]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.0-3.18.2-201501142325.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.0-3.18.2-201501142325.patch
CommitLineData
68739f47
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 479f332..2475ac2 100644
317--- a/Documentation/kernel-parameters.txt
318+++ b/Documentation/kernel-parameters.txt
319@@ -1182,6 +1182,10 @@ 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+
327 hashdist= [KNL,NUMA] Large hashes allocated during boot
328 are distributed across NUMA nodes. Defaults on
329 for 64-bit NUMA, off otherwise.
330@@ -2259,6 +2263,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
331 noexec=on: enable non-executable mappings (default)
332 noexec=off: disable non-executable mappings
333
334+ nopcid [X86-64]
335+ Disable PCID (Process-Context IDentifier) even if it
336+ is supported by the processor.
337+
338 nosmap [X86]
339 Disable SMAP (Supervisor Mode Access Prevention)
340 even if it is supported by processor.
341@@ -2551,6 +2559,30 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
342 the specified number of seconds. This is to be used if
343 your oopses keep scrolling off the screen.
344
345+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
346+ virtualization environments that don't cope well with the
347+ expand down segment used by UDEREF on X86-32 or the frequent
348+ page table updates on X86-64.
349+
350+ pax_sanitize_slab=
351+ Format: { 0 | 1 | off | fast | full }
352+ Options '0' and '1' are only provided for backward
353+ compatibility, 'off' or 'fast' should be used instead.
354+ 0|off : disable slab object sanitization
355+ 1|fast: enable slab object sanitization excluding
356+ whitelisted slabs (default)
357+ full : sanitize all slabs, even the whitelisted ones
358+
359+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
360+
361+ pax_extra_latent_entropy
362+ Enable a very simple form of latent entropy extraction
363+ from the first 4GB of memory as the bootmem allocator
364+ passes the memory pages to the buddy allocator.
365+
366+ pax_weakuderef [X86-64] enables the weaker but faster form of UDEREF
367+ when the processor supports PCID.
368+
369 pcbit= [HW,ISDN]
370
371 pcd. [PARIDE]
372diff --git a/Makefile b/Makefile
373index 8f73b41..320950a 100644
374--- a/Makefile
375+++ b/Makefile
376@@ -298,7 +298,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
377 HOSTCC = gcc
378 HOSTCXX = g++
379 HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89
380-HOSTCXXFLAGS = -O2
381+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
382+HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
383+HOSTCXXFLAGS = -O2 -Wall -W -Wno-array-bounds
384
385 ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)
386 HOSTCFLAGS += -Wno-unused-value -Wno-unused-parameter \
387@@ -445,8 +447,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
388 # Rules shared between *config targets and build targets
389
390 # Basic helpers built in scripts/
391-PHONY += scripts_basic
392-scripts_basic:
393+PHONY += scripts_basic gcc-plugins
394+scripts_basic: gcc-plugins
395 $(Q)$(MAKE) $(build)=scripts/basic
396 $(Q)rm -f .tmp_quiet_recordmcount
397
398@@ -620,6 +622,72 @@ endif
399 # Tell gcc to never replace conditional load with a non-conditional one
400 KBUILD_CFLAGS += $(call cc-option,--param=allow-store-data-races=0)
401
402+ifndef DISABLE_PAX_PLUGINS
403+ifeq ($(call cc-ifversion, -ge, 0408, y), y)
404+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCXX)" "$(HOSTCXX)" "$(CC)")
405+else
406+PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
407+endif
408+ifneq ($(PLUGINCC),)
409+ifdef CONFIG_PAX_CONSTIFY_PLUGIN
410+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
411+endif
412+ifdef CONFIG_PAX_MEMORY_STACKLEAK
413+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
414+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
415+endif
416+ifdef CONFIG_KALLOCSTAT_PLUGIN
417+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
418+endif
419+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
420+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
421+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
422+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
423+endif
424+ifdef CONFIG_GRKERNSEC_RANDSTRUCT
425+RANDSTRUCT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/randomize_layout_plugin.so -DRANDSTRUCT_PLUGIN
426+ifdef CONFIG_GRKERNSEC_RANDSTRUCT_PERFORMANCE
427+RANDSTRUCT_PLUGIN_CFLAGS += -fplugin-arg-randomize_layout_plugin-performance-mode
428+endif
429+endif
430+ifdef CONFIG_CHECKER_PLUGIN
431+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
432+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
433+endif
434+endif
435+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
436+ifdef CONFIG_PAX_SIZE_OVERFLOW
437+SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
438+endif
439+ifdef CONFIG_PAX_LATENT_ENTROPY
440+LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
441+endif
442+ifdef CONFIG_PAX_MEMORY_STRUCTLEAK
443+STRUCTLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/structleak_plugin.so -DSTRUCTLEAK_PLUGIN
444+endif
445+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
446+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
447+GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
448+GCC_PLUGINS_CFLAGS += $(RANDSTRUCT_PLUGIN_CFLAGS)
449+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
450+export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN LATENT_ENTROPY_PLUGIN_CFLAGS
451+ifeq ($(KBUILD_EXTMOD),)
452+gcc-plugins:
453+ $(Q)$(MAKE) $(build)=tools/gcc
454+else
455+gcc-plugins: ;
456+endif
457+else
458+gcc-plugins:
459+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
460+ $(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.))
461+else
462+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
463+endif
464+ $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
465+endif
466+endif
467+
468 ifdef CONFIG_READABLE_ASM
469 # Disable optimizations that make assembler listings hard to read.
470 # reorder blocks reorders the control in the function
471@@ -712,7 +780,7 @@ KBUILD_CFLAGS += $(call cc-option, -gsplit-dwarf, -g)
472 else
473 KBUILD_CFLAGS += -g
474 endif
475-KBUILD_AFLAGS += -Wa,-gdwarf-2
476+KBUILD_AFLAGS += -Wa,--gdwarf-2
477 endif
478 ifdef CONFIG_DEBUG_INFO_DWARF4
479 KBUILD_CFLAGS += $(call cc-option, -gdwarf-4,)
480@@ -877,7 +945,7 @@ export mod_sign_cmd
481
482
483 ifeq ($(KBUILD_EXTMOD),)
484-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
485+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
486
487 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
488 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
489@@ -924,6 +992,8 @@ endif
490
491 # The actual objects are generated when descending,
492 # make sure no implicit rule kicks in
493+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
494+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
495 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
496
497 # Handle descending into subdirectories listed in $(vmlinux-dirs)
498@@ -933,7 +1003,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
499 # Error messages still appears in the original language
500
501 PHONY += $(vmlinux-dirs)
502-$(vmlinux-dirs): prepare scripts
503+$(vmlinux-dirs): gcc-plugins prepare scripts
504 $(Q)$(MAKE) $(build)=$@
505
506 define filechk_kernel.release
507@@ -976,10 +1046,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
508
509 archprepare: archheaders archscripts prepare1 scripts_basic
510
511+prepare0: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
512+prepare0: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
513 prepare0: archprepare FORCE
514 $(Q)$(MAKE) $(build)=.
515
516 # All the preparing..
517+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
518 prepare: prepare0
519
520 # Generate some files
521@@ -1094,6 +1167,8 @@ all: modules
522 # using awk while concatenating to the final file.
523
524 PHONY += modules
525+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
526+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
527 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
528 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
529 @$(kecho) ' Building modules, stage 2.';
530@@ -1109,7 +1184,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
531
532 # Target to prepare building external modules
533 PHONY += modules_prepare
534-modules_prepare: prepare scripts
535+modules_prepare: gcc-plugins prepare scripts
536
537 # Target to install modules
538 PHONY += modules_install
539@@ -1175,7 +1250,10 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
540 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
541 signing_key.priv signing_key.x509 x509.genkey \
542 extra_certificates signing_key.x509.keyid \
543- signing_key.x509.signer include/linux/version.h
544+ signing_key.x509.signer include/linux/version.h \
545+ tools/gcc/size_overflow_plugin/size_overflow_hash_aux.h \
546+ tools/gcc/size_overflow_plugin/size_overflow_hash.h \
547+ tools/gcc/randomize_layout_seed.h
548
549 # clean - Delete most, but leave enough to build external modules
550 #
551@@ -1214,7 +1292,7 @@ distclean: mrproper
552 @find $(srctree) $(RCS_FIND_IGNORE) \
553 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
554 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
555- -o -name '.*.rej' -o -name '*%' -o -name 'core' \) \
556+ -o -name '.*.rej' -o -name '*.so' -o -name '*%' -o -name 'core' \) \
557 -type f -print | xargs rm -f
558
559
560@@ -1380,6 +1458,8 @@ PHONY += $(module-dirs) modules
561 $(module-dirs): crmodverdir $(objtree)/Module.symvers
562 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
563
564+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
565+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
566 modules: $(module-dirs)
567 @$(kecho) ' Building modules, stage 2.';
568 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
569@@ -1520,17 +1600,21 @@ else
570 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
571 endif
572
573-%.s: %.c prepare scripts FORCE
574+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
575+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
576+%.s: %.c gcc-plugins prepare scripts FORCE
577 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
578 %.i: %.c prepare scripts FORCE
579 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
580-%.o: %.c prepare scripts FORCE
581+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
582+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
583+%.o: %.c gcc-plugins prepare scripts FORCE
584 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
585 %.lst: %.c prepare scripts FORCE
586 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
587-%.s: %.S prepare scripts FORCE
588+%.s: %.S gcc-plugins prepare scripts FORCE
589 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
590-%.o: %.S prepare scripts FORCE
591+%.o: %.S gcc-plugins prepare scripts FORCE
592 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
593 %.symtypes: %.c prepare scripts FORCE
594 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
595@@ -1542,11 +1626,15 @@ endif
596 $(build)=$(build-dir)
597 # Make sure the latest headers are built for Documentation
598 Documentation/: headers_install
599-%/: prepare scripts FORCE
600+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
601+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
602+%/: gcc-plugins prepare scripts FORCE
603 $(cmd_crmodverdir)
604 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
605 $(build)=$(build-dir)
606-%.ko: prepare scripts FORCE
607+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
608+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
609+%.ko: gcc-plugins prepare scripts FORCE
610 $(cmd_crmodverdir)
611 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
612 $(build)=$(build-dir) $(@:.ko=.o)
613diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
614index 8f8eafb..3405f46 100644
615--- a/arch/alpha/include/asm/atomic.h
616+++ b/arch/alpha/include/asm/atomic.h
617@@ -239,4 +239,14 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
618 #define atomic_dec(v) atomic_sub(1,(v))
619 #define atomic64_dec(v) atomic64_sub(1,(v))
620
621+#define atomic64_read_unchecked(v) atomic64_read(v)
622+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
623+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
624+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
625+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
626+#define atomic64_inc_unchecked(v) atomic64_inc(v)
627+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
628+#define atomic64_dec_unchecked(v) atomic64_dec(v)
629+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
630+
631 #endif /* _ALPHA_ATOMIC_H */
632diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
633index ad368a9..fbe0f25 100644
634--- a/arch/alpha/include/asm/cache.h
635+++ b/arch/alpha/include/asm/cache.h
636@@ -4,19 +4,19 @@
637 #ifndef __ARCH_ALPHA_CACHE_H
638 #define __ARCH_ALPHA_CACHE_H
639
640+#include <linux/const.h>
641
642 /* Bytes per L1 (data) cache line. */
643 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
644-# define L1_CACHE_BYTES 64
645 # define L1_CACHE_SHIFT 6
646 #else
647 /* Both EV4 and EV5 are write-through, read-allocate,
648 direct-mapped, physical.
649 */
650-# define L1_CACHE_BYTES 32
651 # define L1_CACHE_SHIFT 5
652 #endif
653
654+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
655 #define SMP_CACHE_BYTES L1_CACHE_BYTES
656
657 #endif
658diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
659index 968d999..d36b2df 100644
660--- a/arch/alpha/include/asm/elf.h
661+++ b/arch/alpha/include/asm/elf.h
662@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
663
664 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
665
666+#ifdef CONFIG_PAX_ASLR
667+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
668+
669+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
670+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
671+#endif
672+
673 /* $0 is set by ld.so to a pointer to a function which might be
674 registered using atexit. This provides a mean for the dynamic
675 linker to call DT_FINI functions for shared libraries that have
676diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
677index aab14a0..b4fa3e7 100644
678--- a/arch/alpha/include/asm/pgalloc.h
679+++ b/arch/alpha/include/asm/pgalloc.h
680@@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
681 pgd_set(pgd, pmd);
682 }
683
684+static inline void
685+pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
686+{
687+ pgd_populate(mm, pgd, pmd);
688+}
689+
690 extern pgd_t *pgd_alloc(struct mm_struct *mm);
691
692 static inline void
693diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
694index d8f9b7e..f6222fa 100644
695--- a/arch/alpha/include/asm/pgtable.h
696+++ b/arch/alpha/include/asm/pgtable.h
697@@ -102,6 +102,17 @@ struct vm_area_struct;
698 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
699 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
700 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
701+
702+#ifdef CONFIG_PAX_PAGEEXEC
703+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
704+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
705+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
706+#else
707+# define PAGE_SHARED_NOEXEC PAGE_SHARED
708+# define PAGE_COPY_NOEXEC PAGE_COPY
709+# define PAGE_READONLY_NOEXEC PAGE_READONLY
710+#endif
711+
712 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
713
714 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
715diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
716index 2fd00b7..cfd5069 100644
717--- a/arch/alpha/kernel/module.c
718+++ b/arch/alpha/kernel/module.c
719@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
720
721 /* The small sections were sorted to the end of the segment.
722 The following should definitely cover them. */
723- gp = (u64)me->module_core + me->core_size - 0x8000;
724+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
725 got = sechdrs[me->arch.gotsecindex].sh_addr;
726
727 for (i = 0; i < n; i++) {
728diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
729index f9c732e..78fbb0f 100644
730--- a/arch/alpha/kernel/osf_sys.c
731+++ b/arch/alpha/kernel/osf_sys.c
732@@ -1295,10 +1295,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
733 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
734
735 static unsigned long
736-arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
737- unsigned long limit)
738+arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
739+ unsigned long limit, unsigned long flags)
740 {
741 struct vm_unmapped_area_info info;
742+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
743
744 info.flags = 0;
745 info.length = len;
746@@ -1306,6 +1307,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
747 info.high_limit = limit;
748 info.align_mask = 0;
749 info.align_offset = 0;
750+ info.threadstack_offset = offset;
751 return vm_unmapped_area(&info);
752 }
753
754@@ -1338,20 +1340,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
755 merely specific addresses, but regions of memory -- perhaps
756 this feature should be incorporated into all ports? */
757
758+#ifdef CONFIG_PAX_RANDMMAP
759+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
760+#endif
761+
762 if (addr) {
763- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
764+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
765 if (addr != (unsigned long) -ENOMEM)
766 return addr;
767 }
768
769 /* Next, try allocating at TASK_UNMAPPED_BASE. */
770- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
771- len, limit);
772+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
773+
774 if (addr != (unsigned long) -ENOMEM)
775 return addr;
776
777 /* Finally, try allocating in low memory. */
778- addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
779+ addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
780
781 return addr;
782 }
783diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
784index 98838a0..b304fb4 100644
785--- a/arch/alpha/mm/fault.c
786+++ b/arch/alpha/mm/fault.c
787@@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
788 __reload_thread(pcb);
789 }
790
791+#ifdef CONFIG_PAX_PAGEEXEC
792+/*
793+ * PaX: decide what to do with offenders (regs->pc = fault address)
794+ *
795+ * returns 1 when task should be killed
796+ * 2 when patched PLT trampoline was detected
797+ * 3 when unpatched PLT trampoline was detected
798+ */
799+static int pax_handle_fetch_fault(struct pt_regs *regs)
800+{
801+
802+#ifdef CONFIG_PAX_EMUPLT
803+ int err;
804+
805+ do { /* PaX: patched PLT emulation #1 */
806+ unsigned int ldah, ldq, jmp;
807+
808+ err = get_user(ldah, (unsigned int *)regs->pc);
809+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
810+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
811+
812+ if (err)
813+ break;
814+
815+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
816+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
817+ jmp == 0x6BFB0000U)
818+ {
819+ unsigned long r27, addr;
820+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
821+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
822+
823+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
824+ err = get_user(r27, (unsigned long *)addr);
825+ if (err)
826+ break;
827+
828+ regs->r27 = r27;
829+ regs->pc = r27;
830+ return 2;
831+ }
832+ } while (0);
833+
834+ do { /* PaX: patched PLT emulation #2 */
835+ unsigned int ldah, lda, br;
836+
837+ err = get_user(ldah, (unsigned int *)regs->pc);
838+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
839+ err |= get_user(br, (unsigned int *)(regs->pc+8));
840+
841+ if (err)
842+ break;
843+
844+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
845+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
846+ (br & 0xFFE00000U) == 0xC3E00000U)
847+ {
848+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
849+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
850+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
851+
852+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
853+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
854+ return 2;
855+ }
856+ } while (0);
857+
858+ do { /* PaX: unpatched PLT emulation */
859+ unsigned int br;
860+
861+ err = get_user(br, (unsigned int *)regs->pc);
862+
863+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
864+ unsigned int br2, ldq, nop, jmp;
865+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
866+
867+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
868+ err = get_user(br2, (unsigned int *)addr);
869+ err |= get_user(ldq, (unsigned int *)(addr+4));
870+ err |= get_user(nop, (unsigned int *)(addr+8));
871+ err |= get_user(jmp, (unsigned int *)(addr+12));
872+ err |= get_user(resolver, (unsigned long *)(addr+16));
873+
874+ if (err)
875+ break;
876+
877+ if (br2 == 0xC3600000U &&
878+ ldq == 0xA77B000CU &&
879+ nop == 0x47FF041FU &&
880+ jmp == 0x6B7B0000U)
881+ {
882+ regs->r28 = regs->pc+4;
883+ regs->r27 = addr+16;
884+ regs->pc = resolver;
885+ return 3;
886+ }
887+ }
888+ } while (0);
889+#endif
890+
891+ return 1;
892+}
893+
894+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
895+{
896+ unsigned long i;
897+
898+ printk(KERN_ERR "PAX: bytes at PC: ");
899+ for (i = 0; i < 5; i++) {
900+ unsigned int c;
901+ if (get_user(c, (unsigned int *)pc+i))
902+ printk(KERN_CONT "???????? ");
903+ else
904+ printk(KERN_CONT "%08x ", c);
905+ }
906+ printk("\n");
907+}
908+#endif
909
910 /*
911 * This routine handles page faults. It determines the address,
912@@ -133,8 +251,29 @@ retry:
913 good_area:
914 si_code = SEGV_ACCERR;
915 if (cause < 0) {
916- if (!(vma->vm_flags & VM_EXEC))
917+ if (!(vma->vm_flags & VM_EXEC)) {
918+
919+#ifdef CONFIG_PAX_PAGEEXEC
920+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
921+ goto bad_area;
922+
923+ up_read(&mm->mmap_sem);
924+ switch (pax_handle_fetch_fault(regs)) {
925+
926+#ifdef CONFIG_PAX_EMUPLT
927+ case 2:
928+ case 3:
929+ return;
930+#endif
931+
932+ }
933+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
934+ do_group_exit(SIGKILL);
935+#else
936 goto bad_area;
937+#endif
938+
939+ }
940 } else if (!cause) {
941 /* Allow reads even for write-only mappings */
942 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
943diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
944index 89c4b5c..847a7be 100644
945--- a/arch/arm/Kconfig
946+++ b/arch/arm/Kconfig
947@@ -1740,7 +1740,7 @@ config ALIGNMENT_TRAP
948
949 config UACCESS_WITH_MEMCPY
950 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
951- depends on MMU
952+ depends on MMU && !PAX_MEMORY_UDEREF
953 default y if CPU_FEROCEON
954 help
955 Implement faster copy_to_user and clear_user methods for CPU
956@@ -2004,6 +2004,7 @@ config XIP_PHYS_ADDR
957 config KEXEC
958 bool "Kexec system call (EXPERIMENTAL)"
959 depends on (!SMP || PM_SLEEP_SMP)
960+ depends on !GRKERNSEC_KMEM
961 help
962 kexec is a system call that implements the ability to shutdown your
963 current kernel, and to start another kernel. It is like a reboot
964diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
965index e22c119..eaa807d 100644
966--- a/arch/arm/include/asm/atomic.h
967+++ b/arch/arm/include/asm/atomic.h
968@@ -18,17 +18,41 @@
969 #include <asm/barrier.h>
970 #include <asm/cmpxchg.h>
971
972+#ifdef CONFIG_GENERIC_ATOMIC64
973+#include <asm-generic/atomic64.h>
974+#endif
975+
976 #define ATOMIC_INIT(i) { (i) }
977
978 #ifdef __KERNEL__
979
980+#ifdef CONFIG_THUMB2_KERNEL
981+#define REFCOUNT_TRAP_INSN "bkpt 0xf1"
982+#else
983+#define REFCOUNT_TRAP_INSN "bkpt 0xf103"
984+#endif
985+
986+#define _ASM_EXTABLE(from, to) \
987+" .pushsection __ex_table,\"a\"\n"\
988+" .align 3\n" \
989+" .long " #from ", " #to"\n" \
990+" .popsection"
991+
992 /*
993 * On ARM, ordinary assignment (str instruction) doesn't clear the local
994 * strex/ldrex monitor on some implementations. The reason we can use it for
995 * atomic_set() is the clrex or dummy strex done on every exception return.
996 */
997 #define atomic_read(v) ACCESS_ONCE((v)->counter)
998+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
999+{
1000+ return ACCESS_ONCE(v->counter);
1001+}
1002 #define atomic_set(v,i) (((v)->counter) = (i))
1003+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
1004+{
1005+ v->counter = i;
1006+}
1007
1008 #if __LINUX_ARM_ARCH__ >= 6
1009
1010@@ -38,26 +62,50 @@
1011 * to ensure that the update happens.
1012 */
1013
1014-#define ATOMIC_OP(op, c_op, asm_op) \
1015-static inline void atomic_##op(int i, atomic_t *v) \
1016+#ifdef CONFIG_PAX_REFCOUNT
1017+#define __OVERFLOW_POST \
1018+ " bvc 3f\n" \
1019+ "2: " REFCOUNT_TRAP_INSN "\n"\
1020+ "3:\n"
1021+#define __OVERFLOW_POST_RETURN \
1022+ " bvc 3f\n" \
1023+" mov %0, %1\n" \
1024+ "2: " REFCOUNT_TRAP_INSN "\n"\
1025+ "3:\n"
1026+#define __OVERFLOW_EXTABLE \
1027+ "4:\n" \
1028+ _ASM_EXTABLE(2b, 4b)
1029+#else
1030+#define __OVERFLOW_POST
1031+#define __OVERFLOW_POST_RETURN
1032+#define __OVERFLOW_EXTABLE
1033+#endif
1034+
1035+#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1036+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1037 { \
1038 unsigned long tmp; \
1039 int result; \
1040 \
1041 prefetchw(&v->counter); \
1042- __asm__ __volatile__("@ atomic_" #op "\n" \
1043+ __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
1044 "1: ldrex %0, [%3]\n" \
1045 " " #asm_op " %0, %0, %4\n" \
1046+ post_op \
1047 " strex %1, %0, [%3]\n" \
1048 " teq %1, #0\n" \
1049-" bne 1b" \
1050+" bne 1b\n" \
1051+ extable \
1052 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1053 : "r" (&v->counter), "Ir" (i) \
1054 : "cc"); \
1055 } \
1056
1057-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1058-static inline int atomic_##op##_return(int i, atomic_t *v) \
1059+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op, , )\
1060+ __ATOMIC_OP(op, _unchecked, c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1061+
1062+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1063+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1064 { \
1065 unsigned long tmp; \
1066 int result; \
1067@@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1068 smp_mb(); \
1069 prefetchw(&v->counter); \
1070 \
1071- __asm__ __volatile__("@ atomic_" #op "_return\n" \
1072+ __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
1073 "1: ldrex %0, [%3]\n" \
1074 " " #asm_op " %0, %0, %4\n" \
1075+ post_op \
1076 " strex %1, %0, [%3]\n" \
1077 " teq %1, #0\n" \
1078-" bne 1b" \
1079+" bne 1b\n" \
1080+ extable \
1081 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1082 : "r" (&v->counter), "Ir" (i) \
1083 : "cc"); \
1084@@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1085 return result; \
1086 }
1087
1088+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op, , )\
1089+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1090+
1091 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1092 {
1093 int oldval;
1094@@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1095 __asm__ __volatile__ ("@ atomic_add_unless\n"
1096 "1: ldrex %0, [%4]\n"
1097 " teq %0, %5\n"
1098-" beq 2f\n"
1099-" add %1, %0, %6\n"
1100+" beq 4f\n"
1101+" adds %1, %0, %6\n"
1102+
1103+#ifdef CONFIG_PAX_REFCOUNT
1104+" bvc 3f\n"
1105+"2: " REFCOUNT_TRAP_INSN "\n"
1106+"3:\n"
1107+#endif
1108+
1109 " strex %2, %1, [%4]\n"
1110 " teq %2, #0\n"
1111 " bne 1b\n"
1112-"2:"
1113+"4:"
1114+
1115+#ifdef CONFIG_PAX_REFCOUNT
1116+ _ASM_EXTABLE(2b, 4b)
1117+#endif
1118+
1119 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1120 : "r" (&v->counter), "r" (u), "r" (a)
1121 : "cc");
1122@@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1123 return oldval;
1124 }
1125
1126+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1127+{
1128+ unsigned long oldval, res;
1129+
1130+ smp_mb();
1131+
1132+ do {
1133+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1134+ "ldrex %1, [%3]\n"
1135+ "mov %0, #0\n"
1136+ "teq %1, %4\n"
1137+ "strexeq %0, %5, [%3]\n"
1138+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1139+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1140+ : "cc");
1141+ } while (res);
1142+
1143+ smp_mb();
1144+
1145+ return oldval;
1146+}
1147+
1148 #else /* ARM_ARCH_6 */
1149
1150 #ifdef CONFIG_SMP
1151 #error SMP not supported on pre-ARMv6 CPUs
1152 #endif
1153
1154-#define ATOMIC_OP(op, c_op, asm_op) \
1155-static inline void atomic_##op(int i, atomic_t *v) \
1156+#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
1157+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1158 { \
1159 unsigned long flags; \
1160 \
1161@@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
1162 raw_local_irq_restore(flags); \
1163 } \
1164
1165-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1166-static inline int atomic_##op##_return(int i, atomic_t *v) \
1167+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
1168+ __ATOMIC_OP(op, _unchecked, c_op, asm_op)
1169+
1170+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
1171+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1172 { \
1173 unsigned long flags; \
1174 int val; \
1175@@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1176 return val; \
1177 }
1178
1179+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
1180+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
1181+
1182 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1183 {
1184 int ret;
1185@@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1186 return ret;
1187 }
1188
1189+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1190+{
1191+ return atomic_cmpxchg((atomic_t *)v, old, new);
1192+}
1193+
1194 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1195 {
1196 int c, old;
1197@@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
1198
1199 #undef ATOMIC_OPS
1200 #undef ATOMIC_OP_RETURN
1201+#undef __ATOMIC_OP_RETURN
1202 #undef ATOMIC_OP
1203+#undef __ATOMIC_OP
1204
1205 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1206+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1207+{
1208+ return xchg(&v->counter, new);
1209+}
1210
1211 #define atomic_inc(v) atomic_add(1, v)
1212+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1213+{
1214+ atomic_add_unchecked(1, v);
1215+}
1216 #define atomic_dec(v) atomic_sub(1, v)
1217+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1218+{
1219+ atomic_sub_unchecked(1, v);
1220+}
1221
1222 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1223+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1224+{
1225+ return atomic_add_return_unchecked(1, v) == 0;
1226+}
1227 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1228 #define atomic_inc_return(v) (atomic_add_return(1, v))
1229+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1230+{
1231+ return atomic_add_return_unchecked(1, v);
1232+}
1233 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1234 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1235
1236@@ -216,6 +336,14 @@ typedef struct {
1237 long long counter;
1238 } atomic64_t;
1239
1240+#ifdef CONFIG_PAX_REFCOUNT
1241+typedef struct {
1242+ long long counter;
1243+} atomic64_unchecked_t;
1244+#else
1245+typedef atomic64_t atomic64_unchecked_t;
1246+#endif
1247+
1248 #define ATOMIC64_INIT(i) { (i) }
1249
1250 #ifdef CONFIG_ARM_LPAE
1251@@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1252 return result;
1253 }
1254
1255+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1256+{
1257+ long long result;
1258+
1259+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1260+" ldrd %0, %H0, [%1]"
1261+ : "=&r" (result)
1262+ : "r" (&v->counter), "Qo" (v->counter)
1263+ );
1264+
1265+ return result;
1266+}
1267+
1268 static inline void atomic64_set(atomic64_t *v, long long i)
1269 {
1270 __asm__ __volatile__("@ atomic64_set\n"
1271@@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1272 : "r" (&v->counter), "r" (i)
1273 );
1274 }
1275+
1276+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1277+{
1278+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1279+" strd %2, %H2, [%1]"
1280+ : "=Qo" (v->counter)
1281+ : "r" (&v->counter), "r" (i)
1282+ );
1283+}
1284 #else
1285 static inline long long atomic64_read(const atomic64_t *v)
1286 {
1287@@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1288 return result;
1289 }
1290
1291+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1292+{
1293+ long long result;
1294+
1295+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1296+" ldrexd %0, %H0, [%1]"
1297+ : "=&r" (result)
1298+ : "r" (&v->counter), "Qo" (v->counter)
1299+ );
1300+
1301+ return result;
1302+}
1303+
1304 static inline void atomic64_set(atomic64_t *v, long long i)
1305 {
1306 long long tmp;
1307@@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1308 : "r" (&v->counter), "r" (i)
1309 : "cc");
1310 }
1311+
1312+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1313+{
1314+ long long tmp;
1315+
1316+ prefetchw(&v->counter);
1317+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1318+"1: ldrexd %0, %H0, [%2]\n"
1319+" strexd %0, %3, %H3, [%2]\n"
1320+" teq %0, #0\n"
1321+" bne 1b"
1322+ : "=&r" (tmp), "=Qo" (v->counter)
1323+ : "r" (&v->counter), "r" (i)
1324+ : "cc");
1325+}
1326 #endif
1327
1328-#define ATOMIC64_OP(op, op1, op2) \
1329-static inline void atomic64_##op(long long i, atomic64_t *v) \
1330+#undef __OVERFLOW_POST_RETURN
1331+#define __OVERFLOW_POST_RETURN \
1332+ " bvc 3f\n" \
1333+" mov %0, %1\n" \
1334+" mov %H0, %H1\n" \
1335+ "2: " REFCOUNT_TRAP_INSN "\n"\
1336+ "3:\n"
1337+
1338+#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1339+static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1340 { \
1341 long long result; \
1342 unsigned long tmp; \
1343 \
1344 prefetchw(&v->counter); \
1345- __asm__ __volatile__("@ atomic64_" #op "\n" \
1346+ __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1347 "1: ldrexd %0, %H0, [%3]\n" \
1348 " " #op1 " %Q0, %Q0, %Q4\n" \
1349 " " #op2 " %R0, %R0, %R4\n" \
1350+ post_op \
1351 " strexd %1, %0, %H0, [%3]\n" \
1352 " teq %1, #0\n" \
1353-" bne 1b" \
1354+" bne 1b\n" \
1355+ extable \
1356 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1357 : "r" (&v->counter), "r" (i) \
1358 : "cc"); \
1359 } \
1360
1361-#define ATOMIC64_OP_RETURN(op, op1, op2) \
1362-static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1363+#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, , op1, op2, , ) \
1364+ __ATOMIC64_OP(op, _unchecked, op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1365+
1366+#define __ATOMIC64_OP_RETURN(op, suffix, op1, op2, post_op, extable) \
1367+static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1368 { \
1369 long long result; \
1370 unsigned long tmp; \
1371@@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1372 smp_mb(); \
1373 prefetchw(&v->counter); \
1374 \
1375- __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1376+ __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1377 "1: ldrexd %0, %H0, [%3]\n" \
1378 " " #op1 " %Q0, %Q0, %Q4\n" \
1379 " " #op2 " %R0, %R0, %R4\n" \
1380+ post_op \
1381 " strexd %1, %0, %H0, [%3]\n" \
1382 " teq %1, #0\n" \
1383-" bne 1b" \
1384+" bne 1b\n" \
1385+ extable \
1386 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1387 : "r" (&v->counter), "r" (i) \
1388 : "cc"); \
1389@@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1390 return result; \
1391 }
1392
1393+#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, , op1, op2, , ) \
1394+ __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1395+
1396 #define ATOMIC64_OPS(op, op1, op2) \
1397 ATOMIC64_OP(op, op1, op2) \
1398 ATOMIC64_OP_RETURN(op, op1, op2)
1399@@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1400
1401 #undef ATOMIC64_OPS
1402 #undef ATOMIC64_OP_RETURN
1403+#undef __ATOMIC64_OP_RETURN
1404 #undef ATOMIC64_OP
1405+#undef __ATOMIC64_OP
1406+#undef __OVERFLOW_EXTABLE
1407+#undef __OVERFLOW_POST_RETURN
1408+#undef __OVERFLOW_POST
1409
1410 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1411 long long new)
1412@@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1413 return oldval;
1414 }
1415
1416+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1417+ long long new)
1418+{
1419+ long long oldval;
1420+ unsigned long res;
1421+
1422+ smp_mb();
1423+
1424+ do {
1425+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1426+ "ldrexd %1, %H1, [%3]\n"
1427+ "mov %0, #0\n"
1428+ "teq %1, %4\n"
1429+ "teqeq %H1, %H4\n"
1430+ "strexdeq %0, %5, %H5, [%3]"
1431+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1432+ : "r" (&ptr->counter), "r" (old), "r" (new)
1433+ : "cc");
1434+ } while (res);
1435+
1436+ smp_mb();
1437+
1438+ return oldval;
1439+}
1440+
1441 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1442 {
1443 long long result;
1444@@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1445 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1446 {
1447 long long result;
1448- unsigned long tmp;
1449+ u64 tmp;
1450
1451 smp_mb();
1452 prefetchw(&v->counter);
1453
1454 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1455-"1: ldrexd %0, %H0, [%3]\n"
1456-" subs %Q0, %Q0, #1\n"
1457-" sbc %R0, %R0, #0\n"
1458+"1: ldrexd %1, %H1, [%3]\n"
1459+" subs %Q0, %Q1, #1\n"
1460+" sbcs %R0, %R1, #0\n"
1461+
1462+#ifdef CONFIG_PAX_REFCOUNT
1463+" bvc 3f\n"
1464+" mov %Q0, %Q1\n"
1465+" mov %R0, %R1\n"
1466+"2: " REFCOUNT_TRAP_INSN "\n"
1467+"3:\n"
1468+#endif
1469+
1470 " teq %R0, #0\n"
1471-" bmi 2f\n"
1472+" bmi 4f\n"
1473 " strexd %1, %0, %H0, [%3]\n"
1474 " teq %1, #0\n"
1475 " bne 1b\n"
1476-"2:"
1477+"4:\n"
1478+
1479+#ifdef CONFIG_PAX_REFCOUNT
1480+ _ASM_EXTABLE(2b, 4b)
1481+#endif
1482+
1483 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1484 : "r" (&v->counter)
1485 : "cc");
1486@@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1487 " teq %0, %5\n"
1488 " teqeq %H0, %H5\n"
1489 " moveq %1, #0\n"
1490-" beq 2f\n"
1491+" beq 4f\n"
1492 " adds %Q0, %Q0, %Q6\n"
1493-" adc %R0, %R0, %R6\n"
1494+" adcs %R0, %R0, %R6\n"
1495+
1496+#ifdef CONFIG_PAX_REFCOUNT
1497+" bvc 3f\n"
1498+"2: " REFCOUNT_TRAP_INSN "\n"
1499+"3:\n"
1500+#endif
1501+
1502 " strexd %2, %0, %H0, [%4]\n"
1503 " teq %2, #0\n"
1504 " bne 1b\n"
1505-"2:"
1506+"4:\n"
1507+
1508+#ifdef CONFIG_PAX_REFCOUNT
1509+ _ASM_EXTABLE(2b, 4b)
1510+#endif
1511+
1512 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1513 : "r" (&v->counter), "r" (u), "r" (a)
1514 : "cc");
1515@@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1516
1517 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1518 #define atomic64_inc(v) atomic64_add(1LL, (v))
1519+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1520 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1521+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1522 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1523 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1524 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1525+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1526 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1527 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1528 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1529diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1530index c6a3e73..35cca85 100644
1531--- a/arch/arm/include/asm/barrier.h
1532+++ b/arch/arm/include/asm/barrier.h
1533@@ -63,7 +63,7 @@
1534 do { \
1535 compiletime_assert_atomic_type(*p); \
1536 smp_mb(); \
1537- ACCESS_ONCE(*p) = (v); \
1538+ ACCESS_ONCE_RW(*p) = (v); \
1539 } while (0)
1540
1541 #define smp_load_acquire(p) \
1542diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1543index 75fe66b..ba3dee4 100644
1544--- a/arch/arm/include/asm/cache.h
1545+++ b/arch/arm/include/asm/cache.h
1546@@ -4,8 +4,10 @@
1547 #ifndef __ASMARM_CACHE_H
1548 #define __ASMARM_CACHE_H
1549
1550+#include <linux/const.h>
1551+
1552 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1553-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1554+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1555
1556 /*
1557 * Memory returned by kmalloc() may be used for DMA, so we must make
1558@@ -24,5 +26,6 @@
1559 #endif
1560
1561 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1562+#define __read_only __attribute__ ((__section__(".data..read_only")))
1563
1564 #endif
1565diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1566index 10e78d0..dc8505d 100644
1567--- a/arch/arm/include/asm/cacheflush.h
1568+++ b/arch/arm/include/asm/cacheflush.h
1569@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1570 void (*dma_unmap_area)(const void *, size_t, int);
1571
1572 void (*dma_flush_range)(const void *, const void *);
1573-};
1574+} __no_const;
1575
1576 /*
1577 * Select the calling method
1578diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1579index 5233151..87a71fa 100644
1580--- a/arch/arm/include/asm/checksum.h
1581+++ b/arch/arm/include/asm/checksum.h
1582@@ -37,7 +37,19 @@ __wsum
1583 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1584
1585 __wsum
1586-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1587+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1588+
1589+static inline __wsum
1590+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1591+{
1592+ __wsum ret;
1593+ pax_open_userland();
1594+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1595+ pax_close_userland();
1596+ return ret;
1597+}
1598+
1599+
1600
1601 /*
1602 * Fold a partial checksum without adding pseudo headers
1603diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1604index abb2c37..96db950 100644
1605--- a/arch/arm/include/asm/cmpxchg.h
1606+++ b/arch/arm/include/asm/cmpxchg.h
1607@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1608
1609 #define xchg(ptr,x) \
1610 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1611+#define xchg_unchecked(ptr,x) \
1612+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1613
1614 #include <asm-generic/cmpxchg-local.h>
1615
1616diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1617index 6ddbe44..b5e38b1 100644
1618--- a/arch/arm/include/asm/domain.h
1619+++ b/arch/arm/include/asm/domain.h
1620@@ -48,18 +48,37 @@
1621 * Domain types
1622 */
1623 #define DOMAIN_NOACCESS 0
1624-#define DOMAIN_CLIENT 1
1625 #ifdef CONFIG_CPU_USE_DOMAINS
1626+#define DOMAIN_USERCLIENT 1
1627+#define DOMAIN_KERNELCLIENT 1
1628 #define DOMAIN_MANAGER 3
1629+#define DOMAIN_VECTORS DOMAIN_USER
1630 #else
1631+
1632+#ifdef CONFIG_PAX_KERNEXEC
1633 #define DOMAIN_MANAGER 1
1634+#define DOMAIN_KERNEXEC 3
1635+#else
1636+#define DOMAIN_MANAGER 1
1637+#endif
1638+
1639+#ifdef CONFIG_PAX_MEMORY_UDEREF
1640+#define DOMAIN_USERCLIENT 0
1641+#define DOMAIN_UDEREF 1
1642+#define DOMAIN_VECTORS DOMAIN_KERNEL
1643+#else
1644+#define DOMAIN_USERCLIENT 1
1645+#define DOMAIN_VECTORS DOMAIN_USER
1646+#endif
1647+#define DOMAIN_KERNELCLIENT 1
1648+
1649 #endif
1650
1651 #define domain_val(dom,type) ((type) << (2*(dom)))
1652
1653 #ifndef __ASSEMBLY__
1654
1655-#ifdef CONFIG_CPU_USE_DOMAINS
1656+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1657 static inline void set_domain(unsigned val)
1658 {
1659 asm volatile(
1660@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1661 isb();
1662 }
1663
1664-#define modify_domain(dom,type) \
1665- do { \
1666- struct thread_info *thread = current_thread_info(); \
1667- unsigned int domain = thread->cpu_domain; \
1668- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1669- thread->cpu_domain = domain | domain_val(dom, type); \
1670- set_domain(thread->cpu_domain); \
1671- } while (0)
1672-
1673+extern void modify_domain(unsigned int dom, unsigned int type);
1674 #else
1675 static inline void set_domain(unsigned val) { }
1676 static inline void modify_domain(unsigned dom, unsigned type) { }
1677diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1678index afb9caf..9a0bac0 100644
1679--- a/arch/arm/include/asm/elf.h
1680+++ b/arch/arm/include/asm/elf.h
1681@@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1682 the loader. We need to make sure that it is out of the way of the program
1683 that it will "exec", and that there is sufficient room for the brk. */
1684
1685-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1686+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1687+
1688+#ifdef CONFIG_PAX_ASLR
1689+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1690+
1691+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1692+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1693+#endif
1694
1695 /* When the program starts, a1 contains a pointer to a function to be
1696 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1697@@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1698 extern void elf_set_personality(const struct elf32_hdr *);
1699 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1700
1701-struct mm_struct;
1702-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1703-#define arch_randomize_brk arch_randomize_brk
1704-
1705 #ifdef CONFIG_MMU
1706 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1707 struct linux_binprm;
1708diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1709index de53547..52b9a28 100644
1710--- a/arch/arm/include/asm/fncpy.h
1711+++ b/arch/arm/include/asm/fncpy.h
1712@@ -81,7 +81,9 @@
1713 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1714 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1715 \
1716+ pax_open_kernel(); \
1717 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1718+ pax_close_kernel(); \
1719 flush_icache_range((unsigned long)(dest_buf), \
1720 (unsigned long)(dest_buf) + (size)); \
1721 \
1722diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1723index 53e69da..3fdc896 100644
1724--- a/arch/arm/include/asm/futex.h
1725+++ b/arch/arm/include/asm/futex.h
1726@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1727 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1728 return -EFAULT;
1729
1730+ pax_open_userland();
1731+
1732 smp_mb();
1733 /* Prefetching cannot fault */
1734 prefetchw(uaddr);
1735@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1736 : "cc", "memory");
1737 smp_mb();
1738
1739+ pax_close_userland();
1740+
1741 *uval = val;
1742 return ret;
1743 }
1744@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1745 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1746 return -EFAULT;
1747
1748+ pax_open_userland();
1749+
1750 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1751 "1: " TUSER(ldr) " %1, [%4]\n"
1752 " teq %1, %2\n"
1753@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1754 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1755 : "cc", "memory");
1756
1757+ pax_close_userland();
1758+
1759 *uval = val;
1760 return ret;
1761 }
1762@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1763 return -EFAULT;
1764
1765 pagefault_disable(); /* implies preempt_disable() */
1766+ pax_open_userland();
1767
1768 switch (op) {
1769 case FUTEX_OP_SET:
1770@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1771 ret = -ENOSYS;
1772 }
1773
1774+ pax_close_userland();
1775 pagefault_enable(); /* subsumes preempt_enable() */
1776
1777 if (!ret) {
1778diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1779index 83eb2f7..ed77159 100644
1780--- a/arch/arm/include/asm/kmap_types.h
1781+++ b/arch/arm/include/asm/kmap_types.h
1782@@ -4,6 +4,6 @@
1783 /*
1784 * This is the "bare minimum". AIO seems to require this.
1785 */
1786-#define KM_TYPE_NR 16
1787+#define KM_TYPE_NR 17
1788
1789 #endif
1790diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1791index 9e614a1..3302cca 100644
1792--- a/arch/arm/include/asm/mach/dma.h
1793+++ b/arch/arm/include/asm/mach/dma.h
1794@@ -22,7 +22,7 @@ struct dma_ops {
1795 int (*residue)(unsigned int, dma_t *); /* optional */
1796 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1797 const char *type;
1798-};
1799+} __do_const;
1800
1801 struct dma_struct {
1802 void *addr; /* single DMA address */
1803diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1804index f98c7f3..e5c626d 100644
1805--- a/arch/arm/include/asm/mach/map.h
1806+++ b/arch/arm/include/asm/mach/map.h
1807@@ -23,17 +23,19 @@ struct map_desc {
1808
1809 /* types 0-3 are defined in asm/io.h */
1810 enum {
1811- MT_UNCACHED = 4,
1812- MT_CACHECLEAN,
1813- MT_MINICLEAN,
1814+ MT_UNCACHED_RW = 4,
1815+ MT_CACHECLEAN_RO,
1816+ MT_MINICLEAN_RO,
1817 MT_LOW_VECTORS,
1818 MT_HIGH_VECTORS,
1819- MT_MEMORY_RWX,
1820+ __MT_MEMORY_RWX,
1821 MT_MEMORY_RW,
1822- MT_ROM,
1823- MT_MEMORY_RWX_NONCACHED,
1824+ MT_MEMORY_RX,
1825+ MT_ROM_RX,
1826+ MT_MEMORY_RW_NONCACHED,
1827+ MT_MEMORY_RX_NONCACHED,
1828 MT_MEMORY_RW_DTCM,
1829- MT_MEMORY_RWX_ITCM,
1830+ MT_MEMORY_RX_ITCM,
1831 MT_MEMORY_RW_SO,
1832 MT_MEMORY_DMA_READY,
1833 };
1834diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1835index 891a56b..48f337e 100644
1836--- a/arch/arm/include/asm/outercache.h
1837+++ b/arch/arm/include/asm/outercache.h
1838@@ -36,7 +36,7 @@ struct outer_cache_fns {
1839
1840 /* This is an ARM L2C thing */
1841 void (*write_sec)(unsigned long, unsigned);
1842-};
1843+} __no_const;
1844
1845 extern struct outer_cache_fns outer_cache;
1846
1847diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1848index 4355f0e..cd9168e 100644
1849--- a/arch/arm/include/asm/page.h
1850+++ b/arch/arm/include/asm/page.h
1851@@ -23,6 +23,7 @@
1852
1853 #else
1854
1855+#include <linux/compiler.h>
1856 #include <asm/glue.h>
1857
1858 /*
1859@@ -114,7 +115,7 @@ struct cpu_user_fns {
1860 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1861 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1862 unsigned long vaddr, struct vm_area_struct *vma);
1863-};
1864+} __no_const;
1865
1866 #ifdef MULTI_USER
1867 extern struct cpu_user_fns cpu_user;
1868diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1869index 78a7793..e3dc06c 100644
1870--- a/arch/arm/include/asm/pgalloc.h
1871+++ b/arch/arm/include/asm/pgalloc.h
1872@@ -17,6 +17,7 @@
1873 #include <asm/processor.h>
1874 #include <asm/cacheflush.h>
1875 #include <asm/tlbflush.h>
1876+#include <asm/system_info.h>
1877
1878 #define check_pgt_cache() do { } while (0)
1879
1880@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1881 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1882 }
1883
1884+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1885+{
1886+ pud_populate(mm, pud, pmd);
1887+}
1888+
1889 #else /* !CONFIG_ARM_LPAE */
1890
1891 /*
1892@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1893 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1894 #define pmd_free(mm, pmd) do { } while (0)
1895 #define pud_populate(mm,pmd,pte) BUG()
1896+#define pud_populate_kernel(mm,pmd,pte) BUG()
1897
1898 #endif /* CONFIG_ARM_LPAE */
1899
1900@@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1901 __free_page(pte);
1902 }
1903
1904+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1905+{
1906+#ifdef CONFIG_ARM_LPAE
1907+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1908+#else
1909+ if (addr & SECTION_SIZE)
1910+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1911+ else
1912+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1913+#endif
1914+ flush_pmd_entry(pmdp);
1915+}
1916+
1917 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1918 pmdval_t prot)
1919 {
1920@@ -157,7 +177,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
1921 static inline void
1922 pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
1923 {
1924- __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);
1925+ __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE | __supported_pmd_mask);
1926 }
1927 #define pmd_pgtable(pmd) pmd_page(pmd)
1928
1929diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1930index 5cfba15..f415e1a 100644
1931--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1932+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1933@@ -20,12 +20,15 @@
1934 #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0)
1935 #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0)
1936 #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0)
1937+#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* v7 */
1938 #define PMD_BIT4 (_AT(pmdval_t, 1) << 4)
1939 #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5)
1940 #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */
1941+
1942 /*
1943 * - section
1944 */
1945+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1946 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1947 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1948 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1949@@ -37,6 +40,7 @@
1950 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1951 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1952 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1953+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1954
1955 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1956 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1957@@ -66,6 +70,7 @@
1958 * - extended small page/tiny page
1959 */
1960 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1961+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1962 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1963 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1964 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1965diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1966index f027941..f36ce30 100644
1967--- a/arch/arm/include/asm/pgtable-2level.h
1968+++ b/arch/arm/include/asm/pgtable-2level.h
1969@@ -126,6 +126,9 @@
1970 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1971 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1972
1973+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1974+#define L_PTE_PXN (_AT(pteval_t, 0))
1975+
1976 /*
1977 * These are the memory types, defined to be compatible with
1978 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1979diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
1980index 9fd61c7..f8f1cff 100644
1981--- a/arch/arm/include/asm/pgtable-3level-hwdef.h
1982+++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
1983@@ -76,6 +76,7 @@
1984 #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1985 #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
1986 #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
1987+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1988 #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */
1989
1990 /*
1991diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1992index a31ecdad..95e98d4 100644
1993--- a/arch/arm/include/asm/pgtable-3level.h
1994+++ b/arch/arm/include/asm/pgtable-3level.h
1995@@ -81,6 +81,7 @@
1996 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
1997 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1998 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1999+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
2000 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
2001 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
2002 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
2003@@ -92,10 +93,12 @@
2004 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
2005 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
2006 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
2007+#define PMD_SECT_RDONLY PMD_SECT_AP2
2008
2009 /*
2010 * To be used in assembly code with the upper page attributes.
2011 */
2012+#define L_PTE_PXN_HIGH (1 << (53 - 32))
2013 #define L_PTE_XN_HIGH (1 << (54 - 32))
2014 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
2015
2016diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
2017index 3b30062..01a5f9d 100644
2018--- a/arch/arm/include/asm/pgtable.h
2019+++ b/arch/arm/include/asm/pgtable.h
2020@@ -33,6 +33,9 @@
2021 #include <asm/pgtable-2level.h>
2022 #endif
2023
2024+#define ktla_ktva(addr) (addr)
2025+#define ktva_ktla(addr) (addr)
2026+
2027 /*
2028 * Just any arbitrary offset to the start of the vmalloc VM area: the
2029 * current 8MB value just means that there will be a 8MB "hole" after the
2030@@ -48,6 +51,9 @@
2031 #define LIBRARY_TEXT_START 0x0c000000
2032
2033 #ifndef __ASSEMBLY__
2034+extern pteval_t __supported_pte_mask;
2035+extern pmdval_t __supported_pmd_mask;
2036+
2037 extern void __pte_error(const char *file, int line, pte_t);
2038 extern void __pmd_error(const char *file, int line, pmd_t);
2039 extern void __pgd_error(const char *file, int line, pgd_t);
2040@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2041 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2042 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2043
2044+#define __HAVE_ARCH_PAX_OPEN_KERNEL
2045+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2046+
2047+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2048+#include <asm/domain.h>
2049+#include <linux/thread_info.h>
2050+#include <linux/preempt.h>
2051+
2052+static inline int test_domain(int domain, int domaintype)
2053+{
2054+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2055+}
2056+#endif
2057+
2058+#ifdef CONFIG_PAX_KERNEXEC
2059+static inline unsigned long pax_open_kernel(void) {
2060+#ifdef CONFIG_ARM_LPAE
2061+ /* TODO */
2062+#else
2063+ preempt_disable();
2064+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2065+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2066+#endif
2067+ return 0;
2068+}
2069+
2070+static inline unsigned long pax_close_kernel(void) {
2071+#ifdef CONFIG_ARM_LPAE
2072+ /* TODO */
2073+#else
2074+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2075+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2076+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2077+ preempt_enable_no_resched();
2078+#endif
2079+ return 0;
2080+}
2081+#else
2082+static inline unsigned long pax_open_kernel(void) { return 0; }
2083+static inline unsigned long pax_close_kernel(void) { return 0; }
2084+#endif
2085+
2086 /*
2087 * This is the lowest virtual address we can permit any user space
2088 * mapping to be mapped at. This is particularly important for
2089@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2090 /*
2091 * The pgprot_* and protection_map entries will be fixed up in runtime
2092 * to include the cachable and bufferable bits based on memory policy,
2093- * as well as any architecture dependent bits like global/ASID and SMP
2094- * shared mapping bits.
2095+ * as well as any architecture dependent bits like global/ASID, PXN,
2096+ * and SMP shared mapping bits.
2097 */
2098 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2099
2100@@ -267,7 +315,7 @@ PTE_BIT_FUNC(mknexec, |= L_PTE_XN);
2101 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2102 {
2103 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2104- L_PTE_NONE | L_PTE_VALID;
2105+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2106 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2107 return pte;
2108 }
2109diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2110index c25ef3e..735f14b 100644
2111--- a/arch/arm/include/asm/psci.h
2112+++ b/arch/arm/include/asm/psci.h
2113@@ -32,7 +32,7 @@ struct psci_operations {
2114 int (*affinity_info)(unsigned long target_affinity,
2115 unsigned long lowest_affinity_level);
2116 int (*migrate_info_type)(void);
2117-};
2118+} __no_const;
2119
2120 extern struct psci_operations psci_ops;
2121 extern struct smp_operations psci_smp_ops;
2122diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2123index 18f5a55..5072a40 100644
2124--- a/arch/arm/include/asm/smp.h
2125+++ b/arch/arm/include/asm/smp.h
2126@@ -107,7 +107,7 @@ struct smp_operations {
2127 int (*cpu_disable)(unsigned int cpu);
2128 #endif
2129 #endif
2130-};
2131+} __no_const;
2132
2133 struct of_cpu_method {
2134 const char *method;
2135diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2136index ce73ab6..7310f8a 100644
2137--- a/arch/arm/include/asm/thread_info.h
2138+++ b/arch/arm/include/asm/thread_info.h
2139@@ -78,9 +78,9 @@ struct thread_info {
2140 .flags = 0, \
2141 .preempt_count = INIT_PREEMPT_COUNT, \
2142 .addr_limit = KERNEL_DS, \
2143- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2144- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2145- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2146+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2147+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2148+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2149 .restart_block = { \
2150 .fn = do_no_restart_syscall, \
2151 }, \
2152@@ -154,7 +154,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2153 #define TIF_SYSCALL_AUDIT 9
2154 #define TIF_SYSCALL_TRACEPOINT 10
2155 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2156-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2157+/* within 8 bits of TIF_SYSCALL_TRACE
2158+ * to meet flexible second operand requirements
2159+ */
2160+#define TIF_GRSEC_SETXID 12
2161+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2162 #define TIF_USING_IWMMXT 17
2163 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2164 #define TIF_RESTORE_SIGMASK 20
2165@@ -168,10 +172,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2166 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2167 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2168 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2169+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2170
2171 /* Checks for any syscall work in entry-common.S */
2172 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2173- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2174+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2175
2176 /*
2177 * Change these and you break ASM code in entry-common.S
2178diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2179index 5f833f7..76e6644 100644
2180--- a/arch/arm/include/asm/tls.h
2181+++ b/arch/arm/include/asm/tls.h
2182@@ -3,6 +3,7 @@
2183
2184 #include <linux/compiler.h>
2185 #include <asm/thread_info.h>
2186+#include <asm/pgtable.h>
2187
2188 #ifdef __ASSEMBLY__
2189 #include <asm/asm-offsets.h>
2190@@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2191 * at 0xffff0fe0 must be used instead. (see
2192 * entry-armv.S for details)
2193 */
2194+ pax_open_kernel();
2195 *((unsigned int *)0xffff0ff0) = val;
2196+ pax_close_kernel();
2197 #endif
2198 }
2199
2200diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2201index 4767eb9..bf00668 100644
2202--- a/arch/arm/include/asm/uaccess.h
2203+++ b/arch/arm/include/asm/uaccess.h
2204@@ -18,6 +18,7 @@
2205 #include <asm/domain.h>
2206 #include <asm/unified.h>
2207 #include <asm/compiler.h>
2208+#include <asm/pgtable.h>
2209
2210 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2211 #include <asm-generic/uaccess-unaligned.h>
2212@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2213 static inline void set_fs(mm_segment_t fs)
2214 {
2215 current_thread_info()->addr_limit = fs;
2216- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2217+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2218 }
2219
2220 #define segment_eq(a,b) ((a) == (b))
2221
2222+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2223+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2224+
2225+static inline void pax_open_userland(void)
2226+{
2227+
2228+#ifdef CONFIG_PAX_MEMORY_UDEREF
2229+ if (segment_eq(get_fs(), USER_DS)) {
2230+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2231+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2232+ }
2233+#endif
2234+
2235+}
2236+
2237+static inline void pax_close_userland(void)
2238+{
2239+
2240+#ifdef CONFIG_PAX_MEMORY_UDEREF
2241+ if (segment_eq(get_fs(), USER_DS)) {
2242+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2243+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2244+ }
2245+#endif
2246+
2247+}
2248+
2249 #define __addr_ok(addr) ({ \
2250 unsigned long flag; \
2251 __asm__("cmp %2, %0; movlo %0, #0" \
2252@@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2253
2254 #define get_user(x,p) \
2255 ({ \
2256+ int __e; \
2257 might_fault(); \
2258- __get_user_check(x,p); \
2259+ pax_open_userland(); \
2260+ __e = __get_user_check(x,p); \
2261+ pax_close_userland(); \
2262+ __e; \
2263 })
2264
2265 extern int __put_user_1(void *, unsigned int);
2266@@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2267
2268 #define put_user(x,p) \
2269 ({ \
2270+ int __e; \
2271 might_fault(); \
2272- __put_user_check(x,p); \
2273+ pax_open_userland(); \
2274+ __e = __put_user_check(x,p); \
2275+ pax_close_userland(); \
2276+ __e; \
2277 })
2278
2279 #else /* CONFIG_MMU */
2280@@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2281
2282 #endif /* CONFIG_MMU */
2283
2284+#define access_ok_noprefault(type,addr,size) access_ok((type),(addr),(size))
2285 #define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
2286
2287 #define user_addr_max() \
2288@@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2289 #define __get_user(x,ptr) \
2290 ({ \
2291 long __gu_err = 0; \
2292+ pax_open_userland(); \
2293 __get_user_err((x),(ptr),__gu_err); \
2294+ pax_close_userland(); \
2295 __gu_err; \
2296 })
2297
2298 #define __get_user_error(x,ptr,err) \
2299 ({ \
2300+ pax_open_userland(); \
2301 __get_user_err((x),(ptr),err); \
2302+ pax_close_userland(); \
2303 (void) 0; \
2304 })
2305
2306@@ -368,13 +409,17 @@ do { \
2307 #define __put_user(x,ptr) \
2308 ({ \
2309 long __pu_err = 0; \
2310+ pax_open_userland(); \
2311 __put_user_err((x),(ptr),__pu_err); \
2312+ pax_close_userland(); \
2313 __pu_err; \
2314 })
2315
2316 #define __put_user_error(x,ptr,err) \
2317 ({ \
2318+ pax_open_userland(); \
2319 __put_user_err((x),(ptr),err); \
2320+ pax_close_userland(); \
2321 (void) 0; \
2322 })
2323
2324@@ -474,11 +519,44 @@ do { \
2325
2326
2327 #ifdef CONFIG_MMU
2328-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2329-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2330+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2331+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2332+
2333+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2334+{
2335+ unsigned long ret;
2336+
2337+ check_object_size(to, n, false);
2338+ pax_open_userland();
2339+ ret = ___copy_from_user(to, from, n);
2340+ pax_close_userland();
2341+ return ret;
2342+}
2343+
2344+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2345+{
2346+ unsigned long ret;
2347+
2348+ check_object_size(from, n, true);
2349+ pax_open_userland();
2350+ ret = ___copy_to_user(to, from, n);
2351+ pax_close_userland();
2352+ return ret;
2353+}
2354+
2355 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2356-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2357+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2358 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2359+
2360+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2361+{
2362+ unsigned long ret;
2363+ pax_open_userland();
2364+ ret = ___clear_user(addr, n);
2365+ pax_close_userland();
2366+ return ret;
2367+}
2368+
2369 #else
2370 #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
2371 #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
2372@@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2373
2374 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2375 {
2376+ if ((long)n < 0)
2377+ return n;
2378+
2379 if (access_ok(VERIFY_READ, from, n))
2380 n = __copy_from_user(to, from, n);
2381 else /* security hole - plug it */
2382@@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2383
2384 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2385 {
2386+ if ((long)n < 0)
2387+ return n;
2388+
2389 if (access_ok(VERIFY_WRITE, to, n))
2390 n = __copy_to_user(to, from, n);
2391 return n;
2392diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2393index 5af0ed1..cea83883 100644
2394--- a/arch/arm/include/uapi/asm/ptrace.h
2395+++ b/arch/arm/include/uapi/asm/ptrace.h
2396@@ -92,7 +92,7 @@
2397 * ARMv7 groups of PSR bits
2398 */
2399 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2400-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2401+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2402 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2403 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2404
2405diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2406index a88671c..1cc895e 100644
2407--- a/arch/arm/kernel/armksyms.c
2408+++ b/arch/arm/kernel/armksyms.c
2409@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2410
2411 /* networking */
2412 EXPORT_SYMBOL(csum_partial);
2413-EXPORT_SYMBOL(csum_partial_copy_from_user);
2414+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2415 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2416 EXPORT_SYMBOL(__csum_ipv6_magic);
2417
2418@@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2419 #ifdef CONFIG_MMU
2420 EXPORT_SYMBOL(copy_page);
2421
2422-EXPORT_SYMBOL(__copy_from_user);
2423-EXPORT_SYMBOL(__copy_to_user);
2424-EXPORT_SYMBOL(__clear_user);
2425+EXPORT_SYMBOL(___copy_from_user);
2426+EXPORT_SYMBOL(___copy_to_user);
2427+EXPORT_SYMBOL(___clear_user);
2428
2429 EXPORT_SYMBOL(__get_user_1);
2430 EXPORT_SYMBOL(__get_user_2);
2431diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2432index 2f5555d..d493c91 100644
2433--- a/arch/arm/kernel/entry-armv.S
2434+++ b/arch/arm/kernel/entry-armv.S
2435@@ -47,6 +47,87 @@
2436 9997:
2437 .endm
2438
2439+ .macro pax_enter_kernel
2440+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2441+ @ make aligned space for saved DACR
2442+ sub sp, sp, #8
2443+ @ save regs
2444+ stmdb sp!, {r1, r2}
2445+ @ read DACR from cpu_domain into r1
2446+ mov r2, sp
2447+ @ assume 8K pages, since we have to split the immediate in two
2448+ bic r2, r2, #(0x1fc0)
2449+ bic r2, r2, #(0x3f)
2450+ ldr r1, [r2, #TI_CPU_DOMAIN]
2451+ @ store old DACR on stack
2452+ str r1, [sp, #8]
2453+#ifdef CONFIG_PAX_KERNEXEC
2454+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2455+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2456+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2457+#endif
2458+#ifdef CONFIG_PAX_MEMORY_UDEREF
2459+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2460+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2461+#endif
2462+ @ write r1 to current_thread_info()->cpu_domain
2463+ str r1, [r2, #TI_CPU_DOMAIN]
2464+ @ write r1 to DACR
2465+ mcr p15, 0, r1, c3, c0, 0
2466+ @ instruction sync
2467+ instr_sync
2468+ @ restore regs
2469+ ldmia sp!, {r1, r2}
2470+#endif
2471+ .endm
2472+
2473+ .macro pax_open_userland
2474+#ifdef CONFIG_PAX_MEMORY_UDEREF
2475+ @ save regs
2476+ stmdb sp!, {r0, r1}
2477+ @ read DACR from cpu_domain into r1
2478+ mov r0, sp
2479+ @ assume 8K pages, since we have to split the immediate in two
2480+ bic r0, r0, #(0x1fc0)
2481+ bic r0, r0, #(0x3f)
2482+ ldr r1, [r0, #TI_CPU_DOMAIN]
2483+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2484+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2485+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2486+ @ write r1 to current_thread_info()->cpu_domain
2487+ str r1, [r0, #TI_CPU_DOMAIN]
2488+ @ write r1 to DACR
2489+ mcr p15, 0, r1, c3, c0, 0
2490+ @ instruction sync
2491+ instr_sync
2492+ @ restore regs
2493+ ldmia sp!, {r0, r1}
2494+#endif
2495+ .endm
2496+
2497+ .macro pax_close_userland
2498+#ifdef CONFIG_PAX_MEMORY_UDEREF
2499+ @ save regs
2500+ stmdb sp!, {r0, r1}
2501+ @ read DACR from cpu_domain into r1
2502+ mov r0, sp
2503+ @ assume 8K pages, since we have to split the immediate in two
2504+ bic r0, r0, #(0x1fc0)
2505+ bic r0, r0, #(0x3f)
2506+ ldr r1, [r0, #TI_CPU_DOMAIN]
2507+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2508+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2509+ @ write r1 to current_thread_info()->cpu_domain
2510+ str r1, [r0, #TI_CPU_DOMAIN]
2511+ @ write r1 to DACR
2512+ mcr p15, 0, r1, c3, c0, 0
2513+ @ instruction sync
2514+ instr_sync
2515+ @ restore regs
2516+ ldmia sp!, {r0, r1}
2517+#endif
2518+ .endm
2519+
2520 .macro pabt_helper
2521 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2522 #ifdef MULTI_PABORT
2523@@ -89,11 +170,15 @@
2524 * Invalid mode handlers
2525 */
2526 .macro inv_entry, reason
2527+
2528+ pax_enter_kernel
2529+
2530 sub sp, sp, #S_FRAME_SIZE
2531 ARM( stmib sp, {r1 - lr} )
2532 THUMB( stmia sp, {r0 - r12} )
2533 THUMB( str sp, [sp, #S_SP] )
2534 THUMB( str lr, [sp, #S_LR] )
2535+
2536 mov r1, #\reason
2537 .endm
2538
2539@@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
2540 .macro svc_entry, stack_hole=0, trace=1
2541 UNWIND(.fnstart )
2542 UNWIND(.save {r0 - pc} )
2543+
2544+ pax_enter_kernel
2545+
2546 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2547+
2548 #ifdef CONFIG_THUMB2_KERNEL
2549 SPFIX( str r0, [sp] ) @ temporarily saved
2550 SPFIX( mov r0, sp )
2551@@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
2552 ldmia r0, {r3 - r5}
2553 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2554 mov r6, #-1 @ "" "" "" ""
2555+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2556+ @ offset sp by 8 as done in pax_enter_kernel
2557+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2558+#else
2559 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2560+#endif
2561 SPFIX( addeq r2, r2, #4 )
2562 str r3, [sp, #-4]! @ save the "real" r0 copied
2563 @ from the exception stack
2564@@ -368,6 +462,9 @@ ENDPROC(__fiq_abt)
2565 .macro usr_entry, trace=1
2566 UNWIND(.fnstart )
2567 UNWIND(.cantunwind ) @ don't unwind the user space
2568+
2569+ pax_enter_kernel_user
2570+
2571 sub sp, sp, #S_FRAME_SIZE
2572 ARM( stmib sp, {r1 - r12} )
2573 THUMB( stmia sp, {r0 - r12} )
2574@@ -478,7 +575,9 @@ __und_usr:
2575 tst r3, #PSR_T_BIT @ Thumb mode?
2576 bne __und_usr_thumb
2577 sub r4, r2, #4 @ ARM instr at LR - 4
2578+ pax_open_userland
2579 1: ldrt r0, [r4]
2580+ pax_close_userland
2581 ARM_BE8(rev r0, r0) @ little endian instruction
2582
2583 @ r0 = 32-bit ARM instruction which caused the exception
2584@@ -512,11 +611,15 @@ __und_usr_thumb:
2585 */
2586 .arch armv6t2
2587 #endif
2588+ pax_open_userland
2589 2: ldrht r5, [r4]
2590+ pax_close_userland
2591 ARM_BE8(rev16 r5, r5) @ little endian instruction
2592 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2593 blo __und_usr_fault_16 @ 16bit undefined instruction
2594+ pax_open_userland
2595 3: ldrht r0, [r2]
2596+ pax_close_userland
2597 ARM_BE8(rev16 r0, r0) @ little endian instruction
2598 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2599 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2600@@ -546,7 +649,8 @@ ENDPROC(__und_usr)
2601 */
2602 .pushsection .fixup, "ax"
2603 .align 2
2604-4: str r4, [sp, #S_PC] @ retry current instruction
2605+4: pax_close_userland
2606+ str r4, [sp, #S_PC] @ retry current instruction
2607 ret r9
2608 .popsection
2609 .pushsection __ex_table,"a"
2610@@ -766,7 +870,7 @@ ENTRY(__switch_to)
2611 THUMB( str lr, [ip], #4 )
2612 ldr r4, [r2, #TI_TP_VALUE]
2613 ldr r5, [r2, #TI_TP_VALUE + 4]
2614-#ifdef CONFIG_CPU_USE_DOMAINS
2615+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2616 ldr r6, [r2, #TI_CPU_DOMAIN]
2617 #endif
2618 switch_tls r1, r4, r5, r3, r7
2619@@ -775,7 +879,7 @@ ENTRY(__switch_to)
2620 ldr r8, =__stack_chk_guard
2621 ldr r7, [r7, #TSK_STACK_CANARY]
2622 #endif
2623-#ifdef CONFIG_CPU_USE_DOMAINS
2624+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2625 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2626 #endif
2627 mov r5, r0
2628diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2629index 6bb09d4..113e875 100644
2630--- a/arch/arm/kernel/entry-common.S
2631+++ b/arch/arm/kernel/entry-common.S
2632@@ -11,18 +11,46 @@
2633 #include <asm/assembler.h>
2634 #include <asm/unistd.h>
2635 #include <asm/ftrace.h>
2636+#include <asm/domain.h>
2637 #include <asm/unwind.h>
2638
2639+#include "entry-header.S"
2640+
2641 #ifdef CONFIG_NEED_RET_TO_USER
2642 #include <mach/entry-macro.S>
2643 #else
2644 .macro arch_ret_to_user, tmp1, tmp2
2645+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2646+ @ save regs
2647+ stmdb sp!, {r1, r2}
2648+ @ read DACR from cpu_domain into r1
2649+ mov r2, sp
2650+ @ assume 8K pages, since we have to split the immediate in two
2651+ bic r2, r2, #(0x1fc0)
2652+ bic r2, r2, #(0x3f)
2653+ ldr r1, [r2, #TI_CPU_DOMAIN]
2654+#ifdef CONFIG_PAX_KERNEXEC
2655+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2656+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2657+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2658+#endif
2659+#ifdef CONFIG_PAX_MEMORY_UDEREF
2660+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2661+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2662+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2663+#endif
2664+ @ write r1 to current_thread_info()->cpu_domain
2665+ str r1, [r2, #TI_CPU_DOMAIN]
2666+ @ write r1 to DACR
2667+ mcr p15, 0, r1, c3, c0, 0
2668+ @ instruction sync
2669+ instr_sync
2670+ @ restore regs
2671+ ldmia sp!, {r1, r2}
2672+#endif
2673 .endm
2674 #endif
2675
2676-#include "entry-header.S"
2677-
2678-
2679 .align 5
2680 /*
2681 * This is the fast syscall return path. We do as little as
2682@@ -406,6 +434,12 @@ ENTRY(vector_swi)
2683 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2684 #endif
2685
2686+ /*
2687+ * do this here to avoid a performance hit of wrapping the code above
2688+ * that directly dereferences userland to parse the SWI instruction
2689+ */
2690+ pax_enter_kernel_user
2691+
2692 adr tbl, sys_call_table @ load syscall table pointer
2693
2694 #if defined(CONFIG_OABI_COMPAT)
2695diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2696index 4176df7..a901f8d 100644
2697--- a/arch/arm/kernel/entry-header.S
2698+++ b/arch/arm/kernel/entry-header.S
2699@@ -196,6 +196,60 @@
2700 msr cpsr_c, \rtemp @ switch back to the SVC mode
2701 .endm
2702
2703+ .macro pax_enter_kernel_user
2704+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2705+ @ save regs
2706+ stmdb sp!, {r0, r1}
2707+ @ read DACR from cpu_domain into r1
2708+ mov r0, sp
2709+ @ assume 8K pages, since we have to split the immediate in two
2710+ bic r0, r0, #(0x1fc0)
2711+ bic r0, r0, #(0x3f)
2712+ ldr r1, [r0, #TI_CPU_DOMAIN]
2713+#ifdef CONFIG_PAX_MEMORY_UDEREF
2714+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2715+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2716+#endif
2717+#ifdef CONFIG_PAX_KERNEXEC
2718+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2719+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2720+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2721+#endif
2722+ @ write r1 to current_thread_info()->cpu_domain
2723+ str r1, [r0, #TI_CPU_DOMAIN]
2724+ @ write r1 to DACR
2725+ mcr p15, 0, r1, c3, c0, 0
2726+ @ instruction sync
2727+ instr_sync
2728+ @ restore regs
2729+ ldmia sp!, {r0, r1}
2730+#endif
2731+ .endm
2732+
2733+ .macro pax_exit_kernel
2734+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2735+ @ save regs
2736+ stmdb sp!, {r0, r1}
2737+ @ read old DACR from stack into r1
2738+ ldr r1, [sp, #(8 + S_SP)]
2739+ sub r1, r1, #8
2740+ ldr r1, [r1]
2741+
2742+ @ write r1 to current_thread_info()->cpu_domain
2743+ mov r0, sp
2744+ @ assume 8K pages, since we have to split the immediate in two
2745+ bic r0, r0, #(0x1fc0)
2746+ bic r0, r0, #(0x3f)
2747+ str r1, [r0, #TI_CPU_DOMAIN]
2748+ @ write r1 to DACR
2749+ mcr p15, 0, r1, c3, c0, 0
2750+ @ instruction sync
2751+ instr_sync
2752+ @ restore regs
2753+ ldmia sp!, {r0, r1}
2754+#endif
2755+ .endm
2756+
2757 #ifndef CONFIG_THUMB2_KERNEL
2758 .macro svc_exit, rpsr, irq = 0
2759 .if \irq != 0
2760@@ -215,6 +269,9 @@
2761 blne trace_hardirqs_off
2762 #endif
2763 .endif
2764+
2765+ pax_exit_kernel
2766+
2767 msr spsr_cxsf, \rpsr
2768 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2769 @ We must avoid clrex due to Cortex-A15 erratum #830321
2770@@ -290,6 +347,9 @@
2771 blne trace_hardirqs_off
2772 #endif
2773 .endif
2774+
2775+ pax_exit_kernel
2776+
2777 ldr lr, [sp, #S_SP] @ top of the stack
2778 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2779
2780diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2781index b37752a..ff5cb72 100644
2782--- a/arch/arm/kernel/fiq.c
2783+++ b/arch/arm/kernel/fiq.c
2784@@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2785 void *base = vectors_page;
2786 unsigned offset = FIQ_OFFSET;
2787
2788+ pax_open_kernel();
2789 memcpy(base + offset, start, length);
2790+ pax_close_kernel();
2791+
2792 if (!cache_is_vipt_nonaliasing())
2793 flush_icache_range((unsigned long)base + offset, offset +
2794 length);
2795diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2796index 664eee8..f470938 100644
2797--- a/arch/arm/kernel/head.S
2798+++ b/arch/arm/kernel/head.S
2799@@ -437,7 +437,7 @@ __enable_mmu:
2800 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2801 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2802 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2803- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2804+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2805 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2806 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2807 #endif
2808diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2809index 6a4dffe..4a86a70 100644
2810--- a/arch/arm/kernel/module.c
2811+++ b/arch/arm/kernel/module.c
2812@@ -38,12 +38,39 @@
2813 #endif
2814
2815 #ifdef CONFIG_MMU
2816-void *module_alloc(unsigned long size)
2817+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2818 {
2819+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2820+ return NULL;
2821 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2822- GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE,
2823+ GFP_KERNEL, prot, NUMA_NO_NODE,
2824 __builtin_return_address(0));
2825 }
2826+
2827+void *module_alloc(unsigned long size)
2828+{
2829+
2830+#ifdef CONFIG_PAX_KERNEXEC
2831+ return __module_alloc(size, PAGE_KERNEL);
2832+#else
2833+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2834+#endif
2835+
2836+}
2837+
2838+#ifdef CONFIG_PAX_KERNEXEC
2839+void module_free_exec(struct module *mod, void *module_region)
2840+{
2841+ module_free(mod, module_region);
2842+}
2843+EXPORT_SYMBOL(module_free_exec);
2844+
2845+void *module_alloc_exec(unsigned long size)
2846+{
2847+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2848+}
2849+EXPORT_SYMBOL(module_alloc_exec);
2850+#endif
2851 #endif
2852
2853 int
2854diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2855index 07314af..c46655c 100644
2856--- a/arch/arm/kernel/patch.c
2857+++ b/arch/arm/kernel/patch.c
2858@@ -18,6 +18,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2859 bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
2860 int size;
2861
2862+ pax_open_kernel();
2863 if (thumb2 && __opcode_is_thumb16(insn)) {
2864 *(u16 *)addr = __opcode_to_mem_thumb16(insn);
2865 size = sizeof(u16);
2866@@ -39,6 +40,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2867 *(u32 *)addr = insn;
2868 size = sizeof(u32);
2869 }
2870+ pax_close_kernel();
2871
2872 flush_icache_range((uintptr_t)(addr),
2873 (uintptr_t)(addr) + size);
2874diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2875index fe972a2..a772d83 100644
2876--- a/arch/arm/kernel/process.c
2877+++ b/arch/arm/kernel/process.c
2878@@ -207,6 +207,7 @@ void machine_power_off(void)
2879
2880 if (pm_power_off)
2881 pm_power_off();
2882+ BUG();
2883 }
2884
2885 /*
2886@@ -220,7 +221,7 @@ void machine_power_off(void)
2887 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2888 * to use. Implementing such co-ordination would be essentially impossible.
2889 */
2890-void machine_restart(char *cmd)
2891+__noreturn void machine_restart(char *cmd)
2892 {
2893 local_irq_disable();
2894 smp_send_stop();
2895@@ -246,8 +247,8 @@ void __show_regs(struct pt_regs *regs)
2896
2897 show_regs_print_info(KERN_DEFAULT);
2898
2899- print_symbol("PC is at %s\n", instruction_pointer(regs));
2900- print_symbol("LR is at %s\n", regs->ARM_lr);
2901+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2902+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2903 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2904 "sp : %08lx ip : %08lx fp : %08lx\n",
2905 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2906@@ -424,12 +425,6 @@ unsigned long get_wchan(struct task_struct *p)
2907 return 0;
2908 }
2909
2910-unsigned long arch_randomize_brk(struct mm_struct *mm)
2911-{
2912- unsigned long range_end = mm->brk + 0x02000000;
2913- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2914-}
2915-
2916 #ifdef CONFIG_MMU
2917 #ifdef CONFIG_KUSER_HELPERS
2918 /*
2919@@ -445,7 +440,7 @@ static struct vm_area_struct gate_vma = {
2920
2921 static int __init gate_vma_init(void)
2922 {
2923- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2924+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2925 return 0;
2926 }
2927 arch_initcall(gate_vma_init);
2928@@ -474,81 +469,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2929 return is_gate_vma(vma) ? "[vectors]" : NULL;
2930 }
2931
2932-/* If possible, provide a placement hint at a random offset from the
2933- * stack for the signal page.
2934- */
2935-static unsigned long sigpage_addr(const struct mm_struct *mm,
2936- unsigned int npages)
2937-{
2938- unsigned long offset;
2939- unsigned long first;
2940- unsigned long last;
2941- unsigned long addr;
2942- unsigned int slots;
2943-
2944- first = PAGE_ALIGN(mm->start_stack);
2945-
2946- last = TASK_SIZE - (npages << PAGE_SHIFT);
2947-
2948- /* No room after stack? */
2949- if (first > last)
2950- return 0;
2951-
2952- /* Just enough room? */
2953- if (first == last)
2954- return first;
2955-
2956- slots = ((last - first) >> PAGE_SHIFT) + 1;
2957-
2958- offset = get_random_int() % slots;
2959-
2960- addr = first + (offset << PAGE_SHIFT);
2961-
2962- return addr;
2963-}
2964-
2965-static struct page *signal_page;
2966-extern struct page *get_signal_page(void);
2967-
2968-static const struct vm_special_mapping sigpage_mapping = {
2969- .name = "[sigpage]",
2970- .pages = &signal_page,
2971-};
2972-
2973 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2974 {
2975 struct mm_struct *mm = current->mm;
2976- struct vm_area_struct *vma;
2977- unsigned long addr;
2978- unsigned long hint;
2979- int ret = 0;
2980-
2981- if (!signal_page)
2982- signal_page = get_signal_page();
2983- if (!signal_page)
2984- return -ENOMEM;
2985
2986 down_write(&mm->mmap_sem);
2987- hint = sigpage_addr(mm, 1);
2988- addr = get_unmapped_area(NULL, hint, PAGE_SIZE, 0, 0);
2989- if (IS_ERR_VALUE(addr)) {
2990- ret = addr;
2991- goto up_fail;
2992- }
2993-
2994- vma = _install_special_mapping(mm, addr, PAGE_SIZE,
2995- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2996- &sigpage_mapping);
2997-
2998- if (IS_ERR(vma)) {
2999- ret = PTR_ERR(vma);
3000- goto up_fail;
3001- }
3002-
3003- mm->context.sigpage = addr;
3004-
3005- up_fail:
3006+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
3007 up_write(&mm->mmap_sem);
3008- return ret;
3009+ return 0;
3010 }
3011 #endif
3012diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
3013index f73891b..cf3004e 100644
3014--- a/arch/arm/kernel/psci.c
3015+++ b/arch/arm/kernel/psci.c
3016@@ -28,7 +28,7 @@
3017 #include <asm/psci.h>
3018 #include <asm/system_misc.h>
3019
3020-struct psci_operations psci_ops;
3021+struct psci_operations psci_ops __read_only;
3022
3023 static int (*invoke_psci_fn)(u32, u32, u32, u32);
3024 typedef int (*psci_initcall_t)(const struct device_node *);
3025diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3026index ef9119f..31995a3 100644
3027--- a/arch/arm/kernel/ptrace.c
3028+++ b/arch/arm/kernel/ptrace.c
3029@@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
3030 regs->ARM_ip = ip;
3031 }
3032
3033+#ifdef CONFIG_GRKERNSEC_SETXID
3034+extern void gr_delayed_cred_worker(void);
3035+#endif
3036+
3037 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3038 {
3039 current_thread_info()->syscall = scno;
3040
3041+#ifdef CONFIG_GRKERNSEC_SETXID
3042+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3043+ gr_delayed_cred_worker();
3044+#endif
3045+
3046 /* Do the secure computing check first; failures should be fast. */
3047 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3048 if (secure_computing() == -1)
3049diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3050index c031063..e277ab8 100644
3051--- a/arch/arm/kernel/setup.c
3052+++ b/arch/arm/kernel/setup.c
3053@@ -104,21 +104,23 @@ EXPORT_SYMBOL(elf_hwcap);
3054 unsigned int elf_hwcap2 __read_mostly;
3055 EXPORT_SYMBOL(elf_hwcap2);
3056
3057+pteval_t __supported_pte_mask __read_only;
3058+pmdval_t __supported_pmd_mask __read_only;
3059
3060 #ifdef MULTI_CPU
3061-struct processor processor __read_mostly;
3062+struct processor processor __read_only;
3063 #endif
3064 #ifdef MULTI_TLB
3065-struct cpu_tlb_fns cpu_tlb __read_mostly;
3066+struct cpu_tlb_fns cpu_tlb __read_only;
3067 #endif
3068 #ifdef MULTI_USER
3069-struct cpu_user_fns cpu_user __read_mostly;
3070+struct cpu_user_fns cpu_user __read_only;
3071 #endif
3072 #ifdef MULTI_CACHE
3073-struct cpu_cache_fns cpu_cache __read_mostly;
3074+struct cpu_cache_fns cpu_cache __read_only;
3075 #endif
3076 #ifdef CONFIG_OUTER_CACHE
3077-struct outer_cache_fns outer_cache __read_mostly;
3078+struct outer_cache_fns outer_cache __read_only;
3079 EXPORT_SYMBOL(outer_cache);
3080 #endif
3081
3082@@ -252,9 +254,13 @@ static int __get_cpu_architecture(void)
3083 asm("mrc p15, 0, %0, c0, c1, 4"
3084 : "=r" (mmfr0));
3085 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3086- (mmfr0 & 0x000000f0) >= 0x00000030)
3087+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3088 cpu_arch = CPU_ARCH_ARMv7;
3089- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3090+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3091+ __supported_pte_mask |= L_PTE_PXN;
3092+ __supported_pmd_mask |= PMD_PXNTABLE;
3093+ }
3094+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3095 (mmfr0 & 0x000000f0) == 0x00000020)
3096 cpu_arch = CPU_ARCH_ARMv6;
3097 else
3098diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3099index bd19834..e4d8c66 100644
3100--- a/arch/arm/kernel/signal.c
3101+++ b/arch/arm/kernel/signal.c
3102@@ -24,8 +24,6 @@
3103
3104 extern const unsigned long sigreturn_codes[7];
3105
3106-static unsigned long signal_return_offset;
3107-
3108 #ifdef CONFIG_CRUNCH
3109 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3110 {
3111@@ -396,8 +394,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3112 * except when the MPU has protected the vectors
3113 * page from PL0
3114 */
3115- retcode = mm->context.sigpage + signal_return_offset +
3116- (idx << 2) + thumb;
3117+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3118 } else
3119 #endif
3120 {
3121@@ -604,33 +601,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3122 } while (thread_flags & _TIF_WORK_MASK);
3123 return 0;
3124 }
3125-
3126-struct page *get_signal_page(void)
3127-{
3128- unsigned long ptr;
3129- unsigned offset;
3130- struct page *page;
3131- void *addr;
3132-
3133- page = alloc_pages(GFP_KERNEL, 0);
3134-
3135- if (!page)
3136- return NULL;
3137-
3138- addr = page_address(page);
3139-
3140- /* Give the signal return code some randomness */
3141- offset = 0x200 + (get_random_int() & 0x7fc);
3142- signal_return_offset = offset;
3143-
3144- /*
3145- * Copy signal return handlers into the vector page, and
3146- * set sigreturn to be a pointer to these.
3147- */
3148- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3149-
3150- ptr = (unsigned long)addr + offset;
3151- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3152-
3153- return page;
3154-}
3155diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3156index 13396d3..589d615 100644
3157--- a/arch/arm/kernel/smp.c
3158+++ b/arch/arm/kernel/smp.c
3159@@ -76,7 +76,7 @@ enum ipi_msg_type {
3160
3161 static DECLARE_COMPLETION(cpu_running);
3162
3163-static struct smp_operations smp_ops;
3164+static struct smp_operations smp_ops __read_only;
3165
3166 void __init smp_set_ops(struct smp_operations *ops)
3167 {
3168diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3169index 7a3be1d..b00c7de 100644
3170--- a/arch/arm/kernel/tcm.c
3171+++ b/arch/arm/kernel/tcm.c
3172@@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3173 .virtual = ITCM_OFFSET,
3174 .pfn = __phys_to_pfn(ITCM_OFFSET),
3175 .length = 0,
3176- .type = MT_MEMORY_RWX_ITCM,
3177+ .type = MT_MEMORY_RX_ITCM,
3178 }
3179 };
3180
3181@@ -267,7 +267,9 @@ no_dtcm:
3182 start = &__sitcm_text;
3183 end = &__eitcm_text;
3184 ram = &__itcm_start;
3185+ pax_open_kernel();
3186 memcpy(start, ram, itcm_code_sz);
3187+ pax_close_kernel();
3188 pr_debug("CPU ITCM: copied code from %p - %p\n",
3189 start, end);
3190 itcm_present = true;
3191diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3192index 9f5d818..e013427 100644
3193--- a/arch/arm/kernel/traps.c
3194+++ b/arch/arm/kernel/traps.c
3195@@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3196 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3197 {
3198 #ifdef CONFIG_KALLSYMS
3199- printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3200+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3201 #else
3202 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3203 #endif
3204@@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3205 static int die_owner = -1;
3206 static unsigned int die_nest_count;
3207
3208+extern void gr_handle_kernel_exploit(void);
3209+
3210 static unsigned long oops_begin(void)
3211 {
3212 int cpu;
3213@@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3214 panic("Fatal exception in interrupt");
3215 if (panic_on_oops)
3216 panic("Fatal exception");
3217+
3218+ gr_handle_kernel_exploit();
3219+
3220 if (signr)
3221 do_exit(signr);
3222 }
3223@@ -880,7 +885,11 @@ void __init early_trap_init(void *vectors_base)
3224 kuser_init(vectors_base);
3225
3226 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3227- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3228+
3229+#ifndef CONFIG_PAX_MEMORY_UDEREF
3230+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3231+#endif
3232+
3233 #else /* ifndef CONFIG_CPU_V7M */
3234 /*
3235 * on V7-M there is no need to copy the vector table to a dedicated
3236diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3237index 8e95aa4..595dfc8 100644
3238--- a/arch/arm/kernel/vmlinux.lds.S
3239+++ b/arch/arm/kernel/vmlinux.lds.S
3240@@ -8,7 +8,11 @@
3241 #include <asm/thread_info.h>
3242 #include <asm/memory.h>
3243 #include <asm/page.h>
3244-
3245+
3246+#ifdef CONFIG_PAX_KERNEXEC
3247+#include <asm/pgtable.h>
3248+#endif
3249+
3250 #define PROC_INFO \
3251 . = ALIGN(4); \
3252 VMLINUX_SYMBOL(__proc_info_begin) = .; \
3253@@ -34,7 +38,7 @@
3254 #endif
3255
3256 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3257- defined(CONFIG_GENERIC_BUG)
3258+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3259 #define ARM_EXIT_KEEP(x) x
3260 #define ARM_EXIT_DISCARD(x)
3261 #else
3262@@ -90,6 +94,11 @@ SECTIONS
3263 _text = .;
3264 HEAD_TEXT
3265 }
3266+
3267+#ifdef CONFIG_PAX_KERNEXEC
3268+ . = ALIGN(1<<SECTION_SHIFT);
3269+#endif
3270+
3271 .text : { /* Real text segment */
3272 _stext = .; /* Text and read-only data */
3273 __exception_text_start = .;
3274@@ -112,6 +121,8 @@ SECTIONS
3275 ARM_CPU_KEEP(PROC_INFO)
3276 }
3277
3278+ _etext = .; /* End of text section */
3279+
3280 RO_DATA(PAGE_SIZE)
3281
3282 . = ALIGN(4);
3283@@ -142,7 +153,9 @@ SECTIONS
3284
3285 NOTES
3286
3287- _etext = .; /* End of text and rodata section */
3288+#ifdef CONFIG_PAX_KERNEXEC
3289+ . = ALIGN(1<<SECTION_SHIFT);
3290+#endif
3291
3292 #ifndef CONFIG_XIP_KERNEL
3293 . = ALIGN(PAGE_SIZE);
3294@@ -221,6 +234,11 @@ SECTIONS
3295 #else
3296 . = ALIGN(THREAD_SIZE);
3297 __init_end = .;
3298+
3299+#ifdef CONFIG_PAX_KERNEXEC
3300+ . = ALIGN(1<<SECTION_SHIFT);
3301+#endif
3302+
3303 __data_loc = .;
3304 #endif
3305
3306diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3307index 9e193c8..3560fe6 100644
3308--- a/arch/arm/kvm/arm.c
3309+++ b/arch/arm/kvm/arm.c
3310@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3311 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3312
3313 /* The VMID used in the VTTBR */
3314-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3315+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3316 static u8 kvm_next_vmid;
3317 static DEFINE_SPINLOCK(kvm_vmid_lock);
3318
3319@@ -354,7 +354,7 @@ void force_vm_exit(const cpumask_t *mask)
3320 */
3321 static bool need_new_vmid_gen(struct kvm *kvm)
3322 {
3323- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3324+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3325 }
3326
3327 /**
3328@@ -387,7 +387,7 @@ static void update_vttbr(struct kvm *kvm)
3329
3330 /* First user of a new VMID generation? */
3331 if (unlikely(kvm_next_vmid == 0)) {
3332- atomic64_inc(&kvm_vmid_gen);
3333+ atomic64_inc_unchecked(&kvm_vmid_gen);
3334 kvm_next_vmid = 1;
3335
3336 /*
3337@@ -404,7 +404,7 @@ static void update_vttbr(struct kvm *kvm)
3338 kvm_call_hyp(__kvm_flush_vm_context);
3339 }
3340
3341- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3342+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3343 kvm->arch.vmid = kvm_next_vmid;
3344 kvm_next_vmid++;
3345
3346@@ -980,7 +980,7 @@ static void check_kvm_target_cpu(void *ret)
3347 /**
3348 * Initialize Hyp-mode and memory mappings on all CPUs.
3349 */
3350-int kvm_arch_init(void *opaque)
3351+int kvm_arch_init(const void *opaque)
3352 {
3353 int err;
3354 int ret, cpu;
3355diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3356index 14a0d98..7771a7d 100644
3357--- a/arch/arm/lib/clear_user.S
3358+++ b/arch/arm/lib/clear_user.S
3359@@ -12,14 +12,14 @@
3360
3361 .text
3362
3363-/* Prototype: int __clear_user(void *addr, size_t sz)
3364+/* Prototype: int ___clear_user(void *addr, size_t sz)
3365 * Purpose : clear some user memory
3366 * Params : addr - user memory address to clear
3367 * : sz - number of bytes to clear
3368 * Returns : number of bytes NOT cleared
3369 */
3370 ENTRY(__clear_user_std)
3371-WEAK(__clear_user)
3372+WEAK(___clear_user)
3373 stmfd sp!, {r1, lr}
3374 mov r2, #0
3375 cmp r1, #4
3376@@ -44,7 +44,7 @@ WEAK(__clear_user)
3377 USER( strnebt r2, [r0])
3378 mov r0, #0
3379 ldmfd sp!, {r1, pc}
3380-ENDPROC(__clear_user)
3381+ENDPROC(___clear_user)
3382 ENDPROC(__clear_user_std)
3383
3384 .pushsection .fixup,"ax"
3385diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3386index 66a477a..bee61d3 100644
3387--- a/arch/arm/lib/copy_from_user.S
3388+++ b/arch/arm/lib/copy_from_user.S
3389@@ -16,7 +16,7 @@
3390 /*
3391 * Prototype:
3392 *
3393- * size_t __copy_from_user(void *to, const void *from, size_t n)
3394+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3395 *
3396 * Purpose:
3397 *
3398@@ -84,11 +84,11 @@
3399
3400 .text
3401
3402-ENTRY(__copy_from_user)
3403+ENTRY(___copy_from_user)
3404
3405 #include "copy_template.S"
3406
3407-ENDPROC(__copy_from_user)
3408+ENDPROC(___copy_from_user)
3409
3410 .pushsection .fixup,"ax"
3411 .align 0
3412diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3413index 6ee2f67..d1cce76 100644
3414--- a/arch/arm/lib/copy_page.S
3415+++ b/arch/arm/lib/copy_page.S
3416@@ -10,6 +10,7 @@
3417 * ASM optimised string functions
3418 */
3419 #include <linux/linkage.h>
3420+#include <linux/const.h>
3421 #include <asm/assembler.h>
3422 #include <asm/asm-offsets.h>
3423 #include <asm/cache.h>
3424diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3425index d066df6..df28194 100644
3426--- a/arch/arm/lib/copy_to_user.S
3427+++ b/arch/arm/lib/copy_to_user.S
3428@@ -16,7 +16,7 @@
3429 /*
3430 * Prototype:
3431 *
3432- * size_t __copy_to_user(void *to, const void *from, size_t n)
3433+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3434 *
3435 * Purpose:
3436 *
3437@@ -88,11 +88,11 @@
3438 .text
3439
3440 ENTRY(__copy_to_user_std)
3441-WEAK(__copy_to_user)
3442+WEAK(___copy_to_user)
3443
3444 #include "copy_template.S"
3445
3446-ENDPROC(__copy_to_user)
3447+ENDPROC(___copy_to_user)
3448 ENDPROC(__copy_to_user_std)
3449
3450 .pushsection .fixup,"ax"
3451diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3452index 7d08b43..f7ca7ea 100644
3453--- a/arch/arm/lib/csumpartialcopyuser.S
3454+++ b/arch/arm/lib/csumpartialcopyuser.S
3455@@ -57,8 +57,8 @@
3456 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3457 */
3458
3459-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3460-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3461+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3462+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3463
3464 #include "csumpartialcopygeneric.S"
3465
3466diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3467index 312d43e..21d2322 100644
3468--- a/arch/arm/lib/delay.c
3469+++ b/arch/arm/lib/delay.c
3470@@ -29,7 +29,7 @@
3471 /*
3472 * Default to the loop-based delay implementation.
3473 */
3474-struct arm_delay_ops arm_delay_ops = {
3475+struct arm_delay_ops arm_delay_ops __read_only = {
3476 .delay = __loop_delay,
3477 .const_udelay = __loop_const_udelay,
3478 .udelay = __loop_udelay,
3479diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3480index 3e58d71..029817c 100644
3481--- a/arch/arm/lib/uaccess_with_memcpy.c
3482+++ b/arch/arm/lib/uaccess_with_memcpy.c
3483@@ -136,7 +136,7 @@ out:
3484 }
3485
3486 unsigned long
3487-__copy_to_user(void __user *to, const void *from, unsigned long n)
3488+___copy_to_user(void __user *to, const void *from, unsigned long n)
3489 {
3490 /*
3491 * This test is stubbed out of the main function above to keep
3492@@ -190,7 +190,7 @@ out:
3493 return n;
3494 }
3495
3496-unsigned long __clear_user(void __user *addr, unsigned long n)
3497+unsigned long ___clear_user(void __user *addr, unsigned long n)
3498 {
3499 /* See rational for this in __copy_to_user() above. */
3500 if (n < 64)
3501diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
3502index 9610792..4dfb851 100644
3503--- a/arch/arm/mach-at91/setup.c
3504+++ b/arch/arm/mach-at91/setup.c
3505@@ -83,7 +83,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
3506
3507 desc->pfn = __phys_to_pfn(base);
3508 desc->length = length;
3509- desc->type = MT_MEMORY_RWX_NONCACHED;
3510+ desc->type = MT_MEMORY_RW_NONCACHED;
3511
3512 pr_info("sram at 0x%lx of 0x%x mapped at 0x%lx\n",
3513 base, length, desc->virtual);
3514diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3515index 7f352de..6dc0929 100644
3516--- a/arch/arm/mach-keystone/keystone.c
3517+++ b/arch/arm/mach-keystone/keystone.c
3518@@ -27,7 +27,7 @@
3519
3520 #include "keystone.h"
3521
3522-static struct notifier_block platform_nb;
3523+static notifier_block_no_const platform_nb;
3524 static unsigned long keystone_dma_pfn_offset __read_mostly;
3525
3526 static int keystone_platform_notifier(struct notifier_block *nb,
3527diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3528index c31f4c0..c86224d 100644
3529--- a/arch/arm/mach-mvebu/coherency.c
3530+++ b/arch/arm/mach-mvebu/coherency.c
3531@@ -316,7 +316,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3532
3533 /*
3534 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3535- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3536+ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3537 * is needed as a workaround for a deadlock issue between the PCIe
3538 * interface and the cache controller.
3539 */
3540@@ -329,7 +329,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3541 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3542
3543 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3544- mtype = MT_UNCACHED;
3545+ mtype = MT_UNCACHED_RW;
3546
3547 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3548 }
3549diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3550index 97767a2..9233746 100644
3551--- a/arch/arm/mach-omap2/board-n8x0.c
3552+++ b/arch/arm/mach-omap2/board-n8x0.c
3553@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3554 }
3555 #endif
3556
3557-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3558+struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3559 .late_init = n8x0_menelaus_late_init,
3560 };
3561
3562diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
3563index 5fa3755..1e8c247 100644
3564--- a/arch/arm/mach-omap2/gpmc.c
3565+++ b/arch/arm/mach-omap2/gpmc.c
3566@@ -151,7 +151,6 @@ struct omap3_gpmc_regs {
3567 };
3568
3569 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
3570-static struct irq_chip gpmc_irq_chip;
3571 static int gpmc_irq_start;
3572
3573 static struct resource gpmc_mem_root;
3574@@ -736,6 +735,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
3575
3576 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
3577
3578+static struct irq_chip gpmc_irq_chip = {
3579+ .name = "gpmc",
3580+ .irq_startup = gpmc_irq_noop_ret,
3581+ .irq_enable = gpmc_irq_enable,
3582+ .irq_disable = gpmc_irq_disable,
3583+ .irq_shutdown = gpmc_irq_noop,
3584+ .irq_ack = gpmc_irq_noop,
3585+ .irq_mask = gpmc_irq_noop,
3586+ .irq_unmask = gpmc_irq_noop,
3587+
3588+};
3589+
3590 static int gpmc_setup_irq(void)
3591 {
3592 int i;
3593@@ -750,15 +761,6 @@ static int gpmc_setup_irq(void)
3594 return gpmc_irq_start;
3595 }
3596
3597- gpmc_irq_chip.name = "gpmc";
3598- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
3599- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
3600- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
3601- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
3602- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
3603- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
3604- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
3605-
3606 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
3607 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
3608
3609diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3610index 6944ae3..bc587ca 100644
3611--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3612+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3613@@ -86,7 +86,7 @@ struct cpu_pm_ops {
3614 void (*resume)(void);
3615 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3616 void (*hotplug_restart)(void);
3617-};
3618+} __no_const;
3619
3620 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3621 static struct powerdomain *mpuss_pd;
3622@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3623 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3624 {}
3625
3626-struct cpu_pm_ops omap_pm_ops = {
3627+static struct cpu_pm_ops omap_pm_ops __read_only = {
3628 .finish_suspend = default_finish_suspend,
3629 .resume = dummy_cpu_resume,
3630 .scu_prepare = dummy_scu_prepare,
3631diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3632index f961c46..4a453dc 100644
3633--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3634+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3635@@ -344,7 +344,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3636 return NOTIFY_OK;
3637 }
3638
3639-static struct notifier_block __refdata irq_hotplug_notifier = {
3640+static struct notifier_block irq_hotplug_notifier = {
3641 .notifier_call = irq_cpu_hotplug_notify,
3642 };
3643
3644diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3645index 8c58b71..95b655f 100644
3646--- a/arch/arm/mach-omap2/omap_device.c
3647+++ b/arch/arm/mach-omap2/omap_device.c
3648@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3649 struct platform_device __init *omap_device_build(const char *pdev_name,
3650 int pdev_id,
3651 struct omap_hwmod *oh,
3652- void *pdata, int pdata_len)
3653+ const void *pdata, int pdata_len)
3654 {
3655 struct omap_hwmod *ohs[] = { oh };
3656
3657@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3658 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3659 int pdev_id,
3660 struct omap_hwmod **ohs,
3661- int oh_cnt, void *pdata,
3662+ int oh_cnt, const void *pdata,
3663 int pdata_len)
3664 {
3665 int ret = -ENOMEM;
3666diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3667index 78c02b3..c94109a 100644
3668--- a/arch/arm/mach-omap2/omap_device.h
3669+++ b/arch/arm/mach-omap2/omap_device.h
3670@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3671 /* Core code interface */
3672
3673 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3674- struct omap_hwmod *oh, void *pdata,
3675+ struct omap_hwmod *oh, const void *pdata,
3676 int pdata_len);
3677
3678 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3679 struct omap_hwmod **oh, int oh_cnt,
3680- void *pdata, int pdata_len);
3681+ const void *pdata, int pdata_len);
3682
3683 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3684 struct omap_hwmod **ohs, int oh_cnt);
3685diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3686index 716247e..8df346d 100644
3687--- a/arch/arm/mach-omap2/omap_hwmod.c
3688+++ b/arch/arm/mach-omap2/omap_hwmod.c
3689@@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
3690 int (*init_clkdm)(struct omap_hwmod *oh);
3691 void (*update_context_lost)(struct omap_hwmod *oh);
3692 int (*get_context_lost)(struct omap_hwmod *oh);
3693-};
3694+} __no_const;
3695
3696 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3697-static struct omap_hwmod_soc_ops soc_ops;
3698+static struct omap_hwmod_soc_ops soc_ops __read_only;
3699
3700 /* omap_hwmod_list contains all registered struct omap_hwmods */
3701 static LIST_HEAD(omap_hwmod_list);
3702diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3703index 95fee54..cfa9cf1 100644
3704--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3705+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3706@@ -10,6 +10,7 @@
3707
3708 #include <linux/kernel.h>
3709 #include <linux/init.h>
3710+#include <asm/pgtable.h>
3711
3712 #include "powerdomain.h"
3713
3714@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3715
3716 void __init am43xx_powerdomains_init(void)
3717 {
3718- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3719+ pax_open_kernel();
3720+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3721+ pax_close_kernel();
3722 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3723 pwrdm_register_pwrdms(powerdomains_am43xx);
3724 pwrdm_complete_init();
3725diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3726index ff0a68c..b312aa0 100644
3727--- a/arch/arm/mach-omap2/wd_timer.c
3728+++ b/arch/arm/mach-omap2/wd_timer.c
3729@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3730 struct omap_hwmod *oh;
3731 char *oh_name = "wd_timer2";
3732 char *dev_name = "omap_wdt";
3733- struct omap_wd_timer_platform_data pdata;
3734+ static struct omap_wd_timer_platform_data pdata = {
3735+ .read_reset_sources = prm_read_reset_sources
3736+ };
3737
3738 if (!cpu_class_is_omap2() || of_have_populated_dt())
3739 return 0;
3740@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3741 return -EINVAL;
3742 }
3743
3744- pdata.read_reset_sources = prm_read_reset_sources;
3745-
3746 pdev = omap_device_build(dev_name, id, oh, &pdata,
3747 sizeof(struct omap_wd_timer_platform_data));
3748 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3749diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3750index b30bf5c..d0825bf 100644
3751--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3752+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3753@@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3754 bool entered_lp2 = false;
3755
3756 if (tegra_pending_sgi())
3757- ACCESS_ONCE(abort_flag) = true;
3758+ ACCESS_ONCE_RW(abort_flag) = true;
3759
3760 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3761
3762diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3763index 2dea8b5..6499da2 100644
3764--- a/arch/arm/mach-ux500/setup.h
3765+++ b/arch/arm/mach-ux500/setup.h
3766@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3767 .type = MT_DEVICE, \
3768 }
3769
3770-#define __MEM_DEV_DESC(x, sz) { \
3771- .virtual = IO_ADDRESS(x), \
3772- .pfn = __phys_to_pfn(x), \
3773- .length = sz, \
3774- .type = MT_MEMORY_RWX, \
3775-}
3776-
3777 extern struct smp_operations ux500_smp_ops;
3778 extern void ux500_cpu_die(unsigned int cpu);
3779
3780diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3781index 7eb94e6..799ad3e 100644
3782--- a/arch/arm/mm/Kconfig
3783+++ b/arch/arm/mm/Kconfig
3784@@ -446,6 +446,7 @@ config CPU_32v5
3785
3786 config CPU_32v6
3787 bool
3788+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3789 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3790
3791 config CPU_32v6K
3792@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3793
3794 config CPU_USE_DOMAINS
3795 bool
3796+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3797 help
3798 This option enables or disables the use of domain switching
3799 via the set_fs() function.
3800@@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3801
3802 config KUSER_HELPERS
3803 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3804- depends on MMU
3805+ depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3806 default y
3807 help
3808 Warning: disabling this option may break user programs.
3809@@ -812,7 +814,7 @@ config KUSER_HELPERS
3810 See Documentation/arm/kernel_user_helpers.txt for details.
3811
3812 However, the fixed address nature of these helpers can be used
3813- by ROP (return orientated programming) authors when creating
3814+ by ROP (Return Oriented Programming) authors when creating
3815 exploits.
3816
3817 If all of the binaries and libraries which run on your platform
3818diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3819index 83792f4..c25d36b 100644
3820--- a/arch/arm/mm/alignment.c
3821+++ b/arch/arm/mm/alignment.c
3822@@ -216,10 +216,12 @@ union offset_union {
3823 #define __get16_unaligned_check(ins,val,addr) \
3824 do { \
3825 unsigned int err = 0, v, a = addr; \
3826+ pax_open_userland(); \
3827 __get8_unaligned_check(ins,v,a,err); \
3828 val = v << ((BE) ? 8 : 0); \
3829 __get8_unaligned_check(ins,v,a,err); \
3830 val |= v << ((BE) ? 0 : 8); \
3831+ pax_close_userland(); \
3832 if (err) \
3833 goto fault; \
3834 } while (0)
3835@@ -233,6 +235,7 @@ union offset_union {
3836 #define __get32_unaligned_check(ins,val,addr) \
3837 do { \
3838 unsigned int err = 0, v, a = addr; \
3839+ pax_open_userland(); \
3840 __get8_unaligned_check(ins,v,a,err); \
3841 val = v << ((BE) ? 24 : 0); \
3842 __get8_unaligned_check(ins,v,a,err); \
3843@@ -241,6 +244,7 @@ union offset_union {
3844 val |= v << ((BE) ? 8 : 16); \
3845 __get8_unaligned_check(ins,v,a,err); \
3846 val |= v << ((BE) ? 0 : 24); \
3847+ pax_close_userland(); \
3848 if (err) \
3849 goto fault; \
3850 } while (0)
3851@@ -254,6 +258,7 @@ union offset_union {
3852 #define __put16_unaligned_check(ins,val,addr) \
3853 do { \
3854 unsigned int err = 0, v = val, a = addr; \
3855+ pax_open_userland(); \
3856 __asm__( FIRST_BYTE_16 \
3857 ARM( "1: "ins" %1, [%2], #1\n" ) \
3858 THUMB( "1: "ins" %1, [%2]\n" ) \
3859@@ -273,6 +278,7 @@ union offset_union {
3860 " .popsection\n" \
3861 : "=r" (err), "=&r" (v), "=&r" (a) \
3862 : "0" (err), "1" (v), "2" (a)); \
3863+ pax_close_userland(); \
3864 if (err) \
3865 goto fault; \
3866 } while (0)
3867@@ -286,6 +292,7 @@ union offset_union {
3868 #define __put32_unaligned_check(ins,val,addr) \
3869 do { \
3870 unsigned int err = 0, v = val, a = addr; \
3871+ pax_open_userland(); \
3872 __asm__( FIRST_BYTE_32 \
3873 ARM( "1: "ins" %1, [%2], #1\n" ) \
3874 THUMB( "1: "ins" %1, [%2]\n" ) \
3875@@ -315,6 +322,7 @@ union offset_union {
3876 " .popsection\n" \
3877 : "=r" (err), "=&r" (v), "=&r" (a) \
3878 : "0" (err), "1" (v), "2" (a)); \
3879+ pax_close_userland(); \
3880 if (err) \
3881 goto fault; \
3882 } while (0)
3883diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3884index 5e65ca8..879e7b3 100644
3885--- a/arch/arm/mm/cache-l2x0.c
3886+++ b/arch/arm/mm/cache-l2x0.c
3887@@ -42,7 +42,7 @@ struct l2c_init_data {
3888 void (*fixup)(void __iomem *, u32, struct outer_cache_fns *);
3889 void (*save)(void __iomem *);
3890 struct outer_cache_fns outer_cache;
3891-};
3892+} __do_const;
3893
3894 #define CACHE_LINE_SIZE 32
3895
3896diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3897index 6eb97b3..ac509f6 100644
3898--- a/arch/arm/mm/context.c
3899+++ b/arch/arm/mm/context.c
3900@@ -43,7 +43,7 @@
3901 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3902
3903 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3904-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3905+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3906 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3907
3908 static DEFINE_PER_CPU(atomic64_t, active_asids);
3909@@ -182,7 +182,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3910 {
3911 static u32 cur_idx = 1;
3912 u64 asid = atomic64_read(&mm->context.id);
3913- u64 generation = atomic64_read(&asid_generation);
3914+ u64 generation = atomic64_read_unchecked(&asid_generation);
3915
3916 if (asid != 0 && is_reserved_asid(asid)) {
3917 /*
3918@@ -203,7 +203,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3919 */
3920 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3921 if (asid == NUM_USER_ASIDS) {
3922- generation = atomic64_add_return(ASID_FIRST_VERSION,
3923+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3924 &asid_generation);
3925 flush_context(cpu);
3926 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3927@@ -234,14 +234,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3928 cpu_set_reserved_ttbr0();
3929
3930 asid = atomic64_read(&mm->context.id);
3931- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3932+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3933 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3934 goto switch_mm_fastpath;
3935
3936 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3937 /* Check that our ASID belongs to the current generation. */
3938 asid = atomic64_read(&mm->context.id);
3939- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3940+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3941 asid = new_context(mm, cpu);
3942 atomic64_set(&mm->context.id, asid);
3943 }
3944diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3945index eb8830a..e8ff52e 100644
3946--- a/arch/arm/mm/fault.c
3947+++ b/arch/arm/mm/fault.c
3948@@ -25,6 +25,7 @@
3949 #include <asm/system_misc.h>
3950 #include <asm/system_info.h>
3951 #include <asm/tlbflush.h>
3952+#include <asm/sections.h>
3953
3954 #include "fault.h"
3955
3956@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3957 if (fixup_exception(regs))
3958 return;
3959
3960+#ifdef CONFIG_PAX_MEMORY_UDEREF
3961+ if (addr < TASK_SIZE) {
3962+ if (current->signal->curr_ip)
3963+ 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),
3964+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3965+ else
3966+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3967+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3968+ }
3969+#endif
3970+
3971+#ifdef CONFIG_PAX_KERNEXEC
3972+ if ((fsr & FSR_WRITE) &&
3973+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3974+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3975+ {
3976+ if (current->signal->curr_ip)
3977+ 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),
3978+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3979+ else
3980+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3981+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3982+ }
3983+#endif
3984+
3985 /*
3986 * No handler, we'll have to terminate things with extreme prejudice.
3987 */
3988@@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3989 }
3990 #endif
3991
3992+#ifdef CONFIG_PAX_PAGEEXEC
3993+ if (fsr & FSR_LNX_PF) {
3994+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3995+ do_group_exit(SIGKILL);
3996+ }
3997+#endif
3998+
3999 tsk->thread.address = addr;
4000 tsk->thread.error_code = fsr;
4001 tsk->thread.trap_no = 14;
4002@@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4003 }
4004 #endif /* CONFIG_MMU */
4005
4006+#ifdef CONFIG_PAX_PAGEEXEC
4007+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4008+{
4009+ long i;
4010+
4011+ printk(KERN_ERR "PAX: bytes at PC: ");
4012+ for (i = 0; i < 20; i++) {
4013+ unsigned char c;
4014+ if (get_user(c, (__force unsigned char __user *)pc+i))
4015+ printk(KERN_CONT "?? ");
4016+ else
4017+ printk(KERN_CONT "%02x ", c);
4018+ }
4019+ printk("\n");
4020+
4021+ printk(KERN_ERR "PAX: bytes at SP-4: ");
4022+ for (i = -1; i < 20; i++) {
4023+ unsigned long c;
4024+ if (get_user(c, (__force unsigned long __user *)sp+i))
4025+ printk(KERN_CONT "???????? ");
4026+ else
4027+ printk(KERN_CONT "%08lx ", c);
4028+ }
4029+ printk("\n");
4030+}
4031+#endif
4032+
4033 /*
4034 * First Level Translation Fault Handler
4035 *
4036@@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
4037 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
4038 struct siginfo info;
4039
4040+#ifdef CONFIG_PAX_MEMORY_UDEREF
4041+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
4042+ if (current->signal->curr_ip)
4043+ 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),
4044+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4045+ else
4046+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4047+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4048+ goto die;
4049+ }
4050+#endif
4051+
4052 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4053 return;
4054
4055+die:
4056 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4057 inf->name, fsr, addr);
4058
4059@@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4060 ifsr_info[nr].name = name;
4061 }
4062
4063+asmlinkage int sys_sigreturn(struct pt_regs *regs);
4064+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4065+
4066 asmlinkage void __exception
4067 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4068 {
4069 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4070 struct siginfo info;
4071+ unsigned long pc = instruction_pointer(regs);
4072+
4073+ if (user_mode(regs)) {
4074+ unsigned long sigpage = current->mm->context.sigpage;
4075+
4076+ if (sigpage <= pc && pc < sigpage + 7*4) {
4077+ if (pc < sigpage + 3*4)
4078+ sys_sigreturn(regs);
4079+ else
4080+ sys_rt_sigreturn(regs);
4081+ return;
4082+ }
4083+ if (pc == 0xffff0f60UL) {
4084+ /*
4085+ * PaX: __kuser_cmpxchg64 emulation
4086+ */
4087+ // TODO
4088+ //regs->ARM_pc = regs->ARM_lr;
4089+ //return;
4090+ }
4091+ if (pc == 0xffff0fa0UL) {
4092+ /*
4093+ * PaX: __kuser_memory_barrier emulation
4094+ */
4095+ // dmb(); implied by the exception
4096+ regs->ARM_pc = regs->ARM_lr;
4097+ return;
4098+ }
4099+ if (pc == 0xffff0fc0UL) {
4100+ /*
4101+ * PaX: __kuser_cmpxchg emulation
4102+ */
4103+ // TODO
4104+ //long new;
4105+ //int op;
4106+
4107+ //op = FUTEX_OP_SET << 28;
4108+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4109+ //regs->ARM_r0 = old != new;
4110+ //regs->ARM_pc = regs->ARM_lr;
4111+ //return;
4112+ }
4113+ if (pc == 0xffff0fe0UL) {
4114+ /*
4115+ * PaX: __kuser_get_tls emulation
4116+ */
4117+ regs->ARM_r0 = current_thread_info()->tp_value[0];
4118+ regs->ARM_pc = regs->ARM_lr;
4119+ return;
4120+ }
4121+ }
4122+
4123+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4124+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4125+ if (current->signal->curr_ip)
4126+ 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),
4127+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4128+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4129+ else
4130+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4131+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4132+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4133+ goto die;
4134+ }
4135+#endif
4136+
4137+#ifdef CONFIG_PAX_REFCOUNT
4138+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4139+#ifdef CONFIG_THUMB2_KERNEL
4140+ unsigned short bkpt;
4141+
4142+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4143+#else
4144+ unsigned int bkpt;
4145+
4146+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4147+#endif
4148+ current->thread.error_code = ifsr;
4149+ current->thread.trap_no = 0;
4150+ pax_report_refcount_overflow(regs);
4151+ fixup_exception(regs);
4152+ return;
4153+ }
4154+ }
4155+#endif
4156
4157 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4158 return;
4159
4160+die:
4161 printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4162 inf->name, ifsr, addr);
4163
4164diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4165index cf08bdf..772656c 100644
4166--- a/arch/arm/mm/fault.h
4167+++ b/arch/arm/mm/fault.h
4168@@ -3,6 +3,7 @@
4169
4170 /*
4171 * Fault status register encodings. We steal bit 31 for our own purposes.
4172+ * Set when the FSR value is from an instruction fault.
4173 */
4174 #define FSR_LNX_PF (1 << 31)
4175 #define FSR_WRITE (1 << 11)
4176@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4177 }
4178 #endif
4179
4180+/* valid for LPAE and !LPAE */
4181+static inline int is_xn_fault(unsigned int fsr)
4182+{
4183+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4184+}
4185+
4186+static inline int is_domain_fault(unsigned int fsr)
4187+{
4188+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4189+}
4190+
4191 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4192 unsigned long search_exception_table(unsigned long addr);
4193
4194diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4195index 9481f85..6dae261 100644
4196--- a/arch/arm/mm/init.c
4197+++ b/arch/arm/mm/init.c
4198@@ -31,6 +31,8 @@
4199 #include <asm/setup.h>
4200 #include <asm/tlb.h>
4201 #include <asm/fixmap.h>
4202+#include <asm/system_info.h>
4203+#include <asm/cp15.h>
4204
4205 #include <asm/mach/arch.h>
4206 #include <asm/mach/map.h>
4207@@ -619,7 +621,46 @@ void free_initmem(void)
4208 {
4209 #ifdef CONFIG_HAVE_TCM
4210 extern char __tcm_start, __tcm_end;
4211+#endif
4212
4213+#ifdef CONFIG_PAX_KERNEXEC
4214+ unsigned long addr;
4215+ pgd_t *pgd;
4216+ pud_t *pud;
4217+ pmd_t *pmd;
4218+ int cpu_arch = cpu_architecture();
4219+ unsigned int cr = get_cr();
4220+
4221+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4222+ /* make pages tables, etc before .text NX */
4223+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4224+ pgd = pgd_offset_k(addr);
4225+ pud = pud_offset(pgd, addr);
4226+ pmd = pmd_offset(pud, addr);
4227+ __section_update(pmd, addr, PMD_SECT_XN);
4228+ }
4229+ /* make init NX */
4230+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4231+ pgd = pgd_offset_k(addr);
4232+ pud = pud_offset(pgd, addr);
4233+ pmd = pmd_offset(pud, addr);
4234+ __section_update(pmd, addr, PMD_SECT_XN);
4235+ }
4236+ /* make kernel code/rodata RX */
4237+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4238+ pgd = pgd_offset_k(addr);
4239+ pud = pud_offset(pgd, addr);
4240+ pmd = pmd_offset(pud, addr);
4241+#ifdef CONFIG_ARM_LPAE
4242+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4243+#else
4244+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4245+#endif
4246+ }
4247+ }
4248+#endif
4249+
4250+#ifdef CONFIG_HAVE_TCM
4251 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4252 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4253 #endif
4254diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4255index d1e5ad7..84dcbf2 100644
4256--- a/arch/arm/mm/ioremap.c
4257+++ b/arch/arm/mm/ioremap.c
4258@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4259 unsigned int mtype;
4260
4261 if (cached)
4262- mtype = MT_MEMORY_RWX;
4263+ mtype = MT_MEMORY_RX;
4264 else
4265- mtype = MT_MEMORY_RWX_NONCACHED;
4266+ mtype = MT_MEMORY_RX_NONCACHED;
4267
4268 return __arm_ioremap_caller(phys_addr, size, mtype,
4269 __builtin_return_address(0));
4270diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4271index 5e85ed3..b10a7ed 100644
4272--- a/arch/arm/mm/mmap.c
4273+++ b/arch/arm/mm/mmap.c
4274@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4275 struct vm_area_struct *vma;
4276 int do_align = 0;
4277 int aliasing = cache_is_vipt_aliasing();
4278+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4279 struct vm_unmapped_area_info info;
4280
4281 /*
4282@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4283 if (len > TASK_SIZE)
4284 return -ENOMEM;
4285
4286+#ifdef CONFIG_PAX_RANDMMAP
4287+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4288+#endif
4289+
4290 if (addr) {
4291 if (do_align)
4292 addr = COLOUR_ALIGN(addr, pgoff);
4293@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4294 addr = PAGE_ALIGN(addr);
4295
4296 vma = find_vma(mm, addr);
4297- if (TASK_SIZE - len >= addr &&
4298- (!vma || addr + len <= vma->vm_start))
4299+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4300 return addr;
4301 }
4302
4303@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4304 info.high_limit = TASK_SIZE;
4305 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4306 info.align_offset = pgoff << PAGE_SHIFT;
4307+ info.threadstack_offset = offset;
4308 return vm_unmapped_area(&info);
4309 }
4310
4311@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4312 unsigned long addr = addr0;
4313 int do_align = 0;
4314 int aliasing = cache_is_vipt_aliasing();
4315+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4316 struct vm_unmapped_area_info info;
4317
4318 /*
4319@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4320 return addr;
4321 }
4322
4323+#ifdef CONFIG_PAX_RANDMMAP
4324+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4325+#endif
4326+
4327 /* requesting a specific address */
4328 if (addr) {
4329 if (do_align)
4330@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4331 else
4332 addr = PAGE_ALIGN(addr);
4333 vma = find_vma(mm, addr);
4334- if (TASK_SIZE - len >= addr &&
4335- (!vma || addr + len <= vma->vm_start))
4336+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4337 return addr;
4338 }
4339
4340@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4341 info.high_limit = mm->mmap_base;
4342 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4343 info.align_offset = pgoff << PAGE_SHIFT;
4344+ info.threadstack_offset = offset;
4345 addr = vm_unmapped_area(&info);
4346
4347 /*
4348@@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4349 {
4350 unsigned long random_factor = 0UL;
4351
4352+#ifdef CONFIG_PAX_RANDMMAP
4353+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4354+#endif
4355+
4356 /* 8 bits of randomness in 20 address space bits */
4357 if ((current->flags & PF_RANDOMIZE) &&
4358 !(current->personality & ADDR_NO_RANDOMIZE))
4359@@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4360
4361 if (mmap_is_legacy()) {
4362 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4363+
4364+#ifdef CONFIG_PAX_RANDMMAP
4365+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4366+ mm->mmap_base += mm->delta_mmap;
4367+#endif
4368+
4369 mm->get_unmapped_area = arch_get_unmapped_area;
4370 } else {
4371 mm->mmap_base = mmap_base(random_factor);
4372+
4373+#ifdef CONFIG_PAX_RANDMMAP
4374+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4375+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4376+#endif
4377+
4378 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4379 }
4380 }
4381diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4382index 9f98cec..115fcb6 100644
4383--- a/arch/arm/mm/mmu.c
4384+++ b/arch/arm/mm/mmu.c
4385@@ -40,6 +40,22 @@
4386 #include "mm.h"
4387 #include "tcm.h"
4388
4389+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4390+void modify_domain(unsigned int dom, unsigned int type)
4391+{
4392+ struct thread_info *thread = current_thread_info();
4393+ unsigned int domain = thread->cpu_domain;
4394+ /*
4395+ * DOMAIN_MANAGER might be defined to some other value,
4396+ * use the arch-defined constant
4397+ */
4398+ domain &= ~domain_val(dom, 3);
4399+ thread->cpu_domain = domain | domain_val(dom, type);
4400+ set_domain(thread->cpu_domain);
4401+}
4402+EXPORT_SYMBOL(modify_domain);
4403+#endif
4404+
4405 /*
4406 * empty_zero_page is a special page that is used for
4407 * zero-initialized data and COW.
4408@@ -239,7 +255,15 @@ __setup("noalign", noalign_setup);
4409 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4410 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4411
4412-static struct mem_type mem_types[] = {
4413+#ifdef CONFIG_PAX_KERNEXEC
4414+#define L_PTE_KERNEXEC L_PTE_RDONLY
4415+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4416+#else
4417+#define L_PTE_KERNEXEC L_PTE_DIRTY
4418+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4419+#endif
4420+
4421+static struct mem_type mem_types[] __read_only = {
4422 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4423 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4424 L_PTE_SHARED,
4425@@ -268,19 +292,19 @@ static struct mem_type mem_types[] = {
4426 .prot_sect = PROT_SECT_DEVICE,
4427 .domain = DOMAIN_IO,
4428 },
4429- [MT_UNCACHED] = {
4430+ [MT_UNCACHED_RW] = {
4431 .prot_pte = PROT_PTE_DEVICE,
4432 .prot_l1 = PMD_TYPE_TABLE,
4433 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4434 .domain = DOMAIN_IO,
4435 },
4436- [MT_CACHECLEAN] = {
4437- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4438+ [MT_CACHECLEAN_RO] = {
4439+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4440 .domain = DOMAIN_KERNEL,
4441 },
4442 #ifndef CONFIG_ARM_LPAE
4443- [MT_MINICLEAN] = {
4444- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4445+ [MT_MINICLEAN_RO] = {
4446+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4447 .domain = DOMAIN_KERNEL,
4448 },
4449 #endif
4450@@ -288,15 +312,15 @@ static struct mem_type mem_types[] = {
4451 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4452 L_PTE_RDONLY,
4453 .prot_l1 = PMD_TYPE_TABLE,
4454- .domain = DOMAIN_USER,
4455+ .domain = DOMAIN_VECTORS,
4456 },
4457 [MT_HIGH_VECTORS] = {
4458 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4459 L_PTE_USER | L_PTE_RDONLY,
4460 .prot_l1 = PMD_TYPE_TABLE,
4461- .domain = DOMAIN_USER,
4462+ .domain = DOMAIN_VECTORS,
4463 },
4464- [MT_MEMORY_RWX] = {
4465+ [__MT_MEMORY_RWX] = {
4466 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4467 .prot_l1 = PMD_TYPE_TABLE,
4468 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4469@@ -309,17 +333,30 @@ static struct mem_type mem_types[] = {
4470 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4471 .domain = DOMAIN_KERNEL,
4472 },
4473- [MT_ROM] = {
4474- .prot_sect = PMD_TYPE_SECT,
4475+ [MT_MEMORY_RX] = {
4476+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4477+ .prot_l1 = PMD_TYPE_TABLE,
4478+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4479+ .domain = DOMAIN_KERNEL,
4480+ },
4481+ [MT_ROM_RX] = {
4482+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4483 .domain = DOMAIN_KERNEL,
4484 },
4485- [MT_MEMORY_RWX_NONCACHED] = {
4486+ [MT_MEMORY_RW_NONCACHED] = {
4487 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4488 L_PTE_MT_BUFFERABLE,
4489 .prot_l1 = PMD_TYPE_TABLE,
4490 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4491 .domain = DOMAIN_KERNEL,
4492 },
4493+ [MT_MEMORY_RX_NONCACHED] = {
4494+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4495+ L_PTE_MT_BUFFERABLE,
4496+ .prot_l1 = PMD_TYPE_TABLE,
4497+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4498+ .domain = DOMAIN_KERNEL,
4499+ },
4500 [MT_MEMORY_RW_DTCM] = {
4501 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4502 L_PTE_XN,
4503@@ -327,9 +364,10 @@ static struct mem_type mem_types[] = {
4504 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4505 .domain = DOMAIN_KERNEL,
4506 },
4507- [MT_MEMORY_RWX_ITCM] = {
4508- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4509+ [MT_MEMORY_RX_ITCM] = {
4510+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4511 .prot_l1 = PMD_TYPE_TABLE,
4512+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4513 .domain = DOMAIN_KERNEL,
4514 },
4515 [MT_MEMORY_RW_SO] = {
4516@@ -547,9 +585,14 @@ static void __init build_mem_type_table(void)
4517 * Mark cache clean areas and XIP ROM read only
4518 * from SVC mode and no access from userspace.
4519 */
4520- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4521- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4522- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4523+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4524+#ifdef CONFIG_PAX_KERNEXEC
4525+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4526+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4527+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4528+#endif
4529+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4530+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4531 #endif
4532
4533 /*
4534@@ -566,13 +609,17 @@ static void __init build_mem_type_table(void)
4535 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4536 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4537 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4538- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4539- mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4540+ mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4541+ mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4542 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4543 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4544+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4545+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4546 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4547- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4548- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4549+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4550+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4551+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4552+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4553 }
4554 }
4555
4556@@ -583,15 +630,20 @@ static void __init build_mem_type_table(void)
4557 if (cpu_arch >= CPU_ARCH_ARMv6) {
4558 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4559 /* Non-cacheable Normal is XCB = 001 */
4560- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4561+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4562+ PMD_SECT_BUFFERED;
4563+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4564 PMD_SECT_BUFFERED;
4565 } else {
4566 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4567- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4568+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4569+ PMD_SECT_TEX(1);
4570+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4571 PMD_SECT_TEX(1);
4572 }
4573 } else {
4574- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4575+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4576+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4577 }
4578
4579 #ifdef CONFIG_ARM_LPAE
4580@@ -607,6 +659,8 @@ static void __init build_mem_type_table(void)
4581 vecs_pgprot |= PTE_EXT_AF;
4582 #endif
4583
4584+ user_pgprot |= __supported_pte_mask;
4585+
4586 for (i = 0; i < 16; i++) {
4587 pteval_t v = pgprot_val(protection_map[i]);
4588 protection_map[i] = __pgprot(v | user_pgprot);
4589@@ -624,21 +678,24 @@ static void __init build_mem_type_table(void)
4590
4591 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4592 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4593- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4594- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4595+ mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4596+ mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4597 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4598 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4599+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4600+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4601 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4602- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4603- mem_types[MT_ROM].prot_sect |= cp->pmd;
4604+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4605+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4606+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4607
4608 switch (cp->pmd) {
4609 case PMD_SECT_WT:
4610- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4611+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4612 break;
4613 case PMD_SECT_WB:
4614 case PMD_SECT_WBWA:
4615- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4616+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4617 break;
4618 }
4619 pr_info("Memory policy: %sData cache %s\n",
4620@@ -856,7 +913,7 @@ static void __init create_mapping(struct map_desc *md)
4621 return;
4622 }
4623
4624- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4625+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4626 md->virtual >= PAGE_OFFSET &&
4627 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4628 printk(KERN_WARNING "BUG: mapping for 0x%08llx"
4629@@ -1224,18 +1281,15 @@ void __init arm_mm_memblock_reserve(void)
4630 * called function. This means you can't use any function or debugging
4631 * method which may touch any device, otherwise the kernel _will_ crash.
4632 */
4633+
4634+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4635+
4636 static void __init devicemaps_init(const struct machine_desc *mdesc)
4637 {
4638 struct map_desc map;
4639 unsigned long addr;
4640- void *vectors;
4641
4642- /*
4643- * Allocate the vector page early.
4644- */
4645- vectors = early_alloc(PAGE_SIZE * 2);
4646-
4647- early_trap_init(vectors);
4648+ early_trap_init(&vectors);
4649
4650 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4651 pmd_clear(pmd_off_k(addr));
4652@@ -1248,7 +1302,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4653 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4654 map.virtual = MODULES_VADDR;
4655 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4656- map.type = MT_ROM;
4657+ map.type = MT_ROM_RX;
4658 create_mapping(&map);
4659 #endif
4660
4661@@ -1259,14 +1313,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4662 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4663 map.virtual = FLUSH_BASE;
4664 map.length = SZ_1M;
4665- map.type = MT_CACHECLEAN;
4666+ map.type = MT_CACHECLEAN_RO;
4667 create_mapping(&map);
4668 #endif
4669 #ifdef FLUSH_BASE_MINICACHE
4670 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4671 map.virtual = FLUSH_BASE_MINICACHE;
4672 map.length = SZ_1M;
4673- map.type = MT_MINICLEAN;
4674+ map.type = MT_MINICLEAN_RO;
4675 create_mapping(&map);
4676 #endif
4677
4678@@ -1275,7 +1329,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4679 * location (0xffff0000). If we aren't using high-vectors, also
4680 * create a mapping at the low-vectors virtual address.
4681 */
4682- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4683+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4684 map.virtual = 0xffff0000;
4685 map.length = PAGE_SIZE;
4686 #ifdef CONFIG_KUSER_HELPERS
4687@@ -1335,8 +1389,10 @@ static void __init kmap_init(void)
4688 static void __init map_lowmem(void)
4689 {
4690 struct memblock_region *reg;
4691+#ifndef CONFIG_PAX_KERNEXEC
4692 unsigned long kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4693 unsigned long kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4694+#endif
4695
4696 /* Map all the lowmem memory banks. */
4697 for_each_memblock(memory, reg) {
4698@@ -1349,11 +1405,48 @@ static void __init map_lowmem(void)
4699 if (start >= end)
4700 break;
4701
4702+#ifdef CONFIG_PAX_KERNEXEC
4703+ map.pfn = __phys_to_pfn(start);
4704+ map.virtual = __phys_to_virt(start);
4705+ map.length = end - start;
4706+
4707+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4708+ struct map_desc kernel;
4709+ struct map_desc initmap;
4710+
4711+ /* when freeing initmem we will make this RW */
4712+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4713+ initmap.virtual = (unsigned long)__init_begin;
4714+ initmap.length = _sdata - __init_begin;
4715+ initmap.type = __MT_MEMORY_RWX;
4716+ create_mapping(&initmap);
4717+
4718+ /* when freeing initmem we will make this RX */
4719+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4720+ kernel.virtual = (unsigned long)_stext;
4721+ kernel.length = __init_begin - _stext;
4722+ kernel.type = __MT_MEMORY_RWX;
4723+ create_mapping(&kernel);
4724+
4725+ if (map.virtual < (unsigned long)_stext) {
4726+ map.length = (unsigned long)_stext - map.virtual;
4727+ map.type = __MT_MEMORY_RWX;
4728+ create_mapping(&map);
4729+ }
4730+
4731+ map.pfn = __phys_to_pfn(__pa(_sdata));
4732+ map.virtual = (unsigned long)_sdata;
4733+ map.length = end - __pa(_sdata);
4734+ }
4735+
4736+ map.type = MT_MEMORY_RW;
4737+ create_mapping(&map);
4738+#else
4739 if (end < kernel_x_start || start >= kernel_x_end) {
4740 map.pfn = __phys_to_pfn(start);
4741 map.virtual = __phys_to_virt(start);
4742 map.length = end - start;
4743- map.type = MT_MEMORY_RWX;
4744+ map.type = __MT_MEMORY_RWX;
4745
4746 create_mapping(&map);
4747 } else {
4748@@ -1370,7 +1463,7 @@ static void __init map_lowmem(void)
4749 map.pfn = __phys_to_pfn(kernel_x_start);
4750 map.virtual = __phys_to_virt(kernel_x_start);
4751 map.length = kernel_x_end - kernel_x_start;
4752- map.type = MT_MEMORY_RWX;
4753+ map.type = __MT_MEMORY_RWX;
4754
4755 create_mapping(&map);
4756
4757@@ -1383,6 +1476,7 @@ static void __init map_lowmem(void)
4758 create_mapping(&map);
4759 }
4760 }
4761+#endif
4762 }
4763 }
4764
4765diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4766index e1268f9..a9755a7 100644
4767--- a/arch/arm/net/bpf_jit_32.c
4768+++ b/arch/arm/net/bpf_jit_32.c
4769@@ -20,6 +20,7 @@
4770 #include <asm/cacheflush.h>
4771 #include <asm/hwcap.h>
4772 #include <asm/opcodes.h>
4773+#include <asm/pgtable.h>
4774
4775 #include "bpf_jit_32.h"
4776
4777@@ -71,7 +72,11 @@ struct jit_ctx {
4778 #endif
4779 };
4780
4781+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4782+int bpf_jit_enable __read_only;
4783+#else
4784 int bpf_jit_enable __read_mostly;
4785+#endif
4786
4787 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4788 {
4789@@ -178,8 +183,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4790 {
4791 u32 *ptr;
4792 /* We are guaranteed to have aligned memory. */
4793+ pax_open_kernel();
4794 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4795 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4796+ pax_close_kernel();
4797 }
4798
4799 static void build_prologue(struct jit_ctx *ctx)
4800diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4801index 5b217f4..c23f40e 100644
4802--- a/arch/arm/plat-iop/setup.c
4803+++ b/arch/arm/plat-iop/setup.c
4804@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4805 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4806 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4807 .length = IOP3XX_PERIPHERAL_SIZE,
4808- .type = MT_UNCACHED,
4809+ .type = MT_UNCACHED_RW,
4810 },
4811 };
4812
4813diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4814index a5bc92d..0bb4730 100644
4815--- a/arch/arm/plat-omap/sram.c
4816+++ b/arch/arm/plat-omap/sram.c
4817@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4818 * Looks like we need to preserve some bootloader code at the
4819 * beginning of SRAM for jumping to flash for reboot to work...
4820 */
4821+ pax_open_kernel();
4822 memset_io(omap_sram_base + omap_sram_skip, 0,
4823 omap_sram_size - omap_sram_skip);
4824+ pax_close_kernel();
4825 }
4826diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
4827index ce6d763..cfea917 100644
4828--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
4829+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
4830@@ -47,7 +47,7 @@ struct samsung_dma_ops {
4831 int (*started)(unsigned ch);
4832 int (*flush)(unsigned ch);
4833 int (*stop)(unsigned ch);
4834-};
4835+} __no_const;
4836
4837 extern void *samsung_dmadev_get_ops(void);
4838 extern void *s3c_dma_get_ops(void);
4839diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4840index 6389d60..b5d3bdd 100644
4841--- a/arch/arm64/include/asm/barrier.h
4842+++ b/arch/arm64/include/asm/barrier.h
4843@@ -41,7 +41,7 @@
4844 do { \
4845 compiletime_assert_atomic_type(*p); \
4846 barrier(); \
4847- ACCESS_ONCE(*p) = (v); \
4848+ ACCESS_ONCE_RW(*p) = (v); \
4849 } while (0)
4850
4851 #define smp_load_acquire(p) \
4852diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4853index 3bf8f4e..5dd5491 100644
4854--- a/arch/arm64/include/asm/uaccess.h
4855+++ b/arch/arm64/include/asm/uaccess.h
4856@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4857 flag; \
4858 })
4859
4860+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4861 #define access_ok(type, addr, size) __range_ok(addr, size)
4862 #define user_addr_max get_fs
4863
4864diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4865index c3a58a1..78fbf54 100644
4866--- a/arch/avr32/include/asm/cache.h
4867+++ b/arch/avr32/include/asm/cache.h
4868@@ -1,8 +1,10 @@
4869 #ifndef __ASM_AVR32_CACHE_H
4870 #define __ASM_AVR32_CACHE_H
4871
4872+#include <linux/const.h>
4873+
4874 #define L1_CACHE_SHIFT 5
4875-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4876+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4877
4878 /*
4879 * Memory returned by kmalloc() may be used for DMA, so we must make
4880diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4881index d232888..87c8df1 100644
4882--- a/arch/avr32/include/asm/elf.h
4883+++ b/arch/avr32/include/asm/elf.h
4884@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4885 the loader. We need to make sure that it is out of the way of the program
4886 that it will "exec", and that there is sufficient room for the brk. */
4887
4888-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4889+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4890
4891+#ifdef CONFIG_PAX_ASLR
4892+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4893+
4894+#define PAX_DELTA_MMAP_LEN 15
4895+#define PAX_DELTA_STACK_LEN 15
4896+#endif
4897
4898 /* This yields a mask that user programs can use to figure out what
4899 instruction set this CPU supports. This could be done in user space,
4900diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4901index 479330b..53717a8 100644
4902--- a/arch/avr32/include/asm/kmap_types.h
4903+++ b/arch/avr32/include/asm/kmap_types.h
4904@@ -2,9 +2,9 @@
4905 #define __ASM_AVR32_KMAP_TYPES_H
4906
4907 #ifdef CONFIG_DEBUG_HIGHMEM
4908-# define KM_TYPE_NR 29
4909+# define KM_TYPE_NR 30
4910 #else
4911-# define KM_TYPE_NR 14
4912+# define KM_TYPE_NR 15
4913 #endif
4914
4915 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4916diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4917index 0eca933..eb78c7b 100644
4918--- a/arch/avr32/mm/fault.c
4919+++ b/arch/avr32/mm/fault.c
4920@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4921
4922 int exception_trace = 1;
4923
4924+#ifdef CONFIG_PAX_PAGEEXEC
4925+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4926+{
4927+ unsigned long i;
4928+
4929+ printk(KERN_ERR "PAX: bytes at PC: ");
4930+ for (i = 0; i < 20; i++) {
4931+ unsigned char c;
4932+ if (get_user(c, (unsigned char *)pc+i))
4933+ printk(KERN_CONT "???????? ");
4934+ else
4935+ printk(KERN_CONT "%02x ", c);
4936+ }
4937+ printk("\n");
4938+}
4939+#endif
4940+
4941 /*
4942 * This routine handles page faults. It determines the address and the
4943 * problem, and then passes it off to one of the appropriate routines.
4944@@ -176,6 +193,16 @@ bad_area:
4945 up_read(&mm->mmap_sem);
4946
4947 if (user_mode(regs)) {
4948+
4949+#ifdef CONFIG_PAX_PAGEEXEC
4950+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4951+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4952+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4953+ do_group_exit(SIGKILL);
4954+ }
4955+ }
4956+#endif
4957+
4958 if (exception_trace && printk_ratelimit())
4959 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4960 "sp %08lx ecr %lu\n",
4961diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4962index 568885a..f8008df 100644
4963--- a/arch/blackfin/include/asm/cache.h
4964+++ b/arch/blackfin/include/asm/cache.h
4965@@ -7,6 +7,7 @@
4966 #ifndef __ARCH_BLACKFIN_CACHE_H
4967 #define __ARCH_BLACKFIN_CACHE_H
4968
4969+#include <linux/const.h>
4970 #include <linux/linkage.h> /* for asmlinkage */
4971
4972 /*
4973@@ -14,7 +15,7 @@
4974 * Blackfin loads 32 bytes for cache
4975 */
4976 #define L1_CACHE_SHIFT 5
4977-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4978+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4979 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4980
4981 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4982diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4983index aea2718..3639a60 100644
4984--- a/arch/cris/include/arch-v10/arch/cache.h
4985+++ b/arch/cris/include/arch-v10/arch/cache.h
4986@@ -1,8 +1,9 @@
4987 #ifndef _ASM_ARCH_CACHE_H
4988 #define _ASM_ARCH_CACHE_H
4989
4990+#include <linux/const.h>
4991 /* Etrax 100LX have 32-byte cache-lines. */
4992-#define L1_CACHE_BYTES 32
4993 #define L1_CACHE_SHIFT 5
4994+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4995
4996 #endif /* _ASM_ARCH_CACHE_H */
4997diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
4998index 7caf25d..ee65ac5 100644
4999--- a/arch/cris/include/arch-v32/arch/cache.h
5000+++ b/arch/cris/include/arch-v32/arch/cache.h
5001@@ -1,11 +1,12 @@
5002 #ifndef _ASM_CRIS_ARCH_CACHE_H
5003 #define _ASM_CRIS_ARCH_CACHE_H
5004
5005+#include <linux/const.h>
5006 #include <arch/hwregs/dma.h>
5007
5008 /* A cache-line is 32 bytes. */
5009-#define L1_CACHE_BYTES 32
5010 #define L1_CACHE_SHIFT 5
5011+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5012
5013 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5014
5015diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5016index 102190a..5334cea 100644
5017--- a/arch/frv/include/asm/atomic.h
5018+++ b/arch/frv/include/asm/atomic.h
5019@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5020 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5021 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5022
5023+#define atomic64_read_unchecked(v) atomic64_read(v)
5024+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5025+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5026+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5027+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5028+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5029+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5030+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5031+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5032+
5033 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5034 {
5035 int c, old;
5036diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5037index 2797163..c2a401df9 100644
5038--- a/arch/frv/include/asm/cache.h
5039+++ b/arch/frv/include/asm/cache.h
5040@@ -12,10 +12,11 @@
5041 #ifndef __ASM_CACHE_H
5042 #define __ASM_CACHE_H
5043
5044+#include <linux/const.h>
5045
5046 /* bytes per L1 cache line */
5047 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5048-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5049+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5050
5051 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5052 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5053diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5054index 43901f2..0d8b865 100644
5055--- a/arch/frv/include/asm/kmap_types.h
5056+++ b/arch/frv/include/asm/kmap_types.h
5057@@ -2,6 +2,6 @@
5058 #ifndef _ASM_KMAP_TYPES_H
5059 #define _ASM_KMAP_TYPES_H
5060
5061-#define KM_TYPE_NR 17
5062+#define KM_TYPE_NR 18
5063
5064 #endif
5065diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5066index 836f147..4cf23f5 100644
5067--- a/arch/frv/mm/elf-fdpic.c
5068+++ b/arch/frv/mm/elf-fdpic.c
5069@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5070 {
5071 struct vm_area_struct *vma;
5072 struct vm_unmapped_area_info info;
5073+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5074
5075 if (len > TASK_SIZE)
5076 return -ENOMEM;
5077@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5078 if (addr) {
5079 addr = PAGE_ALIGN(addr);
5080 vma = find_vma(current->mm, addr);
5081- if (TASK_SIZE - len >= addr &&
5082- (!vma || addr + len <= vma->vm_start))
5083+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5084 goto success;
5085 }
5086
5087@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5088 info.high_limit = (current->mm->start_stack - 0x00200000);
5089 info.align_mask = 0;
5090 info.align_offset = 0;
5091+ info.threadstack_offset = offset;
5092 addr = vm_unmapped_area(&info);
5093 if (!(addr & ~PAGE_MASK))
5094 goto success;
5095diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5096index 2635117..fa223cb 100644
5097--- a/arch/hexagon/include/asm/cache.h
5098+++ b/arch/hexagon/include/asm/cache.h
5099@@ -21,9 +21,11 @@
5100 #ifndef __ASM_CACHE_H
5101 #define __ASM_CACHE_H
5102
5103+#include <linux/const.h>
5104+
5105 /* Bytes per L1 cache line */
5106-#define L1_CACHE_SHIFT (5)
5107-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5108+#define L1_CACHE_SHIFT 5
5109+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5110
5111 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
5112 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
5113diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5114index c84c88b..2a6e1ba 100644
5115--- a/arch/ia64/Kconfig
5116+++ b/arch/ia64/Kconfig
5117@@ -549,6 +549,7 @@ source "drivers/sn/Kconfig"
5118 config KEXEC
5119 bool "kexec system call"
5120 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5121+ depends on !GRKERNSEC_KMEM
5122 help
5123 kexec is a system call that implements the ability to shutdown your
5124 current kernel, and to start another kernel. It is like a reboot
5125diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5126index 5441b14..039a446 100644
5127--- a/arch/ia64/Makefile
5128+++ b/arch/ia64/Makefile
5129@@ -99,5 +99,6 @@ endef
5130 archprepare: make_nr_irqs_h FORCE
5131 PHONY += make_nr_irqs_h FORCE
5132
5133+make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5134 make_nr_irqs_h: FORCE
5135 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5136diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5137index 0bf0350..2ad1957 100644
5138--- a/arch/ia64/include/asm/atomic.h
5139+++ b/arch/ia64/include/asm/atomic.h
5140@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5141 #define atomic64_inc(v) atomic64_add(1, (v))
5142 #define atomic64_dec(v) atomic64_sub(1, (v))
5143
5144+#define atomic64_read_unchecked(v) atomic64_read(v)
5145+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5146+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5147+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5148+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5149+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5150+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5151+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5152+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5153+
5154 #endif /* _ASM_IA64_ATOMIC_H */
5155diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5156index a48957c..e097b56 100644
5157--- a/arch/ia64/include/asm/barrier.h
5158+++ b/arch/ia64/include/asm/barrier.h
5159@@ -67,7 +67,7 @@
5160 do { \
5161 compiletime_assert_atomic_type(*p); \
5162 barrier(); \
5163- ACCESS_ONCE(*p) = (v); \
5164+ ACCESS_ONCE_RW(*p) = (v); \
5165 } while (0)
5166
5167 #define smp_load_acquire(p) \
5168diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5169index 988254a..e1ee885 100644
5170--- a/arch/ia64/include/asm/cache.h
5171+++ b/arch/ia64/include/asm/cache.h
5172@@ -1,6 +1,7 @@
5173 #ifndef _ASM_IA64_CACHE_H
5174 #define _ASM_IA64_CACHE_H
5175
5176+#include <linux/const.h>
5177
5178 /*
5179 * Copyright (C) 1998-2000 Hewlett-Packard Co
5180@@ -9,7 +10,7 @@
5181
5182 /* Bytes per L1 (data) cache line. */
5183 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5184-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5185+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5186
5187 #ifdef CONFIG_SMP
5188 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5189diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5190index 5a83c5c..4d7f553 100644
5191--- a/arch/ia64/include/asm/elf.h
5192+++ b/arch/ia64/include/asm/elf.h
5193@@ -42,6 +42,13 @@
5194 */
5195 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5196
5197+#ifdef CONFIG_PAX_ASLR
5198+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5199+
5200+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5201+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5202+#endif
5203+
5204 #define PT_IA_64_UNWIND 0x70000001
5205
5206 /* IA-64 relocations: */
5207diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5208index 5767cdf..7462574 100644
5209--- a/arch/ia64/include/asm/pgalloc.h
5210+++ b/arch/ia64/include/asm/pgalloc.h
5211@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5212 pgd_val(*pgd_entry) = __pa(pud);
5213 }
5214
5215+static inline void
5216+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5217+{
5218+ pgd_populate(mm, pgd_entry, pud);
5219+}
5220+
5221 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5222 {
5223 return quicklist_alloc(0, GFP_KERNEL, NULL);
5224@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5225 pud_val(*pud_entry) = __pa(pmd);
5226 }
5227
5228+static inline void
5229+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5230+{
5231+ pud_populate(mm, pud_entry, pmd);
5232+}
5233+
5234 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5235 {
5236 return quicklist_alloc(0, GFP_KERNEL, NULL);
5237diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5238index 7935115..c0eca6a 100644
5239--- a/arch/ia64/include/asm/pgtable.h
5240+++ b/arch/ia64/include/asm/pgtable.h
5241@@ -12,7 +12,7 @@
5242 * David Mosberger-Tang <davidm@hpl.hp.com>
5243 */
5244
5245-
5246+#include <linux/const.h>
5247 #include <asm/mman.h>
5248 #include <asm/page.h>
5249 #include <asm/processor.h>
5250@@ -142,6 +142,17 @@
5251 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5252 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5253 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5254+
5255+#ifdef CONFIG_PAX_PAGEEXEC
5256+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5257+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5258+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5259+#else
5260+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5261+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5262+# define PAGE_COPY_NOEXEC PAGE_COPY
5263+#endif
5264+
5265 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5266 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5267 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5268diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5269index 45698cd..e8e2dbc 100644
5270--- a/arch/ia64/include/asm/spinlock.h
5271+++ b/arch/ia64/include/asm/spinlock.h
5272@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5273 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5274
5275 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5276- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5277+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5278 }
5279
5280 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5281diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5282index 449c8c0..3d4b1e9 100644
5283--- a/arch/ia64/include/asm/uaccess.h
5284+++ b/arch/ia64/include/asm/uaccess.h
5285@@ -70,6 +70,7 @@
5286 && ((segment).seg == KERNEL_DS.seg \
5287 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5288 })
5289+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5290 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5291
5292 /*
5293@@ -240,12 +241,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5294 static inline unsigned long
5295 __copy_to_user (void __user *to, const void *from, unsigned long count)
5296 {
5297+ if (count > INT_MAX)
5298+ return count;
5299+
5300+ if (!__builtin_constant_p(count))
5301+ check_object_size(from, count, true);
5302+
5303 return __copy_user(to, (__force void __user *) from, count);
5304 }
5305
5306 static inline unsigned long
5307 __copy_from_user (void *to, const void __user *from, unsigned long count)
5308 {
5309+ if (count > INT_MAX)
5310+ return count;
5311+
5312+ if (!__builtin_constant_p(count))
5313+ check_object_size(to, count, false);
5314+
5315 return __copy_user((__force void __user *) to, from, count);
5316 }
5317
5318@@ -255,10 +268,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5319 ({ \
5320 void __user *__cu_to = (to); \
5321 const void *__cu_from = (from); \
5322- long __cu_len = (n); \
5323+ unsigned long __cu_len = (n); \
5324 \
5325- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5326+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5327+ if (!__builtin_constant_p(n)) \
5328+ check_object_size(__cu_from, __cu_len, true); \
5329 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5330+ } \
5331 __cu_len; \
5332 })
5333
5334@@ -266,11 +282,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5335 ({ \
5336 void *__cu_to = (to); \
5337 const void __user *__cu_from = (from); \
5338- long __cu_len = (n); \
5339+ unsigned long __cu_len = (n); \
5340 \
5341 __chk_user_ptr(__cu_from); \
5342- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5343+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5344+ if (!__builtin_constant_p(n)) \
5345+ check_object_size(__cu_to, __cu_len, false); \
5346 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5347+ } \
5348 __cu_len; \
5349 })
5350
5351diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5352index 24603be..948052d 100644
5353--- a/arch/ia64/kernel/module.c
5354+++ b/arch/ia64/kernel/module.c
5355@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
5356 void
5357 module_free (struct module *mod, void *module_region)
5358 {
5359- if (mod && mod->arch.init_unw_table &&
5360- module_region == mod->module_init) {
5361+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
5362 unw_remove_unwind_table(mod->arch.init_unw_table);
5363 mod->arch.init_unw_table = NULL;
5364 }
5365@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5366 }
5367
5368 static inline int
5369+in_init_rx (const struct module *mod, uint64_t addr)
5370+{
5371+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5372+}
5373+
5374+static inline int
5375+in_init_rw (const struct module *mod, uint64_t addr)
5376+{
5377+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5378+}
5379+
5380+static inline int
5381 in_init (const struct module *mod, uint64_t addr)
5382 {
5383- return addr - (uint64_t) mod->module_init < mod->init_size;
5384+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5385+}
5386+
5387+static inline int
5388+in_core_rx (const struct module *mod, uint64_t addr)
5389+{
5390+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5391+}
5392+
5393+static inline int
5394+in_core_rw (const struct module *mod, uint64_t addr)
5395+{
5396+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5397 }
5398
5399 static inline int
5400 in_core (const struct module *mod, uint64_t addr)
5401 {
5402- return addr - (uint64_t) mod->module_core < mod->core_size;
5403+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5404 }
5405
5406 static inline int
5407@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5408 break;
5409
5410 case RV_BDREL:
5411- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5412+ if (in_init_rx(mod, val))
5413+ val -= (uint64_t) mod->module_init_rx;
5414+ else if (in_init_rw(mod, val))
5415+ val -= (uint64_t) mod->module_init_rw;
5416+ else if (in_core_rx(mod, val))
5417+ val -= (uint64_t) mod->module_core_rx;
5418+ else if (in_core_rw(mod, val))
5419+ val -= (uint64_t) mod->module_core_rw;
5420 break;
5421
5422 case RV_LTV:
5423@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5424 * addresses have been selected...
5425 */
5426 uint64_t gp;
5427- if (mod->core_size > MAX_LTOFF)
5428+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5429 /*
5430 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5431 * at the end of the module.
5432 */
5433- gp = mod->core_size - MAX_LTOFF / 2;
5434+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5435 else
5436- gp = mod->core_size / 2;
5437- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5438+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5439+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5440 mod->arch.gp = gp;
5441 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5442 }
5443diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5444index c39c3cd..3c77738 100644
5445--- a/arch/ia64/kernel/palinfo.c
5446+++ b/arch/ia64/kernel/palinfo.c
5447@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5448 return NOTIFY_OK;
5449 }
5450
5451-static struct notifier_block __refdata palinfo_cpu_notifier =
5452+static struct notifier_block palinfo_cpu_notifier =
5453 {
5454 .notifier_call = palinfo_cpu_callback,
5455 .priority = 0,
5456diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5457index 41e33f8..65180b2a 100644
5458--- a/arch/ia64/kernel/sys_ia64.c
5459+++ b/arch/ia64/kernel/sys_ia64.c
5460@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5461 unsigned long align_mask = 0;
5462 struct mm_struct *mm = current->mm;
5463 struct vm_unmapped_area_info info;
5464+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5465
5466 if (len > RGN_MAP_LIMIT)
5467 return -ENOMEM;
5468@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5469 if (REGION_NUMBER(addr) == RGN_HPAGE)
5470 addr = 0;
5471 #endif
5472+
5473+#ifdef CONFIG_PAX_RANDMMAP
5474+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5475+ addr = mm->free_area_cache;
5476+ else
5477+#endif
5478+
5479 if (!addr)
5480 addr = TASK_UNMAPPED_BASE;
5481
5482@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5483 info.high_limit = TASK_SIZE;
5484 info.align_mask = align_mask;
5485 info.align_offset = 0;
5486+ info.threadstack_offset = offset;
5487 return vm_unmapped_area(&info);
5488 }
5489
5490diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5491index 84f8a52..7c76178 100644
5492--- a/arch/ia64/kernel/vmlinux.lds.S
5493+++ b/arch/ia64/kernel/vmlinux.lds.S
5494@@ -192,7 +192,7 @@ SECTIONS {
5495 /* Per-cpu data: */
5496 . = ALIGN(PERCPU_PAGE_SIZE);
5497 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5498- __phys_per_cpu_start = __per_cpu_load;
5499+ __phys_per_cpu_start = per_cpu_load;
5500 /*
5501 * ensure percpu data fits
5502 * into percpu page size
5503diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5504index 7225dad..2a7c8256 100644
5505--- a/arch/ia64/mm/fault.c
5506+++ b/arch/ia64/mm/fault.c
5507@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5508 return pte_present(pte);
5509 }
5510
5511+#ifdef CONFIG_PAX_PAGEEXEC
5512+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5513+{
5514+ unsigned long i;
5515+
5516+ printk(KERN_ERR "PAX: bytes at PC: ");
5517+ for (i = 0; i < 8; i++) {
5518+ unsigned int c;
5519+ if (get_user(c, (unsigned int *)pc+i))
5520+ printk(KERN_CONT "???????? ");
5521+ else
5522+ printk(KERN_CONT "%08x ", c);
5523+ }
5524+ printk("\n");
5525+}
5526+#endif
5527+
5528 # define VM_READ_BIT 0
5529 # define VM_WRITE_BIT 1
5530 # define VM_EXEC_BIT 2
5531@@ -151,8 +168,21 @@ retry:
5532 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5533 goto bad_area;
5534
5535- if ((vma->vm_flags & mask) != mask)
5536+ if ((vma->vm_flags & mask) != mask) {
5537+
5538+#ifdef CONFIG_PAX_PAGEEXEC
5539+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5540+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5541+ goto bad_area;
5542+
5543+ up_read(&mm->mmap_sem);
5544+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5545+ do_group_exit(SIGKILL);
5546+ }
5547+#endif
5548+
5549 goto bad_area;
5550+ }
5551
5552 /*
5553 * If for any reason at all we couldn't handle the fault, make
5554diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5555index 76069c1..c2aa816 100644
5556--- a/arch/ia64/mm/hugetlbpage.c
5557+++ b/arch/ia64/mm/hugetlbpage.c
5558@@ -149,6 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5559 unsigned long pgoff, unsigned long flags)
5560 {
5561 struct vm_unmapped_area_info info;
5562+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5563
5564 if (len > RGN_MAP_LIMIT)
5565 return -ENOMEM;
5566@@ -172,6 +173,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5567 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5568 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5569 info.align_offset = 0;
5570+ info.threadstack_offset = offset;
5571 return vm_unmapped_area(&info);
5572 }
5573
5574diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5575index 6b33457..88b5124 100644
5576--- a/arch/ia64/mm/init.c
5577+++ b/arch/ia64/mm/init.c
5578@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5579 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5580 vma->vm_end = vma->vm_start + PAGE_SIZE;
5581 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5582+
5583+#ifdef CONFIG_PAX_PAGEEXEC
5584+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5585+ vma->vm_flags &= ~VM_EXEC;
5586+
5587+#ifdef CONFIG_PAX_MPROTECT
5588+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5589+ vma->vm_flags &= ~VM_MAYEXEC;
5590+#endif
5591+
5592+ }
5593+#endif
5594+
5595 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5596 down_write(&current->mm->mmap_sem);
5597 if (insert_vm_struct(current->mm, vma)) {
5598@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5599 gate_vma.vm_start = FIXADDR_USER_START;
5600 gate_vma.vm_end = FIXADDR_USER_END;
5601 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5602- gate_vma.vm_page_prot = __P101;
5603+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5604
5605 return 0;
5606 }
5607diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5608index 40b3ee9..8c2c112 100644
5609--- a/arch/m32r/include/asm/cache.h
5610+++ b/arch/m32r/include/asm/cache.h
5611@@ -1,8 +1,10 @@
5612 #ifndef _ASM_M32R_CACHE_H
5613 #define _ASM_M32R_CACHE_H
5614
5615+#include <linux/const.h>
5616+
5617 /* L1 cache line size */
5618 #define L1_CACHE_SHIFT 4
5619-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5620+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5621
5622 #endif /* _ASM_M32R_CACHE_H */
5623diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5624index 82abd15..d95ae5d 100644
5625--- a/arch/m32r/lib/usercopy.c
5626+++ b/arch/m32r/lib/usercopy.c
5627@@ -14,6 +14,9 @@
5628 unsigned long
5629 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5630 {
5631+ if ((long)n < 0)
5632+ return n;
5633+
5634 prefetch(from);
5635 if (access_ok(VERIFY_WRITE, to, n))
5636 __copy_user(to,from,n);
5637@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5638 unsigned long
5639 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5640 {
5641+ if ((long)n < 0)
5642+ return n;
5643+
5644 prefetchw(to);
5645 if (access_ok(VERIFY_READ, from, n))
5646 __copy_user_zeroing(to,from,n);
5647diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5648index 0395c51..5f26031 100644
5649--- a/arch/m68k/include/asm/cache.h
5650+++ b/arch/m68k/include/asm/cache.h
5651@@ -4,9 +4,11 @@
5652 #ifndef __ARCH_M68K_CACHE_H
5653 #define __ARCH_M68K_CACHE_H
5654
5655+#include <linux/const.h>
5656+
5657 /* bytes per L1 cache line */
5658 #define L1_CACHE_SHIFT 4
5659-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5660+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5661
5662 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5663
5664diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5665index c7591e8..ecef036 100644
5666--- a/arch/metag/include/asm/barrier.h
5667+++ b/arch/metag/include/asm/barrier.h
5668@@ -89,7 +89,7 @@ static inline void fence(void)
5669 do { \
5670 compiletime_assert_atomic_type(*p); \
5671 smp_mb(); \
5672- ACCESS_ONCE(*p) = (v); \
5673+ ACCESS_ONCE_RW(*p) = (v); \
5674 } while (0)
5675
5676 #define smp_load_acquire(p) \
5677diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5678index 3c32075..ae0ae75 100644
5679--- a/arch/metag/mm/hugetlbpage.c
5680+++ b/arch/metag/mm/hugetlbpage.c
5681@@ -200,6 +200,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5682 info.high_limit = TASK_SIZE;
5683 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5684 info.align_offset = 0;
5685+ info.threadstack_offset = 0;
5686 return vm_unmapped_area(&info);
5687 }
5688
5689diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5690index 4efe96a..60e8699 100644
5691--- a/arch/microblaze/include/asm/cache.h
5692+++ b/arch/microblaze/include/asm/cache.h
5693@@ -13,11 +13,12 @@
5694 #ifndef _ASM_MICROBLAZE_CACHE_H
5695 #define _ASM_MICROBLAZE_CACHE_H
5696
5697+#include <linux/const.h>
5698 #include <asm/registers.h>
5699
5700 #define L1_CACHE_SHIFT 5
5701 /* word-granular cache in microblaze */
5702-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5703+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5704
5705 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5706
5707diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5708index 9536ef9..9333776 100644
5709--- a/arch/mips/Kconfig
5710+++ b/arch/mips/Kconfig
5711@@ -2413,6 +2413,7 @@ source "kernel/Kconfig.preempt"
5712
5713 config KEXEC
5714 bool "Kexec system call"
5715+ depends on !GRKERNSEC_KMEM
5716 help
5717 kexec is a system call that implements the ability to shutdown your
5718 current kernel, and to start another kernel. It is like a reboot
5719diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5720index 02f2444..506969c 100644
5721--- a/arch/mips/cavium-octeon/dma-octeon.c
5722+++ b/arch/mips/cavium-octeon/dma-octeon.c
5723@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5724 if (dma_release_from_coherent(dev, order, vaddr))
5725 return;
5726
5727- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5728+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5729 }
5730
5731 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5732diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5733index 6dd6bfc..903b0d6 100644
5734--- a/arch/mips/include/asm/atomic.h
5735+++ b/arch/mips/include/asm/atomic.h
5736@@ -21,15 +21,39 @@
5737 #include <asm/cmpxchg.h>
5738 #include <asm/war.h>
5739
5740+#ifdef CONFIG_GENERIC_ATOMIC64
5741+#include <asm-generic/atomic64.h>
5742+#endif
5743+
5744 #define ATOMIC_INIT(i) { (i) }
5745
5746+#ifdef CONFIG_64BIT
5747+#define _ASM_EXTABLE(from, to) \
5748+" .section __ex_table,\"a\"\n" \
5749+" .dword " #from ", " #to"\n" \
5750+" .previous\n"
5751+#else
5752+#define _ASM_EXTABLE(from, to) \
5753+" .section __ex_table,\"a\"\n" \
5754+" .word " #from ", " #to"\n" \
5755+" .previous\n"
5756+#endif
5757+
5758 /*
5759 * atomic_read - read atomic variable
5760 * @v: pointer of type atomic_t
5761 *
5762 * Atomically reads the value of @v.
5763 */
5764-#define atomic_read(v) ACCESS_ONCE((v)->counter)
5765+static inline int atomic_read(const atomic_t *v)
5766+{
5767+ return ACCESS_ONCE(v->counter);
5768+}
5769+
5770+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5771+{
5772+ return ACCESS_ONCE(v->counter);
5773+}
5774
5775 /*
5776 * atomic_set - set atomic variable
5777@@ -38,47 +62,77 @@
5778 *
5779 * Atomically sets the value of @v to @i.
5780 */
5781-#define atomic_set(v, i) ((v)->counter = (i))
5782+static inline void atomic_set(atomic_t *v, int i)
5783+{
5784+ v->counter = i;
5785+}
5786
5787-#define ATOMIC_OP(op, c_op, asm_op) \
5788-static __inline__ void atomic_##op(int i, atomic_t * v) \
5789+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5790+{
5791+ v->counter = i;
5792+}
5793+
5794+#ifdef CONFIG_PAX_REFCOUNT
5795+#define __OVERFLOW_POST \
5796+ " b 4f \n" \
5797+ " .set noreorder \n" \
5798+ "3: b 5f \n" \
5799+ " move %0, %1 \n" \
5800+ " .set reorder \n"
5801+#define __OVERFLOW_EXTABLE \
5802+ "3:\n" \
5803+ _ASM_EXTABLE(2b, 3b)
5804+#else
5805+#define __OVERFLOW_POST
5806+#define __OVERFLOW_EXTABLE
5807+#endif
5808+
5809+#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5810+static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5811 { \
5812 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5813 int temp; \
5814 \
5815 __asm__ __volatile__( \
5816- " .set arch=r4000 \n" \
5817- "1: ll %0, %1 # atomic_" #op " \n" \
5818- " " #asm_op " %0, %2 \n" \
5819+ " .set mips3 \n" \
5820+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5821+ "2: " #asm_op " %0, %2 \n" \
5822 " sc %0, %1 \n" \
5823 " beqzl %0, 1b \n" \
5824+ extable \
5825 " .set mips0 \n" \
5826 : "=&r" (temp), "+m" (v->counter) \
5827 : "Ir" (i)); \
5828 } else if (kernel_uses_llsc) { \
5829 int temp; \
5830 \
5831- do { \
5832- __asm__ __volatile__( \
5833- " .set arch=r4000 \n" \
5834- " ll %0, %1 # atomic_" #op "\n" \
5835- " " #asm_op " %0, %2 \n" \
5836- " sc %0, %1 \n" \
5837- " .set mips0 \n" \
5838- : "=&r" (temp), "+m" (v->counter) \
5839- : "Ir" (i)); \
5840- } while (unlikely(!temp)); \
5841+ __asm__ __volatile__( \
5842+ " .set mips3 \n" \
5843+ " ll %0, %1 # atomic_" #op #suffix "\n" \
5844+ "2: " #asm_op " %0, %2 \n" \
5845+ " sc %0, %1 \n" \
5846+ " beqz %0, 1b \n" \
5847+ extable \
5848+ " .set mips0 \n" \
5849+ : "=&r" (temp), "+m" (v->counter) \
5850+ : "Ir" (i)); \
5851 } else { \
5852 unsigned long flags; \
5853 \
5854 raw_local_irq_save(flags); \
5855- v->counter c_op i; \
5856+ __asm__ __volatile__( \
5857+ "2: " #asm_op " %0, %1 \n" \
5858+ extable \
5859+ : "+r" (v->counter) : "Ir" (i)); \
5860 raw_local_irq_restore(flags); \
5861 } \
5862 } \
5863
5864-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5865-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5866+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , asm_op##u) \
5867+ __ATOMIC_OP(op, _unchecked, asm_op)
5868+
5869+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5870+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5871 { \
5872 int result; \
5873 \
5874@@ -88,37 +142,47 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5875 int temp; \
5876 \
5877 __asm__ __volatile__( \
5878- " .set arch=r4000 \n" \
5879- "1: ll %1, %2 # atomic_" #op "_return \n" \
5880- " " #asm_op " %0, %1, %3 \n" \
5881+ " .set mips3 \n" \
5882+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5883+ "2: " #asm_op " %0, %1, %3 \n" \
5884 " sc %0, %2 \n" \
5885 " beqzl %0, 1b \n" \
5886- " " #asm_op " %0, %1, %3 \n" \
5887+ post_op \
5888+ extable \
5889+ "4: " #asm_op " %0, %1, %3 \n" \
5890+ "5: \n" \
5891 " .set mips0 \n" \
5892 : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5893 : "Ir" (i)); \
5894 } else if (kernel_uses_llsc) { \
5895 int temp; \
5896 \
5897- do { \
5898- __asm__ __volatile__( \
5899- " .set arch=r4000 \n" \
5900- " ll %1, %2 # atomic_" #op "_return \n" \
5901- " " #asm_op " %0, %1, %3 \n" \
5902- " sc %0, %2 \n" \
5903- " .set mips0 \n" \
5904- : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5905- : "Ir" (i)); \
5906- } while (unlikely(!result)); \
5907+ __asm__ __volatile__( \
5908+ " .set mips3 \n" \
5909+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5910+ "2: " #asm_op " %0, %1, %3 \n" \
5911+ " sc %0, %2 \n" \
5912+ " beqz %0, 1b \n" \
5913+ post_op \
5914+ extable \
5915+ "4: " #asm_op " %0, %1, %3 \n" \
5916+ "5: \n" \
5917+ " .set mips0 \n" \
5918+ : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5919+ : "Ir" (i)); \
5920 \
5921 result = temp; result c_op i; \
5922 } else { \
5923 unsigned long flags; \
5924 \
5925 raw_local_irq_save(flags); \
5926- result = v->counter; \
5927- result c_op i; \
5928- v->counter = result; \
5929+ __asm__ __volatile__( \
5930+ " lw %0, %1 \n" \
5931+ "2: " #asm_op " %0, %1, %2 \n" \
5932+ " sw %0, %1 \n" \
5933+ "3: \n" \
5934+ extable \
5935+ : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
5936 raw_local_irq_restore(flags); \
5937 } \
5938 \
5939@@ -127,16 +191,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5940 return result; \
5941 }
5942
5943-#define ATOMIC_OPS(op, c_op, asm_op) \
5944- ATOMIC_OP(op, c_op, asm_op) \
5945- ATOMIC_OP_RETURN(op, c_op, asm_op)
5946+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
5947+ __ATOMIC_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
5948
5949-ATOMIC_OPS(add, +=, addu)
5950-ATOMIC_OPS(sub, -=, subu)
5951+#define ATOMIC_OPS(op, asm_op) \
5952+ ATOMIC_OP(op, asm_op) \
5953+ ATOMIC_OP_RETURN(op, asm_op)
5954+
5955+ATOMIC_OPS(add, add)
5956+ATOMIC_OPS(sub, sub)
5957
5958 #undef ATOMIC_OPS
5959 #undef ATOMIC_OP_RETURN
5960+#undef __ATOMIC_OP_RETURN
5961 #undef ATOMIC_OP
5962+#undef __ATOMIC_OP
5963
5964 /*
5965 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
5966@@ -146,7 +215,7 @@ ATOMIC_OPS(sub, -=, subu)
5967 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5968 * The function returns the old value of @v minus @i.
5969 */
5970-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5971+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5972 {
5973 int result;
5974
5975@@ -203,8 +272,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5976 return result;
5977 }
5978
5979-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5980-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
5981+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
5982+{
5983+ return cmpxchg(&v->counter, old, new);
5984+}
5985+
5986+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
5987+ int new)
5988+{
5989+ return cmpxchg(&(v->counter), old, new);
5990+}
5991+
5992+static inline int atomic_xchg(atomic_t *v, int new)
5993+{
5994+ return xchg(&v->counter, new);
5995+}
5996+
5997+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
5998+{
5999+ return xchg(&(v->counter), new);
6000+}
6001
6002 /**
6003 * __atomic_add_unless - add unless the number is a given value
6004@@ -232,6 +319,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6005
6006 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6007 #define atomic_inc_return(v) atomic_add_return(1, (v))
6008+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6009+{
6010+ return atomic_add_return_unchecked(1, v);
6011+}
6012
6013 /*
6014 * atomic_sub_and_test - subtract value from variable and test result
6015@@ -253,6 +344,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6016 * other cases.
6017 */
6018 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6019+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6020+{
6021+ return atomic_add_return_unchecked(1, v) == 0;
6022+}
6023
6024 /*
6025 * atomic_dec_and_test - decrement by 1 and test
6026@@ -277,6 +372,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6027 * Atomically increments @v by 1.
6028 */
6029 #define atomic_inc(v) atomic_add(1, (v))
6030+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6031+{
6032+ atomic_add_unchecked(1, v);
6033+}
6034
6035 /*
6036 * atomic_dec - decrement and test
6037@@ -285,6 +384,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6038 * Atomically decrements @v by 1.
6039 */
6040 #define atomic_dec(v) atomic_sub(1, (v))
6041+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6042+{
6043+ atomic_sub_unchecked(1, v);
6044+}
6045
6046 /*
6047 * atomic_add_negative - add and test if negative
6048@@ -306,54 +409,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6049 * @v: pointer of type atomic64_t
6050 *
6051 */
6052-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6053+static inline long atomic64_read(const atomic64_t *v)
6054+{
6055+ return ACCESS_ONCE(v->counter);
6056+}
6057+
6058+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6059+{
6060+ return ACCESS_ONCE(v->counter);
6061+}
6062
6063 /*
6064 * atomic64_set - set atomic variable
6065 * @v: pointer of type atomic64_t
6066 * @i: required value
6067 */
6068-#define atomic64_set(v, i) ((v)->counter = (i))
6069+static inline void atomic64_set(atomic64_t *v, long i)
6070+{
6071+ v->counter = i;
6072+}
6073
6074-#define ATOMIC64_OP(op, c_op, asm_op) \
6075-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6076+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6077+{
6078+ v->counter = i;
6079+}
6080+
6081+#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6082+static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6083 { \
6084 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6085 long temp; \
6086 \
6087 __asm__ __volatile__( \
6088- " .set arch=r4000 \n" \
6089- "1: lld %0, %1 # atomic64_" #op " \n" \
6090- " " #asm_op " %0, %2 \n" \
6091+ " .set mips3 \n" \
6092+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6093+ "2: " #asm_op " %0, %2 \n" \
6094 " scd %0, %1 \n" \
6095 " beqzl %0, 1b \n" \
6096+ extable \
6097 " .set mips0 \n" \
6098 : "=&r" (temp), "+m" (v->counter) \
6099 : "Ir" (i)); \
6100 } else if (kernel_uses_llsc) { \
6101 long temp; \
6102 \
6103- do { \
6104- __asm__ __volatile__( \
6105- " .set arch=r4000 \n" \
6106- " lld %0, %1 # atomic64_" #op "\n" \
6107- " " #asm_op " %0, %2 \n" \
6108- " scd %0, %1 \n" \
6109- " .set mips0 \n" \
6110- : "=&r" (temp), "+m" (v->counter) \
6111- : "Ir" (i)); \
6112- } while (unlikely(!temp)); \
6113+ __asm__ __volatile__( \
6114+ " .set mips3 \n" \
6115+ " lld %0, %1 # atomic64_" #op #suffix "\n" \
6116+ "2: " #asm_op " %0, %2 \n" \
6117+ " scd %0, %1 \n" \
6118+ " beqz %0, 1b \n" \
6119+ extable \
6120+ " .set mips0 \n" \
6121+ : "=&r" (temp), "+m" (v->counter) \
6122+ : "Ir" (i)); \
6123 } else { \
6124 unsigned long flags; \
6125 \
6126 raw_local_irq_save(flags); \
6127- v->counter c_op i; \
6128+ __asm__ __volatile__( \
6129+ "2: " #asm_op " %0, %1 \n" \
6130+ extable \
6131+ : "+r" (v->counter) : "Ir" (i)); \
6132 raw_local_irq_restore(flags); \
6133 } \
6134 } \
6135
6136-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6137-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6138+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , asm_op##u) \
6139+ __ATOMIC64_OP(op, _unchecked, asm_op)
6140+
6141+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6142+static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6143 { \
6144 long result; \
6145 \
6146@@ -363,38 +489,48 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6147 long temp; \
6148 \
6149 __asm__ __volatile__( \
6150- " .set arch=r4000 \n" \
6151+ " .set mips3 \n" \
6152 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6153- " " #asm_op " %0, %1, %3 \n" \
6154+ "2: " #asm_op " %0, %1, %3 \n" \
6155 " scd %0, %2 \n" \
6156 " beqzl %0, 1b \n" \
6157- " " #asm_op " %0, %1, %3 \n" \
6158+ post_op \
6159+ extable \
6160+ "4: " #asm_op " %0, %1, %3 \n" \
6161+ "5: \n" \
6162 " .set mips0 \n" \
6163 : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
6164 : "Ir" (i)); \
6165 } else if (kernel_uses_llsc) { \
6166 long temp; \
6167 \
6168- do { \
6169- __asm__ __volatile__( \
6170- " .set arch=r4000 \n" \
6171- " lld %1, %2 # atomic64_" #op "_return\n" \
6172- " " #asm_op " %0, %1, %3 \n" \
6173- " scd %0, %2 \n" \
6174- " .set mips0 \n" \
6175- : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
6176- : "Ir" (i), "m" (v->counter) \
6177- : "memory"); \
6178- } while (unlikely(!result)); \
6179+ __asm__ __volatile__( \
6180+ " .set mips3 \n" \
6181+ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n" \
6182+ "2: " #asm_op " %0, %1, %3 \n" \
6183+ " scd %0, %2 \n" \
6184+ " beqz %0, 1b \n" \
6185+ post_op \
6186+ extable \
6187+ "4: " #asm_op " %0, %1, %3 \n" \
6188+ "5: \n" \
6189+ " .set mips0 \n" \
6190+ : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
6191+ : "Ir" (i), "m" (v->counter) \
6192+ : "memory"); \
6193 \
6194 result = temp; result c_op i; \
6195 } else { \
6196 unsigned long flags; \
6197 \
6198 raw_local_irq_save(flags); \
6199- result = v->counter; \
6200- result c_op i; \
6201- v->counter = result; \
6202+ __asm__ __volatile__( \
6203+ " ld %0, %1 \n" \
6204+ "2: " #asm_op " %0, %1, %2 \n" \
6205+ " sd %0, %1 \n" \
6206+ "3: \n" \
6207+ extable \
6208+ : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
6209 raw_local_irq_restore(flags); \
6210 } \
6211 \
6212@@ -403,16 +539,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6213 return result; \
6214 }
6215
6216-#define ATOMIC64_OPS(op, c_op, asm_op) \
6217- ATOMIC64_OP(op, c_op, asm_op) \
6218- ATOMIC64_OP_RETURN(op, c_op, asm_op)
6219+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
6220+ __ATOMIC64_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6221
6222-ATOMIC64_OPS(add, +=, daddu)
6223-ATOMIC64_OPS(sub, -=, dsubu)
6224+#define ATOMIC64_OPS(op, asm_op) \
6225+ ATOMIC64_OP(op, asm_op) \
6226+ ATOMIC64_OP_RETURN(op, asm_op)
6227+
6228+ATOMIC64_OPS(add, dadd)
6229+ATOMIC64_OPS(sub, dsub)
6230
6231 #undef ATOMIC64_OPS
6232 #undef ATOMIC64_OP_RETURN
6233+#undef __ATOMIC64_OP_RETURN
6234 #undef ATOMIC64_OP
6235+#undef __ATOMIC64_OP
6236+#undef __OVERFLOW_EXTABLE
6237+#undef __OVERFLOW_POST
6238
6239 /*
6240 * atomic64_sub_if_positive - conditionally subtract integer from atomic variable
6241@@ -422,7 +565,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6242 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6243 * The function returns the old value of @v minus @i.
6244 */
6245-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6246+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6247 {
6248 long result;
6249
6250@@ -479,9 +622,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6251 return result;
6252 }
6253
6254-#define atomic64_cmpxchg(v, o, n) \
6255- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6256-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6257+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6258+{
6259+ return cmpxchg(&v->counter, old, new);
6260+}
6261+
6262+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6263+ long new)
6264+{
6265+ return cmpxchg(&(v->counter), old, new);
6266+}
6267+
6268+static inline long atomic64_xchg(atomic64_t *v, long new)
6269+{
6270+ return xchg(&v->counter, new);
6271+}
6272+
6273+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6274+{
6275+ return xchg(&(v->counter), new);
6276+}
6277
6278 /**
6279 * atomic64_add_unless - add unless the number is a given value
6280@@ -511,6 +671,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6281
6282 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6283 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6284+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6285
6286 /*
6287 * atomic64_sub_and_test - subtract value from variable and test result
6288@@ -532,6 +693,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6289 * other cases.
6290 */
6291 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6292+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6293
6294 /*
6295 * atomic64_dec_and_test - decrement by 1 and test
6296@@ -556,6 +718,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6297 * Atomically increments @v by 1.
6298 */
6299 #define atomic64_inc(v) atomic64_add(1, (v))
6300+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6301
6302 /*
6303 * atomic64_dec - decrement and test
6304@@ -564,6 +727,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6305 * Atomically decrements @v by 1.
6306 */
6307 #define atomic64_dec(v) atomic64_sub(1, (v))
6308+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6309
6310 /*
6311 * atomic64_add_negative - add and test if negative
6312diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6313index d0101dd..266982c 100644
6314--- a/arch/mips/include/asm/barrier.h
6315+++ b/arch/mips/include/asm/barrier.h
6316@@ -184,7 +184,7 @@
6317 do { \
6318 compiletime_assert_atomic_type(*p); \
6319 smp_mb(); \
6320- ACCESS_ONCE(*p) = (v); \
6321+ ACCESS_ONCE_RW(*p) = (v); \
6322 } while (0)
6323
6324 #define smp_load_acquire(p) \
6325diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6326index b4db69f..8f3b093 100644
6327--- a/arch/mips/include/asm/cache.h
6328+++ b/arch/mips/include/asm/cache.h
6329@@ -9,10 +9,11 @@
6330 #ifndef _ASM_CACHE_H
6331 #define _ASM_CACHE_H
6332
6333+#include <linux/const.h>
6334 #include <kmalloc.h>
6335
6336 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6337-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6338+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6339
6340 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6341 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6342diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6343index 1d38fe0..9beabc9 100644
6344--- a/arch/mips/include/asm/elf.h
6345+++ b/arch/mips/include/asm/elf.h
6346@@ -381,13 +381,16 @@ extern const char *__elf_platform;
6347 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6348 #endif
6349
6350+#ifdef CONFIG_PAX_ASLR
6351+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6352+
6353+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6354+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6355+#endif
6356+
6357 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6358 struct linux_binprm;
6359 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6360 int uses_interp);
6361
6362-struct mm_struct;
6363-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6364-#define arch_randomize_brk arch_randomize_brk
6365-
6366 #endif /* _ASM_ELF_H */
6367diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6368index c1f6afa..38cc6e9 100644
6369--- a/arch/mips/include/asm/exec.h
6370+++ b/arch/mips/include/asm/exec.h
6371@@ -12,6 +12,6 @@
6372 #ifndef _ASM_EXEC_H
6373 #define _ASM_EXEC_H
6374
6375-extern unsigned long arch_align_stack(unsigned long sp);
6376+#define arch_align_stack(x) ((x) & ~0xfUL)
6377
6378 #endif /* _ASM_EXEC_H */
6379diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6380index 9e8ef59..1139d6b 100644
6381--- a/arch/mips/include/asm/hw_irq.h
6382+++ b/arch/mips/include/asm/hw_irq.h
6383@@ -10,7 +10,7 @@
6384
6385 #include <linux/atomic.h>
6386
6387-extern atomic_t irq_err_count;
6388+extern atomic_unchecked_t irq_err_count;
6389
6390 /*
6391 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6392diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6393index 46dfc3c..a16b13a 100644
6394--- a/arch/mips/include/asm/local.h
6395+++ b/arch/mips/include/asm/local.h
6396@@ -12,15 +12,25 @@ typedef struct
6397 atomic_long_t a;
6398 } local_t;
6399
6400+typedef struct {
6401+ atomic_long_unchecked_t a;
6402+} local_unchecked_t;
6403+
6404 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6405
6406 #define local_read(l) atomic_long_read(&(l)->a)
6407+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6408 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6409+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6410
6411 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6412+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6413 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6414+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6415 #define local_inc(l) atomic_long_inc(&(l)->a)
6416+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6417 #define local_dec(l) atomic_long_dec(&(l)->a)
6418+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6419
6420 /*
6421 * Same as above, but return the result value
6422@@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6423 return result;
6424 }
6425
6426+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6427+{
6428+ unsigned long result;
6429+
6430+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6431+ unsigned long temp;
6432+
6433+ __asm__ __volatile__(
6434+ " .set mips3 \n"
6435+ "1:" __LL "%1, %2 # local_add_return \n"
6436+ " addu %0, %1, %3 \n"
6437+ __SC "%0, %2 \n"
6438+ " beqzl %0, 1b \n"
6439+ " addu %0, %1, %3 \n"
6440+ " .set mips0 \n"
6441+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6442+ : "Ir" (i), "m" (l->a.counter)
6443+ : "memory");
6444+ } else if (kernel_uses_llsc) {
6445+ unsigned long temp;
6446+
6447+ __asm__ __volatile__(
6448+ " .set mips3 \n"
6449+ "1:" __LL "%1, %2 # local_add_return \n"
6450+ " addu %0, %1, %3 \n"
6451+ __SC "%0, %2 \n"
6452+ " beqz %0, 1b \n"
6453+ " addu %0, %1, %3 \n"
6454+ " .set mips0 \n"
6455+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6456+ : "Ir" (i), "m" (l->a.counter)
6457+ : "memory");
6458+ } else {
6459+ unsigned long flags;
6460+
6461+ local_irq_save(flags);
6462+ result = l->a.counter;
6463+ result += i;
6464+ l->a.counter = result;
6465+ local_irq_restore(flags);
6466+ }
6467+
6468+ return result;
6469+}
6470+
6471 static __inline__ long local_sub_return(long i, local_t * l)
6472 {
6473 unsigned long result;
6474@@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6475
6476 #define local_cmpxchg(l, o, n) \
6477 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6478+#define local_cmpxchg_unchecked(l, o, n) \
6479+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6480 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6481
6482 /**
6483diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6484index 3be8180..c4798d5 100644
6485--- a/arch/mips/include/asm/page.h
6486+++ b/arch/mips/include/asm/page.h
6487@@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6488 #ifdef CONFIG_CPU_MIPS32
6489 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6490 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6491- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6492+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6493 #else
6494 typedef struct { unsigned long long pte; } pte_t;
6495 #define pte_val(x) ((x).pte)
6496diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6497index b336037..5b874cc 100644
6498--- a/arch/mips/include/asm/pgalloc.h
6499+++ b/arch/mips/include/asm/pgalloc.h
6500@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6501 {
6502 set_pud(pud, __pud((unsigned long)pmd));
6503 }
6504+
6505+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6506+{
6507+ pud_populate(mm, pud, pmd);
6508+}
6509 #endif
6510
6511 /*
6512diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6513index d6d1928..ce4f822 100644
6514--- a/arch/mips/include/asm/pgtable.h
6515+++ b/arch/mips/include/asm/pgtable.h
6516@@ -20,6 +20,9 @@
6517 #include <asm/io.h>
6518 #include <asm/pgtable-bits.h>
6519
6520+#define ktla_ktva(addr) (addr)
6521+#define ktva_ktla(addr) (addr)
6522+
6523 struct mm_struct;
6524 struct vm_area_struct;
6525
6526diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6527index 7de8658..c109224 100644
6528--- a/arch/mips/include/asm/thread_info.h
6529+++ b/arch/mips/include/asm/thread_info.h
6530@@ -105,6 +105,9 @@ static inline struct thread_info *current_thread_info(void)
6531 #define TIF_SECCOMP 4 /* secure computing */
6532 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6533 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6534+/* li takes a 32bit immediate */
6535+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6536+
6537 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6538 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6539 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6540@@ -138,14 +141,16 @@ static inline struct thread_info *current_thread_info(void)
6541 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6542 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6543 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6544+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6545
6546 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6547 _TIF_SYSCALL_AUDIT | \
6548- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6549+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6550+ _TIF_GRSEC_SETXID)
6551
6552 /* work to do in syscall_trace_leave() */
6553 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6554- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6555+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6556
6557 /* work to do on interrupt/exception return */
6558 #define _TIF_WORK_MASK \
6559@@ -153,7 +158,7 @@ static inline struct thread_info *current_thread_info(void)
6560 /* work to do on any return to u-space */
6561 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6562 _TIF_WORK_SYSCALL_EXIT | \
6563- _TIF_SYSCALL_TRACEPOINT)
6564+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6565
6566 /*
6567 * We stash processor id into a COP0 register to retrieve it fast
6568diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6569index 22a5624..7c96295 100644
6570--- a/arch/mips/include/asm/uaccess.h
6571+++ b/arch/mips/include/asm/uaccess.h
6572@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6573 __ok == 0; \
6574 })
6575
6576+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6577 #define access_ok(type, addr, size) \
6578 likely(__access_ok((addr), (size), __access_mask))
6579
6580diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6581index 1188e00..41cf144 100644
6582--- a/arch/mips/kernel/binfmt_elfn32.c
6583+++ b/arch/mips/kernel/binfmt_elfn32.c
6584@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6585 #undef ELF_ET_DYN_BASE
6586 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6587
6588+#ifdef CONFIG_PAX_ASLR
6589+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6590+
6591+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6592+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6593+#endif
6594+
6595 #include <asm/processor.h>
6596 #include <linux/module.h>
6597 #include <linux/elfcore.h>
6598diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6599index 9287678..f870e47 100644
6600--- a/arch/mips/kernel/binfmt_elfo32.c
6601+++ b/arch/mips/kernel/binfmt_elfo32.c
6602@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6603 #undef ELF_ET_DYN_BASE
6604 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6605
6606+#ifdef CONFIG_PAX_ASLR
6607+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6608+
6609+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6610+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6611+#endif
6612+
6613 #include <asm/processor.h>
6614
6615 #include <linux/module.h>
6616diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6617index 50b3648..c2f3cec 100644
6618--- a/arch/mips/kernel/i8259.c
6619+++ b/arch/mips/kernel/i8259.c
6620@@ -201,7 +201,7 @@ spurious_8259A_irq:
6621 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6622 spurious_irq_mask |= irqmask;
6623 }
6624- atomic_inc(&irq_err_count);
6625+ atomic_inc_unchecked(&irq_err_count);
6626 /*
6627 * Theoretically we do not have to handle this IRQ,
6628 * but in Linux this does not cause problems and is
6629diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6630index 44a1f79..2bd6aa3 100644
6631--- a/arch/mips/kernel/irq-gt641xx.c
6632+++ b/arch/mips/kernel/irq-gt641xx.c
6633@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6634 }
6635 }
6636
6637- atomic_inc(&irq_err_count);
6638+ atomic_inc_unchecked(&irq_err_count);
6639 }
6640
6641 void __init gt641xx_irq_init(void)
6642diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6643index d2bfbc2..a8eacd2 100644
6644--- a/arch/mips/kernel/irq.c
6645+++ b/arch/mips/kernel/irq.c
6646@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6647 printk("unexpected IRQ # %d\n", irq);
6648 }
6649
6650-atomic_t irq_err_count;
6651+atomic_unchecked_t irq_err_count;
6652
6653 int arch_show_interrupts(struct seq_file *p, int prec)
6654 {
6655- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6656+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6657 return 0;
6658 }
6659
6660 asmlinkage void spurious_interrupt(void)
6661 {
6662- atomic_inc(&irq_err_count);
6663+ atomic_inc_unchecked(&irq_err_count);
6664 }
6665
6666 void __init init_IRQ(void)
6667@@ -109,7 +109,10 @@ void __init init_IRQ(void)
6668 #endif
6669 }
6670
6671+
6672 #ifdef DEBUG_STACKOVERFLOW
6673+extern void gr_handle_kernel_exploit(void);
6674+
6675 static inline void check_stack_overflow(void)
6676 {
6677 unsigned long sp;
6678@@ -125,6 +128,7 @@ static inline void check_stack_overflow(void)
6679 printk("do_IRQ: stack overflow: %ld\n",
6680 sp - sizeof(struct thread_info));
6681 dump_stack();
6682+ gr_handle_kernel_exploit();
6683 }
6684 }
6685 #else
6686diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6687index 0614717..002fa43 100644
6688--- a/arch/mips/kernel/pm-cps.c
6689+++ b/arch/mips/kernel/pm-cps.c
6690@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6691 nc_core_ready_count = nc_addr;
6692
6693 /* Ensure ready_count is zero-initialised before the assembly runs */
6694- ACCESS_ONCE(*nc_core_ready_count) = 0;
6695+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6696 coupled_barrier(&per_cpu(pm_barrier, core), online);
6697
6698 /* Run the generated entry code */
6699diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6700index 636b074..8fbb91f 100644
6701--- a/arch/mips/kernel/process.c
6702+++ b/arch/mips/kernel/process.c
6703@@ -520,15 +520,3 @@ unsigned long get_wchan(struct task_struct *task)
6704 out:
6705 return pc;
6706 }
6707-
6708-/*
6709- * Don't forget that the stack pointer must be aligned on a 8 bytes
6710- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6711- */
6712-unsigned long arch_align_stack(unsigned long sp)
6713-{
6714- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6715- sp -= get_random_int() & ~PAGE_MASK;
6716-
6717- return sp & ALMASK;
6718-}
6719diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6720index 9d1487d..10c5da5 100644
6721--- a/arch/mips/kernel/ptrace.c
6722+++ b/arch/mips/kernel/ptrace.c
6723@@ -761,6 +761,10 @@ long arch_ptrace(struct task_struct *child, long request,
6724 return ret;
6725 }
6726
6727+#ifdef CONFIG_GRKERNSEC_SETXID
6728+extern void gr_delayed_cred_worker(void);
6729+#endif
6730+
6731 /*
6732 * Notification of system call entry/exit
6733 * - triggered by current->work.syscall_trace
6734@@ -777,6 +781,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6735 tracehook_report_syscall_entry(regs))
6736 ret = -1;
6737
6738+#ifdef CONFIG_GRKERNSEC_SETXID
6739+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6740+ gr_delayed_cred_worker();
6741+#endif
6742+
6743 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6744 trace_sys_enter(regs, regs->regs[2]);
6745
6746diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6747index 07fc524..b9d7f28 100644
6748--- a/arch/mips/kernel/reset.c
6749+++ b/arch/mips/kernel/reset.c
6750@@ -13,6 +13,7 @@
6751 #include <linux/reboot.h>
6752
6753 #include <asm/reboot.h>
6754+#include <asm/bug.h>
6755
6756 /*
6757 * Urgs ... Too many MIPS machines to handle this in a generic way.
6758@@ -29,16 +30,19 @@ void machine_restart(char *command)
6759 {
6760 if (_machine_restart)
6761 _machine_restart(command);
6762+ BUG();
6763 }
6764
6765 void machine_halt(void)
6766 {
6767 if (_machine_halt)
6768 _machine_halt();
6769+ BUG();
6770 }
6771
6772 void machine_power_off(void)
6773 {
6774 if (pm_power_off)
6775 pm_power_off();
6776+ BUG();
6777 }
6778diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6779index 2242bdd..b284048 100644
6780--- a/arch/mips/kernel/sync-r4k.c
6781+++ b/arch/mips/kernel/sync-r4k.c
6782@@ -18,8 +18,8 @@
6783 #include <asm/mipsregs.h>
6784
6785 static atomic_t count_start_flag = ATOMIC_INIT(0);
6786-static atomic_t count_count_start = ATOMIC_INIT(0);
6787-static atomic_t count_count_stop = ATOMIC_INIT(0);
6788+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6789+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6790 static atomic_t count_reference = ATOMIC_INIT(0);
6791
6792 #define COUNTON 100
6793@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6794
6795 for (i = 0; i < NR_LOOPS; i++) {
6796 /* slaves loop on '!= 2' */
6797- while (atomic_read(&count_count_start) != 1)
6798+ while (atomic_read_unchecked(&count_count_start) != 1)
6799 mb();
6800- atomic_set(&count_count_stop, 0);
6801+ atomic_set_unchecked(&count_count_stop, 0);
6802 smp_wmb();
6803
6804 /* this lets the slaves write their count register */
6805- atomic_inc(&count_count_start);
6806+ atomic_inc_unchecked(&count_count_start);
6807
6808 /*
6809 * Everyone initialises count in the last loop:
6810@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6811 /*
6812 * Wait for all slaves to leave the synchronization point:
6813 */
6814- while (atomic_read(&count_count_stop) != 1)
6815+ while (atomic_read_unchecked(&count_count_stop) != 1)
6816 mb();
6817- atomic_set(&count_count_start, 0);
6818+ atomic_set_unchecked(&count_count_start, 0);
6819 smp_wmb();
6820- atomic_inc(&count_count_stop);
6821+ atomic_inc_unchecked(&count_count_stop);
6822 }
6823 /* Arrange for an interrupt in a short while */
6824 write_c0_compare(read_c0_count() + COUNTON);
6825@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6826 initcount = atomic_read(&count_reference);
6827
6828 for (i = 0; i < NR_LOOPS; i++) {
6829- atomic_inc(&count_count_start);
6830- while (atomic_read(&count_count_start) != 2)
6831+ atomic_inc_unchecked(&count_count_start);
6832+ while (atomic_read_unchecked(&count_count_start) != 2)
6833 mb();
6834
6835 /*
6836@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6837 if (i == NR_LOOPS-1)
6838 write_c0_count(initcount);
6839
6840- atomic_inc(&count_count_stop);
6841- while (atomic_read(&count_count_stop) != 2)
6842+ atomic_inc_unchecked(&count_count_stop);
6843+ while (atomic_read_unchecked(&count_count_stop) != 2)
6844 mb();
6845 }
6846 /* Arrange for an interrupt in a short while */
6847diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6848index 22b19c2..c5cc8c4 100644
6849--- a/arch/mips/kernel/traps.c
6850+++ b/arch/mips/kernel/traps.c
6851@@ -688,7 +688,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6852 siginfo_t info;
6853
6854 prev_state = exception_enter();
6855- die_if_kernel("Integer overflow", regs);
6856+ if (unlikely(!user_mode(regs))) {
6857+
6858+#ifdef CONFIG_PAX_REFCOUNT
6859+ if (fixup_exception(regs)) {
6860+ pax_report_refcount_overflow(regs);
6861+ exception_exit(prev_state);
6862+ return;
6863+ }
6864+#endif
6865+
6866+ die("Integer overflow", regs);
6867+ }
6868
6869 info.si_code = FPE_INTOVF;
6870 info.si_signo = SIGFPE;
6871diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6872index e3b21e5..ea5ff7c 100644
6873--- a/arch/mips/kvm/mips.c
6874+++ b/arch/mips/kvm/mips.c
6875@@ -805,7 +805,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6876 return r;
6877 }
6878
6879-int kvm_arch_init(void *opaque)
6880+int kvm_arch_init(const void *opaque)
6881 {
6882 if (kvm_mips_callbacks) {
6883 kvm_err("kvm: module already exists\n");
6884diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6885index becc42b..9e43d4b 100644
6886--- a/arch/mips/mm/fault.c
6887+++ b/arch/mips/mm/fault.c
6888@@ -28,6 +28,23 @@
6889 #include <asm/highmem.h> /* For VMALLOC_END */
6890 #include <linux/kdebug.h>
6891
6892+#ifdef CONFIG_PAX_PAGEEXEC
6893+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6894+{
6895+ unsigned long i;
6896+
6897+ printk(KERN_ERR "PAX: bytes at PC: ");
6898+ for (i = 0; i < 5; i++) {
6899+ unsigned int c;
6900+ if (get_user(c, (unsigned int *)pc+i))
6901+ printk(KERN_CONT "???????? ");
6902+ else
6903+ printk(KERN_CONT "%08x ", c);
6904+ }
6905+ printk("\n");
6906+}
6907+#endif
6908+
6909 /*
6910 * This routine handles page faults. It determines the address,
6911 * and the problem, and then passes it off to one of the appropriate
6912@@ -199,6 +216,14 @@ bad_area:
6913 bad_area_nosemaphore:
6914 /* User mode accesses just cause a SIGSEGV */
6915 if (user_mode(regs)) {
6916+
6917+#ifdef CONFIG_PAX_PAGEEXEC
6918+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6919+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6920+ do_group_exit(SIGKILL);
6921+ }
6922+#endif
6923+
6924 tsk->thread.cp0_badvaddr = address;
6925 tsk->thread.error_code = write;
6926 #if 0
6927diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6928index f1baadd..5472dca 100644
6929--- a/arch/mips/mm/mmap.c
6930+++ b/arch/mips/mm/mmap.c
6931@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6932 struct vm_area_struct *vma;
6933 unsigned long addr = addr0;
6934 int do_color_align;
6935+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6936 struct vm_unmapped_area_info info;
6937
6938 if (unlikely(len > TASK_SIZE))
6939@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6940 do_color_align = 1;
6941
6942 /* requesting a specific address */
6943+
6944+#ifdef CONFIG_PAX_RANDMMAP
6945+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6946+#endif
6947+
6948 if (addr) {
6949 if (do_color_align)
6950 addr = COLOUR_ALIGN(addr, pgoff);
6951@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6952 addr = PAGE_ALIGN(addr);
6953
6954 vma = find_vma(mm, addr);
6955- if (TASK_SIZE - len >= addr &&
6956- (!vma || addr + len <= vma->vm_start))
6957+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
6958 return addr;
6959 }
6960
6961 info.length = len;
6962 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6963 info.align_offset = pgoff << PAGE_SHIFT;
6964+ info.threadstack_offset = offset;
6965
6966 if (dir == DOWN) {
6967 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6968@@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6969 {
6970 unsigned long random_factor = 0UL;
6971
6972+#ifdef CONFIG_PAX_RANDMMAP
6973+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
6974+#endif
6975+
6976 if (current->flags & PF_RANDOMIZE) {
6977 random_factor = get_random_int();
6978 random_factor = random_factor << PAGE_SHIFT;
6979@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6980
6981 if (mmap_is_legacy()) {
6982 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
6983+
6984+#ifdef CONFIG_PAX_RANDMMAP
6985+ if (mm->pax_flags & MF_PAX_RANDMMAP)
6986+ mm->mmap_base += mm->delta_mmap;
6987+#endif
6988+
6989 mm->get_unmapped_area = arch_get_unmapped_area;
6990 } else {
6991 mm->mmap_base = mmap_base(random_factor);
6992+
6993+#ifdef CONFIG_PAX_RANDMMAP
6994+ if (mm->pax_flags & MF_PAX_RANDMMAP)
6995+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
6996+#endif
6997+
6998 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
6999 }
7000 }
7001
7002-static inline unsigned long brk_rnd(void)
7003-{
7004- unsigned long rnd = get_random_int();
7005-
7006- rnd = rnd << PAGE_SHIFT;
7007- /* 8MB for 32bit, 256MB for 64bit */
7008- if (TASK_IS_32BIT_ADDR)
7009- rnd = rnd & 0x7ffffful;
7010- else
7011- rnd = rnd & 0xffffffful;
7012-
7013- return rnd;
7014-}
7015-
7016-unsigned long arch_randomize_brk(struct mm_struct *mm)
7017-{
7018- unsigned long base = mm->brk;
7019- unsigned long ret;
7020-
7021- ret = PAGE_ALIGN(base + brk_rnd());
7022-
7023- if (ret < mm->brk)
7024- return mm->brk;
7025-
7026- return ret;
7027-}
7028-
7029 int __virt_addr_valid(const volatile void *kaddr)
7030 {
7031 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
7032diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
7033index 59cccd9..f39ac2f 100644
7034--- a/arch/mips/pci/pci-octeon.c
7035+++ b/arch/mips/pci/pci-octeon.c
7036@@ -327,8 +327,8 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn,
7037
7038
7039 static struct pci_ops octeon_pci_ops = {
7040- octeon_read_config,
7041- octeon_write_config,
7042+ .read = octeon_read_config,
7043+ .write = octeon_write_config,
7044 };
7045
7046 static struct resource octeon_pci_mem_resource = {
7047diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
7048index 5e36c33..eb4a17b 100644
7049--- a/arch/mips/pci/pcie-octeon.c
7050+++ b/arch/mips/pci/pcie-octeon.c
7051@@ -1792,8 +1792,8 @@ static int octeon_dummy_write_config(struct pci_bus *bus, unsigned int devfn,
7052 }
7053
7054 static struct pci_ops octeon_pcie0_ops = {
7055- octeon_pcie0_read_config,
7056- octeon_pcie0_write_config,
7057+ .read = octeon_pcie0_read_config,
7058+ .write = octeon_pcie0_write_config,
7059 };
7060
7061 static struct resource octeon_pcie0_mem_resource = {
7062@@ -1813,8 +1813,8 @@ static struct pci_controller octeon_pcie0_controller = {
7063 };
7064
7065 static struct pci_ops octeon_pcie1_ops = {
7066- octeon_pcie1_read_config,
7067- octeon_pcie1_write_config,
7068+ .read = octeon_pcie1_read_config,
7069+ .write = octeon_pcie1_write_config,
7070 };
7071
7072 static struct resource octeon_pcie1_mem_resource = {
7073@@ -1834,8 +1834,8 @@ static struct pci_controller octeon_pcie1_controller = {
7074 };
7075
7076 static struct pci_ops octeon_dummy_ops = {
7077- octeon_dummy_read_config,
7078- octeon_dummy_write_config,
7079+ .read = octeon_dummy_read_config,
7080+ .write = octeon_dummy_write_config,
7081 };
7082
7083 static struct resource octeon_dummy_mem_resource = {
7084diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7085index a2358b4..7cead4f 100644
7086--- a/arch/mips/sgi-ip27/ip27-nmi.c
7087+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7088@@ -187,9 +187,9 @@ void
7089 cont_nmi_dump(void)
7090 {
7091 #ifndef REAL_NMI_SIGNAL
7092- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7093+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7094
7095- atomic_inc(&nmied_cpus);
7096+ atomic_inc_unchecked(&nmied_cpus);
7097 #endif
7098 /*
7099 * Only allow 1 cpu to proceed
7100@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7101 udelay(10000);
7102 }
7103 #else
7104- while (atomic_read(&nmied_cpus) != num_online_cpus());
7105+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7106 #endif
7107
7108 /*
7109diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7110index a046b30..6799527 100644
7111--- a/arch/mips/sni/rm200.c
7112+++ b/arch/mips/sni/rm200.c
7113@@ -270,7 +270,7 @@ spurious_8259A_irq:
7114 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7115 spurious_irq_mask |= irqmask;
7116 }
7117- atomic_inc(&irq_err_count);
7118+ atomic_inc_unchecked(&irq_err_count);
7119 /*
7120 * Theoretically we do not have to handle this IRQ,
7121 * but in Linux this does not cause problems and is
7122diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7123index 41e873b..34d33a7 100644
7124--- a/arch/mips/vr41xx/common/icu.c
7125+++ b/arch/mips/vr41xx/common/icu.c
7126@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7127
7128 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7129
7130- atomic_inc(&irq_err_count);
7131+ atomic_inc_unchecked(&irq_err_count);
7132
7133 return -1;
7134 }
7135diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7136index ae0e4ee..e8f0692 100644
7137--- a/arch/mips/vr41xx/common/irq.c
7138+++ b/arch/mips/vr41xx/common/irq.c
7139@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7140 irq_cascade_t *cascade;
7141
7142 if (irq >= NR_IRQS) {
7143- atomic_inc(&irq_err_count);
7144+ atomic_inc_unchecked(&irq_err_count);
7145 return;
7146 }
7147
7148@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7149 ret = cascade->get_irq(irq);
7150 irq = ret;
7151 if (ret < 0)
7152- atomic_inc(&irq_err_count);
7153+ atomic_inc_unchecked(&irq_err_count);
7154 else
7155 irq_dispatch(irq);
7156 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7157diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7158index 967d144..db12197 100644
7159--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7160+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7161@@ -11,12 +11,14 @@
7162 #ifndef _ASM_PROC_CACHE_H
7163 #define _ASM_PROC_CACHE_H
7164
7165+#include <linux/const.h>
7166+
7167 /* L1 cache */
7168
7169 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7170 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7171-#define L1_CACHE_BYTES 16 /* bytes per entry */
7172 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7173+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7174 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7175
7176 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7177diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7178index bcb5df2..84fabd2 100644
7179--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7180+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7181@@ -16,13 +16,15 @@
7182 #ifndef _ASM_PROC_CACHE_H
7183 #define _ASM_PROC_CACHE_H
7184
7185+#include <linux/const.h>
7186+
7187 /*
7188 * L1 cache
7189 */
7190 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7191 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7192-#define L1_CACHE_BYTES 32 /* bytes per entry */
7193 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7194+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7195 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7196
7197 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7198diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7199index 4ce7a01..449202a 100644
7200--- a/arch/openrisc/include/asm/cache.h
7201+++ b/arch/openrisc/include/asm/cache.h
7202@@ -19,11 +19,13 @@
7203 #ifndef __ASM_OPENRISC_CACHE_H
7204 #define __ASM_OPENRISC_CACHE_H
7205
7206+#include <linux/const.h>
7207+
7208 /* FIXME: How can we replace these with values from the CPU...
7209 * they shouldn't be hard-coded!
7210 */
7211
7212-#define L1_CACHE_BYTES 16
7213 #define L1_CACHE_SHIFT 4
7214+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7215
7216 #endif /* __ASM_OPENRISC_CACHE_H */
7217diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7218index 226f8ca..9d9b87d 100644
7219--- a/arch/parisc/include/asm/atomic.h
7220+++ b/arch/parisc/include/asm/atomic.h
7221@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7222 return dec;
7223 }
7224
7225+#define atomic64_read_unchecked(v) atomic64_read(v)
7226+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7227+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7228+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7229+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7230+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7231+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7232+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7233+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7234+
7235 #endif /* !CONFIG_64BIT */
7236
7237
7238diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7239index 47f11c7..3420df2 100644
7240--- a/arch/parisc/include/asm/cache.h
7241+++ b/arch/parisc/include/asm/cache.h
7242@@ -5,6 +5,7 @@
7243 #ifndef __ARCH_PARISC_CACHE_H
7244 #define __ARCH_PARISC_CACHE_H
7245
7246+#include <linux/const.h>
7247
7248 /*
7249 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7250@@ -15,13 +16,13 @@
7251 * just ruin performance.
7252 */
7253 #ifdef CONFIG_PA20
7254-#define L1_CACHE_BYTES 64
7255 #define L1_CACHE_SHIFT 6
7256 #else
7257-#define L1_CACHE_BYTES 32
7258 #define L1_CACHE_SHIFT 5
7259 #endif
7260
7261+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7262+
7263 #ifndef __ASSEMBLY__
7264
7265 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7266diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7267index 3391d06..c23a2cc 100644
7268--- a/arch/parisc/include/asm/elf.h
7269+++ b/arch/parisc/include/asm/elf.h
7270@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7271
7272 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7273
7274+#ifdef CONFIG_PAX_ASLR
7275+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7276+
7277+#define PAX_DELTA_MMAP_LEN 16
7278+#define PAX_DELTA_STACK_LEN 16
7279+#endif
7280+
7281 /* This yields a mask that user programs can use to figure out what
7282 instruction set this CPU supports. This could be done in user space,
7283 but it's not easy, and we've already done it here. */
7284diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7285index f213f5b..0af3e8e 100644
7286--- a/arch/parisc/include/asm/pgalloc.h
7287+++ b/arch/parisc/include/asm/pgalloc.h
7288@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7289 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7290 }
7291
7292+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7293+{
7294+ pgd_populate(mm, pgd, pmd);
7295+}
7296+
7297 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7298 {
7299 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7300@@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7301 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7302 #define pmd_free(mm, x) do { } while (0)
7303 #define pgd_populate(mm, pmd, pte) BUG()
7304+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7305
7306 #endif
7307
7308diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7309index 22b89d1..ce34230 100644
7310--- a/arch/parisc/include/asm/pgtable.h
7311+++ b/arch/parisc/include/asm/pgtable.h
7312@@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7313 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7314 #define PAGE_COPY PAGE_EXECREAD
7315 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7316+
7317+#ifdef CONFIG_PAX_PAGEEXEC
7318+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7319+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7320+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7321+#else
7322+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7323+# define PAGE_COPY_NOEXEC PAGE_COPY
7324+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7325+#endif
7326+
7327 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7328 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7329 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7330diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7331index a5cb070..8604ddc 100644
7332--- a/arch/parisc/include/asm/uaccess.h
7333+++ b/arch/parisc/include/asm/uaccess.h
7334@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7335 const void __user *from,
7336 unsigned long n)
7337 {
7338- int sz = __compiletime_object_size(to);
7339+ size_t sz = __compiletime_object_size(to);
7340 int ret = -EFAULT;
7341
7342- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7343+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7344 ret = __copy_from_user(to, from, n);
7345 else
7346 copy_from_user_overflow();
7347diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7348index 50dfafc..b9fc230 100644
7349--- a/arch/parisc/kernel/module.c
7350+++ b/arch/parisc/kernel/module.c
7351@@ -98,16 +98,38 @@
7352
7353 /* three functions to determine where in the module core
7354 * or init pieces the location is */
7355+static inline int in_init_rx(struct module *me, void *loc)
7356+{
7357+ return (loc >= me->module_init_rx &&
7358+ loc < (me->module_init_rx + me->init_size_rx));
7359+}
7360+
7361+static inline int in_init_rw(struct module *me, void *loc)
7362+{
7363+ return (loc >= me->module_init_rw &&
7364+ loc < (me->module_init_rw + me->init_size_rw));
7365+}
7366+
7367 static inline int in_init(struct module *me, void *loc)
7368 {
7369- return (loc >= me->module_init &&
7370- loc <= (me->module_init + me->init_size));
7371+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7372+}
7373+
7374+static inline int in_core_rx(struct module *me, void *loc)
7375+{
7376+ return (loc >= me->module_core_rx &&
7377+ loc < (me->module_core_rx + me->core_size_rx));
7378+}
7379+
7380+static inline int in_core_rw(struct module *me, void *loc)
7381+{
7382+ return (loc >= me->module_core_rw &&
7383+ loc < (me->module_core_rw + me->core_size_rw));
7384 }
7385
7386 static inline int in_core(struct module *me, void *loc)
7387 {
7388- return (loc >= me->module_core &&
7389- loc <= (me->module_core + me->core_size));
7390+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7391 }
7392
7393 static inline int in_local(struct module *me, void *loc)
7394@@ -371,13 +393,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7395 }
7396
7397 /* align things a bit */
7398- me->core_size = ALIGN(me->core_size, 16);
7399- me->arch.got_offset = me->core_size;
7400- me->core_size += gots * sizeof(struct got_entry);
7401+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7402+ me->arch.got_offset = me->core_size_rw;
7403+ me->core_size_rw += gots * sizeof(struct got_entry);
7404
7405- me->core_size = ALIGN(me->core_size, 16);
7406- me->arch.fdesc_offset = me->core_size;
7407- me->core_size += fdescs * sizeof(Elf_Fdesc);
7408+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7409+ me->arch.fdesc_offset = me->core_size_rw;
7410+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7411
7412 me->arch.got_max = gots;
7413 me->arch.fdesc_max = fdescs;
7414@@ -395,7 +417,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7415
7416 BUG_ON(value == 0);
7417
7418- got = me->module_core + me->arch.got_offset;
7419+ got = me->module_core_rw + me->arch.got_offset;
7420 for (i = 0; got[i].addr; i++)
7421 if (got[i].addr == value)
7422 goto out;
7423@@ -413,7 +435,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7424 #ifdef CONFIG_64BIT
7425 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7426 {
7427- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7428+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7429
7430 if (!value) {
7431 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7432@@ -431,7 +453,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7433
7434 /* Create new one */
7435 fdesc->addr = value;
7436- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7437+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7438 return (Elf_Addr)fdesc;
7439 }
7440 #endif /* CONFIG_64BIT */
7441@@ -843,7 +865,7 @@ register_unwind_table(struct module *me,
7442
7443 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7444 end = table + sechdrs[me->arch.unwind_section].sh_size;
7445- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7446+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7447
7448 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7449 me->arch.unwind_section, table, end, gp);
7450diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7451index e1ffea2..46ed66e 100644
7452--- a/arch/parisc/kernel/sys_parisc.c
7453+++ b/arch/parisc/kernel/sys_parisc.c
7454@@ -89,6 +89,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7455 unsigned long task_size = TASK_SIZE;
7456 int do_color_align, last_mmap;
7457 struct vm_unmapped_area_info info;
7458+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7459
7460 if (len > task_size)
7461 return -ENOMEM;
7462@@ -106,6 +107,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7463 goto found_addr;
7464 }
7465
7466+#ifdef CONFIG_PAX_RANDMMAP
7467+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7468+#endif
7469+
7470 if (addr) {
7471 if (do_color_align && last_mmap)
7472 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7473@@ -124,6 +129,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7474 info.high_limit = mmap_upper_limit();
7475 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7476 info.align_offset = shared_align_offset(last_mmap, pgoff);
7477+ info.threadstack_offset = offset;
7478 addr = vm_unmapped_area(&info);
7479
7480 found_addr:
7481@@ -143,6 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7482 unsigned long addr = addr0;
7483 int do_color_align, last_mmap;
7484 struct vm_unmapped_area_info info;
7485+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7486
7487 #ifdef CONFIG_64BIT
7488 /* This should only ever run for 32-bit processes. */
7489@@ -167,6 +174,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7490 }
7491
7492 /* requesting a specific address */
7493+#ifdef CONFIG_PAX_RANDMMAP
7494+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7495+#endif
7496+
7497 if (addr) {
7498 if (do_color_align && last_mmap)
7499 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7500@@ -184,6 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7501 info.high_limit = mm->mmap_base;
7502 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7503 info.align_offset = shared_align_offset(last_mmap, pgoff);
7504+ info.threadstack_offset = offset;
7505 addr = vm_unmapped_area(&info);
7506 if (!(addr & ~PAGE_MASK))
7507 goto found_addr;
7508@@ -249,6 +261,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7509 mm->mmap_legacy_base = mmap_legacy_base();
7510 mm->mmap_base = mmap_upper_limit();
7511
7512+#ifdef CONFIG_PAX_RANDMMAP
7513+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7514+ mm->mmap_legacy_base += mm->delta_mmap;
7515+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7516+ }
7517+#endif
7518+
7519 if (mmap_is_legacy()) {
7520 mm->mmap_base = mm->mmap_legacy_base;
7521 mm->get_unmapped_area = arch_get_unmapped_area;
7522diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7523index 47ee620..1107387 100644
7524--- a/arch/parisc/kernel/traps.c
7525+++ b/arch/parisc/kernel/traps.c
7526@@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7527
7528 down_read(&current->mm->mmap_sem);
7529 vma = find_vma(current->mm,regs->iaoq[0]);
7530- if (vma && (regs->iaoq[0] >= vma->vm_start)
7531- && (vma->vm_flags & VM_EXEC)) {
7532-
7533+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7534 fault_address = regs->iaoq[0];
7535 fault_space = regs->iasq[0];
7536
7537diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7538index 3ca9c11..d163ef7 100644
7539--- a/arch/parisc/mm/fault.c
7540+++ b/arch/parisc/mm/fault.c
7541@@ -15,6 +15,7 @@
7542 #include <linux/sched.h>
7543 #include <linux/interrupt.h>
7544 #include <linux/module.h>
7545+#include <linux/unistd.h>
7546
7547 #include <asm/uaccess.h>
7548 #include <asm/traps.h>
7549@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7550 static unsigned long
7551 parisc_acctyp(unsigned long code, unsigned int inst)
7552 {
7553- if (code == 6 || code == 16)
7554+ if (code == 6 || code == 7 || code == 16)
7555 return VM_EXEC;
7556
7557 switch (inst & 0xf0000000) {
7558@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7559 }
7560 #endif
7561
7562+#ifdef CONFIG_PAX_PAGEEXEC
7563+/*
7564+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7565+ *
7566+ * returns 1 when task should be killed
7567+ * 2 when rt_sigreturn trampoline was detected
7568+ * 3 when unpatched PLT trampoline was detected
7569+ */
7570+static int pax_handle_fetch_fault(struct pt_regs *regs)
7571+{
7572+
7573+#ifdef CONFIG_PAX_EMUPLT
7574+ int err;
7575+
7576+ do { /* PaX: unpatched PLT emulation */
7577+ unsigned int bl, depwi;
7578+
7579+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7580+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7581+
7582+ if (err)
7583+ break;
7584+
7585+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7586+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7587+
7588+ err = get_user(ldw, (unsigned int *)addr);
7589+ err |= get_user(bv, (unsigned int *)(addr+4));
7590+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7591+
7592+ if (err)
7593+ break;
7594+
7595+ if (ldw == 0x0E801096U &&
7596+ bv == 0xEAC0C000U &&
7597+ ldw2 == 0x0E881095U)
7598+ {
7599+ unsigned int resolver, map;
7600+
7601+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7602+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7603+ if (err)
7604+ break;
7605+
7606+ regs->gr[20] = instruction_pointer(regs)+8;
7607+ regs->gr[21] = map;
7608+ regs->gr[22] = resolver;
7609+ regs->iaoq[0] = resolver | 3UL;
7610+ regs->iaoq[1] = regs->iaoq[0] + 4;
7611+ return 3;
7612+ }
7613+ }
7614+ } while (0);
7615+#endif
7616+
7617+#ifdef CONFIG_PAX_EMUTRAMP
7618+
7619+#ifndef CONFIG_PAX_EMUSIGRT
7620+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7621+ return 1;
7622+#endif
7623+
7624+ do { /* PaX: rt_sigreturn emulation */
7625+ unsigned int ldi1, ldi2, bel, nop;
7626+
7627+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7628+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7629+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7630+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7631+
7632+ if (err)
7633+ break;
7634+
7635+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7636+ ldi2 == 0x3414015AU &&
7637+ bel == 0xE4008200U &&
7638+ nop == 0x08000240U)
7639+ {
7640+ regs->gr[25] = (ldi1 & 2) >> 1;
7641+ regs->gr[20] = __NR_rt_sigreturn;
7642+ regs->gr[31] = regs->iaoq[1] + 16;
7643+ regs->sr[0] = regs->iasq[1];
7644+ regs->iaoq[0] = 0x100UL;
7645+ regs->iaoq[1] = regs->iaoq[0] + 4;
7646+ regs->iasq[0] = regs->sr[2];
7647+ regs->iasq[1] = regs->sr[2];
7648+ return 2;
7649+ }
7650+ } while (0);
7651+#endif
7652+
7653+ return 1;
7654+}
7655+
7656+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7657+{
7658+ unsigned long i;
7659+
7660+ printk(KERN_ERR "PAX: bytes at PC: ");
7661+ for (i = 0; i < 5; i++) {
7662+ unsigned int c;
7663+ if (get_user(c, (unsigned int *)pc+i))
7664+ printk(KERN_CONT "???????? ");
7665+ else
7666+ printk(KERN_CONT "%08x ", c);
7667+ }
7668+ printk("\n");
7669+}
7670+#endif
7671+
7672 int fixup_exception(struct pt_regs *regs)
7673 {
7674 const struct exception_table_entry *fix;
7675@@ -234,8 +345,33 @@ retry:
7676
7677 good_area:
7678
7679- if ((vma->vm_flags & acc_type) != acc_type)
7680+ if ((vma->vm_flags & acc_type) != acc_type) {
7681+
7682+#ifdef CONFIG_PAX_PAGEEXEC
7683+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7684+ (address & ~3UL) == instruction_pointer(regs))
7685+ {
7686+ up_read(&mm->mmap_sem);
7687+ switch (pax_handle_fetch_fault(regs)) {
7688+
7689+#ifdef CONFIG_PAX_EMUPLT
7690+ case 3:
7691+ return;
7692+#endif
7693+
7694+#ifdef CONFIG_PAX_EMUTRAMP
7695+ case 2:
7696+ return;
7697+#endif
7698+
7699+ }
7700+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7701+ do_group_exit(SIGKILL);
7702+ }
7703+#endif
7704+
7705 goto bad_area;
7706+ }
7707
7708 /*
7709 * If for any reason at all we couldn't handle the fault, make
7710diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7711index 88eace4..4ba2591 100644
7712--- a/arch/powerpc/Kconfig
7713+++ b/arch/powerpc/Kconfig
7714@@ -404,6 +404,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7715 config KEXEC
7716 bool "kexec system call"
7717 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7718+ depends on !GRKERNSEC_KMEM
7719 help
7720 kexec is a system call that implements the ability to shutdown your
7721 current kernel, and to start another kernel. It is like a reboot
7722diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7723index 512d278..d31fadd 100644
7724--- a/arch/powerpc/include/asm/atomic.h
7725+++ b/arch/powerpc/include/asm/atomic.h
7726@@ -12,6 +12,11 @@
7727
7728 #define ATOMIC_INIT(i) { (i) }
7729
7730+#define _ASM_EXTABLE(from, to) \
7731+" .section __ex_table,\"a\"\n" \
7732+ PPC_LONG" " #from ", " #to"\n" \
7733+" .previous\n"
7734+
7735 static __inline__ int atomic_read(const atomic_t *v)
7736 {
7737 int t;
7738@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7739 return t;
7740 }
7741
7742+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7743+{
7744+ int t;
7745+
7746+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7747+
7748+ return t;
7749+}
7750+
7751 static __inline__ void atomic_set(atomic_t *v, int i)
7752 {
7753 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7754 }
7755
7756-#define ATOMIC_OP(op, asm_op) \
7757-static __inline__ void atomic_##op(int a, atomic_t *v) \
7758+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7759+{
7760+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7761+}
7762+
7763+#ifdef CONFIG_PAX_REFCOUNT
7764+#define __REFCOUNT_OP(op) op##o.
7765+#define __OVERFLOW_PRE \
7766+ " mcrxr cr0\n"
7767+#define __OVERFLOW_POST \
7768+ " bf 4*cr0+so, 3f\n" \
7769+ "2: .long 0x00c00b00\n" \
7770+ "3:\n"
7771+#define __OVERFLOW_EXTABLE \
7772+ "\n4:\n"
7773+ _ASM_EXTABLE(2b, 4b)
7774+#else
7775+#define __REFCOUNT_OP(op) op
7776+#define __OVERFLOW_PRE
7777+#define __OVERFLOW_POST
7778+#define __OVERFLOW_EXTABLE
7779+#endif
7780+
7781+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7782+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7783 { \
7784 int t; \
7785 \
7786 __asm__ __volatile__( \
7787-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7788+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7789+ pre_op \
7790 #asm_op " %0,%2,%0\n" \
7791+ post_op \
7792 PPC405_ERR77(0,%3) \
7793 " stwcx. %0,0,%3 \n" \
7794 " bne- 1b\n" \
7795+ extable \
7796 : "=&r" (t), "+m" (v->counter) \
7797 : "r" (a), "r" (&v->counter) \
7798 : "cc"); \
7799 } \
7800
7801-#define ATOMIC_OP_RETURN(op, asm_op) \
7802-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7803+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7804+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7805+
7806+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7807+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7808 { \
7809 int t; \
7810 \
7811 __asm__ __volatile__( \
7812 PPC_ATOMIC_ENTRY_BARRIER \
7813-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7814+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7815+ pre_op \
7816 #asm_op " %0,%1,%0\n" \
7817+ post_op \
7818 PPC405_ERR77(0,%2) \
7819 " stwcx. %0,0,%2 \n" \
7820 " bne- 1b\n" \
7821+ extable \
7822 PPC_ATOMIC_EXIT_BARRIER \
7823 : "=&r" (t) \
7824 : "r" (a), "r" (&v->counter) \
7825@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7826 return t; \
7827 }
7828
7829+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7830+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7831+
7832 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7833
7834 ATOMIC_OPS(add, add)
7835@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7836
7837 #undef ATOMIC_OPS
7838 #undef ATOMIC_OP_RETURN
7839+#undef __ATOMIC_OP_RETURN
7840 #undef ATOMIC_OP
7841+#undef __ATOMIC_OP
7842
7843 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7844
7845-static __inline__ void atomic_inc(atomic_t *v)
7846-{
7847- int t;
7848+/*
7849+ * atomic_inc - increment atomic variable
7850+ * @v: pointer of type atomic_t
7851+ *
7852+ * Automatically increments @v by 1
7853+ */
7854+#define atomic_inc(v) atomic_add(1, (v))
7855+#define atomic_inc_return(v) atomic_add_return(1, (v))
7856
7857- __asm__ __volatile__(
7858-"1: lwarx %0,0,%2 # atomic_inc\n\
7859- addic %0,%0,1\n"
7860- PPC405_ERR77(0,%2)
7861-" stwcx. %0,0,%2 \n\
7862- bne- 1b"
7863- : "=&r" (t), "+m" (v->counter)
7864- : "r" (&v->counter)
7865- : "cc", "xer");
7866+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7867+{
7868+ atomic_add_unchecked(1, v);
7869 }
7870
7871-static __inline__ int atomic_inc_return(atomic_t *v)
7872+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7873 {
7874- int t;
7875-
7876- __asm__ __volatile__(
7877- PPC_ATOMIC_ENTRY_BARRIER
7878-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7879- addic %0,%0,1\n"
7880- PPC405_ERR77(0,%1)
7881-" stwcx. %0,0,%1 \n\
7882- bne- 1b"
7883- PPC_ATOMIC_EXIT_BARRIER
7884- : "=&r" (t)
7885- : "r" (&v->counter)
7886- : "cc", "xer", "memory");
7887-
7888- return t;
7889+ return atomic_add_return_unchecked(1, v);
7890 }
7891
7892 /*
7893@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7894 */
7895 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7896
7897-static __inline__ void atomic_dec(atomic_t *v)
7898+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7899 {
7900- int t;
7901-
7902- __asm__ __volatile__(
7903-"1: lwarx %0,0,%2 # atomic_dec\n\
7904- addic %0,%0,-1\n"
7905- PPC405_ERR77(0,%2)\
7906-" stwcx. %0,0,%2\n\
7907- bne- 1b"
7908- : "=&r" (t), "+m" (v->counter)
7909- : "r" (&v->counter)
7910- : "cc", "xer");
7911+ return atomic_add_return_unchecked(1, v) == 0;
7912 }
7913
7914-static __inline__ int atomic_dec_return(atomic_t *v)
7915+/*
7916+ * atomic_dec - decrement atomic variable
7917+ * @v: pointer of type atomic_t
7918+ *
7919+ * Atomically decrements @v by 1
7920+ */
7921+#define atomic_dec(v) atomic_sub(1, (v))
7922+#define atomic_dec_return(v) atomic_sub_return(1, (v))
7923+
7924+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7925 {
7926- int t;
7927-
7928- __asm__ __volatile__(
7929- PPC_ATOMIC_ENTRY_BARRIER
7930-"1: lwarx %0,0,%1 # atomic_dec_return\n\
7931- addic %0,%0,-1\n"
7932- PPC405_ERR77(0,%1)
7933-" stwcx. %0,0,%1\n\
7934- bne- 1b"
7935- PPC_ATOMIC_EXIT_BARRIER
7936- : "=&r" (t)
7937- : "r" (&v->counter)
7938- : "cc", "xer", "memory");
7939-
7940- return t;
7941+ atomic_sub_unchecked(1, v);
7942 }
7943
7944 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7945 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7946
7947+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7948+{
7949+ return cmpxchg(&(v->counter), old, new);
7950+}
7951+
7952+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7953+{
7954+ return xchg(&(v->counter), new);
7955+}
7956+
7957 /**
7958 * __atomic_add_unless - add unless the number is a given value
7959 * @v: pointer of type atomic_t
7960@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7961 PPC_ATOMIC_ENTRY_BARRIER
7962 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7963 cmpw 0,%0,%3 \n\
7964- beq- 2f \n\
7965- add %0,%2,%0 \n"
7966+ beq- 2f \n"
7967+
7968+#ifdef CONFIG_PAX_REFCOUNT
7969+" mcrxr cr0\n"
7970+" addo. %0,%2,%0\n"
7971+" bf 4*cr0+so, 4f\n"
7972+"3:.long " "0x00c00b00""\n"
7973+"4:\n"
7974+#else
7975+ "add %0,%2,%0 \n"
7976+#endif
7977+
7978 PPC405_ERR77(0,%2)
7979 " stwcx. %0,0,%1 \n\
7980 bne- 1b \n"
7981+"5:"
7982+
7983+#ifdef CONFIG_PAX_REFCOUNT
7984+ _ASM_EXTABLE(3b, 5b)
7985+#endif
7986+
7987 PPC_ATOMIC_EXIT_BARRIER
7988 " subf %0,%2,%0 \n\
7989 2:"
7990@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7991 }
7992 #define atomic_dec_if_positive atomic_dec_if_positive
7993
7994+#define smp_mb__before_atomic_dec() smp_mb()
7995+#define smp_mb__after_atomic_dec() smp_mb()
7996+#define smp_mb__before_atomic_inc() smp_mb()
7997+#define smp_mb__after_atomic_inc() smp_mb()
7998+
7999 #ifdef __powerpc64__
8000
8001 #define ATOMIC64_INIT(i) { (i) }
8002@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
8003 return t;
8004 }
8005
8006+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
8007+{
8008+ long t;
8009+
8010+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
8011+
8012+ return t;
8013+}
8014+
8015 static __inline__ void atomic64_set(atomic64_t *v, long i)
8016 {
8017 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8018 }
8019
8020-#define ATOMIC64_OP(op, asm_op) \
8021-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
8022+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
8023+{
8024+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
8025+}
8026+
8027+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
8028+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
8029 { \
8030 long t; \
8031 \
8032 __asm__ __volatile__( \
8033 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
8034+ pre_op \
8035 #asm_op " %0,%2,%0\n" \
8036+ post_op \
8037 " stdcx. %0,0,%3 \n" \
8038 " bne- 1b\n" \
8039+ extable \
8040 : "=&r" (t), "+m" (v->counter) \
8041 : "r" (a), "r" (&v->counter) \
8042 : "cc"); \
8043 }
8044
8045-#define ATOMIC64_OP_RETURN(op, asm_op) \
8046-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8047+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8048+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8049+
8050+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8051+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8052 { \
8053 long t; \
8054 \
8055 __asm__ __volatile__( \
8056 PPC_ATOMIC_ENTRY_BARRIER \
8057 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8058+ pre_op \
8059 #asm_op " %0,%1,%0\n" \
8060+ post_op \
8061 " stdcx. %0,0,%2 \n" \
8062 " bne- 1b\n" \
8063+ extable \
8064 PPC_ATOMIC_EXIT_BARRIER \
8065 : "=&r" (t) \
8066 : "r" (a), "r" (&v->counter) \
8067@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8068 return t; \
8069 }
8070
8071+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8072+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8073+
8074 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8075
8076 ATOMIC64_OPS(add, add)
8077@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8078
8079 #undef ATOMIC64_OPS
8080 #undef ATOMIC64_OP_RETURN
8081+#undef __ATOMIC64_OP_RETURN
8082 #undef ATOMIC64_OP
8083+#undef __ATOMIC64_OP
8084+#undef __OVERFLOW_EXTABLE
8085+#undef __OVERFLOW_POST
8086+#undef __OVERFLOW_PRE
8087+#undef __REFCOUNT_OP
8088
8089 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8090
8091-static __inline__ void atomic64_inc(atomic64_t *v)
8092-{
8093- long t;
8094+/*
8095+ * atomic64_inc - increment atomic variable
8096+ * @v: pointer of type atomic64_t
8097+ *
8098+ * Automatically increments @v by 1
8099+ */
8100+#define atomic64_inc(v) atomic64_add(1, (v))
8101+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8102
8103- __asm__ __volatile__(
8104-"1: ldarx %0,0,%2 # atomic64_inc\n\
8105- addic %0,%0,1\n\
8106- stdcx. %0,0,%2 \n\
8107- bne- 1b"
8108- : "=&r" (t), "+m" (v->counter)
8109- : "r" (&v->counter)
8110- : "cc", "xer");
8111+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8112+{
8113+ atomic64_add_unchecked(1, v);
8114 }
8115
8116-static __inline__ long atomic64_inc_return(atomic64_t *v)
8117+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8118 {
8119- long t;
8120-
8121- __asm__ __volatile__(
8122- PPC_ATOMIC_ENTRY_BARRIER
8123-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8124- addic %0,%0,1\n\
8125- stdcx. %0,0,%1 \n\
8126- bne- 1b"
8127- PPC_ATOMIC_EXIT_BARRIER
8128- : "=&r" (t)
8129- : "r" (&v->counter)
8130- : "cc", "xer", "memory");
8131-
8132- return t;
8133+ return atomic64_add_return_unchecked(1, v);
8134 }
8135
8136 /*
8137@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8138 */
8139 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8140
8141-static __inline__ void atomic64_dec(atomic64_t *v)
8142+/*
8143+ * atomic64_dec - decrement atomic variable
8144+ * @v: pointer of type atomic64_t
8145+ *
8146+ * Atomically decrements @v by 1
8147+ */
8148+#define atomic64_dec(v) atomic64_sub(1, (v))
8149+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8150+
8151+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8152 {
8153- long t;
8154-
8155- __asm__ __volatile__(
8156-"1: ldarx %0,0,%2 # atomic64_dec\n\
8157- addic %0,%0,-1\n\
8158- stdcx. %0,0,%2\n\
8159- bne- 1b"
8160- : "=&r" (t), "+m" (v->counter)
8161- : "r" (&v->counter)
8162- : "cc", "xer");
8163-}
8164-
8165-static __inline__ long atomic64_dec_return(atomic64_t *v)
8166-{
8167- long t;
8168-
8169- __asm__ __volatile__(
8170- PPC_ATOMIC_ENTRY_BARRIER
8171-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8172- addic %0,%0,-1\n\
8173- stdcx. %0,0,%1\n\
8174- bne- 1b"
8175- PPC_ATOMIC_EXIT_BARRIER
8176- : "=&r" (t)
8177- : "r" (&v->counter)
8178- : "cc", "xer", "memory");
8179-
8180- return t;
8181+ atomic64_sub_unchecked(1, v);
8182 }
8183
8184 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8185@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8186 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8187 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8188
8189+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8190+{
8191+ return cmpxchg(&(v->counter), old, new);
8192+}
8193+
8194+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8195+{
8196+ return xchg(&(v->counter), new);
8197+}
8198+
8199 /**
8200 * atomic64_add_unless - add unless the number is a given value
8201 * @v: pointer of type atomic64_t
8202@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8203
8204 __asm__ __volatile__ (
8205 PPC_ATOMIC_ENTRY_BARRIER
8206-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8207+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8208 cmpd 0,%0,%3 \n\
8209- beq- 2f \n\
8210- add %0,%2,%0 \n"
8211+ beq- 2f \n"
8212+
8213+#ifdef CONFIG_PAX_REFCOUNT
8214+" mcrxr cr0\n"
8215+" addo. %0,%2,%0\n"
8216+" bf 4*cr0+so, 4f\n"
8217+"3:.long " "0x00c00b00""\n"
8218+"4:\n"
8219+#else
8220+ "add %0,%2,%0 \n"
8221+#endif
8222+
8223 " stdcx. %0,0,%1 \n\
8224 bne- 1b \n"
8225 PPC_ATOMIC_EXIT_BARRIER
8226+"5:"
8227+
8228+#ifdef CONFIG_PAX_REFCOUNT
8229+ _ASM_EXTABLE(3b, 5b)
8230+#endif
8231+
8232 " subf %0,%2,%0 \n\
8233 2:"
8234 : "=&r" (t)
8235diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8236index bab79a1..4a3eabc 100644
8237--- a/arch/powerpc/include/asm/barrier.h
8238+++ b/arch/powerpc/include/asm/barrier.h
8239@@ -73,7 +73,7 @@
8240 do { \
8241 compiletime_assert_atomic_type(*p); \
8242 __lwsync(); \
8243- ACCESS_ONCE(*p) = (v); \
8244+ ACCESS_ONCE_RW(*p) = (v); \
8245 } while (0)
8246
8247 #define smp_load_acquire(p) \
8248diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8249index 34a05a1..a1f2c67 100644
8250--- a/arch/powerpc/include/asm/cache.h
8251+++ b/arch/powerpc/include/asm/cache.h
8252@@ -4,6 +4,7 @@
8253 #ifdef __KERNEL__
8254
8255 #include <asm/reg.h>
8256+#include <linux/const.h>
8257
8258 /* bytes per L1 cache line */
8259 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8260@@ -23,7 +24,7 @@
8261 #define L1_CACHE_SHIFT 7
8262 #endif
8263
8264-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8265+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8266
8267 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8268
8269diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8270index 888d8f3..66f581c 100644
8271--- a/arch/powerpc/include/asm/elf.h
8272+++ b/arch/powerpc/include/asm/elf.h
8273@@ -28,8 +28,19 @@
8274 the loader. We need to make sure that it is out of the way of the program
8275 that it will "exec", and that there is sufficient room for the brk. */
8276
8277-extern unsigned long randomize_et_dyn(unsigned long base);
8278-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
8279+#define ELF_ET_DYN_BASE (0x20000000)
8280+
8281+#ifdef CONFIG_PAX_ASLR
8282+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8283+
8284+#ifdef __powerpc64__
8285+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8286+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8287+#else
8288+#define PAX_DELTA_MMAP_LEN 15
8289+#define PAX_DELTA_STACK_LEN 15
8290+#endif
8291+#endif
8292
8293 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8294
8295@@ -129,10 +140,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8296 (0x7ff >> (PAGE_SHIFT - 12)) : \
8297 (0x3ffff >> (PAGE_SHIFT - 12)))
8298
8299-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8300-#define arch_randomize_brk arch_randomize_brk
8301-
8302-
8303 #ifdef CONFIG_SPU_BASE
8304 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8305 #define NT_SPU 1
8306diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8307index 8196e9c..d83a9f3 100644
8308--- a/arch/powerpc/include/asm/exec.h
8309+++ b/arch/powerpc/include/asm/exec.h
8310@@ -4,6 +4,6 @@
8311 #ifndef _ASM_POWERPC_EXEC_H
8312 #define _ASM_POWERPC_EXEC_H
8313
8314-extern unsigned long arch_align_stack(unsigned long sp);
8315+#define arch_align_stack(x) ((x) & ~0xfUL)
8316
8317 #endif /* _ASM_POWERPC_EXEC_H */
8318diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8319index 5acabbd..7ea14fa 100644
8320--- a/arch/powerpc/include/asm/kmap_types.h
8321+++ b/arch/powerpc/include/asm/kmap_types.h
8322@@ -10,7 +10,7 @@
8323 * 2 of the License, or (at your option) any later version.
8324 */
8325
8326-#define KM_TYPE_NR 16
8327+#define KM_TYPE_NR 17
8328
8329 #endif /* __KERNEL__ */
8330 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8331diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8332index b8da913..c02b593 100644
8333--- a/arch/powerpc/include/asm/local.h
8334+++ b/arch/powerpc/include/asm/local.h
8335@@ -9,21 +9,65 @@ typedef struct
8336 atomic_long_t a;
8337 } local_t;
8338
8339+typedef struct
8340+{
8341+ atomic_long_unchecked_t a;
8342+} local_unchecked_t;
8343+
8344 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8345
8346 #define local_read(l) atomic_long_read(&(l)->a)
8347+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8348 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8349+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8350
8351 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8352+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8353 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8354+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8355 #define local_inc(l) atomic_long_inc(&(l)->a)
8356+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8357 #define local_dec(l) atomic_long_dec(&(l)->a)
8358+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8359
8360 static __inline__ long local_add_return(long a, local_t *l)
8361 {
8362 long t;
8363
8364 __asm__ __volatile__(
8365+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8366+
8367+#ifdef CONFIG_PAX_REFCOUNT
8368+" mcrxr cr0\n"
8369+" addo. %0,%1,%0\n"
8370+" bf 4*cr0+so, 3f\n"
8371+"2:.long " "0x00c00b00""\n"
8372+#else
8373+" add %0,%1,%0\n"
8374+#endif
8375+
8376+"3:\n"
8377+ PPC405_ERR77(0,%2)
8378+ PPC_STLCX "%0,0,%2 \n\
8379+ bne- 1b"
8380+
8381+#ifdef CONFIG_PAX_REFCOUNT
8382+"\n4:\n"
8383+ _ASM_EXTABLE(2b, 4b)
8384+#endif
8385+
8386+ : "=&r" (t)
8387+ : "r" (a), "r" (&(l->a.counter))
8388+ : "cc", "memory");
8389+
8390+ return t;
8391+}
8392+
8393+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8394+{
8395+ long t;
8396+
8397+ __asm__ __volatile__(
8398 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8399 add %0,%1,%0\n"
8400 PPC405_ERR77(0,%2)
8401@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8402
8403 #define local_cmpxchg(l, o, n) \
8404 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8405+#define local_cmpxchg_unchecked(l, o, n) \
8406+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8407 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8408
8409 /**
8410diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8411index 8565c25..2865190 100644
8412--- a/arch/powerpc/include/asm/mman.h
8413+++ b/arch/powerpc/include/asm/mman.h
8414@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8415 }
8416 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8417
8418-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8419+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8420 {
8421 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8422 }
8423diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8424index 26fe1ae..987ffc5 100644
8425--- a/arch/powerpc/include/asm/page.h
8426+++ b/arch/powerpc/include/asm/page.h
8427@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8428 * and needs to be executable. This means the whole heap ends
8429 * up being executable.
8430 */
8431-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8432- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8433+#define VM_DATA_DEFAULT_FLAGS32 \
8434+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8435+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8436
8437 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8438 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8439@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8440 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8441 #endif
8442
8443+#define ktla_ktva(addr) (addr)
8444+#define ktva_ktla(addr) (addr)
8445+
8446 #ifndef CONFIG_PPC_BOOK3S_64
8447 /*
8448 * Use the top bit of the higher-level page table entries to indicate whether
8449diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8450index d908a46..3753f71 100644
8451--- a/arch/powerpc/include/asm/page_64.h
8452+++ b/arch/powerpc/include/asm/page_64.h
8453@@ -172,15 +172,18 @@ do { \
8454 * stack by default, so in the absence of a PT_GNU_STACK program header
8455 * we turn execute permission off.
8456 */
8457-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8458- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8459+#define VM_STACK_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_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8464 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8465
8466+#ifndef CONFIG_PAX_PAGEEXEC
8467 #define VM_STACK_DEFAULT_FLAGS \
8468 (is_32bit_task() ? \
8469 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8470+#endif
8471
8472 #include <asm-generic/getorder.h>
8473
8474diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8475index 4b0be20..c15a27d 100644
8476--- a/arch/powerpc/include/asm/pgalloc-64.h
8477+++ b/arch/powerpc/include/asm/pgalloc-64.h
8478@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8479 #ifndef CONFIG_PPC_64K_PAGES
8480
8481 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8482+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8483
8484 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8485 {
8486@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8487 pud_set(pud, (unsigned long)pmd);
8488 }
8489
8490+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8491+{
8492+ pud_populate(mm, pud, pmd);
8493+}
8494+
8495 #define pmd_populate(mm, pmd, pte_page) \
8496 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8497 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8498@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8499 #endif
8500
8501 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8502+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8503
8504 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8505 pte_t *pte)
8506diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8507index 316f9a5..ba05c77 100644
8508--- a/arch/powerpc/include/asm/pgtable.h
8509+++ b/arch/powerpc/include/asm/pgtable.h
8510@@ -2,6 +2,7 @@
8511 #define _ASM_POWERPC_PGTABLE_H
8512 #ifdef __KERNEL__
8513
8514+#include <linux/const.h>
8515 #ifndef __ASSEMBLY__
8516 #include <linux/mmdebug.h>
8517 #include <linux/mmzone.h>
8518diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8519index 4aad413..85d86bf 100644
8520--- a/arch/powerpc/include/asm/pte-hash32.h
8521+++ b/arch/powerpc/include/asm/pte-hash32.h
8522@@ -21,6 +21,7 @@
8523 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
8524 #define _PAGE_USER 0x004 /* usermode access allowed */
8525 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8526+#define _PAGE_EXEC _PAGE_GUARDED
8527 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8528 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8529 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8530diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8531index c998279..d13a9f8 100644
8532--- a/arch/powerpc/include/asm/reg.h
8533+++ b/arch/powerpc/include/asm/reg.h
8534@@ -251,6 +251,7 @@
8535 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8536 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8537 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8538+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8539 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8540 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8541 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8542diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8543index 5a6614a..d89995d1 100644
8544--- a/arch/powerpc/include/asm/smp.h
8545+++ b/arch/powerpc/include/asm/smp.h
8546@@ -51,7 +51,7 @@ struct smp_ops_t {
8547 int (*cpu_disable)(void);
8548 void (*cpu_die)(unsigned int nr);
8549 int (*cpu_bootable)(unsigned int nr);
8550-};
8551+} __no_const;
8552
8553 extern void smp_send_debugger_break(void);
8554 extern void start_secondary_resume(void);
8555diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8556index 4dbe072..b803275 100644
8557--- a/arch/powerpc/include/asm/spinlock.h
8558+++ b/arch/powerpc/include/asm/spinlock.h
8559@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8560 __asm__ __volatile__(
8561 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8562 __DO_SIGN_EXTEND
8563-" addic. %0,%0,1\n\
8564- ble- 2f\n"
8565+
8566+#ifdef CONFIG_PAX_REFCOUNT
8567+" mcrxr cr0\n"
8568+" addico. %0,%0,1\n"
8569+" bf 4*cr0+so, 3f\n"
8570+"2:.long " "0x00c00b00""\n"
8571+#else
8572+" addic. %0,%0,1\n"
8573+#endif
8574+
8575+"3:\n"
8576+ "ble- 4f\n"
8577 PPC405_ERR77(0,%1)
8578 " stwcx. %0,0,%1\n\
8579 bne- 1b\n"
8580 PPC_ACQUIRE_BARRIER
8581-"2:" : "=&r" (tmp)
8582+"4:"
8583+
8584+#ifdef CONFIG_PAX_REFCOUNT
8585+ _ASM_EXTABLE(2b,4b)
8586+#endif
8587+
8588+ : "=&r" (tmp)
8589 : "r" (&rw->lock)
8590 : "cr0", "xer", "memory");
8591
8592@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8593 __asm__ __volatile__(
8594 "# read_unlock\n\t"
8595 PPC_RELEASE_BARRIER
8596-"1: lwarx %0,0,%1\n\
8597- addic %0,%0,-1\n"
8598+"1: lwarx %0,0,%1\n"
8599+
8600+#ifdef CONFIG_PAX_REFCOUNT
8601+" mcrxr cr0\n"
8602+" addico. %0,%0,-1\n"
8603+" bf 4*cr0+so, 3f\n"
8604+"2:.long " "0x00c00b00""\n"
8605+#else
8606+" addic. %0,%0,-1\n"
8607+#endif
8608+
8609+"3:\n"
8610 PPC405_ERR77(0,%1)
8611 " stwcx. %0,0,%1\n\
8612 bne- 1b"
8613+
8614+#ifdef CONFIG_PAX_REFCOUNT
8615+"\n4:\n"
8616+ _ASM_EXTABLE(2b, 4b)
8617+#endif
8618+
8619 : "=&r"(tmp)
8620 : "r"(&rw->lock)
8621 : "cr0", "xer", "memory");
8622diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8623index b034ecd..af7e31f 100644
8624--- a/arch/powerpc/include/asm/thread_info.h
8625+++ b/arch/powerpc/include/asm/thread_info.h
8626@@ -107,6 +107,8 @@ static inline struct thread_info *current_thread_info(void)
8627 #if defined(CONFIG_PPC64)
8628 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8629 #endif
8630+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8631+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8632
8633 /* as above, but as bit values */
8634 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8635@@ -125,9 +127,10 @@ static inline struct thread_info *current_thread_info(void)
8636 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8637 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8638 #define _TIF_NOHZ (1<<TIF_NOHZ)
8639+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8640 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8641 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8642- _TIF_NOHZ)
8643+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8644
8645 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8646 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8647diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8648index 9485b43..3bd3c16 100644
8649--- a/arch/powerpc/include/asm/uaccess.h
8650+++ b/arch/powerpc/include/asm/uaccess.h
8651@@ -58,6 +58,7 @@
8652
8653 #endif
8654
8655+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8656 #define access_ok(type, addr, size) \
8657 (__chk_user_ptr(addr), \
8658 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8659@@ -318,52 +319,6 @@ do { \
8660 extern unsigned long __copy_tofrom_user(void __user *to,
8661 const void __user *from, unsigned long size);
8662
8663-#ifndef __powerpc64__
8664-
8665-static inline unsigned long copy_from_user(void *to,
8666- const void __user *from, unsigned long n)
8667-{
8668- unsigned long over;
8669-
8670- if (access_ok(VERIFY_READ, from, n))
8671- return __copy_tofrom_user((__force void __user *)to, from, n);
8672- if ((unsigned long)from < TASK_SIZE) {
8673- over = (unsigned long)from + n - TASK_SIZE;
8674- return __copy_tofrom_user((__force void __user *)to, from,
8675- n - over) + over;
8676- }
8677- return n;
8678-}
8679-
8680-static inline unsigned long copy_to_user(void __user *to,
8681- const void *from, unsigned long n)
8682-{
8683- unsigned long over;
8684-
8685- if (access_ok(VERIFY_WRITE, to, n))
8686- return __copy_tofrom_user(to, (__force void __user *)from, n);
8687- if ((unsigned long)to < TASK_SIZE) {
8688- over = (unsigned long)to + n - TASK_SIZE;
8689- return __copy_tofrom_user(to, (__force void __user *)from,
8690- n - over) + over;
8691- }
8692- return n;
8693-}
8694-
8695-#else /* __powerpc64__ */
8696-
8697-#define __copy_in_user(to, from, size) \
8698- __copy_tofrom_user((to), (from), (size))
8699-
8700-extern unsigned long copy_from_user(void *to, const void __user *from,
8701- unsigned long n);
8702-extern unsigned long copy_to_user(void __user *to, const void *from,
8703- unsigned long n);
8704-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8705- unsigned long n);
8706-
8707-#endif /* __powerpc64__ */
8708-
8709 static inline unsigned long __copy_from_user_inatomic(void *to,
8710 const void __user *from, unsigned long n)
8711 {
8712@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8713 if (ret == 0)
8714 return 0;
8715 }
8716+
8717+ if (!__builtin_constant_p(n))
8718+ check_object_size(to, n, false);
8719+
8720 return __copy_tofrom_user((__force void __user *)to, from, n);
8721 }
8722
8723@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8724 if (ret == 0)
8725 return 0;
8726 }
8727+
8728+ if (!__builtin_constant_p(n))
8729+ check_object_size(from, n, true);
8730+
8731 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8732 }
8733
8734@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8735 return __copy_to_user_inatomic(to, from, size);
8736 }
8737
8738+#ifndef __powerpc64__
8739+
8740+static inline unsigned long __must_check copy_from_user(void *to,
8741+ const void __user *from, unsigned long n)
8742+{
8743+ unsigned long over;
8744+
8745+ if ((long)n < 0)
8746+ return n;
8747+
8748+ if (access_ok(VERIFY_READ, from, n)) {
8749+ if (!__builtin_constant_p(n))
8750+ check_object_size(to, n, false);
8751+ return __copy_tofrom_user((__force void __user *)to, from, n);
8752+ }
8753+ if ((unsigned long)from < TASK_SIZE) {
8754+ over = (unsigned long)from + n - TASK_SIZE;
8755+ if (!__builtin_constant_p(n - over))
8756+ check_object_size(to, n - over, false);
8757+ return __copy_tofrom_user((__force void __user *)to, from,
8758+ n - over) + over;
8759+ }
8760+ return n;
8761+}
8762+
8763+static inline unsigned long __must_check copy_to_user(void __user *to,
8764+ const void *from, unsigned long n)
8765+{
8766+ unsigned long over;
8767+
8768+ if ((long)n < 0)
8769+ return n;
8770+
8771+ if (access_ok(VERIFY_WRITE, to, n)) {
8772+ if (!__builtin_constant_p(n))
8773+ check_object_size(from, n, true);
8774+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8775+ }
8776+ if ((unsigned long)to < TASK_SIZE) {
8777+ over = (unsigned long)to + n - TASK_SIZE;
8778+ if (!__builtin_constant_p(n))
8779+ check_object_size(from, n - over, true);
8780+ return __copy_tofrom_user(to, (__force void __user *)from,
8781+ n - over) + over;
8782+ }
8783+ return n;
8784+}
8785+
8786+#else /* __powerpc64__ */
8787+
8788+#define __copy_in_user(to, from, size) \
8789+ __copy_tofrom_user((to), (from), (size))
8790+
8791+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8792+{
8793+ if ((long)n < 0 || n > INT_MAX)
8794+ return n;
8795+
8796+ if (!__builtin_constant_p(n))
8797+ check_object_size(to, n, false);
8798+
8799+ if (likely(access_ok(VERIFY_READ, from, n)))
8800+ n = __copy_from_user(to, from, n);
8801+ else
8802+ memset(to, 0, n);
8803+ return n;
8804+}
8805+
8806+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8807+{
8808+ if ((long)n < 0 || n > INT_MAX)
8809+ return n;
8810+
8811+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8812+ if (!__builtin_constant_p(n))
8813+ check_object_size(from, n, true);
8814+ n = __copy_to_user(to, from, n);
8815+ }
8816+ return n;
8817+}
8818+
8819+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8820+ unsigned long n);
8821+
8822+#endif /* __powerpc64__ */
8823+
8824 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8825
8826 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8827diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8828index 502cf69..822e63b 100644
8829--- a/arch/powerpc/kernel/Makefile
8830+++ b/arch/powerpc/kernel/Makefile
8831@@ -27,6 +27,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8832 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8833 endif
8834
8835+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8836+
8837 obj-y := cputable.o ptrace.o syscalls.o \
8838 irq.o align.o signal_32.o pmc.o vdso.o \
8839 process.o systbl.o idle.o \
8840diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8841index 3e68d1c..72a5ee6 100644
8842--- a/arch/powerpc/kernel/exceptions-64e.S
8843+++ b/arch/powerpc/kernel/exceptions-64e.S
8844@@ -1010,6 +1010,7 @@ storage_fault_common:
8845 std r14,_DAR(r1)
8846 std r15,_DSISR(r1)
8847 addi r3,r1,STACK_FRAME_OVERHEAD
8848+ bl save_nvgprs
8849 mr r4,r14
8850 mr r5,r15
8851 ld r14,PACA_EXGEN+EX_R14(r13)
8852@@ -1018,8 +1019,7 @@ storage_fault_common:
8853 cmpdi r3,0
8854 bne- 1f
8855 b ret_from_except_lite
8856-1: bl save_nvgprs
8857- mr r5,r3
8858+1: mr r5,r3
8859 addi r3,r1,STACK_FRAME_OVERHEAD
8860 ld r4,_DAR(r1)
8861 bl bad_page_fault
8862diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8863index 72e783e..fe058e2 100644
8864--- a/arch/powerpc/kernel/exceptions-64s.S
8865+++ b/arch/powerpc/kernel/exceptions-64s.S
8866@@ -1588,10 +1588,10 @@ handle_page_fault:
8867 11: ld r4,_DAR(r1)
8868 ld r5,_DSISR(r1)
8869 addi r3,r1,STACK_FRAME_OVERHEAD
8870+ bl save_nvgprs
8871 bl do_page_fault
8872 cmpdi r3,0
8873 beq+ 12f
8874- bl save_nvgprs
8875 mr r5,r3
8876 addi r3,r1,STACK_FRAME_OVERHEAD
8877 lwz r4,_DAR(r1)
8878diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8879index c143835..5a9697f 100644
8880--- a/arch/powerpc/kernel/irq.c
8881+++ b/arch/powerpc/kernel/irq.c
8882@@ -461,6 +461,8 @@ void migrate_irqs(void)
8883 }
8884 #endif
8885
8886+extern void gr_handle_kernel_exploit(void);
8887+
8888 static inline void check_stack_overflow(void)
8889 {
8890 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8891@@ -473,6 +475,7 @@ static inline void check_stack_overflow(void)
8892 pr_err("do_IRQ: stack overflow: %ld\n",
8893 sp - sizeof(struct thread_info));
8894 dump_stack();
8895+ gr_handle_kernel_exploit();
8896 }
8897 #endif
8898 }
8899diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8900index c94d2e0..992a9ce 100644
8901--- a/arch/powerpc/kernel/module_32.c
8902+++ b/arch/powerpc/kernel/module_32.c
8903@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8904 me->arch.core_plt_section = i;
8905 }
8906 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8907- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8908+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8909 return -ENOEXEC;
8910 }
8911
8912@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8913
8914 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8915 /* Init, or core PLT? */
8916- if (location >= mod->module_core
8917- && location < mod->module_core + mod->core_size)
8918+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8919+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8920 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8921- else
8922+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8923+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8924 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8925+ else {
8926+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8927+ return ~0UL;
8928+ }
8929
8930 /* Find this entry, or if that fails, the next avail. entry */
8931 while (entry->jump[0]) {
8932@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8933 }
8934 #ifdef CONFIG_DYNAMIC_FTRACE
8935 module->arch.tramp =
8936- do_plt_call(module->module_core,
8937+ do_plt_call(module->module_core_rx,
8938 (unsigned long)ftrace_caller,
8939 sechdrs, module);
8940 #endif
8941diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8942index 923cd2d..ae782a9 100644
8943--- a/arch/powerpc/kernel/process.c
8944+++ b/arch/powerpc/kernel/process.c
8945@@ -1040,8 +1040,8 @@ void show_regs(struct pt_regs * regs)
8946 * Lookup NIP late so we have the best change of getting the
8947 * above info out without failing
8948 */
8949- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8950- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8951+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8952+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8953 #endif
8954 show_stack(current, (unsigned long *) regs->gpr[1]);
8955 if (!user_mode(regs))
8956@@ -1560,10 +1560,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8957 newsp = stack[0];
8958 ip = stack[STACK_FRAME_LR_SAVE];
8959 if (!firstframe || ip != lr) {
8960- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8961+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8962 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8963 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
8964- printk(" (%pS)",
8965+ printk(" (%pA)",
8966 (void *)current->ret_stack[curr_frame].ret);
8967 curr_frame--;
8968 }
8969@@ -1583,7 +1583,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8970 struct pt_regs *regs = (struct pt_regs *)
8971 (sp + STACK_FRAME_OVERHEAD);
8972 lr = regs->link;
8973- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8974+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8975 regs->trap, (void *)regs->nip, (void *)lr);
8976 firstframe = 1;
8977 }
8978@@ -1619,58 +1619,3 @@ void notrace __ppc64_runlatch_off(void)
8979 mtspr(SPRN_CTRLT, ctrl);
8980 }
8981 #endif /* CONFIG_PPC64 */
8982-
8983-unsigned long arch_align_stack(unsigned long sp)
8984-{
8985- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8986- sp -= get_random_int() & ~PAGE_MASK;
8987- return sp & ~0xf;
8988-}
8989-
8990-static inline unsigned long brk_rnd(void)
8991-{
8992- unsigned long rnd = 0;
8993-
8994- /* 8MB for 32bit, 1GB for 64bit */
8995- if (is_32bit_task())
8996- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8997- else
8998- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8999-
9000- return rnd << PAGE_SHIFT;
9001-}
9002-
9003-unsigned long arch_randomize_brk(struct mm_struct *mm)
9004-{
9005- unsigned long base = mm->brk;
9006- unsigned long ret;
9007-
9008-#ifdef CONFIG_PPC_STD_MMU_64
9009- /*
9010- * If we are using 1TB segments and we are allowed to randomise
9011- * the heap, we can put it above 1TB so it is backed by a 1TB
9012- * segment. Otherwise the heap will be in the bottom 1TB
9013- * which always uses 256MB segments and this may result in a
9014- * performance penalty.
9015- */
9016- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
9017- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
9018-#endif
9019-
9020- ret = PAGE_ALIGN(base + brk_rnd());
9021-
9022- if (ret < mm->brk)
9023- return mm->brk;
9024-
9025- return ret;
9026-}
9027-
9028-unsigned long randomize_et_dyn(unsigned long base)
9029-{
9030- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
9031-
9032- if (ret < base)
9033- return base;
9034-
9035- return ret;
9036-}
9037diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
9038index f21897b..28c0428 100644
9039--- a/arch/powerpc/kernel/ptrace.c
9040+++ b/arch/powerpc/kernel/ptrace.c
9041@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
9042 return ret;
9043 }
9044
9045+#ifdef CONFIG_GRKERNSEC_SETXID
9046+extern void gr_delayed_cred_worker(void);
9047+#endif
9048+
9049 /*
9050 * We must return the syscall number to actually look up in the table.
9051 * This can be -1L to skip running any syscall at all.
9052@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9053
9054 secure_computing_strict(regs->gpr[0]);
9055
9056+#ifdef CONFIG_GRKERNSEC_SETXID
9057+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9058+ gr_delayed_cred_worker();
9059+#endif
9060+
9061 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9062 tracehook_report_syscall_entry(regs))
9063 /*
9064@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9065 {
9066 int step;
9067
9068+#ifdef CONFIG_GRKERNSEC_SETXID
9069+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9070+ gr_delayed_cred_worker();
9071+#endif
9072+
9073 audit_syscall_exit(regs);
9074
9075 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9076diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9077index b171001..4ac7ac5 100644
9078--- a/arch/powerpc/kernel/signal_32.c
9079+++ b/arch/powerpc/kernel/signal_32.c
9080@@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9081 /* Save user registers on the stack */
9082 frame = &rt_sf->uc.uc_mcontext;
9083 addr = frame;
9084- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9085+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9086 sigret = 0;
9087 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9088 } else {
9089diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9090index 2cb0c94..c0c0bc9 100644
9091--- a/arch/powerpc/kernel/signal_64.c
9092+++ b/arch/powerpc/kernel/signal_64.c
9093@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9094 current->thread.fp_state.fpscr = 0;
9095
9096 /* Set up to return from userspace. */
9097- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9098+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9099 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9100 } else {
9101 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9102diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9103index 0dc43f9..a885d33 100644
9104--- a/arch/powerpc/kernel/traps.c
9105+++ b/arch/powerpc/kernel/traps.c
9106@@ -36,6 +36,7 @@
9107 #include <linux/debugfs.h>
9108 #include <linux/ratelimit.h>
9109 #include <linux/context_tracking.h>
9110+#include <linux/uaccess.h>
9111
9112 #include <asm/emulated_ops.h>
9113 #include <asm/pgtable.h>
9114@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9115 return flags;
9116 }
9117
9118+extern void gr_handle_kernel_exploit(void);
9119+
9120 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9121 int signr)
9122 {
9123@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9124 panic("Fatal exception in interrupt");
9125 if (panic_on_oops)
9126 panic("Fatal exception");
9127+
9128+ gr_handle_kernel_exploit();
9129+
9130 do_exit(signr);
9131 }
9132
9133@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9134 enum ctx_state prev_state = exception_enter();
9135 unsigned int reason = get_reason(regs);
9136
9137+#ifdef CONFIG_PAX_REFCOUNT
9138+ unsigned int bkpt;
9139+ const struct exception_table_entry *entry;
9140+
9141+ if (reason & REASON_ILLEGAL) {
9142+ /* Check if PaX bad instruction */
9143+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9144+ current->thread.trap_nr = 0;
9145+ pax_report_refcount_overflow(regs);
9146+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9147+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9148+ regs->nip = entry->fixup;
9149+ return;
9150+ }
9151+ /* fixup_exception() could not handle */
9152+ goto bail;
9153+ }
9154+ }
9155+#endif
9156+
9157 /* We can now get here via a FP Unavailable exception if the core
9158 * has no FPU, in that case the reason flags will be 0 */
9159
9160diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9161index f174351..5722009 100644
9162--- a/arch/powerpc/kernel/vdso.c
9163+++ b/arch/powerpc/kernel/vdso.c
9164@@ -35,6 +35,7 @@
9165 #include <asm/vdso.h>
9166 #include <asm/vdso_datapage.h>
9167 #include <asm/setup.h>
9168+#include <asm/mman.h>
9169
9170 #undef DEBUG
9171
9172@@ -221,7 +222,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9173 vdso_base = VDSO32_MBASE;
9174 #endif
9175
9176- current->mm->context.vdso_base = 0;
9177+ current->mm->context.vdso_base = ~0UL;
9178
9179 /* vDSO has a problem and was disabled, just don't "enable" it for the
9180 * process
9181@@ -241,7 +242,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9182 vdso_base = get_unmapped_area(NULL, vdso_base,
9183 (vdso_pages << PAGE_SHIFT) +
9184 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9185- 0, 0);
9186+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9187 if (IS_ERR_VALUE(vdso_base)) {
9188 rc = vdso_base;
9189 goto fail_mmapsem;
9190diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9191index c1f8f53..71a3b96 100644
9192--- a/arch/powerpc/kvm/powerpc.c
9193+++ b/arch/powerpc/kvm/powerpc.c
9194@@ -1409,7 +1409,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9195 }
9196 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9197
9198-int kvm_arch_init(void *opaque)
9199+int kvm_arch_init(const void *opaque)
9200 {
9201 return 0;
9202 }
9203diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9204index 5eea6f3..5d10396 100644
9205--- a/arch/powerpc/lib/usercopy_64.c
9206+++ b/arch/powerpc/lib/usercopy_64.c
9207@@ -9,22 +9,6 @@
9208 #include <linux/module.h>
9209 #include <asm/uaccess.h>
9210
9211-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9212-{
9213- if (likely(access_ok(VERIFY_READ, from, n)))
9214- n = __copy_from_user(to, from, n);
9215- else
9216- memset(to, 0, n);
9217- return n;
9218-}
9219-
9220-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9221-{
9222- if (likely(access_ok(VERIFY_WRITE, to, n)))
9223- n = __copy_to_user(to, from, n);
9224- return n;
9225-}
9226-
9227 unsigned long copy_in_user(void __user *to, const void __user *from,
9228 unsigned long n)
9229 {
9230@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9231 return n;
9232 }
9233
9234-EXPORT_SYMBOL(copy_from_user);
9235-EXPORT_SYMBOL(copy_to_user);
9236 EXPORT_SYMBOL(copy_in_user);
9237
9238diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9239index 08d659a..ab329f4 100644
9240--- a/arch/powerpc/mm/fault.c
9241+++ b/arch/powerpc/mm/fault.c
9242@@ -33,6 +33,10 @@
9243 #include <linux/ratelimit.h>
9244 #include <linux/context_tracking.h>
9245 #include <linux/hugetlb.h>
9246+#include <linux/slab.h>
9247+#include <linux/pagemap.h>
9248+#include <linux/compiler.h>
9249+#include <linux/unistd.h>
9250
9251 #include <asm/firmware.h>
9252 #include <asm/page.h>
9253@@ -69,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9254 }
9255 #endif
9256
9257+#ifdef CONFIG_PAX_PAGEEXEC
9258+/*
9259+ * PaX: decide what to do with offenders (regs->nip = fault address)
9260+ *
9261+ * returns 1 when task should be killed
9262+ */
9263+static int pax_handle_fetch_fault(struct pt_regs *regs)
9264+{
9265+ return 1;
9266+}
9267+
9268+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9269+{
9270+ unsigned long i;
9271+
9272+ printk(KERN_ERR "PAX: bytes at PC: ");
9273+ for (i = 0; i < 5; i++) {
9274+ unsigned int c;
9275+ if (get_user(c, (unsigned int __user *)pc+i))
9276+ printk(KERN_CONT "???????? ");
9277+ else
9278+ printk(KERN_CONT "%08x ", c);
9279+ }
9280+ printk("\n");
9281+}
9282+#endif
9283+
9284 /*
9285 * Check whether the instruction at regs->nip is a store using
9286 * an update addressing form which will update r1.
9287@@ -228,7 +259,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9288 * indicate errors in DSISR but can validly be set in SRR1.
9289 */
9290 if (trap == 0x400)
9291- error_code &= 0x48200000;
9292+ error_code &= 0x58200000;
9293 else
9294 is_write = error_code & DSISR_ISSTORE;
9295 #else
9296@@ -390,7 +421,7 @@ good_area:
9297 * "undefined". Of those that can be set, this is the only
9298 * one which seems bad.
9299 */
9300- if (error_code & 0x10000000)
9301+ if (error_code & DSISR_GUARDED)
9302 /* Guarded storage error. */
9303 goto bad_area;
9304 #endif /* CONFIG_8xx */
9305@@ -405,7 +436,7 @@ good_area:
9306 * processors use the same I/D cache coherency mechanism
9307 * as embedded.
9308 */
9309- if (error_code & DSISR_PROTFAULT)
9310+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
9311 goto bad_area;
9312 #endif /* CONFIG_PPC_STD_MMU */
9313
9314@@ -495,6 +526,23 @@ bad_area:
9315 bad_area_nosemaphore:
9316 /* User mode accesses cause a SIGSEGV */
9317 if (user_mode(regs)) {
9318+
9319+#ifdef CONFIG_PAX_PAGEEXEC
9320+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9321+#ifdef CONFIG_PPC_STD_MMU
9322+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9323+#else
9324+ if (is_exec && regs->nip == address) {
9325+#endif
9326+ switch (pax_handle_fetch_fault(regs)) {
9327+ }
9328+
9329+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9330+ do_group_exit(SIGKILL);
9331+ }
9332+ }
9333+#endif
9334+
9335 _exception(SIGSEGV, regs, code, address);
9336 goto bail;
9337 }
9338diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9339index cb8bdbe..cde4bc7 100644
9340--- a/arch/powerpc/mm/mmap.c
9341+++ b/arch/powerpc/mm/mmap.c
9342@@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9343 return sysctl_legacy_va_layout;
9344 }
9345
9346-static unsigned long mmap_rnd(void)
9347+static unsigned long mmap_rnd(struct mm_struct *mm)
9348 {
9349 unsigned long rnd = 0;
9350
9351+#ifdef CONFIG_PAX_RANDMMAP
9352+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9353+#endif
9354+
9355 if (current->flags & PF_RANDOMIZE) {
9356 /* 8MB for 32bit, 1GB for 64bit */
9357 if (is_32bit_task())
9358@@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9359 return rnd << PAGE_SHIFT;
9360 }
9361
9362-static inline unsigned long mmap_base(void)
9363+static inline unsigned long mmap_base(struct mm_struct *mm)
9364 {
9365 unsigned long gap = rlimit(RLIMIT_STACK);
9366
9367@@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9368 else if (gap > MAX_GAP)
9369 gap = MAX_GAP;
9370
9371- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9372+ return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9373 }
9374
9375 /*
9376@@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9377 */
9378 if (mmap_is_legacy()) {
9379 mm->mmap_base = TASK_UNMAPPED_BASE;
9380+
9381+#ifdef CONFIG_PAX_RANDMMAP
9382+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9383+ mm->mmap_base += mm->delta_mmap;
9384+#endif
9385+
9386 mm->get_unmapped_area = arch_get_unmapped_area;
9387 } else {
9388- mm->mmap_base = mmap_base();
9389+ mm->mmap_base = mmap_base(mm);
9390+
9391+#ifdef CONFIG_PAX_RANDMMAP
9392+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9393+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9394+#endif
9395+
9396 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9397 }
9398 }
9399diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9400index ded0ea1..f213a9b 100644
9401--- a/arch/powerpc/mm/slice.c
9402+++ b/arch/powerpc/mm/slice.c
9403@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9404 if ((mm->task_size - len) < addr)
9405 return 0;
9406 vma = find_vma(mm, addr);
9407- return (!vma || (addr + len) <= vma->vm_start);
9408+ return check_heap_stack_gap(vma, addr, len, 0);
9409 }
9410
9411 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9412@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9413 info.align_offset = 0;
9414
9415 addr = TASK_UNMAPPED_BASE;
9416+
9417+#ifdef CONFIG_PAX_RANDMMAP
9418+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9419+ addr += mm->delta_mmap;
9420+#endif
9421+
9422 while (addr < TASK_SIZE) {
9423 info.low_limit = addr;
9424 if (!slice_scan_available(addr, available, 1, &addr))
9425@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9426 if (fixed && addr > (mm->task_size - len))
9427 return -ENOMEM;
9428
9429+#ifdef CONFIG_PAX_RANDMMAP
9430+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9431+ addr = 0;
9432+#endif
9433+
9434 /* If hint, make sure it matches our alignment restrictions */
9435 if (!fixed && addr) {
9436 addr = _ALIGN_UP(addr, 1ul << pshift);
9437diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9438index 4278acf..67fd0e6 100644
9439--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9440+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9441@@ -400,8 +400,8 @@ static int scc_pciex_write_config(struct pci_bus *bus, unsigned int devfn,
9442 }
9443
9444 static struct pci_ops scc_pciex_pci_ops = {
9445- scc_pciex_read_config,
9446- scc_pciex_write_config,
9447+ .read = scc_pciex_read_config,
9448+ .write = scc_pciex_write_config,
9449 };
9450
9451 static void pciex_clear_intr_all(unsigned int __iomem *base)
9452diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9453index d966bbe..372124a 100644
9454--- a/arch/powerpc/platforms/cell/spufs/file.c
9455+++ b/arch/powerpc/platforms/cell/spufs/file.c
9456@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9457 return VM_FAULT_NOPAGE;
9458 }
9459
9460-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9461+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9462 unsigned long address,
9463- void *buf, int len, int write)
9464+ void *buf, size_t len, int write)
9465 {
9466 struct spu_context *ctx = vma->vm_file->private_data;
9467 unsigned long offset = address - vma->vm_start;
9468diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9469index fa934fe..c296056 100644
9470--- a/arch/s390/include/asm/atomic.h
9471+++ b/arch/s390/include/asm/atomic.h
9472@@ -412,4 +412,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9473 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9474 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9475
9476+#define atomic64_read_unchecked(v) atomic64_read(v)
9477+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9478+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9479+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9480+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9481+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9482+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9483+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9484+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9485+
9486 #endif /* __ARCH_S390_ATOMIC__ */
9487diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9488index b5dce65..8aca09a 100644
9489--- a/arch/s390/include/asm/barrier.h
9490+++ b/arch/s390/include/asm/barrier.h
9491@@ -39,7 +39,7 @@
9492 do { \
9493 compiletime_assert_atomic_type(*p); \
9494 barrier(); \
9495- ACCESS_ONCE(*p) = (v); \
9496+ ACCESS_ONCE_RW(*p) = (v); \
9497 } while (0)
9498
9499 #define smp_load_acquire(p) \
9500diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9501index 4d7ccac..d03d0ad 100644
9502--- a/arch/s390/include/asm/cache.h
9503+++ b/arch/s390/include/asm/cache.h
9504@@ -9,8 +9,10 @@
9505 #ifndef __ARCH_S390_CACHE_H
9506 #define __ARCH_S390_CACHE_H
9507
9508-#define L1_CACHE_BYTES 256
9509+#include <linux/const.h>
9510+
9511 #define L1_CACHE_SHIFT 8
9512+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9513 #define NET_SKB_PAD 32
9514
9515 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9516diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9517index f6e43d3..5f57681 100644
9518--- a/arch/s390/include/asm/elf.h
9519+++ b/arch/s390/include/asm/elf.h
9520@@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
9521 the loader. We need to make sure that it is out of the way of the program
9522 that it will "exec", and that there is sufficient room for the brk. */
9523
9524-extern unsigned long randomize_et_dyn(unsigned long base);
9525-#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
9526+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9527+
9528+#ifdef CONFIG_PAX_ASLR
9529+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9530+
9531+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9532+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9533+#endif
9534
9535 /* This yields a mask that user programs can use to figure out what
9536 instruction set this CPU supports. */
9537@@ -223,9 +229,6 @@ struct linux_binprm;
9538 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9539 int arch_setup_additional_pages(struct linux_binprm *, int);
9540
9541-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9542-#define arch_randomize_brk arch_randomize_brk
9543-
9544 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa, __vector128 *vxrs);
9545
9546 #endif
9547diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9548index c4a93d6..4d2a9b4 100644
9549--- a/arch/s390/include/asm/exec.h
9550+++ b/arch/s390/include/asm/exec.h
9551@@ -7,6 +7,6 @@
9552 #ifndef __ASM_EXEC_H
9553 #define __ASM_EXEC_H
9554
9555-extern unsigned long arch_align_stack(unsigned long sp);
9556+#define arch_align_stack(x) ((x) & ~0xfUL)
9557
9558 #endif /* __ASM_EXEC_H */
9559diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9560index cd4c68e..6764641 100644
9561--- a/arch/s390/include/asm/uaccess.h
9562+++ b/arch/s390/include/asm/uaccess.h
9563@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9564 __range_ok((unsigned long)(addr), (size)); \
9565 })
9566
9567+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9568 #define access_ok(type, addr, size) __access_ok(addr, size)
9569
9570 /*
9571@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9572 copy_to_user(void __user *to, const void *from, unsigned long n)
9573 {
9574 might_fault();
9575+
9576+ if ((long)n < 0)
9577+ return n;
9578+
9579 return __copy_to_user(to, from, n);
9580 }
9581
9582@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9583 static inline unsigned long __must_check
9584 copy_from_user(void *to, const void __user *from, unsigned long n)
9585 {
9586- unsigned int sz = __compiletime_object_size(to);
9587+ size_t sz = __compiletime_object_size(to);
9588
9589 might_fault();
9590- if (unlikely(sz != -1 && sz < n)) {
9591+
9592+ if ((long)n < 0)
9593+ return n;
9594+
9595+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9596 copy_from_user_overflow();
9597 return n;
9598 }
9599diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9600index b89b591..fd9609d 100644
9601--- a/arch/s390/kernel/module.c
9602+++ b/arch/s390/kernel/module.c
9603@@ -169,11 +169,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9604
9605 /* Increase core size by size of got & plt and set start
9606 offsets for got and plt. */
9607- me->core_size = ALIGN(me->core_size, 4);
9608- me->arch.got_offset = me->core_size;
9609- me->core_size += me->arch.got_size;
9610- me->arch.plt_offset = me->core_size;
9611- me->core_size += me->arch.plt_size;
9612+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9613+ me->arch.got_offset = me->core_size_rw;
9614+ me->core_size_rw += me->arch.got_size;
9615+ me->arch.plt_offset = me->core_size_rx;
9616+ me->core_size_rx += me->arch.plt_size;
9617 return 0;
9618 }
9619
9620@@ -289,7 +289,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9621 if (info->got_initialized == 0) {
9622 Elf_Addr *gotent;
9623
9624- gotent = me->module_core + me->arch.got_offset +
9625+ gotent = me->module_core_rw + me->arch.got_offset +
9626 info->got_offset;
9627 *gotent = val;
9628 info->got_initialized = 1;
9629@@ -312,7 +312,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9630 rc = apply_rela_bits(loc, val, 0, 64, 0);
9631 else if (r_type == R_390_GOTENT ||
9632 r_type == R_390_GOTPLTENT) {
9633- val += (Elf_Addr) me->module_core - loc;
9634+ val += (Elf_Addr) me->module_core_rw - loc;
9635 rc = apply_rela_bits(loc, val, 1, 32, 1);
9636 }
9637 break;
9638@@ -325,7 +325,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9639 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9640 if (info->plt_initialized == 0) {
9641 unsigned int *ip;
9642- ip = me->module_core + me->arch.plt_offset +
9643+ ip = me->module_core_rx + me->arch.plt_offset +
9644 info->plt_offset;
9645 #ifndef CONFIG_64BIT
9646 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9647@@ -350,7 +350,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9648 val - loc + 0xffffUL < 0x1ffffeUL) ||
9649 (r_type == R_390_PLT32DBL &&
9650 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9651- val = (Elf_Addr) me->module_core +
9652+ val = (Elf_Addr) me->module_core_rx +
9653 me->arch.plt_offset +
9654 info->plt_offset;
9655 val += rela->r_addend - loc;
9656@@ -372,7 +372,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9657 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9658 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9659 val = val + rela->r_addend -
9660- ((Elf_Addr) me->module_core + me->arch.got_offset);
9661+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9662 if (r_type == R_390_GOTOFF16)
9663 rc = apply_rela_bits(loc, val, 0, 16, 0);
9664 else if (r_type == R_390_GOTOFF32)
9665@@ -382,7 +382,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9666 break;
9667 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9668 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9669- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9670+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9671 rela->r_addend - loc;
9672 if (r_type == R_390_GOTPC)
9673 rc = apply_rela_bits(loc, val, 1, 32, 0);
9674diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9675index ed84cc2..c05a9d2 100644
9676--- a/arch/s390/kernel/process.c
9677+++ b/arch/s390/kernel/process.c
9678@@ -218,37 +218,3 @@ unsigned long get_wchan(struct task_struct *p)
9679 }
9680 return 0;
9681 }
9682-
9683-unsigned long arch_align_stack(unsigned long sp)
9684-{
9685- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9686- sp -= get_random_int() & ~PAGE_MASK;
9687- return sp & ~0xf;
9688-}
9689-
9690-static inline unsigned long brk_rnd(void)
9691-{
9692- /* 8MB for 32bit, 1GB for 64bit */
9693- if (is_32bit_task())
9694- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9695- else
9696- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9697-}
9698-
9699-unsigned long arch_randomize_brk(struct mm_struct *mm)
9700-{
9701- unsigned long ret;
9702-
9703- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9704- return (ret > mm->brk) ? ret : mm->brk;
9705-}
9706-
9707-unsigned long randomize_et_dyn(unsigned long base)
9708-{
9709- unsigned long ret;
9710-
9711- if (!(current->flags & PF_RANDOMIZE))
9712- return base;
9713- ret = PAGE_ALIGN(base + brk_rnd());
9714- return (ret > base) ? ret : base;
9715-}
9716diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9717index 9b436c2..54fbf0a 100644
9718--- a/arch/s390/mm/mmap.c
9719+++ b/arch/s390/mm/mmap.c
9720@@ -95,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9721 */
9722 if (mmap_is_legacy()) {
9723 mm->mmap_base = mmap_base_legacy();
9724+
9725+#ifdef CONFIG_PAX_RANDMMAP
9726+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9727+ mm->mmap_base += mm->delta_mmap;
9728+#endif
9729+
9730 mm->get_unmapped_area = arch_get_unmapped_area;
9731 } else {
9732 mm->mmap_base = mmap_base();
9733+
9734+#ifdef CONFIG_PAX_RANDMMAP
9735+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9736+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9737+#endif
9738+
9739 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9740 }
9741 }
9742@@ -170,9 +182,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9743 */
9744 if (mmap_is_legacy()) {
9745 mm->mmap_base = mmap_base_legacy();
9746+
9747+#ifdef CONFIG_PAX_RANDMMAP
9748+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9749+ mm->mmap_base += mm->delta_mmap;
9750+#endif
9751+
9752 mm->get_unmapped_area = s390_get_unmapped_area;
9753 } else {
9754 mm->mmap_base = mmap_base();
9755+
9756+#ifdef CONFIG_PAX_RANDMMAP
9757+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9758+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9759+#endif
9760+
9761 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9762 }
9763 }
9764diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9765index ae3d59f..f65f075 100644
9766--- a/arch/score/include/asm/cache.h
9767+++ b/arch/score/include/asm/cache.h
9768@@ -1,7 +1,9 @@
9769 #ifndef _ASM_SCORE_CACHE_H
9770 #define _ASM_SCORE_CACHE_H
9771
9772+#include <linux/const.h>
9773+
9774 #define L1_CACHE_SHIFT 4
9775-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9776+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9777
9778 #endif /* _ASM_SCORE_CACHE_H */
9779diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9780index f9f3cd5..58ff438 100644
9781--- a/arch/score/include/asm/exec.h
9782+++ b/arch/score/include/asm/exec.h
9783@@ -1,6 +1,6 @@
9784 #ifndef _ASM_SCORE_EXEC_H
9785 #define _ASM_SCORE_EXEC_H
9786
9787-extern unsigned long arch_align_stack(unsigned long sp);
9788+#define arch_align_stack(x) (x)
9789
9790 #endif /* _ASM_SCORE_EXEC_H */
9791diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9792index a1519ad3..e8ac1ff 100644
9793--- a/arch/score/kernel/process.c
9794+++ b/arch/score/kernel/process.c
9795@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9796
9797 return task_pt_regs(task)->cp0_epc;
9798 }
9799-
9800-unsigned long arch_align_stack(unsigned long sp)
9801-{
9802- return sp;
9803-}
9804diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9805index ef9e555..331bd29 100644
9806--- a/arch/sh/include/asm/cache.h
9807+++ b/arch/sh/include/asm/cache.h
9808@@ -9,10 +9,11 @@
9809 #define __ASM_SH_CACHE_H
9810 #ifdef __KERNEL__
9811
9812+#include <linux/const.h>
9813 #include <linux/init.h>
9814 #include <cpu/cache.h>
9815
9816-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9817+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9818
9819 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9820
9821diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9822index 6777177..cb5e44f 100644
9823--- a/arch/sh/mm/mmap.c
9824+++ b/arch/sh/mm/mmap.c
9825@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9826 struct mm_struct *mm = current->mm;
9827 struct vm_area_struct *vma;
9828 int do_colour_align;
9829+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9830 struct vm_unmapped_area_info info;
9831
9832 if (flags & MAP_FIXED) {
9833@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9834 if (filp || (flags & MAP_SHARED))
9835 do_colour_align = 1;
9836
9837+#ifdef CONFIG_PAX_RANDMMAP
9838+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9839+#endif
9840+
9841 if (addr) {
9842 if (do_colour_align)
9843 addr = COLOUR_ALIGN(addr, pgoff);
9844@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9845 addr = PAGE_ALIGN(addr);
9846
9847 vma = find_vma(mm, addr);
9848- if (TASK_SIZE - len >= addr &&
9849- (!vma || addr + len <= vma->vm_start))
9850+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9851 return addr;
9852 }
9853
9854 info.flags = 0;
9855 info.length = len;
9856- info.low_limit = TASK_UNMAPPED_BASE;
9857+ info.low_limit = mm->mmap_base;
9858 info.high_limit = TASK_SIZE;
9859 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9860 info.align_offset = pgoff << PAGE_SHIFT;
9861@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9862 struct mm_struct *mm = current->mm;
9863 unsigned long addr = addr0;
9864 int do_colour_align;
9865+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9866 struct vm_unmapped_area_info info;
9867
9868 if (flags & MAP_FIXED) {
9869@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9870 if (filp || (flags & MAP_SHARED))
9871 do_colour_align = 1;
9872
9873+#ifdef CONFIG_PAX_RANDMMAP
9874+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9875+#endif
9876+
9877 /* requesting a specific address */
9878 if (addr) {
9879 if (do_colour_align)
9880@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9881 addr = PAGE_ALIGN(addr);
9882
9883 vma = find_vma(mm, addr);
9884- if (TASK_SIZE - len >= addr &&
9885- (!vma || addr + len <= vma->vm_start))
9886+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9887 return addr;
9888 }
9889
9890@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9891 VM_BUG_ON(addr != -ENOMEM);
9892 info.flags = 0;
9893 info.low_limit = TASK_UNMAPPED_BASE;
9894+
9895+#ifdef CONFIG_PAX_RANDMMAP
9896+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9897+ info.low_limit += mm->delta_mmap;
9898+#endif
9899+
9900 info.high_limit = TASK_SIZE;
9901 addr = vm_unmapped_area(&info);
9902 }
9903diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9904index 4082749..fd97781 100644
9905--- a/arch/sparc/include/asm/atomic_64.h
9906+++ b/arch/sparc/include/asm/atomic_64.h
9907@@ -15,18 +15,38 @@
9908 #define ATOMIC64_INIT(i) { (i) }
9909
9910 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9911+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9912+{
9913+ return ACCESS_ONCE(v->counter);
9914+}
9915 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9916+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9917+{
9918+ return ACCESS_ONCE(v->counter);
9919+}
9920
9921 #define atomic_set(v, i) (((v)->counter) = i)
9922+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9923+{
9924+ v->counter = i;
9925+}
9926 #define atomic64_set(v, i) (((v)->counter) = i)
9927+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9928+{
9929+ v->counter = i;
9930+}
9931
9932-#define ATOMIC_OP(op) \
9933-void atomic_##op(int, atomic_t *); \
9934-void atomic64_##op(long, atomic64_t *);
9935+#define __ATOMIC_OP(op, suffix) \
9936+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9937+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9938
9939-#define ATOMIC_OP_RETURN(op) \
9940-int atomic_##op##_return(int, atomic_t *); \
9941-long atomic64_##op##_return(long, atomic64_t *);
9942+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9943+
9944+#define __ATOMIC_OP_RETURN(op, suffix) \
9945+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9946+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9947+
9948+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9949
9950 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9951
9952@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9953
9954 #undef ATOMIC_OPS
9955 #undef ATOMIC_OP_RETURN
9956+#undef __ATOMIC_OP_RETURN
9957 #undef ATOMIC_OP
9958+#undef __ATOMIC_OP
9959
9960 #define atomic_dec_return(v) atomic_sub_return(1, v)
9961 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9962
9963 #define atomic_inc_return(v) atomic_add_return(1, v)
9964+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9965+{
9966+ return atomic_add_return_unchecked(1, v);
9967+}
9968 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9969+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9970+{
9971+ return atomic64_add_return_unchecked(1, v);
9972+}
9973
9974 /*
9975 * atomic_inc_and_test - increment and test
9976@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9977 * other cases.
9978 */
9979 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9980+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9981+{
9982+ return atomic_inc_return_unchecked(v) == 0;
9983+}
9984 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9985
9986 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9987@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9988 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9989
9990 #define atomic_inc(v) atomic_add(1, v)
9991+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9992+{
9993+ atomic_add_unchecked(1, v);
9994+}
9995 #define atomic64_inc(v) atomic64_add(1, v)
9996+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9997+{
9998+ atomic64_add_unchecked(1, v);
9999+}
10000
10001 #define atomic_dec(v) atomic_sub(1, v)
10002+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
10003+{
10004+ atomic_sub_unchecked(1, v);
10005+}
10006 #define atomic64_dec(v) atomic64_sub(1, v)
10007+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
10008+{
10009+ atomic64_sub_unchecked(1, v);
10010+}
10011
10012 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
10013 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
10014
10015 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
10016+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
10017+{
10018+ return cmpxchg(&v->counter, old, new);
10019+}
10020 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
10021+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
10022+{
10023+ return xchg(&v->counter, new);
10024+}
10025
10026 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10027 {
10028- int c, old;
10029+ int c, old, new;
10030 c = atomic_read(v);
10031 for (;;) {
10032- if (unlikely(c == (u)))
10033+ if (unlikely(c == u))
10034 break;
10035- old = atomic_cmpxchg((v), c, c + (a));
10036+
10037+ asm volatile("addcc %2, %0, %0\n"
10038+
10039+#ifdef CONFIG_PAX_REFCOUNT
10040+ "tvs %%icc, 6\n"
10041+#endif
10042+
10043+ : "=r" (new)
10044+ : "0" (c), "ir" (a)
10045+ : "cc");
10046+
10047+ old = atomic_cmpxchg(v, c, new);
10048 if (likely(old == c))
10049 break;
10050 c = old;
10051@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10052 #define atomic64_cmpxchg(v, o, n) \
10053 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10054 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10055+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10056+{
10057+ return xchg(&v->counter, new);
10058+}
10059
10060 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10061 {
10062- long c, old;
10063+ long c, old, new;
10064 c = atomic64_read(v);
10065 for (;;) {
10066- if (unlikely(c == (u)))
10067+ if (unlikely(c == u))
10068 break;
10069- old = atomic64_cmpxchg((v), c, c + (a));
10070+
10071+ asm volatile("addcc %2, %0, %0\n"
10072+
10073+#ifdef CONFIG_PAX_REFCOUNT
10074+ "tvs %%xcc, 6\n"
10075+#endif
10076+
10077+ : "=r" (new)
10078+ : "0" (c), "ir" (a)
10079+ : "cc");
10080+
10081+ old = atomic64_cmpxchg(v, c, new);
10082 if (likely(old == c))
10083 break;
10084 c = old;
10085 }
10086- return c != (u);
10087+ return c != u;
10088 }
10089
10090 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10091diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10092index 305dcc3..7835030 100644
10093--- a/arch/sparc/include/asm/barrier_64.h
10094+++ b/arch/sparc/include/asm/barrier_64.h
10095@@ -57,7 +57,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10096 do { \
10097 compiletime_assert_atomic_type(*p); \
10098 barrier(); \
10099- ACCESS_ONCE(*p) = (v); \
10100+ ACCESS_ONCE_RW(*p) = (v); \
10101 } while (0)
10102
10103 #define smp_load_acquire(p) \
10104diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10105index 5bb6991..5c2132e 100644
10106--- a/arch/sparc/include/asm/cache.h
10107+++ b/arch/sparc/include/asm/cache.h
10108@@ -7,10 +7,12 @@
10109 #ifndef _SPARC_CACHE_H
10110 #define _SPARC_CACHE_H
10111
10112+#include <linux/const.h>
10113+
10114 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10115
10116 #define L1_CACHE_SHIFT 5
10117-#define L1_CACHE_BYTES 32
10118+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10119
10120 #ifdef CONFIG_SPARC32
10121 #define SMP_CACHE_BYTES_SHIFT 5
10122diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10123index a24e41f..47677ff 100644
10124--- a/arch/sparc/include/asm/elf_32.h
10125+++ b/arch/sparc/include/asm/elf_32.h
10126@@ -114,6 +114,13 @@ typedef struct {
10127
10128 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10129
10130+#ifdef CONFIG_PAX_ASLR
10131+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10132+
10133+#define PAX_DELTA_MMAP_LEN 16
10134+#define PAX_DELTA_STACK_LEN 16
10135+#endif
10136+
10137 /* This yields a mask that user programs can use to figure out what
10138 instruction set this cpu supports. This can NOT be done in userspace
10139 on Sparc. */
10140diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10141index 370ca1e..d4f4a98 100644
10142--- a/arch/sparc/include/asm/elf_64.h
10143+++ b/arch/sparc/include/asm/elf_64.h
10144@@ -189,6 +189,13 @@ typedef struct {
10145 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10146 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10147
10148+#ifdef CONFIG_PAX_ASLR
10149+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10150+
10151+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10152+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10153+#endif
10154+
10155 extern unsigned long sparc64_elf_hwcap;
10156 #define ELF_HWCAP sparc64_elf_hwcap
10157
10158diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10159index a3890da..f6a408e 100644
10160--- a/arch/sparc/include/asm/pgalloc_32.h
10161+++ b/arch/sparc/include/asm/pgalloc_32.h
10162@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10163 }
10164
10165 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10166+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10167
10168 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10169 unsigned long address)
10170diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10171index 5e31871..13469c6 100644
10172--- a/arch/sparc/include/asm/pgalloc_64.h
10173+++ b/arch/sparc/include/asm/pgalloc_64.h
10174@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10175 }
10176
10177 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10178+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10179
10180 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10181 {
10182@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10183 }
10184
10185 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10186+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10187
10188 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10189 {
10190diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10191index 59ba6f6..4518128 100644
10192--- a/arch/sparc/include/asm/pgtable.h
10193+++ b/arch/sparc/include/asm/pgtable.h
10194@@ -5,4 +5,8 @@
10195 #else
10196 #include <asm/pgtable_32.h>
10197 #endif
10198+
10199+#define ktla_ktva(addr) (addr)
10200+#define ktva_ktla(addr) (addr)
10201+
10202 #endif
10203diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10204index b9b91ae..950b91e 100644
10205--- a/arch/sparc/include/asm/pgtable_32.h
10206+++ b/arch/sparc/include/asm/pgtable_32.h
10207@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10208 #define PAGE_SHARED SRMMU_PAGE_SHARED
10209 #define PAGE_COPY SRMMU_PAGE_COPY
10210 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10211+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10212+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10213+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10214 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10215
10216 /* Top-level page directory - dummy used by init-mm.
10217@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10218
10219 /* xwr */
10220 #define __P000 PAGE_NONE
10221-#define __P001 PAGE_READONLY
10222-#define __P010 PAGE_COPY
10223-#define __P011 PAGE_COPY
10224+#define __P001 PAGE_READONLY_NOEXEC
10225+#define __P010 PAGE_COPY_NOEXEC
10226+#define __P011 PAGE_COPY_NOEXEC
10227 #define __P100 PAGE_READONLY
10228 #define __P101 PAGE_READONLY
10229 #define __P110 PAGE_COPY
10230 #define __P111 PAGE_COPY
10231
10232 #define __S000 PAGE_NONE
10233-#define __S001 PAGE_READONLY
10234-#define __S010 PAGE_SHARED
10235-#define __S011 PAGE_SHARED
10236+#define __S001 PAGE_READONLY_NOEXEC
10237+#define __S010 PAGE_SHARED_NOEXEC
10238+#define __S011 PAGE_SHARED_NOEXEC
10239 #define __S100 PAGE_READONLY
10240 #define __S101 PAGE_READONLY
10241 #define __S110 PAGE_SHARED
10242diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10243index 79da178..c2eede8 100644
10244--- a/arch/sparc/include/asm/pgtsrmmu.h
10245+++ b/arch/sparc/include/asm/pgtsrmmu.h
10246@@ -115,6 +115,11 @@
10247 SRMMU_EXEC | SRMMU_REF)
10248 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10249 SRMMU_EXEC | SRMMU_REF)
10250+
10251+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10252+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10253+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10254+
10255 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10256 SRMMU_DIRTY | SRMMU_REF)
10257
10258diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10259index 29d64b1..4272fe8 100644
10260--- a/arch/sparc/include/asm/setup.h
10261+++ b/arch/sparc/include/asm/setup.h
10262@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10263 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10264
10265 /* init_64.c */
10266-extern atomic_t dcpage_flushes;
10267-extern atomic_t dcpage_flushes_xcall;
10268+extern atomic_unchecked_t dcpage_flushes;
10269+extern atomic_unchecked_t dcpage_flushes_xcall;
10270
10271 extern int sysctl_tsb_ratio;
10272 #endif
10273diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10274index 9689176..63c18ea 100644
10275--- a/arch/sparc/include/asm/spinlock_64.h
10276+++ b/arch/sparc/include/asm/spinlock_64.h
10277@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10278
10279 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10280
10281-static void inline arch_read_lock(arch_rwlock_t *lock)
10282+static inline void arch_read_lock(arch_rwlock_t *lock)
10283 {
10284 unsigned long tmp1, tmp2;
10285
10286 __asm__ __volatile__ (
10287 "1: ldsw [%2], %0\n"
10288 " brlz,pn %0, 2f\n"
10289-"4: add %0, 1, %1\n"
10290+"4: addcc %0, 1, %1\n"
10291+
10292+#ifdef CONFIG_PAX_REFCOUNT
10293+" tvs %%icc, 6\n"
10294+#endif
10295+
10296 " cas [%2], %0, %1\n"
10297 " cmp %0, %1\n"
10298 " bne,pn %%icc, 1b\n"
10299@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10300 " .previous"
10301 : "=&r" (tmp1), "=&r" (tmp2)
10302 : "r" (lock)
10303- : "memory");
10304+ : "memory", "cc");
10305 }
10306
10307-static int inline arch_read_trylock(arch_rwlock_t *lock)
10308+static inline int arch_read_trylock(arch_rwlock_t *lock)
10309 {
10310 int tmp1, tmp2;
10311
10312@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10313 "1: ldsw [%2], %0\n"
10314 " brlz,a,pn %0, 2f\n"
10315 " mov 0, %0\n"
10316-" add %0, 1, %1\n"
10317+" addcc %0, 1, %1\n"
10318+
10319+#ifdef CONFIG_PAX_REFCOUNT
10320+" tvs %%icc, 6\n"
10321+#endif
10322+
10323 " cas [%2], %0, %1\n"
10324 " cmp %0, %1\n"
10325 " bne,pn %%icc, 1b\n"
10326@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10327 return tmp1;
10328 }
10329
10330-static void inline arch_read_unlock(arch_rwlock_t *lock)
10331+static inline void arch_read_unlock(arch_rwlock_t *lock)
10332 {
10333 unsigned long tmp1, tmp2;
10334
10335 __asm__ __volatile__(
10336 "1: lduw [%2], %0\n"
10337-" sub %0, 1, %1\n"
10338+" subcc %0, 1, %1\n"
10339+
10340+#ifdef CONFIG_PAX_REFCOUNT
10341+" tvs %%icc, 6\n"
10342+#endif
10343+
10344 " cas [%2], %0, %1\n"
10345 " cmp %0, %1\n"
10346 " bne,pn %%xcc, 1b\n"
10347@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10348 : "memory");
10349 }
10350
10351-static void inline arch_write_lock(arch_rwlock_t *lock)
10352+static inline void arch_write_lock(arch_rwlock_t *lock)
10353 {
10354 unsigned long mask, tmp1, tmp2;
10355
10356@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10357 : "memory");
10358 }
10359
10360-static void inline arch_write_unlock(arch_rwlock_t *lock)
10361+static inline void arch_write_unlock(arch_rwlock_t *lock)
10362 {
10363 __asm__ __volatile__(
10364 " stw %%g0, [%0]"
10365@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10366 : "memory");
10367 }
10368
10369-static int inline arch_write_trylock(arch_rwlock_t *lock)
10370+static inline int arch_write_trylock(arch_rwlock_t *lock)
10371 {
10372 unsigned long mask, tmp1, tmp2, result;
10373
10374diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10375index 025c984..a216504 100644
10376--- a/arch/sparc/include/asm/thread_info_32.h
10377+++ b/arch/sparc/include/asm/thread_info_32.h
10378@@ -49,6 +49,8 @@ struct thread_info {
10379 unsigned long w_saved;
10380
10381 struct restart_block restart_block;
10382+
10383+ unsigned long lowest_stack;
10384 };
10385
10386 /*
10387diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10388index 798f027..b009941 100644
10389--- a/arch/sparc/include/asm/thread_info_64.h
10390+++ b/arch/sparc/include/asm/thread_info_64.h
10391@@ -63,6 +63,8 @@ struct thread_info {
10392 struct pt_regs *kern_una_regs;
10393 unsigned int kern_una_insn;
10394
10395+ unsigned long lowest_stack;
10396+
10397 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10398 __attribute__ ((aligned(64)));
10399 };
10400@@ -190,12 +192,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10401 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10402 /* flag bit 4 is available */
10403 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10404-/* flag bit 6 is available */
10405+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10406 #define TIF_32BIT 7 /* 32-bit binary */
10407 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10408 #define TIF_SECCOMP 9 /* secure computing */
10409 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10410 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10411+
10412 /* NOTE: Thread flags >= 12 should be ones we have no interest
10413 * in using in assembly, else we can't use the mask as
10414 * an immediate value in instructions such as andcc.
10415@@ -215,12 +218,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10416 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10417 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10418 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10419+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10420
10421 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10422 _TIF_DO_NOTIFY_RESUME_MASK | \
10423 _TIF_NEED_RESCHED)
10424 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10425
10426+#define _TIF_WORK_SYSCALL \
10427+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10428+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10429+
10430 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10431
10432 /*
10433diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10434index bd56c28..4b63d83 100644
10435--- a/arch/sparc/include/asm/uaccess.h
10436+++ b/arch/sparc/include/asm/uaccess.h
10437@@ -1,5 +1,6 @@
10438 #ifndef ___ASM_SPARC_UACCESS_H
10439 #define ___ASM_SPARC_UACCESS_H
10440+
10441 #if defined(__sparc__) && defined(__arch64__)
10442 #include <asm/uaccess_64.h>
10443 #else
10444diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10445index 9634d08..f55fe4f 100644
10446--- a/arch/sparc/include/asm/uaccess_32.h
10447+++ b/arch/sparc/include/asm/uaccess_32.h
10448@@ -250,27 +250,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10449
10450 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10451 {
10452- if (n && __access_ok((unsigned long) to, n))
10453+ if ((long)n < 0)
10454+ return n;
10455+
10456+ if (n && __access_ok((unsigned long) to, n)) {
10457+ if (!__builtin_constant_p(n))
10458+ check_object_size(from, n, true);
10459 return __copy_user(to, (__force void __user *) from, n);
10460- else
10461+ } else
10462 return n;
10463 }
10464
10465 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10466 {
10467+ if ((long)n < 0)
10468+ return n;
10469+
10470+ if (!__builtin_constant_p(n))
10471+ check_object_size(from, n, true);
10472+
10473 return __copy_user(to, (__force void __user *) from, n);
10474 }
10475
10476 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10477 {
10478- if (n && __access_ok((unsigned long) from, n))
10479+ if ((long)n < 0)
10480+ return n;
10481+
10482+ if (n && __access_ok((unsigned long) from, n)) {
10483+ if (!__builtin_constant_p(n))
10484+ check_object_size(to, n, false);
10485 return __copy_user((__force void __user *) to, from, n);
10486- else
10487+ } else
10488 return n;
10489 }
10490
10491 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10492 {
10493+ if ((long)n < 0)
10494+ return n;
10495+
10496 return __copy_user((__force void __user *) to, from, n);
10497 }
10498
10499diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10500index c990a5e..f17b9c1 100644
10501--- a/arch/sparc/include/asm/uaccess_64.h
10502+++ b/arch/sparc/include/asm/uaccess_64.h
10503@@ -10,6 +10,7 @@
10504 #include <linux/compiler.h>
10505 #include <linux/string.h>
10506 #include <linux/thread_info.h>
10507+#include <linux/kernel.h>
10508 #include <asm/asi.h>
10509 #include <asm/spitfire.h>
10510 #include <asm-generic/uaccess-unaligned.h>
10511@@ -214,8 +215,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10512 static inline unsigned long __must_check
10513 copy_from_user(void *to, const void __user *from, unsigned long size)
10514 {
10515- unsigned long ret = ___copy_from_user(to, from, size);
10516+ unsigned long ret;
10517
10518+ if ((long)size < 0 || size > INT_MAX)
10519+ return size;
10520+
10521+ if (!__builtin_constant_p(size))
10522+ check_object_size(to, size, false);
10523+
10524+ ret = ___copy_from_user(to, from, size);
10525 if (unlikely(ret))
10526 ret = copy_from_user_fixup(to, from, size);
10527
10528@@ -231,8 +239,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10529 static inline unsigned long __must_check
10530 copy_to_user(void __user *to, const void *from, unsigned long size)
10531 {
10532- unsigned long ret = ___copy_to_user(to, from, size);
10533+ unsigned long ret;
10534
10535+ if ((long)size < 0 || size > INT_MAX)
10536+ return size;
10537+
10538+ if (!__builtin_constant_p(size))
10539+ check_object_size(from, size, true);
10540+
10541+ ret = ___copy_to_user(to, from, size);
10542 if (unlikely(ret))
10543 ret = copy_to_user_fixup(to, from, size);
10544 return ret;
10545diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10546index 7cf9c6e..6206648 100644
10547--- a/arch/sparc/kernel/Makefile
10548+++ b/arch/sparc/kernel/Makefile
10549@@ -4,7 +4,7 @@
10550 #
10551
10552 asflags-y := -ansi
10553-ccflags-y := -Werror
10554+#ccflags-y := -Werror
10555
10556 extra-y := head_$(BITS).o
10557
10558diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10559index 50e7b62..79fae35 100644
10560--- a/arch/sparc/kernel/process_32.c
10561+++ b/arch/sparc/kernel/process_32.c
10562@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10563
10564 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10565 r->psr, r->pc, r->npc, r->y, print_tainted());
10566- printk("PC: <%pS>\n", (void *) r->pc);
10567+ printk("PC: <%pA>\n", (void *) r->pc);
10568 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10569 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10570 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10571 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10572 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10573 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10574- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10575+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10576
10577 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10578 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10579@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10580 rw = (struct reg_window32 *) fp;
10581 pc = rw->ins[7];
10582 printk("[%08lx : ", pc);
10583- printk("%pS ] ", (void *) pc);
10584+ printk("%pA ] ", (void *) pc);
10585 fp = rw->ins[6];
10586 } while (++count < 16);
10587 printk("\n");
10588diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10589index 0be7bf9..2b1cba8 100644
10590--- a/arch/sparc/kernel/process_64.c
10591+++ b/arch/sparc/kernel/process_64.c
10592@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10593 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10594 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10595 if (regs->tstate & TSTATE_PRIV)
10596- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10597+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10598 }
10599
10600 void show_regs(struct pt_regs *regs)
10601@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10602
10603 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10604 regs->tpc, regs->tnpc, regs->y, print_tainted());
10605- printk("TPC: <%pS>\n", (void *) regs->tpc);
10606+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10607 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10608 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10609 regs->u_regs[3]);
10610@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10611 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10612 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10613 regs->u_regs[15]);
10614- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10615+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10616 show_regwindow(regs);
10617 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10618 }
10619@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10620 ((tp && tp->task) ? tp->task->pid : -1));
10621
10622 if (gp->tstate & TSTATE_PRIV) {
10623- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10624+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10625 (void *) gp->tpc,
10626 (void *) gp->o7,
10627 (void *) gp->i7,
10628diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10629index 79cc0d1..ec62734 100644
10630--- a/arch/sparc/kernel/prom_common.c
10631+++ b/arch/sparc/kernel/prom_common.c
10632@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10633
10634 unsigned int prom_early_allocated __initdata;
10635
10636-static struct of_pdt_ops prom_sparc_ops __initdata = {
10637+static struct of_pdt_ops prom_sparc_ops __initconst = {
10638 .nextprop = prom_common_nextprop,
10639 .getproplen = prom_getproplen,
10640 .getproperty = prom_getproperty,
10641diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10642index 9ddc492..27a5619 100644
10643--- a/arch/sparc/kernel/ptrace_64.c
10644+++ b/arch/sparc/kernel/ptrace_64.c
10645@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10646 return ret;
10647 }
10648
10649+#ifdef CONFIG_GRKERNSEC_SETXID
10650+extern void gr_delayed_cred_worker(void);
10651+#endif
10652+
10653 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10654 {
10655 int ret = 0;
10656@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10657 if (test_thread_flag(TIF_NOHZ))
10658 user_exit();
10659
10660+#ifdef CONFIG_GRKERNSEC_SETXID
10661+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10662+ gr_delayed_cred_worker();
10663+#endif
10664+
10665 if (test_thread_flag(TIF_SYSCALL_TRACE))
10666 ret = tracehook_report_syscall_entry(regs);
10667
10668@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10669 if (test_thread_flag(TIF_NOHZ))
10670 user_exit();
10671
10672+#ifdef CONFIG_GRKERNSEC_SETXID
10673+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10674+ gr_delayed_cred_worker();
10675+#endif
10676+
10677 audit_syscall_exit(regs);
10678
10679 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10680diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10681index da6f1a7..e5dea8f 100644
10682--- a/arch/sparc/kernel/smp_64.c
10683+++ b/arch/sparc/kernel/smp_64.c
10684@@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10685 return;
10686
10687 #ifdef CONFIG_DEBUG_DCFLUSH
10688- atomic_inc(&dcpage_flushes);
10689+ atomic_inc_unchecked(&dcpage_flushes);
10690 #endif
10691
10692 this_cpu = get_cpu();
10693@@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10694 xcall_deliver(data0, __pa(pg_addr),
10695 (u64) pg_addr, cpumask_of(cpu));
10696 #ifdef CONFIG_DEBUG_DCFLUSH
10697- atomic_inc(&dcpage_flushes_xcall);
10698+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10699 #endif
10700 }
10701 }
10702@@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10703 preempt_disable();
10704
10705 #ifdef CONFIG_DEBUG_DCFLUSH
10706- atomic_inc(&dcpage_flushes);
10707+ atomic_inc_unchecked(&dcpage_flushes);
10708 #endif
10709 data0 = 0;
10710 pg_addr = page_address(page);
10711@@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10712 xcall_deliver(data0, __pa(pg_addr),
10713 (u64) pg_addr, cpu_online_mask);
10714 #ifdef CONFIG_DEBUG_DCFLUSH
10715- atomic_inc(&dcpage_flushes_xcall);
10716+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10717 #endif
10718 }
10719 __local_flush_dcache_page(page);
10720diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10721index 646988d..b88905f 100644
10722--- a/arch/sparc/kernel/sys_sparc_32.c
10723+++ b/arch/sparc/kernel/sys_sparc_32.c
10724@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10725 if (len > TASK_SIZE - PAGE_SIZE)
10726 return -ENOMEM;
10727 if (!addr)
10728- addr = TASK_UNMAPPED_BASE;
10729+ addr = current->mm->mmap_base;
10730
10731 info.flags = 0;
10732 info.length = len;
10733diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10734index c85403d..6af95c9 100644
10735--- a/arch/sparc/kernel/sys_sparc_64.c
10736+++ b/arch/sparc/kernel/sys_sparc_64.c
10737@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10738 struct vm_area_struct * vma;
10739 unsigned long task_size = TASK_SIZE;
10740 int do_color_align;
10741+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10742 struct vm_unmapped_area_info info;
10743
10744 if (flags & MAP_FIXED) {
10745 /* We do not accept a shared mapping if it would violate
10746 * cache aliasing constraints.
10747 */
10748- if ((flags & MAP_SHARED) &&
10749+ if ((filp || (flags & MAP_SHARED)) &&
10750 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10751 return -EINVAL;
10752 return addr;
10753@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10754 if (filp || (flags & MAP_SHARED))
10755 do_color_align = 1;
10756
10757+#ifdef CONFIG_PAX_RANDMMAP
10758+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10759+#endif
10760+
10761 if (addr) {
10762 if (do_color_align)
10763 addr = COLOR_ALIGN(addr, pgoff);
10764@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10765 addr = PAGE_ALIGN(addr);
10766
10767 vma = find_vma(mm, addr);
10768- if (task_size - len >= addr &&
10769- (!vma || addr + len <= vma->vm_start))
10770+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10771 return addr;
10772 }
10773
10774 info.flags = 0;
10775 info.length = len;
10776- info.low_limit = TASK_UNMAPPED_BASE;
10777+ info.low_limit = mm->mmap_base;
10778 info.high_limit = min(task_size, VA_EXCLUDE_START);
10779 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10780 info.align_offset = pgoff << PAGE_SHIFT;
10781+ info.threadstack_offset = offset;
10782 addr = vm_unmapped_area(&info);
10783
10784 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10785 VM_BUG_ON(addr != -ENOMEM);
10786 info.low_limit = VA_EXCLUDE_END;
10787+
10788+#ifdef CONFIG_PAX_RANDMMAP
10789+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10790+ info.low_limit += mm->delta_mmap;
10791+#endif
10792+
10793 info.high_limit = task_size;
10794 addr = vm_unmapped_area(&info);
10795 }
10796@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10797 unsigned long task_size = STACK_TOP32;
10798 unsigned long addr = addr0;
10799 int do_color_align;
10800+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10801 struct vm_unmapped_area_info info;
10802
10803 /* This should only ever run for 32-bit processes. */
10804@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10805 /* We do not accept a shared mapping if it would violate
10806 * cache aliasing constraints.
10807 */
10808- if ((flags & MAP_SHARED) &&
10809+ if ((filp || (flags & MAP_SHARED)) &&
10810 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10811 return -EINVAL;
10812 return addr;
10813@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10814 if (filp || (flags & MAP_SHARED))
10815 do_color_align = 1;
10816
10817+#ifdef CONFIG_PAX_RANDMMAP
10818+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10819+#endif
10820+
10821 /* requesting a specific address */
10822 if (addr) {
10823 if (do_color_align)
10824@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10825 addr = PAGE_ALIGN(addr);
10826
10827 vma = find_vma(mm, addr);
10828- if (task_size - len >= addr &&
10829- (!vma || addr + len <= vma->vm_start))
10830+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10831 return addr;
10832 }
10833
10834@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10835 info.high_limit = mm->mmap_base;
10836 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10837 info.align_offset = pgoff << PAGE_SHIFT;
10838+ info.threadstack_offset = offset;
10839 addr = vm_unmapped_area(&info);
10840
10841 /*
10842@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10843 VM_BUG_ON(addr != -ENOMEM);
10844 info.flags = 0;
10845 info.low_limit = TASK_UNMAPPED_BASE;
10846+
10847+#ifdef CONFIG_PAX_RANDMMAP
10848+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10849+ info.low_limit += mm->delta_mmap;
10850+#endif
10851+
10852 info.high_limit = STACK_TOP32;
10853 addr = vm_unmapped_area(&info);
10854 }
10855@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10856 EXPORT_SYMBOL(get_fb_unmapped_area);
10857
10858 /* Essentially the same as PowerPC. */
10859-static unsigned long mmap_rnd(void)
10860+static unsigned long mmap_rnd(struct mm_struct *mm)
10861 {
10862 unsigned long rnd = 0UL;
10863
10864+#ifdef CONFIG_PAX_RANDMMAP
10865+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10866+#endif
10867+
10868 if (current->flags & PF_RANDOMIZE) {
10869 unsigned long val = get_random_int();
10870 if (test_thread_flag(TIF_32BIT))
10871@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10872
10873 void arch_pick_mmap_layout(struct mm_struct *mm)
10874 {
10875- unsigned long random_factor = mmap_rnd();
10876+ unsigned long random_factor = mmap_rnd(mm);
10877 unsigned long gap;
10878
10879 /*
10880@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10881 gap == RLIM_INFINITY ||
10882 sysctl_legacy_va_layout) {
10883 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10884+
10885+#ifdef CONFIG_PAX_RANDMMAP
10886+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10887+ mm->mmap_base += mm->delta_mmap;
10888+#endif
10889+
10890 mm->get_unmapped_area = arch_get_unmapped_area;
10891 } else {
10892 /* We know it's 32-bit */
10893@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10894 gap = (task_size / 6 * 5);
10895
10896 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10897+
10898+#ifdef CONFIG_PAX_RANDMMAP
10899+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10900+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10901+#endif
10902+
10903 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10904 }
10905 }
10906diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10907index 33a17e7..d87fb1f 100644
10908--- a/arch/sparc/kernel/syscalls.S
10909+++ b/arch/sparc/kernel/syscalls.S
10910@@ -52,7 +52,7 @@ sys32_rt_sigreturn:
10911 #endif
10912 .align 32
10913 1: ldx [%g6 + TI_FLAGS], %l5
10914- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10915+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10916 be,pt %icc, rtrap
10917 nop
10918 call syscall_trace_leave
10919@@ -184,7 +184,7 @@ linux_sparc_syscall32:
10920
10921 srl %i3, 0, %o3 ! IEU0
10922 srl %i2, 0, %o2 ! IEU0 Group
10923- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10924+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10925 bne,pn %icc, linux_syscall_trace32 ! CTI
10926 mov %i0, %l5 ! IEU1
10927 5: call %l7 ! CTI Group brk forced
10928@@ -208,7 +208,7 @@ linux_sparc_syscall:
10929
10930 mov %i3, %o3 ! IEU1
10931 mov %i4, %o4 ! IEU0 Group
10932- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10933+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10934 bne,pn %icc, linux_syscall_trace ! CTI Group
10935 mov %i0, %l5 ! IEU0
10936 2: call %l7 ! CTI Group brk forced
10937@@ -223,7 +223,7 @@ ret_sys_call:
10938
10939 cmp %o0, -ERESTART_RESTARTBLOCK
10940 bgeu,pn %xcc, 1f
10941- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10942+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10943 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10944
10945 2:
10946diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10947index 6fd386c5..6907d81 100644
10948--- a/arch/sparc/kernel/traps_32.c
10949+++ b/arch/sparc/kernel/traps_32.c
10950@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10951 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10952 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10953
10954+extern void gr_handle_kernel_exploit(void);
10955+
10956 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10957 {
10958 static int die_counter;
10959@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10960 count++ < 30 &&
10961 (((unsigned long) rw) >= PAGE_OFFSET) &&
10962 !(((unsigned long) rw) & 0x7)) {
10963- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10964+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10965 (void *) rw->ins[7]);
10966 rw = (struct reg_window32 *)rw->ins[6];
10967 }
10968 }
10969 printk("Instruction DUMP:");
10970 instruction_dump ((unsigned long *) regs->pc);
10971- if(regs->psr & PSR_PS)
10972+ if(regs->psr & PSR_PS) {
10973+ gr_handle_kernel_exploit();
10974 do_exit(SIGKILL);
10975+ }
10976 do_exit(SIGSEGV);
10977 }
10978
10979diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10980index 981a769..d906eda 100644
10981--- a/arch/sparc/kernel/traps_64.c
10982+++ b/arch/sparc/kernel/traps_64.c
10983@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10984 i + 1,
10985 p->trapstack[i].tstate, p->trapstack[i].tpc,
10986 p->trapstack[i].tnpc, p->trapstack[i].tt);
10987- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10988+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10989 }
10990 }
10991
10992@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10993
10994 lvl -= 0x100;
10995 if (regs->tstate & TSTATE_PRIV) {
10996+
10997+#ifdef CONFIG_PAX_REFCOUNT
10998+ if (lvl == 6)
10999+ pax_report_refcount_overflow(regs);
11000+#endif
11001+
11002 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
11003 die_if_kernel(buffer, regs);
11004 }
11005@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
11006 void bad_trap_tl1(struct pt_regs *regs, long lvl)
11007 {
11008 char buffer[32];
11009-
11010+
11011 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
11012 0, lvl, SIGTRAP) == NOTIFY_STOP)
11013 return;
11014
11015+#ifdef CONFIG_PAX_REFCOUNT
11016+ if (lvl == 6)
11017+ pax_report_refcount_overflow(regs);
11018+#endif
11019+
11020 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
11021
11022 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
11023@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
11024 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
11025 printk("%s" "ERROR(%d): ",
11026 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
11027- printk("TPC<%pS>\n", (void *) regs->tpc);
11028+ printk("TPC<%pA>\n", (void *) regs->tpc);
11029 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
11030 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
11031 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
11032@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11033 smp_processor_id(),
11034 (type & 0x1) ? 'I' : 'D',
11035 regs->tpc);
11036- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11037+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11038 panic("Irrecoverable Cheetah+ parity error.");
11039 }
11040
11041@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11042 smp_processor_id(),
11043 (type & 0x1) ? 'I' : 'D',
11044 regs->tpc);
11045- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11046+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11047 }
11048
11049 struct sun4v_error_entry {
11050@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11051 /*0x38*/u64 reserved_5;
11052 };
11053
11054-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11055-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11056+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11057+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11058
11059 static const char *sun4v_err_type_to_str(u8 type)
11060 {
11061@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11062 }
11063
11064 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11065- int cpu, const char *pfx, atomic_t *ocnt)
11066+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11067 {
11068 u64 *raw_ptr = (u64 *) ent;
11069 u32 attrs;
11070@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11071
11072 show_regs(regs);
11073
11074- if ((cnt = atomic_read(ocnt)) != 0) {
11075- atomic_set(ocnt, 0);
11076+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11077+ atomic_set_unchecked(ocnt, 0);
11078 wmb();
11079 printk("%s: Queue overflowed %d times.\n",
11080 pfx, cnt);
11081@@ -2048,7 +2059,7 @@ out:
11082 */
11083 void sun4v_resum_overflow(struct pt_regs *regs)
11084 {
11085- atomic_inc(&sun4v_resum_oflow_cnt);
11086+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11087 }
11088
11089 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11090@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11091 /* XXX Actually even this can make not that much sense. Perhaps
11092 * XXX we should just pull the plug and panic directly from here?
11093 */
11094- atomic_inc(&sun4v_nonresum_oflow_cnt);
11095+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11096 }
11097
11098 static void sun4v_tlb_error(struct pt_regs *regs)
11099@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11100
11101 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11102 regs->tpc, tl);
11103- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11104+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11105 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11106- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11107+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11108 (void *) regs->u_regs[UREG_I7]);
11109 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11110 "pte[%lx] error[%lx]\n",
11111@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11112
11113 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11114 regs->tpc, tl);
11115- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11116+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11117 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11118- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11119+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11120 (void *) regs->u_regs[UREG_I7]);
11121 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11122 "pte[%lx] error[%lx]\n",
11123@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11124 fp = (unsigned long)sf->fp + STACK_BIAS;
11125 }
11126
11127- printk(" [%016lx] %pS\n", pc, (void *) pc);
11128+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11129 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11130 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11131 int index = tsk->curr_ret_stack;
11132 if (tsk->ret_stack && index >= graph) {
11133 pc = tsk->ret_stack[index - graph].ret;
11134- printk(" [%016lx] %pS\n", pc, (void *) pc);
11135+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11136 graph++;
11137 }
11138 }
11139@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11140 return (struct reg_window *) (fp + STACK_BIAS);
11141 }
11142
11143+extern void gr_handle_kernel_exploit(void);
11144+
11145 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11146 {
11147 static int die_counter;
11148@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11149 while (rw &&
11150 count++ < 30 &&
11151 kstack_valid(tp, (unsigned long) rw)) {
11152- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11153+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11154 (void *) rw->ins[7]);
11155
11156 rw = kernel_stack_up(rw);
11157@@ -2427,8 +2440,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11158 }
11159 user_instruction_dump ((unsigned int __user *) regs->tpc);
11160 }
11161- if (regs->tstate & TSTATE_PRIV)
11162+ if (regs->tstate & TSTATE_PRIV) {
11163+ gr_handle_kernel_exploit();
11164 do_exit(SIGKILL);
11165+ }
11166 do_exit(SIGSEGV);
11167 }
11168 EXPORT_SYMBOL(die_if_kernel);
11169diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11170index 62098a8..547ab2c 100644
11171--- a/arch/sparc/kernel/unaligned_64.c
11172+++ b/arch/sparc/kernel/unaligned_64.c
11173@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11174 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11175
11176 if (__ratelimit(&ratelimit)) {
11177- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11178+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11179 regs->tpc, (void *) regs->tpc);
11180 }
11181 }
11182diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11183index 3269b02..64f5231 100644
11184--- a/arch/sparc/lib/Makefile
11185+++ b/arch/sparc/lib/Makefile
11186@@ -2,7 +2,7 @@
11187 #
11188
11189 asflags-y := -ansi -DST_DIV0=0x02
11190-ccflags-y := -Werror
11191+#ccflags-y := -Werror
11192
11193 lib-$(CONFIG_SPARC32) += ashrdi3.o
11194 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11195diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11196index 05dac43..76f8ed4 100644
11197--- a/arch/sparc/lib/atomic_64.S
11198+++ b/arch/sparc/lib/atomic_64.S
11199@@ -15,11 +15,22 @@
11200 * a value and does the barriers.
11201 */
11202
11203-#define ATOMIC_OP(op) \
11204-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11205+#ifdef CONFIG_PAX_REFCOUNT
11206+#define __REFCOUNT_OP(op) op##cc
11207+#define __OVERFLOW_IOP tvs %icc, 6;
11208+#define __OVERFLOW_XOP tvs %xcc, 6;
11209+#else
11210+#define __REFCOUNT_OP(op) op
11211+#define __OVERFLOW_IOP
11212+#define __OVERFLOW_XOP
11213+#endif
11214+
11215+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11216+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11217 BACKOFF_SETUP(%o2); \
11218 1: lduw [%o1], %g1; \
11219- op %g1, %o0, %g7; \
11220+ asm_op %g1, %o0, %g7; \
11221+ post_op \
11222 cas [%o1], %g1, %g7; \
11223 cmp %g1, %g7; \
11224 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11225@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11226 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11227 ENDPROC(atomic_##op); \
11228
11229-#define ATOMIC_OP_RETURN(op) \
11230-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11231+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11232+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11233+
11234+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11235+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11236 BACKOFF_SETUP(%o2); \
11237 1: lduw [%o1], %g1; \
11238- op %g1, %o0, %g7; \
11239+ asm_op %g1, %o0, %g7; \
11240+ post_op \
11241 cas [%o1], %g1, %g7; \
11242 cmp %g1, %g7; \
11243 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11244@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11245 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11246 ENDPROC(atomic_##op##_return);
11247
11248+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11249+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11250+
11251 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11252
11253 ATOMIC_OPS(add)
11254@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11255
11256 #undef ATOMIC_OPS
11257 #undef ATOMIC_OP_RETURN
11258+#undef __ATOMIC_OP_RETURN
11259 #undef ATOMIC_OP
11260+#undef __ATOMIC_OP
11261
11262-#define ATOMIC64_OP(op) \
11263-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11264+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11265+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11266 BACKOFF_SETUP(%o2); \
11267 1: ldx [%o1], %g1; \
11268- op %g1, %o0, %g7; \
11269+ asm_op %g1, %o0, %g7; \
11270+ post_op \
11271 casx [%o1], %g1, %g7; \
11272 cmp %g1, %g7; \
11273 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11274@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11275 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11276 ENDPROC(atomic64_##op); \
11277
11278-#define ATOMIC64_OP_RETURN(op) \
11279-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11280+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11281+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11282+
11283+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11284+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11285 BACKOFF_SETUP(%o2); \
11286 1: ldx [%o1], %g1; \
11287- op %g1, %o0, %g7; \
11288+ asm_op %g1, %o0, %g7; \
11289+ post_op \
11290 casx [%o1], %g1, %g7; \
11291 cmp %g1, %g7; \
11292 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11293@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11294 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11295 ENDPROC(atomic64_##op##_return);
11296
11297+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11298+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11299+
11300 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11301
11302 ATOMIC64_OPS(add)
11303@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11304
11305 #undef ATOMIC64_OPS
11306 #undef ATOMIC64_OP_RETURN
11307+#undef __ATOMIC64_OP_RETURN
11308 #undef ATOMIC64_OP
11309+#undef __ATOMIC64_OP
11310+#undef __OVERFLOW_XOP
11311+#undef __OVERFLOW_IOP
11312+#undef __REFCOUNT_OP
11313
11314 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11315 BACKOFF_SETUP(%o2)
11316diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11317index 1d649a9..fbc5bfc 100644
11318--- a/arch/sparc/lib/ksyms.c
11319+++ b/arch/sparc/lib/ksyms.c
11320@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11321 /* Atomic counter implementation. */
11322 #define ATOMIC_OP(op) \
11323 EXPORT_SYMBOL(atomic_##op); \
11324-EXPORT_SYMBOL(atomic64_##op);
11325+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11326+EXPORT_SYMBOL(atomic64_##op); \
11327+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11328
11329 #define ATOMIC_OP_RETURN(op) \
11330 EXPORT_SYMBOL(atomic_##op##_return); \
11331@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11332 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11333
11334 ATOMIC_OPS(add)
11335+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11336+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11337 ATOMIC_OPS(sub)
11338
11339 #undef ATOMIC_OPS
11340diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11341index 30c3ecc..736f015 100644
11342--- a/arch/sparc/mm/Makefile
11343+++ b/arch/sparc/mm/Makefile
11344@@ -2,7 +2,7 @@
11345 #
11346
11347 asflags-y := -ansi
11348-ccflags-y := -Werror
11349+#ccflags-y := -Werror
11350
11351 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11352 obj-y += fault_$(BITS).o
11353diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11354index 908e8c1..1524793 100644
11355--- a/arch/sparc/mm/fault_32.c
11356+++ b/arch/sparc/mm/fault_32.c
11357@@ -21,6 +21,9 @@
11358 #include <linux/perf_event.h>
11359 #include <linux/interrupt.h>
11360 #include <linux/kdebug.h>
11361+#include <linux/slab.h>
11362+#include <linux/pagemap.h>
11363+#include <linux/compiler.h>
11364
11365 #include <asm/page.h>
11366 #include <asm/pgtable.h>
11367@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11368 return safe_compute_effective_address(regs, insn);
11369 }
11370
11371+#ifdef CONFIG_PAX_PAGEEXEC
11372+#ifdef CONFIG_PAX_DLRESOLVE
11373+static void pax_emuplt_close(struct vm_area_struct *vma)
11374+{
11375+ vma->vm_mm->call_dl_resolve = 0UL;
11376+}
11377+
11378+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11379+{
11380+ unsigned int *kaddr;
11381+
11382+ vmf->page = alloc_page(GFP_HIGHUSER);
11383+ if (!vmf->page)
11384+ return VM_FAULT_OOM;
11385+
11386+ kaddr = kmap(vmf->page);
11387+ memset(kaddr, 0, PAGE_SIZE);
11388+ kaddr[0] = 0x9DE3BFA8U; /* save */
11389+ flush_dcache_page(vmf->page);
11390+ kunmap(vmf->page);
11391+ return VM_FAULT_MAJOR;
11392+}
11393+
11394+static const struct vm_operations_struct pax_vm_ops = {
11395+ .close = pax_emuplt_close,
11396+ .fault = pax_emuplt_fault
11397+};
11398+
11399+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11400+{
11401+ int ret;
11402+
11403+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11404+ vma->vm_mm = current->mm;
11405+ vma->vm_start = addr;
11406+ vma->vm_end = addr + PAGE_SIZE;
11407+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11408+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11409+ vma->vm_ops = &pax_vm_ops;
11410+
11411+ ret = insert_vm_struct(current->mm, vma);
11412+ if (ret)
11413+ return ret;
11414+
11415+ ++current->mm->total_vm;
11416+ return 0;
11417+}
11418+#endif
11419+
11420+/*
11421+ * PaX: decide what to do with offenders (regs->pc = fault address)
11422+ *
11423+ * returns 1 when task should be killed
11424+ * 2 when patched PLT trampoline was detected
11425+ * 3 when unpatched PLT trampoline was detected
11426+ */
11427+static int pax_handle_fetch_fault(struct pt_regs *regs)
11428+{
11429+
11430+#ifdef CONFIG_PAX_EMUPLT
11431+ int err;
11432+
11433+ do { /* PaX: patched PLT emulation #1 */
11434+ unsigned int sethi1, sethi2, jmpl;
11435+
11436+ err = get_user(sethi1, (unsigned int *)regs->pc);
11437+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11438+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11439+
11440+ if (err)
11441+ break;
11442+
11443+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11444+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11445+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11446+ {
11447+ unsigned int addr;
11448+
11449+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11450+ addr = regs->u_regs[UREG_G1];
11451+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11452+ regs->pc = addr;
11453+ regs->npc = addr+4;
11454+ return 2;
11455+ }
11456+ } while (0);
11457+
11458+ do { /* PaX: patched PLT emulation #2 */
11459+ unsigned int ba;
11460+
11461+ err = get_user(ba, (unsigned int *)regs->pc);
11462+
11463+ if (err)
11464+ break;
11465+
11466+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11467+ unsigned int addr;
11468+
11469+ if ((ba & 0xFFC00000U) == 0x30800000U)
11470+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11471+ else
11472+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11473+ regs->pc = addr;
11474+ regs->npc = addr+4;
11475+ return 2;
11476+ }
11477+ } while (0);
11478+
11479+ do { /* PaX: patched PLT emulation #3 */
11480+ unsigned int sethi, bajmpl, nop;
11481+
11482+ err = get_user(sethi, (unsigned int *)regs->pc);
11483+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11484+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11485+
11486+ if (err)
11487+ break;
11488+
11489+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11490+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11491+ nop == 0x01000000U)
11492+ {
11493+ unsigned int addr;
11494+
11495+ addr = (sethi & 0x003FFFFFU) << 10;
11496+ regs->u_regs[UREG_G1] = addr;
11497+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11498+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11499+ else
11500+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11501+ regs->pc = addr;
11502+ regs->npc = addr+4;
11503+ return 2;
11504+ }
11505+ } while (0);
11506+
11507+ do { /* PaX: unpatched PLT emulation step 1 */
11508+ unsigned int sethi, ba, nop;
11509+
11510+ err = get_user(sethi, (unsigned int *)regs->pc);
11511+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11512+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11513+
11514+ if (err)
11515+ break;
11516+
11517+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11518+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11519+ nop == 0x01000000U)
11520+ {
11521+ unsigned int addr, save, call;
11522+
11523+ if ((ba & 0xFFC00000U) == 0x30800000U)
11524+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11525+ else
11526+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11527+
11528+ err = get_user(save, (unsigned int *)addr);
11529+ err |= get_user(call, (unsigned int *)(addr+4));
11530+ err |= get_user(nop, (unsigned int *)(addr+8));
11531+ if (err)
11532+ break;
11533+
11534+#ifdef CONFIG_PAX_DLRESOLVE
11535+ if (save == 0x9DE3BFA8U &&
11536+ (call & 0xC0000000U) == 0x40000000U &&
11537+ nop == 0x01000000U)
11538+ {
11539+ struct vm_area_struct *vma;
11540+ unsigned long call_dl_resolve;
11541+
11542+ down_read(&current->mm->mmap_sem);
11543+ call_dl_resolve = current->mm->call_dl_resolve;
11544+ up_read(&current->mm->mmap_sem);
11545+ if (likely(call_dl_resolve))
11546+ goto emulate;
11547+
11548+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11549+
11550+ down_write(&current->mm->mmap_sem);
11551+ if (current->mm->call_dl_resolve) {
11552+ call_dl_resolve = current->mm->call_dl_resolve;
11553+ up_write(&current->mm->mmap_sem);
11554+ if (vma)
11555+ kmem_cache_free(vm_area_cachep, vma);
11556+ goto emulate;
11557+ }
11558+
11559+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11560+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11561+ up_write(&current->mm->mmap_sem);
11562+ if (vma)
11563+ kmem_cache_free(vm_area_cachep, vma);
11564+ return 1;
11565+ }
11566+
11567+ if (pax_insert_vma(vma, call_dl_resolve)) {
11568+ up_write(&current->mm->mmap_sem);
11569+ kmem_cache_free(vm_area_cachep, vma);
11570+ return 1;
11571+ }
11572+
11573+ current->mm->call_dl_resolve = call_dl_resolve;
11574+ up_write(&current->mm->mmap_sem);
11575+
11576+emulate:
11577+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11578+ regs->pc = call_dl_resolve;
11579+ regs->npc = addr+4;
11580+ return 3;
11581+ }
11582+#endif
11583+
11584+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11585+ if ((save & 0xFFC00000U) == 0x05000000U &&
11586+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11587+ nop == 0x01000000U)
11588+ {
11589+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11590+ regs->u_regs[UREG_G2] = addr + 4;
11591+ addr = (save & 0x003FFFFFU) << 10;
11592+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11593+ regs->pc = addr;
11594+ regs->npc = addr+4;
11595+ return 3;
11596+ }
11597+ }
11598+ } while (0);
11599+
11600+ do { /* PaX: unpatched PLT emulation step 2 */
11601+ unsigned int save, call, nop;
11602+
11603+ err = get_user(save, (unsigned int *)(regs->pc-4));
11604+ err |= get_user(call, (unsigned int *)regs->pc);
11605+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11606+ if (err)
11607+ break;
11608+
11609+ if (save == 0x9DE3BFA8U &&
11610+ (call & 0xC0000000U) == 0x40000000U &&
11611+ nop == 0x01000000U)
11612+ {
11613+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11614+
11615+ regs->u_regs[UREG_RETPC] = regs->pc;
11616+ regs->pc = dl_resolve;
11617+ regs->npc = dl_resolve+4;
11618+ return 3;
11619+ }
11620+ } while (0);
11621+#endif
11622+
11623+ return 1;
11624+}
11625+
11626+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11627+{
11628+ unsigned long i;
11629+
11630+ printk(KERN_ERR "PAX: bytes at PC: ");
11631+ for (i = 0; i < 8; i++) {
11632+ unsigned int c;
11633+ if (get_user(c, (unsigned int *)pc+i))
11634+ printk(KERN_CONT "???????? ");
11635+ else
11636+ printk(KERN_CONT "%08x ", c);
11637+ }
11638+ printk("\n");
11639+}
11640+#endif
11641+
11642 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11643 int text_fault)
11644 {
11645@@ -226,6 +500,24 @@ good_area:
11646 if (!(vma->vm_flags & VM_WRITE))
11647 goto bad_area;
11648 } else {
11649+
11650+#ifdef CONFIG_PAX_PAGEEXEC
11651+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11652+ up_read(&mm->mmap_sem);
11653+ switch (pax_handle_fetch_fault(regs)) {
11654+
11655+#ifdef CONFIG_PAX_EMUPLT
11656+ case 2:
11657+ case 3:
11658+ return;
11659+#endif
11660+
11661+ }
11662+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11663+ do_group_exit(SIGKILL);
11664+ }
11665+#endif
11666+
11667 /* Allow reads even for write-only mappings */
11668 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11669 goto bad_area;
11670diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11671index 18fcd71..e4fe821 100644
11672--- a/arch/sparc/mm/fault_64.c
11673+++ b/arch/sparc/mm/fault_64.c
11674@@ -22,6 +22,9 @@
11675 #include <linux/kdebug.h>
11676 #include <linux/percpu.h>
11677 #include <linux/context_tracking.h>
11678+#include <linux/slab.h>
11679+#include <linux/pagemap.h>
11680+#include <linux/compiler.h>
11681
11682 #include <asm/page.h>
11683 #include <asm/pgtable.h>
11684@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11685 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11686 regs->tpc);
11687 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11688- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11689+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11690 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11691 dump_stack();
11692 unhandled_fault(regs->tpc, current, regs);
11693@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11694 show_regs(regs);
11695 }
11696
11697+#ifdef CONFIG_PAX_PAGEEXEC
11698+#ifdef CONFIG_PAX_DLRESOLVE
11699+static void pax_emuplt_close(struct vm_area_struct *vma)
11700+{
11701+ vma->vm_mm->call_dl_resolve = 0UL;
11702+}
11703+
11704+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11705+{
11706+ unsigned int *kaddr;
11707+
11708+ vmf->page = alloc_page(GFP_HIGHUSER);
11709+ if (!vmf->page)
11710+ return VM_FAULT_OOM;
11711+
11712+ kaddr = kmap(vmf->page);
11713+ memset(kaddr, 0, PAGE_SIZE);
11714+ kaddr[0] = 0x9DE3BFA8U; /* save */
11715+ flush_dcache_page(vmf->page);
11716+ kunmap(vmf->page);
11717+ return VM_FAULT_MAJOR;
11718+}
11719+
11720+static const struct vm_operations_struct pax_vm_ops = {
11721+ .close = pax_emuplt_close,
11722+ .fault = pax_emuplt_fault
11723+};
11724+
11725+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11726+{
11727+ int ret;
11728+
11729+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11730+ vma->vm_mm = current->mm;
11731+ vma->vm_start = addr;
11732+ vma->vm_end = addr + PAGE_SIZE;
11733+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11734+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11735+ vma->vm_ops = &pax_vm_ops;
11736+
11737+ ret = insert_vm_struct(current->mm, vma);
11738+ if (ret)
11739+ return ret;
11740+
11741+ ++current->mm->total_vm;
11742+ return 0;
11743+}
11744+#endif
11745+
11746+/*
11747+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11748+ *
11749+ * returns 1 when task should be killed
11750+ * 2 when patched PLT trampoline was detected
11751+ * 3 when unpatched PLT trampoline was detected
11752+ */
11753+static int pax_handle_fetch_fault(struct pt_regs *regs)
11754+{
11755+
11756+#ifdef CONFIG_PAX_EMUPLT
11757+ int err;
11758+
11759+ do { /* PaX: patched PLT emulation #1 */
11760+ unsigned int sethi1, sethi2, jmpl;
11761+
11762+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11763+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11764+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11765+
11766+ if (err)
11767+ break;
11768+
11769+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11770+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11771+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11772+ {
11773+ unsigned long addr;
11774+
11775+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11776+ addr = regs->u_regs[UREG_G1];
11777+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11778+
11779+ if (test_thread_flag(TIF_32BIT))
11780+ addr &= 0xFFFFFFFFUL;
11781+
11782+ regs->tpc = addr;
11783+ regs->tnpc = addr+4;
11784+ return 2;
11785+ }
11786+ } while (0);
11787+
11788+ do { /* PaX: patched PLT emulation #2 */
11789+ unsigned int ba;
11790+
11791+ err = get_user(ba, (unsigned int *)regs->tpc);
11792+
11793+ if (err)
11794+ break;
11795+
11796+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11797+ unsigned long addr;
11798+
11799+ if ((ba & 0xFFC00000U) == 0x30800000U)
11800+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11801+ else
11802+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11803+
11804+ if (test_thread_flag(TIF_32BIT))
11805+ addr &= 0xFFFFFFFFUL;
11806+
11807+ regs->tpc = addr;
11808+ regs->tnpc = addr+4;
11809+ return 2;
11810+ }
11811+ } while (0);
11812+
11813+ do { /* PaX: patched PLT emulation #3 */
11814+ unsigned int sethi, bajmpl, nop;
11815+
11816+ err = get_user(sethi, (unsigned int *)regs->tpc);
11817+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11818+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11819+
11820+ if (err)
11821+ break;
11822+
11823+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11824+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11825+ nop == 0x01000000U)
11826+ {
11827+ unsigned long addr;
11828+
11829+ addr = (sethi & 0x003FFFFFU) << 10;
11830+ regs->u_regs[UREG_G1] = addr;
11831+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11832+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11833+ else
11834+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11835+
11836+ if (test_thread_flag(TIF_32BIT))
11837+ addr &= 0xFFFFFFFFUL;
11838+
11839+ regs->tpc = addr;
11840+ regs->tnpc = addr+4;
11841+ return 2;
11842+ }
11843+ } while (0);
11844+
11845+ do { /* PaX: patched PLT emulation #4 */
11846+ unsigned int sethi, mov1, call, mov2;
11847+
11848+ err = get_user(sethi, (unsigned int *)regs->tpc);
11849+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11850+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11851+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11852+
11853+ if (err)
11854+ break;
11855+
11856+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11857+ mov1 == 0x8210000FU &&
11858+ (call & 0xC0000000U) == 0x40000000U &&
11859+ mov2 == 0x9E100001U)
11860+ {
11861+ unsigned long addr;
11862+
11863+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11864+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11865+
11866+ if (test_thread_flag(TIF_32BIT))
11867+ addr &= 0xFFFFFFFFUL;
11868+
11869+ regs->tpc = addr;
11870+ regs->tnpc = addr+4;
11871+ return 2;
11872+ }
11873+ } while (0);
11874+
11875+ do { /* PaX: patched PLT emulation #5 */
11876+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11877+
11878+ err = get_user(sethi, (unsigned int *)regs->tpc);
11879+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11880+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11881+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11882+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11883+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11884+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11885+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11886+
11887+ if (err)
11888+ break;
11889+
11890+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11891+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11892+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11893+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11894+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11895+ sllx == 0x83287020U &&
11896+ jmpl == 0x81C04005U &&
11897+ nop == 0x01000000U)
11898+ {
11899+ unsigned long addr;
11900+
11901+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11902+ regs->u_regs[UREG_G1] <<= 32;
11903+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11904+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11905+ regs->tpc = addr;
11906+ regs->tnpc = addr+4;
11907+ return 2;
11908+ }
11909+ } while (0);
11910+
11911+ do { /* PaX: patched PLT emulation #6 */
11912+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11913+
11914+ err = get_user(sethi, (unsigned int *)regs->tpc);
11915+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11916+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11917+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11918+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11919+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11920+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11921+
11922+ if (err)
11923+ break;
11924+
11925+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11926+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11927+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11928+ sllx == 0x83287020U &&
11929+ (or & 0xFFFFE000U) == 0x8A116000U &&
11930+ jmpl == 0x81C04005U &&
11931+ nop == 0x01000000U)
11932+ {
11933+ unsigned long addr;
11934+
11935+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11936+ regs->u_regs[UREG_G1] <<= 32;
11937+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11938+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11939+ regs->tpc = addr;
11940+ regs->tnpc = addr+4;
11941+ return 2;
11942+ }
11943+ } while (0);
11944+
11945+ do { /* PaX: unpatched PLT emulation step 1 */
11946+ unsigned int sethi, ba, nop;
11947+
11948+ err = get_user(sethi, (unsigned int *)regs->tpc);
11949+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11950+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11951+
11952+ if (err)
11953+ break;
11954+
11955+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11956+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11957+ nop == 0x01000000U)
11958+ {
11959+ unsigned long addr;
11960+ unsigned int save, call;
11961+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11962+
11963+ if ((ba & 0xFFC00000U) == 0x30800000U)
11964+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11965+ else
11966+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11967+
11968+ if (test_thread_flag(TIF_32BIT))
11969+ addr &= 0xFFFFFFFFUL;
11970+
11971+ err = get_user(save, (unsigned int *)addr);
11972+ err |= get_user(call, (unsigned int *)(addr+4));
11973+ err |= get_user(nop, (unsigned int *)(addr+8));
11974+ if (err)
11975+ break;
11976+
11977+#ifdef CONFIG_PAX_DLRESOLVE
11978+ if (save == 0x9DE3BFA8U &&
11979+ (call & 0xC0000000U) == 0x40000000U &&
11980+ nop == 0x01000000U)
11981+ {
11982+ struct vm_area_struct *vma;
11983+ unsigned long call_dl_resolve;
11984+
11985+ down_read(&current->mm->mmap_sem);
11986+ call_dl_resolve = current->mm->call_dl_resolve;
11987+ up_read(&current->mm->mmap_sem);
11988+ if (likely(call_dl_resolve))
11989+ goto emulate;
11990+
11991+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11992+
11993+ down_write(&current->mm->mmap_sem);
11994+ if (current->mm->call_dl_resolve) {
11995+ call_dl_resolve = current->mm->call_dl_resolve;
11996+ up_write(&current->mm->mmap_sem);
11997+ if (vma)
11998+ kmem_cache_free(vm_area_cachep, vma);
11999+ goto emulate;
12000+ }
12001+
12002+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
12003+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
12004+ up_write(&current->mm->mmap_sem);
12005+ if (vma)
12006+ kmem_cache_free(vm_area_cachep, vma);
12007+ return 1;
12008+ }
12009+
12010+ if (pax_insert_vma(vma, call_dl_resolve)) {
12011+ up_write(&current->mm->mmap_sem);
12012+ kmem_cache_free(vm_area_cachep, vma);
12013+ return 1;
12014+ }
12015+
12016+ current->mm->call_dl_resolve = call_dl_resolve;
12017+ up_write(&current->mm->mmap_sem);
12018+
12019+emulate:
12020+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12021+ regs->tpc = call_dl_resolve;
12022+ regs->tnpc = addr+4;
12023+ return 3;
12024+ }
12025+#endif
12026+
12027+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
12028+ if ((save & 0xFFC00000U) == 0x05000000U &&
12029+ (call & 0xFFFFE000U) == 0x85C0A000U &&
12030+ nop == 0x01000000U)
12031+ {
12032+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12033+ regs->u_regs[UREG_G2] = addr + 4;
12034+ addr = (save & 0x003FFFFFU) << 10;
12035+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
12036+
12037+ if (test_thread_flag(TIF_32BIT))
12038+ addr &= 0xFFFFFFFFUL;
12039+
12040+ regs->tpc = addr;
12041+ regs->tnpc = addr+4;
12042+ return 3;
12043+ }
12044+
12045+ /* PaX: 64-bit PLT stub */
12046+ err = get_user(sethi1, (unsigned int *)addr);
12047+ err |= get_user(sethi2, (unsigned int *)(addr+4));
12048+ err |= get_user(or1, (unsigned int *)(addr+8));
12049+ err |= get_user(or2, (unsigned int *)(addr+12));
12050+ err |= get_user(sllx, (unsigned int *)(addr+16));
12051+ err |= get_user(add, (unsigned int *)(addr+20));
12052+ err |= get_user(jmpl, (unsigned int *)(addr+24));
12053+ err |= get_user(nop, (unsigned int *)(addr+28));
12054+ if (err)
12055+ break;
12056+
12057+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12058+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12059+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12060+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12061+ sllx == 0x89293020U &&
12062+ add == 0x8A010005U &&
12063+ jmpl == 0x89C14000U &&
12064+ nop == 0x01000000U)
12065+ {
12066+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12067+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12068+ regs->u_regs[UREG_G4] <<= 32;
12069+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12070+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12071+ regs->u_regs[UREG_G4] = addr + 24;
12072+ addr = regs->u_regs[UREG_G5];
12073+ regs->tpc = addr;
12074+ regs->tnpc = addr+4;
12075+ return 3;
12076+ }
12077+ }
12078+ } while (0);
12079+
12080+#ifdef CONFIG_PAX_DLRESOLVE
12081+ do { /* PaX: unpatched PLT emulation step 2 */
12082+ unsigned int save, call, nop;
12083+
12084+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12085+ err |= get_user(call, (unsigned int *)regs->tpc);
12086+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12087+ if (err)
12088+ break;
12089+
12090+ if (save == 0x9DE3BFA8U &&
12091+ (call & 0xC0000000U) == 0x40000000U &&
12092+ nop == 0x01000000U)
12093+ {
12094+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12095+
12096+ if (test_thread_flag(TIF_32BIT))
12097+ dl_resolve &= 0xFFFFFFFFUL;
12098+
12099+ regs->u_regs[UREG_RETPC] = regs->tpc;
12100+ regs->tpc = dl_resolve;
12101+ regs->tnpc = dl_resolve+4;
12102+ return 3;
12103+ }
12104+ } while (0);
12105+#endif
12106+
12107+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12108+ unsigned int sethi, ba, nop;
12109+
12110+ err = get_user(sethi, (unsigned int *)regs->tpc);
12111+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12112+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12113+
12114+ if (err)
12115+ break;
12116+
12117+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12118+ (ba & 0xFFF00000U) == 0x30600000U &&
12119+ nop == 0x01000000U)
12120+ {
12121+ unsigned long addr;
12122+
12123+ addr = (sethi & 0x003FFFFFU) << 10;
12124+ regs->u_regs[UREG_G1] = addr;
12125+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12126+
12127+ if (test_thread_flag(TIF_32BIT))
12128+ addr &= 0xFFFFFFFFUL;
12129+
12130+ regs->tpc = addr;
12131+ regs->tnpc = addr+4;
12132+ return 2;
12133+ }
12134+ } while (0);
12135+
12136+#endif
12137+
12138+ return 1;
12139+}
12140+
12141+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12142+{
12143+ unsigned long i;
12144+
12145+ printk(KERN_ERR "PAX: bytes at PC: ");
12146+ for (i = 0; i < 8; i++) {
12147+ unsigned int c;
12148+ if (get_user(c, (unsigned int *)pc+i))
12149+ printk(KERN_CONT "???????? ");
12150+ else
12151+ printk(KERN_CONT "%08x ", c);
12152+ }
12153+ printk("\n");
12154+}
12155+#endif
12156+
12157 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12158 {
12159 enum ctx_state prev_state = exception_enter();
12160@@ -353,6 +816,29 @@ retry:
12161 if (!vma)
12162 goto bad_area;
12163
12164+#ifdef CONFIG_PAX_PAGEEXEC
12165+ /* PaX: detect ITLB misses on non-exec pages */
12166+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12167+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12168+ {
12169+ if (address != regs->tpc)
12170+ goto good_area;
12171+
12172+ up_read(&mm->mmap_sem);
12173+ switch (pax_handle_fetch_fault(regs)) {
12174+
12175+#ifdef CONFIG_PAX_EMUPLT
12176+ case 2:
12177+ case 3:
12178+ return;
12179+#endif
12180+
12181+ }
12182+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12183+ do_group_exit(SIGKILL);
12184+ }
12185+#endif
12186+
12187 /* Pure DTLB misses do not tell us whether the fault causing
12188 * load/store/atomic was a write or not, it only says that there
12189 * was no match. So in such a case we (carefully) read the
12190diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12191index d329537..2c3746a 100644
12192--- a/arch/sparc/mm/hugetlbpage.c
12193+++ b/arch/sparc/mm/hugetlbpage.c
12194@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12195 unsigned long addr,
12196 unsigned long len,
12197 unsigned long pgoff,
12198- unsigned long flags)
12199+ unsigned long flags,
12200+ unsigned long offset)
12201 {
12202+ struct mm_struct *mm = current->mm;
12203 unsigned long task_size = TASK_SIZE;
12204 struct vm_unmapped_area_info info;
12205
12206@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12207
12208 info.flags = 0;
12209 info.length = len;
12210- info.low_limit = TASK_UNMAPPED_BASE;
12211+ info.low_limit = mm->mmap_base;
12212 info.high_limit = min(task_size, VA_EXCLUDE_START);
12213 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12214 info.align_offset = 0;
12215+ info.threadstack_offset = offset;
12216 addr = vm_unmapped_area(&info);
12217
12218 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12219 VM_BUG_ON(addr != -ENOMEM);
12220 info.low_limit = VA_EXCLUDE_END;
12221+
12222+#ifdef CONFIG_PAX_RANDMMAP
12223+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12224+ info.low_limit += mm->delta_mmap;
12225+#endif
12226+
12227 info.high_limit = task_size;
12228 addr = vm_unmapped_area(&info);
12229 }
12230@@ -55,7 +64,8 @@ static unsigned long
12231 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12232 const unsigned long len,
12233 const unsigned long pgoff,
12234- const unsigned long flags)
12235+ const unsigned long flags,
12236+ const unsigned long offset)
12237 {
12238 struct mm_struct *mm = current->mm;
12239 unsigned long addr = addr0;
12240@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12241 info.high_limit = mm->mmap_base;
12242 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12243 info.align_offset = 0;
12244+ info.threadstack_offset = offset;
12245 addr = vm_unmapped_area(&info);
12246
12247 /*
12248@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12249 VM_BUG_ON(addr != -ENOMEM);
12250 info.flags = 0;
12251 info.low_limit = TASK_UNMAPPED_BASE;
12252+
12253+#ifdef CONFIG_PAX_RANDMMAP
12254+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12255+ info.low_limit += mm->delta_mmap;
12256+#endif
12257+
12258 info.high_limit = STACK_TOP32;
12259 addr = vm_unmapped_area(&info);
12260 }
12261@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12262 struct mm_struct *mm = current->mm;
12263 struct vm_area_struct *vma;
12264 unsigned long task_size = TASK_SIZE;
12265+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12266
12267 if (test_thread_flag(TIF_32BIT))
12268 task_size = STACK_TOP32;
12269@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12270 return addr;
12271 }
12272
12273+#ifdef CONFIG_PAX_RANDMMAP
12274+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12275+#endif
12276+
12277 if (addr) {
12278 addr = ALIGN(addr, HPAGE_SIZE);
12279 vma = find_vma(mm, addr);
12280- if (task_size - len >= addr &&
12281- (!vma || addr + len <= vma->vm_start))
12282+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12283 return addr;
12284 }
12285 if (mm->get_unmapped_area == arch_get_unmapped_area)
12286 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12287- pgoff, flags);
12288+ pgoff, flags, offset);
12289 else
12290 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12291- pgoff, flags);
12292+ pgoff, flags, offset);
12293 }
12294
12295 pte_t *huge_pte_alloc(struct mm_struct *mm,
12296diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12297index 2d91c62..17a8fff 100644
12298--- a/arch/sparc/mm/init_64.c
12299+++ b/arch/sparc/mm/init_64.c
12300@@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12301 int num_kernel_image_mappings;
12302
12303 #ifdef CONFIG_DEBUG_DCFLUSH
12304-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12305+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12306 #ifdef CONFIG_SMP
12307-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12308+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12309 #endif
12310 #endif
12311
12312@@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
12313 {
12314 BUG_ON(tlb_type == hypervisor);
12315 #ifdef CONFIG_DEBUG_DCFLUSH
12316- atomic_inc(&dcpage_flushes);
12317+ atomic_inc_unchecked(&dcpage_flushes);
12318 #endif
12319
12320 #ifdef DCACHE_ALIASING_POSSIBLE
12321@@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
12322
12323 #ifdef CONFIG_DEBUG_DCFLUSH
12324 seq_printf(m, "DCPageFlushes\t: %d\n",
12325- atomic_read(&dcpage_flushes));
12326+ atomic_read_unchecked(&dcpage_flushes));
12327 #ifdef CONFIG_SMP
12328 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12329- atomic_read(&dcpage_flushes_xcall));
12330+ atomic_read_unchecked(&dcpage_flushes_xcall));
12331 #endif /* CONFIG_SMP */
12332 #endif /* CONFIG_DEBUG_DCFLUSH */
12333 }
12334diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12335index 7cca418..53fc030 100644
12336--- a/arch/tile/Kconfig
12337+++ b/arch/tile/Kconfig
12338@@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
12339
12340 config KEXEC
12341 bool "kexec system call"
12342+ depends on !GRKERNSEC_KMEM
12343 ---help---
12344 kexec is a system call that implements the ability to shutdown your
12345 current kernel, and to start another kernel. It is like a reboot
12346diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12347index 7b11c5f..755a026 100644
12348--- a/arch/tile/include/asm/atomic_64.h
12349+++ b/arch/tile/include/asm/atomic_64.h
12350@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12351
12352 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12353
12354+#define atomic64_read_unchecked(v) atomic64_read(v)
12355+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12356+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12357+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12358+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12359+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12360+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12361+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12362+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12363+
12364 /* Define this to indicate that cmpxchg is an efficient operation. */
12365 #define __HAVE_ARCH_CMPXCHG
12366
12367diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12368index 6160761..00cac88 100644
12369--- a/arch/tile/include/asm/cache.h
12370+++ b/arch/tile/include/asm/cache.h
12371@@ -15,11 +15,12 @@
12372 #ifndef _ASM_TILE_CACHE_H
12373 #define _ASM_TILE_CACHE_H
12374
12375+#include <linux/const.h>
12376 #include <arch/chip.h>
12377
12378 /* bytes per L1 data cache line */
12379 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12380-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12381+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12382
12383 /* bytes per L2 cache line */
12384 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12385diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12386index b6cde32..c0cb736 100644
12387--- a/arch/tile/include/asm/uaccess.h
12388+++ b/arch/tile/include/asm/uaccess.h
12389@@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12390 const void __user *from,
12391 unsigned long n)
12392 {
12393- int sz = __compiletime_object_size(to);
12394+ size_t sz = __compiletime_object_size(to);
12395
12396- if (likely(sz == -1 || sz >= n))
12397+ if (likely(sz == (size_t)-1 || sz >= n))
12398 n = _copy_from_user(to, from, n);
12399 else
12400 copy_from_user_overflow();
12401diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12402index e514899..f8743c4 100644
12403--- a/arch/tile/mm/hugetlbpage.c
12404+++ b/arch/tile/mm/hugetlbpage.c
12405@@ -207,6 +207,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12406 info.high_limit = TASK_SIZE;
12407 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12408 info.align_offset = 0;
12409+ info.threadstack_offset = 0;
12410 return vm_unmapped_area(&info);
12411 }
12412
12413@@ -224,6 +225,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12414 info.high_limit = current->mm->mmap_base;
12415 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12416 info.align_offset = 0;
12417+ info.threadstack_offset = 0;
12418 addr = vm_unmapped_area(&info);
12419
12420 /*
12421diff --git a/arch/um/Makefile b/arch/um/Makefile
12422index e4b1a96..16162f8 100644
12423--- a/arch/um/Makefile
12424+++ b/arch/um/Makefile
12425@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12426 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12427 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12428
12429+ifdef CONSTIFY_PLUGIN
12430+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12431+endif
12432+
12433 #This will adjust *FLAGS accordingly to the platform.
12434 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12435
12436diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12437index 19e1bdd..3665b77 100644
12438--- a/arch/um/include/asm/cache.h
12439+++ b/arch/um/include/asm/cache.h
12440@@ -1,6 +1,7 @@
12441 #ifndef __UM_CACHE_H
12442 #define __UM_CACHE_H
12443
12444+#include <linux/const.h>
12445
12446 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12447 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12448@@ -12,6 +13,6 @@
12449 # define L1_CACHE_SHIFT 5
12450 #endif
12451
12452-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12453+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12454
12455 #endif
12456diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12457index 2e0a6b1..a64d0f5 100644
12458--- a/arch/um/include/asm/kmap_types.h
12459+++ b/arch/um/include/asm/kmap_types.h
12460@@ -8,6 +8,6 @@
12461
12462 /* No more #include "asm/arch/kmap_types.h" ! */
12463
12464-#define KM_TYPE_NR 14
12465+#define KM_TYPE_NR 15
12466
12467 #endif
12468diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12469index 71c5d13..4c7b9f1 100644
12470--- a/arch/um/include/asm/page.h
12471+++ b/arch/um/include/asm/page.h
12472@@ -14,6 +14,9 @@
12473 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12474 #define PAGE_MASK (~(PAGE_SIZE-1))
12475
12476+#define ktla_ktva(addr) (addr)
12477+#define ktva_ktla(addr) (addr)
12478+
12479 #ifndef __ASSEMBLY__
12480
12481 struct page;
12482diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12483index 0032f92..cd151e0 100644
12484--- a/arch/um/include/asm/pgtable-3level.h
12485+++ b/arch/um/include/asm/pgtable-3level.h
12486@@ -58,6 +58,7 @@
12487 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12488 #define pud_populate(mm, pud, pmd) \
12489 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12490+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12491
12492 #ifdef CONFIG_64BIT
12493 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12494diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12495index f17bca8..48adb87 100644
12496--- a/arch/um/kernel/process.c
12497+++ b/arch/um/kernel/process.c
12498@@ -356,22 +356,6 @@ int singlestepping(void * t)
12499 return 2;
12500 }
12501
12502-/*
12503- * Only x86 and x86_64 have an arch_align_stack().
12504- * All other arches have "#define arch_align_stack(x) (x)"
12505- * in their asm/exec.h
12506- * As this is included in UML from asm-um/system-generic.h,
12507- * we can use it to behave as the subarch does.
12508- */
12509-#ifndef arch_align_stack
12510-unsigned long arch_align_stack(unsigned long sp)
12511-{
12512- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12513- sp -= get_random_int() % 8192;
12514- return sp & ~0xf;
12515-}
12516-#endif
12517-
12518 unsigned long get_wchan(struct task_struct *p)
12519 {
12520 unsigned long stack_page, sp, ip;
12521diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12522index ad8f795..2c7eec6 100644
12523--- a/arch/unicore32/include/asm/cache.h
12524+++ b/arch/unicore32/include/asm/cache.h
12525@@ -12,8 +12,10 @@
12526 #ifndef __UNICORE_CACHE_H__
12527 #define __UNICORE_CACHE_H__
12528
12529-#define L1_CACHE_SHIFT (5)
12530-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12531+#include <linux/const.h>
12532+
12533+#define L1_CACHE_SHIFT 5
12534+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12535
12536 /*
12537 * Memory returned by kmalloc() may be used for DMA, so we must make
12538diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12539index 41a503c..cf98b04 100644
12540--- a/arch/x86/Kconfig
12541+++ b/arch/x86/Kconfig
12542@@ -129,7 +129,7 @@ config X86
12543 select RTC_LIB
12544 select HAVE_DEBUG_STACKOVERFLOW
12545 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12546- select HAVE_CC_STACKPROTECTOR
12547+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12548 select GENERIC_CPU_AUTOPROBE
12549 select HAVE_ARCH_AUDITSYSCALL
12550 select ARCH_SUPPORTS_ATOMIC_RMW
12551@@ -262,7 +262,7 @@ config X86_HT
12552
12553 config X86_32_LAZY_GS
12554 def_bool y
12555- depends on X86_32 && !CC_STACKPROTECTOR
12556+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12557
12558 config ARCH_HWEIGHT_CFLAGS
12559 string
12560@@ -600,6 +600,7 @@ config SCHED_OMIT_FRAME_POINTER
12561
12562 menuconfig HYPERVISOR_GUEST
12563 bool "Linux guest support"
12564+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12565 ---help---
12566 Say Y here to enable options for running Linux under various hyper-
12567 visors. This option enables basic hypervisor detection and platform
12568@@ -973,6 +974,7 @@ config VM86
12569
12570 config X86_16BIT
12571 bool "Enable support for 16-bit segments" if EXPERT
12572+ depends on !GRKERNSEC
12573 default y
12574 ---help---
12575 This option is required by programs like Wine to run 16-bit
12576@@ -1128,6 +1130,7 @@ choice
12577
12578 config NOHIGHMEM
12579 bool "off"
12580+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12581 ---help---
12582 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12583 However, the address space of 32-bit x86 processors is only 4
12584@@ -1164,6 +1167,7 @@ config NOHIGHMEM
12585
12586 config HIGHMEM4G
12587 bool "4GB"
12588+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12589 ---help---
12590 Select this if you have a 32-bit processor and between 1 and 4
12591 gigabytes of physical RAM.
12592@@ -1216,7 +1220,7 @@ config PAGE_OFFSET
12593 hex
12594 default 0xB0000000 if VMSPLIT_3G_OPT
12595 default 0x80000000 if VMSPLIT_2G
12596- default 0x78000000 if VMSPLIT_2G_OPT
12597+ default 0x70000000 if VMSPLIT_2G_OPT
12598 default 0x40000000 if VMSPLIT_1G
12599 default 0xC0000000
12600 depends on X86_32
12601@@ -1631,6 +1635,7 @@ source kernel/Kconfig.hz
12602
12603 config KEXEC
12604 bool "kexec system call"
12605+ depends on !GRKERNSEC_KMEM
12606 ---help---
12607 kexec is a system call that implements the ability to shutdown your
12608 current kernel, and to start another kernel. It is like a reboot
12609@@ -1816,7 +1821,9 @@ config X86_NEED_RELOCS
12610
12611 config PHYSICAL_ALIGN
12612 hex "Alignment value to which kernel should be aligned"
12613- default "0x200000"
12614+ default "0x1000000"
12615+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12616+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12617 range 0x2000 0x1000000 if X86_32
12618 range 0x200000 0x1000000 if X86_64
12619 ---help---
12620@@ -1899,6 +1906,7 @@ config COMPAT_VDSO
12621 def_bool n
12622 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12623 depends on X86_32 || IA32_EMULATION
12624+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12625 ---help---
12626 Certain buggy versions of glibc will crash if they are
12627 presented with a 32-bit vDSO that is not mapped at the address
12628diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12629index 6983314..54ad7e8 100644
12630--- a/arch/x86/Kconfig.cpu
12631+++ b/arch/x86/Kconfig.cpu
12632@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12633
12634 config X86_F00F_BUG
12635 def_bool y
12636- depends on M586MMX || M586TSC || M586 || M486
12637+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12638
12639 config X86_INVD_BUG
12640 def_bool y
12641@@ -327,7 +327,7 @@ config X86_INVD_BUG
12642
12643 config X86_ALIGNMENT_16
12644 def_bool y
12645- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12646+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12647
12648 config X86_INTEL_USERCOPY
12649 def_bool y
12650@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12651 # generates cmov.
12652 config X86_CMOV
12653 def_bool y
12654- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12655+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12656
12657 config X86_MINIMUM_CPU_FAMILY
12658 int
12659diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12660index 61bd2ad..50b625d 100644
12661--- a/arch/x86/Kconfig.debug
12662+++ b/arch/x86/Kconfig.debug
12663@@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12664 config DEBUG_RODATA
12665 bool "Write protect kernel read-only data structures"
12666 default y
12667- depends on DEBUG_KERNEL
12668+ depends on DEBUG_KERNEL && BROKEN
12669 ---help---
12670 Mark the kernel read-only data as write-protected in the pagetables,
12671 in order to catch accidental (and incorrect) writes to such const
12672@@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12673
12674 config DEBUG_SET_MODULE_RONX
12675 bool "Set loadable kernel module data as NX and text as RO"
12676- depends on MODULES
12677+ depends on MODULES && BROKEN
12678 ---help---
12679 This option helps catch unintended modifications to loadable
12680 kernel module's text and read-only data. It also prevents execution
12681diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12682index 920e616..ac3d4df 100644
12683--- a/arch/x86/Makefile
12684+++ b/arch/x86/Makefile
12685@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12686 # CPU-specific tuning. Anything which can be shared with UML should go here.
12687 include $(srctree)/arch/x86/Makefile_32.cpu
12688 KBUILD_CFLAGS += $(cflags-y)
12689-
12690- # temporary until string.h is fixed
12691- KBUILD_CFLAGS += -ffreestanding
12692 else
12693 BITS := 64
12694 UTS_MACHINE := x86_64
12695@@ -107,6 +104,9 @@ else
12696 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12697 endif
12698
12699+# temporary until string.h is fixed
12700+KBUILD_CFLAGS += -ffreestanding
12701+
12702 # Make sure compiler does not have buggy stack-protector support.
12703 ifdef CONFIG_CC_STACKPROTECTOR
12704 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12705@@ -180,6 +180,7 @@ archheaders:
12706 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12707
12708 archprepare:
12709+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12710 ifeq ($(CONFIG_KEXEC_FILE),y)
12711 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12712 endif
12713@@ -263,3 +264,9 @@ define archhelp
12714 echo ' FDARGS="..." arguments for the booted kernel'
12715 echo ' FDINITRD=file initrd for the booted kernel'
12716 endef
12717+
12718+define OLD_LD
12719+
12720+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12721+*** Please upgrade your binutils to 2.18 or newer
12722+endef
12723diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12724index 5b016e2..04ef69c 100644
12725--- a/arch/x86/boot/Makefile
12726+++ b/arch/x86/boot/Makefile
12727@@ -55,6 +55,9 @@ endif
12728 # ---------------------------------------------------------------------------
12729
12730 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12731+ifdef CONSTIFY_PLUGIN
12732+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12733+endif
12734 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12735 GCOV_PROFILE := n
12736
12737diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12738index 878e4b9..20537ab 100644
12739--- a/arch/x86/boot/bitops.h
12740+++ b/arch/x86/boot/bitops.h
12741@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12742 u8 v;
12743 const u32 *p = (const u32 *)addr;
12744
12745- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12746+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12747 return v;
12748 }
12749
12750@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12751
12752 static inline void set_bit(int nr, void *addr)
12753 {
12754- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12755+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12756 }
12757
12758 #endif /* BOOT_BITOPS_H */
12759diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12760index bd49ec6..94c7f58 100644
12761--- a/arch/x86/boot/boot.h
12762+++ b/arch/x86/boot/boot.h
12763@@ -84,7 +84,7 @@ static inline void io_delay(void)
12764 static inline u16 ds(void)
12765 {
12766 u16 seg;
12767- asm("movw %%ds,%0" : "=rm" (seg));
12768+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12769 return seg;
12770 }
12771
12772diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12773index 45abc36..97bea2d 100644
12774--- a/arch/x86/boot/compressed/Makefile
12775+++ b/arch/x86/boot/compressed/Makefile
12776@@ -16,6 +16,9 @@ KBUILD_CFLAGS += $(cflags-y)
12777 KBUILD_CFLAGS += -mno-mmx -mno-sse
12778 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12779 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12780+ifdef CONSTIFY_PLUGIN
12781+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12782+endif
12783
12784 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12785 GCOV_PROFILE := n
12786diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12787index a53440e..c3dbf1e 100644
12788--- a/arch/x86/boot/compressed/efi_stub_32.S
12789+++ b/arch/x86/boot/compressed/efi_stub_32.S
12790@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12791 * parameter 2, ..., param n. To make things easy, we save the return
12792 * address of efi_call_phys in a global variable.
12793 */
12794- popl %ecx
12795- movl %ecx, saved_return_addr(%edx)
12796- /* get the function pointer into ECX*/
12797- popl %ecx
12798- movl %ecx, efi_rt_function_ptr(%edx)
12799+ popl saved_return_addr(%edx)
12800+ popl efi_rt_function_ptr(%edx)
12801
12802 /*
12803 * 3. Call the physical function.
12804 */
12805- call *%ecx
12806+ call *efi_rt_function_ptr(%edx)
12807
12808 /*
12809 * 4. Balance the stack. And because EAX contain the return value,
12810@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12811 1: popl %edx
12812 subl $1b, %edx
12813
12814- movl efi_rt_function_ptr(%edx), %ecx
12815- pushl %ecx
12816+ pushl efi_rt_function_ptr(%edx)
12817
12818 /*
12819 * 10. Push the saved return address onto the stack and return.
12820 */
12821- movl saved_return_addr(%edx), %ecx
12822- pushl %ecx
12823- ret
12824+ jmpl *saved_return_addr(%edx)
12825 ENDPROC(efi_call_phys)
12826 .previous
12827
12828diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12829index 1d7fbbc..36ecd58 100644
12830--- a/arch/x86/boot/compressed/head_32.S
12831+++ b/arch/x86/boot/compressed/head_32.S
12832@@ -140,10 +140,10 @@ preferred_addr:
12833 addl %eax, %ebx
12834 notl %eax
12835 andl %eax, %ebx
12836- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12837+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12838 jge 1f
12839 #endif
12840- movl $LOAD_PHYSICAL_ADDR, %ebx
12841+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12842 1:
12843
12844 /* Target address to relocate to for decompression */
12845diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12846index 6b1766c..ad465c9 100644
12847--- a/arch/x86/boot/compressed/head_64.S
12848+++ b/arch/x86/boot/compressed/head_64.S
12849@@ -94,10 +94,10 @@ ENTRY(startup_32)
12850 addl %eax, %ebx
12851 notl %eax
12852 andl %eax, %ebx
12853- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12854+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12855 jge 1f
12856 #endif
12857- movl $LOAD_PHYSICAL_ADDR, %ebx
12858+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12859 1:
12860
12861 /* Target address to relocate to for decompression */
12862@@ -322,10 +322,10 @@ preferred_addr:
12863 addq %rax, %rbp
12864 notq %rax
12865 andq %rax, %rbp
12866- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12867+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12868 jge 1f
12869 #endif
12870- movq $LOAD_PHYSICAL_ADDR, %rbp
12871+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12872 1:
12873
12874 /* Target address to relocate to for decompression */
12875@@ -434,8 +434,8 @@ gdt:
12876 .long gdt
12877 .word 0
12878 .quad 0x0000000000000000 /* NULL descriptor */
12879- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12880- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12881+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12882+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12883 .quad 0x0080890000000000 /* TS descriptor */
12884 .quad 0x0000000000000000 /* TS continued */
12885 gdt_end:
12886diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12887index 30dd59a..cd9edc3 100644
12888--- a/arch/x86/boot/compressed/misc.c
12889+++ b/arch/x86/boot/compressed/misc.c
12890@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12891 * Calculate the delta between where vmlinux was linked to load
12892 * and where it was actually loaded.
12893 */
12894- delta = min_addr - LOAD_PHYSICAL_ADDR;
12895+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12896 if (!delta) {
12897 debug_putstr("No relocation needed... ");
12898 return;
12899@@ -312,7 +312,7 @@ static void parse_elf(void *output)
12900 Elf32_Ehdr ehdr;
12901 Elf32_Phdr *phdrs, *phdr;
12902 #endif
12903- void *dest;
12904+ void *dest, *prev;
12905 int i;
12906
12907 memcpy(&ehdr, output, sizeof(ehdr));
12908@@ -339,13 +339,16 @@ static void parse_elf(void *output)
12909 case PT_LOAD:
12910 #ifdef CONFIG_RELOCATABLE
12911 dest = output;
12912- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12913+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12914 #else
12915 dest = (void *)(phdr->p_paddr);
12916 #endif
12917 memcpy(dest,
12918 output + phdr->p_offset,
12919 phdr->p_filesz);
12920+ if (i)
12921+ memset(prev, 0xff, dest - prev);
12922+ prev = dest + phdr->p_filesz;
12923 break;
12924 default: /* Ignore other PT_* */ break;
12925 }
12926@@ -402,7 +405,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12927 error("Destination address too large");
12928 #endif
12929 #ifndef CONFIG_RELOCATABLE
12930- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12931+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12932 error("Wrong destination address");
12933 #endif
12934
12935diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12936index 1fd7d57..0f7d096 100644
12937--- a/arch/x86/boot/cpucheck.c
12938+++ b/arch/x86/boot/cpucheck.c
12939@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12940 u32 ecx = MSR_K7_HWCR;
12941 u32 eax, edx;
12942
12943- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12944+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12945 eax &= ~(1 << 15);
12946- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12947+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12948
12949 get_cpuflags(); /* Make sure it really did something */
12950 err = check_cpuflags();
12951@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12952 u32 ecx = MSR_VIA_FCR;
12953 u32 eax, edx;
12954
12955- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12956+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12957 eax |= (1<<1)|(1<<7);
12958- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12959+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12960
12961 set_bit(X86_FEATURE_CX8, cpu.flags);
12962 err = check_cpuflags();
12963@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12964 u32 eax, edx;
12965 u32 level = 1;
12966
12967- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12968- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12969- asm("cpuid"
12970+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12971+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12972+ asm volatile("cpuid"
12973 : "+a" (level), "=d" (cpu.flags[0])
12974 : : "ecx", "ebx");
12975- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12976+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12977
12978 err = check_cpuflags();
12979 } else if (err == 0x01 &&
12980diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12981index 16ef025..91e033b 100644
12982--- a/arch/x86/boot/header.S
12983+++ b/arch/x86/boot/header.S
12984@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12985 # single linked list of
12986 # struct setup_data
12987
12988-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12989+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12990
12991 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12992+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12993+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12994+#else
12995 #define VO_INIT_SIZE (VO__end - VO__text)
12996+#endif
12997 #if ZO_INIT_SIZE > VO_INIT_SIZE
12998 #define INIT_SIZE ZO_INIT_SIZE
12999 #else
13000diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
13001index db75d07..8e6d0af 100644
13002--- a/arch/x86/boot/memory.c
13003+++ b/arch/x86/boot/memory.c
13004@@ -19,7 +19,7 @@
13005
13006 static int detect_memory_e820(void)
13007 {
13008- int count = 0;
13009+ unsigned int count = 0;
13010 struct biosregs ireg, oreg;
13011 struct e820entry *desc = boot_params.e820_map;
13012 static struct e820entry buf; /* static so it is zeroed */
13013diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
13014index ba3e100..6501b8f 100644
13015--- a/arch/x86/boot/video-vesa.c
13016+++ b/arch/x86/boot/video-vesa.c
13017@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
13018
13019 boot_params.screen_info.vesapm_seg = oreg.es;
13020 boot_params.screen_info.vesapm_off = oreg.di;
13021+ boot_params.screen_info.vesapm_size = oreg.cx;
13022 }
13023
13024 /*
13025diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13026index 43eda28..5ab5fdb 100644
13027--- a/arch/x86/boot/video.c
13028+++ b/arch/x86/boot/video.c
13029@@ -96,7 +96,7 @@ static void store_mode_params(void)
13030 static unsigned int get_entry(void)
13031 {
13032 char entry_buf[4];
13033- int i, len = 0;
13034+ unsigned int i, len = 0;
13035 int key;
13036 unsigned int v;
13037
13038diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13039index 9105655..41779c1 100644
13040--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13041+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13042@@ -8,6 +8,8 @@
13043 * including this sentence is retained in full.
13044 */
13045
13046+#include <asm/alternative-asm.h>
13047+
13048 .extern crypto_ft_tab
13049 .extern crypto_it_tab
13050 .extern crypto_fl_tab
13051@@ -70,6 +72,8 @@
13052 je B192; \
13053 leaq 32(r9),r9;
13054
13055+#define ret pax_force_retaddr; ret
13056+
13057 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13058 movq r1,r2; \
13059 movq r3,r4; \
13060diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13061index 477e9d7..c92c7d8 100644
13062--- a/arch/x86/crypto/aesni-intel_asm.S
13063+++ b/arch/x86/crypto/aesni-intel_asm.S
13064@@ -31,6 +31,7 @@
13065
13066 #include <linux/linkage.h>
13067 #include <asm/inst.h>
13068+#include <asm/alternative-asm.h>
13069
13070 #ifdef __x86_64__
13071 .data
13072@@ -205,7 +206,7 @@ enc: .octa 0x2
13073 * num_initial_blocks = b mod 4
13074 * encrypt the initial num_initial_blocks blocks and apply ghash on
13075 * the ciphertext
13076-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13077+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13078 * are clobbered
13079 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13080 */
13081@@ -214,8 +215,8 @@ enc: .octa 0x2
13082 .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13083 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13084 mov arg7, %r10 # %r10 = AAD
13085- mov arg8, %r12 # %r12 = aadLen
13086- mov %r12, %r11
13087+ mov arg8, %r15 # %r15 = aadLen
13088+ mov %r15, %r11
13089 pxor %xmm\i, %xmm\i
13090 _get_AAD_loop\num_initial_blocks\operation:
13091 movd (%r10), \TMP1
13092@@ -223,15 +224,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13093 psrldq $4, %xmm\i
13094 pxor \TMP1, %xmm\i
13095 add $4, %r10
13096- sub $4, %r12
13097+ sub $4, %r15
13098 jne _get_AAD_loop\num_initial_blocks\operation
13099 cmp $16, %r11
13100 je _get_AAD_loop2_done\num_initial_blocks\operation
13101- mov $16, %r12
13102+ mov $16, %r15
13103 _get_AAD_loop2\num_initial_blocks\operation:
13104 psrldq $4, %xmm\i
13105- sub $4, %r12
13106- cmp %r11, %r12
13107+ sub $4, %r15
13108+ cmp %r11, %r15
13109 jne _get_AAD_loop2\num_initial_blocks\operation
13110 _get_AAD_loop2_done\num_initial_blocks\operation:
13111 movdqa SHUF_MASK(%rip), %xmm14
13112@@ -443,7 +444,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13113 * num_initial_blocks = b mod 4
13114 * encrypt the initial num_initial_blocks blocks and apply ghash on
13115 * the ciphertext
13116-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13117+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13118 * are clobbered
13119 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13120 */
13121@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13122 .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13123 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13124 mov arg7, %r10 # %r10 = AAD
13125- mov arg8, %r12 # %r12 = aadLen
13126- mov %r12, %r11
13127+ mov arg8, %r15 # %r15 = aadLen
13128+ mov %r15, %r11
13129 pxor %xmm\i, %xmm\i
13130 _get_AAD_loop\num_initial_blocks\operation:
13131 movd (%r10), \TMP1
13132@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13133 psrldq $4, %xmm\i
13134 pxor \TMP1, %xmm\i
13135 add $4, %r10
13136- sub $4, %r12
13137+ sub $4, %r15
13138 jne _get_AAD_loop\num_initial_blocks\operation
13139 cmp $16, %r11
13140 je _get_AAD_loop2_done\num_initial_blocks\operation
13141- mov $16, %r12
13142+ mov $16, %r15
13143 _get_AAD_loop2\num_initial_blocks\operation:
13144 psrldq $4, %xmm\i
13145- sub $4, %r12
13146- cmp %r11, %r12
13147+ sub $4, %r15
13148+ cmp %r11, %r15
13149 jne _get_AAD_loop2\num_initial_blocks\operation
13150 _get_AAD_loop2_done\num_initial_blocks\operation:
13151 movdqa SHUF_MASK(%rip), %xmm14
13152@@ -1269,7 +1270,7 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
13153 *
13154 *****************************************************************************/
13155 ENTRY(aesni_gcm_dec)
13156- push %r12
13157+ push %r15
13158 push %r13
13159 push %r14
13160 mov %rsp, %r14
13161@@ -1279,8 +1280,8 @@ ENTRY(aesni_gcm_dec)
13162 */
13163 sub $VARIABLE_OFFSET, %rsp
13164 and $~63, %rsp # align rsp to 64 bytes
13165- mov %arg6, %r12
13166- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13167+ mov %arg6, %r15
13168+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13169 movdqa SHUF_MASK(%rip), %xmm2
13170 PSHUFB_XMM %xmm2, %xmm13
13171
13172@@ -1308,10 +1309,10 @@ ENTRY(aesni_gcm_dec)
13173 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13174 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13175 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13176- mov %r13, %r12
13177- and $(3<<4), %r12
13178+ mov %r13, %r15
13179+ and $(3<<4), %r15
13180 jz _initial_num_blocks_is_0_decrypt
13181- cmp $(2<<4), %r12
13182+ cmp $(2<<4), %r15
13183 jb _initial_num_blocks_is_1_decrypt
13184 je _initial_num_blocks_is_2_decrypt
13185 _initial_num_blocks_is_3_decrypt:
13186@@ -1361,16 +1362,16 @@ _zero_cipher_left_decrypt:
13187 sub $16, %r11
13188 add %r13, %r11
13189 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13190- lea SHIFT_MASK+16(%rip), %r12
13191- sub %r13, %r12
13192+ lea SHIFT_MASK+16(%rip), %r15
13193+ sub %r13, %r15
13194 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13195 # (%r13 is the number of bytes in plaintext mod 16)
13196- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13197+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13198 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13199
13200 movdqa %xmm1, %xmm2
13201 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13202- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13203+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13204 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13205 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13206 pand %xmm1, %xmm2
13207@@ -1399,9 +1400,9 @@ _less_than_8_bytes_left_decrypt:
13208 sub $1, %r13
13209 jne _less_than_8_bytes_left_decrypt
13210 _multiple_of_16_bytes_decrypt:
13211- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13212- shl $3, %r12 # convert into number of bits
13213- movd %r12d, %xmm15 # len(A) in %xmm15
13214+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13215+ shl $3, %r15 # convert into number of bits
13216+ movd %r15d, %xmm15 # len(A) in %xmm15
13217 shl $3, %arg4 # len(C) in bits (*128)
13218 MOVQ_R64_XMM %arg4, %xmm1
13219 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13220@@ -1440,7 +1441,8 @@ _return_T_done_decrypt:
13221 mov %r14, %rsp
13222 pop %r14
13223 pop %r13
13224- pop %r12
13225+ pop %r15
13226+ pax_force_retaddr
13227 ret
13228 ENDPROC(aesni_gcm_dec)
13229
13230@@ -1529,7 +1531,7 @@ ENDPROC(aesni_gcm_dec)
13231 * poly = x^128 + x^127 + x^126 + x^121 + 1
13232 ***************************************************************************/
13233 ENTRY(aesni_gcm_enc)
13234- push %r12
13235+ push %r15
13236 push %r13
13237 push %r14
13238 mov %rsp, %r14
13239@@ -1539,8 +1541,8 @@ ENTRY(aesni_gcm_enc)
13240 #
13241 sub $VARIABLE_OFFSET, %rsp
13242 and $~63, %rsp
13243- mov %arg6, %r12
13244- movdqu (%r12), %xmm13
13245+ mov %arg6, %r15
13246+ movdqu (%r15), %xmm13
13247 movdqa SHUF_MASK(%rip), %xmm2
13248 PSHUFB_XMM %xmm2, %xmm13
13249
13250@@ -1564,13 +1566,13 @@ ENTRY(aesni_gcm_enc)
13251 movdqa %xmm13, HashKey(%rsp)
13252 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13253 and $-16, %r13
13254- mov %r13, %r12
13255+ mov %r13, %r15
13256
13257 # Encrypt first few blocks
13258
13259- and $(3<<4), %r12
13260+ and $(3<<4), %r15
13261 jz _initial_num_blocks_is_0_encrypt
13262- cmp $(2<<4), %r12
13263+ cmp $(2<<4), %r15
13264 jb _initial_num_blocks_is_1_encrypt
13265 je _initial_num_blocks_is_2_encrypt
13266 _initial_num_blocks_is_3_encrypt:
13267@@ -1623,14 +1625,14 @@ _zero_cipher_left_encrypt:
13268 sub $16, %r11
13269 add %r13, %r11
13270 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13271- lea SHIFT_MASK+16(%rip), %r12
13272- sub %r13, %r12
13273+ lea SHIFT_MASK+16(%rip), %r15
13274+ sub %r13, %r15
13275 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13276 # (%r13 is the number of bytes in plaintext mod 16)
13277- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13278+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13279 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13280 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13281- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13282+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13283 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13284 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13285 movdqa SHUF_MASK(%rip), %xmm10
13286@@ -1663,9 +1665,9 @@ _less_than_8_bytes_left_encrypt:
13287 sub $1, %r13
13288 jne _less_than_8_bytes_left_encrypt
13289 _multiple_of_16_bytes_encrypt:
13290- mov arg8, %r12 # %r12 = addLen (number of bytes)
13291- shl $3, %r12
13292- movd %r12d, %xmm15 # len(A) in %xmm15
13293+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13294+ shl $3, %r15
13295+ movd %r15d, %xmm15 # len(A) in %xmm15
13296 shl $3, %arg4 # len(C) in bits (*128)
13297 MOVQ_R64_XMM %arg4, %xmm1
13298 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13299@@ -1704,7 +1706,8 @@ _return_T_done_encrypt:
13300 mov %r14, %rsp
13301 pop %r14
13302 pop %r13
13303- pop %r12
13304+ pop %r15
13305+ pax_force_retaddr
13306 ret
13307 ENDPROC(aesni_gcm_enc)
13308
13309@@ -1722,6 +1725,7 @@ _key_expansion_256a:
13310 pxor %xmm1, %xmm0
13311 movaps %xmm0, (TKEYP)
13312 add $0x10, TKEYP
13313+ pax_force_retaddr
13314 ret
13315 ENDPROC(_key_expansion_128)
13316 ENDPROC(_key_expansion_256a)
13317@@ -1748,6 +1752,7 @@ _key_expansion_192a:
13318 shufps $0b01001110, %xmm2, %xmm1
13319 movaps %xmm1, 0x10(TKEYP)
13320 add $0x20, TKEYP
13321+ pax_force_retaddr
13322 ret
13323 ENDPROC(_key_expansion_192a)
13324
13325@@ -1768,6 +1773,7 @@ _key_expansion_192b:
13326
13327 movaps %xmm0, (TKEYP)
13328 add $0x10, TKEYP
13329+ pax_force_retaddr
13330 ret
13331 ENDPROC(_key_expansion_192b)
13332
13333@@ -1781,6 +1787,7 @@ _key_expansion_256b:
13334 pxor %xmm1, %xmm2
13335 movaps %xmm2, (TKEYP)
13336 add $0x10, TKEYP
13337+ pax_force_retaddr
13338 ret
13339 ENDPROC(_key_expansion_256b)
13340
13341@@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
13342 #ifndef __x86_64__
13343 popl KEYP
13344 #endif
13345+ pax_force_retaddr
13346 ret
13347 ENDPROC(aesni_set_key)
13348
13349@@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
13350 popl KLEN
13351 popl KEYP
13352 #endif
13353+ pax_force_retaddr
13354 ret
13355 ENDPROC(aesni_enc)
13356
13357@@ -1974,6 +1983,7 @@ _aesni_enc1:
13358 AESENC KEY STATE
13359 movaps 0x70(TKEYP), KEY
13360 AESENCLAST KEY STATE
13361+ pax_force_retaddr
13362 ret
13363 ENDPROC(_aesni_enc1)
13364
13365@@ -2083,6 +2093,7 @@ _aesni_enc4:
13366 AESENCLAST KEY STATE2
13367 AESENCLAST KEY STATE3
13368 AESENCLAST KEY STATE4
13369+ pax_force_retaddr
13370 ret
13371 ENDPROC(_aesni_enc4)
13372
13373@@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
13374 popl KLEN
13375 popl KEYP
13376 #endif
13377+ pax_force_retaddr
13378 ret
13379 ENDPROC(aesni_dec)
13380
13381@@ -2164,6 +2176,7 @@ _aesni_dec1:
13382 AESDEC KEY STATE
13383 movaps 0x70(TKEYP), KEY
13384 AESDECLAST KEY STATE
13385+ pax_force_retaddr
13386 ret
13387 ENDPROC(_aesni_dec1)
13388
13389@@ -2273,6 +2286,7 @@ _aesni_dec4:
13390 AESDECLAST KEY STATE2
13391 AESDECLAST KEY STATE3
13392 AESDECLAST KEY STATE4
13393+ pax_force_retaddr
13394 ret
13395 ENDPROC(_aesni_dec4)
13396
13397@@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
13398 popl KEYP
13399 popl LEN
13400 #endif
13401+ pax_force_retaddr
13402 ret
13403 ENDPROC(aesni_ecb_enc)
13404
13405@@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
13406 popl KEYP
13407 popl LEN
13408 #endif
13409+ pax_force_retaddr
13410 ret
13411 ENDPROC(aesni_ecb_dec)
13412
13413@@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
13414 popl LEN
13415 popl IVP
13416 #endif
13417+ pax_force_retaddr
13418 ret
13419 ENDPROC(aesni_cbc_enc)
13420
13421@@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
13422 popl LEN
13423 popl IVP
13424 #endif
13425+ pax_force_retaddr
13426 ret
13427 ENDPROC(aesni_cbc_dec)
13428
13429@@ -2550,6 +2568,7 @@ _aesni_inc_init:
13430 mov $1, TCTR_LOW
13431 MOVQ_R64_XMM TCTR_LOW INC
13432 MOVQ_R64_XMM CTR TCTR_LOW
13433+ pax_force_retaddr
13434 ret
13435 ENDPROC(_aesni_inc_init)
13436
13437@@ -2579,6 +2598,7 @@ _aesni_inc:
13438 .Linc_low:
13439 movaps CTR, IV
13440 PSHUFB_XMM BSWAP_MASK IV
13441+ pax_force_retaddr
13442 ret
13443 ENDPROC(_aesni_inc)
13444
13445@@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
13446 .Lctr_enc_ret:
13447 movups IV, (IVP)
13448 .Lctr_enc_just_ret:
13449+ pax_force_retaddr
13450 ret
13451 ENDPROC(aesni_ctr_enc)
13452
13453@@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
13454 pxor INC, STATE4
13455 movdqu STATE4, 0x70(OUTP)
13456
13457+ pax_force_retaddr
13458 ret
13459 ENDPROC(aesni_xts_crypt8)
13460
13461diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13462index 246c670..466e2d6 100644
13463--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13464+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13465@@ -21,6 +21,7 @@
13466 */
13467
13468 #include <linux/linkage.h>
13469+#include <asm/alternative-asm.h>
13470
13471 .file "blowfish-x86_64-asm.S"
13472 .text
13473@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13474 jnz .L__enc_xor;
13475
13476 write_block();
13477+ pax_force_retaddr
13478 ret;
13479 .L__enc_xor:
13480 xor_block();
13481+ pax_force_retaddr
13482 ret;
13483 ENDPROC(__blowfish_enc_blk)
13484
13485@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13486
13487 movq %r11, %rbp;
13488
13489+ pax_force_retaddr
13490 ret;
13491 ENDPROC(blowfish_dec_blk)
13492
13493@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13494
13495 popq %rbx;
13496 popq %rbp;
13497+ pax_force_retaddr
13498 ret;
13499
13500 .L__enc_xor4:
13501@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13502
13503 popq %rbx;
13504 popq %rbp;
13505+ pax_force_retaddr
13506 ret;
13507 ENDPROC(__blowfish_enc_blk_4way)
13508
13509@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13510 popq %rbx;
13511 popq %rbp;
13512
13513+ pax_force_retaddr
13514 ret;
13515 ENDPROC(blowfish_dec_blk_4way)
13516diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13517index ce71f92..1dce7ec 100644
13518--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13519+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13520@@ -16,6 +16,7 @@
13521 */
13522
13523 #include <linux/linkage.h>
13524+#include <asm/alternative-asm.h>
13525
13526 #define CAMELLIA_TABLE_BYTE_LEN 272
13527
13528@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13529 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13530 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13531 %rcx, (%r9));
13532+ pax_force_retaddr
13533 ret;
13534 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13535
13536@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13537 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13538 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13539 %rax, (%r9));
13540+ pax_force_retaddr
13541 ret;
13542 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13543
13544@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13545 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13546 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13547
13548+ pax_force_retaddr
13549 ret;
13550
13551 .align 8
13552@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13553 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13554 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13555
13556+ pax_force_retaddr
13557 ret;
13558
13559 .align 8
13560@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13561 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13562 %xmm8, %rsi);
13563
13564+ pax_force_retaddr
13565 ret;
13566 ENDPROC(camellia_ecb_enc_16way)
13567
13568@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13569 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13570 %xmm8, %rsi);
13571
13572+ pax_force_retaddr
13573 ret;
13574 ENDPROC(camellia_ecb_dec_16way)
13575
13576@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13577 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13578 %xmm8, %rsi);
13579
13580+ pax_force_retaddr
13581 ret;
13582 ENDPROC(camellia_cbc_dec_16way)
13583
13584@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13585 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13586 %xmm8, %rsi);
13587
13588+ pax_force_retaddr
13589 ret;
13590 ENDPROC(camellia_ctr_16way)
13591
13592@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13593 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13594 %xmm8, %rsi);
13595
13596+ pax_force_retaddr
13597 ret;
13598 ENDPROC(camellia_xts_crypt_16way)
13599
13600diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13601index 0e0b886..5a3123c 100644
13602--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13603+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13604@@ -11,6 +11,7 @@
13605 */
13606
13607 #include <linux/linkage.h>
13608+#include <asm/alternative-asm.h>
13609
13610 #define CAMELLIA_TABLE_BYTE_LEN 272
13611
13612@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13613 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13614 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13615 %rcx, (%r9));
13616+ pax_force_retaddr
13617 ret;
13618 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13619
13620@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13621 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13622 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13623 %rax, (%r9));
13624+ pax_force_retaddr
13625 ret;
13626 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13627
13628@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13629 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13630 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13631
13632+ pax_force_retaddr
13633 ret;
13634
13635 .align 8
13636@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13637 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13638 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13639
13640+ pax_force_retaddr
13641 ret;
13642
13643 .align 8
13644@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13645
13646 vzeroupper;
13647
13648+ pax_force_retaddr
13649 ret;
13650 ENDPROC(camellia_ecb_enc_32way)
13651
13652@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13653
13654 vzeroupper;
13655
13656+ pax_force_retaddr
13657 ret;
13658 ENDPROC(camellia_ecb_dec_32way)
13659
13660@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13661
13662 vzeroupper;
13663
13664+ pax_force_retaddr
13665 ret;
13666 ENDPROC(camellia_cbc_dec_32way)
13667
13668@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13669
13670 vzeroupper;
13671
13672+ pax_force_retaddr
13673 ret;
13674 ENDPROC(camellia_ctr_32way)
13675
13676@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13677
13678 vzeroupper;
13679
13680+ pax_force_retaddr
13681 ret;
13682 ENDPROC(camellia_xts_crypt_32way)
13683
13684diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13685index 310319c..db3d7b5 100644
13686--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13687+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13688@@ -21,6 +21,7 @@
13689 */
13690
13691 #include <linux/linkage.h>
13692+#include <asm/alternative-asm.h>
13693
13694 .file "camellia-x86_64-asm_64.S"
13695 .text
13696@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13697 enc_outunpack(mov, RT1);
13698
13699 movq RRBP, %rbp;
13700+ pax_force_retaddr
13701 ret;
13702
13703 .L__enc_xor:
13704 enc_outunpack(xor, RT1);
13705
13706 movq RRBP, %rbp;
13707+ pax_force_retaddr
13708 ret;
13709 ENDPROC(__camellia_enc_blk)
13710
13711@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13712 dec_outunpack();
13713
13714 movq RRBP, %rbp;
13715+ pax_force_retaddr
13716 ret;
13717 ENDPROC(camellia_dec_blk)
13718
13719@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13720
13721 movq RRBP, %rbp;
13722 popq %rbx;
13723+ pax_force_retaddr
13724 ret;
13725
13726 .L__enc2_xor:
13727@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13728
13729 movq RRBP, %rbp;
13730 popq %rbx;
13731+ pax_force_retaddr
13732 ret;
13733 ENDPROC(__camellia_enc_blk_2way)
13734
13735@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13736
13737 movq RRBP, %rbp;
13738 movq RXOR, %rbx;
13739+ pax_force_retaddr
13740 ret;
13741 ENDPROC(camellia_dec_blk_2way)
13742diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13743index c35fd5d..2d8c7db 100644
13744--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13745+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13746@@ -24,6 +24,7 @@
13747 */
13748
13749 #include <linux/linkage.h>
13750+#include <asm/alternative-asm.h>
13751
13752 .file "cast5-avx-x86_64-asm_64.S"
13753
13754@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13755 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13756 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13757
13758+ pax_force_retaddr
13759 ret;
13760 ENDPROC(__cast5_enc_blk16)
13761
13762@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13763 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13764 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13765
13766+ pax_force_retaddr
13767 ret;
13768
13769 .L__skip_dec:
13770@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13771 vmovdqu RR4, (6*4*4)(%r11);
13772 vmovdqu RL4, (7*4*4)(%r11);
13773
13774+ pax_force_retaddr
13775 ret;
13776 ENDPROC(cast5_ecb_enc_16way)
13777
13778@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13779 vmovdqu RR4, (6*4*4)(%r11);
13780 vmovdqu RL4, (7*4*4)(%r11);
13781
13782+ pax_force_retaddr
13783 ret;
13784 ENDPROC(cast5_ecb_dec_16way)
13785
13786@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13787 * %rdx: src
13788 */
13789
13790- pushq %r12;
13791+ pushq %r14;
13792
13793 movq %rsi, %r11;
13794- movq %rdx, %r12;
13795+ movq %rdx, %r14;
13796
13797 vmovdqu (0*16)(%rdx), RL1;
13798 vmovdqu (1*16)(%rdx), RR1;
13799@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13800 call __cast5_dec_blk16;
13801
13802 /* xor with src */
13803- vmovq (%r12), RX;
13804+ vmovq (%r14), RX;
13805 vpshufd $0x4f, RX, RX;
13806 vpxor RX, RR1, RR1;
13807- vpxor 0*16+8(%r12), RL1, RL1;
13808- vpxor 1*16+8(%r12), RR2, RR2;
13809- vpxor 2*16+8(%r12), RL2, RL2;
13810- vpxor 3*16+8(%r12), RR3, RR3;
13811- vpxor 4*16+8(%r12), RL3, RL3;
13812- vpxor 5*16+8(%r12), RR4, RR4;
13813- vpxor 6*16+8(%r12), RL4, RL4;
13814+ vpxor 0*16+8(%r14), RL1, RL1;
13815+ vpxor 1*16+8(%r14), RR2, RR2;
13816+ vpxor 2*16+8(%r14), RL2, RL2;
13817+ vpxor 3*16+8(%r14), RR3, RR3;
13818+ vpxor 4*16+8(%r14), RL3, RL3;
13819+ vpxor 5*16+8(%r14), RR4, RR4;
13820+ vpxor 6*16+8(%r14), RL4, RL4;
13821
13822 vmovdqu RR1, (0*16)(%r11);
13823 vmovdqu RL1, (1*16)(%r11);
13824@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13825 vmovdqu RR4, (6*16)(%r11);
13826 vmovdqu RL4, (7*16)(%r11);
13827
13828- popq %r12;
13829+ popq %r14;
13830
13831+ pax_force_retaddr
13832 ret;
13833 ENDPROC(cast5_cbc_dec_16way)
13834
13835@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13836 * %rcx: iv (big endian, 64bit)
13837 */
13838
13839- pushq %r12;
13840+ pushq %r14;
13841
13842 movq %rsi, %r11;
13843- movq %rdx, %r12;
13844+ movq %rdx, %r14;
13845
13846 vpcmpeqd RTMP, RTMP, RTMP;
13847 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13848@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13849 call __cast5_enc_blk16;
13850
13851 /* dst = src ^ iv */
13852- vpxor (0*16)(%r12), RR1, RR1;
13853- vpxor (1*16)(%r12), RL1, RL1;
13854- vpxor (2*16)(%r12), RR2, RR2;
13855- vpxor (3*16)(%r12), RL2, RL2;
13856- vpxor (4*16)(%r12), RR3, RR3;
13857- vpxor (5*16)(%r12), RL3, RL3;
13858- vpxor (6*16)(%r12), RR4, RR4;
13859- vpxor (7*16)(%r12), RL4, RL4;
13860+ vpxor (0*16)(%r14), RR1, RR1;
13861+ vpxor (1*16)(%r14), RL1, RL1;
13862+ vpxor (2*16)(%r14), RR2, RR2;
13863+ vpxor (3*16)(%r14), RL2, RL2;
13864+ vpxor (4*16)(%r14), RR3, RR3;
13865+ vpxor (5*16)(%r14), RL3, RL3;
13866+ vpxor (6*16)(%r14), RR4, RR4;
13867+ vpxor (7*16)(%r14), RL4, RL4;
13868 vmovdqu RR1, (0*16)(%r11);
13869 vmovdqu RL1, (1*16)(%r11);
13870 vmovdqu RR2, (2*16)(%r11);
13871@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13872 vmovdqu RR4, (6*16)(%r11);
13873 vmovdqu RL4, (7*16)(%r11);
13874
13875- popq %r12;
13876+ popq %r14;
13877
13878+ pax_force_retaddr
13879 ret;
13880 ENDPROC(cast5_ctr_16way)
13881diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13882index e3531f8..e123f35 100644
13883--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13884+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13885@@ -24,6 +24,7 @@
13886 */
13887
13888 #include <linux/linkage.h>
13889+#include <asm/alternative-asm.h>
13890 #include "glue_helper-asm-avx.S"
13891
13892 .file "cast6-avx-x86_64-asm_64.S"
13893@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13894 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13895 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13896
13897+ pax_force_retaddr
13898 ret;
13899 ENDPROC(__cast6_enc_blk8)
13900
13901@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13902 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13903 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13904
13905+ pax_force_retaddr
13906 ret;
13907 ENDPROC(__cast6_dec_blk8)
13908
13909@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13910
13911 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13912
13913+ pax_force_retaddr
13914 ret;
13915 ENDPROC(cast6_ecb_enc_8way)
13916
13917@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13918
13919 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13920
13921+ pax_force_retaddr
13922 ret;
13923 ENDPROC(cast6_ecb_dec_8way)
13924
13925@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13926 * %rdx: src
13927 */
13928
13929- pushq %r12;
13930+ pushq %r14;
13931
13932 movq %rsi, %r11;
13933- movq %rdx, %r12;
13934+ movq %rdx, %r14;
13935
13936 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13937
13938 call __cast6_dec_blk8;
13939
13940- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13941+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13942
13943- popq %r12;
13944+ popq %r14;
13945
13946+ pax_force_retaddr
13947 ret;
13948 ENDPROC(cast6_cbc_dec_8way)
13949
13950@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13951 * %rcx: iv (little endian, 128bit)
13952 */
13953
13954- pushq %r12;
13955+ pushq %r14;
13956
13957 movq %rsi, %r11;
13958- movq %rdx, %r12;
13959+ movq %rdx, %r14;
13960
13961 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13962 RD2, RX, RKR, RKM);
13963
13964 call __cast6_enc_blk8;
13965
13966- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13967+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13968
13969- popq %r12;
13970+ popq %r14;
13971
13972+ pax_force_retaddr
13973 ret;
13974 ENDPROC(cast6_ctr_8way)
13975
13976@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13977 /* dst <= regs xor IVs(in dst) */
13978 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13979
13980+ pax_force_retaddr
13981 ret;
13982 ENDPROC(cast6_xts_enc_8way)
13983
13984@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13985 /* dst <= regs xor IVs(in dst) */
13986 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13987
13988+ pax_force_retaddr
13989 ret;
13990 ENDPROC(cast6_xts_dec_8way)
13991diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13992index 26d49eb..c0a8c84 100644
13993--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13994+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13995@@ -45,6 +45,7 @@
13996
13997 #include <asm/inst.h>
13998 #include <linux/linkage.h>
13999+#include <asm/alternative-asm.h>
14000
14001 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
14002
14003@@ -309,6 +310,7 @@ do_return:
14004 popq %rsi
14005 popq %rdi
14006 popq %rbx
14007+ pax_force_retaddr
14008 ret
14009
14010 ################################################################
14011diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14012index 5d1e007..098cb4f 100644
14013--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
14014+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
14015@@ -18,6 +18,7 @@
14016
14017 #include <linux/linkage.h>
14018 #include <asm/inst.h>
14019+#include <asm/alternative-asm.h>
14020
14021 .data
14022
14023@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14024 psrlq $1, T2
14025 pxor T2, T1
14026 pxor T1, DATA
14027+ pax_force_retaddr
14028 ret
14029 ENDPROC(__clmul_gf128mul_ble)
14030
14031@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14032 call __clmul_gf128mul_ble
14033 PSHUFB_XMM BSWAP DATA
14034 movups DATA, (%rdi)
14035+ pax_force_retaddr
14036 ret
14037 ENDPROC(clmul_ghash_mul)
14038
14039@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14040 PSHUFB_XMM BSWAP DATA
14041 movups DATA, (%rdi)
14042 .Lupdate_just_ret:
14043+ pax_force_retaddr
14044 ret
14045 ENDPROC(clmul_ghash_update)
14046diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14047index 9279e0b..c4b3d2c 100644
14048--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14049+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14050@@ -1,4 +1,5 @@
14051 #include <linux/linkage.h>
14052+#include <asm/alternative-asm.h>
14053
14054 # enter salsa20_encrypt_bytes
14055 ENTRY(salsa20_encrypt_bytes)
14056@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14057 add %r11,%rsp
14058 mov %rdi,%rax
14059 mov %rsi,%rdx
14060+ pax_force_retaddr
14061 ret
14062 # bytesatleast65:
14063 ._bytesatleast65:
14064@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14065 add %r11,%rsp
14066 mov %rdi,%rax
14067 mov %rsi,%rdx
14068+ pax_force_retaddr
14069 ret
14070 ENDPROC(salsa20_keysetup)
14071
14072@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14073 add %r11,%rsp
14074 mov %rdi,%rax
14075 mov %rsi,%rdx
14076+ pax_force_retaddr
14077 ret
14078 ENDPROC(salsa20_ivsetup)
14079diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14080index 2f202f4..d9164d6 100644
14081--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14082+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14083@@ -24,6 +24,7 @@
14084 */
14085
14086 #include <linux/linkage.h>
14087+#include <asm/alternative-asm.h>
14088 #include "glue_helper-asm-avx.S"
14089
14090 .file "serpent-avx-x86_64-asm_64.S"
14091@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14092 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14093 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14094
14095+ pax_force_retaddr
14096 ret;
14097 ENDPROC(__serpent_enc_blk8_avx)
14098
14099@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14100 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14101 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14102
14103+ pax_force_retaddr
14104 ret;
14105 ENDPROC(__serpent_dec_blk8_avx)
14106
14107@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14108
14109 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14110
14111+ pax_force_retaddr
14112 ret;
14113 ENDPROC(serpent_ecb_enc_8way_avx)
14114
14115@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14116
14117 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14118
14119+ pax_force_retaddr
14120 ret;
14121 ENDPROC(serpent_ecb_dec_8way_avx)
14122
14123@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14124
14125 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14126
14127+ pax_force_retaddr
14128 ret;
14129 ENDPROC(serpent_cbc_dec_8way_avx)
14130
14131@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14132
14133 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14134
14135+ pax_force_retaddr
14136 ret;
14137 ENDPROC(serpent_ctr_8way_avx)
14138
14139@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14140 /* dst <= regs xor IVs(in dst) */
14141 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14142
14143+ pax_force_retaddr
14144 ret;
14145 ENDPROC(serpent_xts_enc_8way_avx)
14146
14147@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14148 /* dst <= regs xor IVs(in dst) */
14149 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14150
14151+ pax_force_retaddr
14152 ret;
14153 ENDPROC(serpent_xts_dec_8way_avx)
14154diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14155index b222085..abd483c 100644
14156--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14157+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14158@@ -15,6 +15,7 @@
14159 */
14160
14161 #include <linux/linkage.h>
14162+#include <asm/alternative-asm.h>
14163 #include "glue_helper-asm-avx2.S"
14164
14165 .file "serpent-avx2-asm_64.S"
14166@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14167 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14168 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14169
14170+ pax_force_retaddr
14171 ret;
14172 ENDPROC(__serpent_enc_blk16)
14173
14174@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14175 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14176 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14177
14178+ pax_force_retaddr
14179 ret;
14180 ENDPROC(__serpent_dec_blk16)
14181
14182@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14183
14184 vzeroupper;
14185
14186+ pax_force_retaddr
14187 ret;
14188 ENDPROC(serpent_ecb_enc_16way)
14189
14190@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14191
14192 vzeroupper;
14193
14194+ pax_force_retaddr
14195 ret;
14196 ENDPROC(serpent_ecb_dec_16way)
14197
14198@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14199
14200 vzeroupper;
14201
14202+ pax_force_retaddr
14203 ret;
14204 ENDPROC(serpent_cbc_dec_16way)
14205
14206@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14207
14208 vzeroupper;
14209
14210+ pax_force_retaddr
14211 ret;
14212 ENDPROC(serpent_ctr_16way)
14213
14214@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14215
14216 vzeroupper;
14217
14218+ pax_force_retaddr
14219 ret;
14220 ENDPROC(serpent_xts_enc_16way)
14221
14222@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14223
14224 vzeroupper;
14225
14226+ pax_force_retaddr
14227 ret;
14228 ENDPROC(serpent_xts_dec_16way)
14229diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14230index acc066c..1559cc4 100644
14231--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14232+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14233@@ -25,6 +25,7 @@
14234 */
14235
14236 #include <linux/linkage.h>
14237+#include <asm/alternative-asm.h>
14238
14239 .file "serpent-sse2-x86_64-asm_64.S"
14240 .text
14241@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14242 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14243 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14244
14245+ pax_force_retaddr
14246 ret;
14247
14248 .L__enc_xor8:
14249 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14250 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14251
14252+ pax_force_retaddr
14253 ret;
14254 ENDPROC(__serpent_enc_blk_8way)
14255
14256@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14257 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14258 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14259
14260+ pax_force_retaddr
14261 ret;
14262 ENDPROC(serpent_dec_blk_8way)
14263diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14264index a410950..9dfe7ad 100644
14265--- a/arch/x86/crypto/sha1_ssse3_asm.S
14266+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14267@@ -29,6 +29,7 @@
14268 */
14269
14270 #include <linux/linkage.h>
14271+#include <asm/alternative-asm.h>
14272
14273 #define CTX %rdi // arg1
14274 #define BUF %rsi // arg2
14275@@ -75,9 +76,9 @@
14276
14277 push %rbx
14278 push %rbp
14279- push %r12
14280+ push %r14
14281
14282- mov %rsp, %r12
14283+ mov %rsp, %r14
14284 sub $64, %rsp # allocate workspace
14285 and $~15, %rsp # align stack
14286
14287@@ -99,11 +100,12 @@
14288 xor %rax, %rax
14289 rep stosq
14290
14291- mov %r12, %rsp # deallocate workspace
14292+ mov %r14, %rsp # deallocate workspace
14293
14294- pop %r12
14295+ pop %r14
14296 pop %rbp
14297 pop %rbx
14298+ pax_force_retaddr
14299 ret
14300
14301 ENDPROC(\name)
14302diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14303index 642f156..51a513c 100644
14304--- a/arch/x86/crypto/sha256-avx-asm.S
14305+++ b/arch/x86/crypto/sha256-avx-asm.S
14306@@ -49,6 +49,7 @@
14307
14308 #ifdef CONFIG_AS_AVX
14309 #include <linux/linkage.h>
14310+#include <asm/alternative-asm.h>
14311
14312 ## assume buffers not aligned
14313 #define VMOVDQ vmovdqu
14314@@ -460,6 +461,7 @@ done_hash:
14315 popq %r13
14316 popq %rbp
14317 popq %rbx
14318+ pax_force_retaddr
14319 ret
14320 ENDPROC(sha256_transform_avx)
14321
14322diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14323index 9e86944..3795e6a 100644
14324--- a/arch/x86/crypto/sha256-avx2-asm.S
14325+++ b/arch/x86/crypto/sha256-avx2-asm.S
14326@@ -50,6 +50,7 @@
14327
14328 #ifdef CONFIG_AS_AVX2
14329 #include <linux/linkage.h>
14330+#include <asm/alternative-asm.h>
14331
14332 ## assume buffers not aligned
14333 #define VMOVDQ vmovdqu
14334@@ -720,6 +721,7 @@ done_hash:
14335 popq %r12
14336 popq %rbp
14337 popq %rbx
14338+ pax_force_retaddr
14339 ret
14340 ENDPROC(sha256_transform_rorx)
14341
14342diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14343index f833b74..8c62a9e 100644
14344--- a/arch/x86/crypto/sha256-ssse3-asm.S
14345+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14346@@ -47,6 +47,7 @@
14347 ########################################################################
14348
14349 #include <linux/linkage.h>
14350+#include <asm/alternative-asm.h>
14351
14352 ## assume buffers not aligned
14353 #define MOVDQ movdqu
14354@@ -471,6 +472,7 @@ done_hash:
14355 popq %rbp
14356 popq %rbx
14357
14358+ pax_force_retaddr
14359 ret
14360 ENDPROC(sha256_transform_ssse3)
14361
14362diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14363index 974dde9..a823ff9 100644
14364--- a/arch/x86/crypto/sha512-avx-asm.S
14365+++ b/arch/x86/crypto/sha512-avx-asm.S
14366@@ -49,6 +49,7 @@
14367
14368 #ifdef CONFIG_AS_AVX
14369 #include <linux/linkage.h>
14370+#include <asm/alternative-asm.h>
14371
14372 .text
14373
14374@@ -364,6 +365,7 @@ updateblock:
14375 mov frame_RSPSAVE(%rsp), %rsp
14376
14377 nowork:
14378+ pax_force_retaddr
14379 ret
14380 ENDPROC(sha512_transform_avx)
14381
14382diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14383index 568b961..ed20c37 100644
14384--- a/arch/x86/crypto/sha512-avx2-asm.S
14385+++ b/arch/x86/crypto/sha512-avx2-asm.S
14386@@ -51,6 +51,7 @@
14387
14388 #ifdef CONFIG_AS_AVX2
14389 #include <linux/linkage.h>
14390+#include <asm/alternative-asm.h>
14391
14392 .text
14393
14394@@ -678,6 +679,7 @@ done_hash:
14395
14396 # Restore Stack Pointer
14397 mov frame_RSPSAVE(%rsp), %rsp
14398+ pax_force_retaddr
14399 ret
14400 ENDPROC(sha512_transform_rorx)
14401
14402diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14403index fb56855..6edd768 100644
14404--- a/arch/x86/crypto/sha512-ssse3-asm.S
14405+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14406@@ -48,6 +48,7 @@
14407 ########################################################################
14408
14409 #include <linux/linkage.h>
14410+#include <asm/alternative-asm.h>
14411
14412 .text
14413
14414@@ -363,6 +364,7 @@ updateblock:
14415 mov frame_RSPSAVE(%rsp), %rsp
14416
14417 nowork:
14418+ pax_force_retaddr
14419 ret
14420 ENDPROC(sha512_transform_ssse3)
14421
14422diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14423index 0505813..b067311 100644
14424--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14425+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14426@@ -24,6 +24,7 @@
14427 */
14428
14429 #include <linux/linkage.h>
14430+#include <asm/alternative-asm.h>
14431 #include "glue_helper-asm-avx.S"
14432
14433 .file "twofish-avx-x86_64-asm_64.S"
14434@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14435 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14436 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14437
14438+ pax_force_retaddr
14439 ret;
14440 ENDPROC(__twofish_enc_blk8)
14441
14442@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14443 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14444 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14445
14446+ pax_force_retaddr
14447 ret;
14448 ENDPROC(__twofish_dec_blk8)
14449
14450@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14451
14452 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14453
14454+ pax_force_retaddr
14455 ret;
14456 ENDPROC(twofish_ecb_enc_8way)
14457
14458@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14459
14460 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14461
14462+ pax_force_retaddr
14463 ret;
14464 ENDPROC(twofish_ecb_dec_8way)
14465
14466@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14467 * %rdx: src
14468 */
14469
14470- pushq %r12;
14471+ pushq %r14;
14472
14473 movq %rsi, %r11;
14474- movq %rdx, %r12;
14475+ movq %rdx, %r14;
14476
14477 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14478
14479 call __twofish_dec_blk8;
14480
14481- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14482+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14483
14484- popq %r12;
14485+ popq %r14;
14486
14487+ pax_force_retaddr
14488 ret;
14489 ENDPROC(twofish_cbc_dec_8way)
14490
14491@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14492 * %rcx: iv (little endian, 128bit)
14493 */
14494
14495- pushq %r12;
14496+ pushq %r14;
14497
14498 movq %rsi, %r11;
14499- movq %rdx, %r12;
14500+ movq %rdx, %r14;
14501
14502 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14503 RD2, RX0, RX1, RY0);
14504
14505 call __twofish_enc_blk8;
14506
14507- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14508+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14509
14510- popq %r12;
14511+ popq %r14;
14512
14513+ pax_force_retaddr
14514 ret;
14515 ENDPROC(twofish_ctr_8way)
14516
14517@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14518 /* dst <= regs xor IVs(in dst) */
14519 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14520
14521+ pax_force_retaddr
14522 ret;
14523 ENDPROC(twofish_xts_enc_8way)
14524
14525@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14526 /* dst <= regs xor IVs(in dst) */
14527 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14528
14529+ pax_force_retaddr
14530 ret;
14531 ENDPROC(twofish_xts_dec_8way)
14532diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14533index 1c3b7ce..02f578d 100644
14534--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14535+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14536@@ -21,6 +21,7 @@
14537 */
14538
14539 #include <linux/linkage.h>
14540+#include <asm/alternative-asm.h>
14541
14542 .file "twofish-x86_64-asm-3way.S"
14543 .text
14544@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14545 popq %r13;
14546 popq %r14;
14547 popq %r15;
14548+ pax_force_retaddr
14549 ret;
14550
14551 .L__enc_xor3:
14552@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14553 popq %r13;
14554 popq %r14;
14555 popq %r15;
14556+ pax_force_retaddr
14557 ret;
14558 ENDPROC(__twofish_enc_blk_3way)
14559
14560@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14561 popq %r13;
14562 popq %r14;
14563 popq %r15;
14564+ pax_force_retaddr
14565 ret;
14566 ENDPROC(twofish_dec_blk_3way)
14567diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14568index a039d21..524b8b2 100644
14569--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14570+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14571@@ -22,6 +22,7 @@
14572
14573 #include <linux/linkage.h>
14574 #include <asm/asm-offsets.h>
14575+#include <asm/alternative-asm.h>
14576
14577 #define a_offset 0
14578 #define b_offset 4
14579@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14580
14581 popq R1
14582 movq $1,%rax
14583+ pax_force_retaddr
14584 ret
14585 ENDPROC(twofish_enc_blk)
14586
14587@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14588
14589 popq R1
14590 movq $1,%rax
14591+ pax_force_retaddr
14592 ret
14593 ENDPROC(twofish_dec_blk)
14594diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14595index df91466..74b31cb 100644
14596--- a/arch/x86/ia32/ia32_aout.c
14597+++ b/arch/x86/ia32/ia32_aout.c
14598@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14599 unsigned long dump_start, dump_size;
14600 struct user32 dump;
14601
14602+ memset(&dump, 0, sizeof(dump));
14603+
14604 fs = get_fs();
14605 set_fs(KERNEL_DS);
14606 has_dumped = 1;
14607diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14608index f9e181a..300544c 100644
14609--- a/arch/x86/ia32/ia32_signal.c
14610+++ b/arch/x86/ia32/ia32_signal.c
14611@@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14612 if (__get_user(set.sig[0], &frame->sc.oldmask)
14613 || (_COMPAT_NSIG_WORDS > 1
14614 && __copy_from_user((((char *) &set.sig) + 4),
14615- &frame->extramask,
14616+ frame->extramask,
14617 sizeof(frame->extramask))))
14618 goto badframe;
14619
14620@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14621 sp -= frame_size;
14622 /* Align the stack pointer according to the i386 ABI,
14623 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14624- sp = ((sp + 4) & -16ul) - 4;
14625+ sp = ((sp - 12) & -16ul) - 4;
14626 return (void __user *) sp;
14627 }
14628
14629@@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14630 } else {
14631 /* Return stub is in 32bit vsyscall page */
14632 if (current->mm->context.vdso)
14633- restorer = current->mm->context.vdso +
14634- selected_vdso32->sym___kernel_sigreturn;
14635+ restorer = (void __force_user *)(current->mm->context.vdso +
14636+ selected_vdso32->sym___kernel_sigreturn);
14637 else
14638- restorer = &frame->retcode;
14639+ restorer = frame->retcode;
14640 }
14641
14642 put_user_try {
14643@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14644 * These are actually not used anymore, but left because some
14645 * gdb versions depend on them as a marker.
14646 */
14647- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14648+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14649 } put_user_catch(err);
14650
14651 if (err)
14652@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14653 0xb8,
14654 __NR_ia32_rt_sigreturn,
14655 0x80cd,
14656- 0,
14657+ 0
14658 };
14659
14660 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14661@@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14662
14663 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14664 restorer = ksig->ka.sa.sa_restorer;
14665+ else if (current->mm->context.vdso)
14666+ /* Return stub is in 32bit vsyscall page */
14667+ restorer = (void __force_user *)(current->mm->context.vdso +
14668+ selected_vdso32->sym___kernel_rt_sigreturn);
14669 else
14670- restorer = current->mm->context.vdso +
14671- selected_vdso32->sym___kernel_rt_sigreturn;
14672+ restorer = frame->retcode;
14673 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14674
14675 /*
14676 * Not actually used anymore, but left because some gdb
14677 * versions need it.
14678 */
14679- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14680+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14681 } put_user_catch(err);
14682
14683 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14684diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14685index ffe7122..899bad3 100644
14686--- a/arch/x86/ia32/ia32entry.S
14687+++ b/arch/x86/ia32/ia32entry.S
14688@@ -15,8 +15,10 @@
14689 #include <asm/irqflags.h>
14690 #include <asm/asm.h>
14691 #include <asm/smap.h>
14692+#include <asm/pgtable.h>
14693 #include <linux/linkage.h>
14694 #include <linux/err.h>
14695+#include <asm/alternative-asm.h>
14696
14697 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14698 #include <linux/elf-em.h>
14699@@ -62,12 +64,12 @@
14700 */
14701 .macro LOAD_ARGS32 offset, _r9=0
14702 .if \_r9
14703- movl \offset+16(%rsp),%r9d
14704+ movl \offset+R9(%rsp),%r9d
14705 .endif
14706- movl \offset+40(%rsp),%ecx
14707- movl \offset+48(%rsp),%edx
14708- movl \offset+56(%rsp),%esi
14709- movl \offset+64(%rsp),%edi
14710+ movl \offset+RCX(%rsp),%ecx
14711+ movl \offset+RDX(%rsp),%edx
14712+ movl \offset+RSI(%rsp),%esi
14713+ movl \offset+RDI(%rsp),%edi
14714 movl %eax,%eax /* zero extension */
14715 .endm
14716
14717@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14718 ENDPROC(native_irq_enable_sysexit)
14719 #endif
14720
14721+ .macro pax_enter_kernel_user
14722+ pax_set_fptr_mask
14723+#ifdef CONFIG_PAX_MEMORY_UDEREF
14724+ call pax_enter_kernel_user
14725+#endif
14726+ .endm
14727+
14728+ .macro pax_exit_kernel_user
14729+#ifdef CONFIG_PAX_MEMORY_UDEREF
14730+ call pax_exit_kernel_user
14731+#endif
14732+#ifdef CONFIG_PAX_RANDKSTACK
14733+ pushq %rax
14734+ pushq %r11
14735+ call pax_randomize_kstack
14736+ popq %r11
14737+ popq %rax
14738+#endif
14739+ .endm
14740+
14741+ .macro pax_erase_kstack
14742+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14743+ call pax_erase_kstack
14744+#endif
14745+ .endm
14746+
14747 /*
14748 * 32bit SYSENTER instruction entry.
14749 *
14750@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14751 CFI_REGISTER rsp,rbp
14752 SWAPGS_UNSAFE_STACK
14753 movq PER_CPU_VAR(kernel_stack), %rsp
14754- addq $(KERNEL_STACK_OFFSET),%rsp
14755- /*
14756- * No need to follow this irqs on/off section: the syscall
14757- * disabled irqs, here we enable it straight after entry:
14758- */
14759- ENABLE_INTERRUPTS(CLBR_NONE)
14760 movl %ebp,%ebp /* zero extension */
14761 pushq_cfi $__USER32_DS
14762 /*CFI_REL_OFFSET ss,0*/
14763@@ -135,23 +157,46 @@ ENTRY(ia32_sysenter_target)
14764 CFI_REL_OFFSET rsp,0
14765 pushfq_cfi
14766 /*CFI_REL_OFFSET rflags,0*/
14767- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14768- CFI_REGISTER rip,r10
14769+ orl $X86_EFLAGS_IF,(%rsp)
14770+ GET_THREAD_INFO(%r11)
14771+ movl TI_sysenter_return(%r11), %r11d
14772+ CFI_REGISTER rip,r11
14773 pushq_cfi $__USER32_CS
14774 /*CFI_REL_OFFSET cs,0*/
14775 movl %eax, %eax
14776- pushq_cfi %r10
14777+ pushq_cfi %r11
14778 CFI_REL_OFFSET rip,0
14779 pushq_cfi %rax
14780 cld
14781 SAVE_ARGS 0,1,0
14782+ pax_enter_kernel_user
14783+
14784+#ifdef CONFIG_PAX_RANDKSTACK
14785+ pax_erase_kstack
14786+#endif
14787+
14788+ /*
14789+ * No need to follow this irqs on/off section: the syscall
14790+ * disabled irqs, here we enable it straight after entry:
14791+ */
14792+ ENABLE_INTERRUPTS(CLBR_NONE)
14793 /* no need to do an access_ok check here because rbp has been
14794 32bit zero extended */
14795+
14796+#ifdef CONFIG_PAX_MEMORY_UDEREF
14797+ addq pax_user_shadow_base,%rbp
14798+ ASM_PAX_OPEN_USERLAND
14799+#endif
14800+
14801 ASM_STAC
14802 1: movl (%rbp),%ebp
14803 _ASM_EXTABLE(1b,ia32_badarg)
14804 ASM_CLAC
14805
14806+#ifdef CONFIG_PAX_MEMORY_UDEREF
14807+ ASM_PAX_CLOSE_USERLAND
14808+#endif
14809+
14810 /*
14811 * Sysenter doesn't filter flags, so we need to clear NT
14812 * ourselves. To save a few cycles, we can check whether
14813@@ -161,8 +206,9 @@ ENTRY(ia32_sysenter_target)
14814 jnz sysenter_fix_flags
14815 sysenter_flags_fixed:
14816
14817- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14818- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14819+ GET_THREAD_INFO(%r11)
14820+ orl $TS_COMPAT,TI_status(%r11)
14821+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14822 CFI_REMEMBER_STATE
14823 jnz sysenter_tracesys
14824 cmpq $(IA32_NR_syscalls-1),%rax
14825@@ -172,15 +218,18 @@ sysenter_do_call:
14826 sysenter_dispatch:
14827 call *ia32_sys_call_table(,%rax,8)
14828 movq %rax,RAX-ARGOFFSET(%rsp)
14829+ GET_THREAD_INFO(%r11)
14830 DISABLE_INTERRUPTS(CLBR_NONE)
14831 TRACE_IRQS_OFF
14832- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14833+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14834 jnz sysexit_audit
14835 sysexit_from_sys_call:
14836- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14837+ pax_exit_kernel_user
14838+ pax_erase_kstack
14839+ andl $~TS_COMPAT,TI_status(%r11)
14840 /* clear IF, that popfq doesn't enable interrupts early */
14841- andl $~0x200,EFLAGS-R11(%rsp)
14842- movl RIP-R11(%rsp),%edx /* User %eip */
14843+ andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
14844+ movl RIP(%rsp),%edx /* User %eip */
14845 CFI_REGISTER rip,rdx
14846 RESTORE_ARGS 0,24,0,0,0,0
14847 xorq %r8,%r8
14848@@ -205,6 +254,9 @@ sysexit_from_sys_call:
14849 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14850 movl %eax,%edi /* 1st arg: syscall number */
14851 call __audit_syscall_entry
14852+
14853+ pax_erase_kstack
14854+
14855 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14856 cmpq $(IA32_NR_syscalls-1),%rax
14857 ja ia32_badsys
14858@@ -216,7 +268,7 @@ sysexit_from_sys_call:
14859 .endm
14860
14861 .macro auditsys_exit exit
14862- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14863+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14864 jnz ia32_ret_from_sys_call
14865 TRACE_IRQS_ON
14866 ENABLE_INTERRUPTS(CLBR_NONE)
14867@@ -227,11 +279,12 @@ sysexit_from_sys_call:
14868 1: setbe %al /* 1 if error, 0 if not */
14869 movzbl %al,%edi /* zero-extend that into %edi */
14870 call __audit_syscall_exit
14871+ GET_THREAD_INFO(%r11)
14872 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14873 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14874 DISABLE_INTERRUPTS(CLBR_NONE)
14875 TRACE_IRQS_OFF
14876- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14877+ testl %edi,TI_flags(%r11)
14878 jz \exit
14879 CLEAR_RREGS -ARGOFFSET
14880 jmp int_with_check
14881@@ -253,7 +306,7 @@ sysenter_fix_flags:
14882
14883 sysenter_tracesys:
14884 #ifdef CONFIG_AUDITSYSCALL
14885- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14886+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14887 jz sysenter_auditsys
14888 #endif
14889 SAVE_REST
14890@@ -265,6 +318,9 @@ sysenter_tracesys:
14891 RESTORE_REST
14892 cmpq $(IA32_NR_syscalls-1),%rax
14893 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14894+
14895+ pax_erase_kstack
14896+
14897 jmp sysenter_do_call
14898 CFI_ENDPROC
14899 ENDPROC(ia32_sysenter_target)
14900@@ -292,19 +348,25 @@ ENDPROC(ia32_sysenter_target)
14901 ENTRY(ia32_cstar_target)
14902 CFI_STARTPROC32 simple
14903 CFI_SIGNAL_FRAME
14904- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14905+ CFI_DEF_CFA rsp,0
14906 CFI_REGISTER rip,rcx
14907 /*CFI_REGISTER rflags,r11*/
14908 SWAPGS_UNSAFE_STACK
14909 movl %esp,%r8d
14910 CFI_REGISTER rsp,r8
14911 movq PER_CPU_VAR(kernel_stack),%rsp
14912+ SAVE_ARGS 8*6,0,0
14913+ pax_enter_kernel_user
14914+
14915+#ifdef CONFIG_PAX_RANDKSTACK
14916+ pax_erase_kstack
14917+#endif
14918+
14919 /*
14920 * No need to follow this irqs on/off section: the syscall
14921 * disabled irqs and here we enable it straight after entry:
14922 */
14923 ENABLE_INTERRUPTS(CLBR_NONE)
14924- SAVE_ARGS 8,0,0
14925 movl %eax,%eax /* zero extension */
14926 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14927 movq %rcx,RIP-ARGOFFSET(%rsp)
14928@@ -320,12 +382,25 @@ ENTRY(ia32_cstar_target)
14929 /* no need to do an access_ok check here because r8 has been
14930 32bit zero extended */
14931 /* hardware stack frame is complete now */
14932+
14933+#ifdef CONFIG_PAX_MEMORY_UDEREF
14934+ ASM_PAX_OPEN_USERLAND
14935+ movq pax_user_shadow_base,%r8
14936+ addq RSP-ARGOFFSET(%rsp),%r8
14937+#endif
14938+
14939 ASM_STAC
14940 1: movl (%r8),%r9d
14941 _ASM_EXTABLE(1b,ia32_badarg)
14942 ASM_CLAC
14943- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14944- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14945+
14946+#ifdef CONFIG_PAX_MEMORY_UDEREF
14947+ ASM_PAX_CLOSE_USERLAND
14948+#endif
14949+
14950+ GET_THREAD_INFO(%r11)
14951+ orl $TS_COMPAT,TI_status(%r11)
14952+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14953 CFI_REMEMBER_STATE
14954 jnz cstar_tracesys
14955 cmpq $IA32_NR_syscalls-1,%rax
14956@@ -335,13 +410,16 @@ cstar_do_call:
14957 cstar_dispatch:
14958 call *ia32_sys_call_table(,%rax,8)
14959 movq %rax,RAX-ARGOFFSET(%rsp)
14960+ GET_THREAD_INFO(%r11)
14961 DISABLE_INTERRUPTS(CLBR_NONE)
14962 TRACE_IRQS_OFF
14963- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14964+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14965 jnz sysretl_audit
14966 sysretl_from_sys_call:
14967- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14968- RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14969+ pax_exit_kernel_user
14970+ pax_erase_kstack
14971+ andl $~TS_COMPAT,TI_status(%r11)
14972+ RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14973 movl RIP-ARGOFFSET(%rsp),%ecx
14974 CFI_REGISTER rip,rcx
14975 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14976@@ -368,7 +446,7 @@ sysretl_audit:
14977
14978 cstar_tracesys:
14979 #ifdef CONFIG_AUDITSYSCALL
14980- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14981+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14982 jz cstar_auditsys
14983 #endif
14984 xchgl %r9d,%ebp
14985@@ -382,11 +460,19 @@ cstar_tracesys:
14986 xchgl %ebp,%r9d
14987 cmpq $(IA32_NR_syscalls-1),%rax
14988 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14989+
14990+ pax_erase_kstack
14991+
14992 jmp cstar_do_call
14993 END(ia32_cstar_target)
14994
14995 ia32_badarg:
14996 ASM_CLAC
14997+
14998+#ifdef CONFIG_PAX_MEMORY_UDEREF
14999+ ASM_PAX_CLOSE_USERLAND
15000+#endif
15001+
15002 movq $-EFAULT,%rax
15003 jmp ia32_sysret
15004 CFI_ENDPROC
15005@@ -423,19 +509,26 @@ ENTRY(ia32_syscall)
15006 CFI_REL_OFFSET rip,RIP-RIP
15007 PARAVIRT_ADJUST_EXCEPTION_FRAME
15008 SWAPGS
15009- /*
15010- * No need to follow this irqs on/off section: the syscall
15011- * disabled irqs and here we enable it straight after entry:
15012- */
15013- ENABLE_INTERRUPTS(CLBR_NONE)
15014 movl %eax,%eax
15015 pushq_cfi %rax
15016 cld
15017 /* note the registers are not zero extended to the sf.
15018 this could be a problem. */
15019 SAVE_ARGS 0,1,0
15020- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15021- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15022+ pax_enter_kernel_user
15023+
15024+#ifdef CONFIG_PAX_RANDKSTACK
15025+ pax_erase_kstack
15026+#endif
15027+
15028+ /*
15029+ * No need to follow this irqs on/off section: the syscall
15030+ * disabled irqs and here we enable it straight after entry:
15031+ */
15032+ ENABLE_INTERRUPTS(CLBR_NONE)
15033+ GET_THREAD_INFO(%r11)
15034+ orl $TS_COMPAT,TI_status(%r11)
15035+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15036 jnz ia32_tracesys
15037 cmpq $(IA32_NR_syscalls-1),%rax
15038 ja ia32_badsys
15039@@ -458,6 +551,9 @@ ia32_tracesys:
15040 RESTORE_REST
15041 cmpq $(IA32_NR_syscalls-1),%rax
15042 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15043+
15044+ pax_erase_kstack
15045+
15046 jmp ia32_do_call
15047 END(ia32_syscall)
15048
15049diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15050index 8e0ceec..af13504 100644
15051--- a/arch/x86/ia32/sys_ia32.c
15052+++ b/arch/x86/ia32/sys_ia32.c
15053@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15054 */
15055 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15056 {
15057- typeof(ubuf->st_uid) uid = 0;
15058- typeof(ubuf->st_gid) gid = 0;
15059+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15060+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15061 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15062 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15063 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15064diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15065index 372231c..51b537d 100644
15066--- a/arch/x86/include/asm/alternative-asm.h
15067+++ b/arch/x86/include/asm/alternative-asm.h
15068@@ -18,6 +18,45 @@
15069 .endm
15070 #endif
15071
15072+#ifdef KERNEXEC_PLUGIN
15073+ .macro pax_force_retaddr_bts rip=0
15074+ btsq $63,\rip(%rsp)
15075+ .endm
15076+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15077+ .macro pax_force_retaddr rip=0, reload=0
15078+ btsq $63,\rip(%rsp)
15079+ .endm
15080+ .macro pax_force_fptr ptr
15081+ btsq $63,\ptr
15082+ .endm
15083+ .macro pax_set_fptr_mask
15084+ .endm
15085+#endif
15086+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15087+ .macro pax_force_retaddr rip=0, reload=0
15088+ .if \reload
15089+ pax_set_fptr_mask
15090+ .endif
15091+ orq %r12,\rip(%rsp)
15092+ .endm
15093+ .macro pax_force_fptr ptr
15094+ orq %r12,\ptr
15095+ .endm
15096+ .macro pax_set_fptr_mask
15097+ movabs $0x8000000000000000,%r12
15098+ .endm
15099+#endif
15100+#else
15101+ .macro pax_force_retaddr rip=0, reload=0
15102+ .endm
15103+ .macro pax_force_fptr ptr
15104+ .endm
15105+ .macro pax_force_retaddr_bts rip=0
15106+ .endm
15107+ .macro pax_set_fptr_mask
15108+ .endm
15109+#endif
15110+
15111 .macro altinstruction_entry orig alt feature orig_len alt_len
15112 .long \orig - .
15113 .long \alt - .
15114diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15115index 473bdbe..b1e3377 100644
15116--- a/arch/x86/include/asm/alternative.h
15117+++ b/arch/x86/include/asm/alternative.h
15118@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15119 ".pushsection .discard,\"aw\",@progbits\n" \
15120 DISCARD_ENTRY(1) \
15121 ".popsection\n" \
15122- ".pushsection .altinstr_replacement, \"ax\"\n" \
15123+ ".pushsection .altinstr_replacement, \"a\"\n" \
15124 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15125 ".popsection"
15126
15127@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15128 DISCARD_ENTRY(1) \
15129 DISCARD_ENTRY(2) \
15130 ".popsection\n" \
15131- ".pushsection .altinstr_replacement, \"ax\"\n" \
15132+ ".pushsection .altinstr_replacement, \"a\"\n" \
15133 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15134 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15135 ".popsection"
15136diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15137index 465b309..ab7e51f 100644
15138--- a/arch/x86/include/asm/apic.h
15139+++ b/arch/x86/include/asm/apic.h
15140@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15141
15142 #ifdef CONFIG_X86_LOCAL_APIC
15143
15144-extern unsigned int apic_verbosity;
15145+extern int apic_verbosity;
15146 extern int local_apic_timer_c2_ok;
15147
15148 extern int disable_apic;
15149diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15150index 20370c6..a2eb9b0 100644
15151--- a/arch/x86/include/asm/apm.h
15152+++ b/arch/x86/include/asm/apm.h
15153@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15154 __asm__ __volatile__(APM_DO_ZERO_SEGS
15155 "pushl %%edi\n\t"
15156 "pushl %%ebp\n\t"
15157- "lcall *%%cs:apm_bios_entry\n\t"
15158+ "lcall *%%ss:apm_bios_entry\n\t"
15159 "setc %%al\n\t"
15160 "popl %%ebp\n\t"
15161 "popl %%edi\n\t"
15162@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15163 __asm__ __volatile__(APM_DO_ZERO_SEGS
15164 "pushl %%edi\n\t"
15165 "pushl %%ebp\n\t"
15166- "lcall *%%cs:apm_bios_entry\n\t"
15167+ "lcall *%%ss:apm_bios_entry\n\t"
15168 "setc %%bl\n\t"
15169 "popl %%ebp\n\t"
15170 "popl %%edi\n\t"
15171diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15172index 5e5cd12..3d18208 100644
15173--- a/arch/x86/include/asm/atomic.h
15174+++ b/arch/x86/include/asm/atomic.h
15175@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15176 }
15177
15178 /**
15179+ * atomic_read_unchecked - read atomic variable
15180+ * @v: pointer of type atomic_unchecked_t
15181+ *
15182+ * Atomically reads the value of @v.
15183+ */
15184+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15185+{
15186+ return ACCESS_ONCE((v)->counter);
15187+}
15188+
15189+/**
15190 * atomic_set - set atomic variable
15191 * @v: pointer of type atomic_t
15192 * @i: required value
15193@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15194 }
15195
15196 /**
15197+ * atomic_set_unchecked - set atomic variable
15198+ * @v: pointer of type atomic_unchecked_t
15199+ * @i: required value
15200+ *
15201+ * Atomically sets the value of @v to @i.
15202+ */
15203+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15204+{
15205+ v->counter = i;
15206+}
15207+
15208+/**
15209 * atomic_add - add integer to atomic variable
15210 * @i: integer value to add
15211 * @v: pointer of type atomic_t
15212@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15213 */
15214 static inline void atomic_add(int i, atomic_t *v)
15215 {
15216- asm volatile(LOCK_PREFIX "addl %1,%0"
15217+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15218+
15219+#ifdef CONFIG_PAX_REFCOUNT
15220+ "jno 0f\n"
15221+ LOCK_PREFIX "subl %1,%0\n"
15222+ "int $4\n0:\n"
15223+ _ASM_EXTABLE(0b, 0b)
15224+#endif
15225+
15226+ : "+m" (v->counter)
15227+ : "ir" (i));
15228+}
15229+
15230+/**
15231+ * atomic_add_unchecked - add integer to atomic variable
15232+ * @i: integer value to add
15233+ * @v: pointer of type atomic_unchecked_t
15234+ *
15235+ * Atomically adds @i to @v.
15236+ */
15237+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15238+{
15239+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15240 : "+m" (v->counter)
15241 : "ir" (i));
15242 }
15243@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15244 */
15245 static inline void atomic_sub(int i, atomic_t *v)
15246 {
15247- asm volatile(LOCK_PREFIX "subl %1,%0"
15248+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15249+
15250+#ifdef CONFIG_PAX_REFCOUNT
15251+ "jno 0f\n"
15252+ LOCK_PREFIX "addl %1,%0\n"
15253+ "int $4\n0:\n"
15254+ _ASM_EXTABLE(0b, 0b)
15255+#endif
15256+
15257+ : "+m" (v->counter)
15258+ : "ir" (i));
15259+}
15260+
15261+/**
15262+ * atomic_sub_unchecked - subtract integer from atomic variable
15263+ * @i: integer value to subtract
15264+ * @v: pointer of type atomic_unchecked_t
15265+ *
15266+ * Atomically subtracts @i from @v.
15267+ */
15268+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15269+{
15270+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15271 : "+m" (v->counter)
15272 : "ir" (i));
15273 }
15274@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15275 */
15276 static inline int atomic_sub_and_test(int i, atomic_t *v)
15277 {
15278- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15279+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15280 }
15281
15282 /**
15283@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15284 */
15285 static inline void atomic_inc(atomic_t *v)
15286 {
15287- asm volatile(LOCK_PREFIX "incl %0"
15288+ asm volatile(LOCK_PREFIX "incl %0\n"
15289+
15290+#ifdef CONFIG_PAX_REFCOUNT
15291+ "jno 0f\n"
15292+ LOCK_PREFIX "decl %0\n"
15293+ "int $4\n0:\n"
15294+ _ASM_EXTABLE(0b, 0b)
15295+#endif
15296+
15297+ : "+m" (v->counter));
15298+}
15299+
15300+/**
15301+ * atomic_inc_unchecked - increment atomic variable
15302+ * @v: pointer of type atomic_unchecked_t
15303+ *
15304+ * Atomically increments @v by 1.
15305+ */
15306+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15307+{
15308+ asm volatile(LOCK_PREFIX "incl %0\n"
15309 : "+m" (v->counter));
15310 }
15311
15312@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15313 */
15314 static inline void atomic_dec(atomic_t *v)
15315 {
15316- asm volatile(LOCK_PREFIX "decl %0"
15317+ asm volatile(LOCK_PREFIX "decl %0\n"
15318+
15319+#ifdef CONFIG_PAX_REFCOUNT
15320+ "jno 0f\n"
15321+ LOCK_PREFIX "incl %0\n"
15322+ "int $4\n0:\n"
15323+ _ASM_EXTABLE(0b, 0b)
15324+#endif
15325+
15326+ : "+m" (v->counter));
15327+}
15328+
15329+/**
15330+ * atomic_dec_unchecked - decrement atomic variable
15331+ * @v: pointer of type atomic_unchecked_t
15332+ *
15333+ * Atomically decrements @v by 1.
15334+ */
15335+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15336+{
15337+ asm volatile(LOCK_PREFIX "decl %0\n"
15338 : "+m" (v->counter));
15339 }
15340
15341@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15342 */
15343 static inline int atomic_dec_and_test(atomic_t *v)
15344 {
15345- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15346+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15347 }
15348
15349 /**
15350@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15351 */
15352 static inline int atomic_inc_and_test(atomic_t *v)
15353 {
15354- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15355+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15356+}
15357+
15358+/**
15359+ * atomic_inc_and_test_unchecked - increment and test
15360+ * @v: pointer of type atomic_unchecked_t
15361+ *
15362+ * Atomically increments @v by 1
15363+ * and returns true if the result is zero, or false for all
15364+ * other cases.
15365+ */
15366+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15367+{
15368+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15369 }
15370
15371 /**
15372@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15373 */
15374 static inline int atomic_add_negative(int i, atomic_t *v)
15375 {
15376- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15377+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15378 }
15379
15380 /**
15381@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15382 *
15383 * Atomically adds @i to @v and returns @i + @v
15384 */
15385-static inline int atomic_add_return(int i, atomic_t *v)
15386+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15387+{
15388+ return i + xadd_check_overflow(&v->counter, i);
15389+}
15390+
15391+/**
15392+ * atomic_add_return_unchecked - add integer and return
15393+ * @i: integer value to add
15394+ * @v: pointer of type atomic_unchecked_t
15395+ *
15396+ * Atomically adds @i to @v and returns @i + @v
15397+ */
15398+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15399 {
15400 return i + xadd(&v->counter, i);
15401 }
15402@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15403 *
15404 * Atomically subtracts @i from @v and returns @v - @i
15405 */
15406-static inline int atomic_sub_return(int i, atomic_t *v)
15407+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15408 {
15409 return atomic_add_return(-i, v);
15410 }
15411
15412 #define atomic_inc_return(v) (atomic_add_return(1, v))
15413+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15414+{
15415+ return atomic_add_return_unchecked(1, v);
15416+}
15417 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15418
15419-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15420+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15421+{
15422+ return cmpxchg(&v->counter, old, new);
15423+}
15424+
15425+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15426 {
15427 return cmpxchg(&v->counter, old, new);
15428 }
15429@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15430 return xchg(&v->counter, new);
15431 }
15432
15433+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15434+{
15435+ return xchg(&v->counter, new);
15436+}
15437+
15438 /**
15439 * __atomic_add_unless - add unless the number is already a given value
15440 * @v: pointer of type atomic_t
15441@@ -191,14 +337,27 @@ static inline int atomic_xchg(atomic_t *v, int new)
15442 * Atomically adds @a to @v, so long as @v was not already @u.
15443 * Returns the old value of @v.
15444 */
15445-static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15446+static inline int __intentional_overflow(-1) __atomic_add_unless(atomic_t *v, int a, int u)
15447 {
15448- int c, old;
15449+ int c, old, new;
15450 c = atomic_read(v);
15451 for (;;) {
15452- if (unlikely(c == (u)))
15453+ if (unlikely(c == u))
15454 break;
15455- old = atomic_cmpxchg((v), c, c + (a));
15456+
15457+ asm volatile("addl %2,%0\n"
15458+
15459+#ifdef CONFIG_PAX_REFCOUNT
15460+ "jno 0f\n"
15461+ "subl %2,%0\n"
15462+ "int $4\n0:\n"
15463+ _ASM_EXTABLE(0b, 0b)
15464+#endif
15465+
15466+ : "=r" (new)
15467+ : "0" (c), "ir" (a));
15468+
15469+ old = atomic_cmpxchg(v, c, new);
15470 if (likely(old == c))
15471 break;
15472 c = old;
15473@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15474 }
15475
15476 /**
15477+ * atomic_inc_not_zero_hint - increment if not null
15478+ * @v: pointer of type atomic_t
15479+ * @hint: probable value of the atomic before the increment
15480+ *
15481+ * This version of atomic_inc_not_zero() gives a hint of probable
15482+ * value of the atomic. This helps processor to not read the memory
15483+ * before doing the atomic read/modify/write cycle, lowering
15484+ * number of bus transactions on some arches.
15485+ *
15486+ * Returns: 0 if increment was not done, 1 otherwise.
15487+ */
15488+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15489+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15490+{
15491+ int val, c = hint, new;
15492+
15493+ /* sanity test, should be removed by compiler if hint is a constant */
15494+ if (!hint)
15495+ return __atomic_add_unless(v, 1, 0);
15496+
15497+ do {
15498+ asm volatile("incl %0\n"
15499+
15500+#ifdef CONFIG_PAX_REFCOUNT
15501+ "jno 0f\n"
15502+ "decl %0\n"
15503+ "int $4\n0:\n"
15504+ _ASM_EXTABLE(0b, 0b)
15505+#endif
15506+
15507+ : "=r" (new)
15508+ : "0" (c));
15509+
15510+ val = atomic_cmpxchg(v, c, new);
15511+ if (val == c)
15512+ return 1;
15513+ c = val;
15514+ } while (c);
15515+
15516+ return 0;
15517+}
15518+
15519+/**
15520 * atomic_inc_short - increment of a short integer
15521 * @v: pointer to type int
15522 *
15523@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15524 }
15525
15526 /* These are x86-specific, used by some header files */
15527-#define atomic_clear_mask(mask, addr) \
15528- asm volatile(LOCK_PREFIX "andl %0,%1" \
15529- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15530+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15531+{
15532+ asm volatile(LOCK_PREFIX "andl %1,%0"
15533+ : "+m" (v->counter)
15534+ : "r" (~(mask))
15535+ : "memory");
15536+}
15537
15538-#define atomic_set_mask(mask, addr) \
15539- asm volatile(LOCK_PREFIX "orl %0,%1" \
15540- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15541- : "memory")
15542+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15543+{
15544+ asm volatile(LOCK_PREFIX "andl %1,%0"
15545+ : "+m" (v->counter)
15546+ : "r" (~(mask))
15547+ : "memory");
15548+}
15549+
15550+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15551+{
15552+ asm volatile(LOCK_PREFIX "orl %1,%0"
15553+ : "+m" (v->counter)
15554+ : "r" (mask)
15555+ : "memory");
15556+}
15557+
15558+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15559+{
15560+ asm volatile(LOCK_PREFIX "orl %1,%0"
15561+ : "+m" (v->counter)
15562+ : "r" (mask)
15563+ : "memory");
15564+}
15565
15566 #ifdef CONFIG_X86_32
15567 # include <asm/atomic64_32.h>
15568diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15569index b154de7..bf18a5a 100644
15570--- a/arch/x86/include/asm/atomic64_32.h
15571+++ b/arch/x86/include/asm/atomic64_32.h
15572@@ -12,6 +12,14 @@ typedef struct {
15573 u64 __aligned(8) counter;
15574 } atomic64_t;
15575
15576+#ifdef CONFIG_PAX_REFCOUNT
15577+typedef struct {
15578+ u64 __aligned(8) counter;
15579+} atomic64_unchecked_t;
15580+#else
15581+typedef atomic64_t atomic64_unchecked_t;
15582+#endif
15583+
15584 #define ATOMIC64_INIT(val) { (val) }
15585
15586 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15587@@ -37,21 +45,31 @@ typedef struct {
15588 ATOMIC64_DECL_ONE(sym##_386)
15589
15590 ATOMIC64_DECL_ONE(add_386);
15591+ATOMIC64_DECL_ONE(add_unchecked_386);
15592 ATOMIC64_DECL_ONE(sub_386);
15593+ATOMIC64_DECL_ONE(sub_unchecked_386);
15594 ATOMIC64_DECL_ONE(inc_386);
15595+ATOMIC64_DECL_ONE(inc_unchecked_386);
15596 ATOMIC64_DECL_ONE(dec_386);
15597+ATOMIC64_DECL_ONE(dec_unchecked_386);
15598 #endif
15599
15600 #define alternative_atomic64(f, out, in...) \
15601 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15602
15603 ATOMIC64_DECL(read);
15604+ATOMIC64_DECL(read_unchecked);
15605 ATOMIC64_DECL(set);
15606+ATOMIC64_DECL(set_unchecked);
15607 ATOMIC64_DECL(xchg);
15608 ATOMIC64_DECL(add_return);
15609+ATOMIC64_DECL(add_return_unchecked);
15610 ATOMIC64_DECL(sub_return);
15611+ATOMIC64_DECL(sub_return_unchecked);
15612 ATOMIC64_DECL(inc_return);
15613+ATOMIC64_DECL(inc_return_unchecked);
15614 ATOMIC64_DECL(dec_return);
15615+ATOMIC64_DECL(dec_return_unchecked);
15616 ATOMIC64_DECL(dec_if_positive);
15617 ATOMIC64_DECL(inc_not_zero);
15618 ATOMIC64_DECL(add_unless);
15619@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15620 }
15621
15622 /**
15623+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15624+ * @p: pointer to type atomic64_unchecked_t
15625+ * @o: expected value
15626+ * @n: new value
15627+ *
15628+ * Atomically sets @v to @n if it was equal to @o and returns
15629+ * the old value.
15630+ */
15631+
15632+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15633+{
15634+ return cmpxchg64(&v->counter, o, n);
15635+}
15636+
15637+/**
15638 * atomic64_xchg - xchg atomic64 variable
15639 * @v: pointer to type atomic64_t
15640 * @n: value to assign
15641@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15642 }
15643
15644 /**
15645+ * atomic64_set_unchecked - set atomic64 variable
15646+ * @v: pointer to type atomic64_unchecked_t
15647+ * @n: value to assign
15648+ *
15649+ * Atomically sets the value of @v to @n.
15650+ */
15651+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15652+{
15653+ unsigned high = (unsigned)(i >> 32);
15654+ unsigned low = (unsigned)i;
15655+ alternative_atomic64(set, /* no output */,
15656+ "S" (v), "b" (low), "c" (high)
15657+ : "eax", "edx", "memory");
15658+}
15659+
15660+/**
15661 * atomic64_read - read atomic64 variable
15662 * @v: pointer to type atomic64_t
15663 *
15664@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15665 }
15666
15667 /**
15668+ * atomic64_read_unchecked - read atomic64 variable
15669+ * @v: pointer to type atomic64_unchecked_t
15670+ *
15671+ * Atomically reads the value of @v and returns it.
15672+ */
15673+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15674+{
15675+ long long r;
15676+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15677+ return r;
15678+ }
15679+
15680+/**
15681 * atomic64_add_return - add and return
15682 * @i: integer value to add
15683 * @v: pointer to type atomic64_t
15684@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15685 return i;
15686 }
15687
15688+/**
15689+ * atomic64_add_return_unchecked - add and return
15690+ * @i: integer value to add
15691+ * @v: pointer to type atomic64_unchecked_t
15692+ *
15693+ * Atomically adds @i to @v and returns @i + *@v
15694+ */
15695+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15696+{
15697+ alternative_atomic64(add_return_unchecked,
15698+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15699+ ASM_NO_INPUT_CLOBBER("memory"));
15700+ return i;
15701+}
15702+
15703 /*
15704 * Other variants with different arithmetic operators:
15705 */
15706@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15707 return a;
15708 }
15709
15710+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15711+{
15712+ long long a;
15713+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15714+ "S" (v) : "memory", "ecx");
15715+ return a;
15716+}
15717+
15718 static inline long long atomic64_dec_return(atomic64_t *v)
15719 {
15720 long long a;
15721@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15722 }
15723
15724 /**
15725+ * atomic64_add_unchecked - add integer to atomic64 variable
15726+ * @i: integer value to add
15727+ * @v: pointer to type atomic64_unchecked_t
15728+ *
15729+ * Atomically adds @i to @v.
15730+ */
15731+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15732+{
15733+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15734+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15735+ ASM_NO_INPUT_CLOBBER("memory"));
15736+ return i;
15737+}
15738+
15739+/**
15740 * atomic64_sub - subtract the atomic64 variable
15741 * @i: integer value to subtract
15742 * @v: pointer to type atomic64_t
15743diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15744index f8d273e..02f39f3 100644
15745--- a/arch/x86/include/asm/atomic64_64.h
15746+++ b/arch/x86/include/asm/atomic64_64.h
15747@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15748 }
15749
15750 /**
15751+ * atomic64_read_unchecked - read atomic64 variable
15752+ * @v: pointer of type atomic64_unchecked_t
15753+ *
15754+ * Atomically reads the value of @v.
15755+ * Doesn't imply a read memory barrier.
15756+ */
15757+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15758+{
15759+ return ACCESS_ONCE((v)->counter);
15760+}
15761+
15762+/**
15763 * atomic64_set - set atomic64 variable
15764 * @v: pointer to type atomic64_t
15765 * @i: required value
15766@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15767 }
15768
15769 /**
15770+ * atomic64_set_unchecked - set atomic64 variable
15771+ * @v: pointer to type atomic64_unchecked_t
15772+ * @i: required value
15773+ *
15774+ * Atomically sets the value of @v to @i.
15775+ */
15776+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15777+{
15778+ v->counter = i;
15779+}
15780+
15781+/**
15782 * atomic64_add - add integer to atomic64 variable
15783 * @i: integer value to add
15784 * @v: pointer to type atomic64_t
15785@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15786 */
15787 static inline void atomic64_add(long i, atomic64_t *v)
15788 {
15789+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15790+
15791+#ifdef CONFIG_PAX_REFCOUNT
15792+ "jno 0f\n"
15793+ LOCK_PREFIX "subq %1,%0\n"
15794+ "int $4\n0:\n"
15795+ _ASM_EXTABLE(0b, 0b)
15796+#endif
15797+
15798+ : "=m" (v->counter)
15799+ : "er" (i), "m" (v->counter));
15800+}
15801+
15802+/**
15803+ * atomic64_add_unchecked - add integer to atomic64 variable
15804+ * @i: integer value to add
15805+ * @v: pointer to type atomic64_unchecked_t
15806+ *
15807+ * Atomically adds @i to @v.
15808+ */
15809+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15810+{
15811 asm volatile(LOCK_PREFIX "addq %1,%0"
15812 : "=m" (v->counter)
15813 : "er" (i), "m" (v->counter));
15814@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15815 */
15816 static inline void atomic64_sub(long i, atomic64_t *v)
15817 {
15818- asm volatile(LOCK_PREFIX "subq %1,%0"
15819+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15820+
15821+#ifdef CONFIG_PAX_REFCOUNT
15822+ "jno 0f\n"
15823+ LOCK_PREFIX "addq %1,%0\n"
15824+ "int $4\n0:\n"
15825+ _ASM_EXTABLE(0b, 0b)
15826+#endif
15827+
15828+ : "=m" (v->counter)
15829+ : "er" (i), "m" (v->counter));
15830+}
15831+
15832+/**
15833+ * atomic64_sub_unchecked - subtract the atomic64 variable
15834+ * @i: integer value to subtract
15835+ * @v: pointer to type atomic64_unchecked_t
15836+ *
15837+ * Atomically subtracts @i from @v.
15838+ */
15839+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15840+{
15841+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15842 : "=m" (v->counter)
15843 : "er" (i), "m" (v->counter));
15844 }
15845@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15846 */
15847 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15848 {
15849- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15850+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15851 }
15852
15853 /**
15854@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15855 */
15856 static inline void atomic64_inc(atomic64_t *v)
15857 {
15858+ asm volatile(LOCK_PREFIX "incq %0\n"
15859+
15860+#ifdef CONFIG_PAX_REFCOUNT
15861+ "jno 0f\n"
15862+ LOCK_PREFIX "decq %0\n"
15863+ "int $4\n0:\n"
15864+ _ASM_EXTABLE(0b, 0b)
15865+#endif
15866+
15867+ : "=m" (v->counter)
15868+ : "m" (v->counter));
15869+}
15870+
15871+/**
15872+ * atomic64_inc_unchecked - increment atomic64 variable
15873+ * @v: pointer to type atomic64_unchecked_t
15874+ *
15875+ * Atomically increments @v by 1.
15876+ */
15877+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15878+{
15879 asm volatile(LOCK_PREFIX "incq %0"
15880 : "=m" (v->counter)
15881 : "m" (v->counter));
15882@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15883 */
15884 static inline void atomic64_dec(atomic64_t *v)
15885 {
15886- asm volatile(LOCK_PREFIX "decq %0"
15887+ asm volatile(LOCK_PREFIX "decq %0\n"
15888+
15889+#ifdef CONFIG_PAX_REFCOUNT
15890+ "jno 0f\n"
15891+ LOCK_PREFIX "incq %0\n"
15892+ "int $4\n0:\n"
15893+ _ASM_EXTABLE(0b, 0b)
15894+#endif
15895+
15896+ : "=m" (v->counter)
15897+ : "m" (v->counter));
15898+}
15899+
15900+/**
15901+ * atomic64_dec_unchecked - decrement atomic64 variable
15902+ * @v: pointer to type atomic64_t
15903+ *
15904+ * Atomically decrements @v by 1.
15905+ */
15906+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15907+{
15908+ asm volatile(LOCK_PREFIX "decq %0\n"
15909 : "=m" (v->counter)
15910 : "m" (v->counter));
15911 }
15912@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15913 */
15914 static inline int atomic64_dec_and_test(atomic64_t *v)
15915 {
15916- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15917+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15918 }
15919
15920 /**
15921@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15922 */
15923 static inline int atomic64_inc_and_test(atomic64_t *v)
15924 {
15925- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15926+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15927 }
15928
15929 /**
15930@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15931 */
15932 static inline int atomic64_add_negative(long i, atomic64_t *v)
15933 {
15934- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15935+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15936 }
15937
15938 /**
15939@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15940 */
15941 static inline long atomic64_add_return(long i, atomic64_t *v)
15942 {
15943+ return i + xadd_check_overflow(&v->counter, i);
15944+}
15945+
15946+/**
15947+ * atomic64_add_return_unchecked - add and return
15948+ * @i: integer value to add
15949+ * @v: pointer to type atomic64_unchecked_t
15950+ *
15951+ * Atomically adds @i to @v and returns @i + @v
15952+ */
15953+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15954+{
15955 return i + xadd(&v->counter, i);
15956 }
15957
15958@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15959 }
15960
15961 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15962+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15963+{
15964+ return atomic64_add_return_unchecked(1, v);
15965+}
15966 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15967
15968 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15969@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15970 return cmpxchg(&v->counter, old, new);
15971 }
15972
15973+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15974+{
15975+ return cmpxchg(&v->counter, old, new);
15976+}
15977+
15978 static inline long atomic64_xchg(atomic64_t *v, long new)
15979 {
15980 return xchg(&v->counter, new);
15981@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15982 */
15983 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15984 {
15985- long c, old;
15986+ long c, old, new;
15987 c = atomic64_read(v);
15988 for (;;) {
15989- if (unlikely(c == (u)))
15990+ if (unlikely(c == u))
15991 break;
15992- old = atomic64_cmpxchg((v), c, c + (a));
15993+
15994+ asm volatile("add %2,%0\n"
15995+
15996+#ifdef CONFIG_PAX_REFCOUNT
15997+ "jno 0f\n"
15998+ "sub %2,%0\n"
15999+ "int $4\n0:\n"
16000+ _ASM_EXTABLE(0b, 0b)
16001+#endif
16002+
16003+ : "=r" (new)
16004+ : "0" (c), "ir" (a));
16005+
16006+ old = atomic64_cmpxchg(v, c, new);
16007 if (likely(old == c))
16008 break;
16009 c = old;
16010 }
16011- return c != (u);
16012+ return c != u;
16013 }
16014
16015 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
16016diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
16017index 0f4460b..fa1ee19 100644
16018--- a/arch/x86/include/asm/barrier.h
16019+++ b/arch/x86/include/asm/barrier.h
16020@@ -107,7 +107,7 @@
16021 do { \
16022 compiletime_assert_atomic_type(*p); \
16023 smp_mb(); \
16024- ACCESS_ONCE(*p) = (v); \
16025+ ACCESS_ONCE_RW(*p) = (v); \
16026 } while (0)
16027
16028 #define smp_load_acquire(p) \
16029@@ -124,7 +124,7 @@ do { \
16030 do { \
16031 compiletime_assert_atomic_type(*p); \
16032 barrier(); \
16033- ACCESS_ONCE(*p) = (v); \
16034+ ACCESS_ONCE_RW(*p) = (v); \
16035 } while (0)
16036
16037 #define smp_load_acquire(p) \
16038diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16039index cfe3b95..d01b118 100644
16040--- a/arch/x86/include/asm/bitops.h
16041+++ b/arch/x86/include/asm/bitops.h
16042@@ -50,7 +50,7 @@
16043 * a mask operation on a byte.
16044 */
16045 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16046-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16047+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16048 #define CONST_MASK(nr) (1 << ((nr) & 7))
16049
16050 /**
16051@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16052 */
16053 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16054 {
16055- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16056+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16057 }
16058
16059 /**
16060@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16061 */
16062 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16063 {
16064- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16065+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16066 }
16067
16068 /**
16069@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16070 */
16071 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16072 {
16073- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16074+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16075 }
16076
16077 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16078@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16079 *
16080 * Undefined if no bit exists, so code should check against 0 first.
16081 */
16082-static inline unsigned long __ffs(unsigned long word)
16083+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16084 {
16085 asm("rep; bsf %1,%0"
16086 : "=r" (word)
16087@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16088 *
16089 * Undefined if no zero exists, so code should check against ~0UL first.
16090 */
16091-static inline unsigned long ffz(unsigned long word)
16092+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16093 {
16094 asm("rep; bsf %1,%0"
16095 : "=r" (word)
16096@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16097 *
16098 * Undefined if no set bit exists, so code should check against 0 first.
16099 */
16100-static inline unsigned long __fls(unsigned long word)
16101+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16102 {
16103 asm("bsr %1,%0"
16104 : "=r" (word)
16105@@ -434,7 +434,7 @@ static inline int ffs(int x)
16106 * set bit if value is nonzero. The last (most significant) bit is
16107 * at position 32.
16108 */
16109-static inline int fls(int x)
16110+static inline int __intentional_overflow(-1) fls(int x)
16111 {
16112 int r;
16113
16114@@ -476,7 +476,7 @@ static inline int fls(int x)
16115 * at position 64.
16116 */
16117 #ifdef CONFIG_X86_64
16118-static __always_inline int fls64(__u64 x)
16119+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16120 {
16121 int bitpos = -1;
16122 /*
16123diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16124index 4fa687a..60f2d39 100644
16125--- a/arch/x86/include/asm/boot.h
16126+++ b/arch/x86/include/asm/boot.h
16127@@ -6,10 +6,15 @@
16128 #include <uapi/asm/boot.h>
16129
16130 /* Physical address where kernel should be loaded. */
16131-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16132+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16133 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16134 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16135
16136+#ifndef __ASSEMBLY__
16137+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16138+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16139+#endif
16140+
16141 /* Minimum kernel alignment, as a power of two */
16142 #ifdef CONFIG_X86_64
16143 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16144diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16145index 48f99f1..d78ebf9 100644
16146--- a/arch/x86/include/asm/cache.h
16147+++ b/arch/x86/include/asm/cache.h
16148@@ -5,12 +5,13 @@
16149
16150 /* L1 cache line size */
16151 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16152-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16153+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16154
16155 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16156+#define __read_only __attribute__((__section__(".data..read_only")))
16157
16158 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16159-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16160+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16161
16162 #ifdef CONFIG_X86_VSMP
16163 #ifdef CONFIG_SMP
16164diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
16165index 9863ee3..4a1f8e1 100644
16166--- a/arch/x86/include/asm/cacheflush.h
16167+++ b/arch/x86/include/asm/cacheflush.h
16168@@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
16169 unsigned long pg_flags = pg->flags & _PGMT_MASK;
16170
16171 if (pg_flags == _PGMT_DEFAULT)
16172- return -1;
16173+ return ~0UL;
16174 else if (pg_flags == _PGMT_WC)
16175 return _PAGE_CACHE_WC;
16176 else if (pg_flags == _PGMT_UC_MINUS)
16177diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16178index 76659b6..72b8439 100644
16179--- a/arch/x86/include/asm/calling.h
16180+++ b/arch/x86/include/asm/calling.h
16181@@ -82,107 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
16182 #define RSP 152
16183 #define SS 160
16184
16185-#define ARGOFFSET R11
16186-#define SWFRAME ORIG_RAX
16187+#define ARGOFFSET R15
16188
16189 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
16190- subq $9*8+\addskip, %rsp
16191- CFI_ADJUST_CFA_OFFSET 9*8+\addskip
16192- movq_cfi rdi, 8*8
16193- movq_cfi rsi, 7*8
16194- movq_cfi rdx, 6*8
16195+ subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
16196+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
16197+ movq_cfi rdi, RDI
16198+ movq_cfi rsi, RSI
16199+ movq_cfi rdx, RDX
16200
16201 .if \save_rcx
16202- movq_cfi rcx, 5*8
16203+ movq_cfi rcx, RCX
16204 .endif
16205
16206 .if \rax_enosys
16207- movq $-ENOSYS, 4*8(%rsp)
16208+ movq $-ENOSYS, RAX(%rsp)
16209 .else
16210- movq_cfi rax, 4*8
16211+ movq_cfi rax, RAX
16212 .endif
16213
16214 .if \save_r891011
16215- movq_cfi r8, 3*8
16216- movq_cfi r9, 2*8
16217- movq_cfi r10, 1*8
16218- movq_cfi r11, 0*8
16219+ movq_cfi r8, R8
16220+ movq_cfi r9, R9
16221+ movq_cfi r10, R10
16222+ movq_cfi r11, R11
16223 .endif
16224
16225+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16226+ movq_cfi r12, R12
16227+#endif
16228+
16229 .endm
16230
16231-#define ARG_SKIP (9*8)
16232+#define ARG_SKIP ORIG_RAX
16233
16234 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
16235 rstor_r8910=1, rstor_rdx=1
16236+
16237+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16238+ movq_cfi_restore R12, r12
16239+#endif
16240+
16241 .if \rstor_r11
16242- movq_cfi_restore 0*8, r11
16243+ movq_cfi_restore R11, r11
16244 .endif
16245
16246 .if \rstor_r8910
16247- movq_cfi_restore 1*8, r10
16248- movq_cfi_restore 2*8, r9
16249- movq_cfi_restore 3*8, r8
16250+ movq_cfi_restore R10, r10
16251+ movq_cfi_restore R9, r9
16252+ movq_cfi_restore R8, r8
16253 .endif
16254
16255 .if \rstor_rax
16256- movq_cfi_restore 4*8, rax
16257+ movq_cfi_restore RAX, rax
16258 .endif
16259
16260 .if \rstor_rcx
16261- movq_cfi_restore 5*8, rcx
16262+ movq_cfi_restore RCX, rcx
16263 .endif
16264
16265 .if \rstor_rdx
16266- movq_cfi_restore 6*8, rdx
16267+ movq_cfi_restore RDX, rdx
16268 .endif
16269
16270- movq_cfi_restore 7*8, rsi
16271- movq_cfi_restore 8*8, rdi
16272+ movq_cfi_restore RSI, rsi
16273+ movq_cfi_restore RDI, rdi
16274
16275- .if ARG_SKIP+\addskip > 0
16276- addq $ARG_SKIP+\addskip, %rsp
16277- CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
16278+ .if ORIG_RAX+\addskip > 0
16279+ addq $ORIG_RAX+\addskip, %rsp
16280+ CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
16281 .endif
16282 .endm
16283
16284- .macro LOAD_ARGS offset, skiprax=0
16285- movq \offset(%rsp), %r11
16286- movq \offset+8(%rsp), %r10
16287- movq \offset+16(%rsp), %r9
16288- movq \offset+24(%rsp), %r8
16289- movq \offset+40(%rsp), %rcx
16290- movq \offset+48(%rsp), %rdx
16291- movq \offset+56(%rsp), %rsi
16292- movq \offset+64(%rsp), %rdi
16293+ .macro LOAD_ARGS skiprax=0
16294+ movq R11(%rsp), %r11
16295+ movq R10(%rsp), %r10
16296+ movq R9(%rsp), %r9
16297+ movq R8(%rsp), %r8
16298+ movq RCX(%rsp), %rcx
16299+ movq RDX(%rsp), %rdx
16300+ movq RSI(%rsp), %rsi
16301+ movq RDI(%rsp), %rdi
16302 .if \skiprax
16303 .else
16304- movq \offset+72(%rsp), %rax
16305+ movq ORIG_RAX(%rsp), %rax
16306 .endif
16307 .endm
16308
16309-#define REST_SKIP (6*8)
16310-
16311 .macro SAVE_REST
16312- subq $REST_SKIP, %rsp
16313- CFI_ADJUST_CFA_OFFSET REST_SKIP
16314- movq_cfi rbx, 5*8
16315- movq_cfi rbp, 4*8
16316- movq_cfi r12, 3*8
16317- movq_cfi r13, 2*8
16318- movq_cfi r14, 1*8
16319- movq_cfi r15, 0*8
16320+ movq_cfi rbx, RBX
16321+ movq_cfi rbp, RBP
16322+
16323+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16324+ movq_cfi r12, R12
16325+#endif
16326+
16327+ movq_cfi r13, R13
16328+ movq_cfi r14, R14
16329+ movq_cfi r15, R15
16330 .endm
16331
16332 .macro RESTORE_REST
16333- movq_cfi_restore 0*8, r15
16334- movq_cfi_restore 1*8, r14
16335- movq_cfi_restore 2*8, r13
16336- movq_cfi_restore 3*8, r12
16337- movq_cfi_restore 4*8, rbp
16338- movq_cfi_restore 5*8, rbx
16339- addq $REST_SKIP, %rsp
16340- CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16341+ movq_cfi_restore R15, r15
16342+ movq_cfi_restore R14, r14
16343+ movq_cfi_restore R13, r13
16344+
16345+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16346+ movq_cfi_restore R12, r12
16347+#endif
16348+
16349+ movq_cfi_restore RBP, rbp
16350+ movq_cfi_restore RBX, rbx
16351 .endm
16352
16353 .macro SAVE_ALL
16354diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16355index f50de69..2b0a458 100644
16356--- a/arch/x86/include/asm/checksum_32.h
16357+++ b/arch/x86/include/asm/checksum_32.h
16358@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16359 int len, __wsum sum,
16360 int *src_err_ptr, int *dst_err_ptr);
16361
16362+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16363+ int len, __wsum sum,
16364+ int *src_err_ptr, int *dst_err_ptr);
16365+
16366+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16367+ int len, __wsum sum,
16368+ int *src_err_ptr, int *dst_err_ptr);
16369+
16370 /*
16371 * Note: when you get a NULL pointer exception here this means someone
16372 * passed in an incorrect kernel address to one of these functions.
16373@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16374
16375 might_sleep();
16376 stac();
16377- ret = csum_partial_copy_generic((__force void *)src, dst,
16378+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16379 len, sum, err_ptr, NULL);
16380 clac();
16381
16382@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16383 might_sleep();
16384 if (access_ok(VERIFY_WRITE, dst, len)) {
16385 stac();
16386- ret = csum_partial_copy_generic(src, (__force void *)dst,
16387+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16388 len, sum, NULL, err_ptr);
16389 clac();
16390 return ret;
16391diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16392index 99c105d7..2f667ac 100644
16393--- a/arch/x86/include/asm/cmpxchg.h
16394+++ b/arch/x86/include/asm/cmpxchg.h
16395@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16396 __compiletime_error("Bad argument size for cmpxchg");
16397 extern void __xadd_wrong_size(void)
16398 __compiletime_error("Bad argument size for xadd");
16399+extern void __xadd_check_overflow_wrong_size(void)
16400+ __compiletime_error("Bad argument size for xadd_check_overflow");
16401 extern void __add_wrong_size(void)
16402 __compiletime_error("Bad argument size for add");
16403+extern void __add_check_overflow_wrong_size(void)
16404+ __compiletime_error("Bad argument size for add_check_overflow");
16405
16406 /*
16407 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16408@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16409 __ret; \
16410 })
16411
16412+#ifdef CONFIG_PAX_REFCOUNT
16413+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16414+ ({ \
16415+ __typeof__ (*(ptr)) __ret = (arg); \
16416+ switch (sizeof(*(ptr))) { \
16417+ case __X86_CASE_L: \
16418+ asm volatile (lock #op "l %0, %1\n" \
16419+ "jno 0f\n" \
16420+ "mov %0,%1\n" \
16421+ "int $4\n0:\n" \
16422+ _ASM_EXTABLE(0b, 0b) \
16423+ : "+r" (__ret), "+m" (*(ptr)) \
16424+ : : "memory", "cc"); \
16425+ break; \
16426+ case __X86_CASE_Q: \
16427+ asm volatile (lock #op "q %q0, %1\n" \
16428+ "jno 0f\n" \
16429+ "mov %0,%1\n" \
16430+ "int $4\n0:\n" \
16431+ _ASM_EXTABLE(0b, 0b) \
16432+ : "+r" (__ret), "+m" (*(ptr)) \
16433+ : : "memory", "cc"); \
16434+ break; \
16435+ default: \
16436+ __ ## op ## _check_overflow_wrong_size(); \
16437+ } \
16438+ __ret; \
16439+ })
16440+#else
16441+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16442+#endif
16443+
16444 /*
16445 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16446 * Since this is generally used to protect other memory information, we
16447@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16448 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16449 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16450
16451+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16452+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16453+
16454 #define __add(ptr, inc, lock) \
16455 ({ \
16456 __typeof__ (*(ptr)) __ret = (inc); \
16457diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16458index 59c6c40..5e0b22c 100644
16459--- a/arch/x86/include/asm/compat.h
16460+++ b/arch/x86/include/asm/compat.h
16461@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16462 typedef u32 compat_uint_t;
16463 typedef u32 compat_ulong_t;
16464 typedef u64 __attribute__((aligned(4))) compat_u64;
16465-typedef u32 compat_uptr_t;
16466+typedef u32 __user compat_uptr_t;
16467
16468 struct compat_timespec {
16469 compat_time_t tv_sec;
16470diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16471index 0bb1335..8f1aec7 100644
16472--- a/arch/x86/include/asm/cpufeature.h
16473+++ b/arch/x86/include/asm/cpufeature.h
16474@@ -207,7 +207,7 @@
16475 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16476 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16477 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16478-
16479+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16480
16481 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16482 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16483@@ -215,7 +215,7 @@
16484 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16485 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16486 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16487-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16488+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16489 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16490 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16491 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16492@@ -383,6 +383,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16493 #define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16)
16494 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16495 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16496+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16497
16498 #if __GNUC__ >= 4
16499 extern void warn_pre_alternatives(void);
16500@@ -434,7 +435,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16501
16502 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16503 t_warn:
16504- warn_pre_alternatives();
16505+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16506+ warn_pre_alternatives();
16507 return false;
16508 #endif
16509
16510@@ -454,7 +456,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16511 ".section .discard,\"aw\",@progbits\n"
16512 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16513 ".previous\n"
16514- ".section .altinstr_replacement,\"ax\"\n"
16515+ ".section .altinstr_replacement,\"a\"\n"
16516 "3: movb $1,%0\n"
16517 "4:\n"
16518 ".previous\n"
16519@@ -491,7 +493,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16520 " .byte 2b - 1b\n" /* src len */
16521 " .byte 4f - 3f\n" /* repl len */
16522 ".previous\n"
16523- ".section .altinstr_replacement,\"ax\"\n"
16524+ ".section .altinstr_replacement,\"a\"\n"
16525 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16526 "4:\n"
16527 ".previous\n"
16528@@ -524,7 +526,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16529 ".section .discard,\"aw\",@progbits\n"
16530 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16531 ".previous\n"
16532- ".section .altinstr_replacement,\"ax\"\n"
16533+ ".section .altinstr_replacement,\"a\"\n"
16534 "3: movb $0,%0\n"
16535 "4:\n"
16536 ".previous\n"
16537@@ -538,7 +540,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16538 ".section .discard,\"aw\",@progbits\n"
16539 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16540 ".previous\n"
16541- ".section .altinstr_replacement,\"ax\"\n"
16542+ ".section .altinstr_replacement,\"a\"\n"
16543 "5: movb $1,%0\n"
16544 "6:\n"
16545 ".previous\n"
16546diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16547index 50d033a..37deb26 100644
16548--- a/arch/x86/include/asm/desc.h
16549+++ b/arch/x86/include/asm/desc.h
16550@@ -4,6 +4,7 @@
16551 #include <asm/desc_defs.h>
16552 #include <asm/ldt.h>
16553 #include <asm/mmu.h>
16554+#include <asm/pgtable.h>
16555
16556 #include <linux/smp.h>
16557 #include <linux/percpu.h>
16558@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16559
16560 desc->type = (info->read_exec_only ^ 1) << 1;
16561 desc->type |= info->contents << 2;
16562+ desc->type |= info->seg_not_present ^ 1;
16563
16564 desc->s = 1;
16565 desc->dpl = 0x3;
16566@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16567 }
16568
16569 extern struct desc_ptr idt_descr;
16570-extern gate_desc idt_table[];
16571-extern struct desc_ptr debug_idt_descr;
16572-extern gate_desc debug_idt_table[];
16573-
16574-struct gdt_page {
16575- struct desc_struct gdt[GDT_ENTRIES];
16576-} __attribute__((aligned(PAGE_SIZE)));
16577-
16578-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16579+extern gate_desc idt_table[IDT_ENTRIES];
16580+extern const struct desc_ptr debug_idt_descr;
16581+extern gate_desc debug_idt_table[IDT_ENTRIES];
16582
16583+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16584 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16585 {
16586- return per_cpu(gdt_page, cpu).gdt;
16587+ return cpu_gdt_table[cpu];
16588 }
16589
16590 #ifdef CONFIG_X86_64
16591@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16592 unsigned long base, unsigned dpl, unsigned flags,
16593 unsigned short seg)
16594 {
16595- gate->a = (seg << 16) | (base & 0xffff);
16596- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16597+ gate->gate.offset_low = base;
16598+ gate->gate.seg = seg;
16599+ gate->gate.reserved = 0;
16600+ gate->gate.type = type;
16601+ gate->gate.s = 0;
16602+ gate->gate.dpl = dpl;
16603+ gate->gate.p = 1;
16604+ gate->gate.offset_high = base >> 16;
16605 }
16606
16607 #endif
16608@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16609
16610 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16611 {
16612+ pax_open_kernel();
16613 memcpy(&idt[entry], gate, sizeof(*gate));
16614+ pax_close_kernel();
16615 }
16616
16617 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16618 {
16619+ pax_open_kernel();
16620 memcpy(&ldt[entry], desc, 8);
16621+ pax_close_kernel();
16622 }
16623
16624 static inline void
16625@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16626 default: size = sizeof(*gdt); break;
16627 }
16628
16629+ pax_open_kernel();
16630 memcpy(&gdt[entry], desc, size);
16631+ pax_close_kernel();
16632 }
16633
16634 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16635@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16636
16637 static inline void native_load_tr_desc(void)
16638 {
16639+ pax_open_kernel();
16640 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16641+ pax_close_kernel();
16642 }
16643
16644 static inline void native_load_gdt(const struct desc_ptr *dtr)
16645@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16646 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16647 unsigned int i;
16648
16649+ pax_open_kernel();
16650 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16651 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16652+ pax_close_kernel();
16653 }
16654
16655 #define _LDT_empty(info) \
16656@@ -287,7 +300,7 @@ static inline void load_LDT(mm_context_t *pc)
16657 preempt_enable();
16658 }
16659
16660-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16661+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16662 {
16663 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16664 }
16665@@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16666 }
16667
16668 #ifdef CONFIG_X86_64
16669-static inline void set_nmi_gate(int gate, void *addr)
16670+static inline void set_nmi_gate(int gate, const void *addr)
16671 {
16672 gate_desc s;
16673
16674@@ -321,14 +334,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16675 #endif
16676
16677 #ifdef CONFIG_TRACING
16678-extern struct desc_ptr trace_idt_descr;
16679-extern gate_desc trace_idt_table[];
16680+extern const struct desc_ptr trace_idt_descr;
16681+extern gate_desc trace_idt_table[IDT_ENTRIES];
16682 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16683 {
16684 write_idt_entry(trace_idt_table, entry, gate);
16685 }
16686
16687-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16688+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16689 unsigned dpl, unsigned ist, unsigned seg)
16690 {
16691 gate_desc s;
16692@@ -348,7 +361,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16693 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16694 #endif
16695
16696-static inline void _set_gate(int gate, unsigned type, void *addr,
16697+static inline void _set_gate(int gate, unsigned type, const void *addr,
16698 unsigned dpl, unsigned ist, unsigned seg)
16699 {
16700 gate_desc s;
16701@@ -371,9 +384,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16702 #define set_intr_gate(n, addr) \
16703 do { \
16704 BUG_ON((unsigned)n > 0xFF); \
16705- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16706+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16707 __KERNEL_CS); \
16708- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16709+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16710 0, 0, __KERNEL_CS); \
16711 } while (0)
16712
16713@@ -401,19 +414,19 @@ static inline void alloc_system_vector(int vector)
16714 /*
16715 * This routine sets up an interrupt gate at directory privilege level 3.
16716 */
16717-static inline void set_system_intr_gate(unsigned int n, void *addr)
16718+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16719 {
16720 BUG_ON((unsigned)n > 0xFF);
16721 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16722 }
16723
16724-static inline void set_system_trap_gate(unsigned int n, void *addr)
16725+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16726 {
16727 BUG_ON((unsigned)n > 0xFF);
16728 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16729 }
16730
16731-static inline void set_trap_gate(unsigned int n, void *addr)
16732+static inline void set_trap_gate(unsigned int n, const void *addr)
16733 {
16734 BUG_ON((unsigned)n > 0xFF);
16735 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16736@@ -422,16 +435,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16737 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16738 {
16739 BUG_ON((unsigned)n > 0xFF);
16740- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16741+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16742 }
16743
16744-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16745+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16746 {
16747 BUG_ON((unsigned)n > 0xFF);
16748 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16749 }
16750
16751-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16752+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16753 {
16754 BUG_ON((unsigned)n > 0xFF);
16755 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16756@@ -503,4 +516,17 @@ static inline void load_current_idt(void)
16757 else
16758 load_idt((const struct desc_ptr *)&idt_descr);
16759 }
16760+
16761+#ifdef CONFIG_X86_32
16762+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16763+{
16764+ struct desc_struct d;
16765+
16766+ if (likely(limit))
16767+ limit = (limit - 1UL) >> PAGE_SHIFT;
16768+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16769+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16770+}
16771+#endif
16772+
16773 #endif /* _ASM_X86_DESC_H */
16774diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16775index 278441f..b95a174 100644
16776--- a/arch/x86/include/asm/desc_defs.h
16777+++ b/arch/x86/include/asm/desc_defs.h
16778@@ -31,6 +31,12 @@ struct desc_struct {
16779 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16780 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16781 };
16782+ struct {
16783+ u16 offset_low;
16784+ u16 seg;
16785+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16786+ unsigned offset_high: 16;
16787+ } gate;
16788 };
16789 } __attribute__((packed));
16790
16791diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16792index ced283a..ffe04cc 100644
16793--- a/arch/x86/include/asm/div64.h
16794+++ b/arch/x86/include/asm/div64.h
16795@@ -39,7 +39,7 @@
16796 __mod; \
16797 })
16798
16799-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16800+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16801 {
16802 union {
16803 u64 v64;
16804diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16805index ca3347a..1a5082a 100644
16806--- a/arch/x86/include/asm/elf.h
16807+++ b/arch/x86/include/asm/elf.h
16808@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16809
16810 #include <asm/vdso.h>
16811
16812-#ifdef CONFIG_X86_64
16813-extern unsigned int vdso64_enabled;
16814-#endif
16815 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16816 extern unsigned int vdso32_enabled;
16817 #endif
16818@@ -249,7 +246,25 @@ extern int force_personality32;
16819 the loader. We need to make sure that it is out of the way of the program
16820 that it will "exec", and that there is sufficient room for the brk. */
16821
16822+#ifdef CONFIG_PAX_SEGMEXEC
16823+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16824+#else
16825 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16826+#endif
16827+
16828+#ifdef CONFIG_PAX_ASLR
16829+#ifdef CONFIG_X86_32
16830+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16831+
16832+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16833+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16834+#else
16835+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16836+
16837+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16838+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16839+#endif
16840+#endif
16841
16842 /* This yields a mask that user programs can use to figure out what
16843 instruction set this CPU supports. This could be done in user space,
16844@@ -298,17 +313,13 @@ do { \
16845
16846 #define ARCH_DLINFO \
16847 do { \
16848- if (vdso64_enabled) \
16849- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16850- (unsigned long __force)current->mm->context.vdso); \
16851+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16852 } while (0)
16853
16854 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16855 #define ARCH_DLINFO_X32 \
16856 do { \
16857- if (vdso64_enabled) \
16858- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16859- (unsigned long __force)current->mm->context.vdso); \
16860+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16861 } while (0)
16862
16863 #define AT_SYSINFO 32
16864@@ -323,10 +334,10 @@ else \
16865
16866 #endif /* !CONFIG_X86_32 */
16867
16868-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16869+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16870
16871 #define VDSO_ENTRY \
16872- ((unsigned long)current->mm->context.vdso + \
16873+ (current->mm->context.vdso + \
16874 selected_vdso32->sym___kernel_vsyscall)
16875
16876 struct linux_binprm;
16877@@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
16878 int uses_interp);
16879 #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
16880
16881-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16882-#define arch_randomize_brk arch_randomize_brk
16883-
16884 /*
16885 * True on X86_32 or when emulating IA32 on X86_64
16886 */
16887diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16888index 77a99ac..39ff7f5 100644
16889--- a/arch/x86/include/asm/emergency-restart.h
16890+++ b/arch/x86/include/asm/emergency-restart.h
16891@@ -1,6 +1,6 @@
16892 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16893 #define _ASM_X86_EMERGENCY_RESTART_H
16894
16895-extern void machine_emergency_restart(void);
16896+extern void machine_emergency_restart(void) __noreturn;
16897
16898 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16899diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16900index 1c7eefe..d0e4702 100644
16901--- a/arch/x86/include/asm/floppy.h
16902+++ b/arch/x86/include/asm/floppy.h
16903@@ -229,18 +229,18 @@ static struct fd_routine_l {
16904 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16905 } fd_routine[] = {
16906 {
16907- request_dma,
16908- free_dma,
16909- get_dma_residue,
16910- dma_mem_alloc,
16911- hard_dma_setup
16912+ ._request_dma = request_dma,
16913+ ._free_dma = free_dma,
16914+ ._get_dma_residue = get_dma_residue,
16915+ ._dma_mem_alloc = dma_mem_alloc,
16916+ ._dma_setup = hard_dma_setup
16917 },
16918 {
16919- vdma_request_dma,
16920- vdma_nop,
16921- vdma_get_dma_residue,
16922- vdma_mem_alloc,
16923- vdma_dma_setup
16924+ ._request_dma = vdma_request_dma,
16925+ ._free_dma = vdma_nop,
16926+ ._get_dma_residue = vdma_get_dma_residue,
16927+ ._dma_mem_alloc = vdma_mem_alloc,
16928+ ._dma_setup = vdma_dma_setup
16929 }
16930 };
16931
16932diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16933index e97622f..d0ba77a 100644
16934--- a/arch/x86/include/asm/fpu-internal.h
16935+++ b/arch/x86/include/asm/fpu-internal.h
16936@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16937 #define user_insn(insn, output, input...) \
16938 ({ \
16939 int err; \
16940+ pax_open_userland(); \
16941 asm volatile(ASM_STAC "\n" \
16942- "1:" #insn "\n\t" \
16943+ "1:" \
16944+ __copyuser_seg \
16945+ #insn "\n\t" \
16946 "2: " ASM_CLAC "\n" \
16947 ".section .fixup,\"ax\"\n" \
16948 "3: movl $-1,%[err]\n" \
16949@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16950 _ASM_EXTABLE(1b, 3b) \
16951 : [err] "=r" (err), output \
16952 : "0"(0), input); \
16953+ pax_close_userland(); \
16954 err; \
16955 })
16956
16957@@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16958 "fnclex\n\t"
16959 "emms\n\t"
16960 "fildl %P[addr]" /* set F?P to defined value */
16961- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16962+ : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16963 }
16964
16965 return fpu_restore_checking(&tsk->thread.fpu);
16966diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16967index b4c1f54..e290c08 100644
16968--- a/arch/x86/include/asm/futex.h
16969+++ b/arch/x86/include/asm/futex.h
16970@@ -12,6 +12,7 @@
16971 #include <asm/smap.h>
16972
16973 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16974+ typecheck(u32 __user *, uaddr); \
16975 asm volatile("\t" ASM_STAC "\n" \
16976 "1:\t" insn "\n" \
16977 "2:\t" ASM_CLAC "\n" \
16978@@ -20,15 +21,16 @@
16979 "\tjmp\t2b\n" \
16980 "\t.previous\n" \
16981 _ASM_EXTABLE(1b, 3b) \
16982- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16983+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16984 : "i" (-EFAULT), "0" (oparg), "1" (0))
16985
16986 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16987+ typecheck(u32 __user *, uaddr); \
16988 asm volatile("\t" ASM_STAC "\n" \
16989 "1:\tmovl %2, %0\n" \
16990 "\tmovl\t%0, %3\n" \
16991 "\t" insn "\n" \
16992- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16993+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16994 "\tjnz\t1b\n" \
16995 "3:\t" ASM_CLAC "\n" \
16996 "\t.section .fixup,\"ax\"\n" \
16997@@ -38,7 +40,7 @@
16998 _ASM_EXTABLE(1b, 4b) \
16999 _ASM_EXTABLE(2b, 4b) \
17000 : "=&a" (oldval), "=&r" (ret), \
17001- "+m" (*uaddr), "=&r" (tem) \
17002+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
17003 : "r" (oparg), "i" (-EFAULT), "1" (0))
17004
17005 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17006@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17007
17008 pagefault_disable();
17009
17010+ pax_open_userland();
17011 switch (op) {
17012 case FUTEX_OP_SET:
17013- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
17014+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
17015 break;
17016 case FUTEX_OP_ADD:
17017- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
17018+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
17019 uaddr, oparg);
17020 break;
17021 case FUTEX_OP_OR:
17022@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
17023 default:
17024 ret = -ENOSYS;
17025 }
17026+ pax_close_userland();
17027
17028 pagefault_enable();
17029
17030diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
17031index 4615906..788c817 100644
17032--- a/arch/x86/include/asm/hw_irq.h
17033+++ b/arch/x86/include/asm/hw_irq.h
17034@@ -164,8 +164,8 @@ extern void setup_ioapic_dest(void);
17035 extern void enable_IO_APIC(void);
17036
17037 /* Statistics */
17038-extern atomic_t irq_err_count;
17039-extern atomic_t irq_mis_count;
17040+extern atomic_unchecked_t irq_err_count;
17041+extern atomic_unchecked_t irq_mis_count;
17042
17043 /* EISA */
17044 extern void eisa_set_level_irq(unsigned int irq);
17045diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17046index ccffa53..3c90c87 100644
17047--- a/arch/x86/include/asm/i8259.h
17048+++ b/arch/x86/include/asm/i8259.h
17049@@ -62,7 +62,7 @@ struct legacy_pic {
17050 void (*init)(int auto_eoi);
17051 int (*irq_pending)(unsigned int irq);
17052 void (*make_irq)(unsigned int irq);
17053-};
17054+} __do_const;
17055
17056 extern struct legacy_pic *legacy_pic;
17057 extern struct legacy_pic null_legacy_pic;
17058diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17059index b8237d8..3e8864e 100644
17060--- a/arch/x86/include/asm/io.h
17061+++ b/arch/x86/include/asm/io.h
17062@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17063 "m" (*(volatile type __force *)addr) barrier); }
17064
17065 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17066-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17067-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17068+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17069+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17070
17071 build_mmio_read(__readb, "b", unsigned char, "=q", )
17072-build_mmio_read(__readw, "w", unsigned short, "=r", )
17073-build_mmio_read(__readl, "l", unsigned int, "=r", )
17074+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17075+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17076
17077 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17078 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17079@@ -109,7 +109,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17080 * this function
17081 */
17082
17083-static inline phys_addr_t virt_to_phys(volatile void *address)
17084+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17085 {
17086 return __pa(address);
17087 }
17088@@ -185,7 +185,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17089 return ioremap_nocache(offset, size);
17090 }
17091
17092-extern void iounmap(volatile void __iomem *addr);
17093+extern void iounmap(const volatile void __iomem *addr);
17094
17095 extern void set_iounmap_nonlazy(void);
17096
17097@@ -195,6 +195,17 @@ extern void set_iounmap_nonlazy(void);
17098
17099 #include <linux/vmalloc.h>
17100
17101+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17102+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17103+{
17104+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17105+}
17106+
17107+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17108+{
17109+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17110+}
17111+
17112 /*
17113 * Convert a virtual cached pointer to an uncached pointer
17114 */
17115diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17116index 0a8b519..80e7d5b 100644
17117--- a/arch/x86/include/asm/irqflags.h
17118+++ b/arch/x86/include/asm/irqflags.h
17119@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17120 sti; \
17121 sysexit
17122
17123+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17124+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17125+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17126+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17127+
17128 #else
17129 #define INTERRUPT_RETURN iret
17130 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17131diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17132index 4421b5d..8543006 100644
17133--- a/arch/x86/include/asm/kprobes.h
17134+++ b/arch/x86/include/asm/kprobes.h
17135@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17136 #define RELATIVEJUMP_SIZE 5
17137 #define RELATIVECALL_OPCODE 0xe8
17138 #define RELATIVE_ADDR_SIZE 4
17139-#define MAX_STACK_SIZE 64
17140-#define MIN_STACK_SIZE(ADDR) \
17141- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17142- THREAD_SIZE - (unsigned long)(ADDR))) \
17143- ? (MAX_STACK_SIZE) \
17144- : (((unsigned long)current_thread_info()) + \
17145- THREAD_SIZE - (unsigned long)(ADDR)))
17146+#define MAX_STACK_SIZE 64UL
17147+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17148
17149 #define flush_insn_slot(p) do { } while (0)
17150
17151diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
17152index 6ed0c30..74fb6c3 100644
17153--- a/arch/x86/include/asm/kvm_host.h
17154+++ b/arch/x86/include/asm/kvm_host.h
17155@@ -51,6 +51,7 @@
17156 | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG))
17157
17158 #define CR3_L_MODE_RESERVED_BITS 0xFFFFFF0000000000ULL
17159+#define CR3_PCID_INVD (1UL << 63)
17160 #define CR4_RESERVED_BITS \
17161 (~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\
17162 | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE \
17163diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17164index 4ad6560..75c7bdd 100644
17165--- a/arch/x86/include/asm/local.h
17166+++ b/arch/x86/include/asm/local.h
17167@@ -10,33 +10,97 @@ typedef struct {
17168 atomic_long_t a;
17169 } local_t;
17170
17171+typedef struct {
17172+ atomic_long_unchecked_t a;
17173+} local_unchecked_t;
17174+
17175 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17176
17177 #define local_read(l) atomic_long_read(&(l)->a)
17178+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17179 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17180+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17181
17182 static inline void local_inc(local_t *l)
17183 {
17184- asm volatile(_ASM_INC "%0"
17185+ asm volatile(_ASM_INC "%0\n"
17186+
17187+#ifdef CONFIG_PAX_REFCOUNT
17188+ "jno 0f\n"
17189+ _ASM_DEC "%0\n"
17190+ "int $4\n0:\n"
17191+ _ASM_EXTABLE(0b, 0b)
17192+#endif
17193+
17194+ : "+m" (l->a.counter));
17195+}
17196+
17197+static inline void local_inc_unchecked(local_unchecked_t *l)
17198+{
17199+ asm volatile(_ASM_INC "%0\n"
17200 : "+m" (l->a.counter));
17201 }
17202
17203 static inline void local_dec(local_t *l)
17204 {
17205- asm volatile(_ASM_DEC "%0"
17206+ asm volatile(_ASM_DEC "%0\n"
17207+
17208+#ifdef CONFIG_PAX_REFCOUNT
17209+ "jno 0f\n"
17210+ _ASM_INC "%0\n"
17211+ "int $4\n0:\n"
17212+ _ASM_EXTABLE(0b, 0b)
17213+#endif
17214+
17215+ : "+m" (l->a.counter));
17216+}
17217+
17218+static inline void local_dec_unchecked(local_unchecked_t *l)
17219+{
17220+ asm volatile(_ASM_DEC "%0\n"
17221 : "+m" (l->a.counter));
17222 }
17223
17224 static inline void local_add(long i, local_t *l)
17225 {
17226- asm volatile(_ASM_ADD "%1,%0"
17227+ asm volatile(_ASM_ADD "%1,%0\n"
17228+
17229+#ifdef CONFIG_PAX_REFCOUNT
17230+ "jno 0f\n"
17231+ _ASM_SUB "%1,%0\n"
17232+ "int $4\n0:\n"
17233+ _ASM_EXTABLE(0b, 0b)
17234+#endif
17235+
17236+ : "+m" (l->a.counter)
17237+ : "ir" (i));
17238+}
17239+
17240+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17241+{
17242+ asm volatile(_ASM_ADD "%1,%0\n"
17243 : "+m" (l->a.counter)
17244 : "ir" (i));
17245 }
17246
17247 static inline void local_sub(long i, local_t *l)
17248 {
17249- asm volatile(_ASM_SUB "%1,%0"
17250+ asm volatile(_ASM_SUB "%1,%0\n"
17251+
17252+#ifdef CONFIG_PAX_REFCOUNT
17253+ "jno 0f\n"
17254+ _ASM_ADD "%1,%0\n"
17255+ "int $4\n0:\n"
17256+ _ASM_EXTABLE(0b, 0b)
17257+#endif
17258+
17259+ : "+m" (l->a.counter)
17260+ : "ir" (i));
17261+}
17262+
17263+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17264+{
17265+ asm volatile(_ASM_SUB "%1,%0\n"
17266 : "+m" (l->a.counter)
17267 : "ir" (i));
17268 }
17269@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17270 */
17271 static inline int local_sub_and_test(long i, local_t *l)
17272 {
17273- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17274+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17275 }
17276
17277 /**
17278@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17279 */
17280 static inline int local_dec_and_test(local_t *l)
17281 {
17282- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17283+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17284 }
17285
17286 /**
17287@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17288 */
17289 static inline int local_inc_and_test(local_t *l)
17290 {
17291- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17292+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17293 }
17294
17295 /**
17296@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17297 */
17298 static inline int local_add_negative(long i, local_t *l)
17299 {
17300- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17301+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17302 }
17303
17304 /**
17305@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17306 static inline long local_add_return(long i, local_t *l)
17307 {
17308 long __i = i;
17309+ asm volatile(_ASM_XADD "%0, %1\n"
17310+
17311+#ifdef CONFIG_PAX_REFCOUNT
17312+ "jno 0f\n"
17313+ _ASM_MOV "%0,%1\n"
17314+ "int $4\n0:\n"
17315+ _ASM_EXTABLE(0b, 0b)
17316+#endif
17317+
17318+ : "+r" (i), "+m" (l->a.counter)
17319+ : : "memory");
17320+ return i + __i;
17321+}
17322+
17323+/**
17324+ * local_add_return_unchecked - add and return
17325+ * @i: integer value to add
17326+ * @l: pointer to type local_unchecked_t
17327+ *
17328+ * Atomically adds @i to @l and returns @i + @l
17329+ */
17330+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17331+{
17332+ long __i = i;
17333 asm volatile(_ASM_XADD "%0, %1;"
17334 : "+r" (i), "+m" (l->a.counter)
17335 : : "memory");
17336@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17337
17338 #define local_cmpxchg(l, o, n) \
17339 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17340+#define local_cmpxchg_unchecked(l, o, n) \
17341+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17342 /* Always has a lock prefix */
17343 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17344
17345diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17346new file mode 100644
17347index 0000000..2bfd3ba
17348--- /dev/null
17349+++ b/arch/x86/include/asm/mman.h
17350@@ -0,0 +1,15 @@
17351+#ifndef _X86_MMAN_H
17352+#define _X86_MMAN_H
17353+
17354+#include <uapi/asm/mman.h>
17355+
17356+#ifdef __KERNEL__
17357+#ifndef __ASSEMBLY__
17358+#ifdef CONFIG_X86_32
17359+#define arch_mmap_check i386_mmap_check
17360+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17361+#endif
17362+#endif
17363+#endif
17364+
17365+#endif /* X86_MMAN_H */
17366diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17367index 876e74e..e20bfb1 100644
17368--- a/arch/x86/include/asm/mmu.h
17369+++ b/arch/x86/include/asm/mmu.h
17370@@ -9,7 +9,7 @@
17371 * we put the segment information here.
17372 */
17373 typedef struct {
17374- void *ldt;
17375+ struct desc_struct *ldt;
17376 int size;
17377
17378 #ifdef CONFIG_X86_64
17379@@ -18,7 +18,19 @@ typedef struct {
17380 #endif
17381
17382 struct mutex lock;
17383- void __user *vdso;
17384+ unsigned long vdso;
17385+
17386+#ifdef CONFIG_X86_32
17387+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17388+ unsigned long user_cs_base;
17389+ unsigned long user_cs_limit;
17390+
17391+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17392+ cpumask_t cpu_user_cs_mask;
17393+#endif
17394+
17395+#endif
17396+#endif
17397 } mm_context_t;
17398
17399 #ifdef CONFIG_SMP
17400diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17401index 166af2a..648c200 100644
17402--- a/arch/x86/include/asm/mmu_context.h
17403+++ b/arch/x86/include/asm/mmu_context.h
17404@@ -28,6 +28,20 @@ void destroy_context(struct mm_struct *mm);
17405
17406 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17407 {
17408+
17409+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17410+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
17411+ unsigned int i;
17412+ pgd_t *pgd;
17413+
17414+ pax_open_kernel();
17415+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17416+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17417+ set_pgd_batched(pgd+i, native_make_pgd(0));
17418+ pax_close_kernel();
17419+ }
17420+#endif
17421+
17422 #ifdef CONFIG_SMP
17423 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17424 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17425@@ -38,16 +52,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17426 struct task_struct *tsk)
17427 {
17428 unsigned cpu = smp_processor_id();
17429+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17430+ int tlbstate = TLBSTATE_OK;
17431+#endif
17432
17433 if (likely(prev != next)) {
17434 #ifdef CONFIG_SMP
17435+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17436+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17437+#endif
17438 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17439 this_cpu_write(cpu_tlbstate.active_mm, next);
17440 #endif
17441 cpumask_set_cpu(cpu, mm_cpumask(next));
17442
17443 /* Re-load page tables */
17444+#ifdef CONFIG_PAX_PER_CPU_PGD
17445+ pax_open_kernel();
17446+
17447+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17448+ if (static_cpu_has(X86_FEATURE_PCID))
17449+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17450+ else
17451+#endif
17452+
17453+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17454+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17455+ pax_close_kernel();
17456+ 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));
17457+
17458+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17459+ if (static_cpu_has(X86_FEATURE_PCID)) {
17460+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17461+ u64 descriptor[2];
17462+ descriptor[0] = PCID_USER;
17463+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17464+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17465+ descriptor[0] = PCID_KERNEL;
17466+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17467+ }
17468+ } else {
17469+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17470+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17471+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17472+ else
17473+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17474+ }
17475+ } else
17476+#endif
17477+
17478+ load_cr3(get_cpu_pgd(cpu, kernel));
17479+#else
17480 load_cr3(next->pgd);
17481+#endif
17482 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17483
17484 /* Stop flush ipis for the previous mm */
17485@@ -56,9 +113,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17486 /* Load the LDT, if the LDT is different: */
17487 if (unlikely(prev->context.ldt != next->context.ldt))
17488 load_LDT_nolock(&next->context);
17489+
17490+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17491+ if (!(__supported_pte_mask & _PAGE_NX)) {
17492+ smp_mb__before_atomic();
17493+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17494+ smp_mb__after_atomic();
17495+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17496+ }
17497+#endif
17498+
17499+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17500+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17501+ prev->context.user_cs_limit != next->context.user_cs_limit))
17502+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17503+#ifdef CONFIG_SMP
17504+ else if (unlikely(tlbstate != TLBSTATE_OK))
17505+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17506+#endif
17507+#endif
17508+
17509 }
17510+ else {
17511+
17512+#ifdef CONFIG_PAX_PER_CPU_PGD
17513+ pax_open_kernel();
17514+
17515+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17516+ if (static_cpu_has(X86_FEATURE_PCID))
17517+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17518+ else
17519+#endif
17520+
17521+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17522+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17523+ pax_close_kernel();
17524+ 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));
17525+
17526+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17527+ if (static_cpu_has(X86_FEATURE_PCID)) {
17528+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17529+ u64 descriptor[2];
17530+ descriptor[0] = PCID_USER;
17531+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17532+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17533+ descriptor[0] = PCID_KERNEL;
17534+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17535+ }
17536+ } else {
17537+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17538+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17539+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17540+ else
17541+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17542+ }
17543+ } else
17544+#endif
17545+
17546+ load_cr3(get_cpu_pgd(cpu, kernel));
17547+#endif
17548+
17549 #ifdef CONFIG_SMP
17550- else {
17551 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17552 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17553
17554@@ -75,12 +190,29 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17555 * tlb flush IPI delivery. We must reload CR3
17556 * to make sure to use no freed page tables.
17557 */
17558+
17559+#ifndef CONFIG_PAX_PER_CPU_PGD
17560 load_cr3(next->pgd);
17561 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17562+#endif
17563+
17564 load_LDT_nolock(&next->context);
17565+
17566+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17567+ if (!(__supported_pte_mask & _PAGE_NX))
17568+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17569+#endif
17570+
17571+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17572+#ifdef CONFIG_PAX_PAGEEXEC
17573+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17574+#endif
17575+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17576+#endif
17577+
17578 }
17579+#endif
17580 }
17581-#endif
17582 }
17583
17584 #define activate_mm(prev, next) \
17585diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17586index e3b7819..b257c64 100644
17587--- a/arch/x86/include/asm/module.h
17588+++ b/arch/x86/include/asm/module.h
17589@@ -5,6 +5,7 @@
17590
17591 #ifdef CONFIG_X86_64
17592 /* X86_64 does not define MODULE_PROC_FAMILY */
17593+#define MODULE_PROC_FAMILY ""
17594 #elif defined CONFIG_M486
17595 #define MODULE_PROC_FAMILY "486 "
17596 #elif defined CONFIG_M586
17597@@ -57,8 +58,20 @@
17598 #error unknown processor family
17599 #endif
17600
17601-#ifdef CONFIG_X86_32
17602-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17603+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17604+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17605+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17606+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17607+#else
17608+#define MODULE_PAX_KERNEXEC ""
17609 #endif
17610
17611+#ifdef CONFIG_PAX_MEMORY_UDEREF
17612+#define MODULE_PAX_UDEREF "UDEREF "
17613+#else
17614+#define MODULE_PAX_UDEREF ""
17615+#endif
17616+
17617+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17618+
17619 #endif /* _ASM_X86_MODULE_H */
17620diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17621index 5f2fc44..106caa6 100644
17622--- a/arch/x86/include/asm/nmi.h
17623+++ b/arch/x86/include/asm/nmi.h
17624@@ -36,26 +36,35 @@ enum {
17625
17626 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17627
17628+struct nmiaction;
17629+
17630+struct nmiwork {
17631+ const struct nmiaction *action;
17632+ u64 max_duration;
17633+ struct irq_work irq_work;
17634+};
17635+
17636 struct nmiaction {
17637 struct list_head list;
17638 nmi_handler_t handler;
17639- u64 max_duration;
17640- struct irq_work irq_work;
17641 unsigned long flags;
17642 const char *name;
17643-};
17644+ struct nmiwork *work;
17645+} __do_const;
17646
17647 #define register_nmi_handler(t, fn, fg, n, init...) \
17648 ({ \
17649- static struct nmiaction init fn##_na = { \
17650+ static struct nmiwork fn##_nw; \
17651+ static const struct nmiaction init fn##_na = { \
17652 .handler = (fn), \
17653 .name = (n), \
17654 .flags = (fg), \
17655+ .work = &fn##_nw, \
17656 }; \
17657 __register_nmi_handler((t), &fn##_na); \
17658 })
17659
17660-int __register_nmi_handler(unsigned int, struct nmiaction *);
17661+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17662
17663 void unregister_nmi_handler(unsigned int, const char *);
17664
17665diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17666index 802dde3..9183e68 100644
17667--- a/arch/x86/include/asm/page.h
17668+++ b/arch/x86/include/asm/page.h
17669@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17670 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17671
17672 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17673+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17674
17675 #define __boot_va(x) __va(x)
17676 #define __boot_pa(x) __pa(x)
17677@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17678 * virt_to_page(kaddr) returns a valid pointer if and only if
17679 * virt_addr_valid(kaddr) returns true.
17680 */
17681-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17682 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17683 extern bool __virt_addr_valid(unsigned long kaddr);
17684 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17685
17686+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17687+#define virt_to_page(kaddr) \
17688+ ({ \
17689+ const void *__kaddr = (const void *)(kaddr); \
17690+ BUG_ON(!virt_addr_valid(__kaddr)); \
17691+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17692+ })
17693+#else
17694+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17695+#endif
17696+
17697 #endif /* __ASSEMBLY__ */
17698
17699 #include <asm-generic/memory_model.h>
17700diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17701index f408caf..4a0455e 100644
17702--- a/arch/x86/include/asm/page_64.h
17703+++ b/arch/x86/include/asm/page_64.h
17704@@ -7,9 +7,9 @@
17705
17706 /* duplicated to the one in bootmem.h */
17707 extern unsigned long max_pfn;
17708-extern unsigned long phys_base;
17709+extern const unsigned long phys_base;
17710
17711-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17712+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17713 {
17714 unsigned long y = x - __START_KERNEL_map;
17715
17716diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17717index cd6e1610..70f4418 100644
17718--- a/arch/x86/include/asm/paravirt.h
17719+++ b/arch/x86/include/asm/paravirt.h
17720@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17721 return (pmd_t) { ret };
17722 }
17723
17724-static inline pmdval_t pmd_val(pmd_t pmd)
17725+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17726 {
17727 pmdval_t ret;
17728
17729@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17730 val);
17731 }
17732
17733+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17734+{
17735+ pgdval_t val = native_pgd_val(pgd);
17736+
17737+ if (sizeof(pgdval_t) > sizeof(long))
17738+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17739+ val, (u64)val >> 32);
17740+ else
17741+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17742+ val);
17743+}
17744+
17745 static inline void pgd_clear(pgd_t *pgdp)
17746 {
17747 set_pgd(pgdp, __pgd(0));
17748@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17749 pv_mmu_ops.set_fixmap(idx, phys, flags);
17750 }
17751
17752+#ifdef CONFIG_PAX_KERNEXEC
17753+static inline unsigned long pax_open_kernel(void)
17754+{
17755+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17756+}
17757+
17758+static inline unsigned long pax_close_kernel(void)
17759+{
17760+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17761+}
17762+#else
17763+static inline unsigned long pax_open_kernel(void) { return 0; }
17764+static inline unsigned long pax_close_kernel(void) { return 0; }
17765+#endif
17766+
17767 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17768
17769 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17770@@ -906,7 +933,7 @@ extern void default_banner(void);
17771
17772 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17773 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17774-#define PARA_INDIRECT(addr) *%cs:addr
17775+#define PARA_INDIRECT(addr) *%ss:addr
17776 #endif
17777
17778 #define INTERRUPT_RETURN \
17779@@ -981,6 +1008,21 @@ extern void default_banner(void);
17780 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17781 CLBR_NONE, \
17782 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17783+
17784+#define GET_CR0_INTO_RDI \
17785+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17786+ mov %rax,%rdi
17787+
17788+#define SET_RDI_INTO_CR0 \
17789+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17790+
17791+#define GET_CR3_INTO_RDI \
17792+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17793+ mov %rax,%rdi
17794+
17795+#define SET_RDI_INTO_CR3 \
17796+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17797+
17798 #endif /* CONFIG_X86_32 */
17799
17800 #endif /* __ASSEMBLY__ */
17801diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17802index 7549b8b..f0edfda 100644
17803--- a/arch/x86/include/asm/paravirt_types.h
17804+++ b/arch/x86/include/asm/paravirt_types.h
17805@@ -84,7 +84,7 @@ struct pv_init_ops {
17806 */
17807 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17808 unsigned long addr, unsigned len);
17809-};
17810+} __no_const __no_randomize_layout;
17811
17812
17813 struct pv_lazy_ops {
17814@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17815 void (*enter)(void);
17816 void (*leave)(void);
17817 void (*flush)(void);
17818-};
17819+} __no_randomize_layout;
17820
17821 struct pv_time_ops {
17822 unsigned long long (*sched_clock)(void);
17823 unsigned long long (*steal_clock)(int cpu);
17824 unsigned long (*get_tsc_khz)(void);
17825-};
17826+} __no_const __no_randomize_layout;
17827
17828 struct pv_cpu_ops {
17829 /* hooks for various privileged instructions */
17830@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17831
17832 void (*start_context_switch)(struct task_struct *prev);
17833 void (*end_context_switch)(struct task_struct *next);
17834-};
17835+} __no_const __no_randomize_layout;
17836
17837 struct pv_irq_ops {
17838 /*
17839@@ -215,7 +215,7 @@ struct pv_irq_ops {
17840 #ifdef CONFIG_X86_64
17841 void (*adjust_exception_frame)(void);
17842 #endif
17843-};
17844+} __no_randomize_layout;
17845
17846 struct pv_apic_ops {
17847 #ifdef CONFIG_X86_LOCAL_APIC
17848@@ -223,7 +223,7 @@ struct pv_apic_ops {
17849 unsigned long start_eip,
17850 unsigned long start_esp);
17851 #endif
17852-};
17853+} __no_const __no_randomize_layout;
17854
17855 struct pv_mmu_ops {
17856 unsigned long (*read_cr2)(void);
17857@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17858 struct paravirt_callee_save make_pud;
17859
17860 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17861+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17862 #endif /* PAGETABLE_LEVELS == 4 */
17863 #endif /* PAGETABLE_LEVELS >= 3 */
17864
17865@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17866 an mfn. We can tell which is which from the index. */
17867 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17868 phys_addr_t phys, pgprot_t flags);
17869-};
17870+
17871+#ifdef CONFIG_PAX_KERNEXEC
17872+ unsigned long (*pax_open_kernel)(void);
17873+ unsigned long (*pax_close_kernel)(void);
17874+#endif
17875+
17876+} __no_randomize_layout;
17877
17878 struct arch_spinlock;
17879 #ifdef CONFIG_SMP
17880@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17881 struct pv_lock_ops {
17882 struct paravirt_callee_save lock_spinning;
17883 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17884-};
17885+} __no_randomize_layout;
17886
17887 /* This contains all the paravirt structures: we get a convenient
17888 * number for each function using the offset which we use to indicate
17889- * what to patch. */
17890+ * what to patch.
17891+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17892+ */
17893+
17894 struct paravirt_patch_template {
17895 struct pv_init_ops pv_init_ops;
17896 struct pv_time_ops pv_time_ops;
17897@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17898 struct pv_apic_ops pv_apic_ops;
17899 struct pv_mmu_ops pv_mmu_ops;
17900 struct pv_lock_ops pv_lock_ops;
17901-};
17902+} __no_randomize_layout;
17903
17904 extern struct pv_info pv_info;
17905 extern struct pv_init_ops pv_init_ops;
17906diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17907index c4412e9..90e88c5 100644
17908--- a/arch/x86/include/asm/pgalloc.h
17909+++ b/arch/x86/include/asm/pgalloc.h
17910@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17911 pmd_t *pmd, pte_t *pte)
17912 {
17913 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17914+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17915+}
17916+
17917+static inline void pmd_populate_user(struct mm_struct *mm,
17918+ pmd_t *pmd, pte_t *pte)
17919+{
17920+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17921 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17922 }
17923
17924@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17925
17926 #ifdef CONFIG_X86_PAE
17927 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17928+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17929+{
17930+ pud_populate(mm, pudp, pmd);
17931+}
17932 #else /* !CONFIG_X86_PAE */
17933 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17934 {
17935 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17936 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17937 }
17938+
17939+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17940+{
17941+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17942+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17943+}
17944 #endif /* CONFIG_X86_PAE */
17945
17946 #if PAGETABLE_LEVELS > 3
17947@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17948 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17949 }
17950
17951+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17952+{
17953+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17954+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17955+}
17956+
17957 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17958 {
17959 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17960diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17961index 206a87f..1623b06 100644
17962--- a/arch/x86/include/asm/pgtable-2level.h
17963+++ b/arch/x86/include/asm/pgtable-2level.h
17964@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17965
17966 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17967 {
17968+ pax_open_kernel();
17969 *pmdp = pmd;
17970+ pax_close_kernel();
17971 }
17972
17973 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17974diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17975index 81bb91b..9392125 100644
17976--- a/arch/x86/include/asm/pgtable-3level.h
17977+++ b/arch/x86/include/asm/pgtable-3level.h
17978@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17979
17980 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17981 {
17982+ pax_open_kernel();
17983 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17984+ pax_close_kernel();
17985 }
17986
17987 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17988 {
17989+ pax_open_kernel();
17990 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17991+ pax_close_kernel();
17992 }
17993
17994 /*
17995diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17996index aa97a07..5c53c32 100644
17997--- a/arch/x86/include/asm/pgtable.h
17998+++ b/arch/x86/include/asm/pgtable.h
17999@@ -46,6 +46,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18000
18001 #ifndef __PAGETABLE_PUD_FOLDED
18002 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
18003+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
18004 #define pgd_clear(pgd) native_pgd_clear(pgd)
18005 #endif
18006
18007@@ -83,12 +84,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
18008
18009 #define arch_end_context_switch(prev) do {} while(0)
18010
18011+#define pax_open_kernel() native_pax_open_kernel()
18012+#define pax_close_kernel() native_pax_close_kernel()
18013 #endif /* CONFIG_PARAVIRT */
18014
18015+#define __HAVE_ARCH_PAX_OPEN_KERNEL
18016+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
18017+
18018+#ifdef CONFIG_PAX_KERNEXEC
18019+static inline unsigned long native_pax_open_kernel(void)
18020+{
18021+ unsigned long cr0;
18022+
18023+ preempt_disable();
18024+ barrier();
18025+ cr0 = read_cr0() ^ X86_CR0_WP;
18026+ BUG_ON(cr0 & X86_CR0_WP);
18027+ write_cr0(cr0);
18028+ barrier();
18029+ return cr0 ^ X86_CR0_WP;
18030+}
18031+
18032+static inline unsigned long native_pax_close_kernel(void)
18033+{
18034+ unsigned long cr0;
18035+
18036+ barrier();
18037+ cr0 = read_cr0() ^ X86_CR0_WP;
18038+ BUG_ON(!(cr0 & X86_CR0_WP));
18039+ write_cr0(cr0);
18040+ barrier();
18041+ preempt_enable_no_resched();
18042+ return cr0 ^ X86_CR0_WP;
18043+}
18044+#else
18045+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18046+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18047+#endif
18048+
18049 /*
18050 * The following only work if pte_present() is true.
18051 * Undefined behaviour if not..
18052 */
18053+static inline int pte_user(pte_t pte)
18054+{
18055+ return pte_val(pte) & _PAGE_USER;
18056+}
18057+
18058 static inline int pte_dirty(pte_t pte)
18059 {
18060 return pte_flags(pte) & _PAGE_DIRTY;
18061@@ -155,6 +197,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18062 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18063 }
18064
18065+static inline unsigned long pgd_pfn(pgd_t pgd)
18066+{
18067+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18068+}
18069+
18070 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18071
18072 static inline int pmd_large(pmd_t pte)
18073@@ -208,9 +255,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18074 return pte_clear_flags(pte, _PAGE_RW);
18075 }
18076
18077+static inline pte_t pte_mkread(pte_t pte)
18078+{
18079+ return __pte(pte_val(pte) | _PAGE_USER);
18080+}
18081+
18082 static inline pte_t pte_mkexec(pte_t pte)
18083 {
18084- return pte_clear_flags(pte, _PAGE_NX);
18085+#ifdef CONFIG_X86_PAE
18086+ if (__supported_pte_mask & _PAGE_NX)
18087+ return pte_clear_flags(pte, _PAGE_NX);
18088+ else
18089+#endif
18090+ return pte_set_flags(pte, _PAGE_USER);
18091+}
18092+
18093+static inline pte_t pte_exprotect(pte_t pte)
18094+{
18095+#ifdef CONFIG_X86_PAE
18096+ if (__supported_pte_mask & _PAGE_NX)
18097+ return pte_set_flags(pte, _PAGE_NX);
18098+ else
18099+#endif
18100+ return pte_clear_flags(pte, _PAGE_USER);
18101 }
18102
18103 static inline pte_t pte_mkdirty(pte_t pte)
18104@@ -440,6 +507,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18105 #endif
18106
18107 #ifndef __ASSEMBLY__
18108+
18109+#ifdef CONFIG_PAX_PER_CPU_PGD
18110+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18111+enum cpu_pgd_type {kernel = 0, user = 1};
18112+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18113+{
18114+ return cpu_pgd[cpu][type];
18115+}
18116+#endif
18117+
18118 #include <linux/mm_types.h>
18119 #include <linux/mmdebug.h>
18120 #include <linux/log2.h>
18121@@ -586,7 +663,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18122 * Currently stuck as a macro due to indirect forward reference to
18123 * linux/mmzone.h's __section_mem_map_addr() definition:
18124 */
18125-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18126+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18127
18128 /* Find an entry in the second-level page table.. */
18129 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18130@@ -626,7 +703,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18131 * Currently stuck as a macro due to indirect forward reference to
18132 * linux/mmzone.h's __section_mem_map_addr() definition:
18133 */
18134-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18135+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18136
18137 /* to find an entry in a page-table-directory. */
18138 static inline unsigned long pud_index(unsigned long address)
18139@@ -641,7 +718,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18140
18141 static inline int pgd_bad(pgd_t pgd)
18142 {
18143- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18144+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18145 }
18146
18147 static inline int pgd_none(pgd_t pgd)
18148@@ -664,7 +741,12 @@ static inline int pgd_none(pgd_t pgd)
18149 * pgd_offset() returns a (pgd_t *)
18150 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18151 */
18152-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18153+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18154+
18155+#ifdef CONFIG_PAX_PER_CPU_PGD
18156+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18157+#endif
18158+
18159 /*
18160 * a shortcut which implies the use of the kernel's pgd, instead
18161 * of a process's
18162@@ -675,6 +757,23 @@ static inline int pgd_none(pgd_t pgd)
18163 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18164 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18165
18166+#ifdef CONFIG_X86_32
18167+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18168+#else
18169+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18170+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18171+
18172+#ifdef CONFIG_PAX_MEMORY_UDEREF
18173+#ifdef __ASSEMBLY__
18174+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18175+#else
18176+extern unsigned long pax_user_shadow_base;
18177+extern pgdval_t clone_pgd_mask;
18178+#endif
18179+#endif
18180+
18181+#endif
18182+
18183 #ifndef __ASSEMBLY__
18184
18185 extern int direct_gbpages;
18186@@ -841,11 +940,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18187 * dst and src can be on the same page, but the range must not overlap,
18188 * and must not cross a page boundary.
18189 */
18190-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18191+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18192 {
18193- memcpy(dst, src, count * sizeof(pgd_t));
18194+ pax_open_kernel();
18195+ while (count--)
18196+ *dst++ = *src++;
18197+ pax_close_kernel();
18198 }
18199
18200+#ifdef CONFIG_PAX_PER_CPU_PGD
18201+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18202+#endif
18203+
18204+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18205+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18206+#else
18207+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18208+#endif
18209+
18210 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18211 static inline int page_level_shift(enum pg_level level)
18212 {
18213diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18214index b6c0b40..3535d47 100644
18215--- a/arch/x86/include/asm/pgtable_32.h
18216+++ b/arch/x86/include/asm/pgtable_32.h
18217@@ -25,9 +25,6 @@
18218 struct mm_struct;
18219 struct vm_area_struct;
18220
18221-extern pgd_t swapper_pg_dir[1024];
18222-extern pgd_t initial_page_table[1024];
18223-
18224 static inline void pgtable_cache_init(void) { }
18225 static inline void check_pgt_cache(void) { }
18226 void paging_init(void);
18227@@ -45,6 +42,12 @@ void paging_init(void);
18228 # include <asm/pgtable-2level.h>
18229 #endif
18230
18231+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18232+extern pgd_t initial_page_table[PTRS_PER_PGD];
18233+#ifdef CONFIG_X86_PAE
18234+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18235+#endif
18236+
18237 #if defined(CONFIG_HIGHPTE)
18238 #define pte_offset_map(dir, address) \
18239 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18240@@ -59,12 +62,17 @@ void paging_init(void);
18241 /* Clear a kernel PTE and flush it from the TLB */
18242 #define kpte_clear_flush(ptep, vaddr) \
18243 do { \
18244+ pax_open_kernel(); \
18245 pte_clear(&init_mm, (vaddr), (ptep)); \
18246+ pax_close_kernel(); \
18247 __flush_tlb_one((vaddr)); \
18248 } while (0)
18249
18250 #endif /* !__ASSEMBLY__ */
18251
18252+#define HAVE_ARCH_UNMAPPED_AREA
18253+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18254+
18255 /*
18256 * kern_addr_valid() is (1) for FLATMEM and (0) for
18257 * SPARSEMEM and DISCONTIGMEM
18258diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18259index ed5903b..c7fe163 100644
18260--- a/arch/x86/include/asm/pgtable_32_types.h
18261+++ b/arch/x86/include/asm/pgtable_32_types.h
18262@@ -8,7 +8,7 @@
18263 */
18264 #ifdef CONFIG_X86_PAE
18265 # include <asm/pgtable-3level_types.h>
18266-# define PMD_SIZE (1UL << PMD_SHIFT)
18267+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18268 # define PMD_MASK (~(PMD_SIZE - 1))
18269 #else
18270 # include <asm/pgtable-2level_types.h>
18271@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18272 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18273 #endif
18274
18275+#ifdef CONFIG_PAX_KERNEXEC
18276+#ifndef __ASSEMBLY__
18277+extern unsigned char MODULES_EXEC_VADDR[];
18278+extern unsigned char MODULES_EXEC_END[];
18279+#endif
18280+#include <asm/boot.h>
18281+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18282+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18283+#else
18284+#define ktla_ktva(addr) (addr)
18285+#define ktva_ktla(addr) (addr)
18286+#endif
18287+
18288 #define MODULES_VADDR VMALLOC_START
18289 #define MODULES_END VMALLOC_END
18290 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18291diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18292index 4572b2f..4430113 100644
18293--- a/arch/x86/include/asm/pgtable_64.h
18294+++ b/arch/x86/include/asm/pgtable_64.h
18295@@ -16,11 +16,16 @@
18296
18297 extern pud_t level3_kernel_pgt[512];
18298 extern pud_t level3_ident_pgt[512];
18299+extern pud_t level3_vmalloc_start_pgt[512];
18300+extern pud_t level3_vmalloc_end_pgt[512];
18301+extern pud_t level3_vmemmap_pgt[512];
18302+extern pud_t level2_vmemmap_pgt[512];
18303 extern pmd_t level2_kernel_pgt[512];
18304 extern pmd_t level2_fixmap_pgt[512];
18305-extern pmd_t level2_ident_pgt[512];
18306+extern pmd_t level2_ident_pgt[512*2];
18307 extern pte_t level1_fixmap_pgt[512];
18308-extern pgd_t init_level4_pgt[];
18309+extern pte_t level1_vsyscall_pgt[512];
18310+extern pgd_t init_level4_pgt[512];
18311
18312 #define swapper_pg_dir init_level4_pgt
18313
18314@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18315
18316 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18317 {
18318+ pax_open_kernel();
18319 *pmdp = pmd;
18320+ pax_close_kernel();
18321 }
18322
18323 static inline void native_pmd_clear(pmd_t *pmd)
18324@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18325
18326 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18327 {
18328+ pax_open_kernel();
18329 *pudp = pud;
18330+ pax_close_kernel();
18331 }
18332
18333 static inline void native_pud_clear(pud_t *pud)
18334@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18335
18336 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18337 {
18338+ pax_open_kernel();
18339+ *pgdp = pgd;
18340+ pax_close_kernel();
18341+}
18342+
18343+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18344+{
18345 *pgdp = pgd;
18346 }
18347
18348diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18349index 7166e25..baaa6fe 100644
18350--- a/arch/x86/include/asm/pgtable_64_types.h
18351+++ b/arch/x86/include/asm/pgtable_64_types.h
18352@@ -61,9 +61,14 @@ typedef struct { pteval_t pte; } pte_t;
18353 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18354 #define MODULES_END _AC(0xffffffffff000000, UL)
18355 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18356+#define MODULES_EXEC_VADDR MODULES_VADDR
18357+#define MODULES_EXEC_END MODULES_END
18358 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18359 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18360
18361+#define ktla_ktva(addr) (addr)
18362+#define ktva_ktla(addr) (addr)
18363+
18364 #define EARLY_DYNAMIC_PAGE_TABLES 64
18365
18366 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18367diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18368index 0778964..0e94758 100644
18369--- a/arch/x86/include/asm/pgtable_types.h
18370+++ b/arch/x86/include/asm/pgtable_types.h
18371@@ -110,8 +110,10 @@
18372
18373 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18374 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18375-#else
18376+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18377 #define _PAGE_NX (_AT(pteval_t, 0))
18378+#else
18379+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18380 #endif
18381
18382 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
18383@@ -150,6 +152,9 @@
18384 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18385 _PAGE_ACCESSED)
18386
18387+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18388+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18389+
18390 #define __PAGE_KERNEL_EXEC \
18391 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18392 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18393@@ -160,7 +165,7 @@
18394 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
18395 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
18396 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
18397-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18398+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18399 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18400 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
18401 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18402@@ -217,7 +222,7 @@
18403 #ifdef CONFIG_X86_64
18404 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18405 #else
18406-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18407+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18408 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18409 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18410 #endif
18411@@ -256,7 +261,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18412 {
18413 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18414 }
18415+#endif
18416
18417+#if PAGETABLE_LEVELS == 3
18418+#include <asm-generic/pgtable-nopud.h>
18419+#endif
18420+
18421+#if PAGETABLE_LEVELS == 2
18422+#include <asm-generic/pgtable-nopmd.h>
18423+#endif
18424+
18425+#ifndef __ASSEMBLY__
18426 #if PAGETABLE_LEVELS > 3
18427 typedef struct { pudval_t pud; } pud_t;
18428
18429@@ -270,8 +285,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18430 return pud.pud;
18431 }
18432 #else
18433-#include <asm-generic/pgtable-nopud.h>
18434-
18435 static inline pudval_t native_pud_val(pud_t pud)
18436 {
18437 return native_pgd_val(pud.pgd);
18438@@ -291,8 +304,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18439 return pmd.pmd;
18440 }
18441 #else
18442-#include <asm-generic/pgtable-nopmd.h>
18443-
18444 static inline pmdval_t native_pmd_val(pmd_t pmd)
18445 {
18446 return native_pgd_val(pmd.pud.pgd);
18447@@ -346,7 +357,6 @@ typedef struct page *pgtable_t;
18448
18449 extern pteval_t __supported_pte_mask;
18450 extern void set_nx(void);
18451-extern int nx_enabled;
18452
18453 #define pgprot_writecombine pgprot_writecombine
18454 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18455diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18456index 4008734..48f0d81 100644
18457--- a/arch/x86/include/asm/preempt.h
18458+++ b/arch/x86/include/asm/preempt.h
18459@@ -87,7 +87,7 @@ static __always_inline void __preempt_count_sub(int val)
18460 */
18461 static __always_inline bool __preempt_count_dec_and_test(void)
18462 {
18463- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18464+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18465 }
18466
18467 /*
18468diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18469index eb71ec7..f06532a 100644
18470--- a/arch/x86/include/asm/processor.h
18471+++ b/arch/x86/include/asm/processor.h
18472@@ -127,7 +127,7 @@ struct cpuinfo_x86 {
18473 /* Index into per_cpu list: */
18474 u16 cpu_index;
18475 u32 microcode;
18476-} __attribute__((__aligned__(SMP_CACHE_BYTES)));
18477+} __attribute__((__aligned__(SMP_CACHE_BYTES))) __randomize_layout;
18478
18479 #define X86_VENDOR_INTEL 0
18480 #define X86_VENDOR_CYRIX 1
18481@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18482 : "memory");
18483 }
18484
18485+/* invpcid (%rdx),%rax */
18486+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18487+
18488+#define INVPCID_SINGLE_ADDRESS 0UL
18489+#define INVPCID_SINGLE_CONTEXT 1UL
18490+#define INVPCID_ALL_GLOBAL 2UL
18491+#define INVPCID_ALL_NONGLOBAL 3UL
18492+
18493+#define PCID_KERNEL 0UL
18494+#define PCID_USER 1UL
18495+#define PCID_NOFLUSH (1UL << 63)
18496+
18497 static inline void load_cr3(pgd_t *pgdir)
18498 {
18499- write_cr3(__pa(pgdir));
18500+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18501 }
18502
18503 #ifdef CONFIG_X86_32
18504@@ -282,7 +294,7 @@ struct tss_struct {
18505
18506 } ____cacheline_aligned;
18507
18508-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18509+extern struct tss_struct init_tss[NR_CPUS];
18510
18511 /*
18512 * Save the original ist values for checking stack pointers during debugging
18513@@ -478,6 +490,7 @@ struct thread_struct {
18514 unsigned short ds;
18515 unsigned short fsindex;
18516 unsigned short gsindex;
18517+ unsigned short ss;
18518 #endif
18519 #ifdef CONFIG_X86_32
18520 unsigned long ip;
18521@@ -587,29 +600,8 @@ static inline void load_sp0(struct tss_struct *tss,
18522 extern unsigned long mmu_cr4_features;
18523 extern u32 *trampoline_cr4_features;
18524
18525-static inline void set_in_cr4(unsigned long mask)
18526-{
18527- unsigned long cr4;
18528-
18529- mmu_cr4_features |= mask;
18530- if (trampoline_cr4_features)
18531- *trampoline_cr4_features = mmu_cr4_features;
18532- cr4 = read_cr4();
18533- cr4 |= mask;
18534- write_cr4(cr4);
18535-}
18536-
18537-static inline void clear_in_cr4(unsigned long mask)
18538-{
18539- unsigned long cr4;
18540-
18541- mmu_cr4_features &= ~mask;
18542- if (trampoline_cr4_features)
18543- *trampoline_cr4_features = mmu_cr4_features;
18544- cr4 = read_cr4();
18545- cr4 &= ~mask;
18546- write_cr4(cr4);
18547-}
18548+extern void set_in_cr4(unsigned long mask);
18549+extern void clear_in_cr4(unsigned long mask);
18550
18551 typedef struct {
18552 unsigned long seg;
18553@@ -837,11 +829,18 @@ static inline void spin_lock_prefetch(const void *x)
18554 */
18555 #define TASK_SIZE PAGE_OFFSET
18556 #define TASK_SIZE_MAX TASK_SIZE
18557+
18558+#ifdef CONFIG_PAX_SEGMEXEC
18559+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18560+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18561+#else
18562 #define STACK_TOP TASK_SIZE
18563-#define STACK_TOP_MAX STACK_TOP
18564+#endif
18565+
18566+#define STACK_TOP_MAX TASK_SIZE
18567
18568 #define INIT_THREAD { \
18569- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18570+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18571 .vm86_info = NULL, \
18572 .sysenter_cs = __KERNEL_CS, \
18573 .io_bitmap_ptr = NULL, \
18574@@ -855,7 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
18575 */
18576 #define INIT_TSS { \
18577 .x86_tss = { \
18578- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18579+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18580 .ss0 = __KERNEL_DS, \
18581 .ss1 = __KERNEL_CS, \
18582 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18583@@ -866,11 +865,7 @@ static inline void spin_lock_prefetch(const void *x)
18584 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18585
18586 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18587-#define KSTK_TOP(info) \
18588-({ \
18589- unsigned long *__ptr = (unsigned long *)(info); \
18590- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18591-})
18592+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18593
18594 /*
18595 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18596@@ -885,7 +880,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18597 #define task_pt_regs(task) \
18598 ({ \
18599 struct pt_regs *__regs__; \
18600- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18601+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18602 __regs__ - 1; \
18603 })
18604
18605@@ -895,13 +890,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18606 /*
18607 * User space process size. 47bits minus one guard page.
18608 */
18609-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18610+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18611
18612 /* This decides where the kernel will search for a free chunk of vm
18613 * space during mmap's.
18614 */
18615 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18616- 0xc0000000 : 0xFFFFe000)
18617+ 0xc0000000 : 0xFFFFf000)
18618
18619 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18620 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18621@@ -912,11 +907,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18622 #define STACK_TOP_MAX TASK_SIZE_MAX
18623
18624 #define INIT_THREAD { \
18625- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18626+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18627 }
18628
18629 #define INIT_TSS { \
18630- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18631+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18632 }
18633
18634 /*
18635@@ -944,6 +939,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18636 */
18637 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18638
18639+#ifdef CONFIG_PAX_SEGMEXEC
18640+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18641+#endif
18642+
18643 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18644
18645 /* Get/set a process' ability to use the timestamp counter instruction */
18646@@ -970,7 +969,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18647 return 0;
18648 }
18649
18650-extern unsigned long arch_align_stack(unsigned long sp);
18651+#define arch_align_stack(x) ((x) & ~0xfUL)
18652 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18653
18654 void default_idle(void);
18655@@ -980,6 +979,6 @@ bool xen_set_default_idle(void);
18656 #define xen_set_default_idle 0
18657 #endif
18658
18659-void stop_this_cpu(void *dummy);
18660+void stop_this_cpu(void *dummy) __noreturn;
18661 void df_debug(struct pt_regs *regs, long error_code);
18662 #endif /* _ASM_X86_PROCESSOR_H */
18663diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18664index 86fc2bb..bd5049a 100644
18665--- a/arch/x86/include/asm/ptrace.h
18666+++ b/arch/x86/include/asm/ptrace.h
18667@@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18668 }
18669
18670 /*
18671- * user_mode_vm(regs) determines whether a register set came from user mode.
18672+ * user_mode(regs) determines whether a register set came from user mode.
18673 * This is true if V8086 mode was enabled OR if the register set was from
18674 * protected mode with RPL-3 CS value. This tricky test checks that with
18675 * one comparison. Many places in the kernel can bypass this full check
18676- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18677+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18678+ * be used.
18679 */
18680-static inline int user_mode(struct pt_regs *regs)
18681+static inline int user_mode_novm(struct pt_regs *regs)
18682 {
18683 #ifdef CONFIG_X86_32
18684 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18685 #else
18686- return !!(regs->cs & 3);
18687+ return !!(regs->cs & SEGMENT_RPL_MASK);
18688 #endif
18689 }
18690
18691-static inline int user_mode_vm(struct pt_regs *regs)
18692+static inline int user_mode(struct pt_regs *regs)
18693 {
18694 #ifdef CONFIG_X86_32
18695 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18696 USER_RPL;
18697 #else
18698- return user_mode(regs);
18699+ return user_mode_novm(regs);
18700 #endif
18701 }
18702
18703@@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18704 #ifdef CONFIG_X86_64
18705 static inline bool user_64bit_mode(struct pt_regs *regs)
18706 {
18707+ unsigned long cs = regs->cs & 0xffff;
18708 #ifndef CONFIG_PARAVIRT
18709 /*
18710 * On non-paravirt systems, this is the only long mode CPL 3
18711 * selector. We do not allow long mode selectors in the LDT.
18712 */
18713- return regs->cs == __USER_CS;
18714+ return cs == __USER_CS;
18715 #else
18716 /* Headers are too twisted for this to go in paravirt.h. */
18717- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18718+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18719 #endif
18720 }
18721
18722@@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18723 * Traps from the kernel do not save sp and ss.
18724 * Use the helper function to retrieve sp.
18725 */
18726- if (offset == offsetof(struct pt_regs, sp) &&
18727- regs->cs == __KERNEL_CS)
18728- return kernel_stack_pointer(regs);
18729+ if (offset == offsetof(struct pt_regs, sp)) {
18730+ unsigned long cs = regs->cs & 0xffff;
18731+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18732+ return kernel_stack_pointer(regs);
18733+ }
18734 #endif
18735 return *(unsigned long *)((unsigned long)regs + offset);
18736 }
18737diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18738index ae0e241..e80b10b 100644
18739--- a/arch/x86/include/asm/qrwlock.h
18740+++ b/arch/x86/include/asm/qrwlock.h
18741@@ -7,8 +7,8 @@
18742 #define queue_write_unlock queue_write_unlock
18743 static inline void queue_write_unlock(struct qrwlock *lock)
18744 {
18745- barrier();
18746- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18747+ barrier();
18748+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18749 }
18750 #endif
18751
18752diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18753index 9c6b890..5305f53 100644
18754--- a/arch/x86/include/asm/realmode.h
18755+++ b/arch/x86/include/asm/realmode.h
18756@@ -22,16 +22,14 @@ struct real_mode_header {
18757 #endif
18758 /* APM/BIOS reboot */
18759 u32 machine_real_restart_asm;
18760-#ifdef CONFIG_X86_64
18761 u32 machine_real_restart_seg;
18762-#endif
18763 };
18764
18765 /* This must match data at trampoline_32/64.S */
18766 struct trampoline_header {
18767 #ifdef CONFIG_X86_32
18768 u32 start;
18769- u16 gdt_pad;
18770+ u16 boot_cs;
18771 u16 gdt_limit;
18772 u32 gdt_base;
18773 #else
18774diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18775index a82c4f1..ac45053 100644
18776--- a/arch/x86/include/asm/reboot.h
18777+++ b/arch/x86/include/asm/reboot.h
18778@@ -6,13 +6,13 @@
18779 struct pt_regs;
18780
18781 struct machine_ops {
18782- void (*restart)(char *cmd);
18783- void (*halt)(void);
18784- void (*power_off)(void);
18785+ void (* __noreturn restart)(char *cmd);
18786+ void (* __noreturn halt)(void);
18787+ void (* __noreturn power_off)(void);
18788 void (*shutdown)(void);
18789 void (*crash_shutdown)(struct pt_regs *);
18790- void (*emergency_restart)(void);
18791-};
18792+ void (* __noreturn emergency_restart)(void);
18793+} __no_const;
18794
18795 extern struct machine_ops machine_ops;
18796
18797diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18798index 8f7866a..e442f20 100644
18799--- a/arch/x86/include/asm/rmwcc.h
18800+++ b/arch/x86/include/asm/rmwcc.h
18801@@ -3,7 +3,34 @@
18802
18803 #ifdef CC_HAVE_ASM_GOTO
18804
18805-#define __GEN_RMWcc(fullop, var, cc, ...) \
18806+#ifdef CONFIG_PAX_REFCOUNT
18807+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18808+do { \
18809+ asm_volatile_goto (fullop \
18810+ ";jno 0f\n" \
18811+ fullantiop \
18812+ ";int $4\n0:\n" \
18813+ _ASM_EXTABLE(0b, 0b) \
18814+ ";j" cc " %l[cc_label]" \
18815+ : : "m" (var), ## __VA_ARGS__ \
18816+ : "memory" : cc_label); \
18817+ return 0; \
18818+cc_label: \
18819+ return 1; \
18820+} while (0)
18821+#else
18822+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18823+do { \
18824+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18825+ : : "m" (var), ## __VA_ARGS__ \
18826+ : "memory" : cc_label); \
18827+ return 0; \
18828+cc_label: \
18829+ return 1; \
18830+} while (0)
18831+#endif
18832+
18833+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18834 do { \
18835 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18836 : : "m" (var), ## __VA_ARGS__ \
18837@@ -13,15 +40,46 @@ cc_label: \
18838 return 1; \
18839 } while (0)
18840
18841-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18842- __GEN_RMWcc(op " " arg0, var, cc)
18843+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18844+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18845
18846-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18847- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18848+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18849+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18850+
18851+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18852+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18853+
18854+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18855+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18856
18857 #else /* !CC_HAVE_ASM_GOTO */
18858
18859-#define __GEN_RMWcc(fullop, var, cc, ...) \
18860+#ifdef CONFIG_PAX_REFCOUNT
18861+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18862+do { \
18863+ char c; \
18864+ asm volatile (fullop \
18865+ ";jno 0f\n" \
18866+ fullantiop \
18867+ ";int $4\n0:\n" \
18868+ _ASM_EXTABLE(0b, 0b) \
18869+ "; set" cc " %1" \
18870+ : "+m" (var), "=qm" (c) \
18871+ : __VA_ARGS__ : "memory"); \
18872+ return c != 0; \
18873+} while (0)
18874+#else
18875+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18876+do { \
18877+ char c; \
18878+ asm volatile (fullop "; set" cc " %1" \
18879+ : "+m" (var), "=qm" (c) \
18880+ : __VA_ARGS__ : "memory"); \
18881+ return c != 0; \
18882+} while (0)
18883+#endif
18884+
18885+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18886 do { \
18887 char c; \
18888 asm volatile (fullop "; set" cc " %1" \
18889@@ -30,11 +88,17 @@ do { \
18890 return c != 0; \
18891 } while (0)
18892
18893-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18894- __GEN_RMWcc(op " " arg0, var, cc)
18895+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18896+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18897+
18898+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18899+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18900+
18901+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18902+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18903
18904-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18905- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18906+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18907+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18908
18909 #endif /* CC_HAVE_ASM_GOTO */
18910
18911diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18912index cad82c9..2e5c5c1 100644
18913--- a/arch/x86/include/asm/rwsem.h
18914+++ b/arch/x86/include/asm/rwsem.h
18915@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18916 {
18917 asm volatile("# beginning down_read\n\t"
18918 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18919+
18920+#ifdef CONFIG_PAX_REFCOUNT
18921+ "jno 0f\n"
18922+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18923+ "int $4\n0:\n"
18924+ _ASM_EXTABLE(0b, 0b)
18925+#endif
18926+
18927 /* adds 0x00000001 */
18928 " jns 1f\n"
18929 " call call_rwsem_down_read_failed\n"
18930@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18931 "1:\n\t"
18932 " mov %1,%2\n\t"
18933 " add %3,%2\n\t"
18934+
18935+#ifdef CONFIG_PAX_REFCOUNT
18936+ "jno 0f\n"
18937+ "sub %3,%2\n"
18938+ "int $4\n0:\n"
18939+ _ASM_EXTABLE(0b, 0b)
18940+#endif
18941+
18942 " jle 2f\n\t"
18943 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18944 " jnz 1b\n\t"
18945@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18946 long tmp;
18947 asm volatile("# beginning down_write\n\t"
18948 LOCK_PREFIX " xadd %1,(%2)\n\t"
18949+
18950+#ifdef CONFIG_PAX_REFCOUNT
18951+ "jno 0f\n"
18952+ "mov %1,(%2)\n"
18953+ "int $4\n0:\n"
18954+ _ASM_EXTABLE(0b, 0b)
18955+#endif
18956+
18957 /* adds 0xffff0001, returns the old value */
18958 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18959 /* was the active mask 0 before? */
18960@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18961 long tmp;
18962 asm volatile("# beginning __up_read\n\t"
18963 LOCK_PREFIX " xadd %1,(%2)\n\t"
18964+
18965+#ifdef CONFIG_PAX_REFCOUNT
18966+ "jno 0f\n"
18967+ "mov %1,(%2)\n"
18968+ "int $4\n0:\n"
18969+ _ASM_EXTABLE(0b, 0b)
18970+#endif
18971+
18972 /* subtracts 1, returns the old value */
18973 " jns 1f\n\t"
18974 " call call_rwsem_wake\n" /* expects old value in %edx */
18975@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18976 long tmp;
18977 asm volatile("# beginning __up_write\n\t"
18978 LOCK_PREFIX " xadd %1,(%2)\n\t"
18979+
18980+#ifdef CONFIG_PAX_REFCOUNT
18981+ "jno 0f\n"
18982+ "mov %1,(%2)\n"
18983+ "int $4\n0:\n"
18984+ _ASM_EXTABLE(0b, 0b)
18985+#endif
18986+
18987 /* subtracts 0xffff0001, returns the old value */
18988 " jns 1f\n\t"
18989 " call call_rwsem_wake\n" /* expects old value in %edx */
18990@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18991 {
18992 asm volatile("# beginning __downgrade_write\n\t"
18993 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18994+
18995+#ifdef CONFIG_PAX_REFCOUNT
18996+ "jno 0f\n"
18997+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18998+ "int $4\n0:\n"
18999+ _ASM_EXTABLE(0b, 0b)
19000+#endif
19001+
19002 /*
19003 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
19004 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
19005@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
19006 */
19007 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
19008 {
19009- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
19010+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
19011+
19012+#ifdef CONFIG_PAX_REFCOUNT
19013+ "jno 0f\n"
19014+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
19015+ "int $4\n0:\n"
19016+ _ASM_EXTABLE(0b, 0b)
19017+#endif
19018+
19019 : "+m" (sem->count)
19020 : "er" (delta));
19021 }
19022@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
19023 */
19024 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
19025 {
19026- return delta + xadd(&sem->count, delta);
19027+ return delta + xadd_check_overflow(&sem->count, delta);
19028 }
19029
19030 #endif /* __KERNEL__ */
19031diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
19032index 6f1c3a8..7744f19 100644
19033--- a/arch/x86/include/asm/segment.h
19034+++ b/arch/x86/include/asm/segment.h
19035@@ -64,10 +64,15 @@
19036 * 26 - ESPFIX small SS
19037 * 27 - per-cpu [ offset to per-cpu data area ]
19038 * 28 - stack_canary-20 [ for stack protector ]
19039- * 29 - unused
19040- * 30 - unused
19041+ * 29 - PCI BIOS CS
19042+ * 30 - PCI BIOS DS
19043 * 31 - TSS for double fault handler
19044 */
19045+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
19046+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
19047+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
19048+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
19049+
19050 #define GDT_ENTRY_TLS_MIN 6
19051 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
19052
19053@@ -79,6 +84,8 @@
19054
19055 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
19056
19057+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
19058+
19059 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
19060
19061 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
19062@@ -104,6 +111,12 @@
19063 #define __KERNEL_STACK_CANARY 0
19064 #endif
19065
19066+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
19067+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19068+
19069+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
19070+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19071+
19072 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19073
19074 /*
19075@@ -141,7 +154,7 @@
19076 */
19077
19078 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
19079-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
19080+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19081
19082
19083 #else
19084@@ -165,6 +178,8 @@
19085 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
19086 #define __USER32_DS __USER_DS
19087
19088+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19089+
19090 #define GDT_ENTRY_TSS 8 /* needs two entries */
19091 #define GDT_ENTRY_LDT 10 /* needs two entries */
19092 #define GDT_ENTRY_TLS_MIN 12
19093@@ -173,6 +188,8 @@
19094 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
19095 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
19096
19097+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19098+
19099 /* TLS indexes for 64bit - hardcoded in arch_prctl */
19100 #define FS_TLS 0
19101 #define GS_TLS 1
19102@@ -180,12 +197,14 @@
19103 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
19104 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
19105
19106-#define GDT_ENTRIES 16
19107+#define GDT_ENTRIES 17
19108
19109 #endif
19110
19111 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19112+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19113 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19114+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19115 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
19116 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
19117 #ifndef CONFIG_PARAVIRT
19118@@ -268,7 +287,7 @@ static inline unsigned long get_limit(unsigned long segment)
19119 {
19120 unsigned long __limit;
19121 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
19122- return __limit + 1;
19123+ return __limit;
19124 }
19125
19126 #endif /* !__ASSEMBLY__ */
19127diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19128index 8d3120f..352b440 100644
19129--- a/arch/x86/include/asm/smap.h
19130+++ b/arch/x86/include/asm/smap.h
19131@@ -25,11 +25,40 @@
19132
19133 #include <asm/alternative-asm.h>
19134
19135+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19136+#define ASM_PAX_OPEN_USERLAND \
19137+ 661: jmp 663f; \
19138+ .pushsection .altinstr_replacement, "a" ; \
19139+ 662: pushq %rax; nop; \
19140+ .popsection ; \
19141+ .pushsection .altinstructions, "a" ; \
19142+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19143+ .popsection ; \
19144+ call __pax_open_userland; \
19145+ popq %rax; \
19146+ 663:
19147+
19148+#define ASM_PAX_CLOSE_USERLAND \
19149+ 661: jmp 663f; \
19150+ .pushsection .altinstr_replacement, "a" ; \
19151+ 662: pushq %rax; nop; \
19152+ .popsection; \
19153+ .pushsection .altinstructions, "a" ; \
19154+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19155+ .popsection; \
19156+ call __pax_close_userland; \
19157+ popq %rax; \
19158+ 663:
19159+#else
19160+#define ASM_PAX_OPEN_USERLAND
19161+#define ASM_PAX_CLOSE_USERLAND
19162+#endif
19163+
19164 #ifdef CONFIG_X86_SMAP
19165
19166 #define ASM_CLAC \
19167 661: ASM_NOP3 ; \
19168- .pushsection .altinstr_replacement, "ax" ; \
19169+ .pushsection .altinstr_replacement, "a" ; \
19170 662: __ASM_CLAC ; \
19171 .popsection ; \
19172 .pushsection .altinstructions, "a" ; \
19173@@ -38,7 +67,7 @@
19174
19175 #define ASM_STAC \
19176 661: ASM_NOP3 ; \
19177- .pushsection .altinstr_replacement, "ax" ; \
19178+ .pushsection .altinstr_replacement, "a" ; \
19179 662: __ASM_STAC ; \
19180 .popsection ; \
19181 .pushsection .altinstructions, "a" ; \
19182@@ -56,6 +85,37 @@
19183
19184 #include <asm/alternative.h>
19185
19186+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19187+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19188+
19189+extern void __pax_open_userland(void);
19190+static __always_inline unsigned long pax_open_userland(void)
19191+{
19192+
19193+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19194+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
19195+ :
19196+ : [open] "i" (__pax_open_userland)
19197+ : "memory", "rax");
19198+#endif
19199+
19200+ return 0;
19201+}
19202+
19203+extern void __pax_close_userland(void);
19204+static __always_inline unsigned long pax_close_userland(void)
19205+{
19206+
19207+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19208+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
19209+ :
19210+ : [close] "i" (__pax_close_userland)
19211+ : "memory", "rax");
19212+#endif
19213+
19214+ return 0;
19215+}
19216+
19217 #ifdef CONFIG_X86_SMAP
19218
19219 static __always_inline void clac(void)
19220diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19221index 8cd1cc3..827e09e 100644
19222--- a/arch/x86/include/asm/smp.h
19223+++ b/arch/x86/include/asm/smp.h
19224@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19225 /* cpus sharing the last level cache: */
19226 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19227 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19228-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19229+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19230
19231 static inline struct cpumask *cpu_sibling_mask(int cpu)
19232 {
19233@@ -78,7 +78,7 @@ struct smp_ops {
19234
19235 void (*send_call_func_ipi)(const struct cpumask *mask);
19236 void (*send_call_func_single_ipi)(int cpu);
19237-};
19238+} __no_const;
19239
19240 /* Globals due to paravirt */
19241 extern void set_cpu_sibling_map(int cpu);
19242@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
19243 extern int safe_smp_processor_id(void);
19244
19245 #elif defined(CONFIG_X86_64_SMP)
19246-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19247-
19248-#define stack_smp_processor_id() \
19249-({ \
19250- struct thread_info *ti; \
19251- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19252- ti->cpu; \
19253-})
19254+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19255+#define stack_smp_processor_id() raw_smp_processor_id()
19256 #define safe_smp_processor_id() smp_processor_id()
19257
19258 #endif
19259diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19260index 6a99859..03cb807 100644
19261--- a/arch/x86/include/asm/stackprotector.h
19262+++ b/arch/x86/include/asm/stackprotector.h
19263@@ -47,7 +47,7 @@
19264 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19265 */
19266 #define GDT_STACK_CANARY_INIT \
19267- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19268+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19269
19270 /*
19271 * Initialize the stackprotector canary value.
19272@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19273
19274 static inline void load_stack_canary_segment(void)
19275 {
19276-#ifdef CONFIG_X86_32
19277+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19278 asm volatile ("mov %0, %%gs" : : "r" (0));
19279 #endif
19280 }
19281diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19282index 70bbe39..4ae2bd4 100644
19283--- a/arch/x86/include/asm/stacktrace.h
19284+++ b/arch/x86/include/asm/stacktrace.h
19285@@ -11,28 +11,20 @@
19286
19287 extern int kstack_depth_to_print;
19288
19289-struct thread_info;
19290+struct task_struct;
19291 struct stacktrace_ops;
19292
19293-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19294- unsigned long *stack,
19295- unsigned long bp,
19296- const struct stacktrace_ops *ops,
19297- void *data,
19298- unsigned long *end,
19299- int *graph);
19300+typedef unsigned long walk_stack_t(struct task_struct *task,
19301+ void *stack_start,
19302+ unsigned long *stack,
19303+ unsigned long bp,
19304+ const struct stacktrace_ops *ops,
19305+ void *data,
19306+ unsigned long *end,
19307+ int *graph);
19308
19309-extern unsigned long
19310-print_context_stack(struct thread_info *tinfo,
19311- unsigned long *stack, unsigned long bp,
19312- const struct stacktrace_ops *ops, void *data,
19313- unsigned long *end, int *graph);
19314-
19315-extern unsigned long
19316-print_context_stack_bp(struct thread_info *tinfo,
19317- unsigned long *stack, unsigned long bp,
19318- const struct stacktrace_ops *ops, void *data,
19319- unsigned long *end, int *graph);
19320+extern walk_stack_t print_context_stack;
19321+extern walk_stack_t print_context_stack_bp;
19322
19323 /* Generic stack tracer with callbacks */
19324
19325@@ -40,7 +32,7 @@ struct stacktrace_ops {
19326 void (*address)(void *data, unsigned long address, int reliable);
19327 /* On negative return stop dumping */
19328 int (*stack)(void *data, char *name);
19329- walk_stack_t walk_stack;
19330+ walk_stack_t *walk_stack;
19331 };
19332
19333 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19334diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19335index d7f3b3b..3cc39f1 100644
19336--- a/arch/x86/include/asm/switch_to.h
19337+++ b/arch/x86/include/asm/switch_to.h
19338@@ -108,7 +108,7 @@ do { \
19339 "call __switch_to\n\t" \
19340 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19341 __switch_canary \
19342- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19343+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19344 "movq %%rax,%%rdi\n\t" \
19345 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19346 "jnz ret_from_fork\n\t" \
19347@@ -119,7 +119,7 @@ do { \
19348 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19349 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19350 [_tif_fork] "i" (_TIF_FORK), \
19351- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19352+ [thread_info] "m" (current_tinfo), \
19353 [current_task] "m" (current_task) \
19354 __switch_canary_iparam \
19355 : "memory", "cc" __EXTRA_CLOBBER)
19356diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19357index 547e344..6be1175 100644
19358--- a/arch/x86/include/asm/thread_info.h
19359+++ b/arch/x86/include/asm/thread_info.h
19360@@ -24,7 +24,6 @@ struct exec_domain;
19361 #include <linux/atomic.h>
19362
19363 struct thread_info {
19364- struct task_struct *task; /* main task structure */
19365 struct exec_domain *exec_domain; /* execution domain */
19366 __u32 flags; /* low level flags */
19367 __u32 status; /* thread synchronous flags */
19368@@ -33,13 +32,13 @@ struct thread_info {
19369 mm_segment_t addr_limit;
19370 struct restart_block restart_block;
19371 void __user *sysenter_return;
19372+ unsigned long lowest_stack;
19373 unsigned int sig_on_uaccess_error:1;
19374 unsigned int uaccess_err:1; /* uaccess failed */
19375 };
19376
19377-#define INIT_THREAD_INFO(tsk) \
19378+#define INIT_THREAD_INFO \
19379 { \
19380- .task = &tsk, \
19381 .exec_domain = &default_exec_domain, \
19382 .flags = 0, \
19383 .cpu = 0, \
19384@@ -50,7 +49,7 @@ struct thread_info {
19385 }, \
19386 }
19387
19388-#define init_thread_info (init_thread_union.thread_info)
19389+#define init_thread_info (init_thread_union.stack)
19390 #define init_stack (init_thread_union.stack)
19391
19392 #else /* !__ASSEMBLY__ */
19393@@ -91,6 +90,7 @@ struct thread_info {
19394 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19395 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19396 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19397+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19398
19399 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19400 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19401@@ -115,17 +115,18 @@ struct thread_info {
19402 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19403 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19404 #define _TIF_X32 (1 << TIF_X32)
19405+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19406
19407 /* work to do in syscall_trace_enter() */
19408 #define _TIF_WORK_SYSCALL_ENTRY \
19409 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19410 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19411- _TIF_NOHZ)
19412+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19413
19414 /* work to do in syscall_trace_leave() */
19415 #define _TIF_WORK_SYSCALL_EXIT \
19416 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19417- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19418+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19419
19420 /* work to do on interrupt/exception return */
19421 #define _TIF_WORK_MASK \
19422@@ -136,7 +137,7 @@ struct thread_info {
19423 /* work to do on any return to user space */
19424 #define _TIF_ALLWORK_MASK \
19425 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19426- _TIF_NOHZ)
19427+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19428
19429 /* Only used for 64 bit */
19430 #define _TIF_DO_NOTIFY_MASK \
19431@@ -151,7 +152,6 @@ struct thread_info {
19432 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19433
19434 #define STACK_WARN (THREAD_SIZE/8)
19435-#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19436
19437 /*
19438 * macros/functions for gaining access to the thread information structure
19439@@ -162,26 +162,18 @@ struct thread_info {
19440
19441 DECLARE_PER_CPU(unsigned long, kernel_stack);
19442
19443+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19444+
19445 static inline struct thread_info *current_thread_info(void)
19446 {
19447- struct thread_info *ti;
19448- ti = (void *)(this_cpu_read_stable(kernel_stack) +
19449- KERNEL_STACK_OFFSET - THREAD_SIZE);
19450- return ti;
19451+ return this_cpu_read_stable(current_tinfo);
19452 }
19453
19454 #else /* !__ASSEMBLY__ */
19455
19456 /* how to get the thread information struct from ASM */
19457 #define GET_THREAD_INFO(reg) \
19458- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19459- _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19460-
19461-/*
19462- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19463- * a certain register (to be used in assembler memory operands).
19464- */
19465-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19466+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19467
19468 #endif
19469
19470@@ -237,5 +229,12 @@ static inline bool is_ia32_task(void)
19471 extern void arch_task_cache_init(void);
19472 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19473 extern void arch_release_task_struct(struct task_struct *tsk);
19474+
19475+#define __HAVE_THREAD_FUNCTIONS
19476+#define task_thread_info(task) (&(task)->tinfo)
19477+#define task_stack_page(task) ((task)->stack)
19478+#define setup_thread_stack(p, org) do {} while (0)
19479+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19480+
19481 #endif
19482 #endif /* _ASM_X86_THREAD_INFO_H */
19483diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19484index 04905bf..1178cdf 100644
19485--- a/arch/x86/include/asm/tlbflush.h
19486+++ b/arch/x86/include/asm/tlbflush.h
19487@@ -17,18 +17,44 @@
19488
19489 static inline void __native_flush_tlb(void)
19490 {
19491+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19492+ u64 descriptor[2];
19493+
19494+ descriptor[0] = PCID_KERNEL;
19495+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19496+ return;
19497+ }
19498+
19499+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19500+ if (static_cpu_has(X86_FEATURE_PCID)) {
19501+ unsigned int cpu = raw_get_cpu();
19502+
19503+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19504+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19505+ raw_put_cpu_no_resched();
19506+ return;
19507+ }
19508+#endif
19509+
19510 native_write_cr3(native_read_cr3());
19511 }
19512
19513 static inline void __native_flush_tlb_global_irq_disabled(void)
19514 {
19515- unsigned long cr4;
19516+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19517+ u64 descriptor[2];
19518
19519- cr4 = native_read_cr4();
19520- /* clear PGE */
19521- native_write_cr4(cr4 & ~X86_CR4_PGE);
19522- /* write old PGE again and flush TLBs */
19523- native_write_cr4(cr4);
19524+ descriptor[0] = PCID_KERNEL;
19525+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19526+ } else {
19527+ unsigned long cr4;
19528+
19529+ cr4 = native_read_cr4();
19530+ /* clear PGE */
19531+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19532+ /* write old PGE again and flush TLBs */
19533+ native_write_cr4(cr4);
19534+ }
19535 }
19536
19537 static inline void __native_flush_tlb_global(void)
19538@@ -49,6 +75,41 @@ static inline void __native_flush_tlb_global(void)
19539
19540 static inline void __native_flush_tlb_single(unsigned long addr)
19541 {
19542+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19543+ u64 descriptor[2];
19544+
19545+ descriptor[0] = PCID_KERNEL;
19546+ descriptor[1] = addr;
19547+
19548+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19549+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19550+ if (addr < TASK_SIZE_MAX)
19551+ descriptor[1] += pax_user_shadow_base;
19552+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19553+ }
19554+
19555+ descriptor[0] = PCID_USER;
19556+ descriptor[1] = addr;
19557+#endif
19558+
19559+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19560+ return;
19561+ }
19562+
19563+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19564+ if (static_cpu_has(X86_FEATURE_PCID)) {
19565+ unsigned int cpu = raw_get_cpu();
19566+
19567+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19568+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19569+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19570+ raw_put_cpu_no_resched();
19571+
19572+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19573+ addr += pax_user_shadow_base;
19574+ }
19575+#endif
19576+
19577 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19578 }
19579
19580diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19581index 0d592e0..526f797 100644
19582--- a/arch/x86/include/asm/uaccess.h
19583+++ b/arch/x86/include/asm/uaccess.h
19584@@ -7,6 +7,7 @@
19585 #include <linux/compiler.h>
19586 #include <linux/thread_info.h>
19587 #include <linux/string.h>
19588+#include <linux/spinlock.h>
19589 #include <asm/asm.h>
19590 #include <asm/page.h>
19591 #include <asm/smap.h>
19592@@ -29,7 +30,12 @@
19593
19594 #define get_ds() (KERNEL_DS)
19595 #define get_fs() (current_thread_info()->addr_limit)
19596+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19597+void __set_fs(mm_segment_t x);
19598+void set_fs(mm_segment_t x);
19599+#else
19600 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19601+#endif
19602
19603 #define segment_eq(a, b) ((a).seg == (b).seg)
19604
19605@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19606 * checks that the pointer is in the user space range - after calling
19607 * this function, memory access functions may still return -EFAULT.
19608 */
19609-#define access_ok(type, addr, size) \
19610- likely(!__range_not_ok(addr, size, user_addr_max()))
19611+extern int _cond_resched(void);
19612+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19613+#define access_ok(type, addr, size) \
19614+({ \
19615+ unsigned long __size = size; \
19616+ unsigned long __addr = (unsigned long)addr; \
19617+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19618+ if (__ret_ao && __size) { \
19619+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19620+ unsigned long __end_ao = __addr + __size - 1; \
19621+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19622+ while (__addr_ao <= __end_ao) { \
19623+ char __c_ao; \
19624+ __addr_ao += PAGE_SIZE; \
19625+ if (__size > PAGE_SIZE) \
19626+ _cond_resched(); \
19627+ if (__get_user(__c_ao, (char __user *)__addr)) \
19628+ break; \
19629+ if (type != VERIFY_WRITE) { \
19630+ __addr = __addr_ao; \
19631+ continue; \
19632+ } \
19633+ if (__put_user(__c_ao, (char __user *)__addr)) \
19634+ break; \
19635+ __addr = __addr_ao; \
19636+ } \
19637+ } \
19638+ } \
19639+ __ret_ao; \
19640+})
19641
19642 /*
19643 * The exception table consists of pairs of addresses relative to the
19644@@ -176,10 +210,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19645 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19646 __chk_user_ptr(ptr); \
19647 might_fault(); \
19648+ pax_open_userland(); \
19649 asm volatile("call __get_user_%P3" \
19650 : "=a" (__ret_gu), "=r" (__val_gu) \
19651 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19652 (x) = (__typeof__(*(ptr))) __val_gu; \
19653+ pax_close_userland(); \
19654 __ret_gu; \
19655 })
19656
19657@@ -187,13 +223,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19658 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19659 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19660
19661-
19662+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19663+#define __copyuser_seg "gs;"
19664+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19665+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19666+#else
19667+#define __copyuser_seg
19668+#define __COPYUSER_SET_ES
19669+#define __COPYUSER_RESTORE_ES
19670+#endif
19671
19672 #ifdef CONFIG_X86_32
19673 #define __put_user_asm_u64(x, addr, err, errret) \
19674 asm volatile(ASM_STAC "\n" \
19675- "1: movl %%eax,0(%2)\n" \
19676- "2: movl %%edx,4(%2)\n" \
19677+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19678+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19679 "3: " ASM_CLAC "\n" \
19680 ".section .fixup,\"ax\"\n" \
19681 "4: movl %3,%0\n" \
19682@@ -206,8 +250,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19683
19684 #define __put_user_asm_ex_u64(x, addr) \
19685 asm volatile(ASM_STAC "\n" \
19686- "1: movl %%eax,0(%1)\n" \
19687- "2: movl %%edx,4(%1)\n" \
19688+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19689+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19690 "3: " ASM_CLAC "\n" \
19691 _ASM_EXTABLE_EX(1b, 2b) \
19692 _ASM_EXTABLE_EX(2b, 3b) \
19693@@ -257,7 +301,8 @@ extern void __put_user_8(void);
19694 __typeof__(*(ptr)) __pu_val; \
19695 __chk_user_ptr(ptr); \
19696 might_fault(); \
19697- __pu_val = x; \
19698+ __pu_val = (x); \
19699+ pax_open_userland(); \
19700 switch (sizeof(*(ptr))) { \
19701 case 1: \
19702 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19703@@ -275,6 +320,7 @@ extern void __put_user_8(void);
19704 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19705 break; \
19706 } \
19707+ pax_close_userland(); \
19708 __ret_pu; \
19709 })
19710
19711@@ -355,8 +401,10 @@ do { \
19712 } while (0)
19713
19714 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19715+do { \
19716+ pax_open_userland(); \
19717 asm volatile(ASM_STAC "\n" \
19718- "1: mov"itype" %2,%"rtype"1\n" \
19719+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19720 "2: " ASM_CLAC "\n" \
19721 ".section .fixup,\"ax\"\n" \
19722 "3: mov %3,%0\n" \
19723@@ -364,8 +412,10 @@ do { \
19724 " jmp 2b\n" \
19725 ".previous\n" \
19726 _ASM_EXTABLE(1b, 3b) \
19727- : "=r" (err), ltype(x) \
19728- : "m" (__m(addr)), "i" (errret), "0" (err))
19729+ : "=r" (err), ltype (x) \
19730+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19731+ pax_close_userland(); \
19732+} while (0)
19733
19734 #define __get_user_size_ex(x, ptr, size) \
19735 do { \
19736@@ -389,7 +439,7 @@ do { \
19737 } while (0)
19738
19739 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19740- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19741+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19742 "2:\n" \
19743 _ASM_EXTABLE_EX(1b, 2b) \
19744 : ltype(x) : "m" (__m(addr)))
19745@@ -406,13 +456,24 @@ do { \
19746 int __gu_err; \
19747 unsigned long __gu_val; \
19748 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19749- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19750+ (x) = (__typeof__(*(ptr)))__gu_val; \
19751 __gu_err; \
19752 })
19753
19754 /* FIXME: this hack is definitely wrong -AK */
19755 struct __large_struct { unsigned long buf[100]; };
19756-#define __m(x) (*(struct __large_struct __user *)(x))
19757+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19758+#define ____m(x) \
19759+({ \
19760+ unsigned long ____x = (unsigned long)(x); \
19761+ if (____x < pax_user_shadow_base) \
19762+ ____x += pax_user_shadow_base; \
19763+ (typeof(x))____x; \
19764+})
19765+#else
19766+#define ____m(x) (x)
19767+#endif
19768+#define __m(x) (*(struct __large_struct __user *)____m(x))
19769
19770 /*
19771 * Tell gcc we read from memory instead of writing: this is because
19772@@ -420,8 +481,10 @@ struct __large_struct { unsigned long buf[100]; };
19773 * aliasing issues.
19774 */
19775 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19776+do { \
19777+ pax_open_userland(); \
19778 asm volatile(ASM_STAC "\n" \
19779- "1: mov"itype" %"rtype"1,%2\n" \
19780+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19781 "2: " ASM_CLAC "\n" \
19782 ".section .fixup,\"ax\"\n" \
19783 "3: mov %3,%0\n" \
19784@@ -429,10 +492,12 @@ struct __large_struct { unsigned long buf[100]; };
19785 ".previous\n" \
19786 _ASM_EXTABLE(1b, 3b) \
19787 : "=r"(err) \
19788- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19789+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19790+ pax_close_userland(); \
19791+} while (0)
19792
19793 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19794- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19795+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19796 "2:\n" \
19797 _ASM_EXTABLE_EX(1b, 2b) \
19798 : : ltype(x), "m" (__m(addr)))
19799@@ -442,11 +507,13 @@ struct __large_struct { unsigned long buf[100]; };
19800 */
19801 #define uaccess_try do { \
19802 current_thread_info()->uaccess_err = 0; \
19803+ pax_open_userland(); \
19804 stac(); \
19805 barrier();
19806
19807 #define uaccess_catch(err) \
19808 clac(); \
19809+ pax_close_userland(); \
19810 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19811 } while (0)
19812
19813@@ -471,8 +538,12 @@ struct __large_struct { unsigned long buf[100]; };
19814 * On error, the variable @x is set to zero.
19815 */
19816
19817+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19818+#define __get_user(x, ptr) get_user((x), (ptr))
19819+#else
19820 #define __get_user(x, ptr) \
19821 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19822+#endif
19823
19824 /**
19825 * __put_user: - Write a simple value into user space, with less checking.
19826@@ -494,8 +565,12 @@ struct __large_struct { unsigned long buf[100]; };
19827 * Returns zero on success, or -EFAULT on error.
19828 */
19829
19830+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19831+#define __put_user(x, ptr) put_user((x), (ptr))
19832+#else
19833 #define __put_user(x, ptr) \
19834 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19835+#endif
19836
19837 #define __get_user_unaligned __get_user
19838 #define __put_user_unaligned __put_user
19839@@ -513,7 +588,7 @@ struct __large_struct { unsigned long buf[100]; };
19840 #define get_user_ex(x, ptr) do { \
19841 unsigned long __gue_val; \
19842 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19843- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19844+ (x) = (__typeof__(*(ptr)))__gue_val; \
19845 } while (0)
19846
19847 #define put_user_try uaccess_try
19848@@ -542,18 +617,19 @@ extern void __cmpxchg_wrong_size(void)
19849 __typeof__(ptr) __uval = (uval); \
19850 __typeof__(*(ptr)) __old = (old); \
19851 __typeof__(*(ptr)) __new = (new); \
19852+ pax_open_userland(); \
19853 switch (size) { \
19854 case 1: \
19855 { \
19856 asm volatile("\t" ASM_STAC "\n" \
19857- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19858+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19859 "2:\t" ASM_CLAC "\n" \
19860 "\t.section .fixup, \"ax\"\n" \
19861 "3:\tmov %3, %0\n" \
19862 "\tjmp 2b\n" \
19863 "\t.previous\n" \
19864 _ASM_EXTABLE(1b, 3b) \
19865- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19866+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19867 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19868 : "memory" \
19869 ); \
19870@@ -562,14 +638,14 @@ extern void __cmpxchg_wrong_size(void)
19871 case 2: \
19872 { \
19873 asm volatile("\t" ASM_STAC "\n" \
19874- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19875+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19876 "2:\t" ASM_CLAC "\n" \
19877 "\t.section .fixup, \"ax\"\n" \
19878 "3:\tmov %3, %0\n" \
19879 "\tjmp 2b\n" \
19880 "\t.previous\n" \
19881 _ASM_EXTABLE(1b, 3b) \
19882- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19883+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19884 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19885 : "memory" \
19886 ); \
19887@@ -578,14 +654,14 @@ extern void __cmpxchg_wrong_size(void)
19888 case 4: \
19889 { \
19890 asm volatile("\t" ASM_STAC "\n" \
19891- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19892+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19893 "2:\t" ASM_CLAC "\n" \
19894 "\t.section .fixup, \"ax\"\n" \
19895 "3:\tmov %3, %0\n" \
19896 "\tjmp 2b\n" \
19897 "\t.previous\n" \
19898 _ASM_EXTABLE(1b, 3b) \
19899- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19900+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19901 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19902 : "memory" \
19903 ); \
19904@@ -597,14 +673,14 @@ extern void __cmpxchg_wrong_size(void)
19905 __cmpxchg_wrong_size(); \
19906 \
19907 asm volatile("\t" ASM_STAC "\n" \
19908- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19909+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19910 "2:\t" ASM_CLAC "\n" \
19911 "\t.section .fixup, \"ax\"\n" \
19912 "3:\tmov %3, %0\n" \
19913 "\tjmp 2b\n" \
19914 "\t.previous\n" \
19915 _ASM_EXTABLE(1b, 3b) \
19916- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19917+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19918 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19919 : "memory" \
19920 ); \
19921@@ -613,6 +689,7 @@ extern void __cmpxchg_wrong_size(void)
19922 default: \
19923 __cmpxchg_wrong_size(); \
19924 } \
19925+ pax_close_userland(); \
19926 *__uval = __old; \
19927 __ret; \
19928 })
19929@@ -636,17 +713,6 @@ extern struct movsl_mask {
19930
19931 #define ARCH_HAS_NOCACHE_UACCESS 1
19932
19933-#ifdef CONFIG_X86_32
19934-# include <asm/uaccess_32.h>
19935-#else
19936-# include <asm/uaccess_64.h>
19937-#endif
19938-
19939-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19940- unsigned n);
19941-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19942- unsigned n);
19943-
19944 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19945 # define copy_user_diag __compiletime_error
19946 #else
19947@@ -656,7 +722,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19948 extern void copy_user_diag("copy_from_user() buffer size is too small")
19949 copy_from_user_overflow(void);
19950 extern void copy_user_diag("copy_to_user() buffer size is too small")
19951-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19952+copy_to_user_overflow(void);
19953
19954 #undef copy_user_diag
19955
19956@@ -669,7 +735,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19957
19958 extern void
19959 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19960-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19961+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19962 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19963
19964 #else
19965@@ -684,10 +750,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19966
19967 #endif
19968
19969+#ifdef CONFIG_X86_32
19970+# include <asm/uaccess_32.h>
19971+#else
19972+# include <asm/uaccess_64.h>
19973+#endif
19974+
19975 static inline unsigned long __must_check
19976 copy_from_user(void *to, const void __user *from, unsigned long n)
19977 {
19978- int sz = __compiletime_object_size(to);
19979+ size_t sz = __compiletime_object_size(to);
19980
19981 might_fault();
19982
19983@@ -709,12 +781,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19984 * case, and do only runtime checking for non-constant sizes.
19985 */
19986
19987- if (likely(sz < 0 || sz >= n))
19988- n = _copy_from_user(to, from, n);
19989- else if(__builtin_constant_p(n))
19990- copy_from_user_overflow();
19991- else
19992- __copy_from_user_overflow(sz, n);
19993+ if (likely(sz != (size_t)-1 && sz < n)) {
19994+ if(__builtin_constant_p(n))
19995+ copy_from_user_overflow();
19996+ else
19997+ __copy_from_user_overflow(sz, n);
19998+ } else if (access_ok(VERIFY_READ, from, n))
19999+ n = __copy_from_user(to, from, n);
20000+ else if ((long)n > 0)
20001+ memset(to, 0, n);
20002
20003 return n;
20004 }
20005@@ -722,17 +797,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
20006 static inline unsigned long __must_check
20007 copy_to_user(void __user *to, const void *from, unsigned long n)
20008 {
20009- int sz = __compiletime_object_size(from);
20010+ size_t sz = __compiletime_object_size(from);
20011
20012 might_fault();
20013
20014 /* See the comment in copy_from_user() above. */
20015- if (likely(sz < 0 || sz >= n))
20016- n = _copy_to_user(to, from, n);
20017- else if(__builtin_constant_p(n))
20018- copy_to_user_overflow();
20019- else
20020- __copy_to_user_overflow(sz, n);
20021+ if (likely(sz != (size_t)-1 && sz < n)) {
20022+ if(__builtin_constant_p(n))
20023+ copy_to_user_overflow();
20024+ else
20025+ __copy_to_user_overflow(sz, n);
20026+ } else if (access_ok(VERIFY_WRITE, to, n))
20027+ n = __copy_to_user(to, from, n);
20028
20029 return n;
20030 }
20031diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
20032index 3c03a5d..1071638 100644
20033--- a/arch/x86/include/asm/uaccess_32.h
20034+++ b/arch/x86/include/asm/uaccess_32.h
20035@@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
20036 static __always_inline unsigned long __must_check
20037 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20038 {
20039+ if ((long)n < 0)
20040+ return n;
20041+
20042+ check_object_size(from, n, true);
20043+
20044 if (__builtin_constant_p(n)) {
20045 unsigned long ret;
20046
20047@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20048 __copy_to_user(void __user *to, const void *from, unsigned long n)
20049 {
20050 might_fault();
20051+
20052 return __copy_to_user_inatomic(to, from, n);
20053 }
20054
20055 static __always_inline unsigned long
20056 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20057 {
20058+ if ((long)n < 0)
20059+ return n;
20060+
20061 /* Avoid zeroing the tail if the copy fails..
20062 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20063 * but as the zeroing behaviour is only significant when n is not
20064@@ -137,6 +146,12 @@ static __always_inline unsigned long
20065 __copy_from_user(void *to, const void __user *from, unsigned long n)
20066 {
20067 might_fault();
20068+
20069+ if ((long)n < 0)
20070+ return n;
20071+
20072+ check_object_size(to, n, false);
20073+
20074 if (__builtin_constant_p(n)) {
20075 unsigned long ret;
20076
20077@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20078 const void __user *from, unsigned long n)
20079 {
20080 might_fault();
20081+
20082+ if ((long)n < 0)
20083+ return n;
20084+
20085 if (__builtin_constant_p(n)) {
20086 unsigned long ret;
20087
20088@@ -181,7 +200,10 @@ static __always_inline unsigned long
20089 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20090 unsigned long n)
20091 {
20092- return __copy_from_user_ll_nocache_nozero(to, from, n);
20093+ if ((long)n < 0)
20094+ return n;
20095+
20096+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20097 }
20098
20099 #endif /* _ASM_X86_UACCESS_32_H */
20100diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20101index 12a26b9..206c200 100644
20102--- a/arch/x86/include/asm/uaccess_64.h
20103+++ b/arch/x86/include/asm/uaccess_64.h
20104@@ -10,6 +10,9 @@
20105 #include <asm/alternative.h>
20106 #include <asm/cpufeature.h>
20107 #include <asm/page.h>
20108+#include <asm/pgtable.h>
20109+
20110+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20111
20112 /*
20113 * Copy To/From Userspace
20114@@ -17,14 +20,14 @@
20115
20116 /* Handles exceptions in both to and from, but doesn't do access_ok */
20117 __must_check unsigned long
20118-copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
20119+copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
20120 __must_check unsigned long
20121-copy_user_generic_string(void *to, const void *from, unsigned len);
20122+copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
20123 __must_check unsigned long
20124-copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20125+copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
20126
20127 static __always_inline __must_check unsigned long
20128-copy_user_generic(void *to, const void *from, unsigned len)
20129+copy_user_generic(void *to, const void *from, unsigned long len)
20130 {
20131 unsigned ret;
20132
20133@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20134 }
20135
20136 __must_check unsigned long
20137-copy_in_user(void __user *to, const void __user *from, unsigned len);
20138+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20139
20140 static __always_inline __must_check
20141-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20142+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20143 {
20144- int ret = 0;
20145+ size_t sz = __compiletime_object_size(dst);
20146+ unsigned ret = 0;
20147+
20148+ if (size > INT_MAX)
20149+ return size;
20150+
20151+ check_object_size(dst, size, false);
20152+
20153+#ifdef CONFIG_PAX_MEMORY_UDEREF
20154+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20155+ return size;
20156+#endif
20157+
20158+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20159+ if(__builtin_constant_p(size))
20160+ copy_from_user_overflow();
20161+ else
20162+ __copy_from_user_overflow(sz, size);
20163+ return size;
20164+ }
20165
20166 if (!__builtin_constant_p(size))
20167- return copy_user_generic(dst, (__force void *)src, size);
20168+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20169 switch (size) {
20170- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20171+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20172 ret, "b", "b", "=q", 1);
20173 return ret;
20174- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20175+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20176 ret, "w", "w", "=r", 2);
20177 return ret;
20178- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20179+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20180 ret, "l", "k", "=r", 4);
20181 return ret;
20182- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20183+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20184 ret, "q", "", "=r", 8);
20185 return ret;
20186 case 10:
20187- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20188+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20189 ret, "q", "", "=r", 10);
20190 if (unlikely(ret))
20191 return ret;
20192 __get_user_asm(*(u16 *)(8 + (char *)dst),
20193- (u16 __user *)(8 + (char __user *)src),
20194+ (const u16 __user *)(8 + (const char __user *)src),
20195 ret, "w", "w", "=r", 2);
20196 return ret;
20197 case 16:
20198- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20199+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20200 ret, "q", "", "=r", 16);
20201 if (unlikely(ret))
20202 return ret;
20203 __get_user_asm(*(u64 *)(8 + (char *)dst),
20204- (u64 __user *)(8 + (char __user *)src),
20205+ (const u64 __user *)(8 + (const char __user *)src),
20206 ret, "q", "", "=r", 8);
20207 return ret;
20208 default:
20209- return copy_user_generic(dst, (__force void *)src, size);
20210+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20211 }
20212 }
20213
20214 static __always_inline __must_check
20215-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20216+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20217 {
20218 might_fault();
20219 return __copy_from_user_nocheck(dst, src, size);
20220 }
20221
20222 static __always_inline __must_check
20223-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20224+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20225 {
20226- int ret = 0;
20227+ size_t sz = __compiletime_object_size(src);
20228+ unsigned ret = 0;
20229+
20230+ if (size > INT_MAX)
20231+ return size;
20232+
20233+ check_object_size(src, size, true);
20234+
20235+#ifdef CONFIG_PAX_MEMORY_UDEREF
20236+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20237+ return size;
20238+#endif
20239+
20240+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20241+ if(__builtin_constant_p(size))
20242+ copy_to_user_overflow();
20243+ else
20244+ __copy_to_user_overflow(sz, size);
20245+ return size;
20246+ }
20247
20248 if (!__builtin_constant_p(size))
20249- return copy_user_generic((__force void *)dst, src, size);
20250+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20251 switch (size) {
20252- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20253+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20254 ret, "b", "b", "iq", 1);
20255 return ret;
20256- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20257+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20258 ret, "w", "w", "ir", 2);
20259 return ret;
20260- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20261+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20262 ret, "l", "k", "ir", 4);
20263 return ret;
20264- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20265+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20266 ret, "q", "", "er", 8);
20267 return ret;
20268 case 10:
20269- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20270+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20271 ret, "q", "", "er", 10);
20272 if (unlikely(ret))
20273 return ret;
20274 asm("":::"memory");
20275- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20276+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20277 ret, "w", "w", "ir", 2);
20278 return ret;
20279 case 16:
20280- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20281+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20282 ret, "q", "", "er", 16);
20283 if (unlikely(ret))
20284 return ret;
20285 asm("":::"memory");
20286- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20287+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20288 ret, "q", "", "er", 8);
20289 return ret;
20290 default:
20291- return copy_user_generic((__force void *)dst, src, size);
20292+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20293 }
20294 }
20295
20296 static __always_inline __must_check
20297-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20298+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20299 {
20300 might_fault();
20301 return __copy_to_user_nocheck(dst, src, size);
20302 }
20303
20304 static __always_inline __must_check
20305-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20306+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20307 {
20308- int ret = 0;
20309+ unsigned ret = 0;
20310
20311 might_fault();
20312+
20313+ if (size > INT_MAX)
20314+ return size;
20315+
20316+#ifdef CONFIG_PAX_MEMORY_UDEREF
20317+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20318+ return size;
20319+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20320+ return size;
20321+#endif
20322+
20323 if (!__builtin_constant_p(size))
20324- return copy_user_generic((__force void *)dst,
20325- (__force void *)src, size);
20326+ return copy_user_generic((__force_kernel void *)____m(dst),
20327+ (__force_kernel const void *)____m(src), size);
20328 switch (size) {
20329 case 1: {
20330 u8 tmp;
20331- __get_user_asm(tmp, (u8 __user *)src,
20332+ __get_user_asm(tmp, (const u8 __user *)src,
20333 ret, "b", "b", "=q", 1);
20334 if (likely(!ret))
20335 __put_user_asm(tmp, (u8 __user *)dst,
20336@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20337 }
20338 case 2: {
20339 u16 tmp;
20340- __get_user_asm(tmp, (u16 __user *)src,
20341+ __get_user_asm(tmp, (const u16 __user *)src,
20342 ret, "w", "w", "=r", 2);
20343 if (likely(!ret))
20344 __put_user_asm(tmp, (u16 __user *)dst,
20345@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20346
20347 case 4: {
20348 u32 tmp;
20349- __get_user_asm(tmp, (u32 __user *)src,
20350+ __get_user_asm(tmp, (const u32 __user *)src,
20351 ret, "l", "k", "=r", 4);
20352 if (likely(!ret))
20353 __put_user_asm(tmp, (u32 __user *)dst,
20354@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20355 }
20356 case 8: {
20357 u64 tmp;
20358- __get_user_asm(tmp, (u64 __user *)src,
20359+ __get_user_asm(tmp, (const u64 __user *)src,
20360 ret, "q", "", "=r", 8);
20361 if (likely(!ret))
20362 __put_user_asm(tmp, (u64 __user *)dst,
20363@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20364 return ret;
20365 }
20366 default:
20367- return copy_user_generic((__force void *)dst,
20368- (__force void *)src, size);
20369+ return copy_user_generic((__force_kernel void *)____m(dst),
20370+ (__force_kernel const void *)____m(src), size);
20371 }
20372 }
20373
20374-static __must_check __always_inline int
20375-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20376+static __must_check __always_inline unsigned long
20377+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20378 {
20379 return __copy_from_user_nocheck(dst, src, size);
20380 }
20381
20382-static __must_check __always_inline int
20383-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20384+static __must_check __always_inline unsigned long
20385+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20386 {
20387 return __copy_to_user_nocheck(dst, src, size);
20388 }
20389
20390-extern long __copy_user_nocache(void *dst, const void __user *src,
20391- unsigned size, int zerorest);
20392+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20393+ unsigned long size, int zerorest);
20394
20395-static inline int
20396-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20397+static inline unsigned long
20398+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20399 {
20400 might_fault();
20401+
20402+ if (size > INT_MAX)
20403+ return size;
20404+
20405+#ifdef CONFIG_PAX_MEMORY_UDEREF
20406+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20407+ return size;
20408+#endif
20409+
20410 return __copy_user_nocache(dst, src, size, 1);
20411 }
20412
20413-static inline int
20414+static inline unsigned long
20415 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20416- unsigned size)
20417+ unsigned long size)
20418 {
20419+ if (size > INT_MAX)
20420+ return size;
20421+
20422+#ifdef CONFIG_PAX_MEMORY_UDEREF
20423+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20424+ return size;
20425+#endif
20426+
20427 return __copy_user_nocache(dst, src, size, 0);
20428 }
20429
20430 unsigned long
20431-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
20432+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
20433
20434 #endif /* _ASM_X86_UACCESS_64_H */
20435diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20436index 5b238981..77fdd78 100644
20437--- a/arch/x86/include/asm/word-at-a-time.h
20438+++ b/arch/x86/include/asm/word-at-a-time.h
20439@@ -11,7 +11,7 @@
20440 * and shift, for example.
20441 */
20442 struct word_at_a_time {
20443- const unsigned long one_bits, high_bits;
20444+ unsigned long one_bits, high_bits;
20445 };
20446
20447 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20448diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20449index e45e4da..44e8572 100644
20450--- a/arch/x86/include/asm/x86_init.h
20451+++ b/arch/x86/include/asm/x86_init.h
20452@@ -129,7 +129,7 @@ struct x86_init_ops {
20453 struct x86_init_timers timers;
20454 struct x86_init_iommu iommu;
20455 struct x86_init_pci pci;
20456-};
20457+} __no_const;
20458
20459 /**
20460 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20461@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20462 void (*setup_percpu_clockev)(void);
20463 void (*early_percpu_clock_init)(void);
20464 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20465-};
20466+} __no_const;
20467
20468 struct timespec;
20469
20470@@ -168,7 +168,7 @@ struct x86_platform_ops {
20471 void (*save_sched_clock_state)(void);
20472 void (*restore_sched_clock_state)(void);
20473 void (*apic_post_init)(void);
20474-};
20475+} __no_const;
20476
20477 struct pci_dev;
20478 struct msi_msg;
20479@@ -185,7 +185,7 @@ struct x86_msi_ops {
20480 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20481 u32 (*msi_mask_irq)(struct msi_desc *desc, u32 mask, u32 flag);
20482 u32 (*msix_mask_irq)(struct msi_desc *desc, u32 flag);
20483-};
20484+} __no_const;
20485
20486 struct IO_APIC_route_entry;
20487 struct io_apic_irq_attr;
20488@@ -206,7 +206,7 @@ struct x86_io_apic_ops {
20489 unsigned int destination, int vector,
20490 struct io_apic_irq_attr *attr);
20491 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20492-};
20493+} __no_const;
20494
20495 extern struct x86_init_ops x86_init;
20496 extern struct x86_cpuinit_ops x86_cpuinit;
20497diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20498index c949923..c22bfa4 100644
20499--- a/arch/x86/include/asm/xen/page.h
20500+++ b/arch/x86/include/asm/xen/page.h
20501@@ -63,7 +63,7 @@ extern int m2p_remove_override(struct page *page,
20502 extern struct page *m2p_find_override(unsigned long mfn);
20503 extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
20504
20505-static inline unsigned long pfn_to_mfn(unsigned long pfn)
20506+static inline unsigned long __intentional_overflow(-1) pfn_to_mfn(unsigned long pfn)
20507 {
20508 unsigned long mfn;
20509
20510diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20511index 7e7a79a..0824666 100644
20512--- a/arch/x86/include/asm/xsave.h
20513+++ b/arch/x86/include/asm/xsave.h
20514@@ -228,12 +228,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20515 if (unlikely(err))
20516 return -EFAULT;
20517
20518+ pax_open_userland();
20519 __asm__ __volatile__(ASM_STAC "\n"
20520- "1:"XSAVE"\n"
20521+ "1:"
20522+ __copyuser_seg
20523+ XSAVE"\n"
20524 "2: " ASM_CLAC "\n"
20525 xstate_fault
20526 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20527 : "memory");
20528+ pax_close_userland();
20529 return err;
20530 }
20531
20532@@ -243,16 +247,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20533 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20534 {
20535 int err = 0;
20536- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20537+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20538 u32 lmask = mask;
20539 u32 hmask = mask >> 32;
20540
20541+ pax_open_userland();
20542 __asm__ __volatile__(ASM_STAC "\n"
20543- "1:"XRSTOR"\n"
20544+ "1:"
20545+ __copyuser_seg
20546+ XRSTOR"\n"
20547 "2: " ASM_CLAC "\n"
20548 xstate_fault
20549 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20550 : "memory"); /* memory required? */
20551+ pax_close_userland();
20552 return err;
20553 }
20554
20555diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20556index d993e33..8db1b18 100644
20557--- a/arch/x86/include/uapi/asm/e820.h
20558+++ b/arch/x86/include/uapi/asm/e820.h
20559@@ -58,7 +58,7 @@ struct e820map {
20560 #define ISA_START_ADDRESS 0xa0000
20561 #define ISA_END_ADDRESS 0x100000
20562
20563-#define BIOS_BEGIN 0x000a0000
20564+#define BIOS_BEGIN 0x000c0000
20565 #define BIOS_END 0x00100000
20566
20567 #define BIOS_ROM_BASE 0xffe00000
20568diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20569index 7b0a55a..ad115bf 100644
20570--- a/arch/x86/include/uapi/asm/ptrace-abi.h
20571+++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20572@@ -49,7 +49,6 @@
20573 #define EFLAGS 144
20574 #define RSP 152
20575 #define SS 160
20576-#define ARGOFFSET R11
20577 #endif /* __ASSEMBLY__ */
20578
20579 /* top of stack page */
20580diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20581index 8f1e774..9b4c381 100644
20582--- a/arch/x86/kernel/Makefile
20583+++ b/arch/x86/kernel/Makefile
20584@@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20585 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20586 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20587 obj-y += probe_roms.o
20588-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20589+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20590 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20591 obj-$(CONFIG_X86_64) += mcount_64.o
20592 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20593diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20594index a142e77..6222cdd 100644
20595--- a/arch/x86/kernel/acpi/boot.c
20596+++ b/arch/x86/kernel/acpi/boot.c
20597@@ -1276,7 +1276,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
20598 * If your system is blacklisted here, but you find that acpi=force
20599 * works for you, please contact linux-acpi@vger.kernel.org
20600 */
20601-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20602+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20603 /*
20604 * Boxes that need ACPI disabled
20605 */
20606@@ -1351,7 +1351,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20607 };
20608
20609 /* second table for DMI checks that should run after early-quirks */
20610-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20611+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20612 /*
20613 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20614 * which includes some code which overrides all temperature
20615diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20616index 3136820..e2c6577 100644
20617--- a/arch/x86/kernel/acpi/sleep.c
20618+++ b/arch/x86/kernel/acpi/sleep.c
20619@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20620 #else /* CONFIG_64BIT */
20621 #ifdef CONFIG_SMP
20622 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20623+
20624+ pax_open_kernel();
20625 early_gdt_descr.address =
20626 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20627+ pax_close_kernel();
20628+
20629 initial_gs = per_cpu_offset(smp_processor_id());
20630 #endif
20631 initial_code = (unsigned long)wakeup_long64;
20632diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20633index 665c6b7..eae4d56 100644
20634--- a/arch/x86/kernel/acpi/wakeup_32.S
20635+++ b/arch/x86/kernel/acpi/wakeup_32.S
20636@@ -29,13 +29,11 @@ wakeup_pmode_return:
20637 # and restore the stack ... but you need gdt for this to work
20638 movl saved_context_esp, %esp
20639
20640- movl %cs:saved_magic, %eax
20641- cmpl $0x12345678, %eax
20642+ cmpl $0x12345678, saved_magic
20643 jne bogus_magic
20644
20645 # jump to place where we left off
20646- movl saved_eip, %eax
20647- jmp *%eax
20648+ jmp *(saved_eip)
20649
20650 bogus_magic:
20651 jmp bogus_magic
20652diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20653index 703130f..27a155d 100644
20654--- a/arch/x86/kernel/alternative.c
20655+++ b/arch/x86/kernel/alternative.c
20656@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20657 */
20658 for (a = start; a < end; a++) {
20659 instr = (u8 *)&a->instr_offset + a->instr_offset;
20660+
20661+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20662+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20663+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20664+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20665+#endif
20666+
20667 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20668 BUG_ON(a->replacementlen > a->instrlen);
20669 BUG_ON(a->instrlen > sizeof(insnbuf));
20670@@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20671 add_nops(insnbuf + a->replacementlen,
20672 a->instrlen - a->replacementlen);
20673
20674+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20675+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20676+ instr = ktva_ktla(instr);
20677+#endif
20678+
20679 text_poke_early(instr, insnbuf, a->instrlen);
20680 }
20681 }
20682@@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20683 for (poff = start; poff < end; poff++) {
20684 u8 *ptr = (u8 *)poff + *poff;
20685
20686+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20687+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20688+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20689+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20690+#endif
20691+
20692 if (!*poff || ptr < text || ptr >= text_end)
20693 continue;
20694 /* turn DS segment override prefix into lock prefix */
20695- if (*ptr == 0x3e)
20696+ if (*ktla_ktva(ptr) == 0x3e)
20697 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20698 }
20699 mutex_unlock(&text_mutex);
20700@@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20701 for (poff = start; poff < end; poff++) {
20702 u8 *ptr = (u8 *)poff + *poff;
20703
20704+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20705+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20706+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20707+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20708+#endif
20709+
20710 if (!*poff || ptr < text || ptr >= text_end)
20711 continue;
20712 /* turn lock prefix into DS segment override prefix */
20713- if (*ptr == 0xf0)
20714+ if (*ktla_ktva(ptr) == 0xf0)
20715 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20716 }
20717 mutex_unlock(&text_mutex);
20718@@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20719
20720 BUG_ON(p->len > MAX_PATCH_LEN);
20721 /* prep the buffer with the original instructions */
20722- memcpy(insnbuf, p->instr, p->len);
20723+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20724 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20725 (unsigned long)p->instr, p->len);
20726
20727@@ -504,7 +528,7 @@ void __init alternative_instructions(void)
20728 if (!uniproc_patched || num_possible_cpus() == 1)
20729 free_init_pages("SMP alternatives",
20730 (unsigned long)__smp_locks,
20731- (unsigned long)__smp_locks_end);
20732+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20733 #endif
20734
20735 apply_paravirt(__parainstructions, __parainstructions_end);
20736@@ -524,13 +548,17 @@ void __init alternative_instructions(void)
20737 * instructions. And on the local CPU you need to be protected again NMI or MCE
20738 * handlers seeing an inconsistent instruction while you patch.
20739 */
20740-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20741+void *__kprobes text_poke_early(void *addr, const void *opcode,
20742 size_t len)
20743 {
20744 unsigned long flags;
20745 local_irq_save(flags);
20746- memcpy(addr, opcode, len);
20747+
20748+ pax_open_kernel();
20749+ memcpy(ktla_ktva(addr), opcode, len);
20750 sync_core();
20751+ pax_close_kernel();
20752+
20753 local_irq_restore(flags);
20754 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20755 that causes hangs on some VIA CPUs. */
20756@@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20757 */
20758 void *text_poke(void *addr, const void *opcode, size_t len)
20759 {
20760- unsigned long flags;
20761- char *vaddr;
20762+ unsigned char *vaddr = ktla_ktva(addr);
20763 struct page *pages[2];
20764- int i;
20765+ size_t i;
20766
20767 if (!core_kernel_text((unsigned long)addr)) {
20768- pages[0] = vmalloc_to_page(addr);
20769- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20770+ pages[0] = vmalloc_to_page(vaddr);
20771+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20772 } else {
20773- pages[0] = virt_to_page(addr);
20774+ pages[0] = virt_to_page(vaddr);
20775 WARN_ON(!PageReserved(pages[0]));
20776- pages[1] = virt_to_page(addr + PAGE_SIZE);
20777+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20778 }
20779 BUG_ON(!pages[0]);
20780- local_irq_save(flags);
20781- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20782- if (pages[1])
20783- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20784- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20785- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20786- clear_fixmap(FIX_TEXT_POKE0);
20787- if (pages[1])
20788- clear_fixmap(FIX_TEXT_POKE1);
20789- local_flush_tlb();
20790- sync_core();
20791- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20792- that causes hangs on some VIA CPUs. */
20793+ text_poke_early(addr, opcode, len);
20794 for (i = 0; i < len; i++)
20795- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20796- local_irq_restore(flags);
20797+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20798 return addr;
20799 }
20800
20801@@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
20802 if (likely(!bp_patching_in_progress))
20803 return 0;
20804
20805- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20806+ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20807 return 0;
20808
20809 /* set up the specified breakpoint handler */
20810@@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
20811 */
20812 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20813 {
20814- unsigned char int3 = 0xcc;
20815+ const unsigned char int3 = 0xcc;
20816
20817 bp_int3_handler = handler;
20818 bp_int3_addr = (u8 *)addr + sizeof(int3);
20819diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20820index ba6cc04..06fd971 100644
20821--- a/arch/x86/kernel/apic/apic.c
20822+++ b/arch/x86/kernel/apic/apic.c
20823@@ -201,7 +201,7 @@ int first_system_vector = 0xfe;
20824 /*
20825 * Debug level, exported for io_apic.c
20826 */
20827-unsigned int apic_verbosity;
20828+int apic_verbosity;
20829
20830 int pic_mode;
20831
20832@@ -1989,7 +1989,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20833 apic_write(APIC_ESR, 0);
20834 v = apic_read(APIC_ESR);
20835 ack_APIC_irq();
20836- atomic_inc(&irq_err_count);
20837+ atomic_inc_unchecked(&irq_err_count);
20838
20839 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20840 smp_processor_id(), v);
20841diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20842index de918c4..32eed23 100644
20843--- a/arch/x86/kernel/apic/apic_flat_64.c
20844+++ b/arch/x86/kernel/apic/apic_flat_64.c
20845@@ -154,7 +154,7 @@ static int flat_probe(void)
20846 return 1;
20847 }
20848
20849-static struct apic apic_flat = {
20850+static struct apic apic_flat __read_only = {
20851 .name = "flat",
20852 .probe = flat_probe,
20853 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20854@@ -260,7 +260,7 @@ static int physflat_probe(void)
20855 return 0;
20856 }
20857
20858-static struct apic apic_physflat = {
20859+static struct apic apic_physflat __read_only = {
20860
20861 .name = "physical flat",
20862 .probe = physflat_probe,
20863diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20864index b205cdb..d8503ff 100644
20865--- a/arch/x86/kernel/apic/apic_noop.c
20866+++ b/arch/x86/kernel/apic/apic_noop.c
20867@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20868 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20869 }
20870
20871-struct apic apic_noop = {
20872+struct apic apic_noop __read_only = {
20873 .name = "noop",
20874 .probe = noop_probe,
20875 .acpi_madt_oem_check = NULL,
20876diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20877index c4a8d63..fe893ac 100644
20878--- a/arch/x86/kernel/apic/bigsmp_32.c
20879+++ b/arch/x86/kernel/apic/bigsmp_32.c
20880@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20881 return dmi_bigsmp;
20882 }
20883
20884-static struct apic apic_bigsmp = {
20885+static struct apic apic_bigsmp __read_only = {
20886
20887 .name = "bigsmp",
20888 .probe = probe_bigsmp,
20889diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20890index 1183d54..6158e47 100644
20891--- a/arch/x86/kernel/apic/io_apic.c
20892+++ b/arch/x86/kernel/apic/io_apic.c
20893@@ -1230,7 +1230,7 @@ out:
20894 }
20895 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
20896
20897-void lock_vector_lock(void)
20898+void lock_vector_lock(void) __acquires(vector_lock)
20899 {
20900 /* Used to the online set of cpus does not change
20901 * during assign_irq_vector.
20902@@ -1238,7 +1238,7 @@ void lock_vector_lock(void)
20903 raw_spin_lock(&vector_lock);
20904 }
20905
20906-void unlock_vector_lock(void)
20907+void unlock_vector_lock(void) __releases(vector_lock)
20908 {
20909 raw_spin_unlock(&vector_lock);
20910 }
20911@@ -2465,7 +2465,7 @@ static void ack_apic_edge(struct irq_data *data)
20912 ack_APIC_irq();
20913 }
20914
20915-atomic_t irq_mis_count;
20916+atomic_unchecked_t irq_mis_count;
20917
20918 #ifdef CONFIG_GENERIC_PENDING_IRQ
20919 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20920@@ -2606,7 +2606,7 @@ static void ack_apic_level(struct irq_data *data)
20921 * at the cpu.
20922 */
20923 if (!(v & (1 << (i & 0x1f)))) {
20924- atomic_inc(&irq_mis_count);
20925+ atomic_inc_unchecked(&irq_mis_count);
20926
20927 eoi_ioapic_irq(irq, cfg);
20928 }
20929diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20930index bda4886..f9c7195 100644
20931--- a/arch/x86/kernel/apic/probe_32.c
20932+++ b/arch/x86/kernel/apic/probe_32.c
20933@@ -72,7 +72,7 @@ static int probe_default(void)
20934 return 1;
20935 }
20936
20937-static struct apic apic_default = {
20938+static struct apic apic_default __read_only = {
20939
20940 .name = "default",
20941 .probe = probe_default,
20942diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20943index e658f21..b695a1a 100644
20944--- a/arch/x86/kernel/apic/x2apic_cluster.c
20945+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20946@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20947 return notifier_from_errno(err);
20948 }
20949
20950-static struct notifier_block __refdata x2apic_cpu_notifier = {
20951+static struct notifier_block x2apic_cpu_notifier = {
20952 .notifier_call = update_clusterinfo,
20953 };
20954
20955@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20956 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20957 }
20958
20959-static struct apic apic_x2apic_cluster = {
20960+static struct apic apic_x2apic_cluster __read_only = {
20961
20962 .name = "cluster x2apic",
20963 .probe = x2apic_cluster_probe,
20964diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20965index 6fae733..5ca17af 100644
20966--- a/arch/x86/kernel/apic/x2apic_phys.c
20967+++ b/arch/x86/kernel/apic/x2apic_phys.c
20968@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20969 return apic == &apic_x2apic_phys;
20970 }
20971
20972-static struct apic apic_x2apic_phys = {
20973+static struct apic apic_x2apic_phys __read_only = {
20974
20975 .name = "physical x2apic",
20976 .probe = x2apic_phys_probe,
20977diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20978index 8e9dcfd..c61b3e4 100644
20979--- a/arch/x86/kernel/apic/x2apic_uv_x.c
20980+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20981@@ -348,7 +348,7 @@ static int uv_probe(void)
20982 return apic == &apic_x2apic_uv_x;
20983 }
20984
20985-static struct apic __refdata apic_x2apic_uv_x = {
20986+static struct apic apic_x2apic_uv_x __read_only = {
20987
20988 .name = "UV large system",
20989 .probe = uv_probe,
20990diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20991index 5848744..56cb598 100644
20992--- a/arch/x86/kernel/apm_32.c
20993+++ b/arch/x86/kernel/apm_32.c
20994@@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
20995 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20996 * even though they are called in protected mode.
20997 */
20998-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20999+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
21000 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
21001
21002 static const char driver_version[] = "1.16ac"; /* no spaces */
21003@@ -611,7 +611,10 @@ static long __apm_bios_call(void *_call)
21004 BUG_ON(cpu != 0);
21005 gdt = get_cpu_gdt_table(cpu);
21006 save_desc_40 = gdt[0x40 / 8];
21007+
21008+ pax_open_kernel();
21009 gdt[0x40 / 8] = bad_bios_desc;
21010+ pax_close_kernel();
21011
21012 apm_irq_save(flags);
21013 APM_DO_SAVE_SEGS;
21014@@ -620,7 +623,11 @@ static long __apm_bios_call(void *_call)
21015 &call->esi);
21016 APM_DO_RESTORE_SEGS;
21017 apm_irq_restore(flags);
21018+
21019+ pax_open_kernel();
21020 gdt[0x40 / 8] = save_desc_40;
21021+ pax_close_kernel();
21022+
21023 put_cpu();
21024
21025 return call->eax & 0xff;
21026@@ -687,7 +694,10 @@ static long __apm_bios_call_simple(void *_call)
21027 BUG_ON(cpu != 0);
21028 gdt = get_cpu_gdt_table(cpu);
21029 save_desc_40 = gdt[0x40 / 8];
21030+
21031+ pax_open_kernel();
21032 gdt[0x40 / 8] = bad_bios_desc;
21033+ pax_close_kernel();
21034
21035 apm_irq_save(flags);
21036 APM_DO_SAVE_SEGS;
21037@@ -695,7 +705,11 @@ static long __apm_bios_call_simple(void *_call)
21038 &call->eax);
21039 APM_DO_RESTORE_SEGS;
21040 apm_irq_restore(flags);
21041+
21042+ pax_open_kernel();
21043 gdt[0x40 / 8] = save_desc_40;
21044+ pax_close_kernel();
21045+
21046 put_cpu();
21047 return error;
21048 }
21049@@ -2350,12 +2364,15 @@ static int __init apm_init(void)
21050 * code to that CPU.
21051 */
21052 gdt = get_cpu_gdt_table(0);
21053+
21054+ pax_open_kernel();
21055 set_desc_base(&gdt[APM_CS >> 3],
21056 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21057 set_desc_base(&gdt[APM_CS_16 >> 3],
21058 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21059 set_desc_base(&gdt[APM_DS >> 3],
21060 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21061+ pax_close_kernel();
21062
21063 proc_create("apm", 0, NULL, &apm_file_ops);
21064
21065diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21066index 9f6b934..cf5ffb3 100644
21067--- a/arch/x86/kernel/asm-offsets.c
21068+++ b/arch/x86/kernel/asm-offsets.c
21069@@ -32,6 +32,8 @@ void common(void) {
21070 OFFSET(TI_flags, thread_info, flags);
21071 OFFSET(TI_status, thread_info, status);
21072 OFFSET(TI_addr_limit, thread_info, addr_limit);
21073+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21074+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21075
21076 BLANK();
21077 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21078@@ -52,8 +54,26 @@ void common(void) {
21079 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21080 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21081 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21082+
21083+#ifdef CONFIG_PAX_KERNEXEC
21084+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21085 #endif
21086
21087+#ifdef CONFIG_PAX_MEMORY_UDEREF
21088+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21089+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21090+#ifdef CONFIG_X86_64
21091+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21092+#endif
21093+#endif
21094+
21095+#endif
21096+
21097+ BLANK();
21098+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21099+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21100+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21101+
21102 #ifdef CONFIG_XEN
21103 BLANK();
21104 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21105diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21106index e7c798b..2b2019b 100644
21107--- a/arch/x86/kernel/asm-offsets_64.c
21108+++ b/arch/x86/kernel/asm-offsets_64.c
21109@@ -77,6 +77,7 @@ int main(void)
21110 BLANK();
21111 #undef ENTRY
21112
21113+ DEFINE(TSS_size, sizeof(struct tss_struct));
21114 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21115 BLANK();
21116
21117diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21118index e27b49d..85b106c 100644
21119--- a/arch/x86/kernel/cpu/Makefile
21120+++ b/arch/x86/kernel/cpu/Makefile
21121@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21122 CFLAGS_REMOVE_perf_event.o = -pg
21123 endif
21124
21125-# Make sure load_percpu_segment has no stackprotector
21126-nostackp := $(call cc-option, -fno-stack-protector)
21127-CFLAGS_common.o := $(nostackp)
21128-
21129 obj-y := intel_cacheinfo.o scattered.o topology.o
21130 obj-y += common.o
21131 obj-y += rdrand.o
21132diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21133index 813d29d..6e542d4 100644
21134--- a/arch/x86/kernel/cpu/amd.c
21135+++ b/arch/x86/kernel/cpu/amd.c
21136@@ -718,7 +718,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21137 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21138 {
21139 /* AMD errata T13 (order #21922) */
21140- if ((c->x86 == 6)) {
21141+ if (c->x86 == 6) {
21142 /* Duron Rev A0 */
21143 if (c->x86_model == 3 && c->x86_mask == 0)
21144 size = 64;
21145diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21146index cfa9b5b..19b5084 100644
21147--- a/arch/x86/kernel/cpu/common.c
21148+++ b/arch/x86/kernel/cpu/common.c
21149@@ -90,60 +90,6 @@ static const struct cpu_dev default_cpu = {
21150
21151 static const struct cpu_dev *this_cpu = &default_cpu;
21152
21153-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21154-#ifdef CONFIG_X86_64
21155- /*
21156- * We need valid kernel segments for data and code in long mode too
21157- * IRET will check the segment types kkeil 2000/10/28
21158- * Also sysret mandates a special GDT layout
21159- *
21160- * TLS descriptors are currently at a different place compared to i386.
21161- * Hopefully nobody expects them at a fixed place (Wine?)
21162- */
21163- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21164- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21165- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21166- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21167- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21168- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21169-#else
21170- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21171- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21172- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21173- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21174- /*
21175- * Segments used for calling PnP BIOS have byte granularity.
21176- * They code segments and data segments have fixed 64k limits,
21177- * the transfer segment sizes are set at run time.
21178- */
21179- /* 32-bit code */
21180- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21181- /* 16-bit code */
21182- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21183- /* 16-bit data */
21184- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21185- /* 16-bit data */
21186- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21187- /* 16-bit data */
21188- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21189- /*
21190- * The APM segments have byte granularity and their bases
21191- * are set at run time. All have 64k limits.
21192- */
21193- /* 32-bit code */
21194- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21195- /* 16-bit code */
21196- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21197- /* data */
21198- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21199-
21200- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21201- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21202- GDT_STACK_CANARY_INIT
21203-#endif
21204-} };
21205-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21206-
21207 static int __init x86_xsave_setup(char *s)
21208 {
21209 if (strlen(s))
21210@@ -305,6 +251,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21211 }
21212 }
21213
21214+#ifdef CONFIG_X86_64
21215+static __init int setup_disable_pcid(char *arg)
21216+{
21217+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21218+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21219+
21220+#ifdef CONFIG_PAX_MEMORY_UDEREF
21221+ if (clone_pgd_mask != ~(pgdval_t)0UL)
21222+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21223+#endif
21224+
21225+ return 1;
21226+}
21227+__setup("nopcid", setup_disable_pcid);
21228+
21229+static void setup_pcid(struct cpuinfo_x86 *c)
21230+{
21231+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21232+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21233+
21234+#ifdef CONFIG_PAX_MEMORY_UDEREF
21235+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
21236+ pax_open_kernel();
21237+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21238+ pax_close_kernel();
21239+ printk("PAX: slow and weak UDEREF enabled\n");
21240+ } else
21241+ printk("PAX: UDEREF disabled\n");
21242+#endif
21243+
21244+ return;
21245+ }
21246+
21247+ printk("PAX: PCID detected\n");
21248+ set_in_cr4(X86_CR4_PCIDE);
21249+
21250+#ifdef CONFIG_PAX_MEMORY_UDEREF
21251+ pax_open_kernel();
21252+ clone_pgd_mask = ~(pgdval_t)0UL;
21253+ pax_close_kernel();
21254+ if (pax_user_shadow_base)
21255+ printk("PAX: weak UDEREF enabled\n");
21256+ else {
21257+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21258+ printk("PAX: strong UDEREF enabled\n");
21259+ }
21260+#endif
21261+
21262+ if (cpu_has(c, X86_FEATURE_INVPCID))
21263+ printk("PAX: INVPCID detected\n");
21264+}
21265+#endif
21266+
21267 /*
21268 * Some CPU features depend on higher CPUID levels, which may not always
21269 * be available due to CPUID level capping or broken virtualization
21270@@ -405,7 +404,7 @@ void switch_to_new_gdt(int cpu)
21271 {
21272 struct desc_ptr gdt_descr;
21273
21274- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21275+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21276 gdt_descr.size = GDT_SIZE - 1;
21277 load_gdt(&gdt_descr);
21278 /* Reload the per-cpu base */
21279@@ -895,6 +894,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21280 setup_smep(c);
21281 setup_smap(c);
21282
21283+#ifdef CONFIG_X86_64
21284+ setup_pcid(c);
21285+#endif
21286+
21287 /*
21288 * The vendor-specific functions might have changed features.
21289 * Now we do "generic changes."
21290@@ -903,6 +906,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21291 /* Filter out anything that depends on CPUID levels we don't have */
21292 filter_cpuid_features(c, true);
21293
21294+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
21295+ setup_clear_cpu_cap(X86_FEATURE_SEP);
21296+#endif
21297+
21298 /* If the model name is still unset, do table lookup. */
21299 if (!c->x86_model_id[0]) {
21300 const char *p;
21301@@ -985,7 +992,7 @@ static void syscall32_cpu_init(void)
21302 void enable_sep_cpu(void)
21303 {
21304 int cpu = get_cpu();
21305- struct tss_struct *tss = &per_cpu(init_tss, cpu);
21306+ struct tss_struct *tss = init_tss + cpu;
21307
21308 if (!boot_cpu_has(X86_FEATURE_SEP)) {
21309 put_cpu();
21310@@ -1125,14 +1132,16 @@ static __init int setup_disablecpuid(char *arg)
21311 }
21312 __setup("clearcpuid=", setup_disablecpuid);
21313
21314+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21315+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21316+
21317 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21318- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21319+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21320 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21321
21322 #ifdef CONFIG_X86_64
21323-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21324-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21325- (unsigned long) debug_idt_table };
21326+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21327+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21328
21329 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21330 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21331@@ -1309,7 +1318,7 @@ void cpu_init(void)
21332 */
21333 load_ucode_ap();
21334
21335- t = &per_cpu(init_tss, cpu);
21336+ t = init_tss + cpu;
21337 oist = &per_cpu(orig_ist, cpu);
21338
21339 #ifdef CONFIG_NUMA
21340@@ -1341,7 +1350,6 @@ void cpu_init(void)
21341 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21342 barrier();
21343
21344- x86_configure_nx();
21345 enable_x2apic();
21346
21347 /*
21348@@ -1393,7 +1401,7 @@ void cpu_init(void)
21349 {
21350 int cpu = smp_processor_id();
21351 struct task_struct *curr = current;
21352- struct tss_struct *t = &per_cpu(init_tss, cpu);
21353+ struct tss_struct *t = init_tss + cpu;
21354 struct thread_struct *thread = &curr->thread;
21355
21356 wait_for_master_cpu(cpu);
21357diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21358index c703507..28535e3 100644
21359--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21360+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21361@@ -1026,6 +1026,22 @@ static struct attribute *default_attrs[] = {
21362 };
21363
21364 #ifdef CONFIG_AMD_NB
21365+static struct attribute *default_attrs_amd_nb[] = {
21366+ &type.attr,
21367+ &level.attr,
21368+ &coherency_line_size.attr,
21369+ &physical_line_partition.attr,
21370+ &ways_of_associativity.attr,
21371+ &number_of_sets.attr,
21372+ &size.attr,
21373+ &shared_cpu_map.attr,
21374+ &shared_cpu_list.attr,
21375+ NULL,
21376+ NULL,
21377+ NULL,
21378+ NULL
21379+};
21380+
21381 static struct attribute **amd_l3_attrs(void)
21382 {
21383 static struct attribute **attrs;
21384@@ -1036,18 +1052,7 @@ static struct attribute **amd_l3_attrs(void)
21385
21386 n = ARRAY_SIZE(default_attrs);
21387
21388- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21389- n += 2;
21390-
21391- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21392- n += 1;
21393-
21394- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21395- if (attrs == NULL)
21396- return attrs = default_attrs;
21397-
21398- for (n = 0; default_attrs[n]; n++)
21399- attrs[n] = default_attrs[n];
21400+ attrs = default_attrs_amd_nb;
21401
21402 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21403 attrs[n++] = &cache_disable_0.attr;
21404@@ -1098,6 +1103,13 @@ static struct kobj_type ktype_cache = {
21405 .default_attrs = default_attrs,
21406 };
21407
21408+#ifdef CONFIG_AMD_NB
21409+static struct kobj_type ktype_cache_amd_nb = {
21410+ .sysfs_ops = &sysfs_ops,
21411+ .default_attrs = default_attrs_amd_nb,
21412+};
21413+#endif
21414+
21415 static struct kobj_type ktype_percpu_entry = {
21416 .sysfs_ops = &sysfs_ops,
21417 };
21418@@ -1163,20 +1175,26 @@ static int cache_add_dev(struct device *dev)
21419 return retval;
21420 }
21421
21422+#ifdef CONFIG_AMD_NB
21423+ amd_l3_attrs();
21424+#endif
21425+
21426 for (i = 0; i < num_cache_leaves; i++) {
21427+ struct kobj_type *ktype;
21428+
21429 this_object = INDEX_KOBJECT_PTR(cpu, i);
21430 this_object->cpu = cpu;
21431 this_object->index = i;
21432
21433 this_leaf = CPUID4_INFO_IDX(cpu, i);
21434
21435- ktype_cache.default_attrs = default_attrs;
21436+ ktype = &ktype_cache;
21437 #ifdef CONFIG_AMD_NB
21438 if (this_leaf->base.nb)
21439- ktype_cache.default_attrs = amd_l3_attrs();
21440+ ktype = &ktype_cache_amd_nb;
21441 #endif
21442 retval = kobject_init_and_add(&(this_object->kobj),
21443- &ktype_cache,
21444+ ktype,
21445 per_cpu(ici_cache_kobject, cpu),
21446 "index%1lu", i);
21447 if (unlikely(retval)) {
21448diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21449index 61a9668ce..b446a37 100644
21450--- a/arch/x86/kernel/cpu/mcheck/mce.c
21451+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21452@@ -45,6 +45,7 @@
21453 #include <asm/processor.h>
21454 #include <asm/mce.h>
21455 #include <asm/msr.h>
21456+#include <asm/local.h>
21457
21458 #include "mce-internal.h"
21459
21460@@ -259,7 +260,7 @@ static void print_mce(struct mce *m)
21461 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21462 m->cs, m->ip);
21463
21464- if (m->cs == __KERNEL_CS)
21465+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21466 print_symbol("{%s}", m->ip);
21467 pr_cont("\n");
21468 }
21469@@ -292,10 +293,10 @@ static void print_mce(struct mce *m)
21470
21471 #define PANIC_TIMEOUT 5 /* 5 seconds */
21472
21473-static atomic_t mce_paniced;
21474+static atomic_unchecked_t mce_paniced;
21475
21476 static int fake_panic;
21477-static atomic_t mce_fake_paniced;
21478+static atomic_unchecked_t mce_fake_paniced;
21479
21480 /* Panic in progress. Enable interrupts and wait for final IPI */
21481 static void wait_for_panic(void)
21482@@ -319,7 +320,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21483 /*
21484 * Make sure only one CPU runs in machine check panic
21485 */
21486- if (atomic_inc_return(&mce_paniced) > 1)
21487+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
21488 wait_for_panic();
21489 barrier();
21490
21491@@ -327,7 +328,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21492 console_verbose();
21493 } else {
21494 /* Don't log too much for fake panic */
21495- if (atomic_inc_return(&mce_fake_paniced) > 1)
21496+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
21497 return;
21498 }
21499 /* First print corrected ones that are still unlogged */
21500@@ -366,7 +367,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21501 if (!fake_panic) {
21502 if (panic_timeout == 0)
21503 panic_timeout = mca_cfg.panic_timeout;
21504- panic(msg);
21505+ panic("%s", msg);
21506 } else
21507 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21508 }
21509@@ -697,7 +698,7 @@ static int mce_timed_out(u64 *t)
21510 * might have been modified by someone else.
21511 */
21512 rmb();
21513- if (atomic_read(&mce_paniced))
21514+ if (atomic_read_unchecked(&mce_paniced))
21515 wait_for_panic();
21516 if (!mca_cfg.monarch_timeout)
21517 goto out;
21518@@ -1674,7 +1675,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21519 }
21520
21521 /* Call the installed machine check handler for this CPU setup. */
21522-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21523+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21524 unexpected_machine_check;
21525
21526 /*
21527@@ -1697,7 +1698,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21528 return;
21529 }
21530
21531+ pax_open_kernel();
21532 machine_check_vector = do_machine_check;
21533+ pax_close_kernel();
21534
21535 __mcheck_cpu_init_generic();
21536 __mcheck_cpu_init_vendor(c);
21537@@ -1711,7 +1714,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21538 */
21539
21540 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21541-static int mce_chrdev_open_count; /* #times opened */
21542+static local_t mce_chrdev_open_count; /* #times opened */
21543 static int mce_chrdev_open_exclu; /* already open exclusive? */
21544
21545 static int mce_chrdev_open(struct inode *inode, struct file *file)
21546@@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21547 spin_lock(&mce_chrdev_state_lock);
21548
21549 if (mce_chrdev_open_exclu ||
21550- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21551+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21552 spin_unlock(&mce_chrdev_state_lock);
21553
21554 return -EBUSY;
21555@@ -1727,7 +1730,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21556
21557 if (file->f_flags & O_EXCL)
21558 mce_chrdev_open_exclu = 1;
21559- mce_chrdev_open_count++;
21560+ local_inc(&mce_chrdev_open_count);
21561
21562 spin_unlock(&mce_chrdev_state_lock);
21563
21564@@ -1738,7 +1741,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21565 {
21566 spin_lock(&mce_chrdev_state_lock);
21567
21568- mce_chrdev_open_count--;
21569+ local_dec(&mce_chrdev_open_count);
21570 mce_chrdev_open_exclu = 0;
21571
21572 spin_unlock(&mce_chrdev_state_lock);
21573@@ -2413,7 +2416,7 @@ static __init void mce_init_banks(void)
21574
21575 for (i = 0; i < mca_cfg.banks; i++) {
21576 struct mce_bank *b = &mce_banks[i];
21577- struct device_attribute *a = &b->attr;
21578+ device_attribute_no_const *a = &b->attr;
21579
21580 sysfs_attr_init(&a->attr);
21581 a->attr.name = b->attrname;
21582@@ -2520,7 +2523,7 @@ struct dentry *mce_get_debugfs_dir(void)
21583 static void mce_reset(void)
21584 {
21585 cpu_missing = 0;
21586- atomic_set(&mce_fake_paniced, 0);
21587+ atomic_set_unchecked(&mce_fake_paniced, 0);
21588 atomic_set(&mce_executing, 0);
21589 atomic_set(&mce_callin, 0);
21590 atomic_set(&global_nwo, 0);
21591diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21592index a304298..49b6d06 100644
21593--- a/arch/x86/kernel/cpu/mcheck/p5.c
21594+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21595@@ -10,6 +10,7 @@
21596 #include <asm/processor.h>
21597 #include <asm/mce.h>
21598 #include <asm/msr.h>
21599+#include <asm/pgtable.h>
21600
21601 /* By default disabled */
21602 int mce_p5_enabled __read_mostly;
21603@@ -48,7 +49,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21604 if (!cpu_has(c, X86_FEATURE_MCE))
21605 return;
21606
21607+ pax_open_kernel();
21608 machine_check_vector = pentium_machine_check;
21609+ pax_close_kernel();
21610 /* Make sure the vector pointer is visible before we enable MCEs: */
21611 wmb();
21612
21613diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21614index 7dc5564..1273569 100644
21615--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21616+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21617@@ -9,6 +9,7 @@
21618 #include <asm/processor.h>
21619 #include <asm/mce.h>
21620 #include <asm/msr.h>
21621+#include <asm/pgtable.h>
21622
21623 /* Machine check handler for WinChip C6: */
21624 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21625@@ -22,7 +23,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21626 {
21627 u32 lo, hi;
21628
21629+ pax_open_kernel();
21630 machine_check_vector = winchip_machine_check;
21631+ pax_close_kernel();
21632 /* Make sure the vector pointer is visible before we enable MCEs: */
21633 wmb();
21634
21635diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21636index 15c2909..2cef20c 100644
21637--- a/arch/x86/kernel/cpu/microcode/core.c
21638+++ b/arch/x86/kernel/cpu/microcode/core.c
21639@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21640 return NOTIFY_OK;
21641 }
21642
21643-static struct notifier_block __refdata mc_cpu_notifier = {
21644+static struct notifier_block mc_cpu_notifier = {
21645 .notifier_call = mc_cpu_callback,
21646 };
21647
21648diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21649index c6826d1..ad18e14a 100644
21650--- a/arch/x86/kernel/cpu/microcode/intel.c
21651+++ b/arch/x86/kernel/cpu/microcode/intel.c
21652@@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21653
21654 static int get_ucode_user(void *to, const void *from, size_t n)
21655 {
21656- return copy_from_user(to, from, n);
21657+ return copy_from_user(to, (const void __force_user *)from, n);
21658 }
21659
21660 static enum ucode_state
21661 request_microcode_user(int cpu, const void __user *buf, size_t size)
21662 {
21663- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21664+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21665 }
21666
21667 static void microcode_fini_cpu(int cpu)
21668diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21669index ea5f363..cb0e905 100644
21670--- a/arch/x86/kernel/cpu/mtrr/main.c
21671+++ b/arch/x86/kernel/cpu/mtrr/main.c
21672@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21673 u64 size_or_mask, size_and_mask;
21674 static bool mtrr_aps_delayed_init;
21675
21676-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21677+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21678
21679 const struct mtrr_ops *mtrr_if;
21680
21681diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21682index df5e41f..816c719 100644
21683--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21684+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21685@@ -25,7 +25,7 @@ struct mtrr_ops {
21686 int (*validate_add_page)(unsigned long base, unsigned long size,
21687 unsigned int type);
21688 int (*have_wrcomb)(void);
21689-};
21690+} __do_const;
21691
21692 extern int generic_get_free_region(unsigned long base, unsigned long size,
21693 int replace_reg);
21694diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21695index 143e5f5..5825081 100644
21696--- a/arch/x86/kernel/cpu/perf_event.c
21697+++ b/arch/x86/kernel/cpu/perf_event.c
21698@@ -1374,7 +1374,7 @@ static void __init pmu_check_apic(void)
21699
21700 }
21701
21702-static struct attribute_group x86_pmu_format_group = {
21703+static attribute_group_no_const x86_pmu_format_group = {
21704 .name = "format",
21705 .attrs = NULL,
21706 };
21707@@ -1473,7 +1473,7 @@ static struct attribute *events_attr[] = {
21708 NULL,
21709 };
21710
21711-static struct attribute_group x86_pmu_events_group = {
21712+static attribute_group_no_const x86_pmu_events_group = {
21713 .name = "events",
21714 .attrs = events_attr,
21715 };
21716@@ -1997,7 +1997,7 @@ static unsigned long get_segment_base(unsigned int segment)
21717 if (idx > GDT_ENTRIES)
21718 return 0;
21719
21720- desc = raw_cpu_ptr(gdt_page.gdt);
21721+ desc = get_cpu_gdt_table(smp_processor_id());
21722 }
21723
21724 return get_desc_base(desc + idx);
21725@@ -2087,7 +2087,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21726 break;
21727
21728 perf_callchain_store(entry, frame.return_address);
21729- fp = frame.next_frame;
21730+ fp = (const void __force_user *)frame.next_frame;
21731 }
21732 }
21733
21734diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21735index 639d128..e92d7e5 100644
21736--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21737+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21738@@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21739 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21740 {
21741 struct attribute **attrs;
21742- struct attribute_group *attr_group;
21743+ attribute_group_no_const *attr_group;
21744 int i = 0, j;
21745
21746 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21747diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21748index 944bf01..4a4392f 100644
21749--- a/arch/x86/kernel/cpu/perf_event_intel.c
21750+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21751@@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
21752 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21753
21754 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21755- u64 capabilities;
21756+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21757
21758- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21759- x86_pmu.intel_cap.capabilities = capabilities;
21760+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21761+ x86_pmu.intel_cap.capabilities = capabilities;
21762 }
21763
21764 intel_ds_init();
21765diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21766index d64f275..26522ff 100644
21767--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21768+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21769@@ -449,7 +449,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21770 NULL,
21771 };
21772
21773-static struct attribute_group rapl_pmu_events_group = {
21774+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21775 .name = "events",
21776 .attrs = NULL, /* patched at runtime */
21777 };
21778diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21779index 9762dbd..53d5d21 100644
21780--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21781+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21782@@ -721,7 +721,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21783 static int __init uncore_type_init(struct intel_uncore_type *type)
21784 {
21785 struct intel_uncore_pmu *pmus;
21786- struct attribute_group *attr_group;
21787+ attribute_group_no_const *attr_group;
21788 struct attribute **attrs;
21789 int i, j;
21790
21791diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21792index 18eb78b..18747cc 100644
21793--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21794+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21795@@ -114,7 +114,7 @@ struct intel_uncore_box {
21796 struct uncore_event_desc {
21797 struct kobj_attribute attr;
21798 const char *config;
21799-};
21800+} __do_const;
21801
21802 ssize_t uncore_event_show(struct kobject *kobj,
21803 struct kobj_attribute *attr, char *buf);
21804diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21805index 3225ae6c..ee3c6db 100644
21806--- a/arch/x86/kernel/cpuid.c
21807+++ b/arch/x86/kernel/cpuid.c
21808@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21809 return notifier_from_errno(err);
21810 }
21811
21812-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21813+static struct notifier_block cpuid_class_cpu_notifier =
21814 {
21815 .notifier_call = cpuid_class_cpu_callback,
21816 };
21817diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21818index f5ab56d..d3b201a 100644
21819--- a/arch/x86/kernel/crash.c
21820+++ b/arch/x86/kernel/crash.c
21821@@ -104,7 +104,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21822 #ifdef CONFIG_X86_32
21823 struct pt_regs fixed_regs;
21824
21825- if (!user_mode_vm(regs)) {
21826+ if (!user_mode(regs)) {
21827 crash_fixup_ss_esp(&fixed_regs, regs);
21828 regs = &fixed_regs;
21829 }
21830diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21831index afa64ad..dce67dd 100644
21832--- a/arch/x86/kernel/crash_dump_64.c
21833+++ b/arch/x86/kernel/crash_dump_64.c
21834@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21835 return -ENOMEM;
21836
21837 if (userbuf) {
21838- if (copy_to_user(buf, vaddr + offset, csize)) {
21839+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21840 iounmap(vaddr);
21841 return -EFAULT;
21842 }
21843diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21844index f6dfd93..892ade4 100644
21845--- a/arch/x86/kernel/doublefault.c
21846+++ b/arch/x86/kernel/doublefault.c
21847@@ -12,7 +12,7 @@
21848
21849 #define DOUBLEFAULT_STACKSIZE (1024)
21850 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21851-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21852+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21853
21854 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21855
21856@@ -22,7 +22,7 @@ static void doublefault_fn(void)
21857 unsigned long gdt, tss;
21858
21859 native_store_gdt(&gdt_desc);
21860- gdt = gdt_desc.address;
21861+ gdt = (unsigned long)gdt_desc.address;
21862
21863 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21864
21865@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21866 /* 0x2 bit is always set */
21867 .flags = X86_EFLAGS_SF | 0x2,
21868 .sp = STACK_START,
21869- .es = __USER_DS,
21870+ .es = __KERNEL_DS,
21871 .cs = __KERNEL_CS,
21872 .ss = __KERNEL_DS,
21873- .ds = __USER_DS,
21874+ .ds = __KERNEL_DS,
21875 .fs = __KERNEL_PERCPU,
21876
21877 .__cr3 = __pa_nodebug(swapper_pg_dir),
21878diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21879index b74ebc7..2c95874 100644
21880--- a/arch/x86/kernel/dumpstack.c
21881+++ b/arch/x86/kernel/dumpstack.c
21882@@ -2,6 +2,9 @@
21883 * Copyright (C) 1991, 1992 Linus Torvalds
21884 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21885 */
21886+#ifdef CONFIG_GRKERNSEC_HIDESYM
21887+#define __INCLUDED_BY_HIDESYM 1
21888+#endif
21889 #include <linux/kallsyms.h>
21890 #include <linux/kprobes.h>
21891 #include <linux/uaccess.h>
21892@@ -33,23 +36,21 @@ static void printk_stack_address(unsigned long address, int reliable)
21893
21894 void printk_address(unsigned long address)
21895 {
21896- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21897+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21898 }
21899
21900 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21901 static void
21902 print_ftrace_graph_addr(unsigned long addr, void *data,
21903 const struct stacktrace_ops *ops,
21904- struct thread_info *tinfo, int *graph)
21905+ struct task_struct *task, int *graph)
21906 {
21907- struct task_struct *task;
21908 unsigned long ret_addr;
21909 int index;
21910
21911 if (addr != (unsigned long)return_to_handler)
21912 return;
21913
21914- task = tinfo->task;
21915 index = task->curr_ret_stack;
21916
21917 if (!task->ret_stack || index < *graph)
21918@@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21919 static inline void
21920 print_ftrace_graph_addr(unsigned long addr, void *data,
21921 const struct stacktrace_ops *ops,
21922- struct thread_info *tinfo, int *graph)
21923+ struct task_struct *task, int *graph)
21924 { }
21925 #endif
21926
21927@@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21928 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21929 */
21930
21931-static inline int valid_stack_ptr(struct thread_info *tinfo,
21932- void *p, unsigned int size, void *end)
21933+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21934 {
21935- void *t = tinfo;
21936 if (end) {
21937 if (p < end && p >= (end-THREAD_SIZE))
21938 return 1;
21939@@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21940 }
21941
21942 unsigned long
21943-print_context_stack(struct thread_info *tinfo,
21944+print_context_stack(struct task_struct *task, void *stack_start,
21945 unsigned long *stack, unsigned long bp,
21946 const struct stacktrace_ops *ops, void *data,
21947 unsigned long *end, int *graph)
21948 {
21949 struct stack_frame *frame = (struct stack_frame *)bp;
21950
21951- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21952+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21953 unsigned long addr;
21954
21955 addr = *stack;
21956@@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21957 } else {
21958 ops->address(data, addr, 0);
21959 }
21960- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21961+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21962 }
21963 stack++;
21964 }
21965@@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21966 EXPORT_SYMBOL_GPL(print_context_stack);
21967
21968 unsigned long
21969-print_context_stack_bp(struct thread_info *tinfo,
21970+print_context_stack_bp(struct task_struct *task, void *stack_start,
21971 unsigned long *stack, unsigned long bp,
21972 const struct stacktrace_ops *ops, void *data,
21973 unsigned long *end, int *graph)
21974@@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21975 struct stack_frame *frame = (struct stack_frame *)bp;
21976 unsigned long *ret_addr = &frame->return_address;
21977
21978- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21979+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21980 unsigned long addr = *ret_addr;
21981
21982 if (!__kernel_text_address(addr))
21983@@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21984 ops->address(data, addr, 1);
21985 frame = frame->next_frame;
21986 ret_addr = &frame->return_address;
21987- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21988+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21989 }
21990
21991 return (unsigned long)frame;
21992@@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
21993 static void print_trace_address(void *data, unsigned long addr, int reliable)
21994 {
21995 touch_nmi_watchdog();
21996- printk(data);
21997+ printk("%s", (char *)data);
21998 printk_stack_address(addr, reliable);
21999 }
22000
22001@@ -225,6 +224,8 @@ unsigned long oops_begin(void)
22002 EXPORT_SYMBOL_GPL(oops_begin);
22003 NOKPROBE_SYMBOL(oops_begin);
22004
22005+extern void gr_handle_kernel_exploit(void);
22006+
22007 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22008 {
22009 if (regs && kexec_should_crash(current))
22010@@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
22011 panic("Fatal exception in interrupt");
22012 if (panic_on_oops)
22013 panic("Fatal exception");
22014- do_exit(signr);
22015+
22016+ gr_handle_kernel_exploit();
22017+
22018+ do_group_exit(signr);
22019 }
22020 NOKPROBE_SYMBOL(oops_end);
22021
22022@@ -275,7 +279,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
22023 print_modules();
22024 show_regs(regs);
22025 #ifdef CONFIG_X86_32
22026- if (user_mode_vm(regs)) {
22027+ if (user_mode(regs)) {
22028 sp = regs->sp;
22029 ss = regs->ss & 0xffff;
22030 } else {
22031@@ -304,7 +308,7 @@ void die(const char *str, struct pt_regs *regs, long err)
22032 unsigned long flags = oops_begin();
22033 int sig = SIGSEGV;
22034
22035- if (!user_mode_vm(regs))
22036+ if (!user_mode(regs))
22037 report_bug(regs->ip, regs);
22038
22039 if (__die(str, regs, err))
22040diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22041index 5abd4cd..c65733b 100644
22042--- a/arch/x86/kernel/dumpstack_32.c
22043+++ b/arch/x86/kernel/dumpstack_32.c
22044@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22045 bp = stack_frame(task, regs);
22046
22047 for (;;) {
22048- struct thread_info *context;
22049+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22050 void *end_stack;
22051
22052 end_stack = is_hardirq_stack(stack, cpu);
22053 if (!end_stack)
22054 end_stack = is_softirq_stack(stack, cpu);
22055
22056- context = task_thread_info(task);
22057- bp = ops->walk_stack(context, stack, bp, ops, data,
22058+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22059 end_stack, &graph);
22060
22061 /* Stop if not on irq stack */
22062@@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
22063 int i;
22064
22065 show_regs_print_info(KERN_EMERG);
22066- __show_regs(regs, !user_mode_vm(regs));
22067+ __show_regs(regs, !user_mode(regs));
22068
22069 /*
22070 * When in-kernel, we also print out the stack and code at the
22071 * time of the fault..
22072 */
22073- if (!user_mode_vm(regs)) {
22074+ if (!user_mode(regs)) {
22075 unsigned int code_prologue = code_bytes * 43 / 64;
22076 unsigned int code_len = code_bytes;
22077 unsigned char c;
22078 u8 *ip;
22079+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22080
22081 pr_emerg("Stack:\n");
22082 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22083
22084 pr_emerg("Code:");
22085
22086- ip = (u8 *)regs->ip - code_prologue;
22087+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22088 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22089 /* try starting at IP */
22090- ip = (u8 *)regs->ip;
22091+ ip = (u8 *)regs->ip + cs_base;
22092 code_len = code_len - code_prologue + 1;
22093 }
22094 for (i = 0; i < code_len; i++, ip++) {
22095@@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
22096 pr_cont(" Bad EIP value.");
22097 break;
22098 }
22099- if (ip == (u8 *)regs->ip)
22100+ if (ip == (u8 *)regs->ip + cs_base)
22101 pr_cont(" <%02x>", c);
22102 else
22103 pr_cont(" %02x", c);
22104@@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
22105 {
22106 unsigned short ud2;
22107
22108+ ip = ktla_ktva(ip);
22109 if (ip < PAGE_OFFSET)
22110 return 0;
22111 if (probe_kernel_address((unsigned short *)ip, ud2))
22112@@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
22113
22114 return ud2 == 0x0b0f;
22115 }
22116+
22117+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22118+void pax_check_alloca(unsigned long size)
22119+{
22120+ unsigned long sp = (unsigned long)&sp, stack_left;
22121+
22122+ /* all kernel stacks are of the same size */
22123+ stack_left = sp & (THREAD_SIZE - 1);
22124+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22125+}
22126+EXPORT_SYMBOL(pax_check_alloca);
22127+#endif
22128diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22129index ff86f19..a20c62c 100644
22130--- a/arch/x86/kernel/dumpstack_64.c
22131+++ b/arch/x86/kernel/dumpstack_64.c
22132@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22133 const struct stacktrace_ops *ops, void *data)
22134 {
22135 const unsigned cpu = get_cpu();
22136- struct thread_info *tinfo;
22137 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22138 unsigned long dummy;
22139 unsigned used = 0;
22140 int graph = 0;
22141 int done = 0;
22142+ void *stack_start;
22143
22144 if (!task)
22145 task = current;
22146@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22147 * current stack address. If the stacks consist of nested
22148 * exceptions
22149 */
22150- tinfo = task_thread_info(task);
22151 while (!done) {
22152 unsigned long *stack_end;
22153 enum stack_type stype;
22154@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22155 if (ops->stack(data, id) < 0)
22156 break;
22157
22158- bp = ops->walk_stack(tinfo, stack, bp, ops,
22159+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22160 data, stack_end, &graph);
22161 ops->stack(data, "<EOE>");
22162 /*
22163@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22164 * second-to-last pointer (index -2 to end) in the
22165 * exception stack:
22166 */
22167+ if ((u16)stack_end[-1] != __KERNEL_DS)
22168+ goto out;
22169 stack = (unsigned long *) stack_end[-2];
22170 done = 0;
22171 break;
22172@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22173
22174 if (ops->stack(data, "IRQ") < 0)
22175 break;
22176- bp = ops->walk_stack(tinfo, stack, bp,
22177+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22178 ops, data, stack_end, &graph);
22179 /*
22180 * We link to the next stack (which would be
22181@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22182 /*
22183 * This handles the process stack:
22184 */
22185- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22186+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22187+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22188+out:
22189 put_cpu();
22190 }
22191 EXPORT_SYMBOL(dump_trace);
22192@@ -349,3 +352,50 @@ int is_valid_bugaddr(unsigned long ip)
22193
22194 return ud2 == 0x0b0f;
22195 }
22196+
22197+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22198+void pax_check_alloca(unsigned long size)
22199+{
22200+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22201+ unsigned cpu, used;
22202+ char *id;
22203+
22204+ /* check the process stack first */
22205+ stack_start = (unsigned long)task_stack_page(current);
22206+ stack_end = stack_start + THREAD_SIZE;
22207+ if (likely(stack_start <= sp && sp < stack_end)) {
22208+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22209+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22210+ return;
22211+ }
22212+
22213+ cpu = get_cpu();
22214+
22215+ /* check the irq stacks */
22216+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22217+ stack_start = stack_end - IRQ_STACK_SIZE;
22218+ if (stack_start <= sp && sp < stack_end) {
22219+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22220+ put_cpu();
22221+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22222+ return;
22223+ }
22224+
22225+ /* check the exception stacks */
22226+ used = 0;
22227+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22228+ stack_start = stack_end - EXCEPTION_STKSZ;
22229+ if (stack_end && stack_start <= sp && sp < stack_end) {
22230+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22231+ put_cpu();
22232+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22233+ return;
22234+ }
22235+
22236+ put_cpu();
22237+
22238+ /* unknown stack */
22239+ BUG();
22240+}
22241+EXPORT_SYMBOL(pax_check_alloca);
22242+#endif
22243diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22244index 49f8864..1cc6d07 100644
22245--- a/arch/x86/kernel/e820.c
22246+++ b/arch/x86/kernel/e820.c
22247@@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22248
22249 static void early_panic(char *msg)
22250 {
22251- early_printk(msg);
22252- panic(msg);
22253+ early_printk("%s", msg);
22254+ panic("%s", msg);
22255 }
22256
22257 static int userdef __initdata;
22258diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22259index 01d1c18..8073693 100644
22260--- a/arch/x86/kernel/early_printk.c
22261+++ b/arch/x86/kernel/early_printk.c
22262@@ -7,6 +7,7 @@
22263 #include <linux/pci_regs.h>
22264 #include <linux/pci_ids.h>
22265 #include <linux/errno.h>
22266+#include <linux/sched.h>
22267 #include <asm/io.h>
22268 #include <asm/processor.h>
22269 #include <asm/fcntl.h>
22270diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22271index 344b63f..55adf14 100644
22272--- a/arch/x86/kernel/entry_32.S
22273+++ b/arch/x86/kernel/entry_32.S
22274@@ -177,13 +177,154 @@
22275 /*CFI_REL_OFFSET gs, PT_GS*/
22276 .endm
22277 .macro SET_KERNEL_GS reg
22278+
22279+#ifdef CONFIG_CC_STACKPROTECTOR
22280 movl $(__KERNEL_STACK_CANARY), \reg
22281+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22282+ movl $(__USER_DS), \reg
22283+#else
22284+ xorl \reg, \reg
22285+#endif
22286+
22287 movl \reg, %gs
22288 .endm
22289
22290 #endif /* CONFIG_X86_32_LAZY_GS */
22291
22292-.macro SAVE_ALL
22293+.macro pax_enter_kernel
22294+#ifdef CONFIG_PAX_KERNEXEC
22295+ call pax_enter_kernel
22296+#endif
22297+.endm
22298+
22299+.macro pax_exit_kernel
22300+#ifdef CONFIG_PAX_KERNEXEC
22301+ call pax_exit_kernel
22302+#endif
22303+.endm
22304+
22305+#ifdef CONFIG_PAX_KERNEXEC
22306+ENTRY(pax_enter_kernel)
22307+#ifdef CONFIG_PARAVIRT
22308+ pushl %eax
22309+ pushl %ecx
22310+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22311+ mov %eax, %esi
22312+#else
22313+ mov %cr0, %esi
22314+#endif
22315+ bts $16, %esi
22316+ jnc 1f
22317+ mov %cs, %esi
22318+ cmp $__KERNEL_CS, %esi
22319+ jz 3f
22320+ ljmp $__KERNEL_CS, $3f
22321+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22322+2:
22323+#ifdef CONFIG_PARAVIRT
22324+ mov %esi, %eax
22325+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22326+#else
22327+ mov %esi, %cr0
22328+#endif
22329+3:
22330+#ifdef CONFIG_PARAVIRT
22331+ popl %ecx
22332+ popl %eax
22333+#endif
22334+ ret
22335+ENDPROC(pax_enter_kernel)
22336+
22337+ENTRY(pax_exit_kernel)
22338+#ifdef CONFIG_PARAVIRT
22339+ pushl %eax
22340+ pushl %ecx
22341+#endif
22342+ mov %cs, %esi
22343+ cmp $__KERNEXEC_KERNEL_CS, %esi
22344+ jnz 2f
22345+#ifdef CONFIG_PARAVIRT
22346+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22347+ mov %eax, %esi
22348+#else
22349+ mov %cr0, %esi
22350+#endif
22351+ btr $16, %esi
22352+ ljmp $__KERNEL_CS, $1f
22353+1:
22354+#ifdef CONFIG_PARAVIRT
22355+ mov %esi, %eax
22356+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22357+#else
22358+ mov %esi, %cr0
22359+#endif
22360+2:
22361+#ifdef CONFIG_PARAVIRT
22362+ popl %ecx
22363+ popl %eax
22364+#endif
22365+ ret
22366+ENDPROC(pax_exit_kernel)
22367+#endif
22368+
22369+ .macro pax_erase_kstack
22370+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22371+ call pax_erase_kstack
22372+#endif
22373+ .endm
22374+
22375+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22376+/*
22377+ * ebp: thread_info
22378+ */
22379+ENTRY(pax_erase_kstack)
22380+ pushl %edi
22381+ pushl %ecx
22382+ pushl %eax
22383+
22384+ mov TI_lowest_stack(%ebp), %edi
22385+ mov $-0xBEEF, %eax
22386+ std
22387+
22388+1: mov %edi, %ecx
22389+ and $THREAD_SIZE_asm - 1, %ecx
22390+ shr $2, %ecx
22391+ repne scasl
22392+ jecxz 2f
22393+
22394+ cmp $2*16, %ecx
22395+ jc 2f
22396+
22397+ mov $2*16, %ecx
22398+ repe scasl
22399+ jecxz 2f
22400+ jne 1b
22401+
22402+2: cld
22403+ or $2*4, %edi
22404+ mov %esp, %ecx
22405+ sub %edi, %ecx
22406+
22407+ cmp $THREAD_SIZE_asm, %ecx
22408+ jb 3f
22409+ ud2
22410+3:
22411+
22412+ shr $2, %ecx
22413+ rep stosl
22414+
22415+ mov TI_task_thread_sp0(%ebp), %edi
22416+ sub $128, %edi
22417+ mov %edi, TI_lowest_stack(%ebp)
22418+
22419+ popl %eax
22420+ popl %ecx
22421+ popl %edi
22422+ ret
22423+ENDPROC(pax_erase_kstack)
22424+#endif
22425+
22426+.macro __SAVE_ALL _DS
22427 cld
22428 PUSH_GS
22429 pushl_cfi %fs
22430@@ -206,7 +347,7 @@
22431 CFI_REL_OFFSET ecx, 0
22432 pushl_cfi %ebx
22433 CFI_REL_OFFSET ebx, 0
22434- movl $(__USER_DS), %edx
22435+ movl $\_DS, %edx
22436 movl %edx, %ds
22437 movl %edx, %es
22438 movl $(__KERNEL_PERCPU), %edx
22439@@ -214,6 +355,15 @@
22440 SET_KERNEL_GS %edx
22441 .endm
22442
22443+.macro SAVE_ALL
22444+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22445+ __SAVE_ALL __KERNEL_DS
22446+ pax_enter_kernel
22447+#else
22448+ __SAVE_ALL __USER_DS
22449+#endif
22450+.endm
22451+
22452 .macro RESTORE_INT_REGS
22453 popl_cfi %ebx
22454 CFI_RESTORE ebx
22455@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22456 popfl_cfi
22457 jmp syscall_exit
22458 CFI_ENDPROC
22459-END(ret_from_fork)
22460+ENDPROC(ret_from_fork)
22461
22462 ENTRY(ret_from_kernel_thread)
22463 CFI_STARTPROC
22464@@ -340,7 +490,15 @@ ret_from_intr:
22465 andl $SEGMENT_RPL_MASK, %eax
22466 #endif
22467 cmpl $USER_RPL, %eax
22468+
22469+#ifdef CONFIG_PAX_KERNEXEC
22470+ jae resume_userspace
22471+
22472+ pax_exit_kernel
22473+ jmp resume_kernel
22474+#else
22475 jb resume_kernel # not returning to v8086 or userspace
22476+#endif
22477
22478 ENTRY(resume_userspace)
22479 LOCKDEP_SYS_EXIT
22480@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22481 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22482 # int/exception return?
22483 jne work_pending
22484- jmp restore_all
22485-END(ret_from_exception)
22486+ jmp restore_all_pax
22487+ENDPROC(ret_from_exception)
22488
22489 #ifdef CONFIG_PREEMPT
22490 ENTRY(resume_kernel)
22491@@ -365,7 +523,7 @@ need_resched:
22492 jz restore_all
22493 call preempt_schedule_irq
22494 jmp need_resched
22495-END(resume_kernel)
22496+ENDPROC(resume_kernel)
22497 #endif
22498 CFI_ENDPROC
22499
22500@@ -395,30 +553,45 @@ sysenter_past_esp:
22501 /*CFI_REL_OFFSET cs, 0*/
22502 /*
22503 * Push current_thread_info()->sysenter_return to the stack.
22504- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22505- * pushed above; +8 corresponds to copy_thread's esp0 setting.
22506 */
22507- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22508+ pushl_cfi $0
22509 CFI_REL_OFFSET eip, 0
22510
22511 pushl_cfi %eax
22512 SAVE_ALL
22513+ GET_THREAD_INFO(%ebp)
22514+ movl TI_sysenter_return(%ebp),%ebp
22515+ movl %ebp,PT_EIP(%esp)
22516 ENABLE_INTERRUPTS(CLBR_NONE)
22517
22518 /*
22519 * Load the potential sixth argument from user stack.
22520 * Careful about security.
22521 */
22522+ movl PT_OLDESP(%esp),%ebp
22523+
22524+#ifdef CONFIG_PAX_MEMORY_UDEREF
22525+ mov PT_OLDSS(%esp),%ds
22526+1: movl %ds:(%ebp),%ebp
22527+ push %ss
22528+ pop %ds
22529+#else
22530 cmpl $__PAGE_OFFSET-3,%ebp
22531 jae syscall_fault
22532 ASM_STAC
22533 1: movl (%ebp),%ebp
22534 ASM_CLAC
22535+#endif
22536+
22537 movl %ebp,PT_EBP(%esp)
22538 _ASM_EXTABLE(1b,syscall_fault)
22539
22540 GET_THREAD_INFO(%ebp)
22541
22542+#ifdef CONFIG_PAX_RANDKSTACK
22543+ pax_erase_kstack
22544+#endif
22545+
22546 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22547 jnz sysenter_audit
22548 sysenter_do_call:
22549@@ -434,12 +607,24 @@ sysenter_after_call:
22550 testl $_TIF_ALLWORK_MASK, %ecx
22551 jne sysexit_audit
22552 sysenter_exit:
22553+
22554+#ifdef CONFIG_PAX_RANDKSTACK
22555+ pushl_cfi %eax
22556+ movl %esp, %eax
22557+ call pax_randomize_kstack
22558+ popl_cfi %eax
22559+#endif
22560+
22561+ pax_erase_kstack
22562+
22563 /* if something modifies registers it must also disable sysexit */
22564 movl PT_EIP(%esp), %edx
22565 movl PT_OLDESP(%esp), %ecx
22566 xorl %ebp,%ebp
22567 TRACE_IRQS_ON
22568 1: mov PT_FS(%esp), %fs
22569+2: mov PT_DS(%esp), %ds
22570+3: mov PT_ES(%esp), %es
22571 PTGS_TO_GS
22572 ENABLE_INTERRUPTS_SYSEXIT
22573
22574@@ -453,6 +638,9 @@ sysenter_audit:
22575 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22576 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22577 call __audit_syscall_entry
22578+
22579+ pax_erase_kstack
22580+
22581 popl_cfi %ecx /* get that remapped edx off the stack */
22582 popl_cfi %ecx /* get that remapped esi off the stack */
22583 movl PT_EAX(%esp),%eax /* reload syscall number */
22584@@ -479,10 +667,16 @@ sysexit_audit:
22585
22586 CFI_ENDPROC
22587 .pushsection .fixup,"ax"
22588-2: movl $0,PT_FS(%esp)
22589+4: movl $0,PT_FS(%esp)
22590+ jmp 1b
22591+5: movl $0,PT_DS(%esp)
22592+ jmp 1b
22593+6: movl $0,PT_ES(%esp)
22594 jmp 1b
22595 .popsection
22596- _ASM_EXTABLE(1b,2b)
22597+ _ASM_EXTABLE(1b,4b)
22598+ _ASM_EXTABLE(2b,5b)
22599+ _ASM_EXTABLE(3b,6b)
22600 PTGS_TO_GS_EX
22601 ENDPROC(ia32_sysenter_target)
22602
22603@@ -493,6 +687,11 @@ ENTRY(system_call)
22604 pushl_cfi %eax # save orig_eax
22605 SAVE_ALL
22606 GET_THREAD_INFO(%ebp)
22607+
22608+#ifdef CONFIG_PAX_RANDKSTACK
22609+ pax_erase_kstack
22610+#endif
22611+
22612 # system call tracing in operation / emulation
22613 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22614 jnz syscall_trace_entry
22615@@ -512,6 +711,15 @@ syscall_exit:
22616 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22617 jne syscall_exit_work
22618
22619+restore_all_pax:
22620+
22621+#ifdef CONFIG_PAX_RANDKSTACK
22622+ movl %esp, %eax
22623+ call pax_randomize_kstack
22624+#endif
22625+
22626+ pax_erase_kstack
22627+
22628 restore_all:
22629 TRACE_IRQS_IRET
22630 restore_all_notrace:
22631@@ -566,14 +774,34 @@ ldt_ss:
22632 * compensating for the offset by changing to the ESPFIX segment with
22633 * a base address that matches for the difference.
22634 */
22635-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22636+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22637 mov %esp, %edx /* load kernel esp */
22638 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22639 mov %dx, %ax /* eax: new kernel esp */
22640 sub %eax, %edx /* offset (low word is 0) */
22641+#ifdef CONFIG_SMP
22642+ movl PER_CPU_VAR(cpu_number), %ebx
22643+ shll $PAGE_SHIFT_asm, %ebx
22644+ addl $cpu_gdt_table, %ebx
22645+#else
22646+ movl $cpu_gdt_table, %ebx
22647+#endif
22648 shr $16, %edx
22649- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22650- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22651+
22652+#ifdef CONFIG_PAX_KERNEXEC
22653+ mov %cr0, %esi
22654+ btr $16, %esi
22655+ mov %esi, %cr0
22656+#endif
22657+
22658+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22659+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22660+
22661+#ifdef CONFIG_PAX_KERNEXEC
22662+ bts $16, %esi
22663+ mov %esi, %cr0
22664+#endif
22665+
22666 pushl_cfi $__ESPFIX_SS
22667 pushl_cfi %eax /* new kernel esp */
22668 /* Disable interrupts, but do not irqtrace this section: we
22669@@ -603,20 +831,18 @@ work_resched:
22670 movl TI_flags(%ebp), %ecx
22671 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22672 # than syscall tracing?
22673- jz restore_all
22674+ jz restore_all_pax
22675 testb $_TIF_NEED_RESCHED, %cl
22676 jnz work_resched
22677
22678 work_notifysig: # deal with pending signals and
22679 # notify-resume requests
22680+ movl %esp, %eax
22681 #ifdef CONFIG_VM86
22682 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22683- movl %esp, %eax
22684 jne work_notifysig_v86 # returning to kernel-space or
22685 # vm86-space
22686 1:
22687-#else
22688- movl %esp, %eax
22689 #endif
22690 TRACE_IRQS_ON
22691 ENABLE_INTERRUPTS(CLBR_NONE)
22692@@ -637,7 +863,7 @@ work_notifysig_v86:
22693 movl %eax, %esp
22694 jmp 1b
22695 #endif
22696-END(work_pending)
22697+ENDPROC(work_pending)
22698
22699 # perform syscall exit tracing
22700 ALIGN
22701@@ -645,11 +871,14 @@ syscall_trace_entry:
22702 movl $-ENOSYS,PT_EAX(%esp)
22703 movl %esp, %eax
22704 call syscall_trace_enter
22705+
22706+ pax_erase_kstack
22707+
22708 /* What it returned is what we'll actually use. */
22709 cmpl $(NR_syscalls), %eax
22710 jnae syscall_call
22711 jmp syscall_exit
22712-END(syscall_trace_entry)
22713+ENDPROC(syscall_trace_entry)
22714
22715 # perform syscall exit tracing
22716 ALIGN
22717@@ -662,26 +891,30 @@ syscall_exit_work:
22718 movl %esp, %eax
22719 call syscall_trace_leave
22720 jmp resume_userspace
22721-END(syscall_exit_work)
22722+ENDPROC(syscall_exit_work)
22723 CFI_ENDPROC
22724
22725 RING0_INT_FRAME # can't unwind into user space anyway
22726 syscall_fault:
22727+#ifdef CONFIG_PAX_MEMORY_UDEREF
22728+ push %ss
22729+ pop %ds
22730+#endif
22731 ASM_CLAC
22732 GET_THREAD_INFO(%ebp)
22733 movl $-EFAULT,PT_EAX(%esp)
22734 jmp resume_userspace
22735-END(syscall_fault)
22736+ENDPROC(syscall_fault)
22737
22738 syscall_badsys:
22739 movl $-ENOSYS,%eax
22740 jmp syscall_after_call
22741-END(syscall_badsys)
22742+ENDPROC(syscall_badsys)
22743
22744 sysenter_badsys:
22745 movl $-ENOSYS,%eax
22746 jmp sysenter_after_call
22747-END(sysenter_badsys)
22748+ENDPROC(sysenter_badsys)
22749 CFI_ENDPROC
22750
22751 .macro FIXUP_ESPFIX_STACK
22752@@ -694,8 +927,15 @@ END(sysenter_badsys)
22753 */
22754 #ifdef CONFIG_X86_ESPFIX32
22755 /* fixup the stack */
22756- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22757- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22758+#ifdef CONFIG_SMP
22759+ movl PER_CPU_VAR(cpu_number), %ebx
22760+ shll $PAGE_SHIFT_asm, %ebx
22761+ addl $cpu_gdt_table, %ebx
22762+#else
22763+ movl $cpu_gdt_table, %ebx
22764+#endif
22765+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22766+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22767 shl $16, %eax
22768 addl %esp, %eax /* the adjusted stack pointer */
22769 pushl_cfi $__KERNEL_DS
22770@@ -751,7 +991,7 @@ vector=vector+1
22771 .endr
22772 2: jmp common_interrupt
22773 .endr
22774-END(irq_entries_start)
22775+ENDPROC(irq_entries_start)
22776
22777 .previous
22778 END(interrupt)
22779@@ -808,7 +1048,7 @@ ENTRY(coprocessor_error)
22780 pushl_cfi $do_coprocessor_error
22781 jmp error_code
22782 CFI_ENDPROC
22783-END(coprocessor_error)
22784+ENDPROC(coprocessor_error)
22785
22786 ENTRY(simd_coprocessor_error)
22787 RING0_INT_FRAME
22788@@ -821,7 +1061,7 @@ ENTRY(simd_coprocessor_error)
22789 .section .altinstructions,"a"
22790 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22791 .previous
22792-.section .altinstr_replacement,"ax"
22793+.section .altinstr_replacement,"a"
22794 663: pushl $do_simd_coprocessor_error
22795 664:
22796 .previous
22797@@ -830,7 +1070,7 @@ ENTRY(simd_coprocessor_error)
22798 #endif
22799 jmp error_code
22800 CFI_ENDPROC
22801-END(simd_coprocessor_error)
22802+ENDPROC(simd_coprocessor_error)
22803
22804 ENTRY(device_not_available)
22805 RING0_INT_FRAME
22806@@ -839,18 +1079,18 @@ ENTRY(device_not_available)
22807 pushl_cfi $do_device_not_available
22808 jmp error_code
22809 CFI_ENDPROC
22810-END(device_not_available)
22811+ENDPROC(device_not_available)
22812
22813 #ifdef CONFIG_PARAVIRT
22814 ENTRY(native_iret)
22815 iret
22816 _ASM_EXTABLE(native_iret, iret_exc)
22817-END(native_iret)
22818+ENDPROC(native_iret)
22819
22820 ENTRY(native_irq_enable_sysexit)
22821 sti
22822 sysexit
22823-END(native_irq_enable_sysexit)
22824+ENDPROC(native_irq_enable_sysexit)
22825 #endif
22826
22827 ENTRY(overflow)
22828@@ -860,7 +1100,7 @@ ENTRY(overflow)
22829 pushl_cfi $do_overflow
22830 jmp error_code
22831 CFI_ENDPROC
22832-END(overflow)
22833+ENDPROC(overflow)
22834
22835 ENTRY(bounds)
22836 RING0_INT_FRAME
22837@@ -869,7 +1109,7 @@ ENTRY(bounds)
22838 pushl_cfi $do_bounds
22839 jmp error_code
22840 CFI_ENDPROC
22841-END(bounds)
22842+ENDPROC(bounds)
22843
22844 ENTRY(invalid_op)
22845 RING0_INT_FRAME
22846@@ -878,7 +1118,7 @@ ENTRY(invalid_op)
22847 pushl_cfi $do_invalid_op
22848 jmp error_code
22849 CFI_ENDPROC
22850-END(invalid_op)
22851+ENDPROC(invalid_op)
22852
22853 ENTRY(coprocessor_segment_overrun)
22854 RING0_INT_FRAME
22855@@ -887,7 +1127,7 @@ ENTRY(coprocessor_segment_overrun)
22856 pushl_cfi $do_coprocessor_segment_overrun
22857 jmp error_code
22858 CFI_ENDPROC
22859-END(coprocessor_segment_overrun)
22860+ENDPROC(coprocessor_segment_overrun)
22861
22862 ENTRY(invalid_TSS)
22863 RING0_EC_FRAME
22864@@ -895,7 +1135,7 @@ ENTRY(invalid_TSS)
22865 pushl_cfi $do_invalid_TSS
22866 jmp error_code
22867 CFI_ENDPROC
22868-END(invalid_TSS)
22869+ENDPROC(invalid_TSS)
22870
22871 ENTRY(segment_not_present)
22872 RING0_EC_FRAME
22873@@ -903,7 +1143,7 @@ ENTRY(segment_not_present)
22874 pushl_cfi $do_segment_not_present
22875 jmp error_code
22876 CFI_ENDPROC
22877-END(segment_not_present)
22878+ENDPROC(segment_not_present)
22879
22880 ENTRY(stack_segment)
22881 RING0_EC_FRAME
22882@@ -911,7 +1151,7 @@ ENTRY(stack_segment)
22883 pushl_cfi $do_stack_segment
22884 jmp error_code
22885 CFI_ENDPROC
22886-END(stack_segment)
22887+ENDPROC(stack_segment)
22888
22889 ENTRY(alignment_check)
22890 RING0_EC_FRAME
22891@@ -919,7 +1159,7 @@ ENTRY(alignment_check)
22892 pushl_cfi $do_alignment_check
22893 jmp error_code
22894 CFI_ENDPROC
22895-END(alignment_check)
22896+ENDPROC(alignment_check)
22897
22898 ENTRY(divide_error)
22899 RING0_INT_FRAME
22900@@ -928,7 +1168,7 @@ ENTRY(divide_error)
22901 pushl_cfi $do_divide_error
22902 jmp error_code
22903 CFI_ENDPROC
22904-END(divide_error)
22905+ENDPROC(divide_error)
22906
22907 #ifdef CONFIG_X86_MCE
22908 ENTRY(machine_check)
22909@@ -938,7 +1178,7 @@ ENTRY(machine_check)
22910 pushl_cfi machine_check_vector
22911 jmp error_code
22912 CFI_ENDPROC
22913-END(machine_check)
22914+ENDPROC(machine_check)
22915 #endif
22916
22917 ENTRY(spurious_interrupt_bug)
22918@@ -948,7 +1188,7 @@ ENTRY(spurious_interrupt_bug)
22919 pushl_cfi $do_spurious_interrupt_bug
22920 jmp error_code
22921 CFI_ENDPROC
22922-END(spurious_interrupt_bug)
22923+ENDPROC(spurious_interrupt_bug)
22924
22925 #ifdef CONFIG_XEN
22926 /* Xen doesn't set %esp to be precisely what the normal sysenter
22927@@ -1054,7 +1294,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22928
22929 ENTRY(mcount)
22930 ret
22931-END(mcount)
22932+ENDPROC(mcount)
22933
22934 ENTRY(ftrace_caller)
22935 pushl %eax
22936@@ -1084,7 +1324,7 @@ ftrace_graph_call:
22937 .globl ftrace_stub
22938 ftrace_stub:
22939 ret
22940-END(ftrace_caller)
22941+ENDPROC(ftrace_caller)
22942
22943 ENTRY(ftrace_regs_caller)
22944 pushf /* push flags before compare (in cs location) */
22945@@ -1182,7 +1422,7 @@ trace:
22946 popl %ecx
22947 popl %eax
22948 jmp ftrace_stub
22949-END(mcount)
22950+ENDPROC(mcount)
22951 #endif /* CONFIG_DYNAMIC_FTRACE */
22952 #endif /* CONFIG_FUNCTION_TRACER */
22953
22954@@ -1200,7 +1440,7 @@ ENTRY(ftrace_graph_caller)
22955 popl %ecx
22956 popl %eax
22957 ret
22958-END(ftrace_graph_caller)
22959+ENDPROC(ftrace_graph_caller)
22960
22961 .globl return_to_handler
22962 return_to_handler:
22963@@ -1261,15 +1501,18 @@ error_code:
22964 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22965 REG_TO_PTGS %ecx
22966 SET_KERNEL_GS %ecx
22967- movl $(__USER_DS), %ecx
22968+ movl $(__KERNEL_DS), %ecx
22969 movl %ecx, %ds
22970 movl %ecx, %es
22971+
22972+ pax_enter_kernel
22973+
22974 TRACE_IRQS_OFF
22975 movl %esp,%eax # pt_regs pointer
22976 call *%edi
22977 jmp ret_from_exception
22978 CFI_ENDPROC
22979-END(page_fault)
22980+ENDPROC(page_fault)
22981
22982 /*
22983 * Debug traps and NMI can happen at the one SYSENTER instruction
22984@@ -1312,7 +1555,7 @@ debug_stack_correct:
22985 call do_debug
22986 jmp ret_from_exception
22987 CFI_ENDPROC
22988-END(debug)
22989+ENDPROC(debug)
22990
22991 /*
22992 * NMI is doubly nasty. It can happen _while_ we're handling
22993@@ -1352,6 +1595,9 @@ nmi_stack_correct:
22994 xorl %edx,%edx # zero error code
22995 movl %esp,%eax # pt_regs pointer
22996 call do_nmi
22997+
22998+ pax_exit_kernel
22999+
23000 jmp restore_all_notrace
23001 CFI_ENDPROC
23002
23003@@ -1389,13 +1635,16 @@ nmi_espfix_stack:
23004 FIXUP_ESPFIX_STACK # %eax == %esp
23005 xorl %edx,%edx # zero error code
23006 call do_nmi
23007+
23008+ pax_exit_kernel
23009+
23010 RESTORE_REGS
23011 lss 12+4(%esp), %esp # back to espfix stack
23012 CFI_ADJUST_CFA_OFFSET -24
23013 jmp irq_return
23014 #endif
23015 CFI_ENDPROC
23016-END(nmi)
23017+ENDPROC(nmi)
23018
23019 ENTRY(int3)
23020 RING0_INT_FRAME
23021@@ -1408,14 +1657,14 @@ ENTRY(int3)
23022 call do_int3
23023 jmp ret_from_exception
23024 CFI_ENDPROC
23025-END(int3)
23026+ENDPROC(int3)
23027
23028 ENTRY(general_protection)
23029 RING0_EC_FRAME
23030 pushl_cfi $do_general_protection
23031 jmp error_code
23032 CFI_ENDPROC
23033-END(general_protection)
23034+ENDPROC(general_protection)
23035
23036 #ifdef CONFIG_KVM_GUEST
23037 ENTRY(async_page_fault)
23038@@ -1424,6 +1673,6 @@ ENTRY(async_page_fault)
23039 pushl_cfi $do_async_page_fault
23040 jmp error_code
23041 CFI_ENDPROC
23042-END(async_page_fault)
23043+ENDPROC(async_page_fault)
23044 #endif
23045
23046diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23047index c0226ab..0d1dc48 100644
23048--- a/arch/x86/kernel/entry_64.S
23049+++ b/arch/x86/kernel/entry_64.S
23050@@ -59,6 +59,8 @@
23051 #include <asm/smap.h>
23052 #include <asm/pgtable_types.h>
23053 #include <linux/err.h>
23054+#include <asm/pgtable.h>
23055+#include <asm/alternative-asm.h>
23056
23057 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23058 #include <linux/elf-em.h>
23059@@ -81,6 +83,431 @@ ENTRY(native_usergs_sysret64)
23060 ENDPROC(native_usergs_sysret64)
23061 #endif /* CONFIG_PARAVIRT */
23062
23063+ .macro ljmpq sel, off
23064+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23065+ .byte 0x48; ljmp *1234f(%rip)
23066+ .pushsection .rodata
23067+ .align 16
23068+ 1234: .quad \off; .word \sel
23069+ .popsection
23070+#else
23071+ pushq $\sel
23072+ pushq $\off
23073+ lretq
23074+#endif
23075+ .endm
23076+
23077+ .macro pax_enter_kernel
23078+ pax_set_fptr_mask
23079+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23080+ call pax_enter_kernel
23081+#endif
23082+ .endm
23083+
23084+ .macro pax_exit_kernel
23085+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23086+ call pax_exit_kernel
23087+#endif
23088+
23089+ .endm
23090+
23091+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23092+ENTRY(pax_enter_kernel)
23093+ pushq %rdi
23094+
23095+#ifdef CONFIG_PARAVIRT
23096+ PV_SAVE_REGS(CLBR_RDI)
23097+#endif
23098+
23099+#ifdef CONFIG_PAX_KERNEXEC
23100+ GET_CR0_INTO_RDI
23101+ bts $16,%rdi
23102+ jnc 3f
23103+ mov %cs,%edi
23104+ cmp $__KERNEL_CS,%edi
23105+ jnz 2f
23106+1:
23107+#endif
23108+
23109+#ifdef CONFIG_PAX_MEMORY_UDEREF
23110+ 661: jmp 111f
23111+ .pushsection .altinstr_replacement, "a"
23112+ 662: ASM_NOP2
23113+ .popsection
23114+ .pushsection .altinstructions, "a"
23115+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23116+ .popsection
23117+ GET_CR3_INTO_RDI
23118+ cmp $0,%dil
23119+ jnz 112f
23120+ mov $__KERNEL_DS,%edi
23121+ mov %edi,%ss
23122+ jmp 111f
23123+112: cmp $1,%dil
23124+ jz 113f
23125+ ud2
23126+113: sub $4097,%rdi
23127+ bts $63,%rdi
23128+ SET_RDI_INTO_CR3
23129+ mov $__UDEREF_KERNEL_DS,%edi
23130+ mov %edi,%ss
23131+111:
23132+#endif
23133+
23134+#ifdef CONFIG_PARAVIRT
23135+ PV_RESTORE_REGS(CLBR_RDI)
23136+#endif
23137+
23138+ popq %rdi
23139+ pax_force_retaddr
23140+ retq
23141+
23142+#ifdef CONFIG_PAX_KERNEXEC
23143+2: ljmpq __KERNEL_CS,1b
23144+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23145+4: SET_RDI_INTO_CR0
23146+ jmp 1b
23147+#endif
23148+ENDPROC(pax_enter_kernel)
23149+
23150+ENTRY(pax_exit_kernel)
23151+ pushq %rdi
23152+
23153+#ifdef CONFIG_PARAVIRT
23154+ PV_SAVE_REGS(CLBR_RDI)
23155+#endif
23156+
23157+#ifdef CONFIG_PAX_KERNEXEC
23158+ mov %cs,%rdi
23159+ cmp $__KERNEXEC_KERNEL_CS,%edi
23160+ jz 2f
23161+ GET_CR0_INTO_RDI
23162+ bts $16,%rdi
23163+ jnc 4f
23164+1:
23165+#endif
23166+
23167+#ifdef CONFIG_PAX_MEMORY_UDEREF
23168+ 661: jmp 111f
23169+ .pushsection .altinstr_replacement, "a"
23170+ 662: ASM_NOP2
23171+ .popsection
23172+ .pushsection .altinstructions, "a"
23173+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23174+ .popsection
23175+ mov %ss,%edi
23176+ cmp $__UDEREF_KERNEL_DS,%edi
23177+ jnz 111f
23178+ GET_CR3_INTO_RDI
23179+ cmp $0,%dil
23180+ jz 112f
23181+ ud2
23182+112: add $4097,%rdi
23183+ bts $63,%rdi
23184+ SET_RDI_INTO_CR3
23185+ mov $__KERNEL_DS,%edi
23186+ mov %edi,%ss
23187+111:
23188+#endif
23189+
23190+#ifdef CONFIG_PARAVIRT
23191+ PV_RESTORE_REGS(CLBR_RDI);
23192+#endif
23193+
23194+ popq %rdi
23195+ pax_force_retaddr
23196+ retq
23197+
23198+#ifdef CONFIG_PAX_KERNEXEC
23199+2: GET_CR0_INTO_RDI
23200+ btr $16,%rdi
23201+ jnc 4f
23202+ ljmpq __KERNEL_CS,3f
23203+3: SET_RDI_INTO_CR0
23204+ jmp 1b
23205+4: ud2
23206+ jmp 4b
23207+#endif
23208+ENDPROC(pax_exit_kernel)
23209+#endif
23210+
23211+ .macro pax_enter_kernel_user
23212+ pax_set_fptr_mask
23213+#ifdef CONFIG_PAX_MEMORY_UDEREF
23214+ call pax_enter_kernel_user
23215+#endif
23216+ .endm
23217+
23218+ .macro pax_exit_kernel_user
23219+#ifdef CONFIG_PAX_MEMORY_UDEREF
23220+ call pax_exit_kernel_user
23221+#endif
23222+#ifdef CONFIG_PAX_RANDKSTACK
23223+ pushq %rax
23224+ pushq %r11
23225+ call pax_randomize_kstack
23226+ popq %r11
23227+ popq %rax
23228+#endif
23229+ .endm
23230+
23231+#ifdef CONFIG_PAX_MEMORY_UDEREF
23232+ENTRY(pax_enter_kernel_user)
23233+ pushq %rdi
23234+ pushq %rbx
23235+
23236+#ifdef CONFIG_PARAVIRT
23237+ PV_SAVE_REGS(CLBR_RDI)
23238+#endif
23239+
23240+ 661: jmp 111f
23241+ .pushsection .altinstr_replacement, "a"
23242+ 662: ASM_NOP2
23243+ .popsection
23244+ .pushsection .altinstructions, "a"
23245+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23246+ .popsection
23247+ GET_CR3_INTO_RDI
23248+ cmp $1,%dil
23249+ jnz 4f
23250+ sub $4097,%rdi
23251+ bts $63,%rdi
23252+ SET_RDI_INTO_CR3
23253+ jmp 3f
23254+111:
23255+
23256+ GET_CR3_INTO_RDI
23257+ mov %rdi,%rbx
23258+ add $__START_KERNEL_map,%rbx
23259+ sub phys_base(%rip),%rbx
23260+
23261+#ifdef CONFIG_PARAVIRT
23262+ cmpl $0, pv_info+PARAVIRT_enabled
23263+ jz 1f
23264+ pushq %rdi
23265+ i = 0
23266+ .rept USER_PGD_PTRS
23267+ mov i*8(%rbx),%rsi
23268+ mov $0,%sil
23269+ lea i*8(%rbx),%rdi
23270+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23271+ i = i + 1
23272+ .endr
23273+ popq %rdi
23274+ jmp 2f
23275+1:
23276+#endif
23277+
23278+ i = 0
23279+ .rept USER_PGD_PTRS
23280+ movb $0,i*8(%rbx)
23281+ i = i + 1
23282+ .endr
23283+
23284+2: SET_RDI_INTO_CR3
23285+
23286+#ifdef CONFIG_PAX_KERNEXEC
23287+ GET_CR0_INTO_RDI
23288+ bts $16,%rdi
23289+ SET_RDI_INTO_CR0
23290+#endif
23291+
23292+3:
23293+
23294+#ifdef CONFIG_PARAVIRT
23295+ PV_RESTORE_REGS(CLBR_RDI)
23296+#endif
23297+
23298+ popq %rbx
23299+ popq %rdi
23300+ pax_force_retaddr
23301+ retq
23302+4: ud2
23303+ENDPROC(pax_enter_kernel_user)
23304+
23305+ENTRY(pax_exit_kernel_user)
23306+ pushq %rdi
23307+ pushq %rbx
23308+
23309+#ifdef CONFIG_PARAVIRT
23310+ PV_SAVE_REGS(CLBR_RDI)
23311+#endif
23312+
23313+ GET_CR3_INTO_RDI
23314+ 661: jmp 1f
23315+ .pushsection .altinstr_replacement, "a"
23316+ 662: ASM_NOP2
23317+ .popsection
23318+ .pushsection .altinstructions, "a"
23319+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23320+ .popsection
23321+ cmp $0,%dil
23322+ jnz 3f
23323+ add $4097,%rdi
23324+ bts $63,%rdi
23325+ SET_RDI_INTO_CR3
23326+ jmp 2f
23327+1:
23328+
23329+ mov %rdi,%rbx
23330+
23331+#ifdef CONFIG_PAX_KERNEXEC
23332+ GET_CR0_INTO_RDI
23333+ btr $16,%rdi
23334+ jnc 3f
23335+ SET_RDI_INTO_CR0
23336+#endif
23337+
23338+ add $__START_KERNEL_map,%rbx
23339+ sub phys_base(%rip),%rbx
23340+
23341+#ifdef CONFIG_PARAVIRT
23342+ cmpl $0, pv_info+PARAVIRT_enabled
23343+ jz 1f
23344+ i = 0
23345+ .rept USER_PGD_PTRS
23346+ mov i*8(%rbx),%rsi
23347+ mov $0x67,%sil
23348+ lea i*8(%rbx),%rdi
23349+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23350+ i = i + 1
23351+ .endr
23352+ jmp 2f
23353+1:
23354+#endif
23355+
23356+ i = 0
23357+ .rept USER_PGD_PTRS
23358+ movb $0x67,i*8(%rbx)
23359+ i = i + 1
23360+ .endr
23361+2:
23362+
23363+#ifdef CONFIG_PARAVIRT
23364+ PV_RESTORE_REGS(CLBR_RDI)
23365+#endif
23366+
23367+ popq %rbx
23368+ popq %rdi
23369+ pax_force_retaddr
23370+ retq
23371+3: ud2
23372+ENDPROC(pax_exit_kernel_user)
23373+#endif
23374+
23375+ .macro pax_enter_kernel_nmi
23376+ pax_set_fptr_mask
23377+
23378+#ifdef CONFIG_PAX_KERNEXEC
23379+ GET_CR0_INTO_RDI
23380+ bts $16,%rdi
23381+ jc 110f
23382+ SET_RDI_INTO_CR0
23383+ or $2,%ebx
23384+110:
23385+#endif
23386+
23387+#ifdef CONFIG_PAX_MEMORY_UDEREF
23388+ 661: jmp 111f
23389+ .pushsection .altinstr_replacement, "a"
23390+ 662: ASM_NOP2
23391+ .popsection
23392+ .pushsection .altinstructions, "a"
23393+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23394+ .popsection
23395+ GET_CR3_INTO_RDI
23396+ cmp $0,%dil
23397+ jz 111f
23398+ sub $4097,%rdi
23399+ or $4,%ebx
23400+ bts $63,%rdi
23401+ SET_RDI_INTO_CR3
23402+ mov $__UDEREF_KERNEL_DS,%edi
23403+ mov %edi,%ss
23404+111:
23405+#endif
23406+ .endm
23407+
23408+ .macro pax_exit_kernel_nmi
23409+#ifdef CONFIG_PAX_KERNEXEC
23410+ btr $1,%ebx
23411+ jnc 110f
23412+ GET_CR0_INTO_RDI
23413+ btr $16,%rdi
23414+ SET_RDI_INTO_CR0
23415+110:
23416+#endif
23417+
23418+#ifdef CONFIG_PAX_MEMORY_UDEREF
23419+ btr $2,%ebx
23420+ jnc 111f
23421+ GET_CR3_INTO_RDI
23422+ add $4097,%rdi
23423+ bts $63,%rdi
23424+ SET_RDI_INTO_CR3
23425+ mov $__KERNEL_DS,%edi
23426+ mov %edi,%ss
23427+111:
23428+#endif
23429+ .endm
23430+
23431+ .macro pax_erase_kstack
23432+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23433+ call pax_erase_kstack
23434+#endif
23435+ .endm
23436+
23437+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23438+ENTRY(pax_erase_kstack)
23439+ pushq %rdi
23440+ pushq %rcx
23441+ pushq %rax
23442+ pushq %r11
23443+
23444+ GET_THREAD_INFO(%r11)
23445+ mov TI_lowest_stack(%r11), %rdi
23446+ mov $-0xBEEF, %rax
23447+ std
23448+
23449+1: mov %edi, %ecx
23450+ and $THREAD_SIZE_asm - 1, %ecx
23451+ shr $3, %ecx
23452+ repne scasq
23453+ jecxz 2f
23454+
23455+ cmp $2*8, %ecx
23456+ jc 2f
23457+
23458+ mov $2*8, %ecx
23459+ repe scasq
23460+ jecxz 2f
23461+ jne 1b
23462+
23463+2: cld
23464+ or $2*8, %rdi
23465+ mov %esp, %ecx
23466+ sub %edi, %ecx
23467+
23468+ cmp $THREAD_SIZE_asm, %rcx
23469+ jb 3f
23470+ ud2
23471+3:
23472+
23473+ shr $3, %ecx
23474+ rep stosq
23475+
23476+ mov TI_task_thread_sp0(%r11), %rdi
23477+ sub $256, %rdi
23478+ mov %rdi, TI_lowest_stack(%r11)
23479+
23480+ popq %r11
23481+ popq %rax
23482+ popq %rcx
23483+ popq %rdi
23484+ pax_force_retaddr
23485+ ret
23486+ENDPROC(pax_erase_kstack)
23487+#endif
23488
23489 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23490 #ifdef CONFIG_TRACE_IRQFLAGS
23491@@ -117,7 +544,7 @@ ENDPROC(native_usergs_sysret64)
23492 .endm
23493
23494 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23495- bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23496+ bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23497 jnc 1f
23498 TRACE_IRQS_ON_DEBUG
23499 1:
23500@@ -155,27 +582,6 @@ ENDPROC(native_usergs_sysret64)
23501 movq \tmp,R11+\offset(%rsp)
23502 .endm
23503
23504- .macro FAKE_STACK_FRAME child_rip
23505- /* push in order ss, rsp, eflags, cs, rip */
23506- xorl %eax, %eax
23507- pushq_cfi $__KERNEL_DS /* ss */
23508- /*CFI_REL_OFFSET ss,0*/
23509- pushq_cfi %rax /* rsp */
23510- CFI_REL_OFFSET rsp,0
23511- pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
23512- /*CFI_REL_OFFSET rflags,0*/
23513- pushq_cfi $__KERNEL_CS /* cs */
23514- /*CFI_REL_OFFSET cs,0*/
23515- pushq_cfi \child_rip /* rip */
23516- CFI_REL_OFFSET rip,0
23517- pushq_cfi %rax /* orig rax */
23518- .endm
23519-
23520- .macro UNFAKE_STACK_FRAME
23521- addq $8*6, %rsp
23522- CFI_ADJUST_CFA_OFFSET -(6*8)
23523- .endm
23524-
23525 /*
23526 * initial frame state for interrupts (and exceptions without error code)
23527 */
23528@@ -241,25 +647,26 @@ ENDPROC(native_usergs_sysret64)
23529 /* save partial stack frame */
23530 .macro SAVE_ARGS_IRQ
23531 cld
23532- /* start from rbp in pt_regs and jump over */
23533- movq_cfi rdi, (RDI-RBP)
23534- movq_cfi rsi, (RSI-RBP)
23535- movq_cfi rdx, (RDX-RBP)
23536- movq_cfi rcx, (RCX-RBP)
23537- movq_cfi rax, (RAX-RBP)
23538- movq_cfi r8, (R8-RBP)
23539- movq_cfi r9, (R9-RBP)
23540- movq_cfi r10, (R10-RBP)
23541- movq_cfi r11, (R11-RBP)
23542+ /* start from r15 in pt_regs and jump over */
23543+ movq_cfi rdi, RDI
23544+ movq_cfi rsi, RSI
23545+ movq_cfi rdx, RDX
23546+ movq_cfi rcx, RCX
23547+ movq_cfi rax, RAX
23548+ movq_cfi r8, R8
23549+ movq_cfi r9, R9
23550+ movq_cfi r10, R10
23551+ movq_cfi r11, R11
23552+ movq_cfi r12, R12
23553
23554 /* Save rbp so that we can unwind from get_irq_regs() */
23555- movq_cfi rbp, 0
23556+ movq_cfi rbp, RBP
23557
23558 /* Save previous stack value */
23559 movq %rsp, %rsi
23560
23561- leaq -RBP(%rsp),%rdi /* arg1 for handler */
23562- testl $3, CS-RBP(%rsi)
23563+ movq %rsp,%rdi /* arg1 for handler */
23564+ testb $3, CS(%rsi)
23565 je 1f
23566 SWAPGS
23567 /*
23568@@ -279,6 +686,18 @@ ENDPROC(native_usergs_sysret64)
23569 0x06 /* DW_OP_deref */, \
23570 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23571 0x22 /* DW_OP_plus */
23572+
23573+#ifdef CONFIG_PAX_MEMORY_UDEREF
23574+ testb $3, CS(%rdi)
23575+ jnz 1f
23576+ pax_enter_kernel
23577+ jmp 2f
23578+1: pax_enter_kernel_user
23579+2:
23580+#else
23581+ pax_enter_kernel
23582+#endif
23583+
23584 /* We entered an interrupt context - irqs are off: */
23585 TRACE_IRQS_OFF
23586 .endm
23587@@ -308,9 +727,52 @@ ENTRY(save_paranoid)
23588 js 1f /* negative -> in kernel */
23589 SWAPGS
23590 xorl %ebx,%ebx
23591-1: ret
23592+1:
23593+#ifdef CONFIG_PAX_MEMORY_UDEREF
23594+ testb $3, CS+8(%rsp)
23595+ jnz 1f
23596+ pax_enter_kernel
23597+ jmp 2f
23598+1: pax_enter_kernel_user
23599+2:
23600+#else
23601+ pax_enter_kernel
23602+#endif
23603+ pax_force_retaddr
23604+ ret
23605 CFI_ENDPROC
23606-END(save_paranoid)
23607+ENDPROC(save_paranoid)
23608+
23609+ENTRY(save_paranoid_nmi)
23610+ XCPT_FRAME 1 RDI+8
23611+ cld
23612+ movq_cfi rdi, RDI+8
23613+ movq_cfi rsi, RSI+8
23614+ movq_cfi rdx, RDX+8
23615+ movq_cfi rcx, RCX+8
23616+ movq_cfi rax, RAX+8
23617+ movq_cfi r8, R8+8
23618+ movq_cfi r9, R9+8
23619+ movq_cfi r10, R10+8
23620+ movq_cfi r11, R11+8
23621+ movq_cfi rbx, RBX+8
23622+ movq_cfi rbp, RBP+8
23623+ movq_cfi r12, R12+8
23624+ movq_cfi r13, R13+8
23625+ movq_cfi r14, R14+8
23626+ movq_cfi r15, R15+8
23627+ movl $1,%ebx
23628+ movl $MSR_GS_BASE,%ecx
23629+ rdmsr
23630+ testl %edx,%edx
23631+ js 1f /* negative -> in kernel */
23632+ SWAPGS
23633+ xorl %ebx,%ebx
23634+1: pax_enter_kernel_nmi
23635+ pax_force_retaddr
23636+ ret
23637+ CFI_ENDPROC
23638+ENDPROC(save_paranoid_nmi)
23639
23640 /*
23641 * A newly forked process directly context switches into this address.
23642@@ -331,7 +793,7 @@ ENTRY(ret_from_fork)
23643
23644 RESTORE_REST
23645
23646- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23647+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23648 jz 1f
23649
23650 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
23651@@ -341,15 +803,13 @@ ENTRY(ret_from_fork)
23652 jmp ret_from_sys_call # go to the SYSRET fastpath
23653
23654 1:
23655- subq $REST_SKIP, %rsp # leave space for volatiles
23656- CFI_ADJUST_CFA_OFFSET REST_SKIP
23657 movq %rbp, %rdi
23658 call *%rbx
23659 movl $0, RAX(%rsp)
23660 RESTORE_REST
23661 jmp int_ret_from_sys_call
23662 CFI_ENDPROC
23663-END(ret_from_fork)
23664+ENDPROC(ret_from_fork)
23665
23666 /*
23667 * System call entry. Up to 6 arguments in registers are supported.
23668@@ -386,7 +846,7 @@ END(ret_from_fork)
23669 ENTRY(system_call)
23670 CFI_STARTPROC simple
23671 CFI_SIGNAL_FRAME
23672- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23673+ CFI_DEF_CFA rsp,0
23674 CFI_REGISTER rip,rcx
23675 /*CFI_REGISTER rflags,r11*/
23676 SWAPGS_UNSAFE_STACK
23677@@ -399,16 +859,23 @@ GLOBAL(system_call_after_swapgs)
23678
23679 movq %rsp,PER_CPU_VAR(old_rsp)
23680 movq PER_CPU_VAR(kernel_stack),%rsp
23681+ SAVE_ARGS 8*6, 0, rax_enosys=1
23682+ pax_enter_kernel_user
23683+
23684+#ifdef CONFIG_PAX_RANDKSTACK
23685+ pax_erase_kstack
23686+#endif
23687+
23688 /*
23689 * No need to follow this irqs off/on section - it's straight
23690 * and short:
23691 */
23692 ENABLE_INTERRUPTS(CLBR_NONE)
23693- SAVE_ARGS 8, 0, rax_enosys=1
23694 movq_cfi rax,(ORIG_RAX-ARGOFFSET)
23695 movq %rcx,RIP-ARGOFFSET(%rsp)
23696 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23697- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23698+ GET_THREAD_INFO(%rcx)
23699+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23700 jnz tracesys
23701 system_call_fastpath:
23702 #if __SYSCALL_MASK == ~0
23703@@ -432,10 +899,13 @@ sysret_check:
23704 LOCKDEP_SYS_EXIT
23705 DISABLE_INTERRUPTS(CLBR_NONE)
23706 TRACE_IRQS_OFF
23707- movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
23708+ GET_THREAD_INFO(%rcx)
23709+ movl TI_flags(%rcx),%edx
23710 andl %edi,%edx
23711 jnz sysret_careful
23712 CFI_REMEMBER_STATE
23713+ pax_exit_kernel_user
23714+ pax_erase_kstack
23715 /*
23716 * sysretq will re-enable interrupts:
23717 */
23718@@ -494,12 +964,15 @@ sysret_audit:
23719
23720 /* Do syscall tracing */
23721 tracesys:
23722- leaq -REST_SKIP(%rsp), %rdi
23723+ movq %rsp, %rdi
23724 movq $AUDIT_ARCH_X86_64, %rsi
23725 call syscall_trace_enter_phase1
23726 test %rax, %rax
23727 jnz tracesys_phase2 /* if needed, run the slow path */
23728- LOAD_ARGS 0 /* else restore clobbered regs */
23729+
23730+ pax_erase_kstack
23731+
23732+ LOAD_ARGS /* else restore clobbered regs */
23733 jmp system_call_fastpath /* and return to the fast path */
23734
23735 tracesys_phase2:
23736@@ -510,12 +983,14 @@ tracesys_phase2:
23737 movq %rax,%rdx
23738 call syscall_trace_enter_phase2
23739
23740+ pax_erase_kstack
23741+
23742 /*
23743 * Reload arg registers from stack in case ptrace changed them.
23744 * We don't reload %rax because syscall_trace_entry_phase2() returned
23745 * the value it wants us to use in the table lookup.
23746 */
23747- LOAD_ARGS ARGOFFSET, 1
23748+ LOAD_ARGS 1
23749 RESTORE_REST
23750 #if __SYSCALL_MASK == ~0
23751 cmpq $__NR_syscall_max,%rax
23752@@ -545,7 +1020,9 @@ GLOBAL(int_with_check)
23753 andl %edi,%edx
23754 jnz int_careful
23755 andl $~TS_COMPAT,TI_status(%rcx)
23756- jmp retint_swapgs
23757+ pax_exit_kernel_user
23758+ pax_erase_kstack
23759+ jmp retint_swapgs_pax
23760
23761 /* Either reschedule or signal or syscall exit tracking needed. */
23762 /* First do a reschedule test. */
23763@@ -591,7 +1068,7 @@ int_restore_rest:
23764 TRACE_IRQS_OFF
23765 jmp int_with_check
23766 CFI_ENDPROC
23767-END(system_call)
23768+ENDPROC(system_call)
23769
23770 .macro FORK_LIKE func
23771 ENTRY(stub_\func)
23772@@ -604,9 +1081,10 @@ ENTRY(stub_\func)
23773 DEFAULT_FRAME 0 8 /* offset 8: return address */
23774 call sys_\func
23775 RESTORE_TOP_OF_STACK %r11, 8
23776- ret $REST_SKIP /* pop extended registers */
23777+ pax_force_retaddr
23778+ ret
23779 CFI_ENDPROC
23780-END(stub_\func)
23781+ENDPROC(stub_\func)
23782 .endm
23783
23784 .macro FIXED_FRAME label,func
23785@@ -616,9 +1094,10 @@ ENTRY(\label)
23786 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23787 call \func
23788 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23789+ pax_force_retaddr
23790 ret
23791 CFI_ENDPROC
23792-END(\label)
23793+ENDPROC(\label)
23794 .endm
23795
23796 FORK_LIKE clone
23797@@ -626,19 +1105,6 @@ END(\label)
23798 FORK_LIKE vfork
23799 FIXED_FRAME stub_iopl, sys_iopl
23800
23801-ENTRY(ptregscall_common)
23802- DEFAULT_FRAME 1 8 /* offset 8: return address */
23803- RESTORE_TOP_OF_STACK %r11, 8
23804- movq_cfi_restore R15+8, r15
23805- movq_cfi_restore R14+8, r14
23806- movq_cfi_restore R13+8, r13
23807- movq_cfi_restore R12+8, r12
23808- movq_cfi_restore RBP+8, rbp
23809- movq_cfi_restore RBX+8, rbx
23810- ret $REST_SKIP /* pop extended registers */
23811- CFI_ENDPROC
23812-END(ptregscall_common)
23813-
23814 ENTRY(stub_execve)
23815 CFI_STARTPROC
23816 addq $8, %rsp
23817@@ -650,7 +1116,7 @@ ENTRY(stub_execve)
23818 RESTORE_REST
23819 jmp int_ret_from_sys_call
23820 CFI_ENDPROC
23821-END(stub_execve)
23822+ENDPROC(stub_execve)
23823
23824 /*
23825 * sigreturn is special because it needs to restore all registers on return.
23826@@ -667,7 +1133,7 @@ ENTRY(stub_rt_sigreturn)
23827 RESTORE_REST
23828 jmp int_ret_from_sys_call
23829 CFI_ENDPROC
23830-END(stub_rt_sigreturn)
23831+ENDPROC(stub_rt_sigreturn)
23832
23833 #ifdef CONFIG_X86_X32_ABI
23834 ENTRY(stub_x32_rt_sigreturn)
23835@@ -681,7 +1147,7 @@ ENTRY(stub_x32_rt_sigreturn)
23836 RESTORE_REST
23837 jmp int_ret_from_sys_call
23838 CFI_ENDPROC
23839-END(stub_x32_rt_sigreturn)
23840+ENDPROC(stub_x32_rt_sigreturn)
23841
23842 ENTRY(stub_x32_execve)
23843 CFI_STARTPROC
23844@@ -695,7 +1161,7 @@ ENTRY(stub_x32_execve)
23845 RESTORE_REST
23846 jmp int_ret_from_sys_call
23847 CFI_ENDPROC
23848-END(stub_x32_execve)
23849+ENDPROC(stub_x32_execve)
23850
23851 #endif
23852
23853@@ -732,7 +1198,7 @@ vector=vector+1
23854 2: jmp common_interrupt
23855 .endr
23856 CFI_ENDPROC
23857-END(irq_entries_start)
23858+ENDPROC(irq_entries_start)
23859
23860 .previous
23861 END(interrupt)
23862@@ -749,8 +1215,8 @@ END(interrupt)
23863 /* 0(%rsp): ~(interrupt number) */
23864 .macro interrupt func
23865 /* reserve pt_regs for scratch regs and rbp */
23866- subq $ORIG_RAX-RBP, %rsp
23867- CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23868+ subq $ORIG_RAX, %rsp
23869+ CFI_ADJUST_CFA_OFFSET ORIG_RAX
23870 SAVE_ARGS_IRQ
23871 call \func
23872 .endm
23873@@ -773,14 +1239,14 @@ ret_from_intr:
23874
23875 /* Restore saved previous stack */
23876 popq %rsi
23877- CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23878- leaq ARGOFFSET-RBP(%rsi), %rsp
23879+ CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23880+ movq %rsi, %rsp
23881 CFI_DEF_CFA_REGISTER rsp
23882- CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23883+ CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23884
23885 exit_intr:
23886 GET_THREAD_INFO(%rcx)
23887- testl $3,CS-ARGOFFSET(%rsp)
23888+ testb $3,CS-ARGOFFSET(%rsp)
23889 je retint_kernel
23890
23891 /* Interrupt came from user space */
23892@@ -802,12 +1268,35 @@ retint_swapgs: /* return to user-space */
23893 * The iretq could re-enable interrupts:
23894 */
23895 DISABLE_INTERRUPTS(CLBR_ANY)
23896+ pax_exit_kernel_user
23897+retint_swapgs_pax:
23898 TRACE_IRQS_IRETQ
23899 SWAPGS
23900 jmp restore_args
23901
23902 retint_restore_args: /* return to kernel space */
23903 DISABLE_INTERRUPTS(CLBR_ANY)
23904+ pax_exit_kernel
23905+
23906+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23907+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23908+ * namely calling EFI runtime services with a phys mapping. We're
23909+ * starting off with NOPs and patch in the real instrumentation
23910+ * (BTS/OR) before starting any userland process; even before starting
23911+ * up the APs.
23912+ */
23913+ .pushsection .altinstr_replacement, "a"
23914+ 601: pax_force_retaddr (RIP-ARGOFFSET)
23915+ 602:
23916+ .popsection
23917+ 603: .fill 602b-601b, 1, 0x90
23918+ .pushsection .altinstructions, "a"
23919+ altinstruction_entry 603b, 601b, X86_FEATURE_ALWAYS, 602b-601b, 602b-601b
23920+ .popsection
23921+#else
23922+ pax_force_retaddr (RIP-ARGOFFSET)
23923+#endif
23924+
23925 /*
23926 * The iretq could re-enable interrupts:
23927 */
23928@@ -845,15 +1334,15 @@ native_irq_return_ldt:
23929 SWAPGS
23930 movq PER_CPU_VAR(espfix_waddr),%rdi
23931 movq %rax,(0*8)(%rdi) /* RAX */
23932- movq (2*8)(%rsp),%rax /* RIP */
23933+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23934 movq %rax,(1*8)(%rdi)
23935- movq (3*8)(%rsp),%rax /* CS */
23936+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23937 movq %rax,(2*8)(%rdi)
23938- movq (4*8)(%rsp),%rax /* RFLAGS */
23939+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23940 movq %rax,(3*8)(%rdi)
23941- movq (6*8)(%rsp),%rax /* SS */
23942+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23943 movq %rax,(5*8)(%rdi)
23944- movq (5*8)(%rsp),%rax /* RSP */
23945+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23946 movq %rax,(4*8)(%rdi)
23947 andl $0xffff0000,%eax
23948 popq_cfi %rdi
23949@@ -907,7 +1396,7 @@ ENTRY(retint_kernel)
23950 jmp exit_intr
23951 #endif
23952 CFI_ENDPROC
23953-END(common_interrupt)
23954+ENDPROC(common_interrupt)
23955
23956 /*
23957 * APIC interrupts.
23958@@ -921,7 +1410,7 @@ ENTRY(\sym)
23959 interrupt \do_sym
23960 jmp ret_from_intr
23961 CFI_ENDPROC
23962-END(\sym)
23963+ENDPROC(\sym)
23964 .endm
23965
23966 #ifdef CONFIG_TRACING
23967@@ -994,7 +1483,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23968 /*
23969 * Exception entry points.
23970 */
23971-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23972+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23973
23974 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23975 ENTRY(\sym)
23976@@ -1045,6 +1534,12 @@ ENTRY(\sym)
23977 .endif
23978
23979 .if \shift_ist != -1
23980+#ifdef CONFIG_SMP
23981+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23982+ lea init_tss(%r13), %r13
23983+#else
23984+ lea init_tss(%rip), %r13
23985+#endif
23986 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
23987 .endif
23988
23989@@ -1061,7 +1556,7 @@ ENTRY(\sym)
23990 .endif
23991
23992 CFI_ENDPROC
23993-END(\sym)
23994+ENDPROC(\sym)
23995 .endm
23996
23997 #ifdef CONFIG_TRACING
23998@@ -1102,9 +1597,10 @@ gs_change:
23999 2: mfence /* workaround */
24000 SWAPGS
24001 popfq_cfi
24002+ pax_force_retaddr
24003 ret
24004 CFI_ENDPROC
24005-END(native_load_gs_index)
24006+ENDPROC(native_load_gs_index)
24007
24008 _ASM_EXTABLE(gs_change,bad_gs)
24009 .section .fixup,"ax"
24010@@ -1132,9 +1628,10 @@ ENTRY(do_softirq_own_stack)
24011 CFI_DEF_CFA_REGISTER rsp
24012 CFI_ADJUST_CFA_OFFSET -8
24013 decl PER_CPU_VAR(irq_count)
24014+ pax_force_retaddr
24015 ret
24016 CFI_ENDPROC
24017-END(do_softirq_own_stack)
24018+ENDPROC(do_softirq_own_stack)
24019
24020 #ifdef CONFIG_XEN
24021 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
24022@@ -1172,7 +1669,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
24023 decl PER_CPU_VAR(irq_count)
24024 jmp error_exit
24025 CFI_ENDPROC
24026-END(xen_do_hypervisor_callback)
24027+ENDPROC(xen_do_hypervisor_callback)
24028
24029 /*
24030 * Hypervisor uses this for application faults while it executes.
24031@@ -1231,7 +1728,7 @@ ENTRY(xen_failsafe_callback)
24032 SAVE_ALL
24033 jmp error_exit
24034 CFI_ENDPROC
24035-END(xen_failsafe_callback)
24036+ENDPROC(xen_failsafe_callback)
24037
24038 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
24039 xen_hvm_callback_vector xen_evtchn_do_upcall
24040@@ -1278,18 +1775,33 @@ ENTRY(paranoid_exit)
24041 DEFAULT_FRAME
24042 DISABLE_INTERRUPTS(CLBR_NONE)
24043 TRACE_IRQS_OFF_DEBUG
24044- testl %ebx,%ebx /* swapgs needed? */
24045+ testl $1,%ebx /* swapgs needed? */
24046 jnz paranoid_restore
24047- testl $3,CS(%rsp)
24048+ testb $3,CS(%rsp)
24049 jnz paranoid_userspace
24050+#ifdef CONFIG_PAX_MEMORY_UDEREF
24051+ pax_exit_kernel
24052+ TRACE_IRQS_IRETQ 0
24053+ SWAPGS_UNSAFE_STACK
24054+ RESTORE_ALL 8
24055+ pax_force_retaddr_bts
24056+ jmp irq_return
24057+#endif
24058 paranoid_swapgs:
24059+#ifdef CONFIG_PAX_MEMORY_UDEREF
24060+ pax_exit_kernel_user
24061+#else
24062+ pax_exit_kernel
24063+#endif
24064 TRACE_IRQS_IRETQ 0
24065 SWAPGS_UNSAFE_STACK
24066 RESTORE_ALL 8
24067 jmp irq_return
24068 paranoid_restore:
24069+ pax_exit_kernel
24070 TRACE_IRQS_IRETQ_DEBUG 0
24071 RESTORE_ALL 8
24072+ pax_force_retaddr_bts
24073 jmp irq_return
24074 paranoid_userspace:
24075 GET_THREAD_INFO(%rcx)
24076@@ -1318,7 +1830,7 @@ paranoid_schedule:
24077 TRACE_IRQS_OFF
24078 jmp paranoid_userspace
24079 CFI_ENDPROC
24080-END(paranoid_exit)
24081+ENDPROC(paranoid_exit)
24082
24083 /*
24084 * Exception entry point. This expects an error code/orig_rax on the stack.
24085@@ -1345,12 +1857,23 @@ ENTRY(error_entry)
24086 movq %r14, R14+8(%rsp)
24087 movq %r15, R15+8(%rsp)
24088 xorl %ebx,%ebx
24089- testl $3,CS+8(%rsp)
24090+ testb $3,CS+8(%rsp)
24091 je error_kernelspace
24092 error_swapgs:
24093 SWAPGS
24094 error_sti:
24095+#ifdef CONFIG_PAX_MEMORY_UDEREF
24096+ testb $3, CS+8(%rsp)
24097+ jnz 1f
24098+ pax_enter_kernel
24099+ jmp 2f
24100+1: pax_enter_kernel_user
24101+2:
24102+#else
24103+ pax_enter_kernel
24104+#endif
24105 TRACE_IRQS_OFF
24106+ pax_force_retaddr
24107 ret
24108
24109 /*
24110@@ -1385,7 +1908,7 @@ error_bad_iret:
24111 decl %ebx /* Return to usergs */
24112 jmp error_sti
24113 CFI_ENDPROC
24114-END(error_entry)
24115+ENDPROC(error_entry)
24116
24117
24118 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
24119@@ -1396,7 +1919,7 @@ ENTRY(error_exit)
24120 DISABLE_INTERRUPTS(CLBR_NONE)
24121 TRACE_IRQS_OFF
24122 GET_THREAD_INFO(%rcx)
24123- testl %eax,%eax
24124+ testl $1,%eax
24125 jne retint_kernel
24126 LOCKDEP_SYS_EXIT_IRQ
24127 movl TI_flags(%rcx),%edx
24128@@ -1405,7 +1928,7 @@ ENTRY(error_exit)
24129 jnz retint_careful
24130 jmp retint_swapgs
24131 CFI_ENDPROC
24132-END(error_exit)
24133+ENDPROC(error_exit)
24134
24135 /*
24136 * Test if a given stack is an NMI stack or not.
24137@@ -1463,9 +1986,11 @@ ENTRY(nmi)
24138 * If %cs was not the kernel segment, then the NMI triggered in user
24139 * space, which means it is definitely not nested.
24140 */
24141+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
24142+ je 1f
24143 cmpl $__KERNEL_CS, 16(%rsp)
24144 jne first_nmi
24145-
24146+1:
24147 /*
24148 * Check the special variable on the stack to see if NMIs are
24149 * executing.
24150@@ -1499,8 +2024,7 @@ nested_nmi:
24151
24152 1:
24153 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24154- leaq -1*8(%rsp), %rdx
24155- movq %rdx, %rsp
24156+ subq $8, %rsp
24157 CFI_ADJUST_CFA_OFFSET 1*8
24158 leaq -10*8(%rsp), %rdx
24159 pushq_cfi $__KERNEL_DS
24160@@ -1518,6 +2042,7 @@ nested_nmi_out:
24161 CFI_RESTORE rdx
24162
24163 /* No need to check faults here */
24164+# pax_force_retaddr_bts
24165 INTERRUPT_RETURN
24166
24167 CFI_RESTORE_STATE
24168@@ -1614,13 +2139,13 @@ end_repeat_nmi:
24169 subq $ORIG_RAX-R15, %rsp
24170 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
24171 /*
24172- * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
24173+ * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
24174 * as we should not be calling schedule in NMI context.
24175 * Even with normal interrupts enabled. An NMI should not be
24176 * setting NEED_RESCHED or anything that normal interrupts and
24177 * exceptions might do.
24178 */
24179- call save_paranoid
24180+ call save_paranoid_nmi
24181 DEFAULT_FRAME 0
24182
24183 /*
24184@@ -1630,9 +2155,9 @@ end_repeat_nmi:
24185 * NMI itself takes a page fault, the page fault that was preempted
24186 * will read the information from the NMI page fault and not the
24187 * origin fault. Save it off and restore it if it changes.
24188- * Use the r12 callee-saved register.
24189+ * Use the r13 callee-saved register.
24190 */
24191- movq %cr2, %r12
24192+ movq %cr2, %r13
24193
24194 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24195 movq %rsp,%rdi
24196@@ -1641,29 +2166,34 @@ end_repeat_nmi:
24197
24198 /* Did the NMI take a page fault? Restore cr2 if it did */
24199 movq %cr2, %rcx
24200- cmpq %rcx, %r12
24201+ cmpq %rcx, %r13
24202 je 1f
24203- movq %r12, %cr2
24204+ movq %r13, %cr2
24205 1:
24206
24207- testl %ebx,%ebx /* swapgs needed? */
24208+ testl $1,%ebx /* swapgs needed? */
24209 jnz nmi_restore
24210 nmi_swapgs:
24211 SWAPGS_UNSAFE_STACK
24212 nmi_restore:
24213+ pax_exit_kernel_nmi
24214 /* Pop the extra iret frame at once */
24215 RESTORE_ALL 6*8
24216+ testb $3, 8(%rsp)
24217+ jnz 1f
24218+ pax_force_retaddr_bts
24219+1:
24220
24221 /* Clear the NMI executing stack variable */
24222 movq $0, 5*8(%rsp)
24223 jmp irq_return
24224 CFI_ENDPROC
24225-END(nmi)
24226+ENDPROC(nmi)
24227
24228 ENTRY(ignore_sysret)
24229 CFI_STARTPROC
24230 mov $-ENOSYS,%eax
24231 sysret
24232 CFI_ENDPROC
24233-END(ignore_sysret)
24234+ENDPROC(ignore_sysret)
24235
24236diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24237index 94d857f..5bce89c 100644
24238--- a/arch/x86/kernel/espfix_64.c
24239+++ b/arch/x86/kernel/espfix_64.c
24240@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24241 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24242 static void *espfix_pages[ESPFIX_MAX_PAGES];
24243
24244-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24245- __aligned(PAGE_SIZE);
24246+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24247
24248 static unsigned int page_random, slot_random;
24249
24250@@ -122,14 +121,17 @@ static void init_espfix_random(void)
24251 void __init init_espfix_bsp(void)
24252 {
24253 pgd_t *pgd_p;
24254- pteval_t ptemask;
24255-
24256- ptemask = __supported_pte_mask;
24257+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24258
24259 /* Install the espfix pud into the kernel page directory */
24260- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24261+ pgd_p = &init_level4_pgt[index];
24262 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24263
24264+#ifdef CONFIG_PAX_PER_CPU_PGD
24265+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24266+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24267+#endif
24268+
24269 /* Randomize the locations */
24270 init_espfix_random();
24271
24272@@ -197,7 +199,7 @@ void init_espfix_ap(void)
24273 set_pte(&pte_p[n*PTE_STRIDE], pte);
24274
24275 /* Job is done for this CPU and any CPU which shares this page */
24276- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24277+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24278
24279 unlock_done:
24280 mutex_unlock(&espfix_init_mutex);
24281diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24282index 3386dc9..28bdf81 100644
24283--- a/arch/x86/kernel/ftrace.c
24284+++ b/arch/x86/kernel/ftrace.c
24285@@ -88,7 +88,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24286 * kernel identity mapping to modify code.
24287 */
24288 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24289- ip = (unsigned long)__va(__pa_symbol(ip));
24290+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24291
24292 return ip;
24293 }
24294@@ -104,6 +104,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24295 {
24296 unsigned char replaced[MCOUNT_INSN_SIZE];
24297
24298+ ip = ktla_ktva(ip);
24299+
24300 /*
24301 * Note: Due to modules and __init, code can
24302 * disappear and change, we need to protect against faulting
24303@@ -229,7 +231,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24304 unsigned char old[MCOUNT_INSN_SIZE];
24305 int ret;
24306
24307- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24308+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24309
24310 ftrace_update_func = ip;
24311 /* Make sure the breakpoints see the ftrace_update_func update */
24312@@ -310,7 +312,7 @@ static int add_break(unsigned long ip, const char *old)
24313 unsigned char replaced[MCOUNT_INSN_SIZE];
24314 unsigned char brk = BREAKPOINT_INSTRUCTION;
24315
24316- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24317+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24318 return -EFAULT;
24319
24320 /* Make sure it is what we expect it to be */
24321diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24322index eda1a86..8f6df48 100644
24323--- a/arch/x86/kernel/head64.c
24324+++ b/arch/x86/kernel/head64.c
24325@@ -67,12 +67,12 @@ again:
24326 pgd = *pgd_p;
24327
24328 /*
24329- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24330- * critical -- __PAGE_OFFSET would point us back into the dynamic
24331+ * The use of __early_va rather than __va here is critical:
24332+ * __va would point us back into the dynamic
24333 * range and we might end up looping forever...
24334 */
24335 if (pgd)
24336- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24337+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24338 else {
24339 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24340 reset_early_page_tables();
24341@@ -82,13 +82,13 @@ again:
24342 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24343 for (i = 0; i < PTRS_PER_PUD; i++)
24344 pud_p[i] = 0;
24345- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24346+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24347 }
24348 pud_p += pud_index(address);
24349 pud = *pud_p;
24350
24351 if (pud)
24352- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24353+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24354 else {
24355 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24356 reset_early_page_tables();
24357@@ -98,7 +98,7 @@ again:
24358 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24359 for (i = 0; i < PTRS_PER_PMD; i++)
24360 pmd_p[i] = 0;
24361- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24362+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24363 }
24364 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24365 pmd_p[pmd_index(address)] = pmd;
24366@@ -175,7 +175,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24367 if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
24368 early_printk("Kernel alive\n");
24369
24370- clear_page(init_level4_pgt);
24371 /* set init_level4_pgt kernel high mapping*/
24372 init_level4_pgt[511] = early_level4_pgt[511];
24373
24374diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24375index f36bd42..0ab4474 100644
24376--- a/arch/x86/kernel/head_32.S
24377+++ b/arch/x86/kernel/head_32.S
24378@@ -26,6 +26,12 @@
24379 /* Physical address */
24380 #define pa(X) ((X) - __PAGE_OFFSET)
24381
24382+#ifdef CONFIG_PAX_KERNEXEC
24383+#define ta(X) (X)
24384+#else
24385+#define ta(X) ((X) - __PAGE_OFFSET)
24386+#endif
24387+
24388 /*
24389 * References to members of the new_cpu_data structure.
24390 */
24391@@ -55,11 +61,7 @@
24392 * and small than max_low_pfn, otherwise will waste some page table entries
24393 */
24394
24395-#if PTRS_PER_PMD > 1
24396-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24397-#else
24398-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24399-#endif
24400+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24401
24402 /* Number of possible pages in the lowmem region */
24403 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24404@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24405 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24406
24407 /*
24408+ * Real beginning of normal "text" segment
24409+ */
24410+ENTRY(stext)
24411+ENTRY(_stext)
24412+
24413+/*
24414 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24415 * %esi points to the real-mode code as a 32-bit pointer.
24416 * CS and DS must be 4 GB flat segments, but we don't depend on
24417@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24418 * can.
24419 */
24420 __HEAD
24421+
24422+#ifdef CONFIG_PAX_KERNEXEC
24423+ jmp startup_32
24424+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24425+.fill PAGE_SIZE-5,1,0xcc
24426+#endif
24427+
24428 ENTRY(startup_32)
24429 movl pa(stack_start),%ecx
24430
24431@@ -106,6 +121,59 @@ ENTRY(startup_32)
24432 2:
24433 leal -__PAGE_OFFSET(%ecx),%esp
24434
24435+#ifdef CONFIG_SMP
24436+ movl $pa(cpu_gdt_table),%edi
24437+ movl $__per_cpu_load,%eax
24438+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24439+ rorl $16,%eax
24440+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24441+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24442+ movl $__per_cpu_end - 1,%eax
24443+ subl $__per_cpu_start,%eax
24444+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24445+#endif
24446+
24447+#ifdef CONFIG_PAX_MEMORY_UDEREF
24448+ movl $NR_CPUS,%ecx
24449+ movl $pa(cpu_gdt_table),%edi
24450+1:
24451+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24452+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24453+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24454+ addl $PAGE_SIZE_asm,%edi
24455+ loop 1b
24456+#endif
24457+
24458+#ifdef CONFIG_PAX_KERNEXEC
24459+ movl $pa(boot_gdt),%edi
24460+ movl $__LOAD_PHYSICAL_ADDR,%eax
24461+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24462+ rorl $16,%eax
24463+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24464+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24465+ rorl $16,%eax
24466+
24467+ ljmp $(__BOOT_CS),$1f
24468+1:
24469+
24470+ movl $NR_CPUS,%ecx
24471+ movl $pa(cpu_gdt_table),%edi
24472+ addl $__PAGE_OFFSET,%eax
24473+1:
24474+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24475+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24476+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24477+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24478+ rorl $16,%eax
24479+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24480+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24481+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24482+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24483+ rorl $16,%eax
24484+ addl $PAGE_SIZE_asm,%edi
24485+ loop 1b
24486+#endif
24487+
24488 /*
24489 * Clear BSS first so that there are no surprises...
24490 */
24491@@ -201,8 +269,11 @@ ENTRY(startup_32)
24492 movl %eax, pa(max_pfn_mapped)
24493
24494 /* Do early initialization of the fixmap area */
24495- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24496- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24497+#ifdef CONFIG_COMPAT_VDSO
24498+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24499+#else
24500+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24501+#endif
24502 #else /* Not PAE */
24503
24504 page_pde_offset = (__PAGE_OFFSET >> 20);
24505@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24506 movl %eax, pa(max_pfn_mapped)
24507
24508 /* Do early initialization of the fixmap area */
24509- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24510- movl %eax,pa(initial_page_table+0xffc)
24511+#ifdef CONFIG_COMPAT_VDSO
24512+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24513+#else
24514+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24515+#endif
24516 #endif
24517
24518 #ifdef CONFIG_PARAVIRT
24519@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24520 cmpl $num_subarch_entries, %eax
24521 jae bad_subarch
24522
24523- movl pa(subarch_entries)(,%eax,4), %eax
24524- subl $__PAGE_OFFSET, %eax
24525- jmp *%eax
24526+ jmp *pa(subarch_entries)(,%eax,4)
24527
24528 bad_subarch:
24529 WEAK(lguest_entry)
24530@@ -261,10 +333,10 @@ WEAK(xen_entry)
24531 __INITDATA
24532
24533 subarch_entries:
24534- .long default_entry /* normal x86/PC */
24535- .long lguest_entry /* lguest hypervisor */
24536- .long xen_entry /* Xen hypervisor */
24537- .long default_entry /* Moorestown MID */
24538+ .long ta(default_entry) /* normal x86/PC */
24539+ .long ta(lguest_entry) /* lguest hypervisor */
24540+ .long ta(xen_entry) /* Xen hypervisor */
24541+ .long ta(default_entry) /* Moorestown MID */
24542 num_subarch_entries = (. - subarch_entries) / 4
24543 .previous
24544 #else
24545@@ -354,6 +426,7 @@ default_entry:
24546 movl pa(mmu_cr4_features),%eax
24547 movl %eax,%cr4
24548
24549+#ifdef CONFIG_X86_PAE
24550 testb $X86_CR4_PAE, %al # check if PAE is enabled
24551 jz enable_paging
24552
24553@@ -382,6 +455,9 @@ default_entry:
24554 /* Make changes effective */
24555 wrmsr
24556
24557+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24558+#endif
24559+
24560 enable_paging:
24561
24562 /*
24563@@ -449,14 +525,20 @@ is486:
24564 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24565 movl %eax,%ss # after changing gdt.
24566
24567- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24568+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24569 movl %eax,%ds
24570 movl %eax,%es
24571
24572 movl $(__KERNEL_PERCPU), %eax
24573 movl %eax,%fs # set this cpu's percpu
24574
24575+#ifdef CONFIG_CC_STACKPROTECTOR
24576 movl $(__KERNEL_STACK_CANARY),%eax
24577+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24578+ movl $(__USER_DS),%eax
24579+#else
24580+ xorl %eax,%eax
24581+#endif
24582 movl %eax,%gs
24583
24584 xorl %eax,%eax # Clear LDT
24585@@ -512,8 +594,11 @@ setup_once:
24586 * relocation. Manually set base address in stack canary
24587 * segment descriptor.
24588 */
24589- movl $gdt_page,%eax
24590+ movl $cpu_gdt_table,%eax
24591 movl $stack_canary,%ecx
24592+#ifdef CONFIG_SMP
24593+ addl $__per_cpu_load,%ecx
24594+#endif
24595 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24596 shrl $16, %ecx
24597 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24598@@ -548,7 +633,7 @@ ENTRY(early_idt_handler)
24599 cmpl $2,(%esp) # X86_TRAP_NMI
24600 je is_nmi # Ignore NMI
24601
24602- cmpl $2,%ss:early_recursion_flag
24603+ cmpl $1,%ss:early_recursion_flag
24604 je hlt_loop
24605 incl %ss:early_recursion_flag
24606
24607@@ -586,8 +671,8 @@ ENTRY(early_idt_handler)
24608 pushl (20+6*4)(%esp) /* trapno */
24609 pushl $fault_msg
24610 call printk
24611-#endif
24612 call dump_stack
24613+#endif
24614 hlt_loop:
24615 hlt
24616 jmp hlt_loop
24617@@ -607,8 +692,11 @@ ENDPROC(early_idt_handler)
24618 /* This is the default interrupt "handler" :-) */
24619 ALIGN
24620 ignore_int:
24621- cld
24622 #ifdef CONFIG_PRINTK
24623+ cmpl $2,%ss:early_recursion_flag
24624+ je hlt_loop
24625+ incl %ss:early_recursion_flag
24626+ cld
24627 pushl %eax
24628 pushl %ecx
24629 pushl %edx
24630@@ -617,9 +705,6 @@ ignore_int:
24631 movl $(__KERNEL_DS),%eax
24632 movl %eax,%ds
24633 movl %eax,%es
24634- cmpl $2,early_recursion_flag
24635- je hlt_loop
24636- incl early_recursion_flag
24637 pushl 16(%esp)
24638 pushl 24(%esp)
24639 pushl 32(%esp)
24640@@ -653,29 +738,34 @@ ENTRY(setup_once_ref)
24641 /*
24642 * BSS section
24643 */
24644-__PAGE_ALIGNED_BSS
24645- .align PAGE_SIZE
24646 #ifdef CONFIG_X86_PAE
24647+.section .initial_pg_pmd,"a",@progbits
24648 initial_pg_pmd:
24649 .fill 1024*KPMDS,4,0
24650 #else
24651+.section .initial_page_table,"a",@progbits
24652 ENTRY(initial_page_table)
24653 .fill 1024,4,0
24654 #endif
24655+.section .initial_pg_fixmap,"a",@progbits
24656 initial_pg_fixmap:
24657 .fill 1024,4,0
24658+.section .empty_zero_page,"a",@progbits
24659 ENTRY(empty_zero_page)
24660 .fill 4096,1,0
24661+.section .swapper_pg_dir,"a",@progbits
24662 ENTRY(swapper_pg_dir)
24663+#ifdef CONFIG_X86_PAE
24664+ .fill 4,8,0
24665+#else
24666 .fill 1024,4,0
24667+#endif
24668
24669 /*
24670 * This starts the data section.
24671 */
24672 #ifdef CONFIG_X86_PAE
24673-__PAGE_ALIGNED_DATA
24674- /* Page-aligned for the benefit of paravirt? */
24675- .align PAGE_SIZE
24676+.section .initial_page_table,"a",@progbits
24677 ENTRY(initial_page_table)
24678 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24679 # if KPMDS == 3
24680@@ -694,12 +784,20 @@ ENTRY(initial_page_table)
24681 # error "Kernel PMDs should be 1, 2 or 3"
24682 # endif
24683 .align PAGE_SIZE /* needs to be page-sized too */
24684+
24685+#ifdef CONFIG_PAX_PER_CPU_PGD
24686+ENTRY(cpu_pgd)
24687+ .rept 2*NR_CPUS
24688+ .fill 4,8,0
24689+ .endr
24690+#endif
24691+
24692 #endif
24693
24694 .data
24695 .balign 4
24696 ENTRY(stack_start)
24697- .long init_thread_union+THREAD_SIZE
24698+ .long init_thread_union+THREAD_SIZE-8
24699
24700 __INITRODATA
24701 int_msg:
24702@@ -727,7 +825,7 @@ fault_msg:
24703 * segment size, and 32-bit linear address value:
24704 */
24705
24706- .data
24707+.section .rodata,"a",@progbits
24708 .globl boot_gdt_descr
24709 .globl idt_descr
24710
24711@@ -736,7 +834,7 @@ fault_msg:
24712 .word 0 # 32 bit align gdt_desc.address
24713 boot_gdt_descr:
24714 .word __BOOT_DS+7
24715- .long boot_gdt - __PAGE_OFFSET
24716+ .long pa(boot_gdt)
24717
24718 .word 0 # 32-bit align idt_desc.address
24719 idt_descr:
24720@@ -747,7 +845,7 @@ idt_descr:
24721 .word 0 # 32 bit align gdt_desc.address
24722 ENTRY(early_gdt_descr)
24723 .word GDT_ENTRIES*8-1
24724- .long gdt_page /* Overwritten for secondary CPUs */
24725+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24726
24727 /*
24728 * The boot_gdt must mirror the equivalent in setup.S and is
24729@@ -756,5 +854,65 @@ ENTRY(early_gdt_descr)
24730 .align L1_CACHE_BYTES
24731 ENTRY(boot_gdt)
24732 .fill GDT_ENTRY_BOOT_CS,8,0
24733- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24734- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24735+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24736+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24737+
24738+ .align PAGE_SIZE_asm
24739+ENTRY(cpu_gdt_table)
24740+ .rept NR_CPUS
24741+ .quad 0x0000000000000000 /* NULL descriptor */
24742+ .quad 0x0000000000000000 /* 0x0b reserved */
24743+ .quad 0x0000000000000000 /* 0x13 reserved */
24744+ .quad 0x0000000000000000 /* 0x1b reserved */
24745+
24746+#ifdef CONFIG_PAX_KERNEXEC
24747+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24748+#else
24749+ .quad 0x0000000000000000 /* 0x20 unused */
24750+#endif
24751+
24752+ .quad 0x0000000000000000 /* 0x28 unused */
24753+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24754+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24755+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24756+ .quad 0x0000000000000000 /* 0x4b reserved */
24757+ .quad 0x0000000000000000 /* 0x53 reserved */
24758+ .quad 0x0000000000000000 /* 0x5b reserved */
24759+
24760+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24761+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24762+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24763+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24764+
24765+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24766+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24767+
24768+ /*
24769+ * Segments used for calling PnP BIOS have byte granularity.
24770+ * The code segments and data segments have fixed 64k limits,
24771+ * the transfer segment sizes are set at run time.
24772+ */
24773+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24774+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24775+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24776+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24777+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24778+
24779+ /*
24780+ * The APM segments have byte granularity and their bases
24781+ * are set at run time. All have 64k limits.
24782+ */
24783+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24784+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24785+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24786+
24787+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24788+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24789+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24790+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24791+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24792+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24793+
24794+ /* Be sure this is zeroed to avoid false validations in Xen */
24795+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24796+ .endr
24797diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24798index a468c0a..8b5a879 100644
24799--- a/arch/x86/kernel/head_64.S
24800+++ b/arch/x86/kernel/head_64.S
24801@@ -20,6 +20,8 @@
24802 #include <asm/processor-flags.h>
24803 #include <asm/percpu.h>
24804 #include <asm/nops.h>
24805+#include <asm/cpufeature.h>
24806+#include <asm/alternative-asm.h>
24807
24808 #ifdef CONFIG_PARAVIRT
24809 #include <asm/asm-offsets.h>
24810@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24811 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24812 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24813 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24814+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24815+L3_VMALLOC_START = pud_index(VMALLOC_START)
24816+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24817+L3_VMALLOC_END = pud_index(VMALLOC_END)
24818+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24819+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24820
24821 .text
24822 __HEAD
24823@@ -89,11 +97,24 @@ startup_64:
24824 * Fixup the physical addresses in the page table
24825 */
24826 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24827+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24828+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24829+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24830+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24831+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24832
24833- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24834- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24835+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24836+#ifndef CONFIG_XEN
24837+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24838+#endif
24839+
24840+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24841+
24842+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24843+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24844
24845 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24846+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24847
24848 /*
24849 * Set up the identity mapping for the switchover. These
24850@@ -174,11 +195,12 @@ ENTRY(secondary_startup_64)
24851 * after the boot processor executes this code.
24852 */
24853
24854+ orq $-1, %rbp
24855 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24856 1:
24857
24858- /* Enable PAE mode and PGE */
24859- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24860+ /* Enable PAE mode and PSE/PGE */
24861+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24862 movq %rcx, %cr4
24863
24864 /* Setup early boot stage 4 level pagetables. */
24865@@ -199,10 +221,19 @@ ENTRY(secondary_startup_64)
24866 movl $MSR_EFER, %ecx
24867 rdmsr
24868 btsl $_EFER_SCE, %eax /* Enable System Call */
24869- btl $20,%edi /* No Execute supported? */
24870+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24871 jnc 1f
24872 btsl $_EFER_NX, %eax
24873+ cmpq $-1, %rbp
24874+ je 1f
24875 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24876+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24877+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24878+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24879+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24880+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24881+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24882+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24883 1: wrmsr /* Make changes effective */
24884
24885 /* Setup cr0 */
24886@@ -282,6 +313,7 @@ ENTRY(secondary_startup_64)
24887 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24888 * address given in m16:64.
24889 */
24890+ pax_set_fptr_mask
24891 movq initial_code(%rip),%rax
24892 pushq $0 # fake return address to stop unwinder
24893 pushq $__KERNEL_CS # set correct cs
24894@@ -313,7 +345,7 @@ ENDPROC(start_cpu0)
24895 .quad INIT_PER_CPU_VAR(irq_stack_union)
24896
24897 GLOBAL(stack_start)
24898- .quad init_thread_union+THREAD_SIZE-8
24899+ .quad init_thread_union+THREAD_SIZE-16
24900 .word 0
24901 __FINITDATA
24902
24903@@ -391,7 +423,7 @@ ENTRY(early_idt_handler)
24904 call dump_stack
24905 #ifdef CONFIG_KALLSYMS
24906 leaq early_idt_ripmsg(%rip),%rdi
24907- movq 40(%rsp),%rsi # %rip again
24908+ movq 88(%rsp),%rsi # %rip again
24909 call __print_symbol
24910 #endif
24911 #endif /* EARLY_PRINTK */
24912@@ -420,6 +452,7 @@ ENDPROC(early_idt_handler)
24913 early_recursion_flag:
24914 .long 0
24915
24916+ .section .rodata,"a",@progbits
24917 #ifdef CONFIG_EARLY_PRINTK
24918 early_idt_msg:
24919 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24920@@ -447,29 +480,52 @@ NEXT_PAGE(early_level4_pgt)
24921 NEXT_PAGE(early_dynamic_pgts)
24922 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24923
24924- .data
24925+ .section .rodata,"a",@progbits
24926
24927-#ifndef CONFIG_XEN
24928 NEXT_PAGE(init_level4_pgt)
24929- .fill 512,8,0
24930-#else
24931-NEXT_PAGE(init_level4_pgt)
24932- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24933 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24934 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24935+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
24936+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24937+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
24938+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24939+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24940+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24941 .org init_level4_pgt + L4_START_KERNEL*8, 0
24942 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24943 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24944
24945+#ifdef CONFIG_PAX_PER_CPU_PGD
24946+NEXT_PAGE(cpu_pgd)
24947+ .rept 2*NR_CPUS
24948+ .fill 512,8,0
24949+ .endr
24950+#endif
24951+
24952 NEXT_PAGE(level3_ident_pgt)
24953 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24954+#ifdef CONFIG_XEN
24955 .fill 511, 8, 0
24956+#else
24957+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24958+ .fill 510,8,0
24959+#endif
24960+
24961+NEXT_PAGE(level3_vmalloc_start_pgt)
24962+ .fill 512,8,0
24963+
24964+NEXT_PAGE(level3_vmalloc_end_pgt)
24965+ .fill 512,8,0
24966+
24967+NEXT_PAGE(level3_vmemmap_pgt)
24968+ .fill L3_VMEMMAP_START,8,0
24969+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24970+
24971 NEXT_PAGE(level2_ident_pgt)
24972- /* Since I easily can, map the first 1G.
24973+ /* Since I easily can, map the first 2G.
24974 * Don't set NX because code runs from these pages.
24975 */
24976- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
24977-#endif
24978+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
24979
24980 NEXT_PAGE(level3_kernel_pgt)
24981 .fill L3_START_KERNEL,8,0
24982@@ -477,6 +533,9 @@ NEXT_PAGE(level3_kernel_pgt)
24983 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
24984 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24985
24986+NEXT_PAGE(level2_vmemmap_pgt)
24987+ .fill 512,8,0
24988+
24989 NEXT_PAGE(level2_kernel_pgt)
24990 /*
24991 * 512 MB kernel mapping. We spend a full page on this pagetable
24992@@ -494,28 +553,64 @@ NEXT_PAGE(level2_kernel_pgt)
24993 NEXT_PAGE(level2_fixmap_pgt)
24994 .fill 506,8,0
24995 .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24996- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
24997- .fill 5,8,0
24998+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24999+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
25000+ .fill 4,8,0
25001
25002 NEXT_PAGE(level1_fixmap_pgt)
25003 .fill 512,8,0
25004
25005+NEXT_PAGE(level1_vsyscall_pgt)
25006+ .fill 512,8,0
25007+
25008 #undef PMDS
25009
25010- .data
25011+ .align PAGE_SIZE
25012+ENTRY(cpu_gdt_table)
25013+ .rept NR_CPUS
25014+ .quad 0x0000000000000000 /* NULL descriptor */
25015+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
25016+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
25017+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
25018+ .quad 0x00cffb000000ffff /* __USER32_CS */
25019+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
25020+ .quad 0x00affb000000ffff /* __USER_CS */
25021+
25022+#ifdef CONFIG_PAX_KERNEXEC
25023+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
25024+#else
25025+ .quad 0x0 /* unused */
25026+#endif
25027+
25028+ .quad 0,0 /* TSS */
25029+ .quad 0,0 /* LDT */
25030+ .quad 0,0,0 /* three TLS descriptors */
25031+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
25032+ /* asm/segment.h:GDT_ENTRIES must match this */
25033+
25034+#ifdef CONFIG_PAX_MEMORY_UDEREF
25035+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
25036+#else
25037+ .quad 0x0 /* unused */
25038+#endif
25039+
25040+ /* zero the remaining page */
25041+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25042+ .endr
25043+
25044 .align 16
25045 .globl early_gdt_descr
25046 early_gdt_descr:
25047 .word GDT_ENTRIES*8-1
25048 early_gdt_descr_base:
25049- .quad INIT_PER_CPU_VAR(gdt_page)
25050+ .quad cpu_gdt_table
25051
25052 ENTRY(phys_base)
25053 /* This must match the first entry in level2_kernel_pgt */
25054 .quad 0x0000000000000000
25055
25056 #include "../../x86/xen/xen-head.S"
25057-
25058- __PAGE_ALIGNED_BSS
25059+
25060+ .section .rodata,"a",@progbits
25061 NEXT_PAGE(empty_zero_page)
25062 .skip PAGE_SIZE
25063diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25064index 05fd74f..c3548b1 100644
25065--- a/arch/x86/kernel/i386_ksyms_32.c
25066+++ b/arch/x86/kernel/i386_ksyms_32.c
25067@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25068 EXPORT_SYMBOL(cmpxchg8b_emu);
25069 #endif
25070
25071+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25072+
25073 /* Networking helper routines. */
25074 EXPORT_SYMBOL(csum_partial_copy_generic);
25075+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25076+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25077
25078 EXPORT_SYMBOL(__get_user_1);
25079 EXPORT_SYMBOL(__get_user_2);
25080@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25081 EXPORT_SYMBOL(___preempt_schedule_context);
25082 #endif
25083 #endif
25084+
25085+#ifdef CONFIG_PAX_KERNEXEC
25086+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25087+#endif
25088+
25089+#ifdef CONFIG_PAX_PER_CPU_PGD
25090+EXPORT_SYMBOL(cpu_pgd);
25091+#endif
25092diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
25093index a9a4229..6f4d476 100644
25094--- a/arch/x86/kernel/i387.c
25095+++ b/arch/x86/kernel/i387.c
25096@@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
25097 static inline bool interrupted_user_mode(void)
25098 {
25099 struct pt_regs *regs = get_irq_regs();
25100- return regs && user_mode_vm(regs);
25101+ return regs && user_mode(regs);
25102 }
25103
25104 /*
25105diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25106index e7cc537..67d7372 100644
25107--- a/arch/x86/kernel/i8259.c
25108+++ b/arch/x86/kernel/i8259.c
25109@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25110 static void make_8259A_irq(unsigned int irq)
25111 {
25112 disable_irq_nosync(irq);
25113- io_apic_irqs &= ~(1<<irq);
25114+ io_apic_irqs &= ~(1UL<<irq);
25115 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25116 enable_irq(irq);
25117 }
25118@@ -208,7 +208,7 @@ spurious_8259A_irq:
25119 "spurious 8259A interrupt: IRQ%d.\n", irq);
25120 spurious_irq_mask |= irqmask;
25121 }
25122- atomic_inc(&irq_err_count);
25123+ atomic_inc_unchecked(&irq_err_count);
25124 /*
25125 * Theoretically we do not have to handle this IRQ,
25126 * but in Linux this does not cause problems and is
25127@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25128 /* (slave's support for AEOI in flat mode is to be investigated) */
25129 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25130
25131+ pax_open_kernel();
25132 if (auto_eoi)
25133 /*
25134 * In AEOI mode we just have to mask the interrupt
25135 * when acking.
25136 */
25137- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25138+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25139 else
25140- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25141+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25142+ pax_close_kernel();
25143
25144 udelay(100); /* wait for 8259A to initialize */
25145
25146diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25147index a979b5b..1d6db75 100644
25148--- a/arch/x86/kernel/io_delay.c
25149+++ b/arch/x86/kernel/io_delay.c
25150@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25151 * Quirk table for systems that misbehave (lock up, etc.) if port
25152 * 0x80 is used:
25153 */
25154-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25155+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25156 {
25157 .callback = dmi_io_delay_0xed_port,
25158 .ident = "Compaq Presario V6000",
25159diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25160index 4ddaf66..49d5c18 100644
25161--- a/arch/x86/kernel/ioport.c
25162+++ b/arch/x86/kernel/ioport.c
25163@@ -6,6 +6,7 @@
25164 #include <linux/sched.h>
25165 #include <linux/kernel.h>
25166 #include <linux/capability.h>
25167+#include <linux/security.h>
25168 #include <linux/errno.h>
25169 #include <linux/types.h>
25170 #include <linux/ioport.h>
25171@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25172 return -EINVAL;
25173 if (turn_on && !capable(CAP_SYS_RAWIO))
25174 return -EPERM;
25175+#ifdef CONFIG_GRKERNSEC_IO
25176+ if (turn_on && grsec_disable_privio) {
25177+ gr_handle_ioperm();
25178+ return -ENODEV;
25179+ }
25180+#endif
25181
25182 /*
25183 * If it's the first ioperm() call in this thread's lifetime, set the
25184@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25185 * because the ->io_bitmap_max value must match the bitmap
25186 * contents:
25187 */
25188- tss = &per_cpu(init_tss, get_cpu());
25189+ tss = init_tss + get_cpu();
25190
25191 if (turn_on)
25192 bitmap_clear(t->io_bitmap_ptr, from, num);
25193@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25194 if (level > old) {
25195 if (!capable(CAP_SYS_RAWIO))
25196 return -EPERM;
25197+#ifdef CONFIG_GRKERNSEC_IO
25198+ if (grsec_disable_privio) {
25199+ gr_handle_iopl();
25200+ return -ENODEV;
25201+ }
25202+#endif
25203 }
25204 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25205 t->iopl = level << 12;
25206diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25207index 922d285..6d20692 100644
25208--- a/arch/x86/kernel/irq.c
25209+++ b/arch/x86/kernel/irq.c
25210@@ -22,7 +22,7 @@
25211 #define CREATE_TRACE_POINTS
25212 #include <asm/trace/irq_vectors.h>
25213
25214-atomic_t irq_err_count;
25215+atomic_unchecked_t irq_err_count;
25216
25217 /* Function pointer for generic interrupt vector handling */
25218 void (*x86_platform_ipi_callback)(void) = NULL;
25219@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25220 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25221 seq_printf(p, " Hypervisor callback interrupts\n");
25222 #endif
25223- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25224+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25225 #if defined(CONFIG_X86_IO_APIC)
25226- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25227+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25228 #endif
25229 return 0;
25230 }
25231@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25232
25233 u64 arch_irq_stat(void)
25234 {
25235- u64 sum = atomic_read(&irq_err_count);
25236+ u64 sum = atomic_read_unchecked(&irq_err_count);
25237 return sum;
25238 }
25239
25240diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25241index 63ce838..2ea3e06 100644
25242--- a/arch/x86/kernel/irq_32.c
25243+++ b/arch/x86/kernel/irq_32.c
25244@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25245
25246 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25247
25248+extern void gr_handle_kernel_exploit(void);
25249+
25250 int sysctl_panic_on_stackoverflow __read_mostly;
25251
25252 /* Debugging check for stack overflow: is there less than 1KB free? */
25253@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25254 __asm__ __volatile__("andl %%esp,%0" :
25255 "=r" (sp) : "0" (THREAD_SIZE - 1));
25256
25257- return sp < (sizeof(struct thread_info) + STACK_WARN);
25258+ return sp < STACK_WARN;
25259 }
25260
25261 static void print_stack_overflow(void)
25262 {
25263 printk(KERN_WARNING "low stack detected by irq handler\n");
25264 dump_stack();
25265+ gr_handle_kernel_exploit();
25266 if (sysctl_panic_on_stackoverflow)
25267 panic("low stack detected by irq handler - check messages\n");
25268 }
25269@@ -84,10 +87,9 @@ static inline void *current_stack(void)
25270 static inline int
25271 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25272 {
25273- struct irq_stack *curstk, *irqstk;
25274+ struct irq_stack *irqstk;
25275 u32 *isp, *prev_esp, arg1, arg2;
25276
25277- curstk = (struct irq_stack *) current_stack();
25278 irqstk = __this_cpu_read(hardirq_stack);
25279
25280 /*
25281@@ -96,15 +98,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25282 * handler) we can't do that and just have to keep using the
25283 * current stack (which is the irq stack already after all)
25284 */
25285- if (unlikely(curstk == irqstk))
25286+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25287 return 0;
25288
25289- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25290+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25291
25292 /* Save the next esp at the bottom of the stack */
25293 prev_esp = (u32 *)irqstk;
25294 *prev_esp = current_stack_pointer;
25295
25296+#ifdef CONFIG_PAX_MEMORY_UDEREF
25297+ __set_fs(MAKE_MM_SEG(0));
25298+#endif
25299+
25300 if (unlikely(overflow))
25301 call_on_stack(print_stack_overflow, isp);
25302
25303@@ -115,6 +121,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25304 : "0" (irq), "1" (desc), "2" (isp),
25305 "D" (desc->handle_irq)
25306 : "memory", "cc", "ecx");
25307+
25308+#ifdef CONFIG_PAX_MEMORY_UDEREF
25309+ __set_fs(current_thread_info()->addr_limit);
25310+#endif
25311+
25312 return 1;
25313 }
25314
25315@@ -123,32 +134,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25316 */
25317 void irq_ctx_init(int cpu)
25318 {
25319- struct irq_stack *irqstk;
25320-
25321 if (per_cpu(hardirq_stack, cpu))
25322 return;
25323
25324- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25325- THREADINFO_GFP,
25326- THREAD_SIZE_ORDER));
25327- per_cpu(hardirq_stack, cpu) = irqstk;
25328-
25329- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25330- THREADINFO_GFP,
25331- THREAD_SIZE_ORDER));
25332- per_cpu(softirq_stack, cpu) = irqstk;
25333-
25334- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25335- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25336+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25337+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25338 }
25339
25340 void do_softirq_own_stack(void)
25341 {
25342- struct thread_info *curstk;
25343 struct irq_stack *irqstk;
25344 u32 *isp, *prev_esp;
25345
25346- curstk = current_stack();
25347 irqstk = __this_cpu_read(softirq_stack);
25348
25349 /* build the stack frame on the softirq stack */
25350@@ -158,7 +155,16 @@ void do_softirq_own_stack(void)
25351 prev_esp = (u32 *)irqstk;
25352 *prev_esp = current_stack_pointer;
25353
25354+#ifdef CONFIG_PAX_MEMORY_UDEREF
25355+ __set_fs(MAKE_MM_SEG(0));
25356+#endif
25357+
25358 call_on_stack(__do_softirq, isp);
25359+
25360+#ifdef CONFIG_PAX_MEMORY_UDEREF
25361+ __set_fs(current_thread_info()->addr_limit);
25362+#endif
25363+
25364 }
25365
25366 bool handle_irq(unsigned irq, struct pt_regs *regs)
25367@@ -172,7 +178,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25368 if (unlikely(!desc))
25369 return false;
25370
25371- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25372+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25373 if (unlikely(overflow))
25374 print_stack_overflow();
25375 desc->handle_irq(irq, desc);
25376diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25377index e4b503d..824fce8 100644
25378--- a/arch/x86/kernel/irq_64.c
25379+++ b/arch/x86/kernel/irq_64.c
25380@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25381 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25382 EXPORT_PER_CPU_SYMBOL(irq_regs);
25383
25384+extern void gr_handle_kernel_exploit(void);
25385+
25386 int sysctl_panic_on_stackoverflow;
25387
25388 /*
25389@@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25390 u64 estack_top, estack_bottom;
25391 u64 curbase = (u64)task_stack_page(current);
25392
25393- if (user_mode_vm(regs))
25394+ if (user_mode(regs))
25395 return;
25396
25397 if (regs->sp >= curbase + sizeof(struct thread_info) +
25398@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25399 irq_stack_top, irq_stack_bottom,
25400 estack_top, estack_bottom);
25401
25402+ gr_handle_kernel_exploit();
25403+
25404 if (sysctl_panic_on_stackoverflow)
25405 panic("low stack detected by irq handler - check messages\n");
25406 #endif
25407diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25408index 26d5a55..a01160a 100644
25409--- a/arch/x86/kernel/jump_label.c
25410+++ b/arch/x86/kernel/jump_label.c
25411@@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25412 * Jump label is enabled for the first time.
25413 * So we expect a default_nop...
25414 */
25415- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25416+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25417 != 0))
25418 bug_at((void *)entry->code, __LINE__);
25419 } else {
25420@@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25421 * ...otherwise expect an ideal_nop. Otherwise
25422 * something went horribly wrong.
25423 */
25424- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25425+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25426 != 0))
25427 bug_at((void *)entry->code, __LINE__);
25428 }
25429@@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25430 * are converting the default nop to the ideal nop.
25431 */
25432 if (init) {
25433- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25434+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25435 bug_at((void *)entry->code, __LINE__);
25436 } else {
25437 code.jump = 0xe9;
25438 code.offset = entry->target -
25439 (entry->code + JUMP_LABEL_NOP_SIZE);
25440- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25441+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25442 bug_at((void *)entry->code, __LINE__);
25443 }
25444 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25445diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25446index 7ec1d5f..5a7d130 100644
25447--- a/arch/x86/kernel/kgdb.c
25448+++ b/arch/x86/kernel/kgdb.c
25449@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25450 #ifdef CONFIG_X86_32
25451 switch (regno) {
25452 case GDB_SS:
25453- if (!user_mode_vm(regs))
25454+ if (!user_mode(regs))
25455 *(unsigned long *)mem = __KERNEL_DS;
25456 break;
25457 case GDB_SP:
25458- if (!user_mode_vm(regs))
25459+ if (!user_mode(regs))
25460 *(unsigned long *)mem = kernel_stack_pointer(regs);
25461 break;
25462 case GDB_GS:
25463@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25464 bp->attr.bp_addr = breakinfo[breakno].addr;
25465 bp->attr.bp_len = breakinfo[breakno].len;
25466 bp->attr.bp_type = breakinfo[breakno].type;
25467- info->address = breakinfo[breakno].addr;
25468+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25469+ info->address = ktla_ktva(breakinfo[breakno].addr);
25470+ else
25471+ info->address = breakinfo[breakno].addr;
25472 info->len = breakinfo[breakno].len;
25473 info->type = breakinfo[breakno].type;
25474 val = arch_install_hw_breakpoint(bp);
25475@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25476 case 'k':
25477 /* clear the trace bit */
25478 linux_regs->flags &= ~X86_EFLAGS_TF;
25479- atomic_set(&kgdb_cpu_doing_single_step, -1);
25480+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25481
25482 /* set the trace bit if we're stepping */
25483 if (remcomInBuffer[0] == 's') {
25484 linux_regs->flags |= X86_EFLAGS_TF;
25485- atomic_set(&kgdb_cpu_doing_single_step,
25486+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25487 raw_smp_processor_id());
25488 }
25489
25490@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25491
25492 switch (cmd) {
25493 case DIE_DEBUG:
25494- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25495+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25496 if (user_mode(regs))
25497 return single_step_cont(regs, args);
25498 break;
25499@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25500 #endif /* CONFIG_DEBUG_RODATA */
25501
25502 bpt->type = BP_BREAKPOINT;
25503- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25504+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25505 BREAK_INSTR_SIZE);
25506 if (err)
25507 return err;
25508- err = probe_kernel_write((char *)bpt->bpt_addr,
25509+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25510 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25511 #ifdef CONFIG_DEBUG_RODATA
25512 if (!err)
25513@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25514 return -EBUSY;
25515 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25516 BREAK_INSTR_SIZE);
25517- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25518+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25519 if (err)
25520 return err;
25521 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25522@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25523 if (mutex_is_locked(&text_mutex))
25524 goto knl_write;
25525 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25526- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25527+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25528 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25529 goto knl_write;
25530 return err;
25531 knl_write:
25532 #endif /* CONFIG_DEBUG_RODATA */
25533- return probe_kernel_write((char *)bpt->bpt_addr,
25534+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25535 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25536 }
25537
25538diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25539index 67e6d19..731ed28 100644
25540--- a/arch/x86/kernel/kprobes/core.c
25541+++ b/arch/x86/kernel/kprobes/core.c
25542@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25543 s32 raddr;
25544 } __packed *insn;
25545
25546- insn = (struct __arch_relative_insn *)from;
25547+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25548+
25549+ pax_open_kernel();
25550 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25551 insn->op = op;
25552+ pax_close_kernel();
25553 }
25554
25555 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25556@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25557 kprobe_opcode_t opcode;
25558 kprobe_opcode_t *orig_opcodes = opcodes;
25559
25560- if (search_exception_tables((unsigned long)opcodes))
25561+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25562 return 0; /* Page fault may occur on this address. */
25563
25564 retry:
25565@@ -242,9 +245,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25566 * for the first byte, we can recover the original instruction
25567 * from it and kp->opcode.
25568 */
25569- memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25570+ memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25571 buf[0] = kp->opcode;
25572- return (unsigned long)buf;
25573+ return ktva_ktla((unsigned long)buf);
25574 }
25575
25576 /*
25577@@ -336,7 +339,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25578 /* Another subsystem puts a breakpoint, failed to recover */
25579 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25580 return 0;
25581+ pax_open_kernel();
25582 memcpy(dest, insn.kaddr, insn.length);
25583+ pax_close_kernel();
25584
25585 #ifdef CONFIG_X86_64
25586 if (insn_rip_relative(&insn)) {
25587@@ -363,7 +368,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25588 return 0;
25589 }
25590 disp = (u8 *) dest + insn_offset_displacement(&insn);
25591+ pax_open_kernel();
25592 *(s32 *) disp = (s32) newdisp;
25593+ pax_close_kernel();
25594 }
25595 #endif
25596 return insn.length;
25597@@ -505,7 +512,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25598 * nor set current_kprobe, because it doesn't use single
25599 * stepping.
25600 */
25601- regs->ip = (unsigned long)p->ainsn.insn;
25602+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25603 preempt_enable_no_resched();
25604 return;
25605 }
25606@@ -522,9 +529,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25607 regs->flags &= ~X86_EFLAGS_IF;
25608 /* single step inline if the instruction is an int3 */
25609 if (p->opcode == BREAKPOINT_INSTRUCTION)
25610- regs->ip = (unsigned long)p->addr;
25611+ regs->ip = ktla_ktva((unsigned long)p->addr);
25612 else
25613- regs->ip = (unsigned long)p->ainsn.insn;
25614+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25615 }
25616 NOKPROBE_SYMBOL(setup_singlestep);
25617
25618@@ -574,7 +581,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25619 struct kprobe *p;
25620 struct kprobe_ctlblk *kcb;
25621
25622- if (user_mode_vm(regs))
25623+ if (user_mode(regs))
25624 return 0;
25625
25626 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
25627@@ -609,7 +616,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25628 setup_singlestep(p, regs, kcb, 0);
25629 return 1;
25630 }
25631- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25632+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25633 /*
25634 * The breakpoint instruction was removed right
25635 * after we hit it. Another cpu has removed
25636@@ -656,6 +663,9 @@ static void __used kretprobe_trampoline_holder(void)
25637 " movq %rax, 152(%rsp)\n"
25638 RESTORE_REGS_STRING
25639 " popfq\n"
25640+#ifdef KERNEXEC_PLUGIN
25641+ " btsq $63,(%rsp)\n"
25642+#endif
25643 #else
25644 " pushf\n"
25645 SAVE_REGS_STRING
25646@@ -796,7 +806,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25647 struct kprobe_ctlblk *kcb)
25648 {
25649 unsigned long *tos = stack_addr(regs);
25650- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25651+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25652 unsigned long orig_ip = (unsigned long)p->addr;
25653 kprobe_opcode_t *insn = p->ainsn.insn;
25654
25655@@ -979,7 +989,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
25656 struct die_args *args = data;
25657 int ret = NOTIFY_DONE;
25658
25659- if (args->regs && user_mode_vm(args->regs))
25660+ if (args->regs && user_mode(args->regs))
25661 return ret;
25662
25663 if (val == DIE_GPF) {
25664diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25665index f1314d0..15f3154 100644
25666--- a/arch/x86/kernel/kprobes/opt.c
25667+++ b/arch/x86/kernel/kprobes/opt.c
25668@@ -79,6 +79,7 @@ found:
25669 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25670 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25671 {
25672+ pax_open_kernel();
25673 #ifdef CONFIG_X86_64
25674 *addr++ = 0x48;
25675 *addr++ = 0xbf;
25676@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25677 *addr++ = 0xb8;
25678 #endif
25679 *(unsigned long *)addr = val;
25680+ pax_close_kernel();
25681 }
25682
25683 asm (
25684@@ -337,7 +339,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25685 * Verify if the address gap is in 2GB range, because this uses
25686 * a relative jump.
25687 */
25688- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25689+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25690 if (abs(rel) > 0x7fffffff) {
25691 __arch_remove_optimized_kprobe(op, 0);
25692 return -ERANGE;
25693@@ -354,16 +356,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25694 op->optinsn.size = ret;
25695
25696 /* Copy arch-dep-instance from template */
25697- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25698+ pax_open_kernel();
25699+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25700+ pax_close_kernel();
25701
25702 /* Set probe information */
25703 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25704
25705 /* Set probe function call */
25706- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25707+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25708
25709 /* Set returning jmp instruction at the tail of out-of-line buffer */
25710- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25711+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25712 (u8 *)op->kp.addr + op->optinsn.size);
25713
25714 flush_icache_range((unsigned long) buf,
25715@@ -388,7 +392,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25716 WARN_ON(kprobe_disabled(&op->kp));
25717
25718 /* Backup instructions which will be replaced by jump address */
25719- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25720+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25721 RELATIVE_ADDR_SIZE);
25722
25723 insn_buf[0] = RELATIVEJUMP_OPCODE;
25724@@ -436,7 +440,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25725 /* This kprobe is really able to run optimized path. */
25726 op = container_of(p, struct optimized_kprobe, kp);
25727 /* Detour through copied instructions */
25728- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25729+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25730 if (!reenter)
25731 reset_current_kprobe();
25732 preempt_enable_no_resched();
25733diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25734index c2bedae..25e7ab60 100644
25735--- a/arch/x86/kernel/ksysfs.c
25736+++ b/arch/x86/kernel/ksysfs.c
25737@@ -184,7 +184,7 @@ out:
25738
25739 static struct kobj_attribute type_attr = __ATTR_RO(type);
25740
25741-static struct bin_attribute data_attr = {
25742+static bin_attribute_no_const data_attr __read_only = {
25743 .attr = {
25744 .name = "data",
25745 .mode = S_IRUGO,
25746diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25747index c37886d..d851d32 100644
25748--- a/arch/x86/kernel/ldt.c
25749+++ b/arch/x86/kernel/ldt.c
25750@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25751 if (reload) {
25752 #ifdef CONFIG_SMP
25753 preempt_disable();
25754- load_LDT(pc);
25755+ load_LDT_nolock(pc);
25756 if (!cpumask_equal(mm_cpumask(current->mm),
25757 cpumask_of(smp_processor_id())))
25758 smp_call_function(flush_ldt, current->mm, 1);
25759 preempt_enable();
25760 #else
25761- load_LDT(pc);
25762+ load_LDT_nolock(pc);
25763 #endif
25764 }
25765 if (oldsize) {
25766@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25767 return err;
25768
25769 for (i = 0; i < old->size; i++)
25770- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25771+ write_ldt_entry(new->ldt, i, old->ldt + i);
25772 return 0;
25773 }
25774
25775@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25776 retval = copy_ldt(&mm->context, &old_mm->context);
25777 mutex_unlock(&old_mm->context.lock);
25778 }
25779+
25780+ if (tsk == current) {
25781+ mm->context.vdso = 0;
25782+
25783+#ifdef CONFIG_X86_32
25784+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25785+ mm->context.user_cs_base = 0UL;
25786+ mm->context.user_cs_limit = ~0UL;
25787+
25788+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25789+ cpus_clear(mm->context.cpu_user_cs_mask);
25790+#endif
25791+
25792+#endif
25793+#endif
25794+
25795+ }
25796+
25797 return retval;
25798 }
25799
25800@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25801 }
25802 }
25803
25804+#ifdef CONFIG_PAX_SEGMEXEC
25805+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25806+ error = -EINVAL;
25807+ goto out_unlock;
25808+ }
25809+#endif
25810+
25811 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25812 error = -EINVAL;
25813 goto out_unlock;
25814diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25815index 72e8e31..f2f1605 100644
25816--- a/arch/x86/kernel/machine_kexec_32.c
25817+++ b/arch/x86/kernel/machine_kexec_32.c
25818@@ -25,7 +25,7 @@
25819 #include <asm/cacheflush.h>
25820 #include <asm/debugreg.h>
25821
25822-static void set_idt(void *newidt, __u16 limit)
25823+static void set_idt(struct desc_struct *newidt, __u16 limit)
25824 {
25825 struct desc_ptr curidt;
25826
25827@@ -37,7 +37,7 @@ static void set_idt(void *newidt, __u16 limit)
25828 }
25829
25830
25831-static void set_gdt(void *newgdt, __u16 limit)
25832+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25833 {
25834 struct desc_ptr curgdt;
25835
25836@@ -215,7 +215,7 @@ void machine_kexec(struct kimage *image)
25837 }
25838
25839 control_page = page_address(image->control_code_page);
25840- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25841+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25842
25843 relocate_kernel_ptr = control_page;
25844 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25845diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25846index c73aecf..4c63630 100644
25847--- a/arch/x86/kernel/mcount_64.S
25848+++ b/arch/x86/kernel/mcount_64.S
25849@@ -7,7 +7,7 @@
25850 #include <linux/linkage.h>
25851 #include <asm/ptrace.h>
25852 #include <asm/ftrace.h>
25853-
25854+#include <asm/alternative-asm.h>
25855
25856 .code64
25857 .section .entry.text, "ax"
25858@@ -24,8 +24,9 @@
25859 #ifdef CONFIG_DYNAMIC_FTRACE
25860
25861 ENTRY(function_hook)
25862+ pax_force_retaddr
25863 retq
25864-END(function_hook)
25865+ENDPROC(function_hook)
25866
25867 /* skip is set if stack has been adjusted */
25868 .macro ftrace_caller_setup skip=0
25869@@ -62,8 +63,9 @@ GLOBAL(ftrace_graph_call)
25870 #endif
25871
25872 GLOBAL(ftrace_stub)
25873+ pax_force_retaddr
25874 retq
25875-END(ftrace_caller)
25876+ENDPROC(ftrace_caller)
25877
25878 ENTRY(ftrace_regs_caller)
25879 /* Save the current flags before compare (in SS location)*/
25880@@ -127,7 +129,7 @@ GLOBAL(ftrace_regs_call)
25881 popfq
25882 jmp ftrace_stub
25883
25884-END(ftrace_regs_caller)
25885+ENDPROC(ftrace_regs_caller)
25886
25887
25888 #else /* ! CONFIG_DYNAMIC_FTRACE */
25889@@ -145,6 +147,7 @@ ENTRY(function_hook)
25890 #endif
25891
25892 GLOBAL(ftrace_stub)
25893+ pax_force_retaddr
25894 retq
25895
25896 trace:
25897@@ -158,12 +161,13 @@ trace:
25898 #endif
25899 subq $MCOUNT_INSN_SIZE, %rdi
25900
25901+ pax_force_fptr ftrace_trace_function
25902 call *ftrace_trace_function
25903
25904 MCOUNT_RESTORE_FRAME
25905
25906 jmp ftrace_stub
25907-END(function_hook)
25908+ENDPROC(function_hook)
25909 #endif /* CONFIG_DYNAMIC_FTRACE */
25910 #endif /* CONFIG_FUNCTION_TRACER */
25911
25912@@ -185,8 +189,9 @@ ENTRY(ftrace_graph_caller)
25913
25914 MCOUNT_RESTORE_FRAME
25915
25916+ pax_force_retaddr
25917 retq
25918-END(ftrace_graph_caller)
25919+ENDPROC(ftrace_graph_caller)
25920
25921 GLOBAL(return_to_handler)
25922 subq $24, %rsp
25923@@ -202,5 +207,7 @@ GLOBAL(return_to_handler)
25924 movq 8(%rsp), %rdx
25925 movq (%rsp), %rax
25926 addq $24, %rsp
25927+ pax_force_fptr %rdi
25928 jmp *%rdi
25929+ENDPROC(return_to_handler)
25930 #endif
25931diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25932index e69f988..da078ea 100644
25933--- a/arch/x86/kernel/module.c
25934+++ b/arch/x86/kernel/module.c
25935@@ -81,17 +81,62 @@ static unsigned long int get_module_load_offset(void)
25936 }
25937 #endif
25938
25939-void *module_alloc(unsigned long size)
25940+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
25941 {
25942- if (PAGE_ALIGN(size) > MODULES_LEN)
25943+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
25944 return NULL;
25945 return __vmalloc_node_range(size, 1,
25946 MODULES_VADDR + get_module_load_offset(),
25947- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
25948- PAGE_KERNEL_EXEC, NUMA_NO_NODE,
25949+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
25950+ prot, NUMA_NO_NODE,
25951 __builtin_return_address(0));
25952 }
25953
25954+void *module_alloc(unsigned long size)
25955+{
25956+
25957+#ifdef CONFIG_PAX_KERNEXEC
25958+ return __module_alloc(size, PAGE_KERNEL);
25959+#else
25960+ return __module_alloc(size, PAGE_KERNEL_EXEC);
25961+#endif
25962+
25963+}
25964+
25965+#ifdef CONFIG_PAX_KERNEXEC
25966+#ifdef CONFIG_X86_32
25967+void *module_alloc_exec(unsigned long size)
25968+{
25969+ struct vm_struct *area;
25970+
25971+ if (size == 0)
25972+ return NULL;
25973+
25974+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
25975+return area ? area->addr : NULL;
25976+}
25977+EXPORT_SYMBOL(module_alloc_exec);
25978+
25979+void module_free_exec(struct module *mod, void *module_region)
25980+{
25981+ vunmap(module_region);
25982+}
25983+EXPORT_SYMBOL(module_free_exec);
25984+#else
25985+void module_free_exec(struct module *mod, void *module_region)
25986+{
25987+ module_free(mod, module_region);
25988+}
25989+EXPORT_SYMBOL(module_free_exec);
25990+
25991+void *module_alloc_exec(unsigned long size)
25992+{
25993+ return __module_alloc(size, PAGE_KERNEL_RX);
25994+}
25995+EXPORT_SYMBOL(module_alloc_exec);
25996+#endif
25997+#endif
25998+
25999 #ifdef CONFIG_X86_32
26000 int apply_relocate(Elf32_Shdr *sechdrs,
26001 const char *strtab,
26002@@ -102,14 +147,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26003 unsigned int i;
26004 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26005 Elf32_Sym *sym;
26006- uint32_t *location;
26007+ uint32_t *plocation, location;
26008
26009 DEBUGP("Applying relocate section %u to %u\n",
26010 relsec, sechdrs[relsec].sh_info);
26011 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26012 /* This is where to make the change */
26013- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26014- + rel[i].r_offset;
26015+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26016+ location = (uint32_t)plocation;
26017+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26018+ plocation = ktla_ktva((void *)plocation);
26019 /* This is the symbol it is referring to. Note that all
26020 undefined symbols have been resolved. */
26021 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26022@@ -118,11 +165,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26023 switch (ELF32_R_TYPE(rel[i].r_info)) {
26024 case R_386_32:
26025 /* We add the value into the location given */
26026- *location += sym->st_value;
26027+ pax_open_kernel();
26028+ *plocation += sym->st_value;
26029+ pax_close_kernel();
26030 break;
26031 case R_386_PC32:
26032 /* Add the value, subtract its position */
26033- *location += sym->st_value - (uint32_t)location;
26034+ pax_open_kernel();
26035+ *plocation += sym->st_value - location;
26036+ pax_close_kernel();
26037 break;
26038 default:
26039 pr_err("%s: Unknown relocation: %u\n",
26040@@ -167,21 +218,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26041 case R_X86_64_NONE:
26042 break;
26043 case R_X86_64_64:
26044+ pax_open_kernel();
26045 *(u64 *)loc = val;
26046+ pax_close_kernel();
26047 break;
26048 case R_X86_64_32:
26049+ pax_open_kernel();
26050 *(u32 *)loc = val;
26051+ pax_close_kernel();
26052 if (val != *(u32 *)loc)
26053 goto overflow;
26054 break;
26055 case R_X86_64_32S:
26056+ pax_open_kernel();
26057 *(s32 *)loc = val;
26058+ pax_close_kernel();
26059 if ((s64)val != *(s32 *)loc)
26060 goto overflow;
26061 break;
26062 case R_X86_64_PC32:
26063 val -= (u64)loc;
26064+ pax_open_kernel();
26065 *(u32 *)loc = val;
26066+ pax_close_kernel();
26067+
26068 #if 0
26069 if ((s64)val != *(s32 *)loc)
26070 goto overflow;
26071diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26072index c9603ac..9f88728 100644
26073--- a/arch/x86/kernel/msr.c
26074+++ b/arch/x86/kernel/msr.c
26075@@ -37,6 +37,7 @@
26076 #include <linux/notifier.h>
26077 #include <linux/uaccess.h>
26078 #include <linux/gfp.h>
26079+#include <linux/grsecurity.h>
26080
26081 #include <asm/processor.h>
26082 #include <asm/msr.h>
26083@@ -103,6 +104,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26084 int err = 0;
26085 ssize_t bytes = 0;
26086
26087+#ifdef CONFIG_GRKERNSEC_KMEM
26088+ gr_handle_msr_write();
26089+ return -EPERM;
26090+#endif
26091+
26092 if (count % 8)
26093 return -EINVAL; /* Invalid chunk size */
26094
26095@@ -150,6 +156,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26096 err = -EBADF;
26097 break;
26098 }
26099+#ifdef CONFIG_GRKERNSEC_KMEM
26100+ gr_handle_msr_write();
26101+ return -EPERM;
26102+#endif
26103 if (copy_from_user(&regs, uregs, sizeof regs)) {
26104 err = -EFAULT;
26105 break;
26106@@ -233,7 +243,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26107 return notifier_from_errno(err);
26108 }
26109
26110-static struct notifier_block __refdata msr_class_cpu_notifier = {
26111+static struct notifier_block msr_class_cpu_notifier = {
26112 .notifier_call = msr_class_cpu_callback,
26113 };
26114
26115diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26116index c3e985d..110a36a 100644
26117--- a/arch/x86/kernel/nmi.c
26118+++ b/arch/x86/kernel/nmi.c
26119@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26120
26121 static void nmi_max_handler(struct irq_work *w)
26122 {
26123- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26124+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26125 int remainder_ns, decimal_msecs;
26126- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26127+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26128
26129 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26130 decimal_msecs = remainder_ns / 1000;
26131
26132 printk_ratelimited(KERN_INFO
26133 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26134- a->handler, whole_msecs, decimal_msecs);
26135+ n->action->handler, whole_msecs, decimal_msecs);
26136 }
26137
26138 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26139@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26140 delta = sched_clock() - delta;
26141 trace_nmi_handler(a->handler, (int)delta, thishandled);
26142
26143- if (delta < nmi_longest_ns || delta < a->max_duration)
26144+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26145 continue;
26146
26147- a->max_duration = delta;
26148- irq_work_queue(&a->irq_work);
26149+ a->work->max_duration = delta;
26150+ irq_work_queue(&a->work->irq_work);
26151 }
26152
26153 rcu_read_unlock();
26154@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26155 }
26156 NOKPROBE_SYMBOL(nmi_handle);
26157
26158-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26159+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26160 {
26161 struct nmi_desc *desc = nmi_to_desc(type);
26162 unsigned long flags;
26163@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26164 if (!action->handler)
26165 return -EINVAL;
26166
26167- init_irq_work(&action->irq_work, nmi_max_handler);
26168+ action->work->action = action;
26169+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26170
26171 spin_lock_irqsave(&desc->lock, flags);
26172
26173@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26174 * event confuses some handlers (kdump uses this flag)
26175 */
26176 if (action->flags & NMI_FLAG_FIRST)
26177- list_add_rcu(&action->list, &desc->head);
26178+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26179 else
26180- list_add_tail_rcu(&action->list, &desc->head);
26181+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26182
26183 spin_unlock_irqrestore(&desc->lock, flags);
26184 return 0;
26185@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26186 if (!strcmp(n->name, name)) {
26187 WARN(in_nmi(),
26188 "Trying to free NMI (%s) from NMI context!\n", n->name);
26189- list_del_rcu(&n->list);
26190+ pax_list_del_rcu((struct list_head *)&n->list);
26191 break;
26192 }
26193 }
26194@@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
26195 dotraplinkage notrace void
26196 do_nmi(struct pt_regs *regs, long error_code)
26197 {
26198+
26199+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26200+ if (!user_mode(regs)) {
26201+ unsigned long cs = regs->cs & 0xFFFF;
26202+ unsigned long ip = ktva_ktla(regs->ip);
26203+
26204+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26205+ regs->ip = ip;
26206+ }
26207+#endif
26208+
26209 nmi_nesting_preprocess(regs);
26210
26211 nmi_enter();
26212diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26213index 6d9582e..f746287 100644
26214--- a/arch/x86/kernel/nmi_selftest.c
26215+++ b/arch/x86/kernel/nmi_selftest.c
26216@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26217 {
26218 /* trap all the unknown NMIs we may generate */
26219 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26220- __initdata);
26221+ __initconst);
26222 }
26223
26224 static void __init cleanup_nmi_testsuite(void)
26225@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26226 unsigned long timeout;
26227
26228 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26229- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26230+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26231 nmi_fail = FAILURE;
26232 return;
26233 }
26234diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26235index bbb6c73..24a58ef 100644
26236--- a/arch/x86/kernel/paravirt-spinlocks.c
26237+++ b/arch/x86/kernel/paravirt-spinlocks.c
26238@@ -8,7 +8,7 @@
26239
26240 #include <asm/paravirt.h>
26241
26242-struct pv_lock_ops pv_lock_ops = {
26243+struct pv_lock_ops pv_lock_ops __read_only = {
26244 #ifdef CONFIG_SMP
26245 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26246 .unlock_kick = paravirt_nop,
26247diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26248index 548d25f..f8fb99c 100644
26249--- a/arch/x86/kernel/paravirt.c
26250+++ b/arch/x86/kernel/paravirt.c
26251@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26252 {
26253 return x;
26254 }
26255+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26256+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26257+#endif
26258
26259 void __init default_banner(void)
26260 {
26261@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26262
26263 if (opfunc == NULL)
26264 /* If there's no function, patch it with a ud2a (BUG) */
26265- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26266- else if (opfunc == _paravirt_nop)
26267+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26268+ else if (opfunc == (void *)_paravirt_nop)
26269 /* If the operation is a nop, then nop the callsite */
26270 ret = paravirt_patch_nop();
26271
26272 /* identity functions just return their single argument */
26273- else if (opfunc == _paravirt_ident_32)
26274+ else if (opfunc == (void *)_paravirt_ident_32)
26275 ret = paravirt_patch_ident_32(insnbuf, len);
26276- else if (opfunc == _paravirt_ident_64)
26277+ else if (opfunc == (void *)_paravirt_ident_64)
26278 ret = paravirt_patch_ident_64(insnbuf, len);
26279+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26280+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26281+ ret = paravirt_patch_ident_64(insnbuf, len);
26282+#endif
26283
26284 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26285 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26286@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26287 if (insn_len > len || start == NULL)
26288 insn_len = len;
26289 else
26290- memcpy(insnbuf, start, insn_len);
26291+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26292
26293 return insn_len;
26294 }
26295@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26296 return this_cpu_read(paravirt_lazy_mode);
26297 }
26298
26299-struct pv_info pv_info = {
26300+struct pv_info pv_info __read_only = {
26301 .name = "bare hardware",
26302 .paravirt_enabled = 0,
26303 .kernel_rpl = 0,
26304@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26305 #endif
26306 };
26307
26308-struct pv_init_ops pv_init_ops = {
26309+struct pv_init_ops pv_init_ops __read_only = {
26310 .patch = native_patch,
26311 };
26312
26313-struct pv_time_ops pv_time_ops = {
26314+struct pv_time_ops pv_time_ops __read_only = {
26315 .sched_clock = native_sched_clock,
26316 .steal_clock = native_steal_clock,
26317 };
26318
26319-__visible struct pv_irq_ops pv_irq_ops = {
26320+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26321 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26322 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26323 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26324@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26325 #endif
26326 };
26327
26328-__visible struct pv_cpu_ops pv_cpu_ops = {
26329+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26330 .cpuid = native_cpuid,
26331 .get_debugreg = native_get_debugreg,
26332 .set_debugreg = native_set_debugreg,
26333@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26334 NOKPROBE_SYMBOL(native_set_debugreg);
26335 NOKPROBE_SYMBOL(native_load_idt);
26336
26337-struct pv_apic_ops pv_apic_ops = {
26338+struct pv_apic_ops pv_apic_ops __read_only= {
26339 #ifdef CONFIG_X86_LOCAL_APIC
26340 .startup_ipi_hook = paravirt_nop,
26341 #endif
26342 };
26343
26344-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26345+#ifdef CONFIG_X86_32
26346+#ifdef CONFIG_X86_PAE
26347+/* 64-bit pagetable entries */
26348+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26349+#else
26350 /* 32-bit pagetable entries */
26351 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26352+#endif
26353 #else
26354 /* 64-bit pagetable entries */
26355 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26356 #endif
26357
26358-struct pv_mmu_ops pv_mmu_ops = {
26359+struct pv_mmu_ops pv_mmu_ops __read_only = {
26360
26361 .read_cr2 = native_read_cr2,
26362 .write_cr2 = native_write_cr2,
26363@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26364 .make_pud = PTE_IDENT,
26365
26366 .set_pgd = native_set_pgd,
26367+ .set_pgd_batched = native_set_pgd_batched,
26368 #endif
26369 #endif /* PAGETABLE_LEVELS >= 3 */
26370
26371@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26372 },
26373
26374 .set_fixmap = native_set_fixmap,
26375+
26376+#ifdef CONFIG_PAX_KERNEXEC
26377+ .pax_open_kernel = native_pax_open_kernel,
26378+ .pax_close_kernel = native_pax_close_kernel,
26379+#endif
26380+
26381 };
26382
26383 EXPORT_SYMBOL_GPL(pv_time_ops);
26384diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26385index a1da673..b6f5831 100644
26386--- a/arch/x86/kernel/paravirt_patch_64.c
26387+++ b/arch/x86/kernel/paravirt_patch_64.c
26388@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26389 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26390 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26391 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26392+
26393+#ifndef CONFIG_PAX_MEMORY_UDEREF
26394 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26395+#endif
26396+
26397 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26398 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26399
26400@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26401 PATCH_SITE(pv_mmu_ops, read_cr3);
26402 PATCH_SITE(pv_mmu_ops, write_cr3);
26403 PATCH_SITE(pv_cpu_ops, clts);
26404+
26405+#ifndef CONFIG_PAX_MEMORY_UDEREF
26406 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26407+#endif
26408+
26409 PATCH_SITE(pv_cpu_ops, wbinvd);
26410
26411 patch_site:
26412diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26413index 0497f71..7186c0d 100644
26414--- a/arch/x86/kernel/pci-calgary_64.c
26415+++ b/arch/x86/kernel/pci-calgary_64.c
26416@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26417 tce_space = be64_to_cpu(readq(target));
26418 tce_space = tce_space & TAR_SW_BITS;
26419
26420- tce_space = tce_space & (~specified_table_size);
26421+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26422 info->tce_space = (u64 *)__va(tce_space);
26423 }
26424 }
26425diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26426index 35ccf75..7a15747 100644
26427--- a/arch/x86/kernel/pci-iommu_table.c
26428+++ b/arch/x86/kernel/pci-iommu_table.c
26429@@ -2,7 +2,7 @@
26430 #include <asm/iommu_table.h>
26431 #include <linux/string.h>
26432 #include <linux/kallsyms.h>
26433-
26434+#include <linux/sched.h>
26435
26436 #define DEBUG 1
26437
26438diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26439index 77dd0ad..9ec4723 100644
26440--- a/arch/x86/kernel/pci-swiotlb.c
26441+++ b/arch/x86/kernel/pci-swiotlb.c
26442@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26443 struct dma_attrs *attrs)
26444 {
26445 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26446- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26447+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26448 else
26449 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26450 }
26451diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26452index e127dda..94e384d 100644
26453--- a/arch/x86/kernel/process.c
26454+++ b/arch/x86/kernel/process.c
26455@@ -36,7 +36,8 @@
26456 * section. Since TSS's are completely CPU-local, we want them
26457 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26458 */
26459-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26460+struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26461+EXPORT_SYMBOL(init_tss);
26462
26463 #ifdef CONFIG_X86_64
26464 static DEFINE_PER_CPU(unsigned char, is_idle);
26465@@ -94,7 +95,7 @@ void arch_task_cache_init(void)
26466 task_xstate_cachep =
26467 kmem_cache_create("task_xstate", xstate_size,
26468 __alignof__(union thread_xstate),
26469- SLAB_PANIC | SLAB_NOTRACK, NULL);
26470+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26471 setup_xstate_comp();
26472 }
26473
26474@@ -108,7 +109,7 @@ void exit_thread(void)
26475 unsigned long *bp = t->io_bitmap_ptr;
26476
26477 if (bp) {
26478- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26479+ struct tss_struct *tss = init_tss + get_cpu();
26480
26481 t->io_bitmap_ptr = NULL;
26482 clear_thread_flag(TIF_IO_BITMAP);
26483@@ -128,6 +129,9 @@ void flush_thread(void)
26484 {
26485 struct task_struct *tsk = current;
26486
26487+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26488+ loadsegment(gs, 0);
26489+#endif
26490 flush_ptrace_hw_breakpoint(tsk);
26491 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26492 drop_init_fpu(tsk);
26493@@ -274,7 +278,7 @@ static void __exit_idle(void)
26494 void exit_idle(void)
26495 {
26496 /* idle loop has pid 0 */
26497- if (current->pid)
26498+ if (task_pid_nr(current))
26499 return;
26500 __exit_idle();
26501 }
26502@@ -327,7 +331,7 @@ bool xen_set_default_idle(void)
26503 return ret;
26504 }
26505 #endif
26506-void stop_this_cpu(void *dummy)
26507+__noreturn void stop_this_cpu(void *dummy)
26508 {
26509 local_irq_disable();
26510 /*
26511@@ -456,16 +460,37 @@ static int __init idle_setup(char *str)
26512 }
26513 early_param("idle", idle_setup);
26514
26515-unsigned long arch_align_stack(unsigned long sp)
26516+#ifdef CONFIG_PAX_RANDKSTACK
26517+void pax_randomize_kstack(struct pt_regs *regs)
26518 {
26519- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26520- sp -= get_random_int() % 8192;
26521- return sp & ~0xf;
26522-}
26523+ struct thread_struct *thread = &current->thread;
26524+ unsigned long time;
26525
26526-unsigned long arch_randomize_brk(struct mm_struct *mm)
26527-{
26528- unsigned long range_end = mm->brk + 0x02000000;
26529- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26530-}
26531+ if (!randomize_va_space)
26532+ return;
26533+
26534+ if (v8086_mode(regs))
26535+ return;
26536
26537+ rdtscl(time);
26538+
26539+ /* P4 seems to return a 0 LSB, ignore it */
26540+#ifdef CONFIG_MPENTIUM4
26541+ time &= 0x3EUL;
26542+ time <<= 2;
26543+#elif defined(CONFIG_X86_64)
26544+ time &= 0xFUL;
26545+ time <<= 4;
26546+#else
26547+ time &= 0x1FUL;
26548+ time <<= 3;
26549+#endif
26550+
26551+ thread->sp0 ^= time;
26552+ load_sp0(init_tss + smp_processor_id(), thread);
26553+
26554+#ifdef CONFIG_X86_64
26555+ this_cpu_write(kernel_stack, thread->sp0);
26556+#endif
26557+}
26558+#endif
26559diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26560index 8f3ebfe..cbc731b 100644
26561--- a/arch/x86/kernel/process_32.c
26562+++ b/arch/x86/kernel/process_32.c
26563@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26564 unsigned long thread_saved_pc(struct task_struct *tsk)
26565 {
26566 return ((unsigned long *)tsk->thread.sp)[3];
26567+//XXX return tsk->thread.eip;
26568 }
26569
26570 void __show_regs(struct pt_regs *regs, int all)
26571@@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26572 unsigned long sp;
26573 unsigned short ss, gs;
26574
26575- if (user_mode_vm(regs)) {
26576+ if (user_mode(regs)) {
26577 sp = regs->sp;
26578 ss = regs->ss & 0xffff;
26579- gs = get_user_gs(regs);
26580 } else {
26581 sp = kernel_stack_pointer(regs);
26582 savesegment(ss, ss);
26583- savesegment(gs, gs);
26584 }
26585+ gs = get_user_gs(regs);
26586
26587 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26588 (u16)regs->cs, regs->ip, regs->flags,
26589- smp_processor_id());
26590+ raw_smp_processor_id());
26591 print_symbol("EIP is at %s\n", regs->ip);
26592
26593 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26594@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26595 int copy_thread(unsigned long clone_flags, unsigned long sp,
26596 unsigned long arg, struct task_struct *p)
26597 {
26598- struct pt_regs *childregs = task_pt_regs(p);
26599+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26600 struct task_struct *tsk;
26601 int err;
26602
26603 p->thread.sp = (unsigned long) childregs;
26604 p->thread.sp0 = (unsigned long) (childregs+1);
26605+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26606 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26607
26608 if (unlikely(p->flags & PF_KTHREAD)) {
26609 /* kernel thread */
26610 memset(childregs, 0, sizeof(struct pt_regs));
26611 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26612- task_user_gs(p) = __KERNEL_STACK_CANARY;
26613- childregs->ds = __USER_DS;
26614- childregs->es = __USER_DS;
26615+ savesegment(gs, childregs->gs);
26616+ childregs->ds = __KERNEL_DS;
26617+ childregs->es = __KERNEL_DS;
26618 childregs->fs = __KERNEL_PERCPU;
26619 childregs->bx = sp; /* function */
26620 childregs->bp = arg;
26621@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26622 struct thread_struct *prev = &prev_p->thread,
26623 *next = &next_p->thread;
26624 int cpu = smp_processor_id();
26625- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26626+ struct tss_struct *tss = init_tss + cpu;
26627 fpu_switch_t fpu;
26628
26629 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26630@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26631 */
26632 lazy_save_gs(prev->gs);
26633
26634+#ifdef CONFIG_PAX_MEMORY_UDEREF
26635+ __set_fs(task_thread_info(next_p)->addr_limit);
26636+#endif
26637+
26638 /*
26639 * Load the per-thread Thread-Local Storage descriptor.
26640 */
26641@@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26642 */
26643 arch_end_context_switch(next_p);
26644
26645- this_cpu_write(kernel_stack,
26646- (unsigned long)task_stack_page(next_p) +
26647- THREAD_SIZE - KERNEL_STACK_OFFSET);
26648+ this_cpu_write(current_task, next_p);
26649+ this_cpu_write(current_tinfo, &next_p->tinfo);
26650+ this_cpu_write(kernel_stack, next->sp0);
26651
26652 /*
26653 * Restore %gs if needed (which is common)
26654@@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26655
26656 switch_fpu_finish(next_p, fpu);
26657
26658- this_cpu_write(current_task, next_p);
26659-
26660 return prev_p;
26661 }
26662
26663@@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
26664 } while (count++ < 16);
26665 return 0;
26666 }
26667-
26668diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26669index 5a2c029..ec8611d 100644
26670--- a/arch/x86/kernel/process_64.c
26671+++ b/arch/x86/kernel/process_64.c
26672@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26673 struct pt_regs *childregs;
26674 struct task_struct *me = current;
26675
26676- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26677+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26678 childregs = task_pt_regs(p);
26679 p->thread.sp = (unsigned long) childregs;
26680 p->thread.usersp = me->thread.usersp;
26681+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26682 set_tsk_thread_flag(p, TIF_FORK);
26683 p->thread.io_bitmap_ptr = NULL;
26684
26685@@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26686 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26687 savesegment(es, p->thread.es);
26688 savesegment(ds, p->thread.ds);
26689+ savesegment(ss, p->thread.ss);
26690+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26691 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26692
26693 if (unlikely(p->flags & PF_KTHREAD)) {
26694@@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26695 struct thread_struct *prev = &prev_p->thread;
26696 struct thread_struct *next = &next_p->thread;
26697 int cpu = smp_processor_id();
26698- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26699+ struct tss_struct *tss = init_tss + cpu;
26700 unsigned fsindex, gsindex;
26701 fpu_switch_t fpu;
26702
26703@@ -331,6 +334,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26704 if (unlikely(next->ds | prev->ds))
26705 loadsegment(ds, next->ds);
26706
26707+ savesegment(ss, prev->ss);
26708+ if (unlikely(next->ss != prev->ss))
26709+ loadsegment(ss, next->ss);
26710+
26711 /*
26712 * Switch FS and GS.
26713 *
26714@@ -404,6 +411,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26715 prev->usersp = this_cpu_read(old_rsp);
26716 this_cpu_write(old_rsp, next->usersp);
26717 this_cpu_write(current_task, next_p);
26718+ this_cpu_write(current_tinfo, &next_p->tinfo);
26719
26720 /*
26721 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26722@@ -413,9 +421,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26723 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26724 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26725
26726- this_cpu_write(kernel_stack,
26727- (unsigned long)task_stack_page(next_p) +
26728- THREAD_SIZE - KERNEL_STACK_OFFSET);
26729+ this_cpu_write(kernel_stack, next->sp0);
26730
26731 /*
26732 * Now maybe reload the debug registers and handle I/O bitmaps
26733@@ -485,12 +491,11 @@ unsigned long get_wchan(struct task_struct *p)
26734 if (!p || p == current || p->state == TASK_RUNNING)
26735 return 0;
26736 stack = (unsigned long)task_stack_page(p);
26737- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26738+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26739 return 0;
26740 fp = *(u64 *)(p->thread.sp);
26741 do {
26742- if (fp < (unsigned long)stack ||
26743- fp >= (unsigned long)stack+THREAD_SIZE)
26744+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26745 return 0;
26746 ip = *(u64 *)(fp+8);
26747 if (!in_sched_functions(ip))
26748diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26749index e510618..5165ac0 100644
26750--- a/arch/x86/kernel/ptrace.c
26751+++ b/arch/x86/kernel/ptrace.c
26752@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26753 unsigned long sp = (unsigned long)&regs->sp;
26754 u32 *prev_esp;
26755
26756- if (context == (sp & ~(THREAD_SIZE - 1)))
26757+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26758 return sp;
26759
26760- prev_esp = (u32 *)(context);
26761+ prev_esp = *(u32 **)(context);
26762 if (prev_esp)
26763 return (unsigned long)prev_esp;
26764
26765@@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26766 if (child->thread.gs != value)
26767 return do_arch_prctl(child, ARCH_SET_GS, value);
26768 return 0;
26769+
26770+ case offsetof(struct user_regs_struct,ip):
26771+ /*
26772+ * Protect against any attempt to set ip to an
26773+ * impossible address. There are dragons lurking if the
26774+ * address is noncanonical. (This explicitly allows
26775+ * setting ip to TASK_SIZE_MAX, because user code can do
26776+ * that all by itself by running off the end of its
26777+ * address space.
26778+ */
26779+ if (value > TASK_SIZE_MAX)
26780+ return -EIO;
26781+ break;
26782+
26783 #endif
26784 }
26785
26786@@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26787 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26788 {
26789 int i;
26790- int dr7 = 0;
26791+ unsigned long dr7 = 0;
26792 struct arch_hw_breakpoint *info;
26793
26794 for (i = 0; i < HBP_NUM; i++) {
26795@@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26796 unsigned long addr, unsigned long data)
26797 {
26798 int ret;
26799- unsigned long __user *datap = (unsigned long __user *)data;
26800+ unsigned long __user *datap = (__force unsigned long __user *)data;
26801
26802 switch (request) {
26803 /* read the word at location addr in the USER area. */
26804@@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26805 if ((int) addr < 0)
26806 return -EIO;
26807 ret = do_get_thread_area(child, addr,
26808- (struct user_desc __user *)data);
26809+ (__force struct user_desc __user *) data);
26810 break;
26811
26812 case PTRACE_SET_THREAD_AREA:
26813 if ((int) addr < 0)
26814 return -EIO;
26815 ret = do_set_thread_area(child, addr,
26816- (struct user_desc __user *)data, 0);
26817+ (__force struct user_desc __user *) data, 0);
26818 break;
26819 #endif
26820
26821@@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26822
26823 #ifdef CONFIG_X86_64
26824
26825-static struct user_regset x86_64_regsets[] __read_mostly = {
26826+static user_regset_no_const x86_64_regsets[] __read_only = {
26827 [REGSET_GENERAL] = {
26828 .core_note_type = NT_PRSTATUS,
26829 .n = sizeof(struct user_regs_struct) / sizeof(long),
26830@@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26831 #endif /* CONFIG_X86_64 */
26832
26833 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26834-static struct user_regset x86_32_regsets[] __read_mostly = {
26835+static user_regset_no_const x86_32_regsets[] __read_only = {
26836 [REGSET_GENERAL] = {
26837 .core_note_type = NT_PRSTATUS,
26838 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26839@@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26840 */
26841 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26842
26843-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26844+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26845 {
26846 #ifdef CONFIG_X86_64
26847 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26848@@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26849 memset(info, 0, sizeof(*info));
26850 info->si_signo = SIGTRAP;
26851 info->si_code = si_code;
26852- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26853+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26854 }
26855
26856 void user_single_step_siginfo(struct task_struct *tsk,
26857@@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26858 }
26859 }
26860
26861+#ifdef CONFIG_GRKERNSEC_SETXID
26862+extern void gr_delayed_cred_worker(void);
26863+#endif
26864+
26865 /*
26866 * We can return 0 to resume the syscall or anything else to go to phase
26867 * 2. If we resume the syscall, we need to put something appropriate in
26868@@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26869
26870 BUG_ON(regs != task_pt_regs(current));
26871
26872+#ifdef CONFIG_GRKERNSEC_SETXID
26873+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26874+ gr_delayed_cred_worker();
26875+#endif
26876+
26877 /*
26878 * If we stepped into a sysenter/syscall insn, it trapped in
26879 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26880@@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26881 */
26882 user_exit();
26883
26884+#ifdef CONFIG_GRKERNSEC_SETXID
26885+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26886+ gr_delayed_cred_worker();
26887+#endif
26888+
26889 audit_syscall_exit(regs);
26890
26891 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26892diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26893index 2f355d2..e75ed0a 100644
26894--- a/arch/x86/kernel/pvclock.c
26895+++ b/arch/x86/kernel/pvclock.c
26896@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26897 reset_hung_task_detector();
26898 }
26899
26900-static atomic64_t last_value = ATOMIC64_INIT(0);
26901+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26902
26903 void pvclock_resume(void)
26904 {
26905- atomic64_set(&last_value, 0);
26906+ atomic64_set_unchecked(&last_value, 0);
26907 }
26908
26909 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26910@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26911 * updating at the same time, and one of them could be slightly behind,
26912 * making the assumption that last_value always go forward fail to hold.
26913 */
26914- last = atomic64_read(&last_value);
26915+ last = atomic64_read_unchecked(&last_value);
26916 do {
26917 if (ret < last)
26918 return last;
26919- last = atomic64_cmpxchg(&last_value, last, ret);
26920+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
26921 } while (unlikely(last != ret));
26922
26923 return ret;
26924diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
26925index 17962e6..47f55db 100644
26926--- a/arch/x86/kernel/reboot.c
26927+++ b/arch/x86/kernel/reboot.c
26928@@ -69,6 +69,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
26929
26930 void __noreturn machine_real_restart(unsigned int type)
26931 {
26932+
26933+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
26934+ struct desc_struct *gdt;
26935+#endif
26936+
26937 local_irq_disable();
26938
26939 /*
26940@@ -96,7 +101,29 @@ void __noreturn machine_real_restart(unsigned int type)
26941
26942 /* Jump to the identity-mapped low memory code */
26943 #ifdef CONFIG_X86_32
26944- asm volatile("jmpl *%0" : :
26945+
26946+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
26947+ gdt = get_cpu_gdt_table(smp_processor_id());
26948+ pax_open_kernel();
26949+#ifdef CONFIG_PAX_MEMORY_UDEREF
26950+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
26951+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
26952+ loadsegment(ds, __KERNEL_DS);
26953+ loadsegment(es, __KERNEL_DS);
26954+ loadsegment(ss, __KERNEL_DS);
26955+#endif
26956+#ifdef CONFIG_PAX_KERNEXEC
26957+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
26958+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
26959+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
26960+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
26961+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
26962+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
26963+#endif
26964+ pax_close_kernel();
26965+#endif
26966+
26967+ asm volatile("ljmpl *%0" : :
26968 "rm" (real_mode_header->machine_real_restart_asm),
26969 "a" (type));
26970 #else
26971@@ -500,7 +527,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
26972 * This means that this function can never return, it can misbehave
26973 * by not rebooting properly and hanging.
26974 */
26975-static void native_machine_emergency_restart(void)
26976+static void __noreturn native_machine_emergency_restart(void)
26977 {
26978 int i;
26979 int attempt = 0;
26980@@ -620,13 +647,13 @@ void native_machine_shutdown(void)
26981 #endif
26982 }
26983
26984-static void __machine_emergency_restart(int emergency)
26985+static void __noreturn __machine_emergency_restart(int emergency)
26986 {
26987 reboot_emergency = emergency;
26988 machine_ops.emergency_restart();
26989 }
26990
26991-static void native_machine_restart(char *__unused)
26992+static void __noreturn native_machine_restart(char *__unused)
26993 {
26994 pr_notice("machine restart\n");
26995
26996@@ -635,7 +662,7 @@ static void native_machine_restart(char *__unused)
26997 __machine_emergency_restart(0);
26998 }
26999
27000-static void native_machine_halt(void)
27001+static void __noreturn native_machine_halt(void)
27002 {
27003 /* Stop other cpus and apics */
27004 machine_shutdown();
27005@@ -645,7 +672,7 @@ static void native_machine_halt(void)
27006 stop_this_cpu(NULL);
27007 }
27008
27009-static void native_machine_power_off(void)
27010+static void __noreturn native_machine_power_off(void)
27011 {
27012 if (pm_power_off) {
27013 if (!reboot_force)
27014@@ -654,9 +681,10 @@ static void native_machine_power_off(void)
27015 }
27016 /* A fallback in case there is no PM info available */
27017 tboot_shutdown(TB_SHUTDOWN_HALT);
27018+ unreachable();
27019 }
27020
27021-struct machine_ops machine_ops = {
27022+struct machine_ops machine_ops __read_only = {
27023 .power_off = native_machine_power_off,
27024 .shutdown = native_machine_shutdown,
27025 .emergency_restart = native_machine_emergency_restart,
27026diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27027index c8e41e9..64049ef 100644
27028--- a/arch/x86/kernel/reboot_fixups_32.c
27029+++ b/arch/x86/kernel/reboot_fixups_32.c
27030@@ -57,7 +57,7 @@ struct device_fixup {
27031 unsigned int vendor;
27032 unsigned int device;
27033 void (*reboot_fixup)(struct pci_dev *);
27034-};
27035+} __do_const;
27036
27037 /*
27038 * PCI ids solely used for fixups_table go here
27039diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27040index 3fd2c69..a444264 100644
27041--- a/arch/x86/kernel/relocate_kernel_64.S
27042+++ b/arch/x86/kernel/relocate_kernel_64.S
27043@@ -96,8 +96,7 @@ relocate_kernel:
27044
27045 /* jump to identity mapped page */
27046 addq $(identity_mapped - relocate_kernel), %r8
27047- pushq %r8
27048- ret
27049+ jmp *%r8
27050
27051 identity_mapped:
27052 /* set return address to 0 if not preserving context */
27053diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27054index ab08aa2..6d74a3a 100644
27055--- a/arch/x86/kernel/setup.c
27056+++ b/arch/x86/kernel/setup.c
27057@@ -110,6 +110,7 @@
27058 #include <asm/mce.h>
27059 #include <asm/alternative.h>
27060 #include <asm/prom.h>
27061+#include <asm/boot.h>
27062
27063 /*
27064 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27065@@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
27066 #endif
27067
27068
27069-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27070-__visible unsigned long mmu_cr4_features;
27071+#ifdef CONFIG_X86_64
27072+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27073+#elif defined(CONFIG_X86_PAE)
27074+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27075 #else
27076-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27077+__visible unsigned long mmu_cr4_features __read_only;
27078 #endif
27079
27080+void set_in_cr4(unsigned long mask)
27081+{
27082+ unsigned long cr4 = read_cr4();
27083+
27084+ if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
27085+ return;
27086+
27087+ pax_open_kernel();
27088+ mmu_cr4_features |= mask;
27089+ pax_close_kernel();
27090+
27091+ if (trampoline_cr4_features)
27092+ *trampoline_cr4_features = mmu_cr4_features;
27093+ cr4 |= mask;
27094+ write_cr4(cr4);
27095+}
27096+EXPORT_SYMBOL(set_in_cr4);
27097+
27098+void clear_in_cr4(unsigned long mask)
27099+{
27100+ unsigned long cr4 = read_cr4();
27101+
27102+ if (!(cr4 & mask) && cr4 == mmu_cr4_features)
27103+ return;
27104+
27105+ pax_open_kernel();
27106+ mmu_cr4_features &= ~mask;
27107+ pax_close_kernel();
27108+
27109+ if (trampoline_cr4_features)
27110+ *trampoline_cr4_features = mmu_cr4_features;
27111+ cr4 &= ~mask;
27112+ write_cr4(cr4);
27113+}
27114+EXPORT_SYMBOL(clear_in_cr4);
27115+
27116 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27117 int bootloader_type, bootloader_version;
27118
27119@@ -772,7 +811,7 @@ static void __init trim_bios_range(void)
27120 * area (640->1Mb) as ram even though it is not.
27121 * take them out.
27122 */
27123- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27124+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27125
27126 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27127 }
27128@@ -780,7 +819,7 @@ static void __init trim_bios_range(void)
27129 /* called before trim_bios_range() to spare extra sanitize */
27130 static void __init e820_add_kernel_range(void)
27131 {
27132- u64 start = __pa_symbol(_text);
27133+ u64 start = __pa_symbol(ktla_ktva(_text));
27134 u64 size = __pa_symbol(_end) - start;
27135
27136 /*
27137@@ -856,8 +895,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27138
27139 void __init setup_arch(char **cmdline_p)
27140 {
27141+#ifdef CONFIG_X86_32
27142+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27143+#else
27144 memblock_reserve(__pa_symbol(_text),
27145 (unsigned long)__bss_stop - (unsigned long)_text);
27146+#endif
27147
27148 early_reserve_initrd();
27149
27150@@ -955,14 +998,14 @@ void __init setup_arch(char **cmdline_p)
27151
27152 if (!boot_params.hdr.root_flags)
27153 root_mountflags &= ~MS_RDONLY;
27154- init_mm.start_code = (unsigned long) _text;
27155- init_mm.end_code = (unsigned long) _etext;
27156+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27157+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27158 init_mm.end_data = (unsigned long) _edata;
27159 init_mm.brk = _brk_end;
27160
27161- code_resource.start = __pa_symbol(_text);
27162- code_resource.end = __pa_symbol(_etext)-1;
27163- data_resource.start = __pa_symbol(_etext);
27164+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27165+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27166+ data_resource.start = __pa_symbol(_sdata);
27167 data_resource.end = __pa_symbol(_edata)-1;
27168 bss_resource.start = __pa_symbol(__bss_start);
27169 bss_resource.end = __pa_symbol(__bss_stop)-1;
27170diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27171index 5cdff03..80fa283 100644
27172--- a/arch/x86/kernel/setup_percpu.c
27173+++ b/arch/x86/kernel/setup_percpu.c
27174@@ -21,19 +21,17 @@
27175 #include <asm/cpu.h>
27176 #include <asm/stackprotector.h>
27177
27178-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27179+#ifdef CONFIG_SMP
27180+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27181 EXPORT_PER_CPU_SYMBOL(cpu_number);
27182+#endif
27183
27184-#ifdef CONFIG_X86_64
27185 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27186-#else
27187-#define BOOT_PERCPU_OFFSET 0
27188-#endif
27189
27190 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27191 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27192
27193-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27194+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27195 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27196 };
27197 EXPORT_SYMBOL(__per_cpu_offset);
27198@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27199 {
27200 #ifdef CONFIG_NEED_MULTIPLE_NODES
27201 pg_data_t *last = NULL;
27202- unsigned int cpu;
27203+ int cpu;
27204
27205 for_each_possible_cpu(cpu) {
27206 int node = early_cpu_to_node(cpu);
27207@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27208 {
27209 #ifdef CONFIG_X86_32
27210 struct desc_struct gdt;
27211+ unsigned long base = per_cpu_offset(cpu);
27212
27213- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27214- 0x2 | DESCTYPE_S, 0x8);
27215- gdt.s = 1;
27216+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27217+ 0x83 | DESCTYPE_S, 0xC);
27218 write_gdt_entry(get_cpu_gdt_table(cpu),
27219 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27220 #endif
27221@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27222 /* alrighty, percpu areas up and running */
27223 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27224 for_each_possible_cpu(cpu) {
27225+#ifdef CONFIG_CC_STACKPROTECTOR
27226+#ifdef CONFIG_X86_32
27227+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27228+#endif
27229+#endif
27230 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27231 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27232 per_cpu(cpu_number, cpu) = cpu;
27233@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27234 */
27235 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27236 #endif
27237+#ifdef CONFIG_CC_STACKPROTECTOR
27238+#ifdef CONFIG_X86_32
27239+ if (!cpu)
27240+ per_cpu(stack_canary.canary, cpu) = canary;
27241+#endif
27242+#endif
27243 /*
27244 * Up to this point, the boot CPU has been using .init.data
27245 * area. Reload any changed state for the boot CPU.
27246diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27247index ed37a76..39f936e 100644
27248--- a/arch/x86/kernel/signal.c
27249+++ b/arch/x86/kernel/signal.c
27250@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
27251 * Align the stack pointer according to the i386 ABI,
27252 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27253 */
27254- sp = ((sp + 4) & -16ul) - 4;
27255+ sp = ((sp - 12) & -16ul) - 4;
27256 #else /* !CONFIG_X86_32 */
27257 sp = round_down(sp, 16) - 8;
27258 #endif
27259@@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27260 }
27261
27262 if (current->mm->context.vdso)
27263- restorer = current->mm->context.vdso +
27264- selected_vdso32->sym___kernel_sigreturn;
27265+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27266 else
27267- restorer = &frame->retcode;
27268+ restorer = (void __user *)&frame->retcode;
27269 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27270 restorer = ksig->ka.sa.sa_restorer;
27271
27272@@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27273 * reasons and because gdb uses it as a signature to notice
27274 * signal handler stack frames.
27275 */
27276- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27277+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27278
27279 if (err)
27280 return -EFAULT;
27281@@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27282 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27283
27284 /* Set up to return from userspace. */
27285- restorer = current->mm->context.vdso +
27286- selected_vdso32->sym___kernel_rt_sigreturn;
27287+ if (current->mm->context.vdso)
27288+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27289+ else
27290+ restorer = (void __user *)&frame->retcode;
27291 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27292 restorer = ksig->ka.sa.sa_restorer;
27293 put_user_ex(restorer, &frame->pretcode);
27294@@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27295 * reasons and because gdb uses it as a signature to notice
27296 * signal handler stack frames.
27297 */
27298- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27299+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27300 } put_user_catch(err);
27301
27302 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27303@@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27304 {
27305 int usig = signr_convert(ksig->sig);
27306 sigset_t *set = sigmask_to_save();
27307- compat_sigset_t *cset = (compat_sigset_t *) set;
27308+ sigset_t sigcopy;
27309+ compat_sigset_t *cset;
27310+
27311+ sigcopy = *set;
27312+
27313+ cset = (compat_sigset_t *) &sigcopy;
27314
27315 /* Set up the stack frame */
27316 if (is_ia32_frame()) {
27317@@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27318 } else if (is_x32_frame()) {
27319 return x32_setup_rt_frame(ksig, cset, regs);
27320 } else {
27321- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27322+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27323 }
27324 }
27325
27326diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27327index be8e1bd..a3d93fa 100644
27328--- a/arch/x86/kernel/smp.c
27329+++ b/arch/x86/kernel/smp.c
27330@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27331
27332 __setup("nonmi_ipi", nonmi_ipi_setup);
27333
27334-struct smp_ops smp_ops = {
27335+struct smp_ops smp_ops __read_only = {
27336 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27337 .smp_prepare_cpus = native_smp_prepare_cpus,
27338 .smp_cpus_done = native_smp_cpus_done,
27339diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27340index 668d8f2..84a9d54 100644
27341--- a/arch/x86/kernel/smpboot.c
27342+++ b/arch/x86/kernel/smpboot.c
27343@@ -194,14 +194,17 @@ static void notrace start_secondary(void *unused)
27344
27345 enable_start_cpu0 = 0;
27346
27347-#ifdef CONFIG_X86_32
27348+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27349+ barrier();
27350+
27351 /* switch away from the initial page table */
27352+#ifdef CONFIG_PAX_PER_CPU_PGD
27353+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27354+#else
27355 load_cr3(swapper_pg_dir);
27356+#endif
27357 __flush_tlb_all();
27358-#endif
27359
27360- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27361- barrier();
27362 /*
27363 * Check TSC synchronization with the BP:
27364 */
27365@@ -765,8 +768,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27366 alternatives_enable_smp();
27367
27368 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27369- (THREAD_SIZE + task_stack_page(idle))) - 1);
27370+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27371 per_cpu(current_task, cpu) = idle;
27372+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27373
27374 #ifdef CONFIG_X86_32
27375 /* Stack for startup_32 can be just as for start_secondary onwards */
27376@@ -775,10 +779,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27377 clear_tsk_thread_flag(idle, TIF_FORK);
27378 initial_gs = per_cpu_offset(cpu);
27379 #endif
27380- per_cpu(kernel_stack, cpu) =
27381- (unsigned long)task_stack_page(idle) -
27382- KERNEL_STACK_OFFSET + THREAD_SIZE;
27383+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27384+ pax_open_kernel();
27385 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27386+ pax_close_kernel();
27387 initial_code = (unsigned long)start_secondary;
27388 stack_start = idle->thread.sp;
27389
27390@@ -918,6 +922,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27391 /* the FPU context is blank, nobody can own it */
27392 __cpu_disable_lazy_restore(cpu);
27393
27394+#ifdef CONFIG_PAX_PER_CPU_PGD
27395+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27396+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27397+ KERNEL_PGD_PTRS);
27398+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27399+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27400+ KERNEL_PGD_PTRS);
27401+#endif
27402+
27403 err = do_boot_cpu(apicid, cpu, tidle);
27404 if (err) {
27405 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27406diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27407index 9b4d51d..5d28b58 100644
27408--- a/arch/x86/kernel/step.c
27409+++ b/arch/x86/kernel/step.c
27410@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27411 struct desc_struct *desc;
27412 unsigned long base;
27413
27414- seg &= ~7UL;
27415+ seg >>= 3;
27416
27417 mutex_lock(&child->mm->context.lock);
27418- if (unlikely((seg >> 3) >= child->mm->context.size))
27419+ if (unlikely(seg >= child->mm->context.size))
27420 addr = -1L; /* bogus selector, access would fault */
27421 else {
27422 desc = child->mm->context.ldt + seg;
27423@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27424 addr += base;
27425 }
27426 mutex_unlock(&child->mm->context.lock);
27427- }
27428+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27429+ addr = ktla_ktva(addr);
27430
27431 return addr;
27432 }
27433@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27434 unsigned char opcode[15];
27435 unsigned long addr = convert_ip_to_linear(child, regs);
27436
27437+ if (addr == -EINVAL)
27438+ return 0;
27439+
27440 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27441 for (i = 0; i < copied; i++) {
27442 switch (opcode[i]) {
27443diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27444new file mode 100644
27445index 0000000..5877189
27446--- /dev/null
27447+++ b/arch/x86/kernel/sys_i386_32.c
27448@@ -0,0 +1,189 @@
27449+/*
27450+ * This file contains various random system calls that
27451+ * have a non-standard calling sequence on the Linux/i386
27452+ * platform.
27453+ */
27454+
27455+#include <linux/errno.h>
27456+#include <linux/sched.h>
27457+#include <linux/mm.h>
27458+#include <linux/fs.h>
27459+#include <linux/smp.h>
27460+#include <linux/sem.h>
27461+#include <linux/msg.h>
27462+#include <linux/shm.h>
27463+#include <linux/stat.h>
27464+#include <linux/syscalls.h>
27465+#include <linux/mman.h>
27466+#include <linux/file.h>
27467+#include <linux/utsname.h>
27468+#include <linux/ipc.h>
27469+#include <linux/elf.h>
27470+
27471+#include <linux/uaccess.h>
27472+#include <linux/unistd.h>
27473+
27474+#include <asm/syscalls.h>
27475+
27476+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27477+{
27478+ unsigned long pax_task_size = TASK_SIZE;
27479+
27480+#ifdef CONFIG_PAX_SEGMEXEC
27481+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27482+ pax_task_size = SEGMEXEC_TASK_SIZE;
27483+#endif
27484+
27485+ if (flags & MAP_FIXED)
27486+ if (len > pax_task_size || addr > pax_task_size - len)
27487+ return -EINVAL;
27488+
27489+ return 0;
27490+}
27491+
27492+/*
27493+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27494+ */
27495+static unsigned long get_align_mask(void)
27496+{
27497+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27498+ return 0;
27499+
27500+ if (!(current->flags & PF_RANDOMIZE))
27501+ return 0;
27502+
27503+ return va_align.mask;
27504+}
27505+
27506+unsigned long
27507+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27508+ unsigned long len, unsigned long pgoff, unsigned long flags)
27509+{
27510+ struct mm_struct *mm = current->mm;
27511+ struct vm_area_struct *vma;
27512+ unsigned long pax_task_size = TASK_SIZE;
27513+ struct vm_unmapped_area_info info;
27514+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27515+
27516+#ifdef CONFIG_PAX_SEGMEXEC
27517+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27518+ pax_task_size = SEGMEXEC_TASK_SIZE;
27519+#endif
27520+
27521+ pax_task_size -= PAGE_SIZE;
27522+
27523+ if (len > pax_task_size)
27524+ return -ENOMEM;
27525+
27526+ if (flags & MAP_FIXED)
27527+ return addr;
27528+
27529+#ifdef CONFIG_PAX_RANDMMAP
27530+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27531+#endif
27532+
27533+ if (addr) {
27534+ addr = PAGE_ALIGN(addr);
27535+ if (pax_task_size - len >= addr) {
27536+ vma = find_vma(mm, addr);
27537+ if (check_heap_stack_gap(vma, addr, len, offset))
27538+ return addr;
27539+ }
27540+ }
27541+
27542+ info.flags = 0;
27543+ info.length = len;
27544+ info.align_mask = filp ? get_align_mask() : 0;
27545+ info.align_offset = pgoff << PAGE_SHIFT;
27546+ info.threadstack_offset = offset;
27547+
27548+#ifdef CONFIG_PAX_PAGEEXEC
27549+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27550+ info.low_limit = 0x00110000UL;
27551+ info.high_limit = mm->start_code;
27552+
27553+#ifdef CONFIG_PAX_RANDMMAP
27554+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27555+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27556+#endif
27557+
27558+ if (info.low_limit < info.high_limit) {
27559+ addr = vm_unmapped_area(&info);
27560+ if (!IS_ERR_VALUE(addr))
27561+ return addr;
27562+ }
27563+ } else
27564+#endif
27565+
27566+ info.low_limit = mm->mmap_base;
27567+ info.high_limit = pax_task_size;
27568+
27569+ return vm_unmapped_area(&info);
27570+}
27571+
27572+unsigned long
27573+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27574+ const unsigned long len, const unsigned long pgoff,
27575+ const unsigned long flags)
27576+{
27577+ struct vm_area_struct *vma;
27578+ struct mm_struct *mm = current->mm;
27579+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27580+ struct vm_unmapped_area_info info;
27581+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27582+
27583+#ifdef CONFIG_PAX_SEGMEXEC
27584+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27585+ pax_task_size = SEGMEXEC_TASK_SIZE;
27586+#endif
27587+
27588+ pax_task_size -= PAGE_SIZE;
27589+
27590+ /* requested length too big for entire address space */
27591+ if (len > pax_task_size)
27592+ return -ENOMEM;
27593+
27594+ if (flags & MAP_FIXED)
27595+ return addr;
27596+
27597+#ifdef CONFIG_PAX_PAGEEXEC
27598+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27599+ goto bottomup;
27600+#endif
27601+
27602+#ifdef CONFIG_PAX_RANDMMAP
27603+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27604+#endif
27605+
27606+ /* requesting a specific address */
27607+ if (addr) {
27608+ addr = PAGE_ALIGN(addr);
27609+ if (pax_task_size - len >= addr) {
27610+ vma = find_vma(mm, addr);
27611+ if (check_heap_stack_gap(vma, addr, len, offset))
27612+ return addr;
27613+ }
27614+ }
27615+
27616+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27617+ info.length = len;
27618+ info.low_limit = PAGE_SIZE;
27619+ info.high_limit = mm->mmap_base;
27620+ info.align_mask = filp ? get_align_mask() : 0;
27621+ info.align_offset = pgoff << PAGE_SHIFT;
27622+ info.threadstack_offset = offset;
27623+
27624+ addr = vm_unmapped_area(&info);
27625+ if (!(addr & ~PAGE_MASK))
27626+ return addr;
27627+ VM_BUG_ON(addr != -ENOMEM);
27628+
27629+bottomup:
27630+ /*
27631+ * A failed mmap() very likely causes application failure,
27632+ * so fall back to the bottom-up function here. This scenario
27633+ * can happen with large stack limits and large mmap()
27634+ * allocations.
27635+ */
27636+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27637+}
27638diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27639index 30277e2..5664a29 100644
27640--- a/arch/x86/kernel/sys_x86_64.c
27641+++ b/arch/x86/kernel/sys_x86_64.c
27642@@ -81,8 +81,8 @@ out:
27643 return error;
27644 }
27645
27646-static void find_start_end(unsigned long flags, unsigned long *begin,
27647- unsigned long *end)
27648+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27649+ unsigned long *begin, unsigned long *end)
27650 {
27651 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27652 unsigned long new_begin;
27653@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27654 *begin = new_begin;
27655 }
27656 } else {
27657- *begin = current->mm->mmap_legacy_base;
27658+ *begin = mm->mmap_legacy_base;
27659 *end = TASK_SIZE;
27660 }
27661 }
27662@@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27663 struct vm_area_struct *vma;
27664 struct vm_unmapped_area_info info;
27665 unsigned long begin, end;
27666+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27667
27668 if (flags & MAP_FIXED)
27669 return addr;
27670
27671- find_start_end(flags, &begin, &end);
27672+ find_start_end(mm, flags, &begin, &end);
27673
27674 if (len > end)
27675 return -ENOMEM;
27676
27677+#ifdef CONFIG_PAX_RANDMMAP
27678+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27679+#endif
27680+
27681 if (addr) {
27682 addr = PAGE_ALIGN(addr);
27683 vma = find_vma(mm, addr);
27684- if (end - len >= addr &&
27685- (!vma || addr + len <= vma->vm_start))
27686+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27687 return addr;
27688 }
27689
27690@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27691 info.high_limit = end;
27692 info.align_mask = filp ? get_align_mask() : 0;
27693 info.align_offset = pgoff << PAGE_SHIFT;
27694+ info.threadstack_offset = offset;
27695 return vm_unmapped_area(&info);
27696 }
27697
27698@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27699 struct mm_struct *mm = current->mm;
27700 unsigned long addr = addr0;
27701 struct vm_unmapped_area_info info;
27702+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27703
27704 /* requested length too big for entire address space */
27705 if (len > TASK_SIZE)
27706@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27707 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27708 goto bottomup;
27709
27710+#ifdef CONFIG_PAX_RANDMMAP
27711+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27712+#endif
27713+
27714 /* requesting a specific address */
27715 if (addr) {
27716 addr = PAGE_ALIGN(addr);
27717 vma = find_vma(mm, addr);
27718- if (TASK_SIZE - len >= addr &&
27719- (!vma || addr + len <= vma->vm_start))
27720+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27721 return addr;
27722 }
27723
27724@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27725 info.high_limit = mm->mmap_base;
27726 info.align_mask = filp ? get_align_mask() : 0;
27727 info.align_offset = pgoff << PAGE_SHIFT;
27728+ info.threadstack_offset = offset;
27729 addr = vm_unmapped_area(&info);
27730 if (!(addr & ~PAGE_MASK))
27731 return addr;
27732diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27733index 91a4496..bb87552 100644
27734--- a/arch/x86/kernel/tboot.c
27735+++ b/arch/x86/kernel/tboot.c
27736@@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
27737
27738 void tboot_shutdown(u32 shutdown_type)
27739 {
27740- void (*shutdown)(void);
27741+ void (* __noreturn shutdown)(void);
27742
27743 if (!tboot_enabled())
27744 return;
27745@@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
27746
27747 switch_to_tboot_pt();
27748
27749- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27750+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27751 shutdown();
27752
27753 /* should not reach here */
27754@@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27755 return -ENODEV;
27756 }
27757
27758-static atomic_t ap_wfs_count;
27759+static atomic_unchecked_t ap_wfs_count;
27760
27761 static int tboot_wait_for_aps(int num_aps)
27762 {
27763@@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27764 {
27765 switch (action) {
27766 case CPU_DYING:
27767- atomic_inc(&ap_wfs_count);
27768+ atomic_inc_unchecked(&ap_wfs_count);
27769 if (num_online_cpus() == 1)
27770- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27771+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27772 return NOTIFY_BAD;
27773 break;
27774 }
27775@@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
27776
27777 tboot_create_trampoline();
27778
27779- atomic_set(&ap_wfs_count, 0);
27780+ atomic_set_unchecked(&ap_wfs_count, 0);
27781 register_hotcpu_notifier(&tboot_cpu_notifier);
27782
27783 #ifdef CONFIG_DEBUG_FS
27784diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27785index 0fa2960..91eabbe 100644
27786--- a/arch/x86/kernel/time.c
27787+++ b/arch/x86/kernel/time.c
27788@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27789 {
27790 unsigned long pc = instruction_pointer(regs);
27791
27792- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27793+ if (!user_mode(regs) && in_lock_functions(pc)) {
27794 #ifdef CONFIG_FRAME_POINTER
27795- return *(unsigned long *)(regs->bp + sizeof(long));
27796+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27797 #else
27798 unsigned long *sp =
27799 (unsigned long *)kernel_stack_pointer(regs);
27800@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27801 * or above a saved flags. Eflags has bits 22-31 zero,
27802 * kernel addresses don't.
27803 */
27804+
27805+#ifdef CONFIG_PAX_KERNEXEC
27806+ return ktla_ktva(sp[0]);
27807+#else
27808 if (sp[0] >> 22)
27809 return sp[0];
27810 if (sp[1] >> 22)
27811 return sp[1];
27812 #endif
27813+
27814+#endif
27815 }
27816 return pc;
27817 }
27818diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27819index 4e942f3..d0f623f 100644
27820--- a/arch/x86/kernel/tls.c
27821+++ b/arch/x86/kernel/tls.c
27822@@ -118,6 +118,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27823 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27824 return -EINVAL;
27825
27826+#ifdef CONFIG_PAX_SEGMEXEC
27827+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27828+ return -EINVAL;
27829+#endif
27830+
27831 set_tls_desc(p, idx, &info, 1);
27832
27833 return 0;
27834@@ -235,7 +240,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27835
27836 if (kbuf)
27837 info = kbuf;
27838- else if (__copy_from_user(infobuf, ubuf, count))
27839+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27840 return -EFAULT;
27841 else
27842 info = infobuf;
27843diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27844index 1c113db..287b42e 100644
27845--- a/arch/x86/kernel/tracepoint.c
27846+++ b/arch/x86/kernel/tracepoint.c
27847@@ -9,11 +9,11 @@
27848 #include <linux/atomic.h>
27849
27850 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27851-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27852+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27853 (unsigned long) trace_idt_table };
27854
27855 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27856-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27857+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27858
27859 static int trace_irq_vector_refcount;
27860 static DEFINE_MUTEX(irq_vector_mutex);
27861diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27862index 07ab8e9..99c8456 100644
27863--- a/arch/x86/kernel/traps.c
27864+++ b/arch/x86/kernel/traps.c
27865@@ -67,7 +67,7 @@
27866 #include <asm/proto.h>
27867
27868 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27869-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27870+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27871 #else
27872 #include <asm/processor-flags.h>
27873 #include <asm/setup.h>
27874@@ -76,7 +76,7 @@ asmlinkage int system_call(void);
27875 #endif
27876
27877 /* Must be page-aligned because the real IDT is used in a fixmap. */
27878-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27879+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27880
27881 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27882 EXPORT_SYMBOL_GPL(used_vectors);
27883@@ -108,11 +108,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
27884 }
27885
27886 static nokprobe_inline int
27887-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27888+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27889 struct pt_regs *regs, long error_code)
27890 {
27891 #ifdef CONFIG_X86_32
27892- if (regs->flags & X86_VM_MASK) {
27893+ if (v8086_mode(regs)) {
27894 /*
27895 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27896 * On nmi (interrupt 2), do_trap should not be called.
27897@@ -125,12 +125,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27898 return -1;
27899 }
27900 #endif
27901- if (!user_mode(regs)) {
27902+ if (!user_mode_novm(regs)) {
27903 if (!fixup_exception(regs)) {
27904 tsk->thread.error_code = error_code;
27905 tsk->thread.trap_nr = trapnr;
27906+
27907+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27908+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27909+ str = "PAX: suspicious stack segment fault";
27910+#endif
27911+
27912 die(str, regs, error_code);
27913 }
27914+
27915+#ifdef CONFIG_PAX_REFCOUNT
27916+ if (trapnr == X86_TRAP_OF)
27917+ pax_report_refcount_overflow(regs);
27918+#endif
27919+
27920 return 0;
27921 }
27922
27923@@ -169,7 +181,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
27924 }
27925
27926 static void
27927-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27928+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
27929 long error_code, siginfo_t *info)
27930 {
27931 struct task_struct *tsk = current;
27932@@ -193,7 +205,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27933 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
27934 printk_ratelimit()) {
27935 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
27936- tsk->comm, tsk->pid, str,
27937+ tsk->comm, task_pid_nr(tsk), str,
27938 regs->ip, regs->sp, error_code);
27939 print_vma_addr(" in ", regs->ip);
27940 pr_cont("\n");
27941@@ -274,6 +286,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
27942 tsk->thread.error_code = error_code;
27943 tsk->thread.trap_nr = X86_TRAP_DF;
27944
27945+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
27946+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
27947+ die("grsec: kernel stack overflow detected", regs, error_code);
27948+#endif
27949+
27950 #ifdef CONFIG_DOUBLEFAULT
27951 df_debug(regs, error_code);
27952 #endif
27953@@ -296,7 +313,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
27954 conditional_sti(regs);
27955
27956 #ifdef CONFIG_X86_32
27957- if (regs->flags & X86_VM_MASK) {
27958+ if (v8086_mode(regs)) {
27959 local_irq_enable();
27960 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
27961 goto exit;
27962@@ -304,18 +321,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
27963 #endif
27964
27965 tsk = current;
27966- if (!user_mode(regs)) {
27967+ if (!user_mode_novm(regs)) {
27968 if (fixup_exception(regs))
27969 goto exit;
27970
27971 tsk->thread.error_code = error_code;
27972 tsk->thread.trap_nr = X86_TRAP_GP;
27973 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
27974- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
27975+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
27976+
27977+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27978+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
27979+ die("PAX: suspicious general protection fault", regs, error_code);
27980+ else
27981+#endif
27982+
27983 die("general protection fault", regs, error_code);
27984+ }
27985 goto exit;
27986 }
27987
27988+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
27989+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
27990+ struct mm_struct *mm = tsk->mm;
27991+ unsigned long limit;
27992+
27993+ down_write(&mm->mmap_sem);
27994+ limit = mm->context.user_cs_limit;
27995+ if (limit < TASK_SIZE) {
27996+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
27997+ up_write(&mm->mmap_sem);
27998+ return;
27999+ }
28000+ up_write(&mm->mmap_sem);
28001+ }
28002+#endif
28003+
28004 tsk->thread.error_code = error_code;
28005 tsk->thread.trap_nr = X86_TRAP_GP;
28006
28007@@ -427,13 +468,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28008 container_of(task_pt_regs(current),
28009 struct bad_iret_stack, regs);
28010
28011+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28012+ new_stack = s;
28013+
28014 /* Copy the IRET target to the new stack. */
28015 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28016
28017 /* Copy the remainder of the stack from the current stack. */
28018 memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
28019
28020- BUG_ON(!user_mode_vm(&new_stack->regs));
28021+ BUG_ON(!user_mode(&new_stack->regs));
28022 return new_stack;
28023 }
28024 NOKPROBE_SYMBOL(fixup_bad_iret);
28025@@ -519,7 +563,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28026 /* It's safe to allow irq's after DR6 has been saved */
28027 preempt_conditional_sti(regs);
28028
28029- if (regs->flags & X86_VM_MASK) {
28030+ if (v8086_mode(regs)) {
28031 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
28032 X86_TRAP_DB);
28033 preempt_conditional_cli(regs);
28034@@ -534,7 +578,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28035 * We already checked v86 mode above, so we can check for kernel mode
28036 * by just checking the CPL of CS.
28037 */
28038- if ((dr6 & DR_STEP) && !user_mode(regs)) {
28039+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
28040 tsk->thread.debugreg6 &= ~DR_STEP;
28041 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
28042 regs->flags &= ~X86_EFLAGS_TF;
28043@@ -567,7 +611,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
28044 return;
28045 conditional_sti(regs);
28046
28047- if (!user_mode_vm(regs))
28048+ if (!user_mode(regs))
28049 {
28050 if (!fixup_exception(regs)) {
28051 task->thread.error_code = error_code;
28052diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28053index b7e50bb..f4a93ae 100644
28054--- a/arch/x86/kernel/tsc.c
28055+++ b/arch/x86/kernel/tsc.c
28056@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28057 */
28058 smp_wmb();
28059
28060- ACCESS_ONCE(c2n->head) = data;
28061+ ACCESS_ONCE_RW(c2n->head) = data;
28062 }
28063
28064 /*
28065diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28066index 5d1cbfe..2a21feb 100644
28067--- a/arch/x86/kernel/uprobes.c
28068+++ b/arch/x86/kernel/uprobes.c
28069@@ -845,7 +845,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
28070 int ret = NOTIFY_DONE;
28071
28072 /* We are only interested in userspace traps */
28073- if (regs && !user_mode_vm(regs))
28074+ if (regs && !user_mode(regs))
28075 return NOTIFY_DONE;
28076
28077 switch (val) {
28078@@ -919,7 +919,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28079
28080 if (nleft != rasize) {
28081 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28082- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28083+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28084
28085 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28086 }
28087diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28088index b9242ba..50c5edd 100644
28089--- a/arch/x86/kernel/verify_cpu.S
28090+++ b/arch/x86/kernel/verify_cpu.S
28091@@ -20,6 +20,7 @@
28092 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28093 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28094 * arch/x86/kernel/head_32.S: processor startup
28095+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28096 *
28097 * verify_cpu, returns the status of longmode and SSE in register %eax.
28098 * 0: Success 1: Failure
28099diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28100index e8edcf5..27f9344 100644
28101--- a/arch/x86/kernel/vm86_32.c
28102+++ b/arch/x86/kernel/vm86_32.c
28103@@ -44,6 +44,7 @@
28104 #include <linux/ptrace.h>
28105 #include <linux/audit.h>
28106 #include <linux/stddef.h>
28107+#include <linux/grsecurity.h>
28108
28109 #include <asm/uaccess.h>
28110 #include <asm/io.h>
28111@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28112 do_exit(SIGSEGV);
28113 }
28114
28115- tss = &per_cpu(init_tss, get_cpu());
28116+ tss = init_tss + get_cpu();
28117 current->thread.sp0 = current->thread.saved_sp0;
28118 current->thread.sysenter_cs = __KERNEL_CS;
28119 load_sp0(tss, &current->thread);
28120@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28121
28122 if (tsk->thread.saved_sp0)
28123 return -EPERM;
28124+
28125+#ifdef CONFIG_GRKERNSEC_VM86
28126+ if (!capable(CAP_SYS_RAWIO)) {
28127+ gr_handle_vm86();
28128+ return -EPERM;
28129+ }
28130+#endif
28131+
28132 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28133 offsetof(struct kernel_vm86_struct, vm86plus) -
28134 sizeof(info.regs));
28135@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28136 int tmp;
28137 struct vm86plus_struct __user *v86;
28138
28139+#ifdef CONFIG_GRKERNSEC_VM86
28140+ if (!capable(CAP_SYS_RAWIO)) {
28141+ gr_handle_vm86();
28142+ return -EPERM;
28143+ }
28144+#endif
28145+
28146 tsk = current;
28147 switch (cmd) {
28148 case VM86_REQUEST_IRQ:
28149@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28150 tsk->thread.saved_fs = info->regs32->fs;
28151 tsk->thread.saved_gs = get_user_gs(info->regs32);
28152
28153- tss = &per_cpu(init_tss, get_cpu());
28154+ tss = init_tss + get_cpu();
28155 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28156 if (cpu_has_sep)
28157 tsk->thread.sysenter_cs = 0;
28158@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28159 goto cannot_handle;
28160 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28161 goto cannot_handle;
28162- intr_ptr = (unsigned long __user *) (i << 2);
28163+ intr_ptr = (__force unsigned long __user *) (i << 2);
28164 if (get_user(segoffs, intr_ptr))
28165 goto cannot_handle;
28166 if ((segoffs >> 16) == BIOSSEG)
28167diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28168index 49edf2d..c0d1362 100644
28169--- a/arch/x86/kernel/vmlinux.lds.S
28170+++ b/arch/x86/kernel/vmlinux.lds.S
28171@@ -26,6 +26,13 @@
28172 #include <asm/page_types.h>
28173 #include <asm/cache.h>
28174 #include <asm/boot.h>
28175+#include <asm/segment.h>
28176+
28177+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28178+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28179+#else
28180+#define __KERNEL_TEXT_OFFSET 0
28181+#endif
28182
28183 #undef i386 /* in case the preprocessor is a 32bit one */
28184
28185@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28186
28187 PHDRS {
28188 text PT_LOAD FLAGS(5); /* R_E */
28189+#ifdef CONFIG_X86_32
28190+ module PT_LOAD FLAGS(5); /* R_E */
28191+#endif
28192+#ifdef CONFIG_XEN
28193+ rodata PT_LOAD FLAGS(5); /* R_E */
28194+#else
28195+ rodata PT_LOAD FLAGS(4); /* R__ */
28196+#endif
28197 data PT_LOAD FLAGS(6); /* RW_ */
28198-#ifdef CONFIG_X86_64
28199+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28200 #ifdef CONFIG_SMP
28201 percpu PT_LOAD FLAGS(6); /* RW_ */
28202 #endif
28203+ text.init PT_LOAD FLAGS(5); /* R_E */
28204+ text.exit PT_LOAD FLAGS(5); /* R_E */
28205 init PT_LOAD FLAGS(7); /* RWE */
28206-#endif
28207 note PT_NOTE FLAGS(0); /* ___ */
28208 }
28209
28210 SECTIONS
28211 {
28212 #ifdef CONFIG_X86_32
28213- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28214- phys_startup_32 = startup_32 - LOAD_OFFSET;
28215+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28216 #else
28217- . = __START_KERNEL;
28218- phys_startup_64 = startup_64 - LOAD_OFFSET;
28219+ . = __START_KERNEL;
28220 #endif
28221
28222 /* Text and read-only data */
28223- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28224- _text = .;
28225+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28226 /* bootstrapping code */
28227+#ifdef CONFIG_X86_32
28228+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28229+#else
28230+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28231+#endif
28232+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28233+ _text = .;
28234 HEAD_TEXT
28235 . = ALIGN(8);
28236 _stext = .;
28237@@ -104,13 +124,47 @@ SECTIONS
28238 IRQENTRY_TEXT
28239 *(.fixup)
28240 *(.gnu.warning)
28241- /* End of text section */
28242- _etext = .;
28243 } :text = 0x9090
28244
28245- NOTES :text :note
28246+ . += __KERNEL_TEXT_OFFSET;
28247
28248- EXCEPTION_TABLE(16) :text = 0x9090
28249+#ifdef CONFIG_X86_32
28250+ . = ALIGN(PAGE_SIZE);
28251+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28252+
28253+#ifdef CONFIG_PAX_KERNEXEC
28254+ MODULES_EXEC_VADDR = .;
28255+ BYTE(0)
28256+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28257+ . = ALIGN(HPAGE_SIZE) - 1;
28258+ MODULES_EXEC_END = .;
28259+#endif
28260+
28261+ } :module
28262+#endif
28263+
28264+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28265+ /* End of text section */
28266+ BYTE(0)
28267+ _etext = . - __KERNEL_TEXT_OFFSET;
28268+ }
28269+
28270+#ifdef CONFIG_X86_32
28271+ . = ALIGN(PAGE_SIZE);
28272+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28273+ . = ALIGN(PAGE_SIZE);
28274+ *(.empty_zero_page)
28275+ *(.initial_pg_fixmap)
28276+ *(.initial_pg_pmd)
28277+ *(.initial_page_table)
28278+ *(.swapper_pg_dir)
28279+ } :rodata
28280+#endif
28281+
28282+ . = ALIGN(PAGE_SIZE);
28283+ NOTES :rodata :note
28284+
28285+ EXCEPTION_TABLE(16) :rodata
28286
28287 #if defined(CONFIG_DEBUG_RODATA)
28288 /* .text should occupy whole number of pages */
28289@@ -122,16 +176,20 @@ SECTIONS
28290
28291 /* Data */
28292 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28293+
28294+#ifdef CONFIG_PAX_KERNEXEC
28295+ . = ALIGN(HPAGE_SIZE);
28296+#else
28297+ . = ALIGN(PAGE_SIZE);
28298+#endif
28299+
28300 /* Start of data section */
28301 _sdata = .;
28302
28303 /* init_task */
28304 INIT_TASK_DATA(THREAD_SIZE)
28305
28306-#ifdef CONFIG_X86_32
28307- /* 32 bit has nosave before _edata */
28308 NOSAVE_DATA
28309-#endif
28310
28311 PAGE_ALIGNED_DATA(PAGE_SIZE)
28312
28313@@ -174,12 +232,19 @@ SECTIONS
28314 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28315
28316 /* Init code and data - will be freed after init */
28317- . = ALIGN(PAGE_SIZE);
28318 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28319+ BYTE(0)
28320+
28321+#ifdef CONFIG_PAX_KERNEXEC
28322+ . = ALIGN(HPAGE_SIZE);
28323+#else
28324+ . = ALIGN(PAGE_SIZE);
28325+#endif
28326+
28327 __init_begin = .; /* paired with __init_end */
28328- }
28329+ } :init.begin
28330
28331-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28332+#ifdef CONFIG_SMP
28333 /*
28334 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28335 * output PHDR, so the next output section - .init.text - should
28336@@ -188,12 +253,27 @@ SECTIONS
28337 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
28338 #endif
28339
28340- INIT_TEXT_SECTION(PAGE_SIZE)
28341-#ifdef CONFIG_X86_64
28342- :init
28343-#endif
28344+ . = ALIGN(PAGE_SIZE);
28345+ init_begin = .;
28346+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28347+ VMLINUX_SYMBOL(_sinittext) = .;
28348+ INIT_TEXT
28349+ VMLINUX_SYMBOL(_einittext) = .;
28350+ . = ALIGN(PAGE_SIZE);
28351+ } :text.init
28352
28353- INIT_DATA_SECTION(16)
28354+ /*
28355+ * .exit.text is discard at runtime, not link time, to deal with
28356+ * references from .altinstructions and .eh_frame
28357+ */
28358+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28359+ EXIT_TEXT
28360+ . = ALIGN(16);
28361+ } :text.exit
28362+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28363+
28364+ . = ALIGN(PAGE_SIZE);
28365+ INIT_DATA_SECTION(16) :init
28366
28367 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28368 __x86_cpu_dev_start = .;
28369@@ -264,19 +344,12 @@ SECTIONS
28370 }
28371
28372 . = ALIGN(8);
28373- /*
28374- * .exit.text is discard at runtime, not link time, to deal with
28375- * references from .altinstructions and .eh_frame
28376- */
28377- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28378- EXIT_TEXT
28379- }
28380
28381 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28382 EXIT_DATA
28383 }
28384
28385-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28386+#ifndef CONFIG_SMP
28387 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28388 #endif
28389
28390@@ -295,16 +368,10 @@ SECTIONS
28391 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28392 __smp_locks = .;
28393 *(.smp_locks)
28394- . = ALIGN(PAGE_SIZE);
28395 __smp_locks_end = .;
28396+ . = ALIGN(PAGE_SIZE);
28397 }
28398
28399-#ifdef CONFIG_X86_64
28400- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28401- NOSAVE_DATA
28402- }
28403-#endif
28404-
28405 /* BSS */
28406 . = ALIGN(PAGE_SIZE);
28407 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28408@@ -320,6 +387,7 @@ SECTIONS
28409 __brk_base = .;
28410 . += 64 * 1024; /* 64k alignment slop space */
28411 *(.brk_reservation) /* areas brk users have reserved */
28412+ . = ALIGN(HPAGE_SIZE);
28413 __brk_limit = .;
28414 }
28415
28416@@ -346,13 +414,12 @@ SECTIONS
28417 * for the boot processor.
28418 */
28419 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28420-INIT_PER_CPU(gdt_page);
28421 INIT_PER_CPU(irq_stack_union);
28422
28423 /*
28424 * Build-time check on the image size:
28425 */
28426-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28427+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28428 "kernel image bigger than KERNEL_IMAGE_SIZE");
28429
28430 #ifdef CONFIG_SMP
28431diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28432index 957779f..74e405c 100644
28433--- a/arch/x86/kernel/vsyscall_64.c
28434+++ b/arch/x86/kernel/vsyscall_64.c
28435@@ -54,15 +54,13 @@
28436
28437 DEFINE_VVAR(int, vgetcpu_mode);
28438
28439-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28440+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28441
28442 static int __init vsyscall_setup(char *str)
28443 {
28444 if (str) {
28445 if (!strcmp("emulate", str))
28446 vsyscall_mode = EMULATE;
28447- else if (!strcmp("native", str))
28448- vsyscall_mode = NATIVE;
28449 else if (!strcmp("none", str))
28450 vsyscall_mode = NONE;
28451 else
28452@@ -279,8 +277,7 @@ do_ret:
28453 return true;
28454
28455 sigsegv:
28456- force_sig(SIGSEGV, current);
28457- return true;
28458+ do_group_exit(SIGKILL);
28459 }
28460
28461 /*
28462@@ -331,10 +328,7 @@ void __init map_vsyscall(void)
28463 extern char __vsyscall_page;
28464 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28465
28466- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28467- vsyscall_mode == NATIVE
28468- ? PAGE_KERNEL_VSYSCALL
28469- : PAGE_KERNEL_VVAR);
28470+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28471 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28472 (unsigned long)VSYSCALL_ADDR);
28473 }
28474diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28475index 04068192..4d75aa6 100644
28476--- a/arch/x86/kernel/x8664_ksyms_64.c
28477+++ b/arch/x86/kernel/x8664_ksyms_64.c
28478@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28479 EXPORT_SYMBOL(copy_user_generic_unrolled);
28480 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28481 EXPORT_SYMBOL(__copy_user_nocache);
28482-EXPORT_SYMBOL(_copy_from_user);
28483-EXPORT_SYMBOL(_copy_to_user);
28484
28485 EXPORT_SYMBOL(copy_page);
28486 EXPORT_SYMBOL(clear_page);
28487@@ -73,3 +71,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28488 EXPORT_SYMBOL(___preempt_schedule_context);
28489 #endif
28490 #endif
28491+
28492+#ifdef CONFIG_PAX_PER_CPU_PGD
28493+EXPORT_SYMBOL(cpu_pgd);
28494+#endif
28495diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28496index e48b674..a451dd9 100644
28497--- a/arch/x86/kernel/x86_init.c
28498+++ b/arch/x86/kernel/x86_init.c
28499@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28500 static void default_nmi_init(void) { };
28501 static int default_i8042_detect(void) { return 1; };
28502
28503-struct x86_platform_ops x86_platform = {
28504+struct x86_platform_ops x86_platform __read_only = {
28505 .calibrate_tsc = native_calibrate_tsc,
28506 .get_wallclock = mach_get_cmos_time,
28507 .set_wallclock = mach_set_rtc_mmss,
28508@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28509 EXPORT_SYMBOL_GPL(x86_platform);
28510
28511 #if defined(CONFIG_PCI_MSI)
28512-struct x86_msi_ops x86_msi = {
28513+struct x86_msi_ops x86_msi __read_only = {
28514 .setup_msi_irqs = native_setup_msi_irqs,
28515 .compose_msi_msg = native_compose_msi_msg,
28516 .teardown_msi_irq = native_teardown_msi_irq,
28517@@ -150,7 +150,7 @@ u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)
28518 }
28519 #endif
28520
28521-struct x86_io_apic_ops x86_io_apic_ops = {
28522+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28523 .init = native_io_apic_init_mappings,
28524 .read = native_io_apic_read,
28525 .write = native_io_apic_write,
28526diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28527index 4c540c4..0b985b0 100644
28528--- a/arch/x86/kernel/xsave.c
28529+++ b/arch/x86/kernel/xsave.c
28530@@ -167,18 +167,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28531
28532 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28533 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28534- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28535+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28536
28537 if (!use_xsave())
28538 return err;
28539
28540- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28541+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28542
28543 /*
28544 * Read the xstate_bv which we copied (directly from the cpu or
28545 * from the state in task struct) to the user buffers.
28546 */
28547- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28548+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28549
28550 /*
28551 * For legacy compatible, we always set FP/SSE bits in the bit
28552@@ -193,7 +193,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28553 */
28554 xstate_bv |= XSTATE_FPSSE;
28555
28556- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28557+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28558
28559 return err;
28560 }
28561@@ -202,6 +202,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28562 {
28563 int err;
28564
28565+ buf = (struct xsave_struct __user *)____m(buf);
28566 if (use_xsave())
28567 err = xsave_user(buf);
28568 else if (use_fxsr())
28569@@ -312,6 +313,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28570 */
28571 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28572 {
28573+ buf = (void __user *)____m(buf);
28574 if (use_xsave()) {
28575 if ((unsigned long)buf % 64 || fx_only) {
28576 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28577diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28578index 976e3a5..8bb998c 100644
28579--- a/arch/x86/kvm/cpuid.c
28580+++ b/arch/x86/kvm/cpuid.c
28581@@ -175,15 +175,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28582 struct kvm_cpuid2 *cpuid,
28583 struct kvm_cpuid_entry2 __user *entries)
28584 {
28585- int r;
28586+ int r, i;
28587
28588 r = -E2BIG;
28589 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28590 goto out;
28591 r = -EFAULT;
28592- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28593- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28594+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28595 goto out;
28596+ for (i = 0; i < cpuid->nent; ++i) {
28597+ struct kvm_cpuid_entry2 cpuid_entry;
28598+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28599+ goto out;
28600+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28601+ }
28602 vcpu->arch.cpuid_nent = cpuid->nent;
28603 kvm_apic_set_version(vcpu);
28604 kvm_x86_ops->cpuid_update(vcpu);
28605@@ -196,15 +201,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28606 struct kvm_cpuid2 *cpuid,
28607 struct kvm_cpuid_entry2 __user *entries)
28608 {
28609- int r;
28610+ int r, i;
28611
28612 r = -E2BIG;
28613 if (cpuid->nent < vcpu->arch.cpuid_nent)
28614 goto out;
28615 r = -EFAULT;
28616- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28617- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28618+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28619 goto out;
28620+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28621+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28622+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28623+ goto out;
28624+ }
28625 return 0;
28626
28627 out:
28628diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28629index 9f8a2fa..2df3c3f 100644
28630--- a/arch/x86/kvm/emulate.c
28631+++ b/arch/x86/kvm/emulate.c
28632@@ -3519,7 +3519,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28633 int cr = ctxt->modrm_reg;
28634 u64 efer = 0;
28635
28636- static u64 cr_reserved_bits[] = {
28637+ static const u64 cr_reserved_bits[] = {
28638 0xffffffff00000000ULL,
28639 0, 0, 0, /* CR3 checked later */
28640 CR4_RESERVED_BITS,
28641@@ -3554,7 +3554,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28642
28643 ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
28644 if (efer & EFER_LMA)
28645- rsvd = CR3_L_MODE_RESERVED_BITS;
28646+ rsvd = CR3_L_MODE_RESERVED_BITS & ~CR3_PCID_INVD;
28647
28648 if (new_val & rsvd)
28649 return emulate_gp(ctxt, 0);
28650diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28651index b8345dd..f225d71 100644
28652--- a/arch/x86/kvm/lapic.c
28653+++ b/arch/x86/kvm/lapic.c
28654@@ -55,7 +55,7 @@
28655 #define APIC_BUS_CYCLE_NS 1
28656
28657 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28658-#define apic_debug(fmt, arg...)
28659+#define apic_debug(fmt, arg...) do {} while (0)
28660
28661 #define APIC_LVT_NUM 6
28662 /* 14 is the version for Xeon and Pentium 8.4.8*/
28663diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28664index fd49c86..77e1aa0 100644
28665--- a/arch/x86/kvm/paging_tmpl.h
28666+++ b/arch/x86/kvm/paging_tmpl.h
28667@@ -343,7 +343,7 @@ retry_walk:
28668 if (unlikely(kvm_is_error_hva(host_addr)))
28669 goto error;
28670
28671- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28672+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28673 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28674 goto error;
28675 walker->ptep_user[walker->level - 1] = ptep_user;
28676diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28677index 7527cef..c63a838e 100644
28678--- a/arch/x86/kvm/svm.c
28679+++ b/arch/x86/kvm/svm.c
28680@@ -3564,7 +3564,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28681 int cpu = raw_smp_processor_id();
28682
28683 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28684+
28685+ pax_open_kernel();
28686 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28687+ pax_close_kernel();
28688+
28689 load_TR_desc();
28690 }
28691
28692@@ -3965,6 +3969,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28693 #endif
28694 #endif
28695
28696+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28697+ __set_fs(current_thread_info()->addr_limit);
28698+#endif
28699+
28700 reload_tss(vcpu);
28701
28702 local_irq_disable();
28703diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28704index 3e556c6..08bbf7f 100644
28705--- a/arch/x86/kvm/vmx.c
28706+++ b/arch/x86/kvm/vmx.c
28707@@ -1366,12 +1366,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28708 #endif
28709 }
28710
28711-static void vmcs_clear_bits(unsigned long field, u32 mask)
28712+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28713 {
28714 vmcs_writel(field, vmcs_readl(field) & ~mask);
28715 }
28716
28717-static void vmcs_set_bits(unsigned long field, u32 mask)
28718+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28719 {
28720 vmcs_writel(field, vmcs_readl(field) | mask);
28721 }
28722@@ -1631,7 +1631,11 @@ static void reload_tss(void)
28723 struct desc_struct *descs;
28724
28725 descs = (void *)gdt->address;
28726+
28727+ pax_open_kernel();
28728 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28729+ pax_close_kernel();
28730+
28731 load_TR_desc();
28732 }
28733
28734@@ -1859,6 +1863,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28735 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28736 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28737
28738+#ifdef CONFIG_PAX_PER_CPU_PGD
28739+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28740+#endif
28741+
28742 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28743 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28744 vmx->loaded_vmcs->cpu = cpu;
28745@@ -2148,7 +2156,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28746 * reads and returns guest's timestamp counter "register"
28747 * guest_tsc = host_tsc + tsc_offset -- 21.3
28748 */
28749-static u64 guest_read_tsc(void)
28750+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28751 {
28752 u64 host_tsc, tsc_offset;
28753
28754@@ -3146,11 +3154,16 @@ static __init int hardware_setup(void)
28755 * page upon invalidation. No need to do anything if the
28756 * processor does not have the APIC_ACCESS_ADDR VMCS field.
28757 */
28758- kvm_x86_ops->set_apic_access_page_addr = NULL;
28759+ pax_open_kernel();
28760+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28761+ pax_close_kernel();
28762 }
28763
28764- if (!cpu_has_vmx_tpr_shadow())
28765- kvm_x86_ops->update_cr8_intercept = NULL;
28766+ if (!cpu_has_vmx_tpr_shadow()) {
28767+ pax_open_kernel();
28768+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28769+ pax_close_kernel();
28770+ }
28771
28772 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28773 kvm_disable_largepages();
28774@@ -3161,13 +3174,15 @@ static __init int hardware_setup(void)
28775 if (!cpu_has_vmx_apicv())
28776 enable_apicv = 0;
28777
28778+ pax_open_kernel();
28779 if (enable_apicv)
28780- kvm_x86_ops->update_cr8_intercept = NULL;
28781+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28782 else {
28783- kvm_x86_ops->hwapic_irr_update = NULL;
28784- kvm_x86_ops->deliver_posted_interrupt = NULL;
28785- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28786+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28787+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28788+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28789 }
28790+ pax_close_kernel();
28791
28792 if (nested)
28793 nested_vmx_setup_ctls_msrs();
28794@@ -4274,7 +4289,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28795 unsigned long cr4;
28796
28797 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28798+
28799+#ifndef CONFIG_PAX_PER_CPU_PGD
28800 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28801+#endif
28802
28803 /* Save the most likely value for this task's CR4 in the VMCS. */
28804 cr4 = read_cr4();
28805@@ -4301,7 +4319,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28806 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28807 vmx->host_idt_base = dt.address;
28808
28809- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28810+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28811
28812 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28813 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28814@@ -7622,6 +7640,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28815 "jmp 2f \n\t"
28816 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28817 "2: "
28818+
28819+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28820+ "ljmp %[cs],$3f\n\t"
28821+ "3: "
28822+#endif
28823+
28824 /* Save guest registers, load host registers, keep flags */
28825 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28826 "pop %0 \n\t"
28827@@ -7674,6 +7698,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28828 #endif
28829 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28830 [wordsize]"i"(sizeof(ulong))
28831+
28832+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28833+ ,[cs]"i"(__KERNEL_CS)
28834+#endif
28835+
28836 : "cc", "memory"
28837 #ifdef CONFIG_X86_64
28838 , "rax", "rbx", "rdi", "rsi"
28839@@ -7687,7 +7716,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28840 if (debugctlmsr)
28841 update_debugctlmsr(debugctlmsr);
28842
28843-#ifndef CONFIG_X86_64
28844+#ifdef CONFIG_X86_32
28845 /*
28846 * The sysexit path does not restore ds/es, so we must set them to
28847 * a reasonable value ourselves.
28848@@ -7696,8 +7725,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28849 * may be executed in interrupt context, which saves and restore segments
28850 * around it, nullifying its effect.
28851 */
28852- loadsegment(ds, __USER_DS);
28853- loadsegment(es, __USER_DS);
28854+ loadsegment(ds, __KERNEL_DS);
28855+ loadsegment(es, __KERNEL_DS);
28856+ loadsegment(ss, __KERNEL_DS);
28857+
28858+#ifdef CONFIG_PAX_KERNEXEC
28859+ loadsegment(fs, __KERNEL_PERCPU);
28860+#endif
28861+
28862+#ifdef CONFIG_PAX_MEMORY_UDEREF
28863+ __set_fs(current_thread_info()->addr_limit);
28864+#endif
28865+
28866 #endif
28867
28868 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28869diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28870index 0033df3..db6236d 100644
28871--- a/arch/x86/kvm/x86.c
28872+++ b/arch/x86/kvm/x86.c
28873@@ -732,6 +732,8 @@ EXPORT_SYMBOL_GPL(kvm_set_cr4);
28874
28875 int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
28876 {
28877+ cr3 &= ~CR3_PCID_INVD;
28878+
28879 if (cr3 == kvm_read_cr3(vcpu) && !pdptrs_changed(vcpu)) {
28880 kvm_mmu_sync_roots(vcpu);
28881 kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu);
28882@@ -1878,8 +1880,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28883 {
28884 struct kvm *kvm = vcpu->kvm;
28885 int lm = is_long_mode(vcpu);
28886- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28887- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28888+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28889+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28890 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28891 : kvm->arch.xen_hvm_config.blob_size_32;
28892 u32 page_num = data & ~PAGE_MASK;
28893@@ -2806,6 +2808,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28894 if (n < msr_list.nmsrs)
28895 goto out;
28896 r = -EFAULT;
28897+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28898+ goto out;
28899 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28900 num_msrs_to_save * sizeof(u32)))
28901 goto out;
28902@@ -5670,7 +5674,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28903 };
28904 #endif
28905
28906-int kvm_arch_init(void *opaque)
28907+int kvm_arch_init(const void *opaque)
28908 {
28909 int r;
28910 struct kvm_x86_ops *ops = opaque;
28911diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28912index aae9413..d11e829 100644
28913--- a/arch/x86/lguest/boot.c
28914+++ b/arch/x86/lguest/boot.c
28915@@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
28916 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
28917 * Launcher to reboot us.
28918 */
28919-static void lguest_restart(char *reason)
28920+static __noreturn void lguest_restart(char *reason)
28921 {
28922 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
28923+ BUG();
28924 }
28925
28926 /*G:050
28927diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
28928index 00933d5..3a64af9 100644
28929--- a/arch/x86/lib/atomic64_386_32.S
28930+++ b/arch/x86/lib/atomic64_386_32.S
28931@@ -48,6 +48,10 @@ BEGIN(read)
28932 movl (v), %eax
28933 movl 4(v), %edx
28934 RET_ENDP
28935+BEGIN(read_unchecked)
28936+ movl (v), %eax
28937+ movl 4(v), %edx
28938+RET_ENDP
28939 #undef v
28940
28941 #define v %esi
28942@@ -55,6 +59,10 @@ BEGIN(set)
28943 movl %ebx, (v)
28944 movl %ecx, 4(v)
28945 RET_ENDP
28946+BEGIN(set_unchecked)
28947+ movl %ebx, (v)
28948+ movl %ecx, 4(v)
28949+RET_ENDP
28950 #undef v
28951
28952 #define v %esi
28953@@ -70,6 +78,20 @@ RET_ENDP
28954 BEGIN(add)
28955 addl %eax, (v)
28956 adcl %edx, 4(v)
28957+
28958+#ifdef CONFIG_PAX_REFCOUNT
28959+ jno 0f
28960+ subl %eax, (v)
28961+ sbbl %edx, 4(v)
28962+ int $4
28963+0:
28964+ _ASM_EXTABLE(0b, 0b)
28965+#endif
28966+
28967+RET_ENDP
28968+BEGIN(add_unchecked)
28969+ addl %eax, (v)
28970+ adcl %edx, 4(v)
28971 RET_ENDP
28972 #undef v
28973
28974@@ -77,6 +99,24 @@ RET_ENDP
28975 BEGIN(add_return)
28976 addl (v), %eax
28977 adcl 4(v), %edx
28978+
28979+#ifdef CONFIG_PAX_REFCOUNT
28980+ into
28981+1234:
28982+ _ASM_EXTABLE(1234b, 2f)
28983+#endif
28984+
28985+ movl %eax, (v)
28986+ movl %edx, 4(v)
28987+
28988+#ifdef CONFIG_PAX_REFCOUNT
28989+2:
28990+#endif
28991+
28992+RET_ENDP
28993+BEGIN(add_return_unchecked)
28994+ addl (v), %eax
28995+ adcl 4(v), %edx
28996 movl %eax, (v)
28997 movl %edx, 4(v)
28998 RET_ENDP
28999@@ -86,6 +126,20 @@ RET_ENDP
29000 BEGIN(sub)
29001 subl %eax, (v)
29002 sbbl %edx, 4(v)
29003+
29004+#ifdef CONFIG_PAX_REFCOUNT
29005+ jno 0f
29006+ addl %eax, (v)
29007+ adcl %edx, 4(v)
29008+ int $4
29009+0:
29010+ _ASM_EXTABLE(0b, 0b)
29011+#endif
29012+
29013+RET_ENDP
29014+BEGIN(sub_unchecked)
29015+ subl %eax, (v)
29016+ sbbl %edx, 4(v)
29017 RET_ENDP
29018 #undef v
29019
29020@@ -96,6 +150,27 @@ BEGIN(sub_return)
29021 sbbl $0, %edx
29022 addl (v), %eax
29023 adcl 4(v), %edx
29024+
29025+#ifdef CONFIG_PAX_REFCOUNT
29026+ into
29027+1234:
29028+ _ASM_EXTABLE(1234b, 2f)
29029+#endif
29030+
29031+ movl %eax, (v)
29032+ movl %edx, 4(v)
29033+
29034+#ifdef CONFIG_PAX_REFCOUNT
29035+2:
29036+#endif
29037+
29038+RET_ENDP
29039+BEGIN(sub_return_unchecked)
29040+ negl %edx
29041+ negl %eax
29042+ sbbl $0, %edx
29043+ addl (v), %eax
29044+ adcl 4(v), %edx
29045 movl %eax, (v)
29046 movl %edx, 4(v)
29047 RET_ENDP
29048@@ -105,6 +180,20 @@ RET_ENDP
29049 BEGIN(inc)
29050 addl $1, (v)
29051 adcl $0, 4(v)
29052+
29053+#ifdef CONFIG_PAX_REFCOUNT
29054+ jno 0f
29055+ subl $1, (v)
29056+ sbbl $0, 4(v)
29057+ int $4
29058+0:
29059+ _ASM_EXTABLE(0b, 0b)
29060+#endif
29061+
29062+RET_ENDP
29063+BEGIN(inc_unchecked)
29064+ addl $1, (v)
29065+ adcl $0, 4(v)
29066 RET_ENDP
29067 #undef v
29068
29069@@ -114,6 +203,26 @@ BEGIN(inc_return)
29070 movl 4(v), %edx
29071 addl $1, %eax
29072 adcl $0, %edx
29073+
29074+#ifdef CONFIG_PAX_REFCOUNT
29075+ into
29076+1234:
29077+ _ASM_EXTABLE(1234b, 2f)
29078+#endif
29079+
29080+ movl %eax, (v)
29081+ movl %edx, 4(v)
29082+
29083+#ifdef CONFIG_PAX_REFCOUNT
29084+2:
29085+#endif
29086+
29087+RET_ENDP
29088+BEGIN(inc_return_unchecked)
29089+ movl (v), %eax
29090+ movl 4(v), %edx
29091+ addl $1, %eax
29092+ adcl $0, %edx
29093 movl %eax, (v)
29094 movl %edx, 4(v)
29095 RET_ENDP
29096@@ -123,6 +232,20 @@ RET_ENDP
29097 BEGIN(dec)
29098 subl $1, (v)
29099 sbbl $0, 4(v)
29100+
29101+#ifdef CONFIG_PAX_REFCOUNT
29102+ jno 0f
29103+ addl $1, (v)
29104+ adcl $0, 4(v)
29105+ int $4
29106+0:
29107+ _ASM_EXTABLE(0b, 0b)
29108+#endif
29109+
29110+RET_ENDP
29111+BEGIN(dec_unchecked)
29112+ subl $1, (v)
29113+ sbbl $0, 4(v)
29114 RET_ENDP
29115 #undef v
29116
29117@@ -132,6 +255,26 @@ BEGIN(dec_return)
29118 movl 4(v), %edx
29119 subl $1, %eax
29120 sbbl $0, %edx
29121+
29122+#ifdef CONFIG_PAX_REFCOUNT
29123+ into
29124+1234:
29125+ _ASM_EXTABLE(1234b, 2f)
29126+#endif
29127+
29128+ movl %eax, (v)
29129+ movl %edx, 4(v)
29130+
29131+#ifdef CONFIG_PAX_REFCOUNT
29132+2:
29133+#endif
29134+
29135+RET_ENDP
29136+BEGIN(dec_return_unchecked)
29137+ movl (v), %eax
29138+ movl 4(v), %edx
29139+ subl $1, %eax
29140+ sbbl $0, %edx
29141 movl %eax, (v)
29142 movl %edx, 4(v)
29143 RET_ENDP
29144@@ -143,6 +286,13 @@ BEGIN(add_unless)
29145 adcl %edx, %edi
29146 addl (v), %eax
29147 adcl 4(v), %edx
29148+
29149+#ifdef CONFIG_PAX_REFCOUNT
29150+ into
29151+1234:
29152+ _ASM_EXTABLE(1234b, 2f)
29153+#endif
29154+
29155 cmpl %eax, %ecx
29156 je 3f
29157 1:
29158@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29159 1:
29160 addl $1, %eax
29161 adcl $0, %edx
29162+
29163+#ifdef CONFIG_PAX_REFCOUNT
29164+ into
29165+1234:
29166+ _ASM_EXTABLE(1234b, 2f)
29167+#endif
29168+
29169 movl %eax, (v)
29170 movl %edx, 4(v)
29171 movl $1, %eax
29172@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29173 movl 4(v), %edx
29174 subl $1, %eax
29175 sbbl $0, %edx
29176+
29177+#ifdef CONFIG_PAX_REFCOUNT
29178+ into
29179+1234:
29180+ _ASM_EXTABLE(1234b, 1f)
29181+#endif
29182+
29183 js 1f
29184 movl %eax, (v)
29185 movl %edx, 4(v)
29186diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29187index f5cc9eb..51fa319 100644
29188--- a/arch/x86/lib/atomic64_cx8_32.S
29189+++ b/arch/x86/lib/atomic64_cx8_32.S
29190@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
29191 CFI_STARTPROC
29192
29193 read64 %ecx
29194+ pax_force_retaddr
29195 ret
29196 CFI_ENDPROC
29197 ENDPROC(atomic64_read_cx8)
29198
29199+ENTRY(atomic64_read_unchecked_cx8)
29200+ CFI_STARTPROC
29201+
29202+ read64 %ecx
29203+ pax_force_retaddr
29204+ ret
29205+ CFI_ENDPROC
29206+ENDPROC(atomic64_read_unchecked_cx8)
29207+
29208 ENTRY(atomic64_set_cx8)
29209 CFI_STARTPROC
29210
29211@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
29212 cmpxchg8b (%esi)
29213 jne 1b
29214
29215+ pax_force_retaddr
29216 ret
29217 CFI_ENDPROC
29218 ENDPROC(atomic64_set_cx8)
29219
29220+ENTRY(atomic64_set_unchecked_cx8)
29221+ CFI_STARTPROC
29222+
29223+1:
29224+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29225+ * are atomic on 586 and newer */
29226+ cmpxchg8b (%esi)
29227+ jne 1b
29228+
29229+ pax_force_retaddr
29230+ ret
29231+ CFI_ENDPROC
29232+ENDPROC(atomic64_set_unchecked_cx8)
29233+
29234 ENTRY(atomic64_xchg_cx8)
29235 CFI_STARTPROC
29236
29237@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
29238 cmpxchg8b (%esi)
29239 jne 1b
29240
29241+ pax_force_retaddr
29242 ret
29243 CFI_ENDPROC
29244 ENDPROC(atomic64_xchg_cx8)
29245
29246-.macro addsub_return func ins insc
29247-ENTRY(atomic64_\func\()_return_cx8)
29248+.macro addsub_return func ins insc unchecked=""
29249+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29250 CFI_STARTPROC
29251 SAVE ebp
29252 SAVE ebx
29253@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29254 movl %edx, %ecx
29255 \ins\()l %esi, %ebx
29256 \insc\()l %edi, %ecx
29257+
29258+.ifb \unchecked
29259+#ifdef CONFIG_PAX_REFCOUNT
29260+ into
29261+2:
29262+ _ASM_EXTABLE(2b, 3f)
29263+#endif
29264+.endif
29265+
29266 LOCK_PREFIX
29267 cmpxchg8b (%ebp)
29268 jne 1b
29269-
29270-10:
29271 movl %ebx, %eax
29272 movl %ecx, %edx
29273+
29274+.ifb \unchecked
29275+#ifdef CONFIG_PAX_REFCOUNT
29276+3:
29277+#endif
29278+.endif
29279+
29280 RESTORE edi
29281 RESTORE esi
29282 RESTORE ebx
29283 RESTORE ebp
29284+ pax_force_retaddr
29285 ret
29286 CFI_ENDPROC
29287-ENDPROC(atomic64_\func\()_return_cx8)
29288+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29289 .endm
29290
29291 addsub_return add add adc
29292 addsub_return sub sub sbb
29293+addsub_return add add adc _unchecked
29294+addsub_return sub sub sbb _unchecked
29295
29296-.macro incdec_return func ins insc
29297-ENTRY(atomic64_\func\()_return_cx8)
29298+.macro incdec_return func ins insc unchecked=""
29299+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29300 CFI_STARTPROC
29301 SAVE ebx
29302
29303@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
29304 movl %edx, %ecx
29305 \ins\()l $1, %ebx
29306 \insc\()l $0, %ecx
29307+
29308+.ifb \unchecked
29309+#ifdef CONFIG_PAX_REFCOUNT
29310+ into
29311+2:
29312+ _ASM_EXTABLE(2b, 3f)
29313+#endif
29314+.endif
29315+
29316 LOCK_PREFIX
29317 cmpxchg8b (%esi)
29318 jne 1b
29319
29320-10:
29321 movl %ebx, %eax
29322 movl %ecx, %edx
29323+
29324+.ifb \unchecked
29325+#ifdef CONFIG_PAX_REFCOUNT
29326+3:
29327+#endif
29328+.endif
29329+
29330 RESTORE ebx
29331+ pax_force_retaddr
29332 ret
29333 CFI_ENDPROC
29334-ENDPROC(atomic64_\func\()_return_cx8)
29335+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29336 .endm
29337
29338 incdec_return inc add adc
29339 incdec_return dec sub sbb
29340+incdec_return inc add adc _unchecked
29341+incdec_return dec sub sbb _unchecked
29342
29343 ENTRY(atomic64_dec_if_positive_cx8)
29344 CFI_STARTPROC
29345@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29346 movl %edx, %ecx
29347 subl $1, %ebx
29348 sbb $0, %ecx
29349+
29350+#ifdef CONFIG_PAX_REFCOUNT
29351+ into
29352+1234:
29353+ _ASM_EXTABLE(1234b, 2f)
29354+#endif
29355+
29356 js 2f
29357 LOCK_PREFIX
29358 cmpxchg8b (%esi)
29359@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29360 movl %ebx, %eax
29361 movl %ecx, %edx
29362 RESTORE ebx
29363+ pax_force_retaddr
29364 ret
29365 CFI_ENDPROC
29366 ENDPROC(atomic64_dec_if_positive_cx8)
29367@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
29368 movl %edx, %ecx
29369 addl %ebp, %ebx
29370 adcl %edi, %ecx
29371+
29372+#ifdef CONFIG_PAX_REFCOUNT
29373+ into
29374+1234:
29375+ _ASM_EXTABLE(1234b, 3f)
29376+#endif
29377+
29378 LOCK_PREFIX
29379 cmpxchg8b (%esi)
29380 jne 1b
29381@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
29382 CFI_ADJUST_CFA_OFFSET -8
29383 RESTORE ebx
29384 RESTORE ebp
29385+ pax_force_retaddr
29386 ret
29387 4:
29388 cmpl %edx, 4(%esp)
29389@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29390 xorl %ecx, %ecx
29391 addl $1, %ebx
29392 adcl %edx, %ecx
29393+
29394+#ifdef CONFIG_PAX_REFCOUNT
29395+ into
29396+1234:
29397+ _ASM_EXTABLE(1234b, 3f)
29398+#endif
29399+
29400 LOCK_PREFIX
29401 cmpxchg8b (%esi)
29402 jne 1b
29403@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29404 movl $1, %eax
29405 3:
29406 RESTORE ebx
29407+ pax_force_retaddr
29408 ret
29409 CFI_ENDPROC
29410 ENDPROC(atomic64_inc_not_zero_cx8)
29411diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29412index e78b8eee..7e173a8 100644
29413--- a/arch/x86/lib/checksum_32.S
29414+++ b/arch/x86/lib/checksum_32.S
29415@@ -29,7 +29,8 @@
29416 #include <asm/dwarf2.h>
29417 #include <asm/errno.h>
29418 #include <asm/asm.h>
29419-
29420+#include <asm/segment.h>
29421+
29422 /*
29423 * computes a partial checksum, e.g. for TCP/UDP fragments
29424 */
29425@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29426
29427 #define ARGBASE 16
29428 #define FP 12
29429-
29430-ENTRY(csum_partial_copy_generic)
29431+
29432+ENTRY(csum_partial_copy_generic_to_user)
29433 CFI_STARTPROC
29434+
29435+#ifdef CONFIG_PAX_MEMORY_UDEREF
29436+ pushl_cfi %gs
29437+ popl_cfi %es
29438+ jmp csum_partial_copy_generic
29439+#endif
29440+
29441+ENTRY(csum_partial_copy_generic_from_user)
29442+
29443+#ifdef CONFIG_PAX_MEMORY_UDEREF
29444+ pushl_cfi %gs
29445+ popl_cfi %ds
29446+#endif
29447+
29448+ENTRY(csum_partial_copy_generic)
29449 subl $4,%esp
29450 CFI_ADJUST_CFA_OFFSET 4
29451 pushl_cfi %edi
29452@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29453 jmp 4f
29454 SRC(1: movw (%esi), %bx )
29455 addl $2, %esi
29456-DST( movw %bx, (%edi) )
29457+DST( movw %bx, %es:(%edi) )
29458 addl $2, %edi
29459 addw %bx, %ax
29460 adcl $0, %eax
29461@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29462 SRC(1: movl (%esi), %ebx )
29463 SRC( movl 4(%esi), %edx )
29464 adcl %ebx, %eax
29465-DST( movl %ebx, (%edi) )
29466+DST( movl %ebx, %es:(%edi) )
29467 adcl %edx, %eax
29468-DST( movl %edx, 4(%edi) )
29469+DST( movl %edx, %es:4(%edi) )
29470
29471 SRC( movl 8(%esi), %ebx )
29472 SRC( movl 12(%esi), %edx )
29473 adcl %ebx, %eax
29474-DST( movl %ebx, 8(%edi) )
29475+DST( movl %ebx, %es:8(%edi) )
29476 adcl %edx, %eax
29477-DST( movl %edx, 12(%edi) )
29478+DST( movl %edx, %es:12(%edi) )
29479
29480 SRC( movl 16(%esi), %ebx )
29481 SRC( movl 20(%esi), %edx )
29482 adcl %ebx, %eax
29483-DST( movl %ebx, 16(%edi) )
29484+DST( movl %ebx, %es:16(%edi) )
29485 adcl %edx, %eax
29486-DST( movl %edx, 20(%edi) )
29487+DST( movl %edx, %es:20(%edi) )
29488
29489 SRC( movl 24(%esi), %ebx )
29490 SRC( movl 28(%esi), %edx )
29491 adcl %ebx, %eax
29492-DST( movl %ebx, 24(%edi) )
29493+DST( movl %ebx, %es:24(%edi) )
29494 adcl %edx, %eax
29495-DST( movl %edx, 28(%edi) )
29496+DST( movl %edx, %es:28(%edi) )
29497
29498 lea 32(%esi), %esi
29499 lea 32(%edi), %edi
29500@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29501 shrl $2, %edx # This clears CF
29502 SRC(3: movl (%esi), %ebx )
29503 adcl %ebx, %eax
29504-DST( movl %ebx, (%edi) )
29505+DST( movl %ebx, %es:(%edi) )
29506 lea 4(%esi), %esi
29507 lea 4(%edi), %edi
29508 dec %edx
29509@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29510 jb 5f
29511 SRC( movw (%esi), %cx )
29512 leal 2(%esi), %esi
29513-DST( movw %cx, (%edi) )
29514+DST( movw %cx, %es:(%edi) )
29515 leal 2(%edi), %edi
29516 je 6f
29517 shll $16,%ecx
29518 SRC(5: movb (%esi), %cl )
29519-DST( movb %cl, (%edi) )
29520+DST( movb %cl, %es:(%edi) )
29521 6: addl %ecx, %eax
29522 adcl $0, %eax
29523 7:
29524@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29525
29526 6001:
29527 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29528- movl $-EFAULT, (%ebx)
29529+ movl $-EFAULT, %ss:(%ebx)
29530
29531 # zero the complete destination - computing the rest
29532 # is too much work
29533@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29534
29535 6002:
29536 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29537- movl $-EFAULT,(%ebx)
29538+ movl $-EFAULT,%ss:(%ebx)
29539 jmp 5000b
29540
29541 .previous
29542
29543+ pushl_cfi %ss
29544+ popl_cfi %ds
29545+ pushl_cfi %ss
29546+ popl_cfi %es
29547 popl_cfi %ebx
29548 CFI_RESTORE ebx
29549 popl_cfi %esi
29550@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29551 popl_cfi %ecx # equivalent to addl $4,%esp
29552 ret
29553 CFI_ENDPROC
29554-ENDPROC(csum_partial_copy_generic)
29555+ENDPROC(csum_partial_copy_generic_to_user)
29556
29557 #else
29558
29559 /* Version for PentiumII/PPro */
29560
29561 #define ROUND1(x) \
29562+ nop; nop; nop; \
29563 SRC(movl x(%esi), %ebx ) ; \
29564 addl %ebx, %eax ; \
29565- DST(movl %ebx, x(%edi) ) ;
29566+ DST(movl %ebx, %es:x(%edi)) ;
29567
29568 #define ROUND(x) \
29569+ nop; nop; nop; \
29570 SRC(movl x(%esi), %ebx ) ; \
29571 adcl %ebx, %eax ; \
29572- DST(movl %ebx, x(%edi) ) ;
29573+ DST(movl %ebx, %es:x(%edi)) ;
29574
29575 #define ARGBASE 12
29576-
29577-ENTRY(csum_partial_copy_generic)
29578+
29579+ENTRY(csum_partial_copy_generic_to_user)
29580 CFI_STARTPROC
29581+
29582+#ifdef CONFIG_PAX_MEMORY_UDEREF
29583+ pushl_cfi %gs
29584+ popl_cfi %es
29585+ jmp csum_partial_copy_generic
29586+#endif
29587+
29588+ENTRY(csum_partial_copy_generic_from_user)
29589+
29590+#ifdef CONFIG_PAX_MEMORY_UDEREF
29591+ pushl_cfi %gs
29592+ popl_cfi %ds
29593+#endif
29594+
29595+ENTRY(csum_partial_copy_generic)
29596 pushl_cfi %ebx
29597 CFI_REL_OFFSET ebx, 0
29598 pushl_cfi %edi
29599@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29600 subl %ebx, %edi
29601 lea -1(%esi),%edx
29602 andl $-32,%edx
29603- lea 3f(%ebx,%ebx), %ebx
29604+ lea 3f(%ebx,%ebx,2), %ebx
29605 testl %esi, %esi
29606 jmp *%ebx
29607 1: addl $64,%esi
29608@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29609 jb 5f
29610 SRC( movw (%esi), %dx )
29611 leal 2(%esi), %esi
29612-DST( movw %dx, (%edi) )
29613+DST( movw %dx, %es:(%edi) )
29614 leal 2(%edi), %edi
29615 je 6f
29616 shll $16,%edx
29617 5:
29618 SRC( movb (%esi), %dl )
29619-DST( movb %dl, (%edi) )
29620+DST( movb %dl, %es:(%edi) )
29621 6: addl %edx, %eax
29622 adcl $0, %eax
29623 7:
29624 .section .fixup, "ax"
29625 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29626- movl $-EFAULT, (%ebx)
29627+ movl $-EFAULT, %ss:(%ebx)
29628 # zero the complete destination (computing the rest is too much work)
29629 movl ARGBASE+8(%esp),%edi # dst
29630 movl ARGBASE+12(%esp),%ecx # len
29631@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29632 rep; stosb
29633 jmp 7b
29634 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29635- movl $-EFAULT, (%ebx)
29636+ movl $-EFAULT, %ss:(%ebx)
29637 jmp 7b
29638 .previous
29639
29640+#ifdef CONFIG_PAX_MEMORY_UDEREF
29641+ pushl_cfi %ss
29642+ popl_cfi %ds
29643+ pushl_cfi %ss
29644+ popl_cfi %es
29645+#endif
29646+
29647 popl_cfi %esi
29648 CFI_RESTORE esi
29649 popl_cfi %edi
29650@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29651 CFI_RESTORE ebx
29652 ret
29653 CFI_ENDPROC
29654-ENDPROC(csum_partial_copy_generic)
29655+ENDPROC(csum_partial_copy_generic_to_user)
29656
29657 #undef ROUND
29658 #undef ROUND1
29659diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29660index f2145cf..cea889d 100644
29661--- a/arch/x86/lib/clear_page_64.S
29662+++ b/arch/x86/lib/clear_page_64.S
29663@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29664 movl $4096/8,%ecx
29665 xorl %eax,%eax
29666 rep stosq
29667+ pax_force_retaddr
29668 ret
29669 CFI_ENDPROC
29670 ENDPROC(clear_page_c)
29671@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29672 movl $4096,%ecx
29673 xorl %eax,%eax
29674 rep stosb
29675+ pax_force_retaddr
29676 ret
29677 CFI_ENDPROC
29678 ENDPROC(clear_page_c_e)
29679@@ -43,6 +45,7 @@ ENTRY(clear_page)
29680 leaq 64(%rdi),%rdi
29681 jnz .Lloop
29682 nop
29683+ pax_force_retaddr
29684 ret
29685 CFI_ENDPROC
29686 .Lclear_page_end:
29687@@ -58,7 +61,7 @@ ENDPROC(clear_page)
29688
29689 #include <asm/cpufeature.h>
29690
29691- .section .altinstr_replacement,"ax"
29692+ .section .altinstr_replacement,"a"
29693 1: .byte 0xeb /* jmp <disp8> */
29694 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29695 2: .byte 0xeb /* jmp <disp8> */
29696diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29697index 40a1725..5d12ac4 100644
29698--- a/arch/x86/lib/cmpxchg16b_emu.S
29699+++ b/arch/x86/lib/cmpxchg16b_emu.S
29700@@ -8,6 +8,7 @@
29701 #include <linux/linkage.h>
29702 #include <asm/dwarf2.h>
29703 #include <asm/percpu.h>
29704+#include <asm/alternative-asm.h>
29705
29706 .text
29707
29708@@ -46,12 +47,14 @@ CFI_STARTPROC
29709 CFI_REMEMBER_STATE
29710 popfq_cfi
29711 mov $1, %al
29712+ pax_force_retaddr
29713 ret
29714
29715 CFI_RESTORE_STATE
29716 .Lnot_same:
29717 popfq_cfi
29718 xor %al,%al
29719+ pax_force_retaddr
29720 ret
29721
29722 CFI_ENDPROC
29723diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29724index 176cca6..e0d658e 100644
29725--- a/arch/x86/lib/copy_page_64.S
29726+++ b/arch/x86/lib/copy_page_64.S
29727@@ -9,6 +9,7 @@ copy_page_rep:
29728 CFI_STARTPROC
29729 movl $4096/8, %ecx
29730 rep movsq
29731+ pax_force_retaddr
29732 ret
29733 CFI_ENDPROC
29734 ENDPROC(copy_page_rep)
29735@@ -24,8 +25,8 @@ ENTRY(copy_page)
29736 CFI_ADJUST_CFA_OFFSET 2*8
29737 movq %rbx, (%rsp)
29738 CFI_REL_OFFSET rbx, 0
29739- movq %r12, 1*8(%rsp)
29740- CFI_REL_OFFSET r12, 1*8
29741+ movq %r13, 1*8(%rsp)
29742+ CFI_REL_OFFSET r13, 1*8
29743
29744 movl $(4096/64)-5, %ecx
29745 .p2align 4
29746@@ -38,7 +39,7 @@ ENTRY(copy_page)
29747 movq 0x8*4(%rsi), %r9
29748 movq 0x8*5(%rsi), %r10
29749 movq 0x8*6(%rsi), %r11
29750- movq 0x8*7(%rsi), %r12
29751+ movq 0x8*7(%rsi), %r13
29752
29753 prefetcht0 5*64(%rsi)
29754
29755@@ -49,7 +50,7 @@ ENTRY(copy_page)
29756 movq %r9, 0x8*4(%rdi)
29757 movq %r10, 0x8*5(%rdi)
29758 movq %r11, 0x8*6(%rdi)
29759- movq %r12, 0x8*7(%rdi)
29760+ movq %r13, 0x8*7(%rdi)
29761
29762 leaq 64 (%rsi), %rsi
29763 leaq 64 (%rdi), %rdi
29764@@ -68,7 +69,7 @@ ENTRY(copy_page)
29765 movq 0x8*4(%rsi), %r9
29766 movq 0x8*5(%rsi), %r10
29767 movq 0x8*6(%rsi), %r11
29768- movq 0x8*7(%rsi), %r12
29769+ movq 0x8*7(%rsi), %r13
29770
29771 movq %rax, 0x8*0(%rdi)
29772 movq %rbx, 0x8*1(%rdi)
29773@@ -77,7 +78,7 @@ ENTRY(copy_page)
29774 movq %r9, 0x8*4(%rdi)
29775 movq %r10, 0x8*5(%rdi)
29776 movq %r11, 0x8*6(%rdi)
29777- movq %r12, 0x8*7(%rdi)
29778+ movq %r13, 0x8*7(%rdi)
29779
29780 leaq 64(%rdi), %rdi
29781 leaq 64(%rsi), %rsi
29782@@ -85,10 +86,11 @@ ENTRY(copy_page)
29783
29784 movq (%rsp), %rbx
29785 CFI_RESTORE rbx
29786- movq 1*8(%rsp), %r12
29787- CFI_RESTORE r12
29788+ movq 1*8(%rsp), %r13
29789+ CFI_RESTORE r13
29790 addq $2*8, %rsp
29791 CFI_ADJUST_CFA_OFFSET -2*8
29792+ pax_force_retaddr
29793 ret
29794 .Lcopy_page_end:
29795 CFI_ENDPROC
29796@@ -99,7 +101,7 @@ ENDPROC(copy_page)
29797
29798 #include <asm/cpufeature.h>
29799
29800- .section .altinstr_replacement,"ax"
29801+ .section .altinstr_replacement,"a"
29802 1: .byte 0xeb /* jmp <disp8> */
29803 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29804 2:
29805diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29806index dee945d..a84067b 100644
29807--- a/arch/x86/lib/copy_user_64.S
29808+++ b/arch/x86/lib/copy_user_64.S
29809@@ -18,31 +18,7 @@
29810 #include <asm/alternative-asm.h>
29811 #include <asm/asm.h>
29812 #include <asm/smap.h>
29813-
29814-/*
29815- * By placing feature2 after feature1 in altinstructions section, we logically
29816- * implement:
29817- * If CPU has feature2, jmp to alt2 is used
29818- * else if CPU has feature1, jmp to alt1 is used
29819- * else jmp to orig is used.
29820- */
29821- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29822-0:
29823- .byte 0xe9 /* 32bit jump */
29824- .long \orig-1f /* by default jump to orig */
29825-1:
29826- .section .altinstr_replacement,"ax"
29827-2: .byte 0xe9 /* near jump with 32bit immediate */
29828- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29829-3: .byte 0xe9 /* near jump with 32bit immediate */
29830- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29831- .previous
29832-
29833- .section .altinstructions,"a"
29834- altinstruction_entry 0b,2b,\feature1,5,5
29835- altinstruction_entry 0b,3b,\feature2,5,5
29836- .previous
29837- .endm
29838+#include <asm/pgtable.h>
29839
29840 .macro ALIGN_DESTINATION
29841 #ifdef FIX_ALIGNMENT
29842@@ -70,52 +46,6 @@
29843 #endif
29844 .endm
29845
29846-/* Standard copy_to_user with segment limit checking */
29847-ENTRY(_copy_to_user)
29848- CFI_STARTPROC
29849- GET_THREAD_INFO(%rax)
29850- movq %rdi,%rcx
29851- addq %rdx,%rcx
29852- jc bad_to_user
29853- cmpq TI_addr_limit(%rax),%rcx
29854- ja bad_to_user
29855- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29856- copy_user_generic_unrolled,copy_user_generic_string, \
29857- copy_user_enhanced_fast_string
29858- CFI_ENDPROC
29859-ENDPROC(_copy_to_user)
29860-
29861-/* Standard copy_from_user with segment limit checking */
29862-ENTRY(_copy_from_user)
29863- CFI_STARTPROC
29864- GET_THREAD_INFO(%rax)
29865- movq %rsi,%rcx
29866- addq %rdx,%rcx
29867- jc bad_from_user
29868- cmpq TI_addr_limit(%rax),%rcx
29869- ja bad_from_user
29870- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29871- copy_user_generic_unrolled,copy_user_generic_string, \
29872- copy_user_enhanced_fast_string
29873- CFI_ENDPROC
29874-ENDPROC(_copy_from_user)
29875-
29876- .section .fixup,"ax"
29877- /* must zero dest */
29878-ENTRY(bad_from_user)
29879-bad_from_user:
29880- CFI_STARTPROC
29881- movl %edx,%ecx
29882- xorl %eax,%eax
29883- rep
29884- stosb
29885-bad_to_user:
29886- movl %edx,%eax
29887- ret
29888- CFI_ENDPROC
29889-ENDPROC(bad_from_user)
29890- .previous
29891-
29892 /*
29893 * copy_user_generic_unrolled - memory copy with exception handling.
29894 * This version is for CPUs like P4 that don't have efficient micro
29895@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
29896 */
29897 ENTRY(copy_user_generic_unrolled)
29898 CFI_STARTPROC
29899+ ASM_PAX_OPEN_USERLAND
29900 ASM_STAC
29901 cmpl $8,%edx
29902 jb 20f /* less then 8 bytes, go to byte copy loop */
29903@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
29904 jnz 21b
29905 23: xor %eax,%eax
29906 ASM_CLAC
29907+ ASM_PAX_CLOSE_USERLAND
29908+ pax_force_retaddr
29909 ret
29910
29911 .section .fixup,"ax"
29912@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
29913 */
29914 ENTRY(copy_user_generic_string)
29915 CFI_STARTPROC
29916+ ASM_PAX_OPEN_USERLAND
29917 ASM_STAC
29918 cmpl $8,%edx
29919 jb 2f /* less than 8 bytes, go to byte copy loop */
29920@@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
29921 movsb
29922 xorl %eax,%eax
29923 ASM_CLAC
29924+ ASM_PAX_CLOSE_USERLAND
29925+ pax_force_retaddr
29926 ret
29927
29928 .section .fixup,"ax"
29929@@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
29930 */
29931 ENTRY(copy_user_enhanced_fast_string)
29932 CFI_STARTPROC
29933+ ASM_PAX_OPEN_USERLAND
29934 ASM_STAC
29935 movl %edx,%ecx
29936 1: rep
29937 movsb
29938 xorl %eax,%eax
29939 ASM_CLAC
29940+ ASM_PAX_CLOSE_USERLAND
29941+ pax_force_retaddr
29942 ret
29943
29944 .section .fixup,"ax"
29945diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
29946index 6a4f43c..c70fb52 100644
29947--- a/arch/x86/lib/copy_user_nocache_64.S
29948+++ b/arch/x86/lib/copy_user_nocache_64.S
29949@@ -8,6 +8,7 @@
29950
29951 #include <linux/linkage.h>
29952 #include <asm/dwarf2.h>
29953+#include <asm/alternative-asm.h>
29954
29955 #define FIX_ALIGNMENT 1
29956
29957@@ -16,6 +17,7 @@
29958 #include <asm/thread_info.h>
29959 #include <asm/asm.h>
29960 #include <asm/smap.h>
29961+#include <asm/pgtable.h>
29962
29963 .macro ALIGN_DESTINATION
29964 #ifdef FIX_ALIGNMENT
29965@@ -49,6 +51,16 @@
29966 */
29967 ENTRY(__copy_user_nocache)
29968 CFI_STARTPROC
29969+
29970+#ifdef CONFIG_PAX_MEMORY_UDEREF
29971+ mov pax_user_shadow_base,%rcx
29972+ cmp %rcx,%rsi
29973+ jae 1f
29974+ add %rcx,%rsi
29975+1:
29976+#endif
29977+
29978+ ASM_PAX_OPEN_USERLAND
29979 ASM_STAC
29980 cmpl $8,%edx
29981 jb 20f /* less then 8 bytes, go to byte copy loop */
29982@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
29983 jnz 21b
29984 23: xorl %eax,%eax
29985 ASM_CLAC
29986+ ASM_PAX_CLOSE_USERLAND
29987 sfence
29988+ pax_force_retaddr
29989 ret
29990
29991 .section .fixup,"ax"
29992diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
29993index 2419d5f..fe52d0e 100644
29994--- a/arch/x86/lib/csum-copy_64.S
29995+++ b/arch/x86/lib/csum-copy_64.S
29996@@ -9,6 +9,7 @@
29997 #include <asm/dwarf2.h>
29998 #include <asm/errno.h>
29999 #include <asm/asm.h>
30000+#include <asm/alternative-asm.h>
30001
30002 /*
30003 * Checksum copy with exception handling.
30004@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30005 CFI_ADJUST_CFA_OFFSET 7*8
30006 movq %rbx, 2*8(%rsp)
30007 CFI_REL_OFFSET rbx, 2*8
30008- movq %r12, 3*8(%rsp)
30009- CFI_REL_OFFSET r12, 3*8
30010+ movq %r15, 3*8(%rsp)
30011+ CFI_REL_OFFSET r15, 3*8
30012 movq %r14, 4*8(%rsp)
30013 CFI_REL_OFFSET r14, 4*8
30014 movq %r13, 5*8(%rsp)
30015@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30016 movl %edx, %ecx
30017
30018 xorl %r9d, %r9d
30019- movq %rcx, %r12
30020+ movq %rcx, %r15
30021
30022- shrq $6, %r12
30023+ shrq $6, %r15
30024 jz .Lhandle_tail /* < 64 */
30025
30026 clc
30027
30028 /* main loop. clear in 64 byte blocks */
30029 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30030- /* r11: temp3, rdx: temp4, r12 loopcnt */
30031+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30032 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30033 .p2align 4
30034 .Lloop:
30035@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30036 adcq %r14, %rax
30037 adcq %r13, %rax
30038
30039- decl %r12d
30040+ decl %r15d
30041
30042 dest
30043 movq %rbx, (%rsi)
30044@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30045 .Lende:
30046 movq 2*8(%rsp), %rbx
30047 CFI_RESTORE rbx
30048- movq 3*8(%rsp), %r12
30049- CFI_RESTORE r12
30050+ movq 3*8(%rsp), %r15
30051+ CFI_RESTORE r15
30052 movq 4*8(%rsp), %r14
30053 CFI_RESTORE r14
30054 movq 5*8(%rsp), %r13
30055@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30056 CFI_RESTORE rbp
30057 addq $7*8, %rsp
30058 CFI_ADJUST_CFA_OFFSET -7*8
30059+ pax_force_retaddr
30060 ret
30061 CFI_RESTORE_STATE
30062
30063diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30064index 1318f75..44c30fd 100644
30065--- a/arch/x86/lib/csum-wrappers_64.c
30066+++ b/arch/x86/lib/csum-wrappers_64.c
30067@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30068 len -= 2;
30069 }
30070 }
30071+ pax_open_userland();
30072 stac();
30073- isum = csum_partial_copy_generic((__force const void *)src,
30074+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30075 dst, len, isum, errp, NULL);
30076 clac();
30077+ pax_close_userland();
30078 if (unlikely(*errp))
30079 goto out_err;
30080
30081@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30082 }
30083
30084 *errp = 0;
30085+ pax_open_userland();
30086 stac();
30087- ret = csum_partial_copy_generic(src, (void __force *)dst,
30088+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30089 len, isum, NULL, errp);
30090 clac();
30091+ pax_close_userland();
30092 return ret;
30093 }
30094 EXPORT_SYMBOL(csum_partial_copy_to_user);
30095diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30096index a451235..1daa956 100644
30097--- a/arch/x86/lib/getuser.S
30098+++ b/arch/x86/lib/getuser.S
30099@@ -33,17 +33,40 @@
30100 #include <asm/thread_info.h>
30101 #include <asm/asm.h>
30102 #include <asm/smap.h>
30103+#include <asm/segment.h>
30104+#include <asm/pgtable.h>
30105+#include <asm/alternative-asm.h>
30106+
30107+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30108+#define __copyuser_seg gs;
30109+#else
30110+#define __copyuser_seg
30111+#endif
30112
30113 .text
30114 ENTRY(__get_user_1)
30115 CFI_STARTPROC
30116+
30117+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30118 GET_THREAD_INFO(%_ASM_DX)
30119 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30120 jae bad_get_user
30121 ASM_STAC
30122-1: movzbl (%_ASM_AX),%edx
30123+
30124+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30125+ mov pax_user_shadow_base,%_ASM_DX
30126+ cmp %_ASM_DX,%_ASM_AX
30127+ jae 1234f
30128+ add %_ASM_DX,%_ASM_AX
30129+1234:
30130+#endif
30131+
30132+#endif
30133+
30134+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30135 xor %eax,%eax
30136 ASM_CLAC
30137+ pax_force_retaddr
30138 ret
30139 CFI_ENDPROC
30140 ENDPROC(__get_user_1)
30141@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30142 ENTRY(__get_user_2)
30143 CFI_STARTPROC
30144 add $1,%_ASM_AX
30145+
30146+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30147 jc bad_get_user
30148 GET_THREAD_INFO(%_ASM_DX)
30149 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30150 jae bad_get_user
30151 ASM_STAC
30152-2: movzwl -1(%_ASM_AX),%edx
30153+
30154+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30155+ mov pax_user_shadow_base,%_ASM_DX
30156+ cmp %_ASM_DX,%_ASM_AX
30157+ jae 1234f
30158+ add %_ASM_DX,%_ASM_AX
30159+1234:
30160+#endif
30161+
30162+#endif
30163+
30164+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30165 xor %eax,%eax
30166 ASM_CLAC
30167+ pax_force_retaddr
30168 ret
30169 CFI_ENDPROC
30170 ENDPROC(__get_user_2)
30171@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30172 ENTRY(__get_user_4)
30173 CFI_STARTPROC
30174 add $3,%_ASM_AX
30175+
30176+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30177 jc bad_get_user
30178 GET_THREAD_INFO(%_ASM_DX)
30179 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30180 jae bad_get_user
30181 ASM_STAC
30182-3: movl -3(%_ASM_AX),%edx
30183+
30184+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30185+ mov pax_user_shadow_base,%_ASM_DX
30186+ cmp %_ASM_DX,%_ASM_AX
30187+ jae 1234f
30188+ add %_ASM_DX,%_ASM_AX
30189+1234:
30190+#endif
30191+
30192+#endif
30193+
30194+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30195 xor %eax,%eax
30196 ASM_CLAC
30197+ pax_force_retaddr
30198 ret
30199 CFI_ENDPROC
30200 ENDPROC(__get_user_4)
30201@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30202 GET_THREAD_INFO(%_ASM_DX)
30203 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30204 jae bad_get_user
30205+
30206+#ifdef CONFIG_PAX_MEMORY_UDEREF
30207+ mov pax_user_shadow_base,%_ASM_DX
30208+ cmp %_ASM_DX,%_ASM_AX
30209+ jae 1234f
30210+ add %_ASM_DX,%_ASM_AX
30211+1234:
30212+#endif
30213+
30214 ASM_STAC
30215 4: movq -7(%_ASM_AX),%rdx
30216 xor %eax,%eax
30217 ASM_CLAC
30218+ pax_force_retaddr
30219 ret
30220 #else
30221 add $7,%_ASM_AX
30222@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30223 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30224 jae bad_get_user_8
30225 ASM_STAC
30226-4: movl -7(%_ASM_AX),%edx
30227-5: movl -3(%_ASM_AX),%ecx
30228+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30229+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30230 xor %eax,%eax
30231 ASM_CLAC
30232+ pax_force_retaddr
30233 ret
30234 #endif
30235 CFI_ENDPROC
30236@@ -113,6 +175,7 @@ bad_get_user:
30237 xor %edx,%edx
30238 mov $(-EFAULT),%_ASM_AX
30239 ASM_CLAC
30240+ pax_force_retaddr
30241 ret
30242 CFI_ENDPROC
30243 END(bad_get_user)
30244@@ -124,6 +187,7 @@ bad_get_user_8:
30245 xor %ecx,%ecx
30246 mov $(-EFAULT),%_ASM_AX
30247 ASM_CLAC
30248+ pax_force_retaddr
30249 ret
30250 CFI_ENDPROC
30251 END(bad_get_user_8)
30252diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30253index 54fcffe..7be149e 100644
30254--- a/arch/x86/lib/insn.c
30255+++ b/arch/x86/lib/insn.c
30256@@ -20,8 +20,10 @@
30257
30258 #ifdef __KERNEL__
30259 #include <linux/string.h>
30260+#include <asm/pgtable_types.h>
30261 #else
30262 #include <string.h>
30263+#define ktla_ktva(addr) addr
30264 #endif
30265 #include <asm/inat.h>
30266 #include <asm/insn.h>
30267@@ -53,8 +55,8 @@
30268 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
30269 {
30270 memset(insn, 0, sizeof(*insn));
30271- insn->kaddr = kaddr;
30272- insn->next_byte = kaddr;
30273+ insn->kaddr = ktla_ktva(kaddr);
30274+ insn->next_byte = ktla_ktva(kaddr);
30275 insn->x86_64 = x86_64 ? 1 : 0;
30276 insn->opnd_bytes = 4;
30277 if (x86_64)
30278diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30279index 05a95e7..326f2fa 100644
30280--- a/arch/x86/lib/iomap_copy_64.S
30281+++ b/arch/x86/lib/iomap_copy_64.S
30282@@ -17,6 +17,7 @@
30283
30284 #include <linux/linkage.h>
30285 #include <asm/dwarf2.h>
30286+#include <asm/alternative-asm.h>
30287
30288 /*
30289 * override generic version in lib/iomap_copy.c
30290@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30291 CFI_STARTPROC
30292 movl %edx,%ecx
30293 rep movsd
30294+ pax_force_retaddr
30295 ret
30296 CFI_ENDPROC
30297 ENDPROC(__iowrite32_copy)
30298diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30299index 56313a3..0db417e 100644
30300--- a/arch/x86/lib/memcpy_64.S
30301+++ b/arch/x86/lib/memcpy_64.S
30302@@ -24,7 +24,7 @@
30303 * This gets patched over the unrolled variant (below) via the
30304 * alternative instructions framework:
30305 */
30306- .section .altinstr_replacement, "ax", @progbits
30307+ .section .altinstr_replacement, "a", @progbits
30308 .Lmemcpy_c:
30309 movq %rdi, %rax
30310 movq %rdx, %rcx
30311@@ -33,6 +33,7 @@
30312 rep movsq
30313 movl %edx, %ecx
30314 rep movsb
30315+ pax_force_retaddr
30316 ret
30317 .Lmemcpy_e:
30318 .previous
30319@@ -44,11 +45,12 @@
30320 * This gets patched over the unrolled variant (below) via the
30321 * alternative instructions framework:
30322 */
30323- .section .altinstr_replacement, "ax", @progbits
30324+ .section .altinstr_replacement, "a", @progbits
30325 .Lmemcpy_c_e:
30326 movq %rdi, %rax
30327 movq %rdx, %rcx
30328 rep movsb
30329+ pax_force_retaddr
30330 ret
30331 .Lmemcpy_e_e:
30332 .previous
30333@@ -136,6 +138,7 @@ ENTRY(memcpy)
30334 movq %r9, 1*8(%rdi)
30335 movq %r10, -2*8(%rdi, %rdx)
30336 movq %r11, -1*8(%rdi, %rdx)
30337+ pax_force_retaddr
30338 retq
30339 .p2align 4
30340 .Lless_16bytes:
30341@@ -148,6 +151,7 @@ ENTRY(memcpy)
30342 movq -1*8(%rsi, %rdx), %r9
30343 movq %r8, 0*8(%rdi)
30344 movq %r9, -1*8(%rdi, %rdx)
30345+ pax_force_retaddr
30346 retq
30347 .p2align 4
30348 .Lless_8bytes:
30349@@ -161,6 +165,7 @@ ENTRY(memcpy)
30350 movl -4(%rsi, %rdx), %r8d
30351 movl %ecx, (%rdi)
30352 movl %r8d, -4(%rdi, %rdx)
30353+ pax_force_retaddr
30354 retq
30355 .p2align 4
30356 .Lless_3bytes:
30357@@ -179,6 +184,7 @@ ENTRY(memcpy)
30358 movb %cl, (%rdi)
30359
30360 .Lend:
30361+ pax_force_retaddr
30362 retq
30363 CFI_ENDPROC
30364 ENDPROC(memcpy)
30365diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30366index 65268a6..dd1de11 100644
30367--- a/arch/x86/lib/memmove_64.S
30368+++ b/arch/x86/lib/memmove_64.S
30369@@ -202,14 +202,16 @@ ENTRY(memmove)
30370 movb (%rsi), %r11b
30371 movb %r11b, (%rdi)
30372 13:
30373+ pax_force_retaddr
30374 retq
30375 CFI_ENDPROC
30376
30377- .section .altinstr_replacement,"ax"
30378+ .section .altinstr_replacement,"a"
30379 .Lmemmove_begin_forward_efs:
30380 /* Forward moving data. */
30381 movq %rdx, %rcx
30382 rep movsb
30383+ pax_force_retaddr
30384 retq
30385 .Lmemmove_end_forward_efs:
30386 .previous
30387diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30388index 2dcb380..2eb79fe 100644
30389--- a/arch/x86/lib/memset_64.S
30390+++ b/arch/x86/lib/memset_64.S
30391@@ -16,7 +16,7 @@
30392 *
30393 * rax original destination
30394 */
30395- .section .altinstr_replacement, "ax", @progbits
30396+ .section .altinstr_replacement, "a", @progbits
30397 .Lmemset_c:
30398 movq %rdi,%r9
30399 movq %rdx,%rcx
30400@@ -30,6 +30,7 @@
30401 movl %edx,%ecx
30402 rep stosb
30403 movq %r9,%rax
30404+ pax_force_retaddr
30405 ret
30406 .Lmemset_e:
30407 .previous
30408@@ -45,13 +46,14 @@
30409 *
30410 * rax original destination
30411 */
30412- .section .altinstr_replacement, "ax", @progbits
30413+ .section .altinstr_replacement, "a", @progbits
30414 .Lmemset_c_e:
30415 movq %rdi,%r9
30416 movb %sil,%al
30417 movq %rdx,%rcx
30418 rep stosb
30419 movq %r9,%rax
30420+ pax_force_retaddr
30421 ret
30422 .Lmemset_e_e:
30423 .previous
30424@@ -118,6 +120,7 @@ ENTRY(__memset)
30425
30426 .Lende:
30427 movq %r10,%rax
30428+ pax_force_retaddr
30429 ret
30430
30431 CFI_RESTORE_STATE
30432diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30433index c9f2d9b..e7fd2c0 100644
30434--- a/arch/x86/lib/mmx_32.c
30435+++ b/arch/x86/lib/mmx_32.c
30436@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30437 {
30438 void *p;
30439 int i;
30440+ unsigned long cr0;
30441
30442 if (unlikely(in_interrupt()))
30443 return __memcpy(to, from, len);
30444@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30445 kernel_fpu_begin();
30446
30447 __asm__ __volatile__ (
30448- "1: prefetch (%0)\n" /* This set is 28 bytes */
30449- " prefetch 64(%0)\n"
30450- " prefetch 128(%0)\n"
30451- " prefetch 192(%0)\n"
30452- " prefetch 256(%0)\n"
30453+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30454+ " prefetch 64(%1)\n"
30455+ " prefetch 128(%1)\n"
30456+ " prefetch 192(%1)\n"
30457+ " prefetch 256(%1)\n"
30458 "2: \n"
30459 ".section .fixup, \"ax\"\n"
30460- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30461+ "3: \n"
30462+
30463+#ifdef CONFIG_PAX_KERNEXEC
30464+ " movl %%cr0, %0\n"
30465+ " movl %0, %%eax\n"
30466+ " andl $0xFFFEFFFF, %%eax\n"
30467+ " movl %%eax, %%cr0\n"
30468+#endif
30469+
30470+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30471+
30472+#ifdef CONFIG_PAX_KERNEXEC
30473+ " movl %0, %%cr0\n"
30474+#endif
30475+
30476 " jmp 2b\n"
30477 ".previous\n"
30478 _ASM_EXTABLE(1b, 3b)
30479- : : "r" (from));
30480+ : "=&r" (cr0) : "r" (from) : "ax");
30481
30482 for ( ; i > 5; i--) {
30483 __asm__ __volatile__ (
30484- "1: prefetch 320(%0)\n"
30485- "2: movq (%0), %%mm0\n"
30486- " movq 8(%0), %%mm1\n"
30487- " movq 16(%0), %%mm2\n"
30488- " movq 24(%0), %%mm3\n"
30489- " movq %%mm0, (%1)\n"
30490- " movq %%mm1, 8(%1)\n"
30491- " movq %%mm2, 16(%1)\n"
30492- " movq %%mm3, 24(%1)\n"
30493- " movq 32(%0), %%mm0\n"
30494- " movq 40(%0), %%mm1\n"
30495- " movq 48(%0), %%mm2\n"
30496- " movq 56(%0), %%mm3\n"
30497- " movq %%mm0, 32(%1)\n"
30498- " movq %%mm1, 40(%1)\n"
30499- " movq %%mm2, 48(%1)\n"
30500- " movq %%mm3, 56(%1)\n"
30501+ "1: prefetch 320(%1)\n"
30502+ "2: movq (%1), %%mm0\n"
30503+ " movq 8(%1), %%mm1\n"
30504+ " movq 16(%1), %%mm2\n"
30505+ " movq 24(%1), %%mm3\n"
30506+ " movq %%mm0, (%2)\n"
30507+ " movq %%mm1, 8(%2)\n"
30508+ " movq %%mm2, 16(%2)\n"
30509+ " movq %%mm3, 24(%2)\n"
30510+ " movq 32(%1), %%mm0\n"
30511+ " movq 40(%1), %%mm1\n"
30512+ " movq 48(%1), %%mm2\n"
30513+ " movq 56(%1), %%mm3\n"
30514+ " movq %%mm0, 32(%2)\n"
30515+ " movq %%mm1, 40(%2)\n"
30516+ " movq %%mm2, 48(%2)\n"
30517+ " movq %%mm3, 56(%2)\n"
30518 ".section .fixup, \"ax\"\n"
30519- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30520+ "3:\n"
30521+
30522+#ifdef CONFIG_PAX_KERNEXEC
30523+ " movl %%cr0, %0\n"
30524+ " movl %0, %%eax\n"
30525+ " andl $0xFFFEFFFF, %%eax\n"
30526+ " movl %%eax, %%cr0\n"
30527+#endif
30528+
30529+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30530+
30531+#ifdef CONFIG_PAX_KERNEXEC
30532+ " movl %0, %%cr0\n"
30533+#endif
30534+
30535 " jmp 2b\n"
30536 ".previous\n"
30537 _ASM_EXTABLE(1b, 3b)
30538- : : "r" (from), "r" (to) : "memory");
30539+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30540
30541 from += 64;
30542 to += 64;
30543@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30544 static void fast_copy_page(void *to, void *from)
30545 {
30546 int i;
30547+ unsigned long cr0;
30548
30549 kernel_fpu_begin();
30550
30551@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30552 * but that is for later. -AV
30553 */
30554 __asm__ __volatile__(
30555- "1: prefetch (%0)\n"
30556- " prefetch 64(%0)\n"
30557- " prefetch 128(%0)\n"
30558- " prefetch 192(%0)\n"
30559- " prefetch 256(%0)\n"
30560+ "1: prefetch (%1)\n"
30561+ " prefetch 64(%1)\n"
30562+ " prefetch 128(%1)\n"
30563+ " prefetch 192(%1)\n"
30564+ " prefetch 256(%1)\n"
30565 "2: \n"
30566 ".section .fixup, \"ax\"\n"
30567- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30568+ "3: \n"
30569+
30570+#ifdef CONFIG_PAX_KERNEXEC
30571+ " movl %%cr0, %0\n"
30572+ " movl %0, %%eax\n"
30573+ " andl $0xFFFEFFFF, %%eax\n"
30574+ " movl %%eax, %%cr0\n"
30575+#endif
30576+
30577+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30578+
30579+#ifdef CONFIG_PAX_KERNEXEC
30580+ " movl %0, %%cr0\n"
30581+#endif
30582+
30583 " jmp 2b\n"
30584 ".previous\n"
30585- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30586+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30587
30588 for (i = 0; i < (4096-320)/64; i++) {
30589 __asm__ __volatile__ (
30590- "1: prefetch 320(%0)\n"
30591- "2: movq (%0), %%mm0\n"
30592- " movntq %%mm0, (%1)\n"
30593- " movq 8(%0), %%mm1\n"
30594- " movntq %%mm1, 8(%1)\n"
30595- " movq 16(%0), %%mm2\n"
30596- " movntq %%mm2, 16(%1)\n"
30597- " movq 24(%0), %%mm3\n"
30598- " movntq %%mm3, 24(%1)\n"
30599- " movq 32(%0), %%mm4\n"
30600- " movntq %%mm4, 32(%1)\n"
30601- " movq 40(%0), %%mm5\n"
30602- " movntq %%mm5, 40(%1)\n"
30603- " movq 48(%0), %%mm6\n"
30604- " movntq %%mm6, 48(%1)\n"
30605- " movq 56(%0), %%mm7\n"
30606- " movntq %%mm7, 56(%1)\n"
30607+ "1: prefetch 320(%1)\n"
30608+ "2: movq (%1), %%mm0\n"
30609+ " movntq %%mm0, (%2)\n"
30610+ " movq 8(%1), %%mm1\n"
30611+ " movntq %%mm1, 8(%2)\n"
30612+ " movq 16(%1), %%mm2\n"
30613+ " movntq %%mm2, 16(%2)\n"
30614+ " movq 24(%1), %%mm3\n"
30615+ " movntq %%mm3, 24(%2)\n"
30616+ " movq 32(%1), %%mm4\n"
30617+ " movntq %%mm4, 32(%2)\n"
30618+ " movq 40(%1), %%mm5\n"
30619+ " movntq %%mm5, 40(%2)\n"
30620+ " movq 48(%1), %%mm6\n"
30621+ " movntq %%mm6, 48(%2)\n"
30622+ " movq 56(%1), %%mm7\n"
30623+ " movntq %%mm7, 56(%2)\n"
30624 ".section .fixup, \"ax\"\n"
30625- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30626+ "3:\n"
30627+
30628+#ifdef CONFIG_PAX_KERNEXEC
30629+ " movl %%cr0, %0\n"
30630+ " movl %0, %%eax\n"
30631+ " andl $0xFFFEFFFF, %%eax\n"
30632+ " movl %%eax, %%cr0\n"
30633+#endif
30634+
30635+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30636+
30637+#ifdef CONFIG_PAX_KERNEXEC
30638+ " movl %0, %%cr0\n"
30639+#endif
30640+
30641 " jmp 2b\n"
30642 ".previous\n"
30643- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30644+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30645
30646 from += 64;
30647 to += 64;
30648@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30649 static void fast_copy_page(void *to, void *from)
30650 {
30651 int i;
30652+ unsigned long cr0;
30653
30654 kernel_fpu_begin();
30655
30656 __asm__ __volatile__ (
30657- "1: prefetch (%0)\n"
30658- " prefetch 64(%0)\n"
30659- " prefetch 128(%0)\n"
30660- " prefetch 192(%0)\n"
30661- " prefetch 256(%0)\n"
30662+ "1: prefetch (%1)\n"
30663+ " prefetch 64(%1)\n"
30664+ " prefetch 128(%1)\n"
30665+ " prefetch 192(%1)\n"
30666+ " prefetch 256(%1)\n"
30667 "2: \n"
30668 ".section .fixup, \"ax\"\n"
30669- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30670+ "3: \n"
30671+
30672+#ifdef CONFIG_PAX_KERNEXEC
30673+ " movl %%cr0, %0\n"
30674+ " movl %0, %%eax\n"
30675+ " andl $0xFFFEFFFF, %%eax\n"
30676+ " movl %%eax, %%cr0\n"
30677+#endif
30678+
30679+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30680+
30681+#ifdef CONFIG_PAX_KERNEXEC
30682+ " movl %0, %%cr0\n"
30683+#endif
30684+
30685 " jmp 2b\n"
30686 ".previous\n"
30687- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30688+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30689
30690 for (i = 0; i < 4096/64; i++) {
30691 __asm__ __volatile__ (
30692- "1: prefetch 320(%0)\n"
30693- "2: movq (%0), %%mm0\n"
30694- " movq 8(%0), %%mm1\n"
30695- " movq 16(%0), %%mm2\n"
30696- " movq 24(%0), %%mm3\n"
30697- " movq %%mm0, (%1)\n"
30698- " movq %%mm1, 8(%1)\n"
30699- " movq %%mm2, 16(%1)\n"
30700- " movq %%mm3, 24(%1)\n"
30701- " movq 32(%0), %%mm0\n"
30702- " movq 40(%0), %%mm1\n"
30703- " movq 48(%0), %%mm2\n"
30704- " movq 56(%0), %%mm3\n"
30705- " movq %%mm0, 32(%1)\n"
30706- " movq %%mm1, 40(%1)\n"
30707- " movq %%mm2, 48(%1)\n"
30708- " movq %%mm3, 56(%1)\n"
30709+ "1: prefetch 320(%1)\n"
30710+ "2: movq (%1), %%mm0\n"
30711+ " movq 8(%1), %%mm1\n"
30712+ " movq 16(%1), %%mm2\n"
30713+ " movq 24(%1), %%mm3\n"
30714+ " movq %%mm0, (%2)\n"
30715+ " movq %%mm1, 8(%2)\n"
30716+ " movq %%mm2, 16(%2)\n"
30717+ " movq %%mm3, 24(%2)\n"
30718+ " movq 32(%1), %%mm0\n"
30719+ " movq 40(%1), %%mm1\n"
30720+ " movq 48(%1), %%mm2\n"
30721+ " movq 56(%1), %%mm3\n"
30722+ " movq %%mm0, 32(%2)\n"
30723+ " movq %%mm1, 40(%2)\n"
30724+ " movq %%mm2, 48(%2)\n"
30725+ " movq %%mm3, 56(%2)\n"
30726 ".section .fixup, \"ax\"\n"
30727- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30728+ "3:\n"
30729+
30730+#ifdef CONFIG_PAX_KERNEXEC
30731+ " movl %%cr0, %0\n"
30732+ " movl %0, %%eax\n"
30733+ " andl $0xFFFEFFFF, %%eax\n"
30734+ " movl %%eax, %%cr0\n"
30735+#endif
30736+
30737+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30738+
30739+#ifdef CONFIG_PAX_KERNEXEC
30740+ " movl %0, %%cr0\n"
30741+#endif
30742+
30743 " jmp 2b\n"
30744 ".previous\n"
30745 _ASM_EXTABLE(1b, 3b)
30746- : : "r" (from), "r" (to) : "memory");
30747+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30748
30749 from += 64;
30750 to += 64;
30751diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30752index f6d13ee..d789440 100644
30753--- a/arch/x86/lib/msr-reg.S
30754+++ b/arch/x86/lib/msr-reg.S
30755@@ -3,6 +3,7 @@
30756 #include <asm/dwarf2.h>
30757 #include <asm/asm.h>
30758 #include <asm/msr.h>
30759+#include <asm/alternative-asm.h>
30760
30761 #ifdef CONFIG_X86_64
30762 /*
30763@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30764 movl %edi, 28(%r10)
30765 popq_cfi %rbp
30766 popq_cfi %rbx
30767+ pax_force_retaddr
30768 ret
30769 3:
30770 CFI_RESTORE_STATE
30771diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30772index fc6ba17..d4d989d 100644
30773--- a/arch/x86/lib/putuser.S
30774+++ b/arch/x86/lib/putuser.S
30775@@ -16,7 +16,9 @@
30776 #include <asm/errno.h>
30777 #include <asm/asm.h>
30778 #include <asm/smap.h>
30779-
30780+#include <asm/segment.h>
30781+#include <asm/pgtable.h>
30782+#include <asm/alternative-asm.h>
30783
30784 /*
30785 * __put_user_X
30786@@ -30,57 +32,125 @@
30787 * as they get called from within inline assembly.
30788 */
30789
30790-#define ENTER CFI_STARTPROC ; \
30791- GET_THREAD_INFO(%_ASM_BX)
30792-#define EXIT ASM_CLAC ; \
30793- ret ; \
30794+#define ENTER CFI_STARTPROC
30795+#define EXIT ASM_CLAC ; \
30796+ pax_force_retaddr ; \
30797+ ret ; \
30798 CFI_ENDPROC
30799
30800+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30801+#define _DEST %_ASM_CX,%_ASM_BX
30802+#else
30803+#define _DEST %_ASM_CX
30804+#endif
30805+
30806+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30807+#define __copyuser_seg gs;
30808+#else
30809+#define __copyuser_seg
30810+#endif
30811+
30812 .text
30813 ENTRY(__put_user_1)
30814 ENTER
30815+
30816+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30817+ GET_THREAD_INFO(%_ASM_BX)
30818 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30819 jae bad_put_user
30820 ASM_STAC
30821-1: movb %al,(%_ASM_CX)
30822+
30823+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30824+ mov pax_user_shadow_base,%_ASM_BX
30825+ cmp %_ASM_BX,%_ASM_CX
30826+ jb 1234f
30827+ xor %ebx,%ebx
30828+1234:
30829+#endif
30830+
30831+#endif
30832+
30833+1: __copyuser_seg movb %al,(_DEST)
30834 xor %eax,%eax
30835 EXIT
30836 ENDPROC(__put_user_1)
30837
30838 ENTRY(__put_user_2)
30839 ENTER
30840+
30841+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30842+ GET_THREAD_INFO(%_ASM_BX)
30843 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30844 sub $1,%_ASM_BX
30845 cmp %_ASM_BX,%_ASM_CX
30846 jae bad_put_user
30847 ASM_STAC
30848-2: movw %ax,(%_ASM_CX)
30849+
30850+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30851+ mov pax_user_shadow_base,%_ASM_BX
30852+ cmp %_ASM_BX,%_ASM_CX
30853+ jb 1234f
30854+ xor %ebx,%ebx
30855+1234:
30856+#endif
30857+
30858+#endif
30859+
30860+2: __copyuser_seg movw %ax,(_DEST)
30861 xor %eax,%eax
30862 EXIT
30863 ENDPROC(__put_user_2)
30864
30865 ENTRY(__put_user_4)
30866 ENTER
30867+
30868+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30869+ GET_THREAD_INFO(%_ASM_BX)
30870 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30871 sub $3,%_ASM_BX
30872 cmp %_ASM_BX,%_ASM_CX
30873 jae bad_put_user
30874 ASM_STAC
30875-3: movl %eax,(%_ASM_CX)
30876+
30877+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30878+ mov pax_user_shadow_base,%_ASM_BX
30879+ cmp %_ASM_BX,%_ASM_CX
30880+ jb 1234f
30881+ xor %ebx,%ebx
30882+1234:
30883+#endif
30884+
30885+#endif
30886+
30887+3: __copyuser_seg movl %eax,(_DEST)
30888 xor %eax,%eax
30889 EXIT
30890 ENDPROC(__put_user_4)
30891
30892 ENTRY(__put_user_8)
30893 ENTER
30894+
30895+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30896+ GET_THREAD_INFO(%_ASM_BX)
30897 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30898 sub $7,%_ASM_BX
30899 cmp %_ASM_BX,%_ASM_CX
30900 jae bad_put_user
30901 ASM_STAC
30902-4: mov %_ASM_AX,(%_ASM_CX)
30903+
30904+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30905+ mov pax_user_shadow_base,%_ASM_BX
30906+ cmp %_ASM_BX,%_ASM_CX
30907+ jb 1234f
30908+ xor %ebx,%ebx
30909+1234:
30910+#endif
30911+
30912+#endif
30913+
30914+4: __copyuser_seg mov %_ASM_AX,(_DEST)
30915 #ifdef CONFIG_X86_32
30916-5: movl %edx,4(%_ASM_CX)
30917+5: __copyuser_seg movl %edx,4(_DEST)
30918 #endif
30919 xor %eax,%eax
30920 EXIT
30921diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30922index 5dff5f0..cadebf4 100644
30923--- a/arch/x86/lib/rwsem.S
30924+++ b/arch/x86/lib/rwsem.S
30925@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
30926 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30927 CFI_RESTORE __ASM_REG(dx)
30928 restore_common_regs
30929+ pax_force_retaddr
30930 ret
30931 CFI_ENDPROC
30932 ENDPROC(call_rwsem_down_read_failed)
30933@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
30934 movq %rax,%rdi
30935 call rwsem_down_write_failed
30936 restore_common_regs
30937+ pax_force_retaddr
30938 ret
30939 CFI_ENDPROC
30940 ENDPROC(call_rwsem_down_write_failed)
30941@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
30942 movq %rax,%rdi
30943 call rwsem_wake
30944 restore_common_regs
30945-1: ret
30946+1: pax_force_retaddr
30947+ ret
30948 CFI_ENDPROC
30949 ENDPROC(call_rwsem_wake)
30950
30951@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
30952 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30953 CFI_RESTORE __ASM_REG(dx)
30954 restore_common_regs
30955+ pax_force_retaddr
30956 ret
30957 CFI_ENDPROC
30958 ENDPROC(call_rwsem_downgrade_wake)
30959diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
30960index b30b5eb..2b57052 100644
30961--- a/arch/x86/lib/thunk_64.S
30962+++ b/arch/x86/lib/thunk_64.S
30963@@ -9,6 +9,7 @@
30964 #include <asm/dwarf2.h>
30965 #include <asm/calling.h>
30966 #include <asm/asm.h>
30967+#include <asm/alternative-asm.h>
30968
30969 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
30970 .macro THUNK name, func, put_ret_addr_in_rdi=0
30971@@ -16,11 +17,11 @@
30972 \name:
30973 CFI_STARTPROC
30974
30975- /* this one pushes 9 elems, the next one would be %rIP */
30976- SAVE_ARGS
30977+ /* this one pushes 15+1 elems, the next one would be %rIP */
30978+ SAVE_ARGS 8
30979
30980 .if \put_ret_addr_in_rdi
30981- movq_cfi_restore 9*8, rdi
30982+ movq_cfi_restore RIP, rdi
30983 .endif
30984
30985 call \func
30986@@ -47,9 +48,10 @@
30987
30988 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
30989 CFI_STARTPROC
30990- SAVE_ARGS
30991+ SAVE_ARGS 8
30992 restore:
30993- RESTORE_ARGS
30994+ RESTORE_ARGS 1,8
30995+ pax_force_retaddr
30996 ret
30997 CFI_ENDPROC
30998 _ASM_NOKPROBE(restore)
30999diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31000index e2f5e21..4b22130 100644
31001--- a/arch/x86/lib/usercopy_32.c
31002+++ b/arch/x86/lib/usercopy_32.c
31003@@ -42,11 +42,13 @@ do { \
31004 int __d0; \
31005 might_fault(); \
31006 __asm__ __volatile__( \
31007+ __COPYUSER_SET_ES \
31008 ASM_STAC "\n" \
31009 "0: rep; stosl\n" \
31010 " movl %2,%0\n" \
31011 "1: rep; stosb\n" \
31012 "2: " ASM_CLAC "\n" \
31013+ __COPYUSER_RESTORE_ES \
31014 ".section .fixup,\"ax\"\n" \
31015 "3: lea 0(%2,%0,4),%0\n" \
31016 " jmp 2b\n" \
31017@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31018
31019 #ifdef CONFIG_X86_INTEL_USERCOPY
31020 static unsigned long
31021-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31022+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31023 {
31024 int d0, d1;
31025 __asm__ __volatile__(
31026@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31027 " .align 2,0x90\n"
31028 "3: movl 0(%4), %%eax\n"
31029 "4: movl 4(%4), %%edx\n"
31030- "5: movl %%eax, 0(%3)\n"
31031- "6: movl %%edx, 4(%3)\n"
31032+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31033+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31034 "7: movl 8(%4), %%eax\n"
31035 "8: movl 12(%4),%%edx\n"
31036- "9: movl %%eax, 8(%3)\n"
31037- "10: movl %%edx, 12(%3)\n"
31038+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31039+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31040 "11: movl 16(%4), %%eax\n"
31041 "12: movl 20(%4), %%edx\n"
31042- "13: movl %%eax, 16(%3)\n"
31043- "14: movl %%edx, 20(%3)\n"
31044+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31045+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31046 "15: movl 24(%4), %%eax\n"
31047 "16: movl 28(%4), %%edx\n"
31048- "17: movl %%eax, 24(%3)\n"
31049- "18: movl %%edx, 28(%3)\n"
31050+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31051+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31052 "19: movl 32(%4), %%eax\n"
31053 "20: movl 36(%4), %%edx\n"
31054- "21: movl %%eax, 32(%3)\n"
31055- "22: movl %%edx, 36(%3)\n"
31056+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31057+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31058 "23: movl 40(%4), %%eax\n"
31059 "24: movl 44(%4), %%edx\n"
31060- "25: movl %%eax, 40(%3)\n"
31061- "26: movl %%edx, 44(%3)\n"
31062+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31063+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31064 "27: movl 48(%4), %%eax\n"
31065 "28: movl 52(%4), %%edx\n"
31066- "29: movl %%eax, 48(%3)\n"
31067- "30: movl %%edx, 52(%3)\n"
31068+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31069+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31070 "31: movl 56(%4), %%eax\n"
31071 "32: movl 60(%4), %%edx\n"
31072- "33: movl %%eax, 56(%3)\n"
31073- "34: movl %%edx, 60(%3)\n"
31074+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31075+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31076 " addl $-64, %0\n"
31077 " addl $64, %4\n"
31078 " addl $64, %3\n"
31079@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31080 " shrl $2, %0\n"
31081 " andl $3, %%eax\n"
31082 " cld\n"
31083+ __COPYUSER_SET_ES
31084 "99: rep; movsl\n"
31085 "36: movl %%eax, %0\n"
31086 "37: rep; movsb\n"
31087 "100:\n"
31088+ __COPYUSER_RESTORE_ES
31089+ ".section .fixup,\"ax\"\n"
31090+ "101: lea 0(%%eax,%0,4),%0\n"
31091+ " jmp 100b\n"
31092+ ".previous\n"
31093+ _ASM_EXTABLE(1b,100b)
31094+ _ASM_EXTABLE(2b,100b)
31095+ _ASM_EXTABLE(3b,100b)
31096+ _ASM_EXTABLE(4b,100b)
31097+ _ASM_EXTABLE(5b,100b)
31098+ _ASM_EXTABLE(6b,100b)
31099+ _ASM_EXTABLE(7b,100b)
31100+ _ASM_EXTABLE(8b,100b)
31101+ _ASM_EXTABLE(9b,100b)
31102+ _ASM_EXTABLE(10b,100b)
31103+ _ASM_EXTABLE(11b,100b)
31104+ _ASM_EXTABLE(12b,100b)
31105+ _ASM_EXTABLE(13b,100b)
31106+ _ASM_EXTABLE(14b,100b)
31107+ _ASM_EXTABLE(15b,100b)
31108+ _ASM_EXTABLE(16b,100b)
31109+ _ASM_EXTABLE(17b,100b)
31110+ _ASM_EXTABLE(18b,100b)
31111+ _ASM_EXTABLE(19b,100b)
31112+ _ASM_EXTABLE(20b,100b)
31113+ _ASM_EXTABLE(21b,100b)
31114+ _ASM_EXTABLE(22b,100b)
31115+ _ASM_EXTABLE(23b,100b)
31116+ _ASM_EXTABLE(24b,100b)
31117+ _ASM_EXTABLE(25b,100b)
31118+ _ASM_EXTABLE(26b,100b)
31119+ _ASM_EXTABLE(27b,100b)
31120+ _ASM_EXTABLE(28b,100b)
31121+ _ASM_EXTABLE(29b,100b)
31122+ _ASM_EXTABLE(30b,100b)
31123+ _ASM_EXTABLE(31b,100b)
31124+ _ASM_EXTABLE(32b,100b)
31125+ _ASM_EXTABLE(33b,100b)
31126+ _ASM_EXTABLE(34b,100b)
31127+ _ASM_EXTABLE(35b,100b)
31128+ _ASM_EXTABLE(36b,100b)
31129+ _ASM_EXTABLE(37b,100b)
31130+ _ASM_EXTABLE(99b,101b)
31131+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31132+ : "1"(to), "2"(from), "0"(size)
31133+ : "eax", "edx", "memory");
31134+ return size;
31135+}
31136+
31137+static unsigned long
31138+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31139+{
31140+ int d0, d1;
31141+ __asm__ __volatile__(
31142+ " .align 2,0x90\n"
31143+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31144+ " cmpl $67, %0\n"
31145+ " jbe 3f\n"
31146+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31147+ " .align 2,0x90\n"
31148+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31149+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31150+ "5: movl %%eax, 0(%3)\n"
31151+ "6: movl %%edx, 4(%3)\n"
31152+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31153+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31154+ "9: movl %%eax, 8(%3)\n"
31155+ "10: movl %%edx, 12(%3)\n"
31156+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31157+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31158+ "13: movl %%eax, 16(%3)\n"
31159+ "14: movl %%edx, 20(%3)\n"
31160+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31161+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31162+ "17: movl %%eax, 24(%3)\n"
31163+ "18: movl %%edx, 28(%3)\n"
31164+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31165+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31166+ "21: movl %%eax, 32(%3)\n"
31167+ "22: movl %%edx, 36(%3)\n"
31168+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31169+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31170+ "25: movl %%eax, 40(%3)\n"
31171+ "26: movl %%edx, 44(%3)\n"
31172+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31173+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31174+ "29: movl %%eax, 48(%3)\n"
31175+ "30: movl %%edx, 52(%3)\n"
31176+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31177+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31178+ "33: movl %%eax, 56(%3)\n"
31179+ "34: movl %%edx, 60(%3)\n"
31180+ " addl $-64, %0\n"
31181+ " addl $64, %4\n"
31182+ " addl $64, %3\n"
31183+ " cmpl $63, %0\n"
31184+ " ja 1b\n"
31185+ "35: movl %0, %%eax\n"
31186+ " shrl $2, %0\n"
31187+ " andl $3, %%eax\n"
31188+ " cld\n"
31189+ "99: rep; "__copyuser_seg" movsl\n"
31190+ "36: movl %%eax, %0\n"
31191+ "37: rep; "__copyuser_seg" movsb\n"
31192+ "100:\n"
31193 ".section .fixup,\"ax\"\n"
31194 "101: lea 0(%%eax,%0,4),%0\n"
31195 " jmp 100b\n"
31196@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31197 int d0, d1;
31198 __asm__ __volatile__(
31199 " .align 2,0x90\n"
31200- "0: movl 32(%4), %%eax\n"
31201+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31202 " cmpl $67, %0\n"
31203 " jbe 2f\n"
31204- "1: movl 64(%4), %%eax\n"
31205+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31206 " .align 2,0x90\n"
31207- "2: movl 0(%4), %%eax\n"
31208- "21: movl 4(%4), %%edx\n"
31209+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31210+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31211 " movl %%eax, 0(%3)\n"
31212 " movl %%edx, 4(%3)\n"
31213- "3: movl 8(%4), %%eax\n"
31214- "31: movl 12(%4),%%edx\n"
31215+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31216+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31217 " movl %%eax, 8(%3)\n"
31218 " movl %%edx, 12(%3)\n"
31219- "4: movl 16(%4), %%eax\n"
31220- "41: movl 20(%4), %%edx\n"
31221+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31222+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31223 " movl %%eax, 16(%3)\n"
31224 " movl %%edx, 20(%3)\n"
31225- "10: movl 24(%4), %%eax\n"
31226- "51: movl 28(%4), %%edx\n"
31227+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31228+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31229 " movl %%eax, 24(%3)\n"
31230 " movl %%edx, 28(%3)\n"
31231- "11: movl 32(%4), %%eax\n"
31232- "61: movl 36(%4), %%edx\n"
31233+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31234+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31235 " movl %%eax, 32(%3)\n"
31236 " movl %%edx, 36(%3)\n"
31237- "12: movl 40(%4), %%eax\n"
31238- "71: movl 44(%4), %%edx\n"
31239+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31240+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31241 " movl %%eax, 40(%3)\n"
31242 " movl %%edx, 44(%3)\n"
31243- "13: movl 48(%4), %%eax\n"
31244- "81: movl 52(%4), %%edx\n"
31245+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31246+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31247 " movl %%eax, 48(%3)\n"
31248 " movl %%edx, 52(%3)\n"
31249- "14: movl 56(%4), %%eax\n"
31250- "91: movl 60(%4), %%edx\n"
31251+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31252+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31253 " movl %%eax, 56(%3)\n"
31254 " movl %%edx, 60(%3)\n"
31255 " addl $-64, %0\n"
31256@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31257 " shrl $2, %0\n"
31258 " andl $3, %%eax\n"
31259 " cld\n"
31260- "6: rep; movsl\n"
31261+ "6: rep; "__copyuser_seg" movsl\n"
31262 " movl %%eax,%0\n"
31263- "7: rep; movsb\n"
31264+ "7: rep; "__copyuser_seg" movsb\n"
31265 "8:\n"
31266 ".section .fixup,\"ax\"\n"
31267 "9: lea 0(%%eax,%0,4),%0\n"
31268@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31269
31270 __asm__ __volatile__(
31271 " .align 2,0x90\n"
31272- "0: movl 32(%4), %%eax\n"
31273+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31274 " cmpl $67, %0\n"
31275 " jbe 2f\n"
31276- "1: movl 64(%4), %%eax\n"
31277+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31278 " .align 2,0x90\n"
31279- "2: movl 0(%4), %%eax\n"
31280- "21: movl 4(%4), %%edx\n"
31281+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31282+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31283 " movnti %%eax, 0(%3)\n"
31284 " movnti %%edx, 4(%3)\n"
31285- "3: movl 8(%4), %%eax\n"
31286- "31: movl 12(%4),%%edx\n"
31287+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31288+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31289 " movnti %%eax, 8(%3)\n"
31290 " movnti %%edx, 12(%3)\n"
31291- "4: movl 16(%4), %%eax\n"
31292- "41: movl 20(%4), %%edx\n"
31293+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31294+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31295 " movnti %%eax, 16(%3)\n"
31296 " movnti %%edx, 20(%3)\n"
31297- "10: movl 24(%4), %%eax\n"
31298- "51: movl 28(%4), %%edx\n"
31299+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31300+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31301 " movnti %%eax, 24(%3)\n"
31302 " movnti %%edx, 28(%3)\n"
31303- "11: movl 32(%4), %%eax\n"
31304- "61: movl 36(%4), %%edx\n"
31305+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31306+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31307 " movnti %%eax, 32(%3)\n"
31308 " movnti %%edx, 36(%3)\n"
31309- "12: movl 40(%4), %%eax\n"
31310- "71: movl 44(%4), %%edx\n"
31311+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31312+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31313 " movnti %%eax, 40(%3)\n"
31314 " movnti %%edx, 44(%3)\n"
31315- "13: movl 48(%4), %%eax\n"
31316- "81: movl 52(%4), %%edx\n"
31317+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31318+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31319 " movnti %%eax, 48(%3)\n"
31320 " movnti %%edx, 52(%3)\n"
31321- "14: movl 56(%4), %%eax\n"
31322- "91: movl 60(%4), %%edx\n"
31323+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31324+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31325 " movnti %%eax, 56(%3)\n"
31326 " movnti %%edx, 60(%3)\n"
31327 " addl $-64, %0\n"
31328@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31329 " shrl $2, %0\n"
31330 " andl $3, %%eax\n"
31331 " cld\n"
31332- "6: rep; movsl\n"
31333+ "6: rep; "__copyuser_seg" movsl\n"
31334 " movl %%eax,%0\n"
31335- "7: rep; movsb\n"
31336+ "7: rep; "__copyuser_seg" movsb\n"
31337 "8:\n"
31338 ".section .fixup,\"ax\"\n"
31339 "9: lea 0(%%eax,%0,4),%0\n"
31340@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31341
31342 __asm__ __volatile__(
31343 " .align 2,0x90\n"
31344- "0: movl 32(%4), %%eax\n"
31345+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31346 " cmpl $67, %0\n"
31347 " jbe 2f\n"
31348- "1: movl 64(%4), %%eax\n"
31349+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31350 " .align 2,0x90\n"
31351- "2: movl 0(%4), %%eax\n"
31352- "21: movl 4(%4), %%edx\n"
31353+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31354+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31355 " movnti %%eax, 0(%3)\n"
31356 " movnti %%edx, 4(%3)\n"
31357- "3: movl 8(%4), %%eax\n"
31358- "31: movl 12(%4),%%edx\n"
31359+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31360+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31361 " movnti %%eax, 8(%3)\n"
31362 " movnti %%edx, 12(%3)\n"
31363- "4: movl 16(%4), %%eax\n"
31364- "41: movl 20(%4), %%edx\n"
31365+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31366+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31367 " movnti %%eax, 16(%3)\n"
31368 " movnti %%edx, 20(%3)\n"
31369- "10: movl 24(%4), %%eax\n"
31370- "51: movl 28(%4), %%edx\n"
31371+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31372+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31373 " movnti %%eax, 24(%3)\n"
31374 " movnti %%edx, 28(%3)\n"
31375- "11: movl 32(%4), %%eax\n"
31376- "61: movl 36(%4), %%edx\n"
31377+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31378+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31379 " movnti %%eax, 32(%3)\n"
31380 " movnti %%edx, 36(%3)\n"
31381- "12: movl 40(%4), %%eax\n"
31382- "71: movl 44(%4), %%edx\n"
31383+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31384+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31385 " movnti %%eax, 40(%3)\n"
31386 " movnti %%edx, 44(%3)\n"
31387- "13: movl 48(%4), %%eax\n"
31388- "81: movl 52(%4), %%edx\n"
31389+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31390+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31391 " movnti %%eax, 48(%3)\n"
31392 " movnti %%edx, 52(%3)\n"
31393- "14: movl 56(%4), %%eax\n"
31394- "91: movl 60(%4), %%edx\n"
31395+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31396+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31397 " movnti %%eax, 56(%3)\n"
31398 " movnti %%edx, 60(%3)\n"
31399 " addl $-64, %0\n"
31400@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31401 " shrl $2, %0\n"
31402 " andl $3, %%eax\n"
31403 " cld\n"
31404- "6: rep; movsl\n"
31405+ "6: rep; "__copyuser_seg" movsl\n"
31406 " movl %%eax,%0\n"
31407- "7: rep; movsb\n"
31408+ "7: rep; "__copyuser_seg" movsb\n"
31409 "8:\n"
31410 ".section .fixup,\"ax\"\n"
31411 "9: lea 0(%%eax,%0,4),%0\n"
31412@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31413 */
31414 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31415 unsigned long size);
31416-unsigned long __copy_user_intel(void __user *to, const void *from,
31417+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31418+ unsigned long size);
31419+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31420 unsigned long size);
31421 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31422 const void __user *from, unsigned long size);
31423 #endif /* CONFIG_X86_INTEL_USERCOPY */
31424
31425 /* Generic arbitrary sized copy. */
31426-#define __copy_user(to, from, size) \
31427+#define __copy_user(to, from, size, prefix, set, restore) \
31428 do { \
31429 int __d0, __d1, __d2; \
31430 __asm__ __volatile__( \
31431+ set \
31432 " cmp $7,%0\n" \
31433 " jbe 1f\n" \
31434 " movl %1,%0\n" \
31435 " negl %0\n" \
31436 " andl $7,%0\n" \
31437 " subl %0,%3\n" \
31438- "4: rep; movsb\n" \
31439+ "4: rep; "prefix"movsb\n" \
31440 " movl %3,%0\n" \
31441 " shrl $2,%0\n" \
31442 " andl $3,%3\n" \
31443 " .align 2,0x90\n" \
31444- "0: rep; movsl\n" \
31445+ "0: rep; "prefix"movsl\n" \
31446 " movl %3,%0\n" \
31447- "1: rep; movsb\n" \
31448+ "1: rep; "prefix"movsb\n" \
31449 "2:\n" \
31450+ restore \
31451 ".section .fixup,\"ax\"\n" \
31452 "5: addl %3,%0\n" \
31453 " jmp 2b\n" \
31454@@ -538,14 +650,14 @@ do { \
31455 " negl %0\n" \
31456 " andl $7,%0\n" \
31457 " subl %0,%3\n" \
31458- "4: rep; movsb\n" \
31459+ "4: rep; "__copyuser_seg"movsb\n" \
31460 " movl %3,%0\n" \
31461 " shrl $2,%0\n" \
31462 " andl $3,%3\n" \
31463 " .align 2,0x90\n" \
31464- "0: rep; movsl\n" \
31465+ "0: rep; "__copyuser_seg"movsl\n" \
31466 " movl %3,%0\n" \
31467- "1: rep; movsb\n" \
31468+ "1: rep; "__copyuser_seg"movsb\n" \
31469 "2:\n" \
31470 ".section .fixup,\"ax\"\n" \
31471 "5: addl %3,%0\n" \
31472@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31473 {
31474 stac();
31475 if (movsl_is_ok(to, from, n))
31476- __copy_user(to, from, n);
31477+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31478 else
31479- n = __copy_user_intel(to, from, n);
31480+ n = __generic_copy_to_user_intel(to, from, n);
31481 clac();
31482 return n;
31483 }
31484@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31485 {
31486 stac();
31487 if (movsl_is_ok(to, from, n))
31488- __copy_user(to, from, n);
31489+ __copy_user(to, from, n, __copyuser_seg, "", "");
31490 else
31491- n = __copy_user_intel((void __user *)to,
31492- (const void *)from, n);
31493+ n = __generic_copy_from_user_intel(to, from, n);
31494 clac();
31495 return n;
31496 }
31497@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31498 if (n > 64 && cpu_has_xmm2)
31499 n = __copy_user_intel_nocache(to, from, n);
31500 else
31501- __copy_user(to, from, n);
31502+ __copy_user(to, from, n, __copyuser_seg, "", "");
31503 #else
31504- __copy_user(to, from, n);
31505+ __copy_user(to, from, n, __copyuser_seg, "", "");
31506 #endif
31507 clac();
31508 return n;
31509 }
31510 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31511
31512-/**
31513- * copy_to_user: - Copy a block of data into user space.
31514- * @to: Destination address, in user space.
31515- * @from: Source address, in kernel space.
31516- * @n: Number of bytes to copy.
31517- *
31518- * Context: User context only. This function may sleep.
31519- *
31520- * Copy data from kernel space to user space.
31521- *
31522- * Returns number of bytes that could not be copied.
31523- * On success, this will be zero.
31524- */
31525-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31526+#ifdef CONFIG_PAX_MEMORY_UDEREF
31527+void __set_fs(mm_segment_t x)
31528 {
31529- if (access_ok(VERIFY_WRITE, to, n))
31530- n = __copy_to_user(to, from, n);
31531- return n;
31532+ switch (x.seg) {
31533+ case 0:
31534+ loadsegment(gs, 0);
31535+ break;
31536+ case TASK_SIZE_MAX:
31537+ loadsegment(gs, __USER_DS);
31538+ break;
31539+ case -1UL:
31540+ loadsegment(gs, __KERNEL_DS);
31541+ break;
31542+ default:
31543+ BUG();
31544+ }
31545 }
31546-EXPORT_SYMBOL(_copy_to_user);
31547+EXPORT_SYMBOL(__set_fs);
31548
31549-/**
31550- * copy_from_user: - Copy a block of data from user space.
31551- * @to: Destination address, in kernel space.
31552- * @from: Source address, in user space.
31553- * @n: Number of bytes to copy.
31554- *
31555- * Context: User context only. This function may sleep.
31556- *
31557- * Copy data from user space to kernel space.
31558- *
31559- * Returns number of bytes that could not be copied.
31560- * On success, this will be zero.
31561- *
31562- * If some data could not be copied, this function will pad the copied
31563- * data to the requested size using zero bytes.
31564- */
31565-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31566+void set_fs(mm_segment_t x)
31567 {
31568- if (access_ok(VERIFY_READ, from, n))
31569- n = __copy_from_user(to, from, n);
31570- else
31571- memset(to, 0, n);
31572- return n;
31573+ current_thread_info()->addr_limit = x;
31574+ __set_fs(x);
31575 }
31576-EXPORT_SYMBOL(_copy_from_user);
31577+EXPORT_SYMBOL(set_fs);
31578+#endif
31579diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31580index c905e89..01ab928 100644
31581--- a/arch/x86/lib/usercopy_64.c
31582+++ b/arch/x86/lib/usercopy_64.c
31583@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31584 might_fault();
31585 /* no memory constraint because it doesn't change any memory gcc knows
31586 about */
31587+ pax_open_userland();
31588 stac();
31589 asm volatile(
31590 " testq %[size8],%[size8]\n"
31591@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31592 _ASM_EXTABLE(0b,3b)
31593 _ASM_EXTABLE(1b,2b)
31594 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31595- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31596+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31597 [zero] "r" (0UL), [eight] "r" (8UL));
31598 clac();
31599+ pax_close_userland();
31600 return size;
31601 }
31602 EXPORT_SYMBOL(__clear_user);
31603@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31604 }
31605 EXPORT_SYMBOL(clear_user);
31606
31607-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31608+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31609 {
31610- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31611- return copy_user_generic((__force void *)to, (__force void *)from, len);
31612- }
31613- return len;
31614+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31615+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31616+ return len;
31617 }
31618 EXPORT_SYMBOL(copy_in_user);
31619
31620@@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
31621 * it is not necessary to optimize tail handling.
31622 */
31623 __visible unsigned long
31624-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31625+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
31626 {
31627 char c;
31628 unsigned zero_len;
31629
31630+ clac();
31631+ pax_close_userland();
31632 for (; len; --len, to++) {
31633 if (__get_user_nocheck(c, from++, sizeof(char)))
31634 break;
31635@@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31636 for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
31637 if (__put_user_nocheck(c, to++, sizeof(char)))
31638 break;
31639- clac();
31640 return len;
31641 }
31642diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31643index 6a19ad9..1c48f9a 100644
31644--- a/arch/x86/mm/Makefile
31645+++ b/arch/x86/mm/Makefile
31646@@ -30,3 +30,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
31647 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31648
31649 obj-$(CONFIG_MEMTEST) += memtest.o
31650+
31651+quote:="
31652+obj-$(CONFIG_X86_64) += uderef_64.o
31653+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31654diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31655index 903ec1e..c4166b2 100644
31656--- a/arch/x86/mm/extable.c
31657+++ b/arch/x86/mm/extable.c
31658@@ -6,12 +6,24 @@
31659 static inline unsigned long
31660 ex_insn_addr(const struct exception_table_entry *x)
31661 {
31662- return (unsigned long)&x->insn + x->insn;
31663+ unsigned long reloc = 0;
31664+
31665+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31666+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31667+#endif
31668+
31669+ return (unsigned long)&x->insn + x->insn + reloc;
31670 }
31671 static inline unsigned long
31672 ex_fixup_addr(const struct exception_table_entry *x)
31673 {
31674- return (unsigned long)&x->fixup + x->fixup;
31675+ unsigned long reloc = 0;
31676+
31677+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31678+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31679+#endif
31680+
31681+ return (unsigned long)&x->fixup + x->fixup + reloc;
31682 }
31683
31684 int fixup_exception(struct pt_regs *regs)
31685@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31686 unsigned long new_ip;
31687
31688 #ifdef CONFIG_PNPBIOS
31689- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31690+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31691 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31692 extern u32 pnp_bios_is_utter_crap;
31693 pnp_bios_is_utter_crap = 1;
31694@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31695 i += 4;
31696 p->fixup -= i;
31697 i += 4;
31698+
31699+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31700+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31701+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31702+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31703+#endif
31704+
31705 }
31706 }
31707
31708diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31709index d973e61..fb868e9 100644
31710--- a/arch/x86/mm/fault.c
31711+++ b/arch/x86/mm/fault.c
31712@@ -13,12 +13,19 @@
31713 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31714 #include <linux/prefetch.h> /* prefetchw */
31715 #include <linux/context_tracking.h> /* exception_enter(), ... */
31716+#include <linux/unistd.h>
31717+#include <linux/compiler.h>
31718
31719 #include <asm/traps.h> /* dotraplinkage, ... */
31720 #include <asm/pgalloc.h> /* pgd_*(), ... */
31721 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31722 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31723 #include <asm/vsyscall.h> /* emulate_vsyscall */
31724+#include <asm/tlbflush.h>
31725+
31726+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31727+#include <asm/stacktrace.h>
31728+#endif
31729
31730 #define CREATE_TRACE_POINTS
31731 #include <asm/trace/exceptions.h>
31732@@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
31733 int ret = 0;
31734
31735 /* kprobe_running() needs smp_processor_id() */
31736- if (kprobes_built_in() && !user_mode_vm(regs)) {
31737+ if (kprobes_built_in() && !user_mode(regs)) {
31738 preempt_disable();
31739 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31740 ret = 1;
31741@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31742 return !instr_lo || (instr_lo>>1) == 1;
31743 case 0x00:
31744 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31745- if (probe_kernel_address(instr, opcode))
31746+ if (user_mode(regs)) {
31747+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31748+ return 0;
31749+ } else if (probe_kernel_address(instr, opcode))
31750 return 0;
31751
31752 *prefetch = (instr_lo == 0xF) &&
31753@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31754 while (instr < max_instr) {
31755 unsigned char opcode;
31756
31757- if (probe_kernel_address(instr, opcode))
31758+ if (user_mode(regs)) {
31759+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31760+ break;
31761+ } else if (probe_kernel_address(instr, opcode))
31762 break;
31763
31764 instr++;
31765@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31766 force_sig_info(si_signo, &info, tsk);
31767 }
31768
31769+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31770+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31771+#endif
31772+
31773+#ifdef CONFIG_PAX_EMUTRAMP
31774+static int pax_handle_fetch_fault(struct pt_regs *regs);
31775+#endif
31776+
31777+#ifdef CONFIG_PAX_PAGEEXEC
31778+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31779+{
31780+ pgd_t *pgd;
31781+ pud_t *pud;
31782+ pmd_t *pmd;
31783+
31784+ pgd = pgd_offset(mm, address);
31785+ if (!pgd_present(*pgd))
31786+ return NULL;
31787+ pud = pud_offset(pgd, address);
31788+ if (!pud_present(*pud))
31789+ return NULL;
31790+ pmd = pmd_offset(pud, address);
31791+ if (!pmd_present(*pmd))
31792+ return NULL;
31793+ return pmd;
31794+}
31795+#endif
31796+
31797 DEFINE_SPINLOCK(pgd_lock);
31798 LIST_HEAD(pgd_list);
31799
31800@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31801 for (address = VMALLOC_START & PMD_MASK;
31802 address >= TASK_SIZE && address < FIXADDR_TOP;
31803 address += PMD_SIZE) {
31804+
31805+#ifdef CONFIG_PAX_PER_CPU_PGD
31806+ unsigned long cpu;
31807+#else
31808 struct page *page;
31809+#endif
31810
31811 spin_lock(&pgd_lock);
31812+
31813+#ifdef CONFIG_PAX_PER_CPU_PGD
31814+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31815+ pgd_t *pgd = get_cpu_pgd(cpu, user);
31816+ pmd_t *ret;
31817+
31818+ ret = vmalloc_sync_one(pgd, address);
31819+ if (!ret)
31820+ break;
31821+ pgd = get_cpu_pgd(cpu, kernel);
31822+#else
31823 list_for_each_entry(page, &pgd_list, lru) {
31824+ pgd_t *pgd;
31825 spinlock_t *pgt_lock;
31826 pmd_t *ret;
31827
31828@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31829 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31830
31831 spin_lock(pgt_lock);
31832- ret = vmalloc_sync_one(page_address(page), address);
31833+ pgd = page_address(page);
31834+#endif
31835+
31836+ ret = vmalloc_sync_one(pgd, address);
31837+
31838+#ifndef CONFIG_PAX_PER_CPU_PGD
31839 spin_unlock(pgt_lock);
31840+#endif
31841
31842 if (!ret)
31843 break;
31844@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
31845 * an interrupt in the middle of a task switch..
31846 */
31847 pgd_paddr = read_cr3();
31848+
31849+#ifdef CONFIG_PAX_PER_CPU_PGD
31850+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31851+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31852+#endif
31853+
31854 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31855 if (!pmd_k)
31856 return -1;
31857@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
31858 * happen within a race in page table update. In the later
31859 * case just flush:
31860 */
31861- pgd = pgd_offset(current->active_mm, address);
31862+
31863 pgd_ref = pgd_offset_k(address);
31864 if (pgd_none(*pgd_ref))
31865 return -1;
31866
31867+#ifdef CONFIG_PAX_PER_CPU_PGD
31868+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31869+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31870+ if (pgd_none(*pgd)) {
31871+ set_pgd(pgd, *pgd_ref);
31872+ arch_flush_lazy_mmu_mode();
31873+ } else {
31874+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31875+ }
31876+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31877+#else
31878+ pgd = pgd_offset(current->active_mm, address);
31879+#endif
31880+
31881 if (pgd_none(*pgd)) {
31882 set_pgd(pgd, *pgd_ref);
31883 arch_flush_lazy_mmu_mode();
31884@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31885 static int is_errata100(struct pt_regs *regs, unsigned long address)
31886 {
31887 #ifdef CONFIG_X86_64
31888- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31889+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31890 return 1;
31891 #endif
31892 return 0;
31893@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31894 }
31895
31896 static const char nx_warning[] = KERN_CRIT
31897-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31898+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31899 static const char smep_warning[] = KERN_CRIT
31900-"unable to execute userspace code (SMEP?) (uid: %d)\n";
31901+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
31902
31903 static void
31904 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31905@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31906 if (!oops_may_print())
31907 return;
31908
31909- if (error_code & PF_INSTR) {
31910+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31911 unsigned int level;
31912 pgd_t *pgd;
31913 pte_t *pte;
31914@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31915 pte = lookup_address_in_pgd(pgd, address, &level);
31916
31917 if (pte && pte_present(*pte) && !pte_exec(*pte))
31918- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31919+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31920 if (pte && pte_present(*pte) && pte_exec(*pte) &&
31921 (pgd_flags(*pgd) & _PAGE_USER) &&
31922 (read_cr4() & X86_CR4_SMEP))
31923- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
31924+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31925 }
31926
31927+#ifdef CONFIG_PAX_KERNEXEC
31928+ if (init_mm.start_code <= address && address < init_mm.end_code) {
31929+ if (current->signal->curr_ip)
31930+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
31931+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
31932+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31933+ else
31934+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
31935+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31936+ }
31937+#endif
31938+
31939 printk(KERN_ALERT "BUG: unable to handle kernel ");
31940 if (address < PAGE_SIZE)
31941 printk(KERN_CONT "NULL pointer dereference");
31942@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
31943 return;
31944 }
31945 #endif
31946+
31947+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31948+ if (pax_is_fetch_fault(regs, error_code, address)) {
31949+
31950+#ifdef CONFIG_PAX_EMUTRAMP
31951+ switch (pax_handle_fetch_fault(regs)) {
31952+ case 2:
31953+ return;
31954+ }
31955+#endif
31956+
31957+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31958+ do_group_exit(SIGKILL);
31959+ }
31960+#endif
31961+
31962 /* Kernel addresses are always protection faults: */
31963 if (address >= TASK_SIZE)
31964 error_code |= PF_PROT;
31965@@ -867,7 +979,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
31966 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
31967 printk(KERN_ERR
31968 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
31969- tsk->comm, tsk->pid, address);
31970+ tsk->comm, task_pid_nr(tsk), address);
31971 code = BUS_MCEERR_AR;
31972 }
31973 #endif
31974@@ -921,6 +1033,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
31975 return 1;
31976 }
31977
31978+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
31979+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
31980+{
31981+ pte_t *pte;
31982+ pmd_t *pmd;
31983+ spinlock_t *ptl;
31984+ unsigned char pte_mask;
31985+
31986+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
31987+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
31988+ return 0;
31989+
31990+ /* PaX: it's our fault, let's handle it if we can */
31991+
31992+ /* PaX: take a look at read faults before acquiring any locks */
31993+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
31994+ /* instruction fetch attempt from a protected page in user mode */
31995+ up_read(&mm->mmap_sem);
31996+
31997+#ifdef CONFIG_PAX_EMUTRAMP
31998+ switch (pax_handle_fetch_fault(regs)) {
31999+ case 2:
32000+ return 1;
32001+ }
32002+#endif
32003+
32004+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32005+ do_group_exit(SIGKILL);
32006+ }
32007+
32008+ pmd = pax_get_pmd(mm, address);
32009+ if (unlikely(!pmd))
32010+ return 0;
32011+
32012+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32013+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32014+ pte_unmap_unlock(pte, ptl);
32015+ return 0;
32016+ }
32017+
32018+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32019+ /* write attempt to a protected page in user mode */
32020+ pte_unmap_unlock(pte, ptl);
32021+ return 0;
32022+ }
32023+
32024+#ifdef CONFIG_SMP
32025+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
32026+#else
32027+ if (likely(address > get_limit(regs->cs)))
32028+#endif
32029+ {
32030+ set_pte(pte, pte_mkread(*pte));
32031+ __flush_tlb_one(address);
32032+ pte_unmap_unlock(pte, ptl);
32033+ up_read(&mm->mmap_sem);
32034+ return 1;
32035+ }
32036+
32037+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32038+
32039+ /*
32040+ * PaX: fill DTLB with user rights and retry
32041+ */
32042+ __asm__ __volatile__ (
32043+ "orb %2,(%1)\n"
32044+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32045+/*
32046+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32047+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32048+ * page fault when examined during a TLB load attempt. this is true not only
32049+ * for PTEs holding a non-present entry but also present entries that will
32050+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32051+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32052+ * for our target pages since their PTEs are simply not in the TLBs at all.
32053+
32054+ * the best thing in omitting it is that we gain around 15-20% speed in the
32055+ * fast path of the page fault handler and can get rid of tracing since we
32056+ * can no longer flush unintended entries.
32057+ */
32058+ "invlpg (%0)\n"
32059+#endif
32060+ __copyuser_seg"testb $0,(%0)\n"
32061+ "xorb %3,(%1)\n"
32062+ :
32063+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32064+ : "memory", "cc");
32065+ pte_unmap_unlock(pte, ptl);
32066+ up_read(&mm->mmap_sem);
32067+ return 1;
32068+}
32069+#endif
32070+
32071 /*
32072 * Handle a spurious fault caused by a stale TLB entry.
32073 *
32074@@ -1006,6 +1211,9 @@ int show_unhandled_signals = 1;
32075 static inline int
32076 access_error(unsigned long error_code, struct vm_area_struct *vma)
32077 {
32078+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32079+ return 1;
32080+
32081 if (error_code & PF_WRITE) {
32082 /* write, present and write, not present: */
32083 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32084@@ -1040,7 +1248,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
32085 if (error_code & PF_USER)
32086 return false;
32087
32088- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
32089+ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
32090 return false;
32091
32092 return true;
32093@@ -1068,6 +1276,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32094 tsk = current;
32095 mm = tsk->mm;
32096
32097+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32098+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32099+ if (!search_exception_tables(regs->ip)) {
32100+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32101+ bad_area_nosemaphore(regs, error_code, address);
32102+ return;
32103+ }
32104+ if (address < pax_user_shadow_base) {
32105+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32106+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
32107+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
32108+ } else
32109+ address -= pax_user_shadow_base;
32110+ }
32111+#endif
32112+
32113 /*
32114 * Detect and handle instructions that would cause a page fault for
32115 * both a tracked kernel page and a userspace page.
32116@@ -1145,7 +1369,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32117 * User-mode registers count as a user access even for any
32118 * potential system fault or CPU buglet:
32119 */
32120- if (user_mode_vm(regs)) {
32121+ if (user_mode(regs)) {
32122 local_irq_enable();
32123 error_code |= PF_USER;
32124 flags |= FAULT_FLAG_USER;
32125@@ -1192,6 +1416,11 @@ retry:
32126 might_sleep();
32127 }
32128
32129+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32130+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32131+ return;
32132+#endif
32133+
32134 vma = find_vma(mm, address);
32135 if (unlikely(!vma)) {
32136 bad_area(regs, error_code, address);
32137@@ -1203,18 +1432,24 @@ retry:
32138 bad_area(regs, error_code, address);
32139 return;
32140 }
32141- if (error_code & PF_USER) {
32142- /*
32143- * Accessing the stack below %sp is always a bug.
32144- * The large cushion allows instructions like enter
32145- * and pusha to work. ("enter $65535, $31" pushes
32146- * 32 pointers and then decrements %sp by 65535.)
32147- */
32148- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32149- bad_area(regs, error_code, address);
32150- return;
32151- }
32152+ /*
32153+ * Accessing the stack below %sp is always a bug.
32154+ * The large cushion allows instructions like enter
32155+ * and pusha to work. ("enter $65535, $31" pushes
32156+ * 32 pointers and then decrements %sp by 65535.)
32157+ */
32158+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32159+ bad_area(regs, error_code, address);
32160+ return;
32161 }
32162+
32163+#ifdef CONFIG_PAX_SEGMEXEC
32164+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32165+ bad_area(regs, error_code, address);
32166+ return;
32167+ }
32168+#endif
32169+
32170 if (unlikely(expand_stack(vma, address))) {
32171 bad_area(regs, error_code, address);
32172 return;
32173@@ -1331,3 +1566,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32174 }
32175 NOKPROBE_SYMBOL(trace_do_page_fault);
32176 #endif /* CONFIG_TRACING */
32177+
32178+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32179+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32180+{
32181+ struct mm_struct *mm = current->mm;
32182+ unsigned long ip = regs->ip;
32183+
32184+ if (v8086_mode(regs))
32185+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32186+
32187+#ifdef CONFIG_PAX_PAGEEXEC
32188+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32189+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32190+ return true;
32191+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32192+ return true;
32193+ return false;
32194+ }
32195+#endif
32196+
32197+#ifdef CONFIG_PAX_SEGMEXEC
32198+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32199+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32200+ return true;
32201+ return false;
32202+ }
32203+#endif
32204+
32205+ return false;
32206+}
32207+#endif
32208+
32209+#ifdef CONFIG_PAX_EMUTRAMP
32210+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32211+{
32212+ int err;
32213+
32214+ do { /* PaX: libffi trampoline emulation */
32215+ unsigned char mov, jmp;
32216+ unsigned int addr1, addr2;
32217+
32218+#ifdef CONFIG_X86_64
32219+ if ((regs->ip + 9) >> 32)
32220+ break;
32221+#endif
32222+
32223+ err = get_user(mov, (unsigned char __user *)regs->ip);
32224+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32225+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32226+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32227+
32228+ if (err)
32229+ break;
32230+
32231+ if (mov == 0xB8 && jmp == 0xE9) {
32232+ regs->ax = addr1;
32233+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32234+ return 2;
32235+ }
32236+ } while (0);
32237+
32238+ do { /* PaX: gcc trampoline emulation #1 */
32239+ unsigned char mov1, mov2;
32240+ unsigned short jmp;
32241+ unsigned int addr1, addr2;
32242+
32243+#ifdef CONFIG_X86_64
32244+ if ((regs->ip + 11) >> 32)
32245+ break;
32246+#endif
32247+
32248+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32249+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32250+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32251+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32252+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32253+
32254+ if (err)
32255+ break;
32256+
32257+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32258+ regs->cx = addr1;
32259+ regs->ax = addr2;
32260+ regs->ip = addr2;
32261+ return 2;
32262+ }
32263+ } while (0);
32264+
32265+ do { /* PaX: gcc trampoline emulation #2 */
32266+ unsigned char mov, jmp;
32267+ unsigned int addr1, addr2;
32268+
32269+#ifdef CONFIG_X86_64
32270+ if ((regs->ip + 9) >> 32)
32271+ break;
32272+#endif
32273+
32274+ err = get_user(mov, (unsigned char __user *)regs->ip);
32275+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32276+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32277+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32278+
32279+ if (err)
32280+ break;
32281+
32282+ if (mov == 0xB9 && jmp == 0xE9) {
32283+ regs->cx = addr1;
32284+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32285+ return 2;
32286+ }
32287+ } while (0);
32288+
32289+ return 1; /* PaX in action */
32290+}
32291+
32292+#ifdef CONFIG_X86_64
32293+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32294+{
32295+ int err;
32296+
32297+ do { /* PaX: libffi trampoline emulation */
32298+ unsigned short mov1, mov2, jmp1;
32299+ unsigned char stcclc, jmp2;
32300+ unsigned long addr1, addr2;
32301+
32302+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32303+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32304+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32305+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32306+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32307+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32308+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32309+
32310+ if (err)
32311+ break;
32312+
32313+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32314+ regs->r11 = addr1;
32315+ regs->r10 = addr2;
32316+ if (stcclc == 0xF8)
32317+ regs->flags &= ~X86_EFLAGS_CF;
32318+ else
32319+ regs->flags |= X86_EFLAGS_CF;
32320+ regs->ip = addr1;
32321+ return 2;
32322+ }
32323+ } while (0);
32324+
32325+ do { /* PaX: gcc trampoline emulation #1 */
32326+ unsigned short mov1, mov2, jmp1;
32327+ unsigned char jmp2;
32328+ unsigned int addr1;
32329+ unsigned long addr2;
32330+
32331+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32332+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32333+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32334+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32335+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32336+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32337+
32338+ if (err)
32339+ break;
32340+
32341+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32342+ regs->r11 = addr1;
32343+ regs->r10 = addr2;
32344+ regs->ip = addr1;
32345+ return 2;
32346+ }
32347+ } while (0);
32348+
32349+ do { /* PaX: gcc trampoline emulation #2 */
32350+ unsigned short mov1, mov2, jmp1;
32351+ unsigned char jmp2;
32352+ unsigned long addr1, addr2;
32353+
32354+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32355+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32356+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32357+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32358+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32359+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32360+
32361+ if (err)
32362+ break;
32363+
32364+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32365+ regs->r11 = addr1;
32366+ regs->r10 = addr2;
32367+ regs->ip = addr1;
32368+ return 2;
32369+ }
32370+ } while (0);
32371+
32372+ return 1; /* PaX in action */
32373+}
32374+#endif
32375+
32376+/*
32377+ * PaX: decide what to do with offenders (regs->ip = fault address)
32378+ *
32379+ * returns 1 when task should be killed
32380+ * 2 when gcc trampoline was detected
32381+ */
32382+static int pax_handle_fetch_fault(struct pt_regs *regs)
32383+{
32384+ if (v8086_mode(regs))
32385+ return 1;
32386+
32387+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32388+ return 1;
32389+
32390+#ifdef CONFIG_X86_32
32391+ return pax_handle_fetch_fault_32(regs);
32392+#else
32393+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32394+ return pax_handle_fetch_fault_32(regs);
32395+ else
32396+ return pax_handle_fetch_fault_64(regs);
32397+#endif
32398+}
32399+#endif
32400+
32401+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32402+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32403+{
32404+ long i;
32405+
32406+ printk(KERN_ERR "PAX: bytes at PC: ");
32407+ for (i = 0; i < 20; i++) {
32408+ unsigned char c;
32409+ if (get_user(c, (unsigned char __force_user *)pc+i))
32410+ printk(KERN_CONT "?? ");
32411+ else
32412+ printk(KERN_CONT "%02x ", c);
32413+ }
32414+ printk("\n");
32415+
32416+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32417+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32418+ unsigned long c;
32419+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32420+#ifdef CONFIG_X86_32
32421+ printk(KERN_CONT "???????? ");
32422+#else
32423+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32424+ printk(KERN_CONT "???????? ???????? ");
32425+ else
32426+ printk(KERN_CONT "???????????????? ");
32427+#endif
32428+ } else {
32429+#ifdef CONFIG_X86_64
32430+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32431+ printk(KERN_CONT "%08x ", (unsigned int)c);
32432+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32433+ } else
32434+#endif
32435+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32436+ }
32437+ }
32438+ printk("\n");
32439+}
32440+#endif
32441+
32442+/**
32443+ * probe_kernel_write(): safely attempt to write to a location
32444+ * @dst: address to write to
32445+ * @src: pointer to the data that shall be written
32446+ * @size: size of the data chunk
32447+ *
32448+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32449+ * happens, handle that and return -EFAULT.
32450+ */
32451+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32452+{
32453+ long ret;
32454+ mm_segment_t old_fs = get_fs();
32455+
32456+ set_fs(KERNEL_DS);
32457+ pagefault_disable();
32458+ pax_open_kernel();
32459+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32460+ pax_close_kernel();
32461+ pagefault_enable();
32462+ set_fs(old_fs);
32463+
32464+ return ret ? -EFAULT : 0;
32465+}
32466diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32467index 207d9aef..69030980 100644
32468--- a/arch/x86/mm/gup.c
32469+++ b/arch/x86/mm/gup.c
32470@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32471 addr = start;
32472 len = (unsigned long) nr_pages << PAGE_SHIFT;
32473 end = start + len;
32474- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32475+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32476 (void __user *)start, len)))
32477 return 0;
32478
32479@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32480 goto slow_irqon;
32481 #endif
32482
32483+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32484+ (void __user *)start, len)))
32485+ return 0;
32486+
32487 /*
32488 * XXX: batch / limit 'nr', to avoid large irq off latency
32489 * needs some instrumenting to determine the common sizes used by
32490diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32491index 4500142..53a363c 100644
32492--- a/arch/x86/mm/highmem_32.c
32493+++ b/arch/x86/mm/highmem_32.c
32494@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32495 idx = type + KM_TYPE_NR*smp_processor_id();
32496 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32497 BUG_ON(!pte_none(*(kmap_pte-idx)));
32498+
32499+ pax_open_kernel();
32500 set_pte(kmap_pte-idx, mk_pte(page, prot));
32501+ pax_close_kernel();
32502+
32503 arch_flush_lazy_mmu_mode();
32504
32505 return (void *)vaddr;
32506diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32507index 8b977eb..4732c33 100644
32508--- a/arch/x86/mm/hugetlbpage.c
32509+++ b/arch/x86/mm/hugetlbpage.c
32510@@ -80,23 +80,24 @@ int pud_huge(pud_t pud)
32511 #ifdef CONFIG_HUGETLB_PAGE
32512 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32513 unsigned long addr, unsigned long len,
32514- unsigned long pgoff, unsigned long flags)
32515+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32516 {
32517 struct hstate *h = hstate_file(file);
32518 struct vm_unmapped_area_info info;
32519-
32520+
32521 info.flags = 0;
32522 info.length = len;
32523 info.low_limit = current->mm->mmap_legacy_base;
32524 info.high_limit = TASK_SIZE;
32525 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32526 info.align_offset = 0;
32527+ info.threadstack_offset = offset;
32528 return vm_unmapped_area(&info);
32529 }
32530
32531 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32532 unsigned long addr0, unsigned long len,
32533- unsigned long pgoff, unsigned long flags)
32534+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32535 {
32536 struct hstate *h = hstate_file(file);
32537 struct vm_unmapped_area_info info;
32538@@ -108,6 +109,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32539 info.high_limit = current->mm->mmap_base;
32540 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32541 info.align_offset = 0;
32542+ info.threadstack_offset = offset;
32543 addr = vm_unmapped_area(&info);
32544
32545 /*
32546@@ -120,6 +122,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32547 VM_BUG_ON(addr != -ENOMEM);
32548 info.flags = 0;
32549 info.low_limit = TASK_UNMAPPED_BASE;
32550+
32551+#ifdef CONFIG_PAX_RANDMMAP
32552+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32553+ info.low_limit += current->mm->delta_mmap;
32554+#endif
32555+
32556 info.high_limit = TASK_SIZE;
32557 addr = vm_unmapped_area(&info);
32558 }
32559@@ -134,10 +142,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32560 struct hstate *h = hstate_file(file);
32561 struct mm_struct *mm = current->mm;
32562 struct vm_area_struct *vma;
32563+ unsigned long pax_task_size = TASK_SIZE;
32564+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32565
32566 if (len & ~huge_page_mask(h))
32567 return -EINVAL;
32568- if (len > TASK_SIZE)
32569+
32570+#ifdef CONFIG_PAX_SEGMEXEC
32571+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32572+ pax_task_size = SEGMEXEC_TASK_SIZE;
32573+#endif
32574+
32575+ pax_task_size -= PAGE_SIZE;
32576+
32577+ if (len > pax_task_size)
32578 return -ENOMEM;
32579
32580 if (flags & MAP_FIXED) {
32581@@ -146,19 +164,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32582 return addr;
32583 }
32584
32585+#ifdef CONFIG_PAX_RANDMMAP
32586+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32587+#endif
32588+
32589 if (addr) {
32590 addr = ALIGN(addr, huge_page_size(h));
32591 vma = find_vma(mm, addr);
32592- if (TASK_SIZE - len >= addr &&
32593- (!vma || addr + len <= vma->vm_start))
32594+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32595 return addr;
32596 }
32597 if (mm->get_unmapped_area == arch_get_unmapped_area)
32598 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32599- pgoff, flags);
32600+ pgoff, flags, offset);
32601 else
32602 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32603- pgoff, flags);
32604+ pgoff, flags, offset);
32605 }
32606 #endif /* CONFIG_HUGETLB_PAGE */
32607
32608diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32609index 66dba36..f8082ec 100644
32610--- a/arch/x86/mm/init.c
32611+++ b/arch/x86/mm/init.c
32612@@ -4,6 +4,7 @@
32613 #include <linux/swap.h>
32614 #include <linux/memblock.h>
32615 #include <linux/bootmem.h> /* for max_low_pfn */
32616+#include <linux/tboot.h>
32617
32618 #include <asm/cacheflush.h>
32619 #include <asm/e820.h>
32620@@ -17,6 +18,8 @@
32621 #include <asm/proto.h>
32622 #include <asm/dma.h> /* for MAX_DMA_PFN */
32623 #include <asm/microcode.h>
32624+#include <asm/desc.h>
32625+#include <asm/bios_ebda.h>
32626
32627 /*
32628 * We need to define the tracepoints somewhere, and tlb.c
32629@@ -570,7 +573,18 @@ void __init init_mem_mapping(void)
32630 early_ioremap_page_table_range_init();
32631 #endif
32632
32633+#ifdef CONFIG_PAX_PER_CPU_PGD
32634+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32635+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32636+ KERNEL_PGD_PTRS);
32637+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32638+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32639+ KERNEL_PGD_PTRS);
32640+ load_cr3(get_cpu_pgd(0, kernel));
32641+#else
32642 load_cr3(swapper_pg_dir);
32643+#endif
32644+
32645 __flush_tlb_all();
32646
32647 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32648@@ -586,10 +600,40 @@ void __init init_mem_mapping(void)
32649 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32650 * mmio resources as well as potential bios/acpi data regions.
32651 */
32652+
32653+#ifdef CONFIG_GRKERNSEC_KMEM
32654+static unsigned int ebda_start __read_only;
32655+static unsigned int ebda_end __read_only;
32656+#endif
32657+
32658 int devmem_is_allowed(unsigned long pagenr)
32659 {
32660- if (pagenr < 256)
32661+#ifdef CONFIG_GRKERNSEC_KMEM
32662+ /* allow BDA */
32663+ if (!pagenr)
32664 return 1;
32665+ /* allow EBDA */
32666+ if (pagenr >= ebda_start && pagenr < ebda_end)
32667+ return 1;
32668+ /* if tboot is in use, allow access to its hardcoded serial log range */
32669+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32670+ return 1;
32671+#else
32672+ if (!pagenr)
32673+ return 1;
32674+#ifdef CONFIG_VM86
32675+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32676+ return 1;
32677+#endif
32678+#endif
32679+
32680+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32681+ return 1;
32682+#ifdef CONFIG_GRKERNSEC_KMEM
32683+ /* throw out everything else below 1MB */
32684+ if (pagenr <= 256)
32685+ return 0;
32686+#endif
32687 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32688 return 0;
32689 if (!page_is_ram(pagenr))
32690@@ -635,8 +679,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32691 #endif
32692 }
32693
32694+#ifdef CONFIG_GRKERNSEC_KMEM
32695+static inline void gr_init_ebda(void)
32696+{
32697+ unsigned int ebda_addr;
32698+ unsigned int ebda_size = 0;
32699+
32700+ ebda_addr = get_bios_ebda();
32701+ if (ebda_addr) {
32702+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32703+ ebda_size <<= 10;
32704+ }
32705+ if (ebda_addr && ebda_size) {
32706+ ebda_start = ebda_addr >> PAGE_SHIFT;
32707+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32708+ } else {
32709+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32710+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32711+ }
32712+}
32713+#else
32714+static inline void gr_init_ebda(void) { }
32715+#endif
32716+
32717 void free_initmem(void)
32718 {
32719+#ifdef CONFIG_PAX_KERNEXEC
32720+#ifdef CONFIG_X86_32
32721+ /* PaX: limit KERNEL_CS to actual size */
32722+ unsigned long addr, limit;
32723+ struct desc_struct d;
32724+ int cpu;
32725+#else
32726+ pgd_t *pgd;
32727+ pud_t *pud;
32728+ pmd_t *pmd;
32729+ unsigned long addr, end;
32730+#endif
32731+#endif
32732+
32733+ gr_init_ebda();
32734+
32735+#ifdef CONFIG_PAX_KERNEXEC
32736+#ifdef CONFIG_X86_32
32737+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32738+ limit = (limit - 1UL) >> PAGE_SHIFT;
32739+
32740+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32741+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32742+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32743+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32744+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32745+ }
32746+
32747+ /* PaX: make KERNEL_CS read-only */
32748+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32749+ if (!paravirt_enabled())
32750+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32751+/*
32752+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32753+ pgd = pgd_offset_k(addr);
32754+ pud = pud_offset(pgd, addr);
32755+ pmd = pmd_offset(pud, addr);
32756+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32757+ }
32758+*/
32759+#ifdef CONFIG_X86_PAE
32760+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32761+/*
32762+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32763+ pgd = pgd_offset_k(addr);
32764+ pud = pud_offset(pgd, addr);
32765+ pmd = pmd_offset(pud, addr);
32766+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32767+ }
32768+*/
32769+#endif
32770+
32771+#ifdef CONFIG_MODULES
32772+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32773+#endif
32774+
32775+#else
32776+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32777+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32778+ pgd = pgd_offset_k(addr);
32779+ pud = pud_offset(pgd, addr);
32780+ pmd = pmd_offset(pud, addr);
32781+ if (!pmd_present(*pmd))
32782+ continue;
32783+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32784+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32785+ else
32786+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32787+ }
32788+
32789+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32790+ end = addr + KERNEL_IMAGE_SIZE;
32791+ for (; addr < end; addr += PMD_SIZE) {
32792+ pgd = pgd_offset_k(addr);
32793+ pud = pud_offset(pgd, addr);
32794+ pmd = pmd_offset(pud, addr);
32795+ if (!pmd_present(*pmd))
32796+ continue;
32797+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32798+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32799+ }
32800+#endif
32801+
32802+ flush_tlb_all();
32803+#endif
32804+
32805 free_init_pages("unused kernel",
32806 (unsigned long)(&__init_begin),
32807 (unsigned long)(&__init_end));
32808diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32809index c8140e1..59257fc 100644
32810--- a/arch/x86/mm/init_32.c
32811+++ b/arch/x86/mm/init_32.c
32812@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32813 bool __read_mostly __vmalloc_start_set = false;
32814
32815 /*
32816- * Creates a middle page table and puts a pointer to it in the
32817- * given global directory entry. This only returns the gd entry
32818- * in non-PAE compilation mode, since the middle layer is folded.
32819- */
32820-static pmd_t * __init one_md_table_init(pgd_t *pgd)
32821-{
32822- pud_t *pud;
32823- pmd_t *pmd_table;
32824-
32825-#ifdef CONFIG_X86_PAE
32826- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32827- pmd_table = (pmd_t *)alloc_low_page();
32828- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32829- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32830- pud = pud_offset(pgd, 0);
32831- BUG_ON(pmd_table != pmd_offset(pud, 0));
32832-
32833- return pmd_table;
32834- }
32835-#endif
32836- pud = pud_offset(pgd, 0);
32837- pmd_table = pmd_offset(pud, 0);
32838-
32839- return pmd_table;
32840-}
32841-
32842-/*
32843 * Create a page table and place a pointer to it in a middle page
32844 * directory entry:
32845 */
32846@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32847 pte_t *page_table = (pte_t *)alloc_low_page();
32848
32849 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32850+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32851+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32852+#else
32853 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32854+#endif
32855 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32856 }
32857
32858 return pte_offset_kernel(pmd, 0);
32859 }
32860
32861+static pmd_t * __init one_md_table_init(pgd_t *pgd)
32862+{
32863+ pud_t *pud;
32864+ pmd_t *pmd_table;
32865+
32866+ pud = pud_offset(pgd, 0);
32867+ pmd_table = pmd_offset(pud, 0);
32868+
32869+ return pmd_table;
32870+}
32871+
32872 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32873 {
32874 int pgd_idx = pgd_index(vaddr);
32875@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32876 int pgd_idx, pmd_idx;
32877 unsigned long vaddr;
32878 pgd_t *pgd;
32879+ pud_t *pud;
32880 pmd_t *pmd;
32881 pte_t *pte = NULL;
32882 unsigned long count = page_table_range_init_count(start, end);
32883@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32884 pgd = pgd_base + pgd_idx;
32885
32886 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32887- pmd = one_md_table_init(pgd);
32888- pmd = pmd + pmd_index(vaddr);
32889+ pud = pud_offset(pgd, vaddr);
32890+ pmd = pmd_offset(pud, vaddr);
32891+
32892+#ifdef CONFIG_X86_PAE
32893+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32894+#endif
32895+
32896 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32897 pmd++, pmd_idx++) {
32898 pte = page_table_kmap_check(one_page_table_init(pmd),
32899@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32900 }
32901 }
32902
32903-static inline int is_kernel_text(unsigned long addr)
32904+static inline int is_kernel_text(unsigned long start, unsigned long end)
32905 {
32906- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32907- return 1;
32908- return 0;
32909+ if ((start >= ktla_ktva((unsigned long)_etext) ||
32910+ end <= ktla_ktva((unsigned long)_stext)) &&
32911+ (start >= ktla_ktva((unsigned long)_einittext) ||
32912+ end <= ktla_ktva((unsigned long)_sinittext)) &&
32913+
32914+#ifdef CONFIG_ACPI_SLEEP
32915+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32916+#endif
32917+
32918+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32919+ return 0;
32920+ return 1;
32921 }
32922
32923 /*
32924@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
32925 unsigned long last_map_addr = end;
32926 unsigned long start_pfn, end_pfn;
32927 pgd_t *pgd_base = swapper_pg_dir;
32928- int pgd_idx, pmd_idx, pte_ofs;
32929+ unsigned int pgd_idx, pmd_idx, pte_ofs;
32930 unsigned long pfn;
32931 pgd_t *pgd;
32932+ pud_t *pud;
32933 pmd_t *pmd;
32934 pte_t *pte;
32935 unsigned pages_2m, pages_4k;
32936@@ -291,8 +295,13 @@ repeat:
32937 pfn = start_pfn;
32938 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32939 pgd = pgd_base + pgd_idx;
32940- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
32941- pmd = one_md_table_init(pgd);
32942+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
32943+ pud = pud_offset(pgd, 0);
32944+ pmd = pmd_offset(pud, 0);
32945+
32946+#ifdef CONFIG_X86_PAE
32947+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32948+#endif
32949
32950 if (pfn >= end_pfn)
32951 continue;
32952@@ -304,14 +313,13 @@ repeat:
32953 #endif
32954 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
32955 pmd++, pmd_idx++) {
32956- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
32957+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
32958
32959 /*
32960 * Map with big pages if possible, otherwise
32961 * create normal page tables:
32962 */
32963 if (use_pse) {
32964- unsigned int addr2;
32965 pgprot_t prot = PAGE_KERNEL_LARGE;
32966 /*
32967 * first pass will use the same initial
32968@@ -322,11 +330,7 @@ repeat:
32969 _PAGE_PSE);
32970
32971 pfn &= PMD_MASK >> PAGE_SHIFT;
32972- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
32973- PAGE_OFFSET + PAGE_SIZE-1;
32974-
32975- if (is_kernel_text(addr) ||
32976- is_kernel_text(addr2))
32977+ if (is_kernel_text(address, address + PMD_SIZE))
32978 prot = PAGE_KERNEL_LARGE_EXEC;
32979
32980 pages_2m++;
32981@@ -343,7 +347,7 @@ repeat:
32982 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32983 pte += pte_ofs;
32984 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
32985- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
32986+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
32987 pgprot_t prot = PAGE_KERNEL;
32988 /*
32989 * first pass will use the same initial
32990@@ -351,7 +355,7 @@ repeat:
32991 */
32992 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
32993
32994- if (is_kernel_text(addr))
32995+ if (is_kernel_text(address, address + PAGE_SIZE))
32996 prot = PAGE_KERNEL_EXEC;
32997
32998 pages_4k++;
32999@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33000
33001 pud = pud_offset(pgd, va);
33002 pmd = pmd_offset(pud, va);
33003- if (!pmd_present(*pmd))
33004+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33005 break;
33006
33007 /* should not be large page here */
33008@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33009
33010 static void __init pagetable_init(void)
33011 {
33012- pgd_t *pgd_base = swapper_pg_dir;
33013-
33014- permanent_kmaps_init(pgd_base);
33015+ permanent_kmaps_init(swapper_pg_dir);
33016 }
33017
33018-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33019+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33020 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33021
33022 /* user-defined highmem size */
33023@@ -787,10 +789,10 @@ void __init mem_init(void)
33024 ((unsigned long)&__init_end -
33025 (unsigned long)&__init_begin) >> 10,
33026
33027- (unsigned long)&_etext, (unsigned long)&_edata,
33028- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33029+ (unsigned long)&_sdata, (unsigned long)&_edata,
33030+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33031
33032- (unsigned long)&_text, (unsigned long)&_etext,
33033+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33034 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33035
33036 /*
33037@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33038 if (!kernel_set_to_readonly)
33039 return;
33040
33041+ start = ktla_ktva(start);
33042 pr_debug("Set kernel text: %lx - %lx for read write\n",
33043 start, start+size);
33044
33045@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33046 if (!kernel_set_to_readonly)
33047 return;
33048
33049+ start = ktla_ktva(start);
33050 pr_debug("Set kernel text: %lx - %lx for read only\n",
33051 start, start+size);
33052
33053@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33054 unsigned long start = PFN_ALIGN(_text);
33055 unsigned long size = PFN_ALIGN(_etext) - start;
33056
33057+ start = ktla_ktva(start);
33058 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33059 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33060 size >> 10);
33061diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33062index 4e5dfec..6fd6dc5 100644
33063--- a/arch/x86/mm/init_64.c
33064+++ b/arch/x86/mm/init_64.c
33065@@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
33066 * around without checking the pgd every time.
33067 */
33068
33069-pteval_t __supported_pte_mask __read_mostly = ~0;
33070+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33071 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33072
33073 int force_personality32;
33074@@ -184,7 +184,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33075
33076 for (address = start; address <= end; address += PGDIR_SIZE) {
33077 const pgd_t *pgd_ref = pgd_offset_k(address);
33078+
33079+#ifdef CONFIG_PAX_PER_CPU_PGD
33080+ unsigned long cpu;
33081+#else
33082 struct page *page;
33083+#endif
33084
33085 /*
33086 * When it is called after memory hot remove, pgd_none()
33087@@ -195,6 +200,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33088 continue;
33089
33090 spin_lock(&pgd_lock);
33091+
33092+#ifdef CONFIG_PAX_PER_CPU_PGD
33093+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33094+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33095+
33096+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33097+ BUG_ON(pgd_page_vaddr(*pgd)
33098+ != pgd_page_vaddr(*pgd_ref));
33099+
33100+ if (removed) {
33101+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33102+ pgd_clear(pgd);
33103+ } else {
33104+ if (pgd_none(*pgd))
33105+ set_pgd(pgd, *pgd_ref);
33106+ }
33107+
33108+ pgd = pgd_offset_cpu(cpu, kernel, address);
33109+#else
33110 list_for_each_entry(page, &pgd_list, lru) {
33111 pgd_t *pgd;
33112 spinlock_t *pgt_lock;
33113@@ -203,6 +227,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33114 /* the pgt_lock only for Xen */
33115 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33116 spin_lock(pgt_lock);
33117+#endif
33118
33119 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33120 BUG_ON(pgd_page_vaddr(*pgd)
33121@@ -216,7 +241,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33122 set_pgd(pgd, *pgd_ref);
33123 }
33124
33125+#ifndef CONFIG_PAX_PER_CPU_PGD
33126 spin_unlock(pgt_lock);
33127+#endif
33128+
33129 }
33130 spin_unlock(&pgd_lock);
33131 }
33132@@ -249,7 +277,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33133 {
33134 if (pgd_none(*pgd)) {
33135 pud_t *pud = (pud_t *)spp_getpage();
33136- pgd_populate(&init_mm, pgd, pud);
33137+ pgd_populate_kernel(&init_mm, pgd, pud);
33138 if (pud != pud_offset(pgd, 0))
33139 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33140 pud, pud_offset(pgd, 0));
33141@@ -261,7 +289,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33142 {
33143 if (pud_none(*pud)) {
33144 pmd_t *pmd = (pmd_t *) spp_getpage();
33145- pud_populate(&init_mm, pud, pmd);
33146+ pud_populate_kernel(&init_mm, pud, pmd);
33147 if (pmd != pmd_offset(pud, 0))
33148 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33149 pmd, pmd_offset(pud, 0));
33150@@ -290,7 +318,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33151 pmd = fill_pmd(pud, vaddr);
33152 pte = fill_pte(pmd, vaddr);
33153
33154+ pax_open_kernel();
33155 set_pte(pte, new_pte);
33156+ pax_close_kernel();
33157
33158 /*
33159 * It's enough to flush this one mapping.
33160@@ -349,14 +379,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33161 pgd = pgd_offset_k((unsigned long)__va(phys));
33162 if (pgd_none(*pgd)) {
33163 pud = (pud_t *) spp_getpage();
33164- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33165- _PAGE_USER));
33166+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33167 }
33168 pud = pud_offset(pgd, (unsigned long)__va(phys));
33169 if (pud_none(*pud)) {
33170 pmd = (pmd_t *) spp_getpage();
33171- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33172- _PAGE_USER));
33173+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33174 }
33175 pmd = pmd_offset(pud, phys);
33176 BUG_ON(!pmd_none(*pmd));
33177@@ -597,7 +625,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33178 prot);
33179
33180 spin_lock(&init_mm.page_table_lock);
33181- pud_populate(&init_mm, pud, pmd);
33182+ pud_populate_kernel(&init_mm, pud, pmd);
33183 spin_unlock(&init_mm.page_table_lock);
33184 }
33185 __flush_tlb_all();
33186@@ -638,7 +666,7 @@ kernel_physical_mapping_init(unsigned long start,
33187 page_size_mask);
33188
33189 spin_lock(&init_mm.page_table_lock);
33190- pgd_populate(&init_mm, pgd, pud);
33191+ pgd_populate_kernel(&init_mm, pgd, pud);
33192 spin_unlock(&init_mm.page_table_lock);
33193 pgd_changed = true;
33194 }
33195@@ -1217,8 +1245,8 @@ static struct vm_operations_struct gate_vma_ops = {
33196 static struct vm_area_struct gate_vma = {
33197 .vm_start = VSYSCALL_ADDR,
33198 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
33199- .vm_page_prot = PAGE_READONLY_EXEC,
33200- .vm_flags = VM_READ | VM_EXEC,
33201+ .vm_page_prot = PAGE_READONLY,
33202+ .vm_flags = VM_READ,
33203 .vm_ops = &gate_vma_ops,
33204 };
33205
33206diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33207index 7b179b49..6bd17777 100644
33208--- a/arch/x86/mm/iomap_32.c
33209+++ b/arch/x86/mm/iomap_32.c
33210@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33211 type = kmap_atomic_idx_push();
33212 idx = type + KM_TYPE_NR * smp_processor_id();
33213 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33214+
33215+ pax_open_kernel();
33216 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33217+ pax_close_kernel();
33218+
33219 arch_flush_lazy_mmu_mode();
33220
33221 return (void *)vaddr;
33222diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33223index af78e50..0790b03 100644
33224--- a/arch/x86/mm/ioremap.c
33225+++ b/arch/x86/mm/ioremap.c
33226@@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33227 unsigned long i;
33228
33229 for (i = 0; i < nr_pages; ++i)
33230- if (pfn_valid(start_pfn + i) &&
33231- !PageReserved(pfn_to_page(start_pfn + i)))
33232+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33233+ !PageReserved(pfn_to_page(start_pfn + i))))
33234 return 1;
33235
33236 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33237@@ -280,7 +280,7 @@ EXPORT_SYMBOL(ioremap_prot);
33238 *
33239 * Caller must ensure there is only one unmapping for the same pointer.
33240 */
33241-void iounmap(volatile void __iomem *addr)
33242+void iounmap(const volatile void __iomem *addr)
33243 {
33244 struct vm_struct *p, *o;
33245
33246@@ -334,6 +334,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
33247
33248 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33249 if (page_is_ram(start >> PAGE_SHIFT))
33250+#ifdef CONFIG_HIGHMEM
33251+ if ((start >> PAGE_SHIFT) < max_low_pfn)
33252+#endif
33253 return __va(phys);
33254
33255 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
33256@@ -346,13 +349,16 @@ void *xlate_dev_mem_ptr(unsigned long phys)
33257 void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
33258 {
33259 if (page_is_ram(phys >> PAGE_SHIFT))
33260+#ifdef CONFIG_HIGHMEM
33261+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33262+#endif
33263 return;
33264
33265 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33266 return;
33267 }
33268
33269-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33270+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33271
33272 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33273 {
33274@@ -388,8 +394,7 @@ void __init early_ioremap_init(void)
33275 early_ioremap_setup();
33276
33277 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33278- memset(bm_pte, 0, sizeof(bm_pte));
33279- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33280+ pmd_populate_user(&init_mm, pmd, bm_pte);
33281
33282 /*
33283 * The boot-ioremap range spans multiple pmds, for which
33284diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33285index b4f2e7e..96c9c3e 100644
33286--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33287+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33288@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33289 * memory (e.g. tracked pages)? For now, we need this to avoid
33290 * invoking kmemcheck for PnP BIOS calls.
33291 */
33292- if (regs->flags & X86_VM_MASK)
33293+ if (v8086_mode(regs))
33294 return false;
33295- if (regs->cs != __KERNEL_CS)
33296+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33297 return false;
33298
33299 pte = kmemcheck_pte_lookup(address);
33300diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33301index 919b912..9267313 100644
33302--- a/arch/x86/mm/mmap.c
33303+++ b/arch/x86/mm/mmap.c
33304@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
33305 * Leave an at least ~128 MB hole with possible stack randomization.
33306 */
33307 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33308-#define MAX_GAP (TASK_SIZE/6*5)
33309+#define MAX_GAP (pax_task_size/6*5)
33310
33311 static int mmap_is_legacy(void)
33312 {
33313@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
33314 return rnd << PAGE_SHIFT;
33315 }
33316
33317-static unsigned long mmap_base(void)
33318+static unsigned long mmap_base(struct mm_struct *mm)
33319 {
33320 unsigned long gap = rlimit(RLIMIT_STACK);
33321+ unsigned long pax_task_size = TASK_SIZE;
33322+
33323+#ifdef CONFIG_PAX_SEGMEXEC
33324+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33325+ pax_task_size = SEGMEXEC_TASK_SIZE;
33326+#endif
33327
33328 if (gap < MIN_GAP)
33329 gap = MIN_GAP;
33330 else if (gap > MAX_GAP)
33331 gap = MAX_GAP;
33332
33333- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
33334+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
33335 }
33336
33337 /*
33338 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33339 * does, but not when emulating X86_32
33340 */
33341-static unsigned long mmap_legacy_base(void)
33342+static unsigned long mmap_legacy_base(struct mm_struct *mm)
33343 {
33344- if (mmap_is_ia32())
33345+ if (mmap_is_ia32()) {
33346+
33347+#ifdef CONFIG_PAX_SEGMEXEC
33348+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33349+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33350+ else
33351+#endif
33352+
33353 return TASK_UNMAPPED_BASE;
33354- else
33355+ } else
33356 return TASK_UNMAPPED_BASE + mmap_rnd();
33357 }
33358
33359@@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33360 */
33361 void arch_pick_mmap_layout(struct mm_struct *mm)
33362 {
33363- mm->mmap_legacy_base = mmap_legacy_base();
33364- mm->mmap_base = mmap_base();
33365+ mm->mmap_legacy_base = mmap_legacy_base(mm);
33366+ mm->mmap_base = mmap_base(mm);
33367+
33368+#ifdef CONFIG_PAX_RANDMMAP
33369+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33370+ mm->mmap_legacy_base += mm->delta_mmap;
33371+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33372+ }
33373+#endif
33374
33375 if (mmap_is_legacy()) {
33376 mm->mmap_base = mm->mmap_legacy_base;
33377diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33378index 0057a7a..95c7edd 100644
33379--- a/arch/x86/mm/mmio-mod.c
33380+++ b/arch/x86/mm/mmio-mod.c
33381@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33382 break;
33383 default:
33384 {
33385- unsigned char *ip = (unsigned char *)instptr;
33386+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33387 my_trace->opcode = MMIO_UNKNOWN_OP;
33388 my_trace->width = 0;
33389 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33390@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33391 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33392 void __iomem *addr)
33393 {
33394- static atomic_t next_id;
33395+ static atomic_unchecked_t next_id;
33396 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33397 /* These are page-unaligned. */
33398 struct mmiotrace_map map = {
33399@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33400 .private = trace
33401 },
33402 .phys = offset,
33403- .id = atomic_inc_return(&next_id)
33404+ .id = atomic_inc_return_unchecked(&next_id)
33405 };
33406 map.map_id = trace->id;
33407
33408@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33409 ioremap_trace_core(offset, size, addr);
33410 }
33411
33412-static void iounmap_trace_core(volatile void __iomem *addr)
33413+static void iounmap_trace_core(const volatile void __iomem *addr)
33414 {
33415 struct mmiotrace_map map = {
33416 .phys = 0,
33417@@ -328,7 +328,7 @@ not_enabled:
33418 }
33419 }
33420
33421-void mmiotrace_iounmap(volatile void __iomem *addr)
33422+void mmiotrace_iounmap(const volatile void __iomem *addr)
33423 {
33424 might_sleep();
33425 if (is_enabled()) /* recheck and proper locking in *_core() */
33426diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33427index 1a88370..3f598b5 100644
33428--- a/arch/x86/mm/numa.c
33429+++ b/arch/x86/mm/numa.c
33430@@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33431 }
33432 }
33433
33434-static int __init numa_register_memblks(struct numa_meminfo *mi)
33435+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33436 {
33437 unsigned long uninitialized_var(pfn_align);
33438 int i, nid;
33439diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33440index 36de293..b820ddc 100644
33441--- a/arch/x86/mm/pageattr.c
33442+++ b/arch/x86/mm/pageattr.c
33443@@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33444 */
33445 #ifdef CONFIG_PCI_BIOS
33446 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33447- pgprot_val(forbidden) |= _PAGE_NX;
33448+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33449 #endif
33450
33451 /*
33452@@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33453 * Does not cover __inittext since that is gone later on. On
33454 * 64bit we do not enforce !NX on the low mapping
33455 */
33456- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33457- pgprot_val(forbidden) |= _PAGE_NX;
33458+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33459+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33460
33461+#ifdef CONFIG_DEBUG_RODATA
33462 /*
33463 * The .rodata section needs to be read-only. Using the pfn
33464 * catches all aliases.
33465@@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33466 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33467 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33468 pgprot_val(forbidden) |= _PAGE_RW;
33469+#endif
33470
33471 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33472 /*
33473@@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33474 }
33475 #endif
33476
33477+#ifdef CONFIG_PAX_KERNEXEC
33478+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33479+ pgprot_val(forbidden) |= _PAGE_RW;
33480+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33481+ }
33482+#endif
33483+
33484 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33485
33486 return prot;
33487@@ -420,23 +429,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33488 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33489 {
33490 /* change init_mm */
33491+ pax_open_kernel();
33492 set_pte_atomic(kpte, pte);
33493+
33494 #ifdef CONFIG_X86_32
33495 if (!SHARED_KERNEL_PMD) {
33496+
33497+#ifdef CONFIG_PAX_PER_CPU_PGD
33498+ unsigned long cpu;
33499+#else
33500 struct page *page;
33501+#endif
33502
33503+#ifdef CONFIG_PAX_PER_CPU_PGD
33504+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33505+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33506+#else
33507 list_for_each_entry(page, &pgd_list, lru) {
33508- pgd_t *pgd;
33509+ pgd_t *pgd = (pgd_t *)page_address(page);
33510+#endif
33511+
33512 pud_t *pud;
33513 pmd_t *pmd;
33514
33515- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33516+ pgd += pgd_index(address);
33517 pud = pud_offset(pgd, address);
33518 pmd = pmd_offset(pud, address);
33519 set_pte_atomic((pte_t *)pmd, pte);
33520 }
33521 }
33522 #endif
33523+ pax_close_kernel();
33524 }
33525
33526 static int
33527diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33528index 6574388..87e9bef 100644
33529--- a/arch/x86/mm/pat.c
33530+++ b/arch/x86/mm/pat.c
33531@@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
33532
33533 if (!entry) {
33534 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33535- current->comm, current->pid, start, end - 1);
33536+ current->comm, task_pid_nr(current), start, end - 1);
33537 return -EINVAL;
33538 }
33539
33540@@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33541
33542 while (cursor < to) {
33543 if (!devmem_is_allowed(pfn)) {
33544- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33545- current->comm, from, to - 1);
33546+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33547+ current->comm, from, to - 1, cursor);
33548 return 0;
33549 }
33550 cursor += PAGE_SIZE;
33551@@ -577,7 +577,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
33552 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
33553 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33554 "for [mem %#010Lx-%#010Lx]\n",
33555- current->comm, current->pid,
33556+ current->comm, task_pid_nr(current),
33557 cattr_name(flags),
33558 base, (unsigned long long)(base + size-1));
33559 return -EINVAL;
33560@@ -612,7 +612,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33561 flags = lookup_memtype(paddr);
33562 if (want_flags != flags) {
33563 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33564- current->comm, current->pid,
33565+ current->comm, task_pid_nr(current),
33566 cattr_name(want_flags),
33567 (unsigned long long)paddr,
33568 (unsigned long long)(paddr + size - 1),
33569@@ -634,7 +634,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33570 free_memtype(paddr, paddr + size);
33571 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33572 " for [mem %#010Lx-%#010Lx], got %s\n",
33573- current->comm, current->pid,
33574+ current->comm, task_pid_nr(current),
33575 cattr_name(want_flags),
33576 (unsigned long long)paddr,
33577 (unsigned long long)(paddr + size - 1),
33578diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33579index 415f6c4..d319983 100644
33580--- a/arch/x86/mm/pat_rbtree.c
33581+++ b/arch/x86/mm/pat_rbtree.c
33582@@ -160,7 +160,7 @@ success:
33583
33584 failure:
33585 printk(KERN_INFO "%s:%d conflicting memory types "
33586- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33587+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33588 end, cattr_name(found_type), cattr_name(match->type));
33589 return -EBUSY;
33590 }
33591diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33592index 9f0614d..92ae64a 100644
33593--- a/arch/x86/mm/pf_in.c
33594+++ b/arch/x86/mm/pf_in.c
33595@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33596 int i;
33597 enum reason_type rv = OTHERS;
33598
33599- p = (unsigned char *)ins_addr;
33600+ p = (unsigned char *)ktla_ktva(ins_addr);
33601 p += skip_prefix(p, &prf);
33602 p += get_opcode(p, &opcode);
33603
33604@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33605 struct prefix_bits prf;
33606 int i;
33607
33608- p = (unsigned char *)ins_addr;
33609+ p = (unsigned char *)ktla_ktva(ins_addr);
33610 p += skip_prefix(p, &prf);
33611 p += get_opcode(p, &opcode);
33612
33613@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33614 struct prefix_bits prf;
33615 int i;
33616
33617- p = (unsigned char *)ins_addr;
33618+ p = (unsigned char *)ktla_ktva(ins_addr);
33619 p += skip_prefix(p, &prf);
33620 p += get_opcode(p, &opcode);
33621
33622@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33623 struct prefix_bits prf;
33624 int i;
33625
33626- p = (unsigned char *)ins_addr;
33627+ p = (unsigned char *)ktla_ktva(ins_addr);
33628 p += skip_prefix(p, &prf);
33629 p += get_opcode(p, &opcode);
33630 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33631@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33632 struct prefix_bits prf;
33633 int i;
33634
33635- p = (unsigned char *)ins_addr;
33636+ p = (unsigned char *)ktla_ktva(ins_addr);
33637 p += skip_prefix(p, &prf);
33638 p += get_opcode(p, &opcode);
33639 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33640diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33641index 6fb6927..4fc13c0 100644
33642--- a/arch/x86/mm/pgtable.c
33643+++ b/arch/x86/mm/pgtable.c
33644@@ -97,10 +97,71 @@ static inline void pgd_list_del(pgd_t *pgd)
33645 list_del(&page->lru);
33646 }
33647
33648-#define UNSHARED_PTRS_PER_PGD \
33649- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33650+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33651+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33652
33653+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33654+{
33655+ unsigned int count = USER_PGD_PTRS;
33656
33657+ if (!pax_user_shadow_base)
33658+ return;
33659+
33660+ while (count--)
33661+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33662+}
33663+#endif
33664+
33665+#ifdef CONFIG_PAX_PER_CPU_PGD
33666+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33667+{
33668+ unsigned int count = USER_PGD_PTRS;
33669+
33670+ while (count--) {
33671+ pgd_t pgd;
33672+
33673+#ifdef CONFIG_X86_64
33674+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33675+#else
33676+ pgd = *src++;
33677+#endif
33678+
33679+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33680+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33681+#endif
33682+
33683+ *dst++ = pgd;
33684+ }
33685+
33686+}
33687+#endif
33688+
33689+#ifdef CONFIG_X86_64
33690+#define pxd_t pud_t
33691+#define pyd_t pgd_t
33692+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33693+#define pgtable_pxd_page_ctor(page) true
33694+#define pgtable_pxd_page_dtor(page)
33695+#define pxd_free(mm, pud) pud_free((mm), (pud))
33696+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33697+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33698+#define PYD_SIZE PGDIR_SIZE
33699+#else
33700+#define pxd_t pmd_t
33701+#define pyd_t pud_t
33702+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33703+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33704+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33705+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33706+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33707+#define pyd_offset(mm, address) pud_offset((mm), (address))
33708+#define PYD_SIZE PUD_SIZE
33709+#endif
33710+
33711+#ifdef CONFIG_PAX_PER_CPU_PGD
33712+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33713+static inline void pgd_dtor(pgd_t *pgd) {}
33714+#else
33715 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33716 {
33717 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33718@@ -141,6 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
33719 pgd_list_del(pgd);
33720 spin_unlock(&pgd_lock);
33721 }
33722+#endif
33723
33724 /*
33725 * List of all pgd's needed for non-PAE so it can invalidate entries
33726@@ -153,7 +215,7 @@ static void pgd_dtor(pgd_t *pgd)
33727 * -- nyc
33728 */
33729
33730-#ifdef CONFIG_X86_PAE
33731+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33732 /*
33733 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33734 * updating the top-level pagetable entries to guarantee the
33735@@ -165,7 +227,7 @@ static void pgd_dtor(pgd_t *pgd)
33736 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33737 * and initialize the kernel pmds here.
33738 */
33739-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33740+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33741
33742 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33743 {
33744@@ -183,43 +245,45 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33745 */
33746 flush_tlb_mm(mm);
33747 }
33748+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33749+#define PREALLOCATED_PXDS USER_PGD_PTRS
33750 #else /* !CONFIG_X86_PAE */
33751
33752 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33753-#define PREALLOCATED_PMDS 0
33754+#define PREALLOCATED_PXDS 0
33755
33756 #endif /* CONFIG_X86_PAE */
33757
33758-static void free_pmds(pmd_t *pmds[])
33759+static void free_pxds(pxd_t *pxds[])
33760 {
33761 int i;
33762
33763- for(i = 0; i < PREALLOCATED_PMDS; i++)
33764- if (pmds[i]) {
33765- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33766- free_page((unsigned long)pmds[i]);
33767+ for(i = 0; i < PREALLOCATED_PXDS; i++)
33768+ if (pxds[i]) {
33769+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33770+ free_page((unsigned long)pxds[i]);
33771 }
33772 }
33773
33774-static int preallocate_pmds(pmd_t *pmds[])
33775+static int preallocate_pxds(pxd_t *pxds[])
33776 {
33777 int i;
33778 bool failed = false;
33779
33780- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33781- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33782- if (!pmd)
33783+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33784+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33785+ if (!pxd)
33786 failed = true;
33787- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33788- free_page((unsigned long)pmd);
33789- pmd = NULL;
33790+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33791+ free_page((unsigned long)pxd);
33792+ pxd = NULL;
33793 failed = true;
33794 }
33795- pmds[i] = pmd;
33796+ pxds[i] = pxd;
33797 }
33798
33799 if (failed) {
33800- free_pmds(pmds);
33801+ free_pxds(pxds);
33802 return -ENOMEM;
33803 }
33804
33805@@ -232,49 +296,52 @@ static int preallocate_pmds(pmd_t *pmds[])
33806 * preallocate which never got a corresponding vma will need to be
33807 * freed manually.
33808 */
33809-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33810+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33811 {
33812 int i;
33813
33814- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33815+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33816 pgd_t pgd = pgdp[i];
33817
33818 if (pgd_val(pgd) != 0) {
33819- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33820+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33821
33822- pgdp[i] = native_make_pgd(0);
33823+ set_pgd(pgdp + i, native_make_pgd(0));
33824
33825- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33826- pmd_free(mm, pmd);
33827+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33828+ pxd_free(mm, pxd);
33829 }
33830 }
33831 }
33832
33833-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33834+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33835 {
33836- pud_t *pud;
33837+ pyd_t *pyd;
33838 int i;
33839
33840- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33841+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33842 return;
33843
33844- pud = pud_offset(pgd, 0);
33845-
33846- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33847- pmd_t *pmd = pmds[i];
33848+#ifdef CONFIG_X86_64
33849+ pyd = pyd_offset(mm, 0L);
33850+#else
33851+ pyd = pyd_offset(pgd, 0L);
33852+#endif
33853
33854+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33855+ pxd_t *pxd = pxds[i];
33856 if (i >= KERNEL_PGD_BOUNDARY)
33857- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33858- sizeof(pmd_t) * PTRS_PER_PMD);
33859+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33860+ sizeof(pxd_t) * PTRS_PER_PMD);
33861
33862- pud_populate(mm, pud, pmd);
33863+ pyd_populate(mm, pyd, pxd);
33864 }
33865 }
33866
33867 pgd_t *pgd_alloc(struct mm_struct *mm)
33868 {
33869 pgd_t *pgd;
33870- pmd_t *pmds[PREALLOCATED_PMDS];
33871+ pxd_t *pxds[PREALLOCATED_PXDS];
33872
33873 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
33874
33875@@ -283,11 +350,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33876
33877 mm->pgd = pgd;
33878
33879- if (preallocate_pmds(pmds) != 0)
33880+ if (preallocate_pxds(pxds) != 0)
33881 goto out_free_pgd;
33882
33883 if (paravirt_pgd_alloc(mm) != 0)
33884- goto out_free_pmds;
33885+ goto out_free_pxds;
33886
33887 /*
33888 * Make sure that pre-populating the pmds is atomic with
33889@@ -297,14 +364,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33890 spin_lock(&pgd_lock);
33891
33892 pgd_ctor(mm, pgd);
33893- pgd_prepopulate_pmd(mm, pgd, pmds);
33894+ pgd_prepopulate_pxd(mm, pgd, pxds);
33895
33896 spin_unlock(&pgd_lock);
33897
33898 return pgd;
33899
33900-out_free_pmds:
33901- free_pmds(pmds);
33902+out_free_pxds:
33903+ free_pxds(pxds);
33904 out_free_pgd:
33905 free_page((unsigned long)pgd);
33906 out:
33907@@ -313,7 +380,7 @@ out:
33908
33909 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
33910 {
33911- pgd_mop_up_pmds(mm, pgd);
33912+ pgd_mop_up_pxds(mm, pgd);
33913 pgd_dtor(pgd);
33914 paravirt_pgd_free(mm, pgd);
33915 free_page((unsigned long)pgd);
33916diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
33917index 75cc097..79a097f 100644
33918--- a/arch/x86/mm/pgtable_32.c
33919+++ b/arch/x86/mm/pgtable_32.c
33920@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
33921 return;
33922 }
33923 pte = pte_offset_kernel(pmd, vaddr);
33924+
33925+ pax_open_kernel();
33926 if (pte_val(pteval))
33927 set_pte_at(&init_mm, vaddr, pte, pteval);
33928 else
33929 pte_clear(&init_mm, vaddr, pte);
33930+ pax_close_kernel();
33931
33932 /*
33933 * It's enough to flush this one mapping.
33934diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
33935index e666cbb..61788c45 100644
33936--- a/arch/x86/mm/physaddr.c
33937+++ b/arch/x86/mm/physaddr.c
33938@@ -10,7 +10,7 @@
33939 #ifdef CONFIG_X86_64
33940
33941 #ifdef CONFIG_DEBUG_VIRTUAL
33942-unsigned long __phys_addr(unsigned long x)
33943+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33944 {
33945 unsigned long y = x - __START_KERNEL_map;
33946
33947@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
33948 #else
33949
33950 #ifdef CONFIG_DEBUG_VIRTUAL
33951-unsigned long __phys_addr(unsigned long x)
33952+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33953 {
33954 unsigned long phys_addr = x - PAGE_OFFSET;
33955 /* VMALLOC_* aren't constants */
33956diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
33957index 90555bf..f5f1828 100644
33958--- a/arch/x86/mm/setup_nx.c
33959+++ b/arch/x86/mm/setup_nx.c
33960@@ -5,8 +5,10 @@
33961 #include <asm/pgtable.h>
33962 #include <asm/proto.h>
33963
33964+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33965 static int disable_nx;
33966
33967+#ifndef CONFIG_PAX_PAGEEXEC
33968 /*
33969 * noexec = on|off
33970 *
33971@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
33972 return 0;
33973 }
33974 early_param("noexec", noexec_setup);
33975+#endif
33976+
33977+#endif
33978
33979 void x86_configure_nx(void)
33980 {
33981+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33982 if (cpu_has_nx && !disable_nx)
33983 __supported_pte_mask |= _PAGE_NX;
33984 else
33985+#endif
33986 __supported_pte_mask &= ~_PAGE_NX;
33987 }
33988
33989diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
33990index ee61c36..e6fedeb 100644
33991--- a/arch/x86/mm/tlb.c
33992+++ b/arch/x86/mm/tlb.c
33993@@ -48,7 +48,11 @@ void leave_mm(int cpu)
33994 BUG();
33995 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
33996 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
33997+
33998+#ifndef CONFIG_PAX_PER_CPU_PGD
33999 load_cr3(swapper_pg_dir);
34000+#endif
34001+
34002 /*
34003 * This gets called in the idle path where RCU
34004 * functions differently. Tracing normally
34005diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34006new file mode 100644
34007index 0000000..dace51c
34008--- /dev/null
34009+++ b/arch/x86/mm/uderef_64.c
34010@@ -0,0 +1,37 @@
34011+#include <linux/mm.h>
34012+#include <asm/pgtable.h>
34013+#include <asm/uaccess.h>
34014+
34015+#ifdef CONFIG_PAX_MEMORY_UDEREF
34016+/* PaX: due to the special call convention these functions must
34017+ * - remain leaf functions under all configurations,
34018+ * - never be called directly, only dereferenced from the wrappers.
34019+ */
34020+void __pax_open_userland(void)
34021+{
34022+ unsigned int cpu;
34023+
34024+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34025+ return;
34026+
34027+ cpu = raw_get_cpu();
34028+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34029+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34030+ raw_put_cpu_no_resched();
34031+}
34032+EXPORT_SYMBOL(__pax_open_userland);
34033+
34034+void __pax_close_userland(void)
34035+{
34036+ unsigned int cpu;
34037+
34038+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34039+ return;
34040+
34041+ cpu = raw_get_cpu();
34042+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34043+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34044+ raw_put_cpu_no_resched();
34045+}
34046+EXPORT_SYMBOL(__pax_close_userland);
34047+#endif
34048diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34049index 6440221..f84b5c7 100644
34050--- a/arch/x86/net/bpf_jit.S
34051+++ b/arch/x86/net/bpf_jit.S
34052@@ -9,6 +9,7 @@
34053 */
34054 #include <linux/linkage.h>
34055 #include <asm/dwarf2.h>
34056+#include <asm/alternative-asm.h>
34057
34058 /*
34059 * Calling convention :
34060@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34061 jle bpf_slow_path_word
34062 mov (SKBDATA,%rsi),%eax
34063 bswap %eax /* ntohl() */
34064+ pax_force_retaddr
34065 ret
34066
34067 sk_load_half:
34068@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34069 jle bpf_slow_path_half
34070 movzwl (SKBDATA,%rsi),%eax
34071 rol $8,%ax # ntohs()
34072+ pax_force_retaddr
34073 ret
34074
34075 sk_load_byte:
34076@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34077 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34078 jle bpf_slow_path_byte
34079 movzbl (SKBDATA,%rsi),%eax
34080+ pax_force_retaddr
34081 ret
34082
34083 /* rsi contains offset and can be scratched */
34084@@ -90,6 +94,7 @@ bpf_slow_path_word:
34085 js bpf_error
34086 mov - MAX_BPF_STACK + 32(%rbp),%eax
34087 bswap %eax
34088+ pax_force_retaddr
34089 ret
34090
34091 bpf_slow_path_half:
34092@@ -98,12 +103,14 @@ bpf_slow_path_half:
34093 mov - MAX_BPF_STACK + 32(%rbp),%ax
34094 rol $8,%ax
34095 movzwl %ax,%eax
34096+ pax_force_retaddr
34097 ret
34098
34099 bpf_slow_path_byte:
34100 bpf_slow_path_common(1)
34101 js bpf_error
34102 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34103+ pax_force_retaddr
34104 ret
34105
34106 #define sk_negative_common(SIZE) \
34107@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34108 sk_negative_common(4)
34109 mov (%rax), %eax
34110 bswap %eax
34111+ pax_force_retaddr
34112 ret
34113
34114 bpf_slow_path_half_neg:
34115@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34116 mov (%rax),%ax
34117 rol $8,%ax
34118 movzwl %ax,%eax
34119+ pax_force_retaddr
34120 ret
34121
34122 bpf_slow_path_byte_neg:
34123@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34124 .globl sk_load_byte_negative_offset
34125 sk_negative_common(1)
34126 movzbl (%rax), %eax
34127+ pax_force_retaddr
34128 ret
34129
34130 bpf_error:
34131@@ -156,4 +166,5 @@ bpf_error:
34132 mov - MAX_BPF_STACK + 16(%rbp),%r14
34133 mov - MAX_BPF_STACK + 24(%rbp),%r15
34134 leaveq
34135+ pax_force_retaddr
34136 ret
34137diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34138index 3f62734..a57894f 100644
34139--- a/arch/x86/net/bpf_jit_comp.c
34140+++ b/arch/x86/net/bpf_jit_comp.c
34141@@ -13,7 +13,11 @@
34142 #include <linux/if_vlan.h>
34143 #include <asm/cacheflush.h>
34144
34145+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34146+int bpf_jit_enable __read_only;
34147+#else
34148 int bpf_jit_enable __read_mostly;
34149+#endif
34150
34151 /*
34152 * assembly code in arch/x86/net/bpf_jit.S
34153@@ -174,7 +178,9 @@ static inline u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34154 static void jit_fill_hole(void *area, unsigned int size)
34155 {
34156 /* fill whole space with int3 instructions */
34157+ pax_open_kernel();
34158 memset(area, 0xcc, size);
34159+ pax_close_kernel();
34160 }
34161
34162 struct jit_context {
34163@@ -894,7 +900,9 @@ common_load:
34164 pr_err("bpf_jit_compile fatal error\n");
34165 return -EFAULT;
34166 }
34167+ pax_open_kernel();
34168 memcpy(image + proglen, temp, ilen);
34169+ pax_close_kernel();
34170 }
34171 proglen += ilen;
34172 addrs[i] = proglen;
34173@@ -966,7 +974,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34174
34175 if (image) {
34176 bpf_flush_icache(header, image + proglen);
34177- set_memory_ro((unsigned long)header, header->pages);
34178 prog->bpf_func = (void *)image;
34179 prog->jited = true;
34180 }
34181@@ -979,12 +986,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34182 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34183 struct bpf_binary_header *header = (void *)addr;
34184
34185- if (!fp->jited)
34186- goto free_filter;
34187+ if (fp->jited)
34188+ bpf_jit_binary_free(header);
34189
34190- set_memory_rw(addr, header->pages);
34191- bpf_jit_binary_free(header);
34192-
34193-free_filter:
34194 bpf_prog_unlock_free(fp);
34195 }
34196diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34197index 5d04be5..2beeaa2 100644
34198--- a/arch/x86/oprofile/backtrace.c
34199+++ b/arch/x86/oprofile/backtrace.c
34200@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34201 struct stack_frame_ia32 *fp;
34202 unsigned long bytes;
34203
34204- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34205+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34206 if (bytes != 0)
34207 return NULL;
34208
34209- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34210+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34211
34212 oprofile_add_trace(bufhead[0].return_address);
34213
34214@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34215 struct stack_frame bufhead[2];
34216 unsigned long bytes;
34217
34218- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34219+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34220 if (bytes != 0)
34221 return NULL;
34222
34223@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34224 {
34225 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34226
34227- if (!user_mode_vm(regs)) {
34228+ if (!user_mode(regs)) {
34229 unsigned long stack = kernel_stack_pointer(regs);
34230 if (depth)
34231 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34232diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34233index 1d2e639..f6ef82a 100644
34234--- a/arch/x86/oprofile/nmi_int.c
34235+++ b/arch/x86/oprofile/nmi_int.c
34236@@ -23,6 +23,7 @@
34237 #include <asm/nmi.h>
34238 #include <asm/msr.h>
34239 #include <asm/apic.h>
34240+#include <asm/pgtable.h>
34241
34242 #include "op_counter.h"
34243 #include "op_x86_model.h"
34244@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34245 if (ret)
34246 return ret;
34247
34248- if (!model->num_virt_counters)
34249- model->num_virt_counters = model->num_counters;
34250+ if (!model->num_virt_counters) {
34251+ pax_open_kernel();
34252+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34253+ pax_close_kernel();
34254+ }
34255
34256 mux_init(ops);
34257
34258diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34259index 50d86c0..7985318 100644
34260--- a/arch/x86/oprofile/op_model_amd.c
34261+++ b/arch/x86/oprofile/op_model_amd.c
34262@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34263 num_counters = AMD64_NUM_COUNTERS;
34264 }
34265
34266- op_amd_spec.num_counters = num_counters;
34267- op_amd_spec.num_controls = num_counters;
34268- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34269+ pax_open_kernel();
34270+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34271+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34272+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34273+ pax_close_kernel();
34274
34275 return 0;
34276 }
34277diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34278index d90528e..0127e2b 100644
34279--- a/arch/x86/oprofile/op_model_ppro.c
34280+++ b/arch/x86/oprofile/op_model_ppro.c
34281@@ -19,6 +19,7 @@
34282 #include <asm/msr.h>
34283 #include <asm/apic.h>
34284 #include <asm/nmi.h>
34285+#include <asm/pgtable.h>
34286
34287 #include "op_x86_model.h"
34288 #include "op_counter.h"
34289@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34290
34291 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34292
34293- op_arch_perfmon_spec.num_counters = num_counters;
34294- op_arch_perfmon_spec.num_controls = num_counters;
34295+ pax_open_kernel();
34296+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34297+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34298+ pax_close_kernel();
34299 }
34300
34301 static int arch_perfmon_init(struct oprofile_operations *ignore)
34302diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34303index 71e8a67..6a313bb 100644
34304--- a/arch/x86/oprofile/op_x86_model.h
34305+++ b/arch/x86/oprofile/op_x86_model.h
34306@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34307 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34308 struct op_msrs const * const msrs);
34309 #endif
34310-};
34311+} __do_const;
34312
34313 struct op_counter_config;
34314
34315diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34316index b9958c3..24229ab 100644
34317--- a/arch/x86/pci/intel_mid_pci.c
34318+++ b/arch/x86/pci/intel_mid_pci.c
34319@@ -250,7 +250,7 @@ int __init intel_mid_pci_init(void)
34320 pci_mmcfg_late_init();
34321 pcibios_enable_irq = intel_mid_pci_irq_enable;
34322 pcibios_disable_irq = intel_mid_pci_irq_disable;
34323- pci_root_ops = intel_mid_pci_ops;
34324+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34325 pci_soc_mode = 1;
34326 /* Continue with standard init */
34327 return 1;
34328diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34329index eb500c2..eab9e70 100644
34330--- a/arch/x86/pci/irq.c
34331+++ b/arch/x86/pci/irq.c
34332@@ -51,7 +51,7 @@ struct irq_router {
34333 struct irq_router_handler {
34334 u16 vendor;
34335 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34336-};
34337+} __do_const;
34338
34339 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34340 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34341@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34342 return 0;
34343 }
34344
34345-static __initdata struct irq_router_handler pirq_routers[] = {
34346+static __initconst const struct irq_router_handler pirq_routers[] = {
34347 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34348 { PCI_VENDOR_ID_AL, ali_router_probe },
34349 { PCI_VENDOR_ID_ITE, ite_router_probe },
34350@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34351 static void __init pirq_find_router(struct irq_router *r)
34352 {
34353 struct irq_routing_table *rt = pirq_table;
34354- struct irq_router_handler *h;
34355+ const struct irq_router_handler *h;
34356
34357 #ifdef CONFIG_PCI_BIOS
34358 if (!rt->signature) {
34359@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34360 return 0;
34361 }
34362
34363-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34364+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34365 {
34366 .callback = fix_broken_hp_bios_irq9,
34367 .ident = "HP Pavilion N5400 Series Laptop",
34368diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34369index 9b83b90..4112152 100644
34370--- a/arch/x86/pci/pcbios.c
34371+++ b/arch/x86/pci/pcbios.c
34372@@ -79,7 +79,7 @@ union bios32 {
34373 static struct {
34374 unsigned long address;
34375 unsigned short segment;
34376-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34377+} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34378
34379 /*
34380 * Returns the entry point for the given service, NULL on error
34381@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34382 unsigned long length; /* %ecx */
34383 unsigned long entry; /* %edx */
34384 unsigned long flags;
34385+ struct desc_struct d, *gdt;
34386
34387 local_irq_save(flags);
34388- __asm__("lcall *(%%edi); cld"
34389+
34390+ gdt = get_cpu_gdt_table(smp_processor_id());
34391+
34392+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34393+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34394+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34395+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34396+
34397+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34398 : "=a" (return_code),
34399 "=b" (address),
34400 "=c" (length),
34401 "=d" (entry)
34402 : "0" (service),
34403 "1" (0),
34404- "D" (&bios32_indirect));
34405+ "D" (&bios32_indirect),
34406+ "r"(__PCIBIOS_DS)
34407+ : "memory");
34408+
34409+ pax_open_kernel();
34410+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34411+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34412+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34413+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34414+ pax_close_kernel();
34415+
34416 local_irq_restore(flags);
34417
34418 switch (return_code) {
34419- case 0:
34420- return address + entry;
34421- case 0x80: /* Not present */
34422- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34423- return 0;
34424- default: /* Shouldn't happen */
34425- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34426- service, return_code);
34427+ case 0: {
34428+ int cpu;
34429+ unsigned char flags;
34430+
34431+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34432+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34433+ printk(KERN_WARNING "bios32_service: not valid\n");
34434 return 0;
34435+ }
34436+ address = address + PAGE_OFFSET;
34437+ length += 16UL; /* some BIOSs underreport this... */
34438+ flags = 4;
34439+ if (length >= 64*1024*1024) {
34440+ length >>= PAGE_SHIFT;
34441+ flags |= 8;
34442+ }
34443+
34444+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34445+ gdt = get_cpu_gdt_table(cpu);
34446+ pack_descriptor(&d, address, length, 0x9b, flags);
34447+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34448+ pack_descriptor(&d, address, length, 0x93, flags);
34449+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34450+ }
34451+ return entry;
34452+ }
34453+ case 0x80: /* Not present */
34454+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34455+ return 0;
34456+ default: /* Shouldn't happen */
34457+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34458+ service, return_code);
34459+ return 0;
34460 }
34461 }
34462
34463 static struct {
34464 unsigned long address;
34465 unsigned short segment;
34466-} pci_indirect = { 0, __KERNEL_CS };
34467+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34468
34469-static int pci_bios_present;
34470+static int pci_bios_present __read_only;
34471
34472 static int __init check_pcibios(void)
34473 {
34474@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34475 unsigned long flags, pcibios_entry;
34476
34477 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34478- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34479+ pci_indirect.address = pcibios_entry;
34480
34481 local_irq_save(flags);
34482- __asm__(
34483- "lcall *(%%edi); cld\n\t"
34484+ __asm__("movw %w6, %%ds\n\t"
34485+ "lcall *%%ss:(%%edi); cld\n\t"
34486+ "push %%ss\n\t"
34487+ "pop %%ds\n\t"
34488 "jc 1f\n\t"
34489 "xor %%ah, %%ah\n"
34490 "1:"
34491@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34492 "=b" (ebx),
34493 "=c" (ecx)
34494 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34495- "D" (&pci_indirect)
34496+ "D" (&pci_indirect),
34497+ "r" (__PCIBIOS_DS)
34498 : "memory");
34499 local_irq_restore(flags);
34500
34501@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34502
34503 switch (len) {
34504 case 1:
34505- __asm__("lcall *(%%esi); cld\n\t"
34506+ __asm__("movw %w6, %%ds\n\t"
34507+ "lcall *%%ss:(%%esi); cld\n\t"
34508+ "push %%ss\n\t"
34509+ "pop %%ds\n\t"
34510 "jc 1f\n\t"
34511 "xor %%ah, %%ah\n"
34512 "1:"
34513@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34514 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34515 "b" (bx),
34516 "D" ((long)reg),
34517- "S" (&pci_indirect));
34518+ "S" (&pci_indirect),
34519+ "r" (__PCIBIOS_DS));
34520 /*
34521 * Zero-extend the result beyond 8 bits, do not trust the
34522 * BIOS having done it:
34523@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34524 *value &= 0xff;
34525 break;
34526 case 2:
34527- __asm__("lcall *(%%esi); cld\n\t"
34528+ __asm__("movw %w6, %%ds\n\t"
34529+ "lcall *%%ss:(%%esi); cld\n\t"
34530+ "push %%ss\n\t"
34531+ "pop %%ds\n\t"
34532 "jc 1f\n\t"
34533 "xor %%ah, %%ah\n"
34534 "1:"
34535@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34536 : "1" (PCIBIOS_READ_CONFIG_WORD),
34537 "b" (bx),
34538 "D" ((long)reg),
34539- "S" (&pci_indirect));
34540+ "S" (&pci_indirect),
34541+ "r" (__PCIBIOS_DS));
34542 /*
34543 * Zero-extend the result beyond 16 bits, do not trust the
34544 * BIOS having done it:
34545@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34546 *value &= 0xffff;
34547 break;
34548 case 4:
34549- __asm__("lcall *(%%esi); cld\n\t"
34550+ __asm__("movw %w6, %%ds\n\t"
34551+ "lcall *%%ss:(%%esi); cld\n\t"
34552+ "push %%ss\n\t"
34553+ "pop %%ds\n\t"
34554 "jc 1f\n\t"
34555 "xor %%ah, %%ah\n"
34556 "1:"
34557@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34558 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34559 "b" (bx),
34560 "D" ((long)reg),
34561- "S" (&pci_indirect));
34562+ "S" (&pci_indirect),
34563+ "r" (__PCIBIOS_DS));
34564 break;
34565 }
34566
34567@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34568
34569 switch (len) {
34570 case 1:
34571- __asm__("lcall *(%%esi); cld\n\t"
34572+ __asm__("movw %w6, %%ds\n\t"
34573+ "lcall *%%ss:(%%esi); cld\n\t"
34574+ "push %%ss\n\t"
34575+ "pop %%ds\n\t"
34576 "jc 1f\n\t"
34577 "xor %%ah, %%ah\n"
34578 "1:"
34579@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34580 "c" (value),
34581 "b" (bx),
34582 "D" ((long)reg),
34583- "S" (&pci_indirect));
34584+ "S" (&pci_indirect),
34585+ "r" (__PCIBIOS_DS));
34586 break;
34587 case 2:
34588- __asm__("lcall *(%%esi); cld\n\t"
34589+ __asm__("movw %w6, %%ds\n\t"
34590+ "lcall *%%ss:(%%esi); cld\n\t"
34591+ "push %%ss\n\t"
34592+ "pop %%ds\n\t"
34593 "jc 1f\n\t"
34594 "xor %%ah, %%ah\n"
34595 "1:"
34596@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34597 "c" (value),
34598 "b" (bx),
34599 "D" ((long)reg),
34600- "S" (&pci_indirect));
34601+ "S" (&pci_indirect),
34602+ "r" (__PCIBIOS_DS));
34603 break;
34604 case 4:
34605- __asm__("lcall *(%%esi); cld\n\t"
34606+ __asm__("movw %w6, %%ds\n\t"
34607+ "lcall *%%ss:(%%esi); cld\n\t"
34608+ "push %%ss\n\t"
34609+ "pop %%ds\n\t"
34610 "jc 1f\n\t"
34611 "xor %%ah, %%ah\n"
34612 "1:"
34613@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34614 "c" (value),
34615 "b" (bx),
34616 "D" ((long)reg),
34617- "S" (&pci_indirect));
34618+ "S" (&pci_indirect),
34619+ "r" (__PCIBIOS_DS));
34620 break;
34621 }
34622
34623@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34624
34625 DBG("PCI: Fetching IRQ routing table... ");
34626 __asm__("push %%es\n\t"
34627+ "movw %w8, %%ds\n\t"
34628 "push %%ds\n\t"
34629 "pop %%es\n\t"
34630- "lcall *(%%esi); cld\n\t"
34631+ "lcall *%%ss:(%%esi); cld\n\t"
34632 "pop %%es\n\t"
34633+ "push %%ss\n\t"
34634+ "pop %%ds\n"
34635 "jc 1f\n\t"
34636 "xor %%ah, %%ah\n"
34637 "1:"
34638@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34639 "1" (0),
34640 "D" ((long) &opt),
34641 "S" (&pci_indirect),
34642- "m" (opt)
34643+ "m" (opt),
34644+ "r" (__PCIBIOS_DS)
34645 : "memory");
34646 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34647 if (ret & 0xff00)
34648@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34649 {
34650 int ret;
34651
34652- __asm__("lcall *(%%esi); cld\n\t"
34653+ __asm__("movw %w5, %%ds\n\t"
34654+ "lcall *%%ss:(%%esi); cld\n\t"
34655+ "push %%ss\n\t"
34656+ "pop %%ds\n"
34657 "jc 1f\n\t"
34658 "xor %%ah, %%ah\n"
34659 "1:"
34660@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34661 : "0" (PCIBIOS_SET_PCI_HW_INT),
34662 "b" ((dev->bus->number << 8) | dev->devfn),
34663 "c" ((irq << 8) | (pin + 10)),
34664- "S" (&pci_indirect));
34665+ "S" (&pci_indirect),
34666+ "r" (__PCIBIOS_DS));
34667 return !(ret & 0xff00);
34668 }
34669 EXPORT_SYMBOL(pcibios_set_irq_routing);
34670diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34671index 40e7cda..c7e6672 100644
34672--- a/arch/x86/platform/efi/efi_32.c
34673+++ b/arch/x86/platform/efi/efi_32.c
34674@@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
34675 {
34676 struct desc_ptr gdt_descr;
34677
34678+#ifdef CONFIG_PAX_KERNEXEC
34679+ struct desc_struct d;
34680+#endif
34681+
34682 local_irq_save(efi_rt_eflags);
34683
34684 load_cr3(initial_page_table);
34685 __flush_tlb_all();
34686
34687+#ifdef CONFIG_PAX_KERNEXEC
34688+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34689+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34690+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34691+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34692+#endif
34693+
34694 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34695 gdt_descr.size = GDT_SIZE - 1;
34696 load_gdt(&gdt_descr);
34697@@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
34698 {
34699 struct desc_ptr gdt_descr;
34700
34701+#ifdef CONFIG_PAX_KERNEXEC
34702+ struct desc_struct d;
34703+
34704+ memset(&d, 0, sizeof d);
34705+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34706+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34707+#endif
34708+
34709 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34710 gdt_descr.size = GDT_SIZE - 1;
34711 load_gdt(&gdt_descr);
34712
34713+#ifdef CONFIG_PAX_PER_CPU_PGD
34714+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34715+#else
34716 load_cr3(swapper_pg_dir);
34717+#endif
34718+
34719 __flush_tlb_all();
34720
34721 local_irq_restore(efi_rt_eflags);
34722diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34723index 35aecb6..46177db 100644
34724--- a/arch/x86/platform/efi/efi_64.c
34725+++ b/arch/x86/platform/efi/efi_64.c
34726@@ -99,6 +99,11 @@ void __init efi_call_phys_prolog(void)
34727 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34728 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34729 }
34730+
34731+#ifdef CONFIG_PAX_PER_CPU_PGD
34732+ load_cr3(swapper_pg_dir);
34733+#endif
34734+
34735 __flush_tlb_all();
34736 }
34737
34738@@ -116,6 +121,11 @@ void __init efi_call_phys_epilog(void)
34739 for (pgd = 0; pgd < n_pgds; pgd++)
34740 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34741 kfree(save_pgd);
34742+
34743+#ifdef CONFIG_PAX_PER_CPU_PGD
34744+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34745+#endif
34746+
34747 __flush_tlb_all();
34748 local_irq_restore(efi_flags);
34749 early_code_mapping_set_exec(0);
34750@@ -146,8 +156,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34751 unsigned npages;
34752 pgd_t *pgd;
34753
34754- if (efi_enabled(EFI_OLD_MEMMAP))
34755+ if (efi_enabled(EFI_OLD_MEMMAP)) {
34756+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34757+ * able to execute the EFI services.
34758+ */
34759+ if (__supported_pte_mask & _PAGE_NX) {
34760+ unsigned long addr = (unsigned long) __va(0);
34761+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34762+
34763+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34764+#ifdef CONFIG_PAX_PER_CPU_PGD
34765+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34766+#endif
34767+ set_pgd(pgd_offset_k(addr), pe);
34768+ }
34769+
34770 return 0;
34771+ }
34772
34773 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34774 pgd = __va(efi_scratch.efi_pgt);
34775diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34776index 040192b..7d3300f 100644
34777--- a/arch/x86/platform/efi/efi_stub_32.S
34778+++ b/arch/x86/platform/efi/efi_stub_32.S
34779@@ -6,7 +6,9 @@
34780 */
34781
34782 #include <linux/linkage.h>
34783+#include <linux/init.h>
34784 #include <asm/page_types.h>
34785+#include <asm/segment.h>
34786
34787 /*
34788 * efi_call_phys(void *, ...) is a function with variable parameters.
34789@@ -20,7 +22,7 @@
34790 * service functions will comply with gcc calling convention, too.
34791 */
34792
34793-.text
34794+__INIT
34795 ENTRY(efi_call_phys)
34796 /*
34797 * 0. The function can only be called in Linux kernel. So CS has been
34798@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34799 * The mapping of lower virtual memory has been created in prolog and
34800 * epilog.
34801 */
34802- movl $1f, %edx
34803- subl $__PAGE_OFFSET, %edx
34804- jmp *%edx
34805+#ifdef CONFIG_PAX_KERNEXEC
34806+ movl $(__KERNEXEC_EFI_DS), %edx
34807+ mov %edx, %ds
34808+ mov %edx, %es
34809+ mov %edx, %ss
34810+ addl $2f,(1f)
34811+ ljmp *(1f)
34812+
34813+__INITDATA
34814+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34815+.previous
34816+
34817+2:
34818+ subl $2b,(1b)
34819+#else
34820+ jmp 1f-__PAGE_OFFSET
34821 1:
34822+#endif
34823
34824 /*
34825 * 2. Now on the top of stack is the return
34826@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34827 * parameter 2, ..., param n. To make things easy, we save the return
34828 * address of efi_call_phys in a global variable.
34829 */
34830- popl %edx
34831- movl %edx, saved_return_addr
34832- /* get the function pointer into ECX*/
34833- popl %ecx
34834- movl %ecx, efi_rt_function_ptr
34835- movl $2f, %edx
34836- subl $__PAGE_OFFSET, %edx
34837- pushl %edx
34838+ popl (saved_return_addr)
34839+ popl (efi_rt_function_ptr)
34840
34841 /*
34842 * 3. Clear PG bit in %CR0.
34843@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
34844 /*
34845 * 5. Call the physical function.
34846 */
34847- jmp *%ecx
34848+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
34849
34850-2:
34851 /*
34852 * 6. After EFI runtime service returns, control will return to
34853 * following instruction. We'd better readjust stack pointer first.
34854@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
34855 movl %cr0, %edx
34856 orl $0x80000000, %edx
34857 movl %edx, %cr0
34858- jmp 1f
34859-1:
34860+
34861 /*
34862 * 8. Now restore the virtual mode from flat mode by
34863 * adding EIP with PAGE_OFFSET.
34864 */
34865- movl $1f, %edx
34866- jmp *%edx
34867+#ifdef CONFIG_PAX_KERNEXEC
34868+ movl $(__KERNEL_DS), %edx
34869+ mov %edx, %ds
34870+ mov %edx, %es
34871+ mov %edx, %ss
34872+ ljmp $(__KERNEL_CS),$1f
34873+#else
34874+ jmp 1f+__PAGE_OFFSET
34875+#endif
34876 1:
34877
34878 /*
34879 * 9. Balance the stack. And because EAX contain the return value,
34880 * we'd better not clobber it.
34881 */
34882- leal efi_rt_function_ptr, %edx
34883- movl (%edx), %ecx
34884- pushl %ecx
34885+ pushl (efi_rt_function_ptr)
34886
34887 /*
34888- * 10. Push the saved return address onto the stack and return.
34889+ * 10. Return to the saved return address.
34890 */
34891- leal saved_return_addr, %edx
34892- movl (%edx), %ecx
34893- pushl %ecx
34894- ret
34895+ jmpl *(saved_return_addr)
34896 ENDPROC(efi_call_phys)
34897 .previous
34898
34899-.data
34900+__INITDATA
34901 saved_return_addr:
34902 .long 0
34903 efi_rt_function_ptr:
34904diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
34905index 5fcda72..cd4dc41 100644
34906--- a/arch/x86/platform/efi/efi_stub_64.S
34907+++ b/arch/x86/platform/efi/efi_stub_64.S
34908@@ -11,6 +11,7 @@
34909 #include <asm/msr.h>
34910 #include <asm/processor-flags.h>
34911 #include <asm/page_types.h>
34912+#include <asm/alternative-asm.h>
34913
34914 #define SAVE_XMM \
34915 mov %rsp, %rax; \
34916@@ -88,6 +89,7 @@ ENTRY(efi_call)
34917 RESTORE_PGT
34918 addq $48, %rsp
34919 RESTORE_XMM
34920+ pax_force_retaddr 0, 1
34921 ret
34922 ENDPROC(efi_call)
34923
34924@@ -245,8 +247,8 @@ efi_gdt64:
34925 .long 0 /* Filled out by user */
34926 .word 0
34927 .quad 0x0000000000000000 /* NULL descriptor */
34928- .quad 0x00af9a000000ffff /* __KERNEL_CS */
34929- .quad 0x00cf92000000ffff /* __KERNEL_DS */
34930+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
34931+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
34932 .quad 0x0080890000000000 /* TS descriptor */
34933 .quad 0x0000000000000000 /* TS continued */
34934 efi_gdt64_end:
34935diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
34936index 1bbedc4..eb795b5 100644
34937--- a/arch/x86/platform/intel-mid/intel-mid.c
34938+++ b/arch/x86/platform/intel-mid/intel-mid.c
34939@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
34940 {
34941 };
34942
34943-static void intel_mid_reboot(void)
34944+static void __noreturn intel_mid_reboot(void)
34945 {
34946 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
34947+ BUG();
34948 }
34949
34950 static unsigned long __init intel_mid_calibrate_tsc(void)
34951diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34952index 3c1c386..59a68ed 100644
34953--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34954+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34955@@ -13,6 +13,6 @@
34956 /* For every CPU addition a new get_<cpuname>_ops interface needs
34957 * to be added.
34958 */
34959-extern void *get_penwell_ops(void);
34960-extern void *get_cloverview_ops(void);
34961-extern void *get_tangier_ops(void);
34962+extern const void *get_penwell_ops(void);
34963+extern const void *get_cloverview_ops(void);
34964+extern const void *get_tangier_ops(void);
34965diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
34966index 23381d2..8ddc10e 100644
34967--- a/arch/x86/platform/intel-mid/mfld.c
34968+++ b/arch/x86/platform/intel-mid/mfld.c
34969@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
34970 pm_power_off = mfld_power_off;
34971 }
34972
34973-void *get_penwell_ops(void)
34974+const void *get_penwell_ops(void)
34975 {
34976 return &penwell_ops;
34977 }
34978
34979-void *get_cloverview_ops(void)
34980+const void *get_cloverview_ops(void)
34981 {
34982 return &penwell_ops;
34983 }
34984diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
34985index aaca917..66eadbc 100644
34986--- a/arch/x86/platform/intel-mid/mrfl.c
34987+++ b/arch/x86/platform/intel-mid/mrfl.c
34988@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
34989 .arch_setup = tangier_arch_setup,
34990 };
34991
34992-void *get_tangier_ops(void)
34993+const void *get_tangier_ops(void)
34994 {
34995 return &tangier_ops;
34996 }
34997diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
34998index d6ee929..3637cb5 100644
34999--- a/arch/x86/platform/olpc/olpc_dt.c
35000+++ b/arch/x86/platform/olpc/olpc_dt.c
35001@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35002 return res;
35003 }
35004
35005-static struct of_pdt_ops prom_olpc_ops __initdata = {
35006+static struct of_pdt_ops prom_olpc_ops __initconst = {
35007 .nextprop = olpc_dt_nextprop,
35008 .getproplen = olpc_dt_getproplen,
35009 .getproperty = olpc_dt_getproperty,
35010diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35011index 6ec7910..ecdbb11 100644
35012--- a/arch/x86/power/cpu.c
35013+++ b/arch/x86/power/cpu.c
35014@@ -137,11 +137,8 @@ static void do_fpu_end(void)
35015 static void fix_processor_context(void)
35016 {
35017 int cpu = smp_processor_id();
35018- struct tss_struct *t = &per_cpu(init_tss, cpu);
35019-#ifdef CONFIG_X86_64
35020- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35021- tss_desc tss;
35022-#endif
35023+ struct tss_struct *t = init_tss + cpu;
35024+
35025 set_tss_desc(cpu, t); /*
35026 * This just modifies memory; should not be
35027 * necessary. But... This is necessary, because
35028@@ -150,10 +147,6 @@ static void fix_processor_context(void)
35029 */
35030
35031 #ifdef CONFIG_X86_64
35032- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35033- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35034- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35035-
35036 syscall_init(); /* This sets MSR_*STAR and related */
35037 #endif
35038 load_TR_desc(); /* This does ltr */
35039diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35040index bad628a..a102610 100644
35041--- a/arch/x86/realmode/init.c
35042+++ b/arch/x86/realmode/init.c
35043@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35044 __va(real_mode_header->trampoline_header);
35045
35046 #ifdef CONFIG_X86_32
35047- trampoline_header->start = __pa_symbol(startup_32_smp);
35048+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35049+
35050+#ifdef CONFIG_PAX_KERNEXEC
35051+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35052+#endif
35053+
35054+ trampoline_header->boot_cs = __BOOT_CS;
35055 trampoline_header->gdt_limit = __BOOT_DS + 7;
35056 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35057 #else
35058@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35059 *trampoline_cr4_features = read_cr4();
35060
35061 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35062- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35063+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35064 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35065 #endif
35066 }
35067diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35068index 7c0d7be..d24dc88 100644
35069--- a/arch/x86/realmode/rm/Makefile
35070+++ b/arch/x86/realmode/rm/Makefile
35071@@ -67,5 +67,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35072
35073 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35074 -I$(srctree)/arch/x86/boot
35075+ifdef CONSTIFY_PLUGIN
35076+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35077+endif
35078 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35079 GCOV_PROFILE := n
35080diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35081index a28221d..93c40f1 100644
35082--- a/arch/x86/realmode/rm/header.S
35083+++ b/arch/x86/realmode/rm/header.S
35084@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35085 #endif
35086 /* APM/BIOS reboot */
35087 .long pa_machine_real_restart_asm
35088-#ifdef CONFIG_X86_64
35089+#ifdef CONFIG_X86_32
35090+ .long __KERNEL_CS
35091+#else
35092 .long __KERNEL32_CS
35093 #endif
35094 END(real_mode_header)
35095diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35096index 48ddd76..c26749f 100644
35097--- a/arch/x86/realmode/rm/trampoline_32.S
35098+++ b/arch/x86/realmode/rm/trampoline_32.S
35099@@ -24,6 +24,12 @@
35100 #include <asm/page_types.h>
35101 #include "realmode.h"
35102
35103+#ifdef CONFIG_PAX_KERNEXEC
35104+#define ta(X) (X)
35105+#else
35106+#define ta(X) (pa_ ## X)
35107+#endif
35108+
35109 .text
35110 .code16
35111
35112@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35113
35114 cli # We should be safe anyway
35115
35116- movl tr_start, %eax # where we need to go
35117-
35118 movl $0xA5A5A5A5, trampoline_status
35119 # write marker for master knows we're running
35120
35121@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35122 movw $1, %dx # protected mode (PE) bit
35123 lmsw %dx # into protected mode
35124
35125- ljmpl $__BOOT_CS, $pa_startup_32
35126+ ljmpl *(trampoline_header)
35127
35128 .section ".text32","ax"
35129 .code32
35130@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35131 .balign 8
35132 GLOBAL(trampoline_header)
35133 tr_start: .space 4
35134- tr_gdt_pad: .space 2
35135+ tr_boot_cs: .space 2
35136 tr_gdt: .space 6
35137 END(trampoline_header)
35138
35139diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35140index dac7b20..72dbaca 100644
35141--- a/arch/x86/realmode/rm/trampoline_64.S
35142+++ b/arch/x86/realmode/rm/trampoline_64.S
35143@@ -93,6 +93,7 @@ ENTRY(startup_32)
35144 movl %edx, %gs
35145
35146 movl pa_tr_cr4, %eax
35147+ andl $~X86_CR4_PCIDE, %eax
35148 movl %eax, %cr4 # Enable PAE mode
35149
35150 # Setup trampoline 4 level pagetables
35151@@ -106,7 +107,7 @@ ENTRY(startup_32)
35152 wrmsr
35153
35154 # Enable paging and in turn activate Long Mode
35155- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35156+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35157 movl %eax, %cr0
35158
35159 /*
35160diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35161index 9e7e147..25a4158 100644
35162--- a/arch/x86/realmode/rm/wakeup_asm.S
35163+++ b/arch/x86/realmode/rm/wakeup_asm.S
35164@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35165 lgdtl pmode_gdt
35166
35167 /* This really couldn't... */
35168- movl pmode_entry, %eax
35169 movl pmode_cr0, %ecx
35170 movl %ecx, %cr0
35171- ljmpl $__KERNEL_CS, $pa_startup_32
35172- /* -> jmp *%eax in trampoline_32.S */
35173+
35174+ ljmpl *pmode_entry
35175 #else
35176 jmp trampoline_start
35177 #endif
35178diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35179index 604a37e..e49702a 100644
35180--- a/arch/x86/tools/Makefile
35181+++ b/arch/x86/tools/Makefile
35182@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35183
35184 $(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
35185
35186-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35187+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35188 hostprogs-y += relocs
35189 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35190 PHONY += relocs
35191diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35192index a5efb21..97490e9 100644
35193--- a/arch/x86/tools/relocs.c
35194+++ b/arch/x86/tools/relocs.c
35195@@ -1,5 +1,7 @@
35196 /* This is included from relocs_32/64.c */
35197
35198+#include "../../../include/generated/autoconf.h"
35199+
35200 #define ElfW(type) _ElfW(ELF_BITS, type)
35201 #define _ElfW(bits, type) __ElfW(bits, type)
35202 #define __ElfW(bits, type) Elf##bits##_##type
35203@@ -11,6 +13,7 @@
35204 #define Elf_Sym ElfW(Sym)
35205
35206 static Elf_Ehdr ehdr;
35207+static Elf_Phdr *phdr;
35208
35209 struct relocs {
35210 uint32_t *offset;
35211@@ -383,9 +386,39 @@ static void read_ehdr(FILE *fp)
35212 }
35213 }
35214
35215+static void read_phdrs(FILE *fp)
35216+{
35217+ unsigned int i;
35218+
35219+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35220+ if (!phdr) {
35221+ die("Unable to allocate %d program headers\n",
35222+ ehdr.e_phnum);
35223+ }
35224+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35225+ die("Seek to %d failed: %s\n",
35226+ ehdr.e_phoff, strerror(errno));
35227+ }
35228+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35229+ die("Cannot read ELF program headers: %s\n",
35230+ strerror(errno));
35231+ }
35232+ for(i = 0; i < ehdr.e_phnum; i++) {
35233+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35234+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35235+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35236+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35237+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35238+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35239+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35240+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35241+ }
35242+
35243+}
35244+
35245 static void read_shdrs(FILE *fp)
35246 {
35247- int i;
35248+ unsigned int i;
35249 Elf_Shdr shdr;
35250
35251 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35252@@ -420,7 +453,7 @@ static void read_shdrs(FILE *fp)
35253
35254 static void read_strtabs(FILE *fp)
35255 {
35256- int i;
35257+ unsigned int i;
35258 for (i = 0; i < ehdr.e_shnum; i++) {
35259 struct section *sec = &secs[i];
35260 if (sec->shdr.sh_type != SHT_STRTAB) {
35261@@ -445,7 +478,7 @@ static void read_strtabs(FILE *fp)
35262
35263 static void read_symtabs(FILE *fp)
35264 {
35265- int i,j;
35266+ unsigned int i,j;
35267 for (i = 0; i < ehdr.e_shnum; i++) {
35268 struct section *sec = &secs[i];
35269 if (sec->shdr.sh_type != SHT_SYMTAB) {
35270@@ -476,9 +509,11 @@ static void read_symtabs(FILE *fp)
35271 }
35272
35273
35274-static void read_relocs(FILE *fp)
35275+static void read_relocs(FILE *fp, int use_real_mode)
35276 {
35277- int i,j;
35278+ unsigned int i,j;
35279+ uint32_t base;
35280+
35281 for (i = 0; i < ehdr.e_shnum; i++) {
35282 struct section *sec = &secs[i];
35283 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35284@@ -498,9 +533,22 @@ static void read_relocs(FILE *fp)
35285 die("Cannot read symbol table: %s\n",
35286 strerror(errno));
35287 }
35288+ base = 0;
35289+
35290+#ifdef CONFIG_X86_32
35291+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35292+ if (phdr[j].p_type != PT_LOAD )
35293+ continue;
35294+ 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)
35295+ continue;
35296+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35297+ break;
35298+ }
35299+#endif
35300+
35301 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35302 Elf_Rel *rel = &sec->reltab[j];
35303- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35304+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35305 rel->r_info = elf_xword_to_cpu(rel->r_info);
35306 #if (SHT_REL_TYPE == SHT_RELA)
35307 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35308@@ -512,7 +560,7 @@ static void read_relocs(FILE *fp)
35309
35310 static void print_absolute_symbols(void)
35311 {
35312- int i;
35313+ unsigned int i;
35314 const char *format;
35315
35316 if (ELF_BITS == 64)
35317@@ -525,7 +573,7 @@ static void print_absolute_symbols(void)
35318 for (i = 0; i < ehdr.e_shnum; i++) {
35319 struct section *sec = &secs[i];
35320 char *sym_strtab;
35321- int j;
35322+ unsigned int j;
35323
35324 if (sec->shdr.sh_type != SHT_SYMTAB) {
35325 continue;
35326@@ -552,7 +600,7 @@ static void print_absolute_symbols(void)
35327
35328 static void print_absolute_relocs(void)
35329 {
35330- int i, printed = 0;
35331+ unsigned int i, printed = 0;
35332 const char *format;
35333
35334 if (ELF_BITS == 64)
35335@@ -565,7 +613,7 @@ static void print_absolute_relocs(void)
35336 struct section *sec_applies, *sec_symtab;
35337 char *sym_strtab;
35338 Elf_Sym *sh_symtab;
35339- int j;
35340+ unsigned int j;
35341 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35342 continue;
35343 }
35344@@ -642,13 +690,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35345 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35346 Elf_Sym *sym, const char *symname))
35347 {
35348- int i;
35349+ unsigned int i;
35350 /* Walk through the relocations */
35351 for (i = 0; i < ehdr.e_shnum; i++) {
35352 char *sym_strtab;
35353 Elf_Sym *sh_symtab;
35354 struct section *sec_applies, *sec_symtab;
35355- int j;
35356+ unsigned int j;
35357 struct section *sec = &secs[i];
35358
35359 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35360@@ -822,6 +870,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35361 {
35362 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35363 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35364+ char *sym_strtab = sec->link->link->strtab;
35365+
35366+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35367+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35368+ return 0;
35369+
35370+#ifdef CONFIG_PAX_KERNEXEC
35371+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35372+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35373+ return 0;
35374+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35375+ return 0;
35376+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35377+ return 0;
35378+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35379+ return 0;
35380+#endif
35381
35382 switch (r_type) {
35383 case R_386_NONE:
35384@@ -960,7 +1025,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35385
35386 static void emit_relocs(int as_text, int use_real_mode)
35387 {
35388- int i;
35389+ unsigned int i;
35390 int (*write_reloc)(uint32_t, FILE *) = write32;
35391 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35392 const char *symname);
35393@@ -1060,10 +1125,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35394 {
35395 regex_init(use_real_mode);
35396 read_ehdr(fp);
35397+ read_phdrs(fp);
35398 read_shdrs(fp);
35399 read_strtabs(fp);
35400 read_symtabs(fp);
35401- read_relocs(fp);
35402+ read_relocs(fp, use_real_mode);
35403 if (ELF_BITS == 64)
35404 percpu_init();
35405 if (show_absolute_syms) {
35406diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35407index f40281e..92728c9 100644
35408--- a/arch/x86/um/mem_32.c
35409+++ b/arch/x86/um/mem_32.c
35410@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35411 gate_vma.vm_start = FIXADDR_USER_START;
35412 gate_vma.vm_end = FIXADDR_USER_END;
35413 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35414- gate_vma.vm_page_prot = __P101;
35415+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35416
35417 return 0;
35418 }
35419diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35420index 80ffa5b..a33bd15 100644
35421--- a/arch/x86/um/tls_32.c
35422+++ b/arch/x86/um/tls_32.c
35423@@ -260,7 +260,7 @@ out:
35424 if (unlikely(task == current &&
35425 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35426 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35427- "without flushed TLS.", current->pid);
35428+ "without flushed TLS.", task_pid_nr(current));
35429 }
35430
35431 return 0;
35432diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35433index 5a4affe..9e2d522 100644
35434--- a/arch/x86/vdso/Makefile
35435+++ b/arch/x86/vdso/Makefile
35436@@ -174,7 +174,7 @@ quiet_cmd_vdso = VDSO $@
35437 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35438 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35439
35440-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35441+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35442 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35443 GCOV_PROFILE := n
35444
35445diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35446index 0224987..c7d65a5 100644
35447--- a/arch/x86/vdso/vdso2c.h
35448+++ b/arch/x86/vdso/vdso2c.h
35449@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35450 unsigned long load_size = -1; /* Work around bogus warning */
35451 unsigned long mapping_size;
35452 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35453- int i;
35454+ unsigned int i;
35455 unsigned long j;
35456 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35457 *alt_sec = NULL;
35458diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35459index e904c27..b9eaa03 100644
35460--- a/arch/x86/vdso/vdso32-setup.c
35461+++ b/arch/x86/vdso/vdso32-setup.c
35462@@ -14,6 +14,7 @@
35463 #include <asm/cpufeature.h>
35464 #include <asm/processor.h>
35465 #include <asm/vdso.h>
35466+#include <asm/mman.h>
35467
35468 #ifdef CONFIG_COMPAT_VDSO
35469 #define VDSO_DEFAULT 0
35470diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35471index 970463b..da82d3e 100644
35472--- a/arch/x86/vdso/vma.c
35473+++ b/arch/x86/vdso/vma.c
35474@@ -16,10 +16,9 @@
35475 #include <asm/vdso.h>
35476 #include <asm/page.h>
35477 #include <asm/hpet.h>
35478+#include <asm/mman.h>
35479
35480 #if defined(CONFIG_X86_64)
35481-unsigned int __read_mostly vdso64_enabled = 1;
35482-
35483 extern unsigned short vdso_sync_cpuid;
35484 #endif
35485
35486@@ -101,6 +100,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35487 .pages = no_pages,
35488 };
35489
35490+#ifdef CONFIG_PAX_RANDMMAP
35491+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35492+ calculate_addr = false;
35493+#endif
35494+
35495 if (calculate_addr) {
35496 addr = vdso_addr(current->mm->start_stack,
35497 image->size - image->sym_vvar_start);
35498@@ -111,14 +115,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35499 down_write(&mm->mmap_sem);
35500
35501 addr = get_unmapped_area(NULL, addr,
35502- image->size - image->sym_vvar_start, 0, 0);
35503+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35504 if (IS_ERR_VALUE(addr)) {
35505 ret = addr;
35506 goto up_fail;
35507 }
35508
35509 text_start = addr - image->sym_vvar_start;
35510- current->mm->context.vdso = (void __user *)text_start;
35511+ mm->context.vdso = text_start;
35512
35513 /*
35514 * MAYWRITE to allow gdb to COW and set breakpoints
35515@@ -163,15 +167,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35516 hpet_address >> PAGE_SHIFT,
35517 PAGE_SIZE,
35518 pgprot_noncached(PAGE_READONLY));
35519-
35520- if (ret)
35521- goto up_fail;
35522 }
35523 #endif
35524
35525 up_fail:
35526 if (ret)
35527- current->mm->context.vdso = NULL;
35528+ current->mm->context.vdso = 0;
35529
35530 up_write(&mm->mmap_sem);
35531 return ret;
35532@@ -191,8 +192,8 @@ static int load_vdso32(void)
35533
35534 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35535 current_thread_info()->sysenter_return =
35536- current->mm->context.vdso +
35537- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35538+ (void __force_user *)(current->mm->context.vdso +
35539+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35540
35541 return 0;
35542 }
35543@@ -201,9 +202,6 @@ static int load_vdso32(void)
35544 #ifdef CONFIG_X86_64
35545 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35546 {
35547- if (!vdso64_enabled)
35548- return 0;
35549-
35550 return map_vdso(&vdso_image_64, true);
35551 }
35552
35553@@ -212,12 +210,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35554 int uses_interp)
35555 {
35556 #ifdef CONFIG_X86_X32_ABI
35557- if (test_thread_flag(TIF_X32)) {
35558- if (!vdso64_enabled)
35559- return 0;
35560-
35561+ if (test_thread_flag(TIF_X32))
35562 return map_vdso(&vdso_image_x32, true);
35563- }
35564 #endif
35565
35566 return load_vdso32();
35567@@ -229,12 +223,3 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35568 return load_vdso32();
35569 }
35570 #endif
35571-
35572-#ifdef CONFIG_X86_64
35573-static __init int vdso_setup(char *s)
35574-{
35575- vdso64_enabled = simple_strtoul(s, NULL, 0);
35576- return 0;
35577-}
35578-__setup("vdso=", vdso_setup);
35579-#endif
35580diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35581index e88fda8..76ce7ce 100644
35582--- a/arch/x86/xen/Kconfig
35583+++ b/arch/x86/xen/Kconfig
35584@@ -9,6 +9,7 @@ config XEN
35585 select XEN_HAVE_PVMMU
35586 depends on X86_64 || (X86_32 && X86_PAE)
35587 depends on X86_TSC
35588+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35589 help
35590 This is the Linux Xen port. Enabling this will allow the
35591 kernel to boot in a paravirtualized environment under the
35592diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35593index fac5e4f..5b5cf4f 100644
35594--- a/arch/x86/xen/enlighten.c
35595+++ b/arch/x86/xen/enlighten.c
35596@@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35597
35598 struct shared_info xen_dummy_shared_info;
35599
35600-void *xen_initial_gdt;
35601-
35602 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35603 __read_mostly int xen_have_vector_callback;
35604 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35605@@ -542,8 +540,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35606 {
35607 unsigned long va = dtr->address;
35608 unsigned int size = dtr->size + 1;
35609- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35610- unsigned long frames[pages];
35611+ unsigned long frames[65536 / PAGE_SIZE];
35612 int f;
35613
35614 /*
35615@@ -591,8 +588,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35616 {
35617 unsigned long va = dtr->address;
35618 unsigned int size = dtr->size + 1;
35619- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35620- unsigned long frames[pages];
35621+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35622 int f;
35623
35624 /*
35625@@ -600,7 +596,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35626 * 8-byte entries, or 16 4k pages..
35627 */
35628
35629- BUG_ON(size > 65536);
35630+ BUG_ON(size > GDT_SIZE);
35631 BUG_ON(va & ~PAGE_MASK);
35632
35633 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35634@@ -989,7 +985,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35635 return 0;
35636 }
35637
35638-static void set_xen_basic_apic_ops(void)
35639+static void __init set_xen_basic_apic_ops(void)
35640 {
35641 apic->read = xen_apic_read;
35642 apic->write = xen_apic_write;
35643@@ -1295,30 +1291,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35644 #endif
35645 };
35646
35647-static void xen_reboot(int reason)
35648+static __noreturn void xen_reboot(int reason)
35649 {
35650 struct sched_shutdown r = { .reason = reason };
35651
35652- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35653- BUG();
35654+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35655+ BUG();
35656 }
35657
35658-static void xen_restart(char *msg)
35659+static __noreturn void xen_restart(char *msg)
35660 {
35661 xen_reboot(SHUTDOWN_reboot);
35662 }
35663
35664-static void xen_emergency_restart(void)
35665+static __noreturn void xen_emergency_restart(void)
35666 {
35667 xen_reboot(SHUTDOWN_reboot);
35668 }
35669
35670-static void xen_machine_halt(void)
35671+static __noreturn void xen_machine_halt(void)
35672 {
35673 xen_reboot(SHUTDOWN_poweroff);
35674 }
35675
35676-static void xen_machine_power_off(void)
35677+static __noreturn void xen_machine_power_off(void)
35678 {
35679 if (pm_power_off)
35680 pm_power_off();
35681@@ -1573,7 +1569,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35682 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35683
35684 /* Work out if we support NX */
35685- x86_configure_nx();
35686+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35687+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35688+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35689+ unsigned l, h;
35690+
35691+ __supported_pte_mask |= _PAGE_NX;
35692+ rdmsr(MSR_EFER, l, h);
35693+ l |= EFER_NX;
35694+ wrmsr(MSR_EFER, l, h);
35695+ }
35696+#endif
35697
35698 /* Get mfn list */
35699 xen_build_dynamic_phys_to_machine();
35700@@ -1601,13 +1607,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35701
35702 machine_ops = xen_machine_ops;
35703
35704- /*
35705- * The only reliable way to retain the initial address of the
35706- * percpu gdt_page is to remember it here, so we can go and
35707- * mark it RW later, when the initial percpu area is freed.
35708- */
35709- xen_initial_gdt = &per_cpu(gdt_page, 0);
35710-
35711 xen_smp_init();
35712
35713 #ifdef CONFIG_ACPI_NUMA
35714diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35715index a8a1a3d..8216142 100644
35716--- a/arch/x86/xen/mmu.c
35717+++ b/arch/x86/xen/mmu.c
35718@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35719 return val;
35720 }
35721
35722-static pteval_t pte_pfn_to_mfn(pteval_t val)
35723+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35724 {
35725 if (val & _PAGE_PRESENT) {
35726 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35727@@ -1867,7 +1867,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35728 * L3_k[511] -> level2_fixmap_pgt */
35729 convert_pfn_mfn(level3_kernel_pgt);
35730
35731+ convert_pfn_mfn(level3_vmalloc_start_pgt);
35732+ convert_pfn_mfn(level3_vmalloc_end_pgt);
35733+ convert_pfn_mfn(level3_vmemmap_pgt);
35734 /* L3_k[511][506] -> level1_fixmap_pgt */
35735+ /* L3_k[511][507] -> level1_vsyscall_pgt */
35736 convert_pfn_mfn(level2_fixmap_pgt);
35737 }
35738 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35739@@ -1892,11 +1896,16 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35740 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35741 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35742 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35743+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35744+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35745+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35746 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35747 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35748+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35749 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35750 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35751 set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
35752+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
35753
35754 /* Pin down new L4 */
35755 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
35756@@ -2080,6 +2089,7 @@ static void __init xen_post_allocator_init(void)
35757 pv_mmu_ops.set_pud = xen_set_pud;
35758 #if PAGETABLE_LEVELS == 4
35759 pv_mmu_ops.set_pgd = xen_set_pgd;
35760+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35761 #endif
35762
35763 /* This will work as long as patching hasn't happened yet
35764@@ -2158,6 +2168,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35765 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35766 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35767 .set_pgd = xen_set_pgd_hyper,
35768+ .set_pgd_batched = xen_set_pgd_hyper,
35769
35770 .alloc_pud = xen_alloc_pmd_init,
35771 .release_pud = xen_release_pmd_init,
35772diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35773index 4c071ae..00e7049 100644
35774--- a/arch/x86/xen/smp.c
35775+++ b/arch/x86/xen/smp.c
35776@@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35777
35778 if (xen_pv_domain()) {
35779 if (!xen_feature(XENFEAT_writable_page_tables))
35780- /* We've switched to the "real" per-cpu gdt, so make
35781- * sure the old memory can be recycled. */
35782- make_lowmem_page_readwrite(xen_initial_gdt);
35783-
35784 #ifdef CONFIG_X86_32
35785 /*
35786 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35787 * expects __USER_DS
35788 */
35789- loadsegment(ds, __USER_DS);
35790- loadsegment(es, __USER_DS);
35791+ loadsegment(ds, __KERNEL_DS);
35792+ loadsegment(es, __KERNEL_DS);
35793 #endif
35794
35795 xen_filter_cpu_maps();
35796@@ -379,7 +375,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35797 #ifdef CONFIG_X86_32
35798 /* Note: PVH is not yet supported on x86_32. */
35799 ctxt->user_regs.fs = __KERNEL_PERCPU;
35800- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
35801+ savesegment(gs, ctxt->user_regs.gs);
35802 #endif
35803 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
35804
35805@@ -387,8 +383,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35806 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
35807 ctxt->flags = VGCF_IN_KERNEL;
35808 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
35809- ctxt->user_regs.ds = __USER_DS;
35810- ctxt->user_regs.es = __USER_DS;
35811+ ctxt->user_regs.ds = __KERNEL_DS;
35812+ ctxt->user_regs.es = __KERNEL_DS;
35813 ctxt->user_regs.ss = __KERNEL_DS;
35814
35815 xen_copy_trap_info(ctxt->trap_ctxt);
35816@@ -446,14 +442,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
35817 int rc;
35818
35819 per_cpu(current_task, cpu) = idle;
35820+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
35821 #ifdef CONFIG_X86_32
35822 irq_ctx_init(cpu);
35823 #else
35824 clear_tsk_thread_flag(idle, TIF_FORK);
35825 #endif
35826- per_cpu(kernel_stack, cpu) =
35827- (unsigned long)task_stack_page(idle) -
35828- KERNEL_STACK_OFFSET + THREAD_SIZE;
35829+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
35830
35831 xen_setup_runstate_info(cpu);
35832 xen_setup_timer(cpu);
35833@@ -732,7 +727,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
35834
35835 void __init xen_smp_init(void)
35836 {
35837- smp_ops = xen_smp_ops;
35838+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
35839 xen_fill_possible_map();
35840 }
35841
35842diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
35843index fd92a64..1f72641 100644
35844--- a/arch/x86/xen/xen-asm_32.S
35845+++ b/arch/x86/xen/xen-asm_32.S
35846@@ -99,7 +99,7 @@ ENTRY(xen_iret)
35847 pushw %fs
35848 movl $(__KERNEL_PERCPU), %eax
35849 movl %eax, %fs
35850- movl %fs:xen_vcpu, %eax
35851+ mov PER_CPU_VAR(xen_vcpu), %eax
35852 POP_FS
35853 #else
35854 movl %ss:xen_vcpu, %eax
35855diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
35856index 674b2225..f1f5dc1 100644
35857--- a/arch/x86/xen/xen-head.S
35858+++ b/arch/x86/xen/xen-head.S
35859@@ -39,6 +39,17 @@ ENTRY(startup_xen)
35860 #ifdef CONFIG_X86_32
35861 mov %esi,xen_start_info
35862 mov $init_thread_union+THREAD_SIZE,%esp
35863+#ifdef CONFIG_SMP
35864+ movl $cpu_gdt_table,%edi
35865+ movl $__per_cpu_load,%eax
35866+ movw %ax,__KERNEL_PERCPU + 2(%edi)
35867+ rorl $16,%eax
35868+ movb %al,__KERNEL_PERCPU + 4(%edi)
35869+ movb %ah,__KERNEL_PERCPU + 7(%edi)
35870+ movl $__per_cpu_end - 1,%eax
35871+ subl $__per_cpu_start,%eax
35872+ movw %ax,__KERNEL_PERCPU + 0(%edi)
35873+#endif
35874 #else
35875 mov %rsi,xen_start_info
35876 mov $init_thread_union+THREAD_SIZE,%rsp
35877diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
35878index 28c7e0b..2acfec7 100644
35879--- a/arch/x86/xen/xen-ops.h
35880+++ b/arch/x86/xen/xen-ops.h
35881@@ -10,8 +10,6 @@
35882 extern const char xen_hypervisor_callback[];
35883 extern const char xen_failsafe_callback[];
35884
35885-extern void *xen_initial_gdt;
35886-
35887 struct trap_info;
35888 void xen_copy_trap_info(struct trap_info *traps);
35889
35890diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
35891index 525bd3d..ef888b1 100644
35892--- a/arch/xtensa/variants/dc232b/include/variant/core.h
35893+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
35894@@ -119,9 +119,9 @@
35895 ----------------------------------------------------------------------*/
35896
35897 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
35898-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
35899 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
35900 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
35901+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35902
35903 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
35904 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
35905diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
35906index 2f33760..835e50a 100644
35907--- a/arch/xtensa/variants/fsf/include/variant/core.h
35908+++ b/arch/xtensa/variants/fsf/include/variant/core.h
35909@@ -11,6 +11,7 @@
35910 #ifndef _XTENSA_CORE_H
35911 #define _XTENSA_CORE_H
35912
35913+#include <linux/const.h>
35914
35915 /****************************************************************************
35916 Parameters Useful for Any Code, USER or PRIVILEGED
35917@@ -112,9 +113,9 @@
35918 ----------------------------------------------------------------------*/
35919
35920 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35921-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35922 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35923 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35924+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35925
35926 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
35927 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
35928diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
35929index af00795..2bb8105 100644
35930--- a/arch/xtensa/variants/s6000/include/variant/core.h
35931+++ b/arch/xtensa/variants/s6000/include/variant/core.h
35932@@ -11,6 +11,7 @@
35933 #ifndef _XTENSA_CORE_CONFIGURATION_H
35934 #define _XTENSA_CORE_CONFIGURATION_H
35935
35936+#include <linux/const.h>
35937
35938 /****************************************************************************
35939 Parameters Useful for Any Code, USER or PRIVILEGED
35940@@ -118,9 +119,9 @@
35941 ----------------------------------------------------------------------*/
35942
35943 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35944-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35945 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35946 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35947+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35948
35949 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
35950 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
35951diff --git a/block/bio.c b/block/bio.c
35952index 3e6e198..5c65199 100644
35953--- a/block/bio.c
35954+++ b/block/bio.c
35955@@ -1163,7 +1163,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
35956 /*
35957 * Overflow, abort
35958 */
35959- if (end < start)
35960+ if (end < start || end - start > INT_MAX - nr_pages)
35961 return ERR_PTR(-EINVAL);
35962
35963 nr_pages += end - start;
35964@@ -1297,7 +1297,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
35965 /*
35966 * Overflow, abort
35967 */
35968- if (end < start)
35969+ if (end < start || end - start > INT_MAX - nr_pages)
35970 return ERR_PTR(-EINVAL);
35971
35972 nr_pages += end - start;
35973@@ -1559,7 +1559,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
35974 const int read = bio_data_dir(bio) == READ;
35975 struct bio_map_data *bmd = bio->bi_private;
35976 int i;
35977- char *p = bmd->sgvecs[0].iov_base;
35978+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
35979
35980 bio_for_each_segment_all(bvec, bio, i) {
35981 char *addr = page_address(bvec->bv_page);
35982diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
35983index 0736729..2ec3b48 100644
35984--- a/block/blk-iopoll.c
35985+++ b/block/blk-iopoll.c
35986@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
35987 }
35988 EXPORT_SYMBOL(blk_iopoll_complete);
35989
35990-static void blk_iopoll_softirq(struct softirq_action *h)
35991+static __latent_entropy void blk_iopoll_softirq(void)
35992 {
35993 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
35994 int rearm = 0, budget = blk_iopoll_budget;
35995diff --git a/block/blk-map.c b/block/blk-map.c
35996index f890d43..97b0482 100644
35997--- a/block/blk-map.c
35998+++ b/block/blk-map.c
35999@@ -300,7 +300,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36000 if (!len || !kbuf)
36001 return -EINVAL;
36002
36003- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36004+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36005 if (do_copy)
36006 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36007 else
36008diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36009index 53b1737..08177d2e 100644
36010--- a/block/blk-softirq.c
36011+++ b/block/blk-softirq.c
36012@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36013 * Softirq action handler - move entries to local list and loop over them
36014 * while passing them to the queue registered handler.
36015 */
36016-static void blk_done_softirq(struct softirq_action *h)
36017+static __latent_entropy void blk_done_softirq(void)
36018 {
36019 struct list_head *cpu_list, local_list;
36020
36021diff --git a/block/bsg.c b/block/bsg.c
36022index 276e869..6fe4c61 100644
36023--- a/block/bsg.c
36024+++ b/block/bsg.c
36025@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36026 struct sg_io_v4 *hdr, struct bsg_device *bd,
36027 fmode_t has_write_perm)
36028 {
36029+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36030+ unsigned char *cmdptr;
36031+
36032 if (hdr->request_len > BLK_MAX_CDB) {
36033 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36034 if (!rq->cmd)
36035 return -ENOMEM;
36036- }
36037+ cmdptr = rq->cmd;
36038+ } else
36039+ cmdptr = tmpcmd;
36040
36041- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36042+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36043 hdr->request_len))
36044 return -EFAULT;
36045
36046+ if (cmdptr != rq->cmd)
36047+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36048+
36049 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36050 if (blk_verify_command(rq->cmd, has_write_perm))
36051 return -EPERM;
36052diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36053index f678c73..f35aa18 100644
36054--- a/block/compat_ioctl.c
36055+++ b/block/compat_ioctl.c
36056@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36057 cgc = compat_alloc_user_space(sizeof(*cgc));
36058 cgc32 = compat_ptr(arg);
36059
36060- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36061+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36062 get_user(data, &cgc32->buffer) ||
36063 put_user(compat_ptr(data), &cgc->buffer) ||
36064 copy_in_user(&cgc->buflen, &cgc32->buflen,
36065@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36066 err |= __get_user(f->spec1, &uf->spec1);
36067 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36068 err |= __get_user(name, &uf->name);
36069- f->name = compat_ptr(name);
36070+ f->name = (void __force_kernel *)compat_ptr(name);
36071 if (err) {
36072 err = -EFAULT;
36073 goto out;
36074diff --git a/block/genhd.c b/block/genhd.c
36075index bd30606..bbc9b90 100644
36076--- a/block/genhd.c
36077+++ b/block/genhd.c
36078@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36079
36080 /*
36081 * Register device numbers dev..(dev+range-1)
36082- * range must be nonzero
36083+ * Noop if @range is zero.
36084 * The hash chain is sorted on range, so that subranges can override.
36085 */
36086 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36087 struct kobject *(*probe)(dev_t, int *, void *),
36088 int (*lock)(dev_t, void *), void *data)
36089 {
36090- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36091+ if (range)
36092+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36093 }
36094
36095 EXPORT_SYMBOL(blk_register_region);
36096
36097+/* undo blk_register_region(), noop if @range is zero */
36098 void blk_unregister_region(dev_t devt, unsigned long range)
36099 {
36100- kobj_unmap(bdev_map, devt, range);
36101+ if (range)
36102+ kobj_unmap(bdev_map, devt, range);
36103 }
36104
36105 EXPORT_SYMBOL(blk_unregister_region);
36106diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36107index 56d08fd..2e07090 100644
36108--- a/block/partitions/efi.c
36109+++ b/block/partitions/efi.c
36110@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36111 if (!gpt)
36112 return NULL;
36113
36114+ if (!le32_to_cpu(gpt->num_partition_entries))
36115+ return NULL;
36116+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36117+ if (!pte)
36118+ return NULL;
36119+
36120 count = le32_to_cpu(gpt->num_partition_entries) *
36121 le32_to_cpu(gpt->sizeof_partition_entry);
36122- if (!count)
36123- return NULL;
36124- pte = kmalloc(count, GFP_KERNEL);
36125- if (!pte)
36126- return NULL;
36127-
36128 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36129 (u8 *) pte, count) < count) {
36130 kfree(pte);
36131diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36132index b0c2a61..10bb6ec 100644
36133--- a/block/scsi_ioctl.c
36134+++ b/block/scsi_ioctl.c
36135@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36136 return put_user(0, p);
36137 }
36138
36139-static int sg_get_timeout(struct request_queue *q)
36140+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36141 {
36142 return jiffies_to_clock_t(q->sg_timeout);
36143 }
36144@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36145 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36146 struct sg_io_hdr *hdr, fmode_t mode)
36147 {
36148- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36149+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36150+ unsigned char *cmdptr;
36151+
36152+ if (rq->cmd != rq->__cmd)
36153+ cmdptr = rq->cmd;
36154+ else
36155+ cmdptr = tmpcmd;
36156+
36157+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36158 return -EFAULT;
36159+
36160+ if (cmdptr != rq->cmd)
36161+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36162+
36163 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36164 return -EPERM;
36165
36166@@ -431,6 +443,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36167 int err;
36168 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36169 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36170+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36171+ unsigned char *cmdptr;
36172
36173 if (!sic)
36174 return -EINVAL;
36175@@ -469,9 +483,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36176 */
36177 err = -EFAULT;
36178 rq->cmd_len = cmdlen;
36179- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36180+
36181+ if (rq->cmd != rq->__cmd)
36182+ cmdptr = rq->cmd;
36183+ else
36184+ cmdptr = tmpcmd;
36185+
36186+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36187 goto error;
36188
36189+ if (rq->cmd != cmdptr)
36190+ memcpy(rq->cmd, cmdptr, cmdlen);
36191+
36192 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36193 goto error;
36194
36195diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36196index e592c90..c566114 100644
36197--- a/crypto/cryptd.c
36198+++ b/crypto/cryptd.c
36199@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36200
36201 struct cryptd_blkcipher_request_ctx {
36202 crypto_completion_t complete;
36203-};
36204+} __no_const;
36205
36206 struct cryptd_hash_ctx {
36207 struct crypto_shash *child;
36208@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36209
36210 struct cryptd_aead_request_ctx {
36211 crypto_completion_t complete;
36212-};
36213+} __no_const;
36214
36215 static void cryptd_queue_worker(struct work_struct *work);
36216
36217diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36218index 309d345..1632720 100644
36219--- a/crypto/pcrypt.c
36220+++ b/crypto/pcrypt.c
36221@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36222 int ret;
36223
36224 pinst->kobj.kset = pcrypt_kset;
36225- ret = kobject_add(&pinst->kobj, NULL, name);
36226+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36227 if (!ret)
36228 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36229
36230diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36231index 6921c7f..78e1af7 100644
36232--- a/drivers/acpi/acpica/hwxfsleep.c
36233+++ b/drivers/acpi/acpica/hwxfsleep.c
36234@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36235 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36236
36237 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36238- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36239- acpi_hw_extended_sleep},
36240- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36241- acpi_hw_extended_wake_prep},
36242- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36243+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36244+ .extended_function = acpi_hw_extended_sleep},
36245+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36246+ .extended_function = acpi_hw_extended_wake_prep},
36247+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36248+ .extended_function = acpi_hw_extended_wake}
36249 };
36250
36251 /*
36252diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36253index 16129c7..8b675cd 100644
36254--- a/drivers/acpi/apei/apei-internal.h
36255+++ b/drivers/acpi/apei/apei-internal.h
36256@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36257 struct apei_exec_ins_type {
36258 u32 flags;
36259 apei_exec_ins_func_t run;
36260-};
36261+} __do_const;
36262
36263 struct apei_exec_context {
36264 u32 ip;
36265diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36266index fc5f780..e5ac91a 100644
36267--- a/drivers/acpi/apei/ghes.c
36268+++ b/drivers/acpi/apei/ghes.c
36269@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36270 const struct acpi_hest_generic *generic,
36271 const struct acpi_hest_generic_status *estatus)
36272 {
36273- static atomic_t seqno;
36274+ static atomic_unchecked_t seqno;
36275 unsigned int curr_seqno;
36276 char pfx_seq[64];
36277
36278@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36279 else
36280 pfx = KERN_ERR;
36281 }
36282- curr_seqno = atomic_inc_return(&seqno);
36283+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36284 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36285 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36286 pfx_seq, generic->header.source_id);
36287diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36288index a83e3c6..c3d617f 100644
36289--- a/drivers/acpi/bgrt.c
36290+++ b/drivers/acpi/bgrt.c
36291@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36292 if (!bgrt_image)
36293 return -ENODEV;
36294
36295- bin_attr_image.private = bgrt_image;
36296- bin_attr_image.size = bgrt_image_size;
36297+ pax_open_kernel();
36298+ *(void **)&bin_attr_image.private = bgrt_image;
36299+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36300+ pax_close_kernel();
36301
36302 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36303 if (!bgrt_kobj)
36304diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36305index 7556e7c..89a96bd 100644
36306--- a/drivers/acpi/blacklist.c
36307+++ b/drivers/acpi/blacklist.c
36308@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36309 u32 is_critical_error;
36310 };
36311
36312-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36313+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36314
36315 /*
36316 * POLICY: If *anything* doesn't work, put it on the blacklist.
36317@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36318 return 0;
36319 }
36320
36321-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36322+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36323 {
36324 .callback = dmi_disable_osi_vista,
36325 .ident = "Fujitsu Siemens",
36326diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36327index c68e724..e863008 100644
36328--- a/drivers/acpi/custom_method.c
36329+++ b/drivers/acpi/custom_method.c
36330@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36331 struct acpi_table_header table;
36332 acpi_status status;
36333
36334+#ifdef CONFIG_GRKERNSEC_KMEM
36335+ return -EPERM;
36336+#endif
36337+
36338 if (!(*ppos)) {
36339 /* parse the table header to get the table length */
36340 if (count <= sizeof(struct acpi_table_header))
36341diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36342index 7db1931..302dd5f 100644
36343--- a/drivers/acpi/device_pm.c
36344+++ b/drivers/acpi/device_pm.c
36345@@ -1021,6 +1021,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36346
36347 #endif /* CONFIG_PM_SLEEP */
36348
36349+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36350+
36351 static struct dev_pm_domain acpi_general_pm_domain = {
36352 .ops = {
36353 #ifdef CONFIG_PM_RUNTIME
36354@@ -1039,6 +1041,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36355 .restore_early = acpi_subsys_resume_early,
36356 #endif
36357 },
36358+ .detach = acpi_dev_pm_detach
36359 };
36360
36361 /**
36362@@ -1108,7 +1111,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36363 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36364 }
36365
36366- dev->pm_domain->detach = acpi_dev_pm_detach;
36367 return 0;
36368 }
36369 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36370diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36371index 17f9ec5..d9a455e 100644
36372--- a/drivers/acpi/processor_idle.c
36373+++ b/drivers/acpi/processor_idle.c
36374@@ -952,7 +952,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36375 {
36376 int i, count = CPUIDLE_DRIVER_STATE_START;
36377 struct acpi_processor_cx *cx;
36378- struct cpuidle_state *state;
36379+ cpuidle_state_no_const *state;
36380 struct cpuidle_driver *drv = &acpi_idle_driver;
36381
36382 if (!pr->flags.power_setup_done)
36383diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36384index 13e577c..cef11ee 100644
36385--- a/drivers/acpi/sysfs.c
36386+++ b/drivers/acpi/sysfs.c
36387@@ -423,11 +423,11 @@ static u32 num_counters;
36388 static struct attribute **all_attrs;
36389 static u32 acpi_gpe_count;
36390
36391-static struct attribute_group interrupt_stats_attr_group = {
36392+static attribute_group_no_const interrupt_stats_attr_group = {
36393 .name = "interrupts",
36394 };
36395
36396-static struct kobj_attribute *counter_attrs;
36397+static kobj_attribute_no_const *counter_attrs;
36398
36399 static void delete_gpe_attr_array(void)
36400 {
36401diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36402index 97683e4..655f6ba 100644
36403--- a/drivers/ata/libahci.c
36404+++ b/drivers/ata/libahci.c
36405@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36406 }
36407 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36408
36409-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36410+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36411 struct ata_taskfile *tf, int is_cmd, u16 flags,
36412 unsigned long timeout_msec)
36413 {
36414diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36415index c5ba15a..75ec7a8 100644
36416--- a/drivers/ata/libata-core.c
36417+++ b/drivers/ata/libata-core.c
36418@@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36419 static void ata_dev_xfermask(struct ata_device *dev);
36420 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36421
36422-atomic_t ata_print_id = ATOMIC_INIT(0);
36423+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36424
36425 struct ata_force_param {
36426 const char *name;
36427@@ -4797,7 +4797,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36428 struct ata_port *ap;
36429 unsigned int tag;
36430
36431- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36432+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36433 ap = qc->ap;
36434
36435 qc->flags = 0;
36436@@ -4813,7 +4813,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36437 struct ata_port *ap;
36438 struct ata_link *link;
36439
36440- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36441+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36442 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36443 ap = qc->ap;
36444 link = qc->dev->link;
36445@@ -5917,6 +5917,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36446 return;
36447
36448 spin_lock(&lock);
36449+ pax_open_kernel();
36450
36451 for (cur = ops->inherits; cur; cur = cur->inherits) {
36452 void **inherit = (void **)cur;
36453@@ -5930,8 +5931,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36454 if (IS_ERR(*pp))
36455 *pp = NULL;
36456
36457- ops->inherits = NULL;
36458+ *(struct ata_port_operations **)&ops->inherits = NULL;
36459
36460+ pax_close_kernel();
36461 spin_unlock(&lock);
36462 }
36463
36464@@ -6127,7 +6129,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36465
36466 /* give ports names and add SCSI hosts */
36467 for (i = 0; i < host->n_ports; i++) {
36468- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36469+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36470 host->ports[i]->local_port_no = i + 1;
36471 }
36472
36473diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36474index 0586f66..1a8f74a 100644
36475--- a/drivers/ata/libata-scsi.c
36476+++ b/drivers/ata/libata-scsi.c
36477@@ -4151,7 +4151,7 @@ int ata_sas_port_init(struct ata_port *ap)
36478
36479 if (rc)
36480 return rc;
36481- ap->print_id = atomic_inc_return(&ata_print_id);
36482+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36483 return 0;
36484 }
36485 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36486diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36487index 5f4e0cc..ff2c347 100644
36488--- a/drivers/ata/libata.h
36489+++ b/drivers/ata/libata.h
36490@@ -53,7 +53,7 @@ enum {
36491 ATA_DNXFER_QUIET = (1 << 31),
36492 };
36493
36494-extern atomic_t ata_print_id;
36495+extern atomic_unchecked_t ata_print_id;
36496 extern int atapi_passthru16;
36497 extern int libata_fua;
36498 extern int libata_noacpi;
36499diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36500index 38216b9..4ec6aeb 100644
36501--- a/drivers/ata/pata_arasan_cf.c
36502+++ b/drivers/ata/pata_arasan_cf.c
36503@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36504 /* Handle platform specific quirks */
36505 if (quirk) {
36506 if (quirk & CF_BROKEN_PIO) {
36507- ap->ops->set_piomode = NULL;
36508+ pax_open_kernel();
36509+ *(void **)&ap->ops->set_piomode = NULL;
36510+ pax_close_kernel();
36511 ap->pio_mask = 0;
36512 }
36513 if (quirk & CF_BROKEN_MWDMA)
36514diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36515index f9b983a..887b9d8 100644
36516--- a/drivers/atm/adummy.c
36517+++ b/drivers/atm/adummy.c
36518@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36519 vcc->pop(vcc, skb);
36520 else
36521 dev_kfree_skb_any(skb);
36522- atomic_inc(&vcc->stats->tx);
36523+ atomic_inc_unchecked(&vcc->stats->tx);
36524
36525 return 0;
36526 }
36527diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36528index f1a9198..f466a4a 100644
36529--- a/drivers/atm/ambassador.c
36530+++ b/drivers/atm/ambassador.c
36531@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36532 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36533
36534 // VC layer stats
36535- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36536+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36537
36538 // free the descriptor
36539 kfree (tx_descr);
36540@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36541 dump_skb ("<<<", vc, skb);
36542
36543 // VC layer stats
36544- atomic_inc(&atm_vcc->stats->rx);
36545+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36546 __net_timestamp(skb);
36547 // end of our responsibility
36548 atm_vcc->push (atm_vcc, skb);
36549@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36550 } else {
36551 PRINTK (KERN_INFO, "dropped over-size frame");
36552 // should we count this?
36553- atomic_inc(&atm_vcc->stats->rx_drop);
36554+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36555 }
36556
36557 } else {
36558@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36559 }
36560
36561 if (check_area (skb->data, skb->len)) {
36562- atomic_inc(&atm_vcc->stats->tx_err);
36563+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36564 return -ENOMEM; // ?
36565 }
36566
36567diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36568index 480fa6f..947067c 100644
36569--- a/drivers/atm/atmtcp.c
36570+++ b/drivers/atm/atmtcp.c
36571@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36572 if (vcc->pop) vcc->pop(vcc,skb);
36573 else dev_kfree_skb(skb);
36574 if (dev_data) return 0;
36575- atomic_inc(&vcc->stats->tx_err);
36576+ atomic_inc_unchecked(&vcc->stats->tx_err);
36577 return -ENOLINK;
36578 }
36579 size = skb->len+sizeof(struct atmtcp_hdr);
36580@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36581 if (!new_skb) {
36582 if (vcc->pop) vcc->pop(vcc,skb);
36583 else dev_kfree_skb(skb);
36584- atomic_inc(&vcc->stats->tx_err);
36585+ atomic_inc_unchecked(&vcc->stats->tx_err);
36586 return -ENOBUFS;
36587 }
36588 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36589@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36590 if (vcc->pop) vcc->pop(vcc,skb);
36591 else dev_kfree_skb(skb);
36592 out_vcc->push(out_vcc,new_skb);
36593- atomic_inc(&vcc->stats->tx);
36594- atomic_inc(&out_vcc->stats->rx);
36595+ atomic_inc_unchecked(&vcc->stats->tx);
36596+ atomic_inc_unchecked(&out_vcc->stats->rx);
36597 return 0;
36598 }
36599
36600@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36601 read_unlock(&vcc_sklist_lock);
36602 if (!out_vcc) {
36603 result = -EUNATCH;
36604- atomic_inc(&vcc->stats->tx_err);
36605+ atomic_inc_unchecked(&vcc->stats->tx_err);
36606 goto done;
36607 }
36608 skb_pull(skb,sizeof(struct atmtcp_hdr));
36609@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36610 __net_timestamp(new_skb);
36611 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36612 out_vcc->push(out_vcc,new_skb);
36613- atomic_inc(&vcc->stats->tx);
36614- atomic_inc(&out_vcc->stats->rx);
36615+ atomic_inc_unchecked(&vcc->stats->tx);
36616+ atomic_inc_unchecked(&out_vcc->stats->rx);
36617 done:
36618 if (vcc->pop) vcc->pop(vcc,skb);
36619 else dev_kfree_skb(skb);
36620diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36621index d65975a..0b87e20 100644
36622--- a/drivers/atm/eni.c
36623+++ b/drivers/atm/eni.c
36624@@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36625 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36626 vcc->dev->number);
36627 length = 0;
36628- atomic_inc(&vcc->stats->rx_err);
36629+ atomic_inc_unchecked(&vcc->stats->rx_err);
36630 }
36631 else {
36632 length = ATM_CELL_SIZE-1; /* no HEC */
36633@@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36634 size);
36635 }
36636 eff = length = 0;
36637- atomic_inc(&vcc->stats->rx_err);
36638+ atomic_inc_unchecked(&vcc->stats->rx_err);
36639 }
36640 else {
36641 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36642@@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36643 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36644 vcc->dev->number,vcc->vci,length,size << 2,descr);
36645 length = eff = 0;
36646- atomic_inc(&vcc->stats->rx_err);
36647+ atomic_inc_unchecked(&vcc->stats->rx_err);
36648 }
36649 }
36650 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36651@@ -767,7 +767,7 @@ rx_dequeued++;
36652 vcc->push(vcc,skb);
36653 pushed++;
36654 }
36655- atomic_inc(&vcc->stats->rx);
36656+ atomic_inc_unchecked(&vcc->stats->rx);
36657 }
36658 wake_up(&eni_dev->rx_wait);
36659 }
36660@@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
36661 PCI_DMA_TODEVICE);
36662 if (vcc->pop) vcc->pop(vcc,skb);
36663 else dev_kfree_skb_irq(skb);
36664- atomic_inc(&vcc->stats->tx);
36665+ atomic_inc_unchecked(&vcc->stats->tx);
36666 wake_up(&eni_dev->tx_wait);
36667 dma_complete++;
36668 }
36669diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36670index 82f2ae0..f205c02 100644
36671--- a/drivers/atm/firestream.c
36672+++ b/drivers/atm/firestream.c
36673@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36674 }
36675 }
36676
36677- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36678+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36679
36680 fs_dprintk (FS_DEBUG_TXMEM, "i");
36681 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
36682@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36683 #endif
36684 skb_put (skb, qe->p1 & 0xffff);
36685 ATM_SKB(skb)->vcc = atm_vcc;
36686- atomic_inc(&atm_vcc->stats->rx);
36687+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36688 __net_timestamp(skb);
36689 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
36690 atm_vcc->push (atm_vcc, skb);
36691@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36692 kfree (pe);
36693 }
36694 if (atm_vcc)
36695- atomic_inc(&atm_vcc->stats->rx_drop);
36696+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36697 break;
36698 case 0x1f: /* Reassembly abort: no buffers. */
36699 /* Silently increment error counter. */
36700 if (atm_vcc)
36701- atomic_inc(&atm_vcc->stats->rx_drop);
36702+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36703 break;
36704 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
36705 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
36706diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
36707index d4725fc..2d4ea65 100644
36708--- a/drivers/atm/fore200e.c
36709+++ b/drivers/atm/fore200e.c
36710@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
36711 #endif
36712 /* check error condition */
36713 if (*entry->status & STATUS_ERROR)
36714- atomic_inc(&vcc->stats->tx_err);
36715+ atomic_inc_unchecked(&vcc->stats->tx_err);
36716 else
36717- atomic_inc(&vcc->stats->tx);
36718+ atomic_inc_unchecked(&vcc->stats->tx);
36719 }
36720 }
36721
36722@@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36723 if (skb == NULL) {
36724 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
36725
36726- atomic_inc(&vcc->stats->rx_drop);
36727+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36728 return -ENOMEM;
36729 }
36730
36731@@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36732
36733 dev_kfree_skb_any(skb);
36734
36735- atomic_inc(&vcc->stats->rx_drop);
36736+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36737 return -ENOMEM;
36738 }
36739
36740 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36741
36742 vcc->push(vcc, skb);
36743- atomic_inc(&vcc->stats->rx);
36744+ atomic_inc_unchecked(&vcc->stats->rx);
36745
36746 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36747
36748@@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
36749 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
36750 fore200e->atm_dev->number,
36751 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
36752- atomic_inc(&vcc->stats->rx_err);
36753+ atomic_inc_unchecked(&vcc->stats->rx_err);
36754 }
36755 }
36756
36757@@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
36758 goto retry_here;
36759 }
36760
36761- atomic_inc(&vcc->stats->tx_err);
36762+ atomic_inc_unchecked(&vcc->stats->tx_err);
36763
36764 fore200e->tx_sat++;
36765 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
36766diff --git a/drivers/atm/he.c b/drivers/atm/he.c
36767index c39702b..785b73b 100644
36768--- a/drivers/atm/he.c
36769+++ b/drivers/atm/he.c
36770@@ -1689,7 +1689,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36771
36772 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
36773 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
36774- atomic_inc(&vcc->stats->rx_drop);
36775+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36776 goto return_host_buffers;
36777 }
36778
36779@@ -1716,7 +1716,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36780 RBRQ_LEN_ERR(he_dev->rbrq_head)
36781 ? "LEN_ERR" : "",
36782 vcc->vpi, vcc->vci);
36783- atomic_inc(&vcc->stats->rx_err);
36784+ atomic_inc_unchecked(&vcc->stats->rx_err);
36785 goto return_host_buffers;
36786 }
36787
36788@@ -1768,7 +1768,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36789 vcc->push(vcc, skb);
36790 spin_lock(&he_dev->global_lock);
36791
36792- atomic_inc(&vcc->stats->rx);
36793+ atomic_inc_unchecked(&vcc->stats->rx);
36794
36795 return_host_buffers:
36796 ++pdus_assembled;
36797@@ -2094,7 +2094,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
36798 tpd->vcc->pop(tpd->vcc, tpd->skb);
36799 else
36800 dev_kfree_skb_any(tpd->skb);
36801- atomic_inc(&tpd->vcc->stats->tx_err);
36802+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
36803 }
36804 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
36805 return;
36806@@ -2506,7 +2506,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36807 vcc->pop(vcc, skb);
36808 else
36809 dev_kfree_skb_any(skb);
36810- atomic_inc(&vcc->stats->tx_err);
36811+ atomic_inc_unchecked(&vcc->stats->tx_err);
36812 return -EINVAL;
36813 }
36814
36815@@ -2517,7 +2517,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36816 vcc->pop(vcc, skb);
36817 else
36818 dev_kfree_skb_any(skb);
36819- atomic_inc(&vcc->stats->tx_err);
36820+ atomic_inc_unchecked(&vcc->stats->tx_err);
36821 return -EINVAL;
36822 }
36823 #endif
36824@@ -2529,7 +2529,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36825 vcc->pop(vcc, skb);
36826 else
36827 dev_kfree_skb_any(skb);
36828- atomic_inc(&vcc->stats->tx_err);
36829+ atomic_inc_unchecked(&vcc->stats->tx_err);
36830 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36831 return -ENOMEM;
36832 }
36833@@ -2571,7 +2571,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36834 vcc->pop(vcc, skb);
36835 else
36836 dev_kfree_skb_any(skb);
36837- atomic_inc(&vcc->stats->tx_err);
36838+ atomic_inc_unchecked(&vcc->stats->tx_err);
36839 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36840 return -ENOMEM;
36841 }
36842@@ -2602,7 +2602,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36843 __enqueue_tpd(he_dev, tpd, cid);
36844 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36845
36846- atomic_inc(&vcc->stats->tx);
36847+ atomic_inc_unchecked(&vcc->stats->tx);
36848
36849 return 0;
36850 }
36851diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
36852index 1dc0519..1aadaf7 100644
36853--- a/drivers/atm/horizon.c
36854+++ b/drivers/atm/horizon.c
36855@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
36856 {
36857 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
36858 // VC layer stats
36859- atomic_inc(&vcc->stats->rx);
36860+ atomic_inc_unchecked(&vcc->stats->rx);
36861 __net_timestamp(skb);
36862 // end of our responsibility
36863 vcc->push (vcc, skb);
36864@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
36865 dev->tx_iovec = NULL;
36866
36867 // VC layer stats
36868- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36869+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36870
36871 // free the skb
36872 hrz_kfree_skb (skb);
36873diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
36874index 2b24ed0..b3d6acc 100644
36875--- a/drivers/atm/idt77252.c
36876+++ b/drivers/atm/idt77252.c
36877@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
36878 else
36879 dev_kfree_skb(skb);
36880
36881- atomic_inc(&vcc->stats->tx);
36882+ atomic_inc_unchecked(&vcc->stats->tx);
36883 }
36884
36885 atomic_dec(&scq->used);
36886@@ -1072,13 +1072,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36887 if ((sb = dev_alloc_skb(64)) == NULL) {
36888 printk("%s: Can't allocate buffers for aal0.\n",
36889 card->name);
36890- atomic_add(i, &vcc->stats->rx_drop);
36891+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
36892 break;
36893 }
36894 if (!atm_charge(vcc, sb->truesize)) {
36895 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
36896 card->name);
36897- atomic_add(i - 1, &vcc->stats->rx_drop);
36898+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
36899 dev_kfree_skb(sb);
36900 break;
36901 }
36902@@ -1095,7 +1095,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36903 ATM_SKB(sb)->vcc = vcc;
36904 __net_timestamp(sb);
36905 vcc->push(vcc, sb);
36906- atomic_inc(&vcc->stats->rx);
36907+ atomic_inc_unchecked(&vcc->stats->rx);
36908
36909 cell += ATM_CELL_PAYLOAD;
36910 }
36911@@ -1132,13 +1132,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36912 "(CDC: %08x)\n",
36913 card->name, len, rpp->len, readl(SAR_REG_CDC));
36914 recycle_rx_pool_skb(card, rpp);
36915- atomic_inc(&vcc->stats->rx_err);
36916+ atomic_inc_unchecked(&vcc->stats->rx_err);
36917 return;
36918 }
36919 if (stat & SAR_RSQE_CRC) {
36920 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
36921 recycle_rx_pool_skb(card, rpp);
36922- atomic_inc(&vcc->stats->rx_err);
36923+ atomic_inc_unchecked(&vcc->stats->rx_err);
36924 return;
36925 }
36926 if (skb_queue_len(&rpp->queue) > 1) {
36927@@ -1149,7 +1149,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36928 RXPRINTK("%s: Can't alloc RX skb.\n",
36929 card->name);
36930 recycle_rx_pool_skb(card, rpp);
36931- atomic_inc(&vcc->stats->rx_err);
36932+ atomic_inc_unchecked(&vcc->stats->rx_err);
36933 return;
36934 }
36935 if (!atm_charge(vcc, skb->truesize)) {
36936@@ -1168,7 +1168,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36937 __net_timestamp(skb);
36938
36939 vcc->push(vcc, skb);
36940- atomic_inc(&vcc->stats->rx);
36941+ atomic_inc_unchecked(&vcc->stats->rx);
36942
36943 return;
36944 }
36945@@ -1190,7 +1190,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36946 __net_timestamp(skb);
36947
36948 vcc->push(vcc, skb);
36949- atomic_inc(&vcc->stats->rx);
36950+ atomic_inc_unchecked(&vcc->stats->rx);
36951
36952 if (skb->truesize > SAR_FB_SIZE_3)
36953 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
36954@@ -1301,14 +1301,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
36955 if (vcc->qos.aal != ATM_AAL0) {
36956 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
36957 card->name, vpi, vci);
36958- atomic_inc(&vcc->stats->rx_drop);
36959+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36960 goto drop;
36961 }
36962
36963 if ((sb = dev_alloc_skb(64)) == NULL) {
36964 printk("%s: Can't allocate buffers for AAL0.\n",
36965 card->name);
36966- atomic_inc(&vcc->stats->rx_err);
36967+ atomic_inc_unchecked(&vcc->stats->rx_err);
36968 goto drop;
36969 }
36970
36971@@ -1327,7 +1327,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
36972 ATM_SKB(sb)->vcc = vcc;
36973 __net_timestamp(sb);
36974 vcc->push(vcc, sb);
36975- atomic_inc(&vcc->stats->rx);
36976+ atomic_inc_unchecked(&vcc->stats->rx);
36977
36978 drop:
36979 skb_pull(queue, 64);
36980@@ -1952,13 +1952,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36981
36982 if (vc == NULL) {
36983 printk("%s: NULL connection in send().\n", card->name);
36984- atomic_inc(&vcc->stats->tx_err);
36985+ atomic_inc_unchecked(&vcc->stats->tx_err);
36986 dev_kfree_skb(skb);
36987 return -EINVAL;
36988 }
36989 if (!test_bit(VCF_TX, &vc->flags)) {
36990 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
36991- atomic_inc(&vcc->stats->tx_err);
36992+ atomic_inc_unchecked(&vcc->stats->tx_err);
36993 dev_kfree_skb(skb);
36994 return -EINVAL;
36995 }
36996@@ -1970,14 +1970,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36997 break;
36998 default:
36999 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37000- atomic_inc(&vcc->stats->tx_err);
37001+ atomic_inc_unchecked(&vcc->stats->tx_err);
37002 dev_kfree_skb(skb);
37003 return -EINVAL;
37004 }
37005
37006 if (skb_shinfo(skb)->nr_frags != 0) {
37007 printk("%s: No scatter-gather yet.\n", card->name);
37008- atomic_inc(&vcc->stats->tx_err);
37009+ atomic_inc_unchecked(&vcc->stats->tx_err);
37010 dev_kfree_skb(skb);
37011 return -EINVAL;
37012 }
37013@@ -1985,7 +1985,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37014
37015 err = queue_skb(card, vc, skb, oam);
37016 if (err) {
37017- atomic_inc(&vcc->stats->tx_err);
37018+ atomic_inc_unchecked(&vcc->stats->tx_err);
37019 dev_kfree_skb(skb);
37020 return err;
37021 }
37022@@ -2008,7 +2008,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37023 skb = dev_alloc_skb(64);
37024 if (!skb) {
37025 printk("%s: Out of memory in send_oam().\n", card->name);
37026- atomic_inc(&vcc->stats->tx_err);
37027+ atomic_inc_unchecked(&vcc->stats->tx_err);
37028 return -ENOMEM;
37029 }
37030 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37031diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37032index 4217f29..88f547a 100644
37033--- a/drivers/atm/iphase.c
37034+++ b/drivers/atm/iphase.c
37035@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37036 status = (u_short) (buf_desc_ptr->desc_mode);
37037 if (status & (RX_CER | RX_PTE | RX_OFL))
37038 {
37039- atomic_inc(&vcc->stats->rx_err);
37040+ atomic_inc_unchecked(&vcc->stats->rx_err);
37041 IF_ERR(printk("IA: bad packet, dropping it");)
37042 if (status & RX_CER) {
37043 IF_ERR(printk(" cause: packet CRC error\n");)
37044@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37045 len = dma_addr - buf_addr;
37046 if (len > iadev->rx_buf_sz) {
37047 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37048- atomic_inc(&vcc->stats->rx_err);
37049+ atomic_inc_unchecked(&vcc->stats->rx_err);
37050 goto out_free_desc;
37051 }
37052
37053@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37054 ia_vcc = INPH_IA_VCC(vcc);
37055 if (ia_vcc == NULL)
37056 {
37057- atomic_inc(&vcc->stats->rx_err);
37058+ atomic_inc_unchecked(&vcc->stats->rx_err);
37059 atm_return(vcc, skb->truesize);
37060 dev_kfree_skb_any(skb);
37061 goto INCR_DLE;
37062@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37063 if ((length > iadev->rx_buf_sz) || (length >
37064 (skb->len - sizeof(struct cpcs_trailer))))
37065 {
37066- atomic_inc(&vcc->stats->rx_err);
37067+ atomic_inc_unchecked(&vcc->stats->rx_err);
37068 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37069 length, skb->len);)
37070 atm_return(vcc, skb->truesize);
37071@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37072
37073 IF_RX(printk("rx_dle_intr: skb push");)
37074 vcc->push(vcc,skb);
37075- atomic_inc(&vcc->stats->rx);
37076+ atomic_inc_unchecked(&vcc->stats->rx);
37077 iadev->rx_pkt_cnt++;
37078 }
37079 INCR_DLE:
37080@@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37081 {
37082 struct k_sonet_stats *stats;
37083 stats = &PRIV(_ia_dev[board])->sonet_stats;
37084- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37085- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37086- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37087- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37088- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37089- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37090- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37091- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37092- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37093+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37094+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37095+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37096+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37097+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37098+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37099+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37100+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37101+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37102 }
37103 ia_cmds.status = 0;
37104 break;
37105@@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37106 if ((desc == 0) || (desc > iadev->num_tx_desc))
37107 {
37108 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37109- atomic_inc(&vcc->stats->tx);
37110+ atomic_inc_unchecked(&vcc->stats->tx);
37111 if (vcc->pop)
37112 vcc->pop(vcc, skb);
37113 else
37114@@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37115 ATM_DESC(skb) = vcc->vci;
37116 skb_queue_tail(&iadev->tx_dma_q, skb);
37117
37118- atomic_inc(&vcc->stats->tx);
37119+ atomic_inc_unchecked(&vcc->stats->tx);
37120 iadev->tx_pkt_cnt++;
37121 /* Increment transaction counter */
37122 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37123
37124 #if 0
37125 /* add flow control logic */
37126- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37127+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37128 if (iavcc->vc_desc_cnt > 10) {
37129 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37130 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37131diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37132index 93eaf8d..b4ca7da 100644
37133--- a/drivers/atm/lanai.c
37134+++ b/drivers/atm/lanai.c
37135@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37136 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37137 lanai_endtx(lanai, lvcc);
37138 lanai_free_skb(lvcc->tx.atmvcc, skb);
37139- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37140+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37141 }
37142
37143 /* Try to fill the buffer - don't call unless there is backlog */
37144@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37145 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37146 __net_timestamp(skb);
37147 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37148- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37149+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37150 out:
37151 lvcc->rx.buf.ptr = end;
37152 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37153@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37154 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37155 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37156 lanai->stats.service_rxnotaal5++;
37157- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37158+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37159 return 0;
37160 }
37161 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37162@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37163 int bytes;
37164 read_unlock(&vcc_sklist_lock);
37165 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37166- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37167+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37168 lvcc->stats.x.aal5.service_trash++;
37169 bytes = (SERVICE_GET_END(s) * 16) -
37170 (((unsigned long) lvcc->rx.buf.ptr) -
37171@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37172 }
37173 if (s & SERVICE_STREAM) {
37174 read_unlock(&vcc_sklist_lock);
37175- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37176+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37177 lvcc->stats.x.aal5.service_stream++;
37178 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37179 "PDU on VCI %d!\n", lanai->number, vci);
37180@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37181 return 0;
37182 }
37183 DPRINTK("got rx crc error on vci %d\n", vci);
37184- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37185+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37186 lvcc->stats.x.aal5.service_rxcrc++;
37187 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37188 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37189diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37190index 9988ac9..7c52585 100644
37191--- a/drivers/atm/nicstar.c
37192+++ b/drivers/atm/nicstar.c
37193@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37194 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37195 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37196 card->index);
37197- atomic_inc(&vcc->stats->tx_err);
37198+ atomic_inc_unchecked(&vcc->stats->tx_err);
37199 dev_kfree_skb_any(skb);
37200 return -EINVAL;
37201 }
37202@@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37203 if (!vc->tx) {
37204 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37205 card->index);
37206- atomic_inc(&vcc->stats->tx_err);
37207+ atomic_inc_unchecked(&vcc->stats->tx_err);
37208 dev_kfree_skb_any(skb);
37209 return -EINVAL;
37210 }
37211@@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37212 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37213 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37214 card->index);
37215- atomic_inc(&vcc->stats->tx_err);
37216+ atomic_inc_unchecked(&vcc->stats->tx_err);
37217 dev_kfree_skb_any(skb);
37218 return -EINVAL;
37219 }
37220
37221 if (skb_shinfo(skb)->nr_frags != 0) {
37222 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37223- atomic_inc(&vcc->stats->tx_err);
37224+ atomic_inc_unchecked(&vcc->stats->tx_err);
37225 dev_kfree_skb_any(skb);
37226 return -EINVAL;
37227 }
37228@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37229 }
37230
37231 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37232- atomic_inc(&vcc->stats->tx_err);
37233+ atomic_inc_unchecked(&vcc->stats->tx_err);
37234 dev_kfree_skb_any(skb);
37235 return -EIO;
37236 }
37237- atomic_inc(&vcc->stats->tx);
37238+ atomic_inc_unchecked(&vcc->stats->tx);
37239
37240 return 0;
37241 }
37242@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37243 printk
37244 ("nicstar%d: Can't allocate buffers for aal0.\n",
37245 card->index);
37246- atomic_add(i, &vcc->stats->rx_drop);
37247+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37248 break;
37249 }
37250 if (!atm_charge(vcc, sb->truesize)) {
37251 RXPRINTK
37252 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37253 card->index);
37254- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37255+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37256 dev_kfree_skb_any(sb);
37257 break;
37258 }
37259@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37260 ATM_SKB(sb)->vcc = vcc;
37261 __net_timestamp(sb);
37262 vcc->push(vcc, sb);
37263- atomic_inc(&vcc->stats->rx);
37264+ atomic_inc_unchecked(&vcc->stats->rx);
37265 cell += ATM_CELL_PAYLOAD;
37266 }
37267
37268@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37269 if (iovb == NULL) {
37270 printk("nicstar%d: Out of iovec buffers.\n",
37271 card->index);
37272- atomic_inc(&vcc->stats->rx_drop);
37273+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37274 recycle_rx_buf(card, skb);
37275 return;
37276 }
37277@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37278 small or large buffer itself. */
37279 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37280 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37281- atomic_inc(&vcc->stats->rx_err);
37282+ atomic_inc_unchecked(&vcc->stats->rx_err);
37283 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37284 NS_MAX_IOVECS);
37285 NS_PRV_IOVCNT(iovb) = 0;
37286@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37287 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37288 card->index);
37289 which_list(card, skb);
37290- atomic_inc(&vcc->stats->rx_err);
37291+ atomic_inc_unchecked(&vcc->stats->rx_err);
37292 recycle_rx_buf(card, skb);
37293 vc->rx_iov = NULL;
37294 recycle_iov_buf(card, iovb);
37295@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37296 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37297 card->index);
37298 which_list(card, skb);
37299- atomic_inc(&vcc->stats->rx_err);
37300+ atomic_inc_unchecked(&vcc->stats->rx_err);
37301 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37302 NS_PRV_IOVCNT(iovb));
37303 vc->rx_iov = NULL;
37304@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37305 printk(" - PDU size mismatch.\n");
37306 else
37307 printk(".\n");
37308- atomic_inc(&vcc->stats->rx_err);
37309+ atomic_inc_unchecked(&vcc->stats->rx_err);
37310 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37311 NS_PRV_IOVCNT(iovb));
37312 vc->rx_iov = NULL;
37313@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37314 /* skb points to a small buffer */
37315 if (!atm_charge(vcc, skb->truesize)) {
37316 push_rxbufs(card, skb);
37317- atomic_inc(&vcc->stats->rx_drop);
37318+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37319 } else {
37320 skb_put(skb, len);
37321 dequeue_sm_buf(card, skb);
37322@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37323 ATM_SKB(skb)->vcc = vcc;
37324 __net_timestamp(skb);
37325 vcc->push(vcc, skb);
37326- atomic_inc(&vcc->stats->rx);
37327+ atomic_inc_unchecked(&vcc->stats->rx);
37328 }
37329 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37330 struct sk_buff *sb;
37331@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37332 if (len <= NS_SMBUFSIZE) {
37333 if (!atm_charge(vcc, sb->truesize)) {
37334 push_rxbufs(card, sb);
37335- atomic_inc(&vcc->stats->rx_drop);
37336+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37337 } else {
37338 skb_put(sb, len);
37339 dequeue_sm_buf(card, sb);
37340@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37341 ATM_SKB(sb)->vcc = vcc;
37342 __net_timestamp(sb);
37343 vcc->push(vcc, sb);
37344- atomic_inc(&vcc->stats->rx);
37345+ atomic_inc_unchecked(&vcc->stats->rx);
37346 }
37347
37348 push_rxbufs(card, skb);
37349@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37350
37351 if (!atm_charge(vcc, skb->truesize)) {
37352 push_rxbufs(card, skb);
37353- atomic_inc(&vcc->stats->rx_drop);
37354+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37355 } else {
37356 dequeue_lg_buf(card, skb);
37357 #ifdef NS_USE_DESTRUCTORS
37358@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37359 ATM_SKB(skb)->vcc = vcc;
37360 __net_timestamp(skb);
37361 vcc->push(vcc, skb);
37362- atomic_inc(&vcc->stats->rx);
37363+ atomic_inc_unchecked(&vcc->stats->rx);
37364 }
37365
37366 push_rxbufs(card, sb);
37367@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37368 printk
37369 ("nicstar%d: Out of huge buffers.\n",
37370 card->index);
37371- atomic_inc(&vcc->stats->rx_drop);
37372+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37373 recycle_iovec_rx_bufs(card,
37374 (struct iovec *)
37375 iovb->data,
37376@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37377 card->hbpool.count++;
37378 } else
37379 dev_kfree_skb_any(hb);
37380- atomic_inc(&vcc->stats->rx_drop);
37381+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37382 } else {
37383 /* Copy the small buffer to the huge buffer */
37384 sb = (struct sk_buff *)iov->iov_base;
37385@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37386 #endif /* NS_USE_DESTRUCTORS */
37387 __net_timestamp(hb);
37388 vcc->push(vcc, hb);
37389- atomic_inc(&vcc->stats->rx);
37390+ atomic_inc_unchecked(&vcc->stats->rx);
37391 }
37392 }
37393
37394diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37395index 21b0bc6..b5f40ba 100644
37396--- a/drivers/atm/solos-pci.c
37397+++ b/drivers/atm/solos-pci.c
37398@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37399 }
37400 atm_charge(vcc, skb->truesize);
37401 vcc->push(vcc, skb);
37402- atomic_inc(&vcc->stats->rx);
37403+ atomic_inc_unchecked(&vcc->stats->rx);
37404 break;
37405
37406 case PKT_STATUS:
37407@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37408 vcc = SKB_CB(oldskb)->vcc;
37409
37410 if (vcc) {
37411- atomic_inc(&vcc->stats->tx);
37412+ atomic_inc_unchecked(&vcc->stats->tx);
37413 solos_pop(vcc, oldskb);
37414 } else {
37415 dev_kfree_skb_irq(oldskb);
37416diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37417index 0215934..ce9f5b1 100644
37418--- a/drivers/atm/suni.c
37419+++ b/drivers/atm/suni.c
37420@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37421
37422
37423 #define ADD_LIMITED(s,v) \
37424- atomic_add((v),&stats->s); \
37425- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37426+ atomic_add_unchecked((v),&stats->s); \
37427+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37428
37429
37430 static void suni_hz(unsigned long from_timer)
37431diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37432index 5120a96..e2572bd 100644
37433--- a/drivers/atm/uPD98402.c
37434+++ b/drivers/atm/uPD98402.c
37435@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37436 struct sonet_stats tmp;
37437 int error = 0;
37438
37439- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37440+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37441 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37442 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37443 if (zero && !error) {
37444@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37445
37446
37447 #define ADD_LIMITED(s,v) \
37448- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37449- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37450- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37451+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37452+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37453+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37454
37455
37456 static void stat_event(struct atm_dev *dev)
37457@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37458 if (reason & uPD98402_INT_PFM) stat_event(dev);
37459 if (reason & uPD98402_INT_PCO) {
37460 (void) GET(PCOCR); /* clear interrupt cause */
37461- atomic_add(GET(HECCT),
37462+ atomic_add_unchecked(GET(HECCT),
37463 &PRIV(dev)->sonet_stats.uncorr_hcs);
37464 }
37465 if ((reason & uPD98402_INT_RFO) &&
37466@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37467 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37468 uPD98402_INT_LOS),PIMR); /* enable them */
37469 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37470- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37471- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37472- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37473+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37474+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37475+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37476 return 0;
37477 }
37478
37479diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37480index 969c3c2..9b72956 100644
37481--- a/drivers/atm/zatm.c
37482+++ b/drivers/atm/zatm.c
37483@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37484 }
37485 if (!size) {
37486 dev_kfree_skb_irq(skb);
37487- if (vcc) atomic_inc(&vcc->stats->rx_err);
37488+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37489 continue;
37490 }
37491 if (!atm_charge(vcc,skb->truesize)) {
37492@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37493 skb->len = size;
37494 ATM_SKB(skb)->vcc = vcc;
37495 vcc->push(vcc,skb);
37496- atomic_inc(&vcc->stats->rx);
37497+ atomic_inc_unchecked(&vcc->stats->rx);
37498 }
37499 zout(pos & 0xffff,MTA(mbx));
37500 #if 0 /* probably a stupid idea */
37501@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37502 skb_queue_head(&zatm_vcc->backlog,skb);
37503 break;
37504 }
37505- atomic_inc(&vcc->stats->tx);
37506+ atomic_inc_unchecked(&vcc->stats->tx);
37507 wake_up(&zatm_vcc->tx_wait);
37508 }
37509
37510diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37511index 83e910a..b224a73 100644
37512--- a/drivers/base/bus.c
37513+++ b/drivers/base/bus.c
37514@@ -1124,7 +1124,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37515 return -EINVAL;
37516
37517 mutex_lock(&subsys->p->mutex);
37518- list_add_tail(&sif->node, &subsys->p->interfaces);
37519+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37520 if (sif->add_dev) {
37521 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37522 while ((dev = subsys_dev_iter_next(&iter)))
37523@@ -1149,7 +1149,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37524 subsys = sif->subsys;
37525
37526 mutex_lock(&subsys->p->mutex);
37527- list_del_init(&sif->node);
37528+ pax_list_del_init((struct list_head *)&sif->node);
37529 if (sif->remove_dev) {
37530 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37531 while ((dev = subsys_dev_iter_next(&iter)))
37532diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37533index 25798db..15f130e 100644
37534--- a/drivers/base/devtmpfs.c
37535+++ b/drivers/base/devtmpfs.c
37536@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37537 if (!thread)
37538 return 0;
37539
37540- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37541+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37542 if (err)
37543 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37544 else
37545@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37546 *err = sys_unshare(CLONE_NEWNS);
37547 if (*err)
37548 goto out;
37549- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37550+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37551 if (*err)
37552 goto out;
37553- sys_chdir("/.."); /* will traverse into overmounted root */
37554- sys_chroot(".");
37555+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37556+ sys_chroot((char __force_user *)".");
37557 complete(&setup_done);
37558 while (1) {
37559 spin_lock(&req_lock);
37560diff --git a/drivers/base/node.c b/drivers/base/node.c
37561index 472168c..4af587e 100644
37562--- a/drivers/base/node.c
37563+++ b/drivers/base/node.c
37564@@ -620,7 +620,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37565 struct node_attr {
37566 struct device_attribute attr;
37567 enum node_states state;
37568-};
37569+} __do_const;
37570
37571 static ssize_t show_node_state(struct device *dev,
37572 struct device_attribute *attr, char *buf)
37573diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37574index fb83d4a..e1797b3 100644
37575--- a/drivers/base/power/domain.c
37576+++ b/drivers/base/power/domain.c
37577@@ -1725,7 +1725,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37578 {
37579 struct cpuidle_driver *cpuidle_drv;
37580 struct gpd_cpuidle_data *cpuidle_data;
37581- struct cpuidle_state *idle_state;
37582+ cpuidle_state_no_const *idle_state;
37583 int ret = 0;
37584
37585 if (IS_ERR_OR_NULL(genpd) || state < 0)
37586@@ -1793,7 +1793,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37587 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37588 {
37589 struct gpd_cpuidle_data *cpuidle_data;
37590- struct cpuidle_state *idle_state;
37591+ cpuidle_state_no_const *idle_state;
37592 int ret = 0;
37593
37594 if (IS_ERR_OR_NULL(genpd))
37595@@ -2215,7 +2215,9 @@ int genpd_dev_pm_attach(struct device *dev)
37596 return ret;
37597 }
37598
37599- dev->pm_domain->detach = genpd_dev_pm_detach;
37600+ pax_open_kernel();
37601+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
37602+ pax_close_kernel();
37603
37604 return 0;
37605 }
37606diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37607index a9d26ed..74b8405 100644
37608--- a/drivers/base/power/sysfs.c
37609+++ b/drivers/base/power/sysfs.c
37610@@ -182,7 +182,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37611 return -EIO;
37612 }
37613 }
37614- return sprintf(buf, p);
37615+ return sprintf(buf, "%s", p);
37616 }
37617
37618 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37619diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37620index c2744b3..08fac19 100644
37621--- a/drivers/base/power/wakeup.c
37622+++ b/drivers/base/power/wakeup.c
37623@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37624 * They need to be modified together atomically, so it's better to use one
37625 * atomic variable to hold them both.
37626 */
37627-static atomic_t combined_event_count = ATOMIC_INIT(0);
37628+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37629
37630 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37631 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37632
37633 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37634 {
37635- unsigned int comb = atomic_read(&combined_event_count);
37636+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
37637
37638 *cnt = (comb >> IN_PROGRESS_BITS);
37639 *inpr = comb & MAX_IN_PROGRESS;
37640@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37641 ws->start_prevent_time = ws->last_time;
37642
37643 /* Increment the counter of events in progress. */
37644- cec = atomic_inc_return(&combined_event_count);
37645+ cec = atomic_inc_return_unchecked(&combined_event_count);
37646
37647 trace_wakeup_source_activate(ws->name, cec);
37648 }
37649@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37650 * Increment the counter of registered wakeup events and decrement the
37651 * couter of wakeup events in progress simultaneously.
37652 */
37653- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37654+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37655 trace_wakeup_source_deactivate(ws->name, cec);
37656
37657 split_counters(&cnt, &inpr);
37658diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37659index 8d98a32..61d3165 100644
37660--- a/drivers/base/syscore.c
37661+++ b/drivers/base/syscore.c
37662@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37663 void register_syscore_ops(struct syscore_ops *ops)
37664 {
37665 mutex_lock(&syscore_ops_lock);
37666- list_add_tail(&ops->node, &syscore_ops_list);
37667+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37668 mutex_unlock(&syscore_ops_lock);
37669 }
37670 EXPORT_SYMBOL_GPL(register_syscore_ops);
37671@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37672 void unregister_syscore_ops(struct syscore_ops *ops)
37673 {
37674 mutex_lock(&syscore_ops_lock);
37675- list_del(&ops->node);
37676+ pax_list_del((struct list_head *)&ops->node);
37677 mutex_unlock(&syscore_ops_lock);
37678 }
37679 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37680diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37681index ff20f19..018f1da 100644
37682--- a/drivers/block/cciss.c
37683+++ b/drivers/block/cciss.c
37684@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
37685 while (!list_empty(&h->reqQ)) {
37686 c = list_entry(h->reqQ.next, CommandList_struct, list);
37687 /* can't do anything if fifo is full */
37688- if ((h->access.fifo_full(h))) {
37689+ if ((h->access->fifo_full(h))) {
37690 dev_warn(&h->pdev->dev, "fifo full\n");
37691 break;
37692 }
37693@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
37694 h->Qdepth--;
37695
37696 /* Tell the controller execute command */
37697- h->access.submit_command(h, c);
37698+ h->access->submit_command(h, c);
37699
37700 /* Put job onto the completed Q */
37701 addQ(&h->cmpQ, c);
37702@@ -3444,17 +3444,17 @@ startio:
37703
37704 static inline unsigned long get_next_completion(ctlr_info_t *h)
37705 {
37706- return h->access.command_completed(h);
37707+ return h->access->command_completed(h);
37708 }
37709
37710 static inline int interrupt_pending(ctlr_info_t *h)
37711 {
37712- return h->access.intr_pending(h);
37713+ return h->access->intr_pending(h);
37714 }
37715
37716 static inline long interrupt_not_for_us(ctlr_info_t *h)
37717 {
37718- return ((h->access.intr_pending(h) == 0) ||
37719+ return ((h->access->intr_pending(h) == 0) ||
37720 (h->interrupts_enabled == 0));
37721 }
37722
37723@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
37724 u32 a;
37725
37726 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37727- return h->access.command_completed(h);
37728+ return h->access->command_completed(h);
37729
37730 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
37731 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
37732@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
37733 trans_support & CFGTBL_Trans_use_short_tags);
37734
37735 /* Change the access methods to the performant access methods */
37736- h->access = SA5_performant_access;
37737+ h->access = &SA5_performant_access;
37738 h->transMethod = CFGTBL_Trans_Performant;
37739
37740 return;
37741@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
37742 if (prod_index < 0)
37743 return -ENODEV;
37744 h->product_name = products[prod_index].product_name;
37745- h->access = *(products[prod_index].access);
37746+ h->access = products[prod_index].access;
37747
37748 if (cciss_board_disabled(h)) {
37749 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
37750@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
37751 }
37752
37753 /* make sure the board interrupts are off */
37754- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37755+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37756 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
37757 if (rc)
37758 goto clean2;
37759@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
37760 * fake ones to scoop up any residual completions.
37761 */
37762 spin_lock_irqsave(&h->lock, flags);
37763- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37764+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37765 spin_unlock_irqrestore(&h->lock, flags);
37766 free_irq(h->intr[h->intr_mode], h);
37767 rc = cciss_request_irq(h, cciss_msix_discard_completions,
37768@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
37769 dev_info(&h->pdev->dev, "Board READY.\n");
37770 dev_info(&h->pdev->dev,
37771 "Waiting for stale completions to drain.\n");
37772- h->access.set_intr_mask(h, CCISS_INTR_ON);
37773+ h->access->set_intr_mask(h, CCISS_INTR_ON);
37774 msleep(10000);
37775- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37776+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37777
37778 rc = controller_reset_failed(h->cfgtable);
37779 if (rc)
37780@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
37781 cciss_scsi_setup(h);
37782
37783 /* Turn the interrupts on so we can service requests */
37784- h->access.set_intr_mask(h, CCISS_INTR_ON);
37785+ h->access->set_intr_mask(h, CCISS_INTR_ON);
37786
37787 /* Get the firmware version */
37788 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
37789@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
37790 kfree(flush_buf);
37791 if (return_code != IO_OK)
37792 dev_warn(&h->pdev->dev, "Error flushing cache\n");
37793- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37794+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37795 free_irq(h->intr[h->intr_mode], h);
37796 }
37797
37798diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
37799index 7fda30e..2f27946 100644
37800--- a/drivers/block/cciss.h
37801+++ b/drivers/block/cciss.h
37802@@ -101,7 +101,7 @@ struct ctlr_info
37803 /* information about each logical volume */
37804 drive_info_struct *drv[CISS_MAX_LUN];
37805
37806- struct access_method access;
37807+ struct access_method *access;
37808
37809 /* queue and queue Info */
37810 struct list_head reqQ;
37811@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
37812 }
37813
37814 static struct access_method SA5_access = {
37815- SA5_submit_command,
37816- SA5_intr_mask,
37817- SA5_fifo_full,
37818- SA5_intr_pending,
37819- SA5_completed,
37820+ .submit_command = SA5_submit_command,
37821+ .set_intr_mask = SA5_intr_mask,
37822+ .fifo_full = SA5_fifo_full,
37823+ .intr_pending = SA5_intr_pending,
37824+ .command_completed = SA5_completed,
37825 };
37826
37827 static struct access_method SA5B_access = {
37828- SA5_submit_command,
37829- SA5B_intr_mask,
37830- SA5_fifo_full,
37831- SA5B_intr_pending,
37832- SA5_completed,
37833+ .submit_command = SA5_submit_command,
37834+ .set_intr_mask = SA5B_intr_mask,
37835+ .fifo_full = SA5_fifo_full,
37836+ .intr_pending = SA5B_intr_pending,
37837+ .command_completed = SA5_completed,
37838 };
37839
37840 static struct access_method SA5_performant_access = {
37841- SA5_submit_command,
37842- SA5_performant_intr_mask,
37843- SA5_fifo_full,
37844- SA5_performant_intr_pending,
37845- SA5_performant_completed,
37846+ .submit_command = SA5_submit_command,
37847+ .set_intr_mask = SA5_performant_intr_mask,
37848+ .fifo_full = SA5_fifo_full,
37849+ .intr_pending = SA5_performant_intr_pending,
37850+ .command_completed = SA5_performant_completed,
37851 };
37852
37853 struct board_type {
37854diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
37855index 2b94403..fd6ad1f 100644
37856--- a/drivers/block/cpqarray.c
37857+++ b/drivers/block/cpqarray.c
37858@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37859 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
37860 goto Enomem4;
37861 }
37862- hba[i]->access.set_intr_mask(hba[i], 0);
37863+ hba[i]->access->set_intr_mask(hba[i], 0);
37864 if (request_irq(hba[i]->intr, do_ida_intr,
37865 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
37866 {
37867@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37868 add_timer(&hba[i]->timer);
37869
37870 /* Enable IRQ now that spinlock and rate limit timer are set up */
37871- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37872+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37873
37874 for(j=0; j<NWD; j++) {
37875 struct gendisk *disk = ida_gendisk[i][j];
37876@@ -694,7 +694,7 @@ DBGINFO(
37877 for(i=0; i<NR_PRODUCTS; i++) {
37878 if (board_id == products[i].board_id) {
37879 c->product_name = products[i].product_name;
37880- c->access = *(products[i].access);
37881+ c->access = products[i].access;
37882 break;
37883 }
37884 }
37885@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
37886 hba[ctlr]->intr = intr;
37887 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
37888 hba[ctlr]->product_name = products[j].product_name;
37889- hba[ctlr]->access = *(products[j].access);
37890+ hba[ctlr]->access = products[j].access;
37891 hba[ctlr]->ctlr = ctlr;
37892 hba[ctlr]->board_id = board_id;
37893 hba[ctlr]->pci_dev = NULL; /* not PCI */
37894@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
37895
37896 while((c = h->reqQ) != NULL) {
37897 /* Can't do anything if we're busy */
37898- if (h->access.fifo_full(h) == 0)
37899+ if (h->access->fifo_full(h) == 0)
37900 return;
37901
37902 /* Get the first entry from the request Q */
37903@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
37904 h->Qdepth--;
37905
37906 /* Tell the controller to do our bidding */
37907- h->access.submit_command(h, c);
37908+ h->access->submit_command(h, c);
37909
37910 /* Get onto the completion Q */
37911 addQ(&h->cmpQ, c);
37912@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37913 unsigned long flags;
37914 __u32 a,a1;
37915
37916- istat = h->access.intr_pending(h);
37917+ istat = h->access->intr_pending(h);
37918 /* Is this interrupt for us? */
37919 if (istat == 0)
37920 return IRQ_NONE;
37921@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37922 */
37923 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
37924 if (istat & FIFO_NOT_EMPTY) {
37925- while((a = h->access.command_completed(h))) {
37926+ while((a = h->access->command_completed(h))) {
37927 a1 = a; a &= ~3;
37928 if ((c = h->cmpQ) == NULL)
37929 {
37930@@ -1448,11 +1448,11 @@ static int sendcmd(
37931 /*
37932 * Disable interrupt
37933 */
37934- info_p->access.set_intr_mask(info_p, 0);
37935+ info_p->access->set_intr_mask(info_p, 0);
37936 /* Make sure there is room in the command FIFO */
37937 /* Actually it should be completely empty at this time. */
37938 for (i = 200000; i > 0; i--) {
37939- temp = info_p->access.fifo_full(info_p);
37940+ temp = info_p->access->fifo_full(info_p);
37941 if (temp != 0) {
37942 break;
37943 }
37944@@ -1465,7 +1465,7 @@ DBG(
37945 /*
37946 * Send the cmd
37947 */
37948- info_p->access.submit_command(info_p, c);
37949+ info_p->access->submit_command(info_p, c);
37950 complete = pollcomplete(ctlr);
37951
37952 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
37953@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
37954 * we check the new geometry. Then turn interrupts back on when
37955 * we're done.
37956 */
37957- host->access.set_intr_mask(host, 0);
37958+ host->access->set_intr_mask(host, 0);
37959 getgeometry(ctlr);
37960- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
37961+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
37962
37963 for(i=0; i<NWD; i++) {
37964 struct gendisk *disk = ida_gendisk[ctlr][i];
37965@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
37966 /* Wait (up to 2 seconds) for a command to complete */
37967
37968 for (i = 200000; i > 0; i--) {
37969- done = hba[ctlr]->access.command_completed(hba[ctlr]);
37970+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
37971 if (done == 0) {
37972 udelay(10); /* a short fixed delay */
37973 } else
37974diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
37975index be73e9d..7fbf140 100644
37976--- a/drivers/block/cpqarray.h
37977+++ b/drivers/block/cpqarray.h
37978@@ -99,7 +99,7 @@ struct ctlr_info {
37979 drv_info_t drv[NWD];
37980 struct proc_dir_entry *proc;
37981
37982- struct access_method access;
37983+ struct access_method *access;
37984
37985 cmdlist_t *reqQ;
37986 cmdlist_t *cmpQ;
37987diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
37988index 434c77d..6d3219a 100644
37989--- a/drivers/block/drbd/drbd_bitmap.c
37990+++ b/drivers/block/drbd/drbd_bitmap.c
37991@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
37992 submit_bio(rw, bio);
37993 /* this should not count as user activity and cause the
37994 * resync to throttle -- see drbd_rs_should_slow_down(). */
37995- atomic_add(len >> 9, &device->rs_sect_ev);
37996+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
37997 }
37998 }
37999
38000diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38001index 9b22f8f..f2932af 100644
38002--- a/drivers/block/drbd/drbd_int.h
38003+++ b/drivers/block/drbd/drbd_int.h
38004@@ -385,7 +385,7 @@ struct drbd_epoch {
38005 struct drbd_connection *connection;
38006 struct list_head list;
38007 unsigned int barrier_nr;
38008- atomic_t epoch_size; /* increased on every request added. */
38009+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38010 atomic_t active; /* increased on every req. added, and dec on every finished. */
38011 unsigned long flags;
38012 };
38013@@ -946,7 +946,7 @@ struct drbd_device {
38014 unsigned int al_tr_number;
38015 int al_tr_cycle;
38016 wait_queue_head_t seq_wait;
38017- atomic_t packet_seq;
38018+ atomic_unchecked_t packet_seq;
38019 unsigned int peer_seq;
38020 spinlock_t peer_seq_lock;
38021 unsigned long comm_bm_set; /* communicated number of set bits. */
38022@@ -955,8 +955,8 @@ struct drbd_device {
38023 struct mutex own_state_mutex;
38024 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38025 char congestion_reason; /* Why we where congested... */
38026- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38027- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38028+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38029+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38030 int rs_last_sect_ev; /* counter to compare with */
38031 int rs_last_events; /* counter of read or write "events" (unit sectors)
38032 * on the lower level device when we last looked. */
38033@@ -1567,7 +1567,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
38034 char __user *uoptval;
38035 int err;
38036
38037- uoptval = (char __user __force *)optval;
38038+ uoptval = (char __force_user *)optval;
38039
38040 set_fs(KERNEL_DS);
38041 if (level == SOL_SOCKET)
38042diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38043index 973c185..05d8b1a 100644
38044--- a/drivers/block/drbd/drbd_main.c
38045+++ b/drivers/block/drbd/drbd_main.c
38046@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38047 p->sector = sector;
38048 p->block_id = block_id;
38049 p->blksize = blksize;
38050- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38051+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38052 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38053 }
38054
38055@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38056 return -EIO;
38057 p->sector = cpu_to_be64(req->i.sector);
38058 p->block_id = (unsigned long)req;
38059- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38060+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38061 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38062 if (device->state.conn >= C_SYNC_SOURCE &&
38063 device->state.conn <= C_PAUSED_SYNC_T)
38064@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38065 atomic_set(&device->unacked_cnt, 0);
38066 atomic_set(&device->local_cnt, 0);
38067 atomic_set(&device->pp_in_use_by_net, 0);
38068- atomic_set(&device->rs_sect_in, 0);
38069- atomic_set(&device->rs_sect_ev, 0);
38070+ atomic_set_unchecked(&device->rs_sect_in, 0);
38071+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38072 atomic_set(&device->ap_in_flight, 0);
38073 atomic_set(&device->md_io.in_use, 0);
38074
38075@@ -2688,8 +2688,8 @@ void drbd_destroy_connection(struct kref *kref)
38076 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38077 struct drbd_resource *resource = connection->resource;
38078
38079- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38080- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38081+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38082+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38083 kfree(connection->current_epoch);
38084
38085 idr_destroy(&connection->peer_devices);
38086diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38087index 1cd47df..57c53c0 100644
38088--- a/drivers/block/drbd/drbd_nl.c
38089+++ b/drivers/block/drbd/drbd_nl.c
38090@@ -3645,13 +3645,13 @@ finish:
38091
38092 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38093 {
38094- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38095+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38096 struct sk_buff *msg;
38097 struct drbd_genlmsghdr *d_out;
38098 unsigned seq;
38099 int err = -ENOMEM;
38100
38101- seq = atomic_inc_return(&drbd_genl_seq);
38102+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38103 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38104 if (!msg)
38105 goto failed;
38106diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38107index 6960fb0..215d76b 100644
38108--- a/drivers/block/drbd/drbd_receiver.c
38109+++ b/drivers/block/drbd/drbd_receiver.c
38110@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38111 struct drbd_device *device = peer_device->device;
38112 int err;
38113
38114- atomic_set(&device->packet_seq, 0);
38115+ atomic_set_unchecked(&device->packet_seq, 0);
38116 device->peer_seq = 0;
38117
38118 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38119@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38120 do {
38121 next_epoch = NULL;
38122
38123- epoch_size = atomic_read(&epoch->epoch_size);
38124+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38125
38126 switch (ev & ~EV_CLEANUP) {
38127 case EV_PUT:
38128@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38129 rv = FE_DESTROYED;
38130 } else {
38131 epoch->flags = 0;
38132- atomic_set(&epoch->epoch_size, 0);
38133+ atomic_set_unchecked(&epoch->epoch_size, 0);
38134 /* atomic_set(&epoch->active, 0); is already zero */
38135 if (rv == FE_STILL_LIVE)
38136 rv = FE_RECYCLED;
38137@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38138 conn_wait_active_ee_empty(connection);
38139 drbd_flush(connection);
38140
38141- if (atomic_read(&connection->current_epoch->epoch_size)) {
38142+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38143 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38144 if (epoch)
38145 break;
38146@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38147 }
38148
38149 epoch->flags = 0;
38150- atomic_set(&epoch->epoch_size, 0);
38151+ atomic_set_unchecked(&epoch->epoch_size, 0);
38152 atomic_set(&epoch->active, 0);
38153
38154 spin_lock(&connection->epoch_lock);
38155- if (atomic_read(&connection->current_epoch->epoch_size)) {
38156+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38157 list_add(&epoch->list, &connection->current_epoch->list);
38158 connection->current_epoch = epoch;
38159 connection->epochs++;
38160@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38161 list_add_tail(&peer_req->w.list, &device->sync_ee);
38162 spin_unlock_irq(&device->resource->req_lock);
38163
38164- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38165+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38166 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38167 return 0;
38168
38169@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38170 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38171 }
38172
38173- atomic_add(pi->size >> 9, &device->rs_sect_in);
38174+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38175
38176 return err;
38177 }
38178@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38179
38180 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38181 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38182- atomic_inc(&connection->current_epoch->epoch_size);
38183+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38184 err2 = drbd_drain_block(peer_device, pi->size);
38185 if (!err)
38186 err = err2;
38187@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38188
38189 spin_lock(&connection->epoch_lock);
38190 peer_req->epoch = connection->current_epoch;
38191- atomic_inc(&peer_req->epoch->epoch_size);
38192+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38193 atomic_inc(&peer_req->epoch->active);
38194 spin_unlock(&connection->epoch_lock);
38195
38196@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38197
38198 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38199 (int)part_stat_read(&disk->part0, sectors[1]) -
38200- atomic_read(&device->rs_sect_ev);
38201+ atomic_read_unchecked(&device->rs_sect_ev);
38202
38203 if (atomic_read(&device->ap_actlog_cnt)
38204 || !device->rs_last_events || curr_events - device->rs_last_events > 64) {
38205@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38206 device->use_csums = true;
38207 } else if (pi->cmd == P_OV_REPLY) {
38208 /* track progress, we may need to throttle */
38209- atomic_add(size >> 9, &device->rs_sect_in);
38210+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38211 peer_req->w.cb = w_e_end_ov_reply;
38212 dec_rs_pending(device);
38213 /* drbd_rs_begin_io done when we sent this request,
38214@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38215 goto out_free_e;
38216
38217 submit_for_resync:
38218- atomic_add(size >> 9, &device->rs_sect_ev);
38219+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38220
38221 submit:
38222 update_receiver_timing_details(connection, drbd_submit_peer_request);
38223@@ -4564,7 +4564,7 @@ struct data_cmd {
38224 int expect_payload;
38225 size_t pkt_size;
38226 int (*fn)(struct drbd_connection *, struct packet_info *);
38227-};
38228+} __do_const;
38229
38230 static struct data_cmd drbd_cmd_handler[] = {
38231 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38232@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38233 if (!list_empty(&connection->current_epoch->list))
38234 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38235 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38236- atomic_set(&connection->current_epoch->epoch_size, 0);
38237+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38238 connection->send.seen_any_write_yet = false;
38239
38240 drbd_info(connection, "Connection closed\n");
38241@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38242 put_ldev(device);
38243 }
38244 dec_rs_pending(device);
38245- atomic_add(blksize >> 9, &device->rs_sect_in);
38246+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38247
38248 return 0;
38249 }
38250@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38251 struct asender_cmd {
38252 size_t pkt_size;
38253 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38254-};
38255+} __do_const;
38256
38257 static struct asender_cmd asender_tbl[] = {
38258 [P_PING] = { 0, got_Ping },
38259diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38260index d2d1f97..6a1188f 100644
38261--- a/drivers/block/drbd/drbd_worker.c
38262+++ b/drivers/block/drbd/drbd_worker.c
38263@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38264 list_add_tail(&peer_req->w.list, &device->read_ee);
38265 spin_unlock_irq(&device->resource->req_lock);
38266
38267- atomic_add(size >> 9, &device->rs_sect_ev);
38268+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38269 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38270 return 0;
38271
38272@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38273 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38274 int number, mxb;
38275
38276- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38277+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38278 device->rs_in_flight -= sect_in;
38279
38280 rcu_read_lock();
38281@@ -1594,8 +1594,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38282 {
38283 struct fifo_buffer *plan;
38284
38285- atomic_set(&device->rs_sect_in, 0);
38286- atomic_set(&device->rs_sect_ev, 0);
38287+ atomic_set_unchecked(&device->rs_sect_in, 0);
38288+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38289 device->rs_in_flight = 0;
38290
38291 /* Updating the RCU protected object in place is necessary since
38292diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38293index 6cb1beb..bf490f7 100644
38294--- a/drivers/block/loop.c
38295+++ b/drivers/block/loop.c
38296@@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
38297
38298 file_start_write(file);
38299 set_fs(get_ds());
38300- bw = file->f_op->write(file, buf, len, &pos);
38301+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38302 set_fs(old_fs);
38303 file_end_write(file);
38304 if (likely(bw == len))
38305diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
38306index e2bb8af..44b8aef 100644
38307--- a/drivers/block/nvme-core.c
38308+++ b/drivers/block/nvme-core.c
38309@@ -73,7 +73,6 @@ static LIST_HEAD(dev_list);
38310 static struct task_struct *nvme_thread;
38311 static struct workqueue_struct *nvme_workq;
38312 static wait_queue_head_t nvme_kthread_wait;
38313-static struct notifier_block nvme_nb;
38314
38315 static void nvme_reset_failed_dev(struct work_struct *ws);
38316
38317@@ -2926,6 +2925,10 @@ static struct pci_driver nvme_driver = {
38318 .err_handler = &nvme_err_handler,
38319 };
38320
38321+static struct notifier_block nvme_nb = {
38322+ .notifier_call = &nvme_cpu_notify,
38323+};
38324+
38325 static int __init nvme_init(void)
38326 {
38327 int result;
38328@@ -2942,7 +2945,6 @@ static int __init nvme_init(void)
38329 else if (result > 0)
38330 nvme_major = result;
38331
38332- nvme_nb.notifier_call = &nvme_cpu_notify;
38333 result = register_hotcpu_notifier(&nvme_nb);
38334 if (result)
38335 goto unregister_blkdev;
38336diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38337index 09e628da..7607aaa 100644
38338--- a/drivers/block/pktcdvd.c
38339+++ b/drivers/block/pktcdvd.c
38340@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38341
38342 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38343 {
38344- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38345+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38346 }
38347
38348 /*
38349@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38350 return -EROFS;
38351 }
38352 pd->settings.fp = ti.fp;
38353- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38354+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38355
38356 if (ti.nwa_v) {
38357 pd->nwa = be32_to_cpu(ti.next_writable);
38358diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38359index e5565fb..71be10b4 100644
38360--- a/drivers/block/smart1,2.h
38361+++ b/drivers/block/smart1,2.h
38362@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38363 }
38364
38365 static struct access_method smart4_access = {
38366- smart4_submit_command,
38367- smart4_intr_mask,
38368- smart4_fifo_full,
38369- smart4_intr_pending,
38370- smart4_completed,
38371+ .submit_command = smart4_submit_command,
38372+ .set_intr_mask = smart4_intr_mask,
38373+ .fifo_full = smart4_fifo_full,
38374+ .intr_pending = smart4_intr_pending,
38375+ .command_completed = smart4_completed,
38376 };
38377
38378 /*
38379@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38380 }
38381
38382 static struct access_method smart2_access = {
38383- smart2_submit_command,
38384- smart2_intr_mask,
38385- smart2_fifo_full,
38386- smart2_intr_pending,
38387- smart2_completed,
38388+ .submit_command = smart2_submit_command,
38389+ .set_intr_mask = smart2_intr_mask,
38390+ .fifo_full = smart2_fifo_full,
38391+ .intr_pending = smart2_intr_pending,
38392+ .command_completed = smart2_completed,
38393 };
38394
38395 /*
38396@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38397 }
38398
38399 static struct access_method smart2e_access = {
38400- smart2e_submit_command,
38401- smart2e_intr_mask,
38402- smart2e_fifo_full,
38403- smart2e_intr_pending,
38404- smart2e_completed,
38405+ .submit_command = smart2e_submit_command,
38406+ .set_intr_mask = smart2e_intr_mask,
38407+ .fifo_full = smart2e_fifo_full,
38408+ .intr_pending = smart2e_intr_pending,
38409+ .command_completed = smart2e_completed,
38410 };
38411
38412 /*
38413@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38414 }
38415
38416 static struct access_method smart1_access = {
38417- smart1_submit_command,
38418- smart1_intr_mask,
38419- smart1_fifo_full,
38420- smart1_intr_pending,
38421- smart1_completed,
38422+ .submit_command = smart1_submit_command,
38423+ .set_intr_mask = smart1_intr_mask,
38424+ .fifo_full = smart1_fifo_full,
38425+ .intr_pending = smart1_intr_pending,
38426+ .command_completed = smart1_completed,
38427 };
38428diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38429index f038dba..bb74c08 100644
38430--- a/drivers/bluetooth/btwilink.c
38431+++ b/drivers/bluetooth/btwilink.c
38432@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38433
38434 static int bt_ti_probe(struct platform_device *pdev)
38435 {
38436- static struct ti_st *hst;
38437+ struct ti_st *hst;
38438 struct hci_dev *hdev;
38439 int err;
38440
38441diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38442index 5d28a45..a538f90 100644
38443--- a/drivers/cdrom/cdrom.c
38444+++ b/drivers/cdrom/cdrom.c
38445@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38446 ENSURE(reset, CDC_RESET);
38447 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38448 cdi->mc_flags = 0;
38449- cdo->n_minors = 0;
38450 cdi->options = CDO_USE_FFLAGS;
38451
38452 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38453@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38454 else
38455 cdi->cdda_method = CDDA_OLD;
38456
38457- if (!cdo->generic_packet)
38458- cdo->generic_packet = cdrom_dummy_generic_packet;
38459+ if (!cdo->generic_packet) {
38460+ pax_open_kernel();
38461+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38462+ pax_close_kernel();
38463+ }
38464
38465 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38466 mutex_lock(&cdrom_mutex);
38467@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38468 if (cdi->exit)
38469 cdi->exit(cdi);
38470
38471- cdi->ops->n_minors--;
38472 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38473 }
38474
38475@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38476 */
38477 nr = nframes;
38478 do {
38479- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38480+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38481 if (cgc.buffer)
38482 break;
38483
38484@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38485 struct cdrom_device_info *cdi;
38486 int ret;
38487
38488- ret = scnprintf(info + *pos, max_size - *pos, header);
38489+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38490 if (!ret)
38491 return 1;
38492
38493diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38494index 584bc31..e64a12c 100644
38495--- a/drivers/cdrom/gdrom.c
38496+++ b/drivers/cdrom/gdrom.c
38497@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38498 .audio_ioctl = gdrom_audio_ioctl,
38499 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38500 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38501- .n_minors = 1,
38502 };
38503
38504 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38505diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38506index efefd12..4f1d494 100644
38507--- a/drivers/char/Kconfig
38508+++ b/drivers/char/Kconfig
38509@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
38510
38511 config DEVKMEM
38512 bool "/dev/kmem virtual device support"
38513- default y
38514+ default n
38515+ depends on !GRKERNSEC_KMEM
38516 help
38517 Say Y here if you want to support the /dev/kmem device. The
38518 /dev/kmem device is rarely used, but can be used for certain
38519@@ -577,6 +578,7 @@ config DEVPORT
38520 bool
38521 depends on !M68K
38522 depends on ISA || PCI
38523+ depends on !GRKERNSEC_KMEM
38524 default y
38525
38526 source "drivers/s390/char/Kconfig"
38527diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38528index a48e05b..6bac831 100644
38529--- a/drivers/char/agp/compat_ioctl.c
38530+++ b/drivers/char/agp/compat_ioctl.c
38531@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38532 return -ENOMEM;
38533 }
38534
38535- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38536+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38537 sizeof(*usegment) * ureserve.seg_count)) {
38538 kfree(usegment);
38539 kfree(ksegment);
38540diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38541index 09f17eb..8531d2f 100644
38542--- a/drivers/char/agp/frontend.c
38543+++ b/drivers/char/agp/frontend.c
38544@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38545 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38546 return -EFAULT;
38547
38548- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38549+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38550 return -EFAULT;
38551
38552 client = agp_find_client_by_pid(reserve.pid);
38553@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38554 if (segment == NULL)
38555 return -ENOMEM;
38556
38557- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38558+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38559 sizeof(struct agp_segment) * reserve.seg_count)) {
38560 kfree(segment);
38561 return -EFAULT;
38562diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38563index 4f94375..413694e 100644
38564--- a/drivers/char/genrtc.c
38565+++ b/drivers/char/genrtc.c
38566@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38567 switch (cmd) {
38568
38569 case RTC_PLL_GET:
38570+ memset(&pll, 0, sizeof(pll));
38571 if (get_rtc_pll(&pll))
38572 return -EINVAL;
38573 else
38574diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38575index d5d4cd8..22d561d 100644
38576--- a/drivers/char/hpet.c
38577+++ b/drivers/char/hpet.c
38578@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38579 }
38580
38581 static int
38582-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38583+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38584 struct hpet_info *info)
38585 {
38586 struct hpet_timer __iomem *timer;
38587diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38588index f816211..89eadea 100644
38589--- a/drivers/char/ipmi/ipmi_msghandler.c
38590+++ b/drivers/char/ipmi/ipmi_msghandler.c
38591@@ -438,7 +438,7 @@ struct ipmi_smi {
38592 struct proc_dir_entry *proc_dir;
38593 char proc_dir_name[10];
38594
38595- atomic_t stats[IPMI_NUM_STATS];
38596+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38597
38598 /*
38599 * run_to_completion duplicate of smb_info, smi_info
38600@@ -470,9 +470,9 @@ static LIST_HEAD(smi_watchers);
38601 static DEFINE_MUTEX(smi_watchers_mutex);
38602
38603 #define ipmi_inc_stat(intf, stat) \
38604- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38605+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38606 #define ipmi_get_stat(intf, stat) \
38607- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38608+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38609
38610 static int is_lan_addr(struct ipmi_addr *addr)
38611 {
38612@@ -2925,7 +2925,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38613 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38614 init_waitqueue_head(&intf->waitq);
38615 for (i = 0; i < IPMI_NUM_STATS; i++)
38616- atomic_set(&intf->stats[i], 0);
38617+ atomic_set_unchecked(&intf->stats[i], 0);
38618
38619 intf->proc_dir = NULL;
38620
38621diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38622index 5c4e1f6..0ea58f9 100644
38623--- a/drivers/char/ipmi/ipmi_si_intf.c
38624+++ b/drivers/char/ipmi/ipmi_si_intf.c
38625@@ -285,7 +285,7 @@ struct smi_info {
38626 unsigned char slave_addr;
38627
38628 /* Counters and things for the proc filesystem. */
38629- atomic_t stats[SI_NUM_STATS];
38630+ atomic_unchecked_t stats[SI_NUM_STATS];
38631
38632 struct task_struct *thread;
38633
38634@@ -294,9 +294,9 @@ struct smi_info {
38635 };
38636
38637 #define smi_inc_stat(smi, stat) \
38638- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38639+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38640 #define smi_get_stat(smi, stat) \
38641- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38642+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38643
38644 #define SI_MAX_PARMS 4
38645
38646@@ -3377,7 +3377,7 @@ static int try_smi_init(struct smi_info *new_smi)
38647 atomic_set(&new_smi->req_events, 0);
38648 new_smi->run_to_completion = false;
38649 for (i = 0; i < SI_NUM_STATS; i++)
38650- atomic_set(&new_smi->stats[i], 0);
38651+ atomic_set_unchecked(&new_smi->stats[i], 0);
38652
38653 new_smi->interrupt_disabled = true;
38654 atomic_set(&new_smi->stop_operation, 0);
38655diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38656index 524b707..29d07c1 100644
38657--- a/drivers/char/mem.c
38658+++ b/drivers/char/mem.c
38659@@ -18,6 +18,7 @@
38660 #include <linux/raw.h>
38661 #include <linux/tty.h>
38662 #include <linux/capability.h>
38663+#include <linux/security.h>
38664 #include <linux/ptrace.h>
38665 #include <linux/device.h>
38666 #include <linux/highmem.h>
38667@@ -36,6 +37,10 @@
38668
38669 #define DEVPORT_MINOR 4
38670
38671+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38672+extern const struct file_operations grsec_fops;
38673+#endif
38674+
38675 static inline unsigned long size_inside_page(unsigned long start,
38676 unsigned long size)
38677 {
38678@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38679
38680 while (cursor < to) {
38681 if (!devmem_is_allowed(pfn)) {
38682+#ifdef CONFIG_GRKERNSEC_KMEM
38683+ gr_handle_mem_readwrite(from, to);
38684+#else
38685 printk(KERN_INFO
38686 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38687 current->comm, from, to);
38688+#endif
38689 return 0;
38690 }
38691 cursor += PAGE_SIZE;
38692@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38693 }
38694 return 1;
38695 }
38696+#elif defined(CONFIG_GRKERNSEC_KMEM)
38697+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38698+{
38699+ return 0;
38700+}
38701 #else
38702 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38703 {
38704@@ -122,6 +136,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38705
38706 while (count > 0) {
38707 unsigned long remaining;
38708+ char *temp;
38709
38710 sz = size_inside_page(p, count);
38711
38712@@ -137,7 +152,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38713 if (!ptr)
38714 return -EFAULT;
38715
38716- remaining = copy_to_user(buf, ptr, sz);
38717+#ifdef CONFIG_PAX_USERCOPY
38718+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38719+ if (!temp) {
38720+ unxlate_dev_mem_ptr(p, ptr);
38721+ return -ENOMEM;
38722+ }
38723+ memcpy(temp, ptr, sz);
38724+#else
38725+ temp = ptr;
38726+#endif
38727+
38728+ remaining = copy_to_user(buf, temp, sz);
38729+
38730+#ifdef CONFIG_PAX_USERCOPY
38731+ kfree(temp);
38732+#endif
38733+
38734 unxlate_dev_mem_ptr(p, ptr);
38735 if (remaining)
38736 return -EFAULT;
38737@@ -369,9 +400,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38738 size_t count, loff_t *ppos)
38739 {
38740 unsigned long p = *ppos;
38741- ssize_t low_count, read, sz;
38742+ ssize_t low_count, read, sz, err = 0;
38743 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
38744- int err = 0;
38745
38746 read = 0;
38747 if (p < (unsigned long) high_memory) {
38748@@ -393,6 +423,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38749 }
38750 #endif
38751 while (low_count > 0) {
38752+ char *temp;
38753+
38754 sz = size_inside_page(p, low_count);
38755
38756 /*
38757@@ -402,7 +434,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38758 */
38759 kbuf = xlate_dev_kmem_ptr((char *)p);
38760
38761- if (copy_to_user(buf, kbuf, sz))
38762+#ifdef CONFIG_PAX_USERCOPY
38763+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38764+ if (!temp)
38765+ return -ENOMEM;
38766+ memcpy(temp, kbuf, sz);
38767+#else
38768+ temp = kbuf;
38769+#endif
38770+
38771+ err = copy_to_user(buf, temp, sz);
38772+
38773+#ifdef CONFIG_PAX_USERCOPY
38774+ kfree(temp);
38775+#endif
38776+
38777+ if (err)
38778 return -EFAULT;
38779 buf += sz;
38780 p += sz;
38781@@ -797,6 +844,9 @@ static const struct memdev {
38782 #ifdef CONFIG_PRINTK
38783 [11] = { "kmsg", 0644, &kmsg_fops, NULL },
38784 #endif
38785+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38786+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
38787+#endif
38788 };
38789
38790 static int memory_open(struct inode *inode, struct file *filp)
38791@@ -868,7 +918,7 @@ static int __init chr_dev_init(void)
38792 continue;
38793
38794 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
38795- NULL, devlist[minor].name);
38796+ NULL, "%s", devlist[minor].name);
38797 }
38798
38799 return tty_init();
38800diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
38801index 9df78e2..01ba9ae 100644
38802--- a/drivers/char/nvram.c
38803+++ b/drivers/char/nvram.c
38804@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
38805
38806 spin_unlock_irq(&rtc_lock);
38807
38808- if (copy_to_user(buf, contents, tmp - contents))
38809+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
38810 return -EFAULT;
38811
38812 *ppos = i;
38813diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
38814index 0ea9986..e7b07e4 100644
38815--- a/drivers/char/pcmcia/synclink_cs.c
38816+++ b/drivers/char/pcmcia/synclink_cs.c
38817@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38818
38819 if (debug_level >= DEBUG_LEVEL_INFO)
38820 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
38821- __FILE__, __LINE__, info->device_name, port->count);
38822+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
38823
38824 if (tty_port_close_start(port, tty, filp) == 0)
38825 goto cleanup;
38826@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38827 cleanup:
38828 if (debug_level >= DEBUG_LEVEL_INFO)
38829 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
38830- tty->driver->name, port->count);
38831+ tty->driver->name, atomic_read(&port->count));
38832 }
38833
38834 /* Wait until the transmitter is empty.
38835@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38836
38837 if (debug_level >= DEBUG_LEVEL_INFO)
38838 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
38839- __FILE__, __LINE__, tty->driver->name, port->count);
38840+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
38841
38842 /* If port is closing, signal caller to try again */
38843 if (port->flags & ASYNC_CLOSING){
38844@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38845 goto cleanup;
38846 }
38847 spin_lock(&port->lock);
38848- port->count++;
38849+ atomic_inc(&port->count);
38850 spin_unlock(&port->lock);
38851 spin_unlock_irqrestore(&info->netlock, flags);
38852
38853- if (port->count == 1) {
38854+ if (atomic_read(&port->count) == 1) {
38855 /* 1st open on this device, init hardware */
38856 retval = startup(info, tty);
38857 if (retval < 0)
38858@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38859 unsigned short new_crctype;
38860
38861 /* return error if TTY interface open */
38862- if (info->port.count)
38863+ if (atomic_read(&info->port.count))
38864 return -EBUSY;
38865
38866 switch (encoding)
38867@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
38868
38869 /* arbitrate between network and tty opens */
38870 spin_lock_irqsave(&info->netlock, flags);
38871- if (info->port.count != 0 || info->netcount != 0) {
38872+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38873 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
38874 spin_unlock_irqrestore(&info->netlock, flags);
38875 return -EBUSY;
38876@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38877 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
38878
38879 /* return error if TTY interface open */
38880- if (info->port.count)
38881+ if (atomic_read(&info->port.count))
38882 return -EBUSY;
38883
38884 if (cmd != SIOCWANDEV)
38885diff --git a/drivers/char/random.c b/drivers/char/random.c
38886index 04645c0..560e350 100644
38887--- a/drivers/char/random.c
38888+++ b/drivers/char/random.c
38889@@ -289,9 +289,6 @@
38890 /*
38891 * To allow fractional bits to be tracked, the entropy_count field is
38892 * denominated in units of 1/8th bits.
38893- *
38894- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
38895- * credit_entropy_bits() needs to be 64 bits wide.
38896 */
38897 #define ENTROPY_SHIFT 3
38898 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
38899@@ -439,9 +436,9 @@ struct entropy_store {
38900 };
38901
38902 static void push_to_pool(struct work_struct *work);
38903-static __u32 input_pool_data[INPUT_POOL_WORDS];
38904-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
38905-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
38906+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
38907+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38908+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38909
38910 static struct entropy_store input_pool = {
38911 .poolinfo = &poolinfo_table[0],
38912@@ -635,7 +632,7 @@ retry:
38913 /* The +2 corresponds to the /4 in the denominator */
38914
38915 do {
38916- unsigned int anfrac = min(pnfrac, pool_size/2);
38917+ u64 anfrac = min(pnfrac, pool_size/2);
38918 unsigned int add =
38919 ((pool_size - entropy_count)*anfrac*3) >> s;
38920
38921@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
38922
38923 extract_buf(r, tmp);
38924 i = min_t(int, nbytes, EXTRACT_SIZE);
38925- if (copy_to_user(buf, tmp, i)) {
38926+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
38927 ret = -EFAULT;
38928 break;
38929 }
38930@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
38931 static int proc_do_uuid(struct ctl_table *table, int write,
38932 void __user *buffer, size_t *lenp, loff_t *ppos)
38933 {
38934- struct ctl_table fake_table;
38935+ ctl_table_no_const fake_table;
38936 unsigned char buf[64], tmp_uuid[16], *uuid;
38937
38938 uuid = table->data;
38939@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
38940 static int proc_do_entropy(struct ctl_table *table, int write,
38941 void __user *buffer, size_t *lenp, loff_t *ppos)
38942 {
38943- struct ctl_table fake_table;
38944+ ctl_table_no_const fake_table;
38945 int entropy_count;
38946
38947 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
38948diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
38949index 7cc1fe22..b602d6b 100644
38950--- a/drivers/char/sonypi.c
38951+++ b/drivers/char/sonypi.c
38952@@ -54,6 +54,7 @@
38953
38954 #include <asm/uaccess.h>
38955 #include <asm/io.h>
38956+#include <asm/local.h>
38957
38958 #include <linux/sonypi.h>
38959
38960@@ -490,7 +491,7 @@ static struct sonypi_device {
38961 spinlock_t fifo_lock;
38962 wait_queue_head_t fifo_proc_list;
38963 struct fasync_struct *fifo_async;
38964- int open_count;
38965+ local_t open_count;
38966 int model;
38967 struct input_dev *input_jog_dev;
38968 struct input_dev *input_key_dev;
38969@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
38970 static int sonypi_misc_release(struct inode *inode, struct file *file)
38971 {
38972 mutex_lock(&sonypi_device.lock);
38973- sonypi_device.open_count--;
38974+ local_dec(&sonypi_device.open_count);
38975 mutex_unlock(&sonypi_device.lock);
38976 return 0;
38977 }
38978@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
38979 {
38980 mutex_lock(&sonypi_device.lock);
38981 /* Flush input queue on first open */
38982- if (!sonypi_device.open_count)
38983+ if (!local_read(&sonypi_device.open_count))
38984 kfifo_reset(&sonypi_device.fifo);
38985- sonypi_device.open_count++;
38986+ local_inc(&sonypi_device.open_count);
38987 mutex_unlock(&sonypi_device.lock);
38988
38989 return 0;
38990diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
38991index 565a947..dcdc06e 100644
38992--- a/drivers/char/tpm/tpm_acpi.c
38993+++ b/drivers/char/tpm/tpm_acpi.c
38994@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
38995 virt = acpi_os_map_iomem(start, len);
38996 if (!virt) {
38997 kfree(log->bios_event_log);
38998+ log->bios_event_log = NULL;
38999 printk("%s: ERROR - Unable to map memory\n", __func__);
39000 return -EIO;
39001 }
39002
39003- memcpy_fromio(log->bios_event_log, virt, len);
39004+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39005
39006 acpi_os_unmap_iomem(virt, len);
39007 return 0;
39008diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39009index 3a56a13..f8cbd25 100644
39010--- a/drivers/char/tpm/tpm_eventlog.c
39011+++ b/drivers/char/tpm/tpm_eventlog.c
39012@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39013 event = addr;
39014
39015 if ((event->event_type == 0 && event->event_size == 0) ||
39016- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39017+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39018 return NULL;
39019
39020 return addr;
39021@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39022 return NULL;
39023
39024 if ((event->event_type == 0 && event->event_size == 0) ||
39025- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39026+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39027 return NULL;
39028
39029 (*pos)++;
39030@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39031 int i;
39032
39033 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39034- seq_putc(m, data[i]);
39035+ if (!seq_putc(m, data[i]))
39036+ return -EFAULT;
39037
39038 return 0;
39039 }
39040diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39041index cf7a561..c319ce0 100644
39042--- a/drivers/char/virtio_console.c
39043+++ b/drivers/char/virtio_console.c
39044@@ -684,7 +684,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
39045 if (to_user) {
39046 ssize_t ret;
39047
39048- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39049+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39050 if (ret)
39051 return -EFAULT;
39052 } else {
39053@@ -787,7 +787,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39054 if (!port_has_data(port) && !port->host_connected)
39055 return 0;
39056
39057- return fill_readbuf(port, ubuf, count, true);
39058+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39059 }
39060
39061 static int wait_port_writable(struct port *port, bool nonblock)
39062diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39063index b9355da..9611f4e 100644
39064--- a/drivers/clk/clk-composite.c
39065+++ b/drivers/clk/clk-composite.c
39066@@ -191,7 +191,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39067 struct clk *clk;
39068 struct clk_init_data init;
39069 struct clk_composite *composite;
39070- struct clk_ops *clk_composite_ops;
39071+ clk_ops_no_const *clk_composite_ops;
39072
39073 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39074 if (!composite) {
39075diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39076index dd3a78c..386d49c 100644
39077--- a/drivers/clk/socfpga/clk-gate.c
39078+++ b/drivers/clk/socfpga/clk-gate.c
39079@@ -22,6 +22,7 @@
39080 #include <linux/mfd/syscon.h>
39081 #include <linux/of.h>
39082 #include <linux/regmap.h>
39083+#include <asm/pgtable.h>
39084
39085 #include "clk.h"
39086
39087@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39088 return 0;
39089 }
39090
39091-static struct clk_ops gateclk_ops = {
39092+static clk_ops_no_const gateclk_ops __read_only = {
39093 .prepare = socfpga_clk_prepare,
39094 .recalc_rate = socfpga_clk_recalc_rate,
39095 .get_parent = socfpga_clk_get_parent,
39096@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39097 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39098 socfpga_clk->hw.bit_idx = clk_gate[1];
39099
39100- gateclk_ops.enable = clk_gate_ops.enable;
39101- gateclk_ops.disable = clk_gate_ops.disable;
39102+ pax_open_kernel();
39103+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39104+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39105+ pax_close_kernel();
39106 }
39107
39108 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39109diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39110index de6da95..c98278b 100644
39111--- a/drivers/clk/socfpga/clk-pll.c
39112+++ b/drivers/clk/socfpga/clk-pll.c
39113@@ -21,6 +21,7 @@
39114 #include <linux/io.h>
39115 #include <linux/of.h>
39116 #include <linux/of_address.h>
39117+#include <asm/pgtable.h>
39118
39119 #include "clk.h"
39120
39121@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39122 CLK_MGR_PLL_CLK_SRC_MASK;
39123 }
39124
39125-static struct clk_ops clk_pll_ops = {
39126+static clk_ops_no_const clk_pll_ops __read_only = {
39127 .recalc_rate = clk_pll_recalc_rate,
39128 .get_parent = clk_pll_get_parent,
39129 };
39130@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39131 pll_clk->hw.hw.init = &init;
39132
39133 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39134- clk_pll_ops.enable = clk_gate_ops.enable;
39135- clk_pll_ops.disable = clk_gate_ops.disable;
39136+ pax_open_kernel();
39137+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39138+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39139+ pax_close_kernel();
39140
39141 clk = clk_register(NULL, &pll_clk->hw.hw);
39142 if (WARN_ON(IS_ERR(clk))) {
39143diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39144index b0c18ed..1713a80 100644
39145--- a/drivers/cpufreq/acpi-cpufreq.c
39146+++ b/drivers/cpufreq/acpi-cpufreq.c
39147@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39148 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39149 per_cpu(acfreq_data, cpu) = data;
39150
39151- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39152- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39153+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39154+ pax_open_kernel();
39155+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39156+ pax_close_kernel();
39157+ }
39158
39159 result = acpi_processor_register_performance(data->acpi_data, cpu);
39160 if (result)
39161@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39162 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39163 break;
39164 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39165- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39166+ pax_open_kernel();
39167+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39168+ pax_close_kernel();
39169 break;
39170 default:
39171 break;
39172@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39173 if (!msrs)
39174 return;
39175
39176- acpi_cpufreq_driver.boost_supported = true;
39177- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39178+ pax_open_kernel();
39179+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39180+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39181+ pax_close_kernel();
39182
39183 cpu_notifier_register_begin();
39184
39185diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39186index f657c57..31d97ae 100644
39187--- a/drivers/cpufreq/cpufreq-dt.c
39188+++ b/drivers/cpufreq/cpufreq-dt.c
39189@@ -362,7 +362,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39190 if (!IS_ERR(cpu_reg))
39191 regulator_put(cpu_reg);
39192
39193- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39194+ pax_open_kernel();
39195+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39196+ pax_close_kernel();
39197
39198 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39199 if (ret)
39200diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39201index 4473eba..a4c9dc2 100644
39202--- a/drivers/cpufreq/cpufreq.c
39203+++ b/drivers/cpufreq/cpufreq.c
39204@@ -2122,7 +2122,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39205 }
39206
39207 mutex_lock(&cpufreq_governor_mutex);
39208- list_del(&governor->governor_list);
39209+ pax_list_del(&governor->governor_list);
39210 mutex_unlock(&cpufreq_governor_mutex);
39211 return;
39212 }
39213@@ -2338,7 +2338,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39214 return NOTIFY_OK;
39215 }
39216
39217-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39218+static struct notifier_block cpufreq_cpu_notifier = {
39219 .notifier_call = cpufreq_cpu_callback,
39220 };
39221
39222@@ -2378,13 +2378,17 @@ int cpufreq_boost_trigger_state(int state)
39223 return 0;
39224
39225 write_lock_irqsave(&cpufreq_driver_lock, flags);
39226- cpufreq_driver->boost_enabled = state;
39227+ pax_open_kernel();
39228+ *(bool *)&cpufreq_driver->boost_enabled = state;
39229+ pax_close_kernel();
39230 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39231
39232 ret = cpufreq_driver->set_boost(state);
39233 if (ret) {
39234 write_lock_irqsave(&cpufreq_driver_lock, flags);
39235- cpufreq_driver->boost_enabled = !state;
39236+ pax_open_kernel();
39237+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39238+ pax_close_kernel();
39239 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39240
39241 pr_err("%s: Cannot %s BOOST\n",
39242@@ -2441,8 +2445,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39243
39244 pr_debug("trying to register driver %s\n", driver_data->name);
39245
39246- if (driver_data->setpolicy)
39247- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39248+ if (driver_data->setpolicy) {
39249+ pax_open_kernel();
39250+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39251+ pax_close_kernel();
39252+ }
39253
39254 write_lock_irqsave(&cpufreq_driver_lock, flags);
39255 if (cpufreq_driver) {
39256@@ -2457,8 +2464,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39257 * Check if driver provides function to enable boost -
39258 * if not, use cpufreq_boost_set_sw as default
39259 */
39260- if (!cpufreq_driver->set_boost)
39261- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39262+ if (!cpufreq_driver->set_boost) {
39263+ pax_open_kernel();
39264+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39265+ pax_close_kernel();
39266+ }
39267
39268 ret = cpufreq_sysfs_create_file(&boost.attr);
39269 if (ret) {
39270diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39271index 1b44496..b80ff5e 100644
39272--- a/drivers/cpufreq/cpufreq_governor.c
39273+++ b/drivers/cpufreq/cpufreq_governor.c
39274@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39275 struct dbs_data *dbs_data;
39276 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39277 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39278- struct od_ops *od_ops = NULL;
39279+ const struct od_ops *od_ops = NULL;
39280 struct od_dbs_tuners *od_tuners = NULL;
39281 struct cs_dbs_tuners *cs_tuners = NULL;
39282 struct cpu_dbs_common_info *cpu_cdbs;
39283@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39284
39285 if ((cdata->governor == GOV_CONSERVATIVE) &&
39286 (!policy->governor->initialized)) {
39287- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39288+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39289
39290 cpufreq_register_notifier(cs_ops->notifier_block,
39291 CPUFREQ_TRANSITION_NOTIFIER);
39292@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39293
39294 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39295 (policy->governor->initialized == 1)) {
39296- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39297+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39298
39299 cpufreq_unregister_notifier(cs_ops->notifier_block,
39300 CPUFREQ_TRANSITION_NOTIFIER);
39301diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39302index cc401d1..8197340 100644
39303--- a/drivers/cpufreq/cpufreq_governor.h
39304+++ b/drivers/cpufreq/cpufreq_governor.h
39305@@ -212,7 +212,7 @@ struct common_dbs_data {
39306 void (*exit)(struct dbs_data *dbs_data);
39307
39308 /* Governor specific ops, see below */
39309- void *gov_ops;
39310+ const void *gov_ops;
39311 };
39312
39313 /* Governor Per policy data */
39314@@ -232,7 +232,7 @@ struct od_ops {
39315 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39316 unsigned int freq_next, unsigned int relation);
39317 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39318-};
39319+} __no_const;
39320
39321 struct cs_ops {
39322 struct notifier_block *notifier_block;
39323diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39324index ad3f38f..8f086cd 100644
39325--- a/drivers/cpufreq/cpufreq_ondemand.c
39326+++ b/drivers/cpufreq/cpufreq_ondemand.c
39327@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39328
39329 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39330
39331-static struct od_ops od_ops = {
39332+static struct od_ops od_ops __read_only = {
39333 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39334 .powersave_bias_target = generic_powersave_bias_target,
39335 .freq_increase = dbs_freq_increase,
39336@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39337 (struct cpufreq_policy *, unsigned int, unsigned int),
39338 unsigned int powersave_bias)
39339 {
39340- od_ops.powersave_bias_target = f;
39341+ pax_open_kernel();
39342+ *(void **)&od_ops.powersave_bias_target = f;
39343+ pax_close_kernel();
39344 od_set_powersave_bias(powersave_bias);
39345 }
39346 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39347
39348 void od_unregister_powersave_bias_handler(void)
39349 {
39350- od_ops.powersave_bias_target = generic_powersave_bias_target;
39351+ pax_open_kernel();
39352+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39353+ pax_close_kernel();
39354 od_set_powersave_bias(0);
39355 }
39356 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39357diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39358index 27bb6d3..4cf595c 100644
39359--- a/drivers/cpufreq/intel_pstate.c
39360+++ b/drivers/cpufreq/intel_pstate.c
39361@@ -133,10 +133,10 @@ struct pstate_funcs {
39362 struct cpu_defaults {
39363 struct pstate_adjust_policy pid_policy;
39364 struct pstate_funcs funcs;
39365-};
39366+} __do_const;
39367
39368 static struct pstate_adjust_policy pid_params;
39369-static struct pstate_funcs pstate_funcs;
39370+static struct pstate_funcs *pstate_funcs;
39371
39372 struct perf_limits {
39373 int no_turbo;
39374@@ -594,18 +594,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39375
39376 cpu->pstate.current_pstate = pstate;
39377
39378- pstate_funcs.set(cpu, pstate);
39379+ pstate_funcs->set(cpu, pstate);
39380 }
39381
39382 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39383 {
39384- cpu->pstate.min_pstate = pstate_funcs.get_min();
39385- cpu->pstate.max_pstate = pstate_funcs.get_max();
39386- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39387- cpu->pstate.scaling = pstate_funcs.get_scaling();
39388+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39389+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39390+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39391+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39392
39393- if (pstate_funcs.get_vid)
39394- pstate_funcs.get_vid(cpu);
39395+ if (pstate_funcs->get_vid)
39396+ pstate_funcs->get_vid(cpu);
39397 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39398 }
39399
39400@@ -875,9 +875,9 @@ static int intel_pstate_msrs_not_valid(void)
39401 rdmsrl(MSR_IA32_APERF, aperf);
39402 rdmsrl(MSR_IA32_MPERF, mperf);
39403
39404- if (!pstate_funcs.get_max() ||
39405- !pstate_funcs.get_min() ||
39406- !pstate_funcs.get_turbo())
39407+ if (!pstate_funcs->get_max() ||
39408+ !pstate_funcs->get_min() ||
39409+ !pstate_funcs->get_turbo())
39410 return -ENODEV;
39411
39412 rdmsrl(MSR_IA32_APERF, tmp);
39413@@ -891,7 +891,7 @@ static int intel_pstate_msrs_not_valid(void)
39414 return 0;
39415 }
39416
39417-static void copy_pid_params(struct pstate_adjust_policy *policy)
39418+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39419 {
39420 pid_params.sample_rate_ms = policy->sample_rate_ms;
39421 pid_params.p_gain_pct = policy->p_gain_pct;
39422@@ -903,12 +903,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39423
39424 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39425 {
39426- pstate_funcs.get_max = funcs->get_max;
39427- pstate_funcs.get_min = funcs->get_min;
39428- pstate_funcs.get_turbo = funcs->get_turbo;
39429- pstate_funcs.get_scaling = funcs->get_scaling;
39430- pstate_funcs.set = funcs->set;
39431- pstate_funcs.get_vid = funcs->get_vid;
39432+ pstate_funcs = funcs;
39433 }
39434
39435 #if IS_ENABLED(CONFIG_ACPI)
39436diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39437index 529cfd9..0e28fff 100644
39438--- a/drivers/cpufreq/p4-clockmod.c
39439+++ b/drivers/cpufreq/p4-clockmod.c
39440@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39441 case 0x0F: /* Core Duo */
39442 case 0x16: /* Celeron Core */
39443 case 0x1C: /* Atom */
39444- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39445+ pax_open_kernel();
39446+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39447+ pax_close_kernel();
39448 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39449 case 0x0D: /* Pentium M (Dothan) */
39450- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39451+ pax_open_kernel();
39452+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39453+ pax_close_kernel();
39454 /* fall through */
39455 case 0x09: /* Pentium M (Banias) */
39456 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39457@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39458
39459 /* on P-4s, the TSC runs with constant frequency independent whether
39460 * throttling is active or not. */
39461- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39462+ pax_open_kernel();
39463+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39464+ pax_close_kernel();
39465
39466 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39467 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39468diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39469index 9bb42ba..b01b4a2 100644
39470--- a/drivers/cpufreq/sparc-us3-cpufreq.c
39471+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39472@@ -18,14 +18,12 @@
39473 #include <asm/head.h>
39474 #include <asm/timer.h>
39475
39476-static struct cpufreq_driver *cpufreq_us3_driver;
39477-
39478 struct us3_freq_percpu_info {
39479 struct cpufreq_frequency_table table[4];
39480 };
39481
39482 /* Indexed by cpu number. */
39483-static struct us3_freq_percpu_info *us3_freq_table;
39484+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39485
39486 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39487 * in the Safari config register.
39488@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39489
39490 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39491 {
39492- if (cpufreq_us3_driver)
39493- us3_freq_target(policy, 0);
39494+ us3_freq_target(policy, 0);
39495
39496 return 0;
39497 }
39498
39499+static int __init us3_freq_init(void);
39500+static void __exit us3_freq_exit(void);
39501+
39502+static struct cpufreq_driver cpufreq_us3_driver = {
39503+ .init = us3_freq_cpu_init,
39504+ .verify = cpufreq_generic_frequency_table_verify,
39505+ .target_index = us3_freq_target,
39506+ .get = us3_freq_get,
39507+ .exit = us3_freq_cpu_exit,
39508+ .name = "UltraSPARC-III",
39509+
39510+};
39511+
39512 static int __init us3_freq_init(void)
39513 {
39514 unsigned long manuf, impl, ver;
39515- int ret;
39516
39517 if (tlb_type != cheetah && tlb_type != cheetah_plus)
39518 return -ENODEV;
39519@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
39520 (impl == CHEETAH_IMPL ||
39521 impl == CHEETAH_PLUS_IMPL ||
39522 impl == JAGUAR_IMPL ||
39523- impl == PANTHER_IMPL)) {
39524- struct cpufreq_driver *driver;
39525-
39526- ret = -ENOMEM;
39527- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39528- if (!driver)
39529- goto err_out;
39530-
39531- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39532- GFP_KERNEL);
39533- if (!us3_freq_table)
39534- goto err_out;
39535-
39536- driver->init = us3_freq_cpu_init;
39537- driver->verify = cpufreq_generic_frequency_table_verify;
39538- driver->target_index = us3_freq_target;
39539- driver->get = us3_freq_get;
39540- driver->exit = us3_freq_cpu_exit;
39541- strcpy(driver->name, "UltraSPARC-III");
39542-
39543- cpufreq_us3_driver = driver;
39544- ret = cpufreq_register_driver(driver);
39545- if (ret)
39546- goto err_out;
39547-
39548- return 0;
39549-
39550-err_out:
39551- if (driver) {
39552- kfree(driver);
39553- cpufreq_us3_driver = NULL;
39554- }
39555- kfree(us3_freq_table);
39556- us3_freq_table = NULL;
39557- return ret;
39558- }
39559+ impl == PANTHER_IMPL))
39560+ return cpufreq_register_driver(&cpufreq_us3_driver);
39561
39562 return -ENODEV;
39563 }
39564
39565 static void __exit us3_freq_exit(void)
39566 {
39567- if (cpufreq_us3_driver) {
39568- cpufreq_unregister_driver(cpufreq_us3_driver);
39569- kfree(cpufreq_us3_driver);
39570- cpufreq_us3_driver = NULL;
39571- kfree(us3_freq_table);
39572- us3_freq_table = NULL;
39573- }
39574+ cpufreq_unregister_driver(&cpufreq_us3_driver);
39575 }
39576
39577 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39578diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39579index 7d4a315..21bb886 100644
39580--- a/drivers/cpufreq/speedstep-centrino.c
39581+++ b/drivers/cpufreq/speedstep-centrino.c
39582@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39583 !cpu_has(cpu, X86_FEATURE_EST))
39584 return -ENODEV;
39585
39586- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39587- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39588+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39589+ pax_open_kernel();
39590+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39591+ pax_close_kernel();
39592+ }
39593
39594 if (policy->cpu != 0)
39595 return -ENODEV;
39596diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39597index e431d11..d0b997e 100644
39598--- a/drivers/cpuidle/driver.c
39599+++ b/drivers/cpuidle/driver.c
39600@@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
39601
39602 static void poll_idle_init(struct cpuidle_driver *drv)
39603 {
39604- struct cpuidle_state *state = &drv->states[0];
39605+ cpuidle_state_no_const *state = &drv->states[0];
39606
39607 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39608 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39609diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39610index fb9f511..213e6cc 100644
39611--- a/drivers/cpuidle/governor.c
39612+++ b/drivers/cpuidle/governor.c
39613@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39614 mutex_lock(&cpuidle_lock);
39615 if (__cpuidle_find_governor(gov->name) == NULL) {
39616 ret = 0;
39617- list_add_tail(&gov->governor_list, &cpuidle_governors);
39618+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39619 if (!cpuidle_curr_governor ||
39620 cpuidle_curr_governor->rating < gov->rating)
39621 cpuidle_switch_governor(gov);
39622diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39623index 97c5903..023ad23 100644
39624--- a/drivers/cpuidle/sysfs.c
39625+++ b/drivers/cpuidle/sysfs.c
39626@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39627 NULL
39628 };
39629
39630-static struct attribute_group cpuidle_attr_group = {
39631+static attribute_group_no_const cpuidle_attr_group = {
39632 .attrs = cpuidle_default_attrs,
39633 .name = "cpuidle",
39634 };
39635diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39636index 8d2a772..33826c9 100644
39637--- a/drivers/crypto/hifn_795x.c
39638+++ b/drivers/crypto/hifn_795x.c
39639@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39640 MODULE_PARM_DESC(hifn_pll_ref,
39641 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39642
39643-static atomic_t hifn_dev_number;
39644+static atomic_unchecked_t hifn_dev_number;
39645
39646 #define ACRYPTO_OP_DECRYPT 0
39647 #define ACRYPTO_OP_ENCRYPT 1
39648@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
39649 goto err_out_disable_pci_device;
39650
39651 snprintf(name, sizeof(name), "hifn%d",
39652- atomic_inc_return(&hifn_dev_number)-1);
39653+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
39654
39655 err = pci_request_regions(pdev, name);
39656 if (err)
39657diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
39658index 30b538d8..1610d75 100644
39659--- a/drivers/devfreq/devfreq.c
39660+++ b/drivers/devfreq/devfreq.c
39661@@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
39662 goto err_out;
39663 }
39664
39665- list_add(&governor->node, &devfreq_governor_list);
39666+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
39667
39668 list_for_each_entry(devfreq, &devfreq_list, node) {
39669 int ret = 0;
39670@@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
39671 }
39672 }
39673
39674- list_del(&governor->node);
39675+ pax_list_del((struct list_head *)&governor->node);
39676 err_out:
39677 mutex_unlock(&devfreq_list_lock);
39678
39679diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
39680index 42d4974..2714f36 100644
39681--- a/drivers/dma/sh/shdma-base.c
39682+++ b/drivers/dma/sh/shdma-base.c
39683@@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
39684 schan->slave_id = -EINVAL;
39685 }
39686
39687- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
39688- sdev->desc_size, GFP_KERNEL);
39689+ schan->desc = kcalloc(sdev->desc_size,
39690+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
39691 if (!schan->desc) {
39692 ret = -ENOMEM;
39693 goto edescalloc;
39694diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
39695index 58eb857..d7e42c8 100644
39696--- a/drivers/dma/sh/shdmac.c
39697+++ b/drivers/dma/sh/shdmac.c
39698@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
39699 return ret;
39700 }
39701
39702-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
39703+static struct notifier_block sh_dmae_nmi_notifier = {
39704 .notifier_call = sh_dmae_nmi_handler,
39705
39706 /* Run before NMI debug handler and KGDB */
39707diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
39708index 592af5f..bb1d583 100644
39709--- a/drivers/edac/edac_device.c
39710+++ b/drivers/edac/edac_device.c
39711@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
39712 */
39713 int edac_device_alloc_index(void)
39714 {
39715- static atomic_t device_indexes = ATOMIC_INIT(0);
39716+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
39717
39718- return atomic_inc_return(&device_indexes) - 1;
39719+ return atomic_inc_return_unchecked(&device_indexes) - 1;
39720 }
39721 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
39722
39723diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
39724index a6cd361..7bdbf53 100644
39725--- a/drivers/edac/edac_mc_sysfs.c
39726+++ b/drivers/edac/edac_mc_sysfs.c
39727@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
39728 struct dev_ch_attribute {
39729 struct device_attribute attr;
39730 int channel;
39731-};
39732+} __do_const;
39733
39734 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
39735 struct dev_ch_attribute dev_attr_legacy_##_name = \
39736@@ -1011,14 +1011,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
39737 }
39738
39739 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
39740+ pax_open_kernel();
39741 if (mci->get_sdram_scrub_rate) {
39742- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39743- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39744+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39745+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39746 }
39747 if (mci->set_sdram_scrub_rate) {
39748- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39749- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39750+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39751+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39752 }
39753+ pax_close_kernel();
39754 err = device_create_file(&mci->dev,
39755 &dev_attr_sdram_scrub_rate);
39756 if (err) {
39757diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
39758index 2cf44b4d..6dd2dc7 100644
39759--- a/drivers/edac/edac_pci.c
39760+++ b/drivers/edac/edac_pci.c
39761@@ -29,7 +29,7 @@
39762
39763 static DEFINE_MUTEX(edac_pci_ctls_mutex);
39764 static LIST_HEAD(edac_pci_list);
39765-static atomic_t pci_indexes = ATOMIC_INIT(0);
39766+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
39767
39768 /*
39769 * edac_pci_alloc_ctl_info
39770@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
39771 */
39772 int edac_pci_alloc_index(void)
39773 {
39774- return atomic_inc_return(&pci_indexes) - 1;
39775+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
39776 }
39777 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
39778
39779diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
39780index e8658e4..22746d6 100644
39781--- a/drivers/edac/edac_pci_sysfs.c
39782+++ b/drivers/edac/edac_pci_sysfs.c
39783@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
39784 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
39785 static int edac_pci_poll_msec = 1000; /* one second workq period */
39786
39787-static atomic_t pci_parity_count = ATOMIC_INIT(0);
39788-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
39789+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
39790+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
39791
39792 static struct kobject *edac_pci_top_main_kobj;
39793 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
39794@@ -235,7 +235,7 @@ struct edac_pci_dev_attribute {
39795 void *value;
39796 ssize_t(*show) (void *, char *);
39797 ssize_t(*store) (void *, const char *, size_t);
39798-};
39799+} __do_const;
39800
39801 /* Set of show/store abstract level functions for PCI Parity object */
39802 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
39803@@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39804 edac_printk(KERN_CRIT, EDAC_PCI,
39805 "Signaled System Error on %s\n",
39806 pci_name(dev));
39807- atomic_inc(&pci_nonparity_count);
39808+ atomic_inc_unchecked(&pci_nonparity_count);
39809 }
39810
39811 if (status & (PCI_STATUS_PARITY)) {
39812@@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39813 "Master Data Parity Error on %s\n",
39814 pci_name(dev));
39815
39816- atomic_inc(&pci_parity_count);
39817+ atomic_inc_unchecked(&pci_parity_count);
39818 }
39819
39820 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39821@@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39822 "Detected Parity Error on %s\n",
39823 pci_name(dev));
39824
39825- atomic_inc(&pci_parity_count);
39826+ atomic_inc_unchecked(&pci_parity_count);
39827 }
39828 }
39829
39830@@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39831 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
39832 "Signaled System Error on %s\n",
39833 pci_name(dev));
39834- atomic_inc(&pci_nonparity_count);
39835+ atomic_inc_unchecked(&pci_nonparity_count);
39836 }
39837
39838 if (status & (PCI_STATUS_PARITY)) {
39839@@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39840 "Master Data Parity Error on "
39841 "%s\n", pci_name(dev));
39842
39843- atomic_inc(&pci_parity_count);
39844+ atomic_inc_unchecked(&pci_parity_count);
39845 }
39846
39847 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39848@@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39849 "Detected Parity Error on %s\n",
39850 pci_name(dev));
39851
39852- atomic_inc(&pci_parity_count);
39853+ atomic_inc_unchecked(&pci_parity_count);
39854 }
39855 }
39856 }
39857@@ -672,7 +672,7 @@ void edac_pci_do_parity_check(void)
39858 if (!check_pci_errors)
39859 return;
39860
39861- before_count = atomic_read(&pci_parity_count);
39862+ before_count = atomic_read_unchecked(&pci_parity_count);
39863
39864 /* scan all PCI devices looking for a Parity Error on devices and
39865 * bridges.
39866@@ -684,7 +684,7 @@ void edac_pci_do_parity_check(void)
39867 /* Only if operator has selected panic on PCI Error */
39868 if (edac_pci_get_panic_on_pe()) {
39869 /* If the count is different 'after' from 'before' */
39870- if (before_count != atomic_read(&pci_parity_count))
39871+ if (before_count != atomic_read_unchecked(&pci_parity_count))
39872 panic("EDAC: PCI Parity Error");
39873 }
39874 }
39875diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
39876index 51b7e3a..aa8a3e8 100644
39877--- a/drivers/edac/mce_amd.h
39878+++ b/drivers/edac/mce_amd.h
39879@@ -77,7 +77,7 @@ struct amd_decoder_ops {
39880 bool (*mc0_mce)(u16, u8);
39881 bool (*mc1_mce)(u16, u8);
39882 bool (*mc2_mce)(u16, u8);
39883-};
39884+} __no_const;
39885
39886 void amd_report_gart_errors(bool);
39887 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
39888diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
39889index 57ea7f4..af06b76 100644
39890--- a/drivers/firewire/core-card.c
39891+++ b/drivers/firewire/core-card.c
39892@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
39893 const struct fw_card_driver *driver,
39894 struct device *device)
39895 {
39896- static atomic_t index = ATOMIC_INIT(-1);
39897+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
39898
39899- card->index = atomic_inc_return(&index);
39900+ card->index = atomic_inc_return_unchecked(&index);
39901 card->driver = driver;
39902 card->device = device;
39903 card->current_tlabel = 0;
39904@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
39905
39906 void fw_core_remove_card(struct fw_card *card)
39907 {
39908- struct fw_card_driver dummy_driver = dummy_driver_template;
39909+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
39910
39911 card->driver->update_phy_reg(card, 4,
39912 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
39913diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
39914index 2c6d5e1..a2cca6b 100644
39915--- a/drivers/firewire/core-device.c
39916+++ b/drivers/firewire/core-device.c
39917@@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
39918 struct config_rom_attribute {
39919 struct device_attribute attr;
39920 u32 key;
39921-};
39922+} __do_const;
39923
39924 static ssize_t show_immediate(struct device *dev,
39925 struct device_attribute *dattr, char *buf)
39926diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
39927index eb6935c..3cc2bfa 100644
39928--- a/drivers/firewire/core-transaction.c
39929+++ b/drivers/firewire/core-transaction.c
39930@@ -38,6 +38,7 @@
39931 #include <linux/timer.h>
39932 #include <linux/types.h>
39933 #include <linux/workqueue.h>
39934+#include <linux/sched.h>
39935
39936 #include <asm/byteorder.h>
39937
39938diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
39939index e1480ff6..1a429bd 100644
39940--- a/drivers/firewire/core.h
39941+++ b/drivers/firewire/core.h
39942@@ -111,6 +111,7 @@ struct fw_card_driver {
39943
39944 int (*stop_iso)(struct fw_iso_context *ctx);
39945 };
39946+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
39947
39948 void fw_card_initialize(struct fw_card *card,
39949 const struct fw_card_driver *driver, struct device *device);
39950diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
39951index a66a321..f6caf20 100644
39952--- a/drivers/firewire/ohci.c
39953+++ b/drivers/firewire/ohci.c
39954@@ -2056,10 +2056,12 @@ static void bus_reset_work(struct work_struct *work)
39955 be32_to_cpu(ohci->next_header));
39956 }
39957
39958+#ifndef CONFIG_GRKERNSEC
39959 if (param_remote_dma) {
39960 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
39961 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
39962 }
39963+#endif
39964
39965 spin_unlock_irq(&ohci->lock);
39966
39967@@ -2591,8 +2593,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
39968 unsigned long flags;
39969 int n, ret = 0;
39970
39971+#ifndef CONFIG_GRKERNSEC
39972 if (param_remote_dma)
39973 return 0;
39974+#endif
39975
39976 /*
39977 * FIXME: Make sure this bitmask is cleared when we clear the busReset
39978diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
39979index 94a58a0..f5eba42 100644
39980--- a/drivers/firmware/dmi-id.c
39981+++ b/drivers/firmware/dmi-id.c
39982@@ -16,7 +16,7 @@
39983 struct dmi_device_attribute{
39984 struct device_attribute dev_attr;
39985 int field;
39986-};
39987+} __do_const;
39988 #define to_dmi_dev_attr(_dev_attr) \
39989 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
39990
39991diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
39992index 17afc51..0ef90cd 100644
39993--- a/drivers/firmware/dmi_scan.c
39994+++ b/drivers/firmware/dmi_scan.c
39995@@ -835,7 +835,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
39996 if (buf == NULL)
39997 return -1;
39998
39999- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
40000+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
40001
40002 dmi_unmap(buf);
40003 return 0;
40004diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40005index 5b53d61..72cee96 100644
40006--- a/drivers/firmware/efi/cper.c
40007+++ b/drivers/firmware/efi/cper.c
40008@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40009 */
40010 u64 cper_next_record_id(void)
40011 {
40012- static atomic64_t seq;
40013+ static atomic64_unchecked_t seq;
40014
40015- if (!atomic64_read(&seq))
40016- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40017+ if (!atomic64_read_unchecked(&seq))
40018+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40019
40020- return atomic64_inc_return(&seq);
40021+ return atomic64_inc_return_unchecked(&seq);
40022 }
40023 EXPORT_SYMBOL_GPL(cper_next_record_id);
40024
40025diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40026index 8590099..d83627a 100644
40027--- a/drivers/firmware/efi/efi.c
40028+++ b/drivers/firmware/efi/efi.c
40029@@ -148,14 +148,16 @@ static struct attribute_group efi_subsys_attr_group = {
40030 };
40031
40032 static struct efivars generic_efivars;
40033-static struct efivar_operations generic_ops;
40034+static efivar_operations_no_const generic_ops __read_only;
40035
40036 static int generic_ops_register(void)
40037 {
40038- generic_ops.get_variable = efi.get_variable;
40039- generic_ops.set_variable = efi.set_variable;
40040- generic_ops.get_next_variable = efi.get_next_variable;
40041- generic_ops.query_variable_store = efi_query_variable_store;
40042+ pax_open_kernel();
40043+ *(void **)&generic_ops.get_variable = efi.get_variable;
40044+ *(void **)&generic_ops.set_variable = efi.set_variable;
40045+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40046+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40047+ pax_close_kernel();
40048
40049 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40050 }
40051diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40052index f256ecd..387dcb1 100644
40053--- a/drivers/firmware/efi/efivars.c
40054+++ b/drivers/firmware/efi/efivars.c
40055@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40056 static int
40057 create_efivars_bin_attributes(void)
40058 {
40059- struct bin_attribute *attr;
40060+ bin_attribute_no_const *attr;
40061 int error;
40062
40063 /* new_var */
40064diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40065index 2f569aa..c95f4fb 100644
40066--- a/drivers/firmware/google/memconsole.c
40067+++ b/drivers/firmware/google/memconsole.c
40068@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40069 if (!found_memconsole())
40070 return -ENODEV;
40071
40072- memconsole_bin_attr.size = memconsole_length;
40073+ pax_open_kernel();
40074+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40075+ pax_close_kernel();
40076+
40077 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40078 }
40079
40080diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40081index fe49ec3..1ade794 100644
40082--- a/drivers/gpio/gpio-em.c
40083+++ b/drivers/gpio/gpio-em.c
40084@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40085 struct em_gio_priv *p;
40086 struct resource *io[2], *irq[2];
40087 struct gpio_chip *gpio_chip;
40088- struct irq_chip *irq_chip;
40089+ irq_chip_no_const *irq_chip;
40090 const char *name = dev_name(&pdev->dev);
40091 int ret;
40092
40093diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40094index 3784e81..73637b5 100644
40095--- a/drivers/gpio/gpio-ich.c
40096+++ b/drivers/gpio/gpio-ich.c
40097@@ -94,7 +94,7 @@ struct ichx_desc {
40098 * this option allows driver caching written output values
40099 */
40100 bool use_outlvl_cache;
40101-};
40102+} __do_const;
40103
40104 static struct {
40105 spinlock_t lock;
40106diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40107index 415682f..08438b8 100644
40108--- a/drivers/gpio/gpio-omap.c
40109+++ b/drivers/gpio/gpio-omap.c
40110@@ -1162,7 +1162,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40111 const struct omap_gpio_platform_data *pdata;
40112 struct resource *res;
40113 struct gpio_bank *bank;
40114- struct irq_chip *irqc;
40115+ irq_chip_no_const *irqc;
40116 int ret;
40117
40118 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40119diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40120index bf6c094..6573caf 100644
40121--- a/drivers/gpio/gpio-rcar.c
40122+++ b/drivers/gpio/gpio-rcar.c
40123@@ -357,7 +357,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40124 struct gpio_rcar_priv *p;
40125 struct resource *io, *irq;
40126 struct gpio_chip *gpio_chip;
40127- struct irq_chip *irq_chip;
40128+ irq_chip_no_const *irq_chip;
40129 struct device *dev = &pdev->dev;
40130 const char *name = dev_name(dev);
40131 int ret;
40132diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40133index dbf28fa..04dad4e 100644
40134--- a/drivers/gpio/gpio-vr41xx.c
40135+++ b/drivers/gpio/gpio-vr41xx.c
40136@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40137 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40138 maskl, pendl, maskh, pendh);
40139
40140- atomic_inc(&irq_err_count);
40141+ atomic_inc_unchecked(&irq_err_count);
40142
40143 return -EINVAL;
40144 }
40145diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40146index e8e98ca..10f416e 100644
40147--- a/drivers/gpio/gpiolib.c
40148+++ b/drivers/gpio/gpiolib.c
40149@@ -537,8 +537,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40150 }
40151
40152 if (gpiochip->irqchip) {
40153- gpiochip->irqchip->irq_request_resources = NULL;
40154- gpiochip->irqchip->irq_release_resources = NULL;
40155+ pax_open_kernel();
40156+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40157+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40158+ pax_close_kernel();
40159 gpiochip->irqchip = NULL;
40160 }
40161 }
40162@@ -604,8 +606,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40163 gpiochip->irqchip = NULL;
40164 return -EINVAL;
40165 }
40166- irqchip->irq_request_resources = gpiochip_irq_reqres;
40167- irqchip->irq_release_resources = gpiochip_irq_relres;
40168+
40169+ pax_open_kernel();
40170+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40171+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40172+ pax_close_kernel();
40173
40174 /*
40175 * Prepare the mapping since the irqchip shall be orthogonal to
40176diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40177index e79c8d3..a9370bc 100644
40178--- a/drivers/gpu/drm/drm_crtc.c
40179+++ b/drivers/gpu/drm/drm_crtc.c
40180@@ -3900,7 +3900,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40181 goto done;
40182 }
40183
40184- if (copy_to_user(&enum_ptr[copied].name,
40185+ if (copy_to_user(enum_ptr[copied].name,
40186 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40187 ret = -EFAULT;
40188 goto done;
40189diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40190index bc3da32..7289357 100644
40191--- a/drivers/gpu/drm/drm_drv.c
40192+++ b/drivers/gpu/drm/drm_drv.c
40193@@ -443,7 +443,7 @@ void drm_unplug_dev(struct drm_device *dev)
40194
40195 drm_device_set_unplugged(dev);
40196
40197- if (dev->open_count == 0) {
40198+ if (local_read(&dev->open_count) == 0) {
40199 drm_put_dev(dev);
40200 }
40201 mutex_unlock(&drm_global_mutex);
40202diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40203index ed7bc68..0d536af 100644
40204--- a/drivers/gpu/drm/drm_fops.c
40205+++ b/drivers/gpu/drm/drm_fops.c
40206@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40207 return PTR_ERR(minor);
40208
40209 dev = minor->dev;
40210- if (!dev->open_count++)
40211+ if (local_inc_return(&dev->open_count) == 1)
40212 need_setup = 1;
40213
40214 /* share address_space across all char-devs of a single device */
40215@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40216 return 0;
40217
40218 err_undo:
40219- dev->open_count--;
40220+ local_dec(&dev->open_count);
40221 drm_minor_release(minor);
40222 return retcode;
40223 }
40224@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40225
40226 mutex_lock(&drm_global_mutex);
40227
40228- DRM_DEBUG("open_count = %d\n", dev->open_count);
40229+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40230
40231 mutex_lock(&dev->struct_mutex);
40232 list_del(&file_priv->lhead);
40233@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40234 * Begin inline drm_release
40235 */
40236
40237- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40238+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40239 task_pid_nr(current),
40240 (long)old_encode_dev(file_priv->minor->kdev->devt),
40241- dev->open_count);
40242+ local_read(&dev->open_count));
40243
40244 /* Release any auth tokens that might point to this file_priv,
40245 (do that under the drm_global_mutex) */
40246@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
40247 * End inline drm_release
40248 */
40249
40250- if (!--dev->open_count) {
40251+ if (local_dec_and_test(&dev->open_count)) {
40252 retcode = drm_lastclose(dev);
40253 if (drm_device_is_unplugged(dev))
40254 drm_put_dev(dev);
40255diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40256index 3d2e91c..d31c4c9 100644
40257--- a/drivers/gpu/drm/drm_global.c
40258+++ b/drivers/gpu/drm/drm_global.c
40259@@ -36,7 +36,7 @@
40260 struct drm_global_item {
40261 struct mutex mutex;
40262 void *object;
40263- int refcount;
40264+ atomic_t refcount;
40265 };
40266
40267 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40268@@ -49,7 +49,7 @@ void drm_global_init(void)
40269 struct drm_global_item *item = &glob[i];
40270 mutex_init(&item->mutex);
40271 item->object = NULL;
40272- item->refcount = 0;
40273+ atomic_set(&item->refcount, 0);
40274 }
40275 }
40276
40277@@ -59,7 +59,7 @@ void drm_global_release(void)
40278 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
40279 struct drm_global_item *item = &glob[i];
40280 BUG_ON(item->object != NULL);
40281- BUG_ON(item->refcount != 0);
40282+ BUG_ON(atomic_read(&item->refcount) != 0);
40283 }
40284 }
40285
40286@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40287 struct drm_global_item *item = &glob[ref->global_type];
40288
40289 mutex_lock(&item->mutex);
40290- if (item->refcount == 0) {
40291+ if (atomic_read(&item->refcount) == 0) {
40292 item->object = kzalloc(ref->size, GFP_KERNEL);
40293 if (unlikely(item->object == NULL)) {
40294 ret = -ENOMEM;
40295@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40296 goto out_err;
40297
40298 }
40299- ++item->refcount;
40300+ atomic_inc(&item->refcount);
40301 ref->object = item->object;
40302 mutex_unlock(&item->mutex);
40303 return 0;
40304@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
40305 struct drm_global_item *item = &glob[ref->global_type];
40306
40307 mutex_lock(&item->mutex);
40308- BUG_ON(item->refcount == 0);
40309+ BUG_ON(atomic_read(&item->refcount) == 0);
40310 BUG_ON(ref->object != item->object);
40311- if (--item->refcount == 0) {
40312+ if (atomic_dec_and_test(&item->refcount)) {
40313 ref->release(ref);
40314 item->object = NULL;
40315 }
40316diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
40317index 51efebd..2b70935 100644
40318--- a/drivers/gpu/drm/drm_info.c
40319+++ b/drivers/gpu/drm/drm_info.c
40320@@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
40321 struct drm_local_map *map;
40322 struct drm_map_list *r_list;
40323
40324- /* Hardcoded from _DRM_FRAME_BUFFER,
40325- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
40326- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
40327- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
40328+ static const char * const types[] = {
40329+ [_DRM_FRAME_BUFFER] = "FB",
40330+ [_DRM_REGISTERS] = "REG",
40331+ [_DRM_SHM] = "SHM",
40332+ [_DRM_AGP] = "AGP",
40333+ [_DRM_SCATTER_GATHER] = "SG",
40334+ [_DRM_CONSISTENT] = "PCI"};
40335 const char *type;
40336 int i;
40337
40338@@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
40339 map = r_list->map;
40340 if (!map)
40341 continue;
40342- if (map->type < 0 || map->type > 5)
40343+ if (map->type >= ARRAY_SIZE(types))
40344 type = "??";
40345 else
40346 type = types[map->type];
40347diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
40348index 2f4c4343..dd12cd2 100644
40349--- a/drivers/gpu/drm/drm_ioc32.c
40350+++ b/drivers/gpu/drm/drm_ioc32.c
40351@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
40352 request = compat_alloc_user_space(nbytes);
40353 if (!access_ok(VERIFY_WRITE, request, nbytes))
40354 return -EFAULT;
40355- list = (struct drm_buf_desc *) (request + 1);
40356+ list = (struct drm_buf_desc __user *) (request + 1);
40357
40358 if (__put_user(count, &request->count)
40359 || __put_user(list, &request->list))
40360@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
40361 request = compat_alloc_user_space(nbytes);
40362 if (!access_ok(VERIFY_WRITE, request, nbytes))
40363 return -EFAULT;
40364- list = (struct drm_buf_pub *) (request + 1);
40365+ list = (struct drm_buf_pub __user *) (request + 1);
40366
40367 if (__put_user(count, &request->count)
40368 || __put_user(list, &request->list))
40369@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
40370 return 0;
40371 }
40372
40373-drm_ioctl_compat_t *drm_compat_ioctls[] = {
40374+drm_ioctl_compat_t drm_compat_ioctls[] = {
40375 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
40376 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
40377 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
40378@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
40379 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40380 {
40381 unsigned int nr = DRM_IOCTL_NR(cmd);
40382- drm_ioctl_compat_t *fn;
40383 int ret;
40384
40385 /* Assume that ioctls without an explicit compat routine will just
40386@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40387 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
40388 return drm_ioctl(filp, cmd, arg);
40389
40390- fn = drm_compat_ioctls[nr];
40391-
40392- if (fn != NULL)
40393- ret = (*fn) (filp, cmd, arg);
40394+ if (drm_compat_ioctls[nr] != NULL)
40395+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
40396 else
40397 ret = drm_ioctl(filp, cmd, arg);
40398
40399diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
40400index 00587a1..57a65ca 100644
40401--- a/drivers/gpu/drm/drm_ioctl.c
40402+++ b/drivers/gpu/drm/drm_ioctl.c
40403@@ -642,7 +642,7 @@ long drm_ioctl(struct file *filp,
40404 struct drm_file *file_priv = filp->private_data;
40405 struct drm_device *dev;
40406 const struct drm_ioctl_desc *ioctl = NULL;
40407- drm_ioctl_t *func;
40408+ drm_ioctl_no_const_t func;
40409 unsigned int nr = DRM_IOCTL_NR(cmd);
40410 int retcode = -EINVAL;
40411 char stack_kdata[128];
40412diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40413index 93ec5dc..82acbaf 100644
40414--- a/drivers/gpu/drm/i810/i810_drv.h
40415+++ b/drivers/gpu/drm/i810/i810_drv.h
40416@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
40417 int page_flipping;
40418
40419 wait_queue_head_t irq_queue;
40420- atomic_t irq_received;
40421- atomic_t irq_emitted;
40422+ atomic_unchecked_t irq_received;
40423+ atomic_unchecked_t irq_emitted;
40424
40425 int front_offset;
40426 } drm_i810_private_t;
40427diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40428index 318ade9..1f5de55 100644
40429--- a/drivers/gpu/drm/i915/i915_dma.c
40430+++ b/drivers/gpu/drm/i915/i915_dma.c
40431@@ -1294,7 +1294,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40432 * locking inversion with the driver load path. And the access here is
40433 * completely racy anyway. So don't bother with locking for now.
40434 */
40435- return dev->open_count == 0;
40436+ return local_read(&dev->open_count) == 0;
40437 }
40438
40439 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
40440diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40441index 1a0611b..dd1fbfc 100644
40442--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40443+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40444@@ -866,12 +866,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
40445 static int
40446 validate_exec_list(struct drm_device *dev,
40447 struct drm_i915_gem_exec_object2 *exec,
40448- int count)
40449+ unsigned int count)
40450 {
40451 unsigned relocs_total = 0;
40452 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
40453 unsigned invalid_flags;
40454- int i;
40455+ unsigned int i;
40456
40457 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
40458 if (USES_FULL_PPGTT(dev))
40459diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
40460index 2e0613e..a8b94d9 100644
40461--- a/drivers/gpu/drm/i915/i915_ioc32.c
40462+++ b/drivers/gpu/drm/i915/i915_ioc32.c
40463@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
40464 (unsigned long)request);
40465 }
40466
40467-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40468+static drm_ioctl_compat_t i915_compat_ioctls[] = {
40469 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
40470 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
40471 [DRM_I915_GETPARAM] = compat_i915_getparam,
40472@@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40473 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40474 {
40475 unsigned int nr = DRM_IOCTL_NR(cmd);
40476- drm_ioctl_compat_t *fn = NULL;
40477 int ret;
40478
40479 if (nr < DRM_COMMAND_BASE)
40480 return drm_compat_ioctl(filp, cmd, arg);
40481
40482- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
40483- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40484-
40485- if (fn != NULL)
40486+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls)) {
40487+ drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40488 ret = (*fn) (filp, cmd, arg);
40489- else
40490+ } else
40491 ret = drm_ioctl(filp, cmd, arg);
40492
40493 return ret;
40494diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
40495index 9cb5c95..9228666 100644
40496--- a/drivers/gpu/drm/i915/intel_display.c
40497+++ b/drivers/gpu/drm/i915/intel_display.c
40498@@ -12811,13 +12811,13 @@ struct intel_quirk {
40499 int subsystem_vendor;
40500 int subsystem_device;
40501 void (*hook)(struct drm_device *dev);
40502-};
40503+} __do_const;
40504
40505 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
40506 struct intel_dmi_quirk {
40507 void (*hook)(struct drm_device *dev);
40508 const struct dmi_system_id (*dmi_id_list)[];
40509-};
40510+} __do_const;
40511
40512 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40513 {
40514@@ -12825,18 +12825,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40515 return 1;
40516 }
40517
40518-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40519+static const struct dmi_system_id intel_dmi_quirks_table[] = {
40520 {
40521- .dmi_id_list = &(const struct dmi_system_id[]) {
40522- {
40523- .callback = intel_dmi_reverse_brightness,
40524- .ident = "NCR Corporation",
40525- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40526- DMI_MATCH(DMI_PRODUCT_NAME, ""),
40527- },
40528- },
40529- { } /* terminating entry */
40530+ .callback = intel_dmi_reverse_brightness,
40531+ .ident = "NCR Corporation",
40532+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40533+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
40534 },
40535+ },
40536+ { } /* terminating entry */
40537+};
40538+
40539+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40540+ {
40541+ .dmi_id_list = &intel_dmi_quirks_table,
40542 .hook = quirk_invert_brightness,
40543 },
40544 };
40545diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
40546index b4a2014..219ab78 100644
40547--- a/drivers/gpu/drm/mga/mga_drv.h
40548+++ b/drivers/gpu/drm/mga/mga_drv.h
40549@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
40550 u32 clear_cmd;
40551 u32 maccess;
40552
40553- atomic_t vbl_received; /**< Number of vblanks received. */
40554+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
40555 wait_queue_head_t fence_queue;
40556- atomic_t last_fence_retired;
40557+ atomic_unchecked_t last_fence_retired;
40558 u32 next_fence_to_post;
40559
40560 unsigned int fb_cpp;
40561diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
40562index 729bfd5..ead8823 100644
40563--- a/drivers/gpu/drm/mga/mga_ioc32.c
40564+++ b/drivers/gpu/drm/mga/mga_ioc32.c
40565@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
40566 return 0;
40567 }
40568
40569-drm_ioctl_compat_t *mga_compat_ioctls[] = {
40570+drm_ioctl_compat_t mga_compat_ioctls[] = {
40571 [DRM_MGA_INIT] = compat_mga_init,
40572 [DRM_MGA_GETPARAM] = compat_mga_getparam,
40573 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
40574@@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
40575 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40576 {
40577 unsigned int nr = DRM_IOCTL_NR(cmd);
40578- drm_ioctl_compat_t *fn = NULL;
40579 int ret;
40580
40581 if (nr < DRM_COMMAND_BASE)
40582 return drm_compat_ioctl(filp, cmd, arg);
40583
40584- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
40585- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40586-
40587- if (fn != NULL)
40588+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls)) {
40589+ drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40590 ret = (*fn) (filp, cmd, arg);
40591- else
40592+ } else
40593 ret = drm_ioctl(filp, cmd, arg);
40594
40595 return ret;
40596diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
40597index 1b071b8..de8601a 100644
40598--- a/drivers/gpu/drm/mga/mga_irq.c
40599+++ b/drivers/gpu/drm/mga/mga_irq.c
40600@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
40601 if (crtc != 0)
40602 return 0;
40603
40604- return atomic_read(&dev_priv->vbl_received);
40605+ return atomic_read_unchecked(&dev_priv->vbl_received);
40606 }
40607
40608
40609@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40610 /* VBLANK interrupt */
40611 if (status & MGA_VLINEPEN) {
40612 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
40613- atomic_inc(&dev_priv->vbl_received);
40614+ atomic_inc_unchecked(&dev_priv->vbl_received);
40615 drm_handle_vblank(dev, 0);
40616 handled = 1;
40617 }
40618@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40619 if ((prim_start & ~0x03) != (prim_end & ~0x03))
40620 MGA_WRITE(MGA_PRIMEND, prim_end);
40621
40622- atomic_inc(&dev_priv->last_fence_retired);
40623+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
40624 wake_up(&dev_priv->fence_queue);
40625 handled = 1;
40626 }
40627@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
40628 * using fences.
40629 */
40630 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
40631- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
40632+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
40633 - *sequence) <= (1 << 23)));
40634
40635 *sequence = cur_fence;
40636diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
40637index dae2c96..324dbe4 100644
40638--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
40639+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
40640@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
40641 struct bit_table {
40642 const char id;
40643 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
40644-};
40645+} __no_const;
40646
40647 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
40648
40649diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
40650index 8ae36f2..1147a30 100644
40651--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
40652+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
40653@@ -121,7 +121,6 @@ struct nouveau_drm {
40654 struct drm_global_reference mem_global_ref;
40655 struct ttm_bo_global_ref bo_global_ref;
40656 struct ttm_bo_device bdev;
40657- atomic_t validate_sequence;
40658 int (*move)(struct nouveau_channel *,
40659 struct ttm_buffer_object *,
40660 struct ttm_mem_reg *, struct ttm_mem_reg *);
40661diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40662index 462679a..88e32a7 100644
40663--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40664+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40665@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
40666 unsigned long arg)
40667 {
40668 unsigned int nr = DRM_IOCTL_NR(cmd);
40669- drm_ioctl_compat_t *fn = NULL;
40670+ drm_ioctl_compat_t fn = NULL;
40671 int ret;
40672
40673 if (nr < DRM_COMMAND_BASE)
40674diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40675index 753a6de..dd66b98 100644
40676--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
40677+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40678@@ -126,11 +126,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40679 }
40680
40681 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
40682- nouveau_vram_manager_init,
40683- nouveau_vram_manager_fini,
40684- nouveau_vram_manager_new,
40685- nouveau_vram_manager_del,
40686- nouveau_vram_manager_debug
40687+ .init = nouveau_vram_manager_init,
40688+ .takedown = nouveau_vram_manager_fini,
40689+ .get_node = nouveau_vram_manager_new,
40690+ .put_node = nouveau_vram_manager_del,
40691+ .debug = nouveau_vram_manager_debug
40692 };
40693
40694 static int
40695@@ -194,11 +194,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40696 }
40697
40698 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
40699- nouveau_gart_manager_init,
40700- nouveau_gart_manager_fini,
40701- nouveau_gart_manager_new,
40702- nouveau_gart_manager_del,
40703- nouveau_gart_manager_debug
40704+ .init = nouveau_gart_manager_init,
40705+ .takedown = nouveau_gart_manager_fini,
40706+ .get_node = nouveau_gart_manager_new,
40707+ .put_node = nouveau_gart_manager_del,
40708+ .debug = nouveau_gart_manager_debug
40709 };
40710
40711 /*XXX*/
40712@@ -267,11 +267,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40713 }
40714
40715 const struct ttm_mem_type_manager_func nv04_gart_manager = {
40716- nv04_gart_manager_init,
40717- nv04_gart_manager_fini,
40718- nv04_gart_manager_new,
40719- nv04_gart_manager_del,
40720- nv04_gart_manager_debug
40721+ .init = nv04_gart_manager_init,
40722+ .takedown = nv04_gart_manager_fini,
40723+ .get_node = nv04_gart_manager_new,
40724+ .put_node = nv04_gart_manager_del,
40725+ .debug = nv04_gart_manager_debug
40726 };
40727
40728 int
40729diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
40730index c7592ec..dd45ebc 100644
40731--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
40732+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
40733@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
40734 * locking inversion with the driver load path. And the access here is
40735 * completely racy anyway. So don't bother with locking for now.
40736 */
40737- return dev->open_count == 0;
40738+ return local_read(&dev->open_count) == 0;
40739 }
40740
40741 static const struct vga_switcheroo_client_ops
40742diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
40743index 9782364..89bd954 100644
40744--- a/drivers/gpu/drm/qxl/qxl_cmd.c
40745+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
40746@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
40747 int ret;
40748
40749 mutex_lock(&qdev->async_io_mutex);
40750- irq_num = atomic_read(&qdev->irq_received_io_cmd);
40751+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40752 if (qdev->last_sent_io_cmd > irq_num) {
40753 if (intr)
40754 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40755- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40756+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40757 else
40758 ret = wait_event_timeout(qdev->io_cmd_event,
40759- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40760+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40761 /* 0 is timeout, just bail the "hw" has gone away */
40762 if (ret <= 0)
40763 goto out;
40764- irq_num = atomic_read(&qdev->irq_received_io_cmd);
40765+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40766 }
40767 outb(val, addr);
40768 qdev->last_sent_io_cmd = irq_num + 1;
40769 if (intr)
40770 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40771- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40772+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40773 else
40774 ret = wait_event_timeout(qdev->io_cmd_event,
40775- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40776+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40777 out:
40778 if (ret > 0)
40779 ret = 0;
40780diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
40781index 6911b8c..89d6867 100644
40782--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
40783+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
40784@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
40785 struct drm_info_node *node = (struct drm_info_node *) m->private;
40786 struct qxl_device *qdev = node->minor->dev->dev_private;
40787
40788- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
40789- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
40790- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
40791- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
40792+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
40793+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
40794+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
40795+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
40796 seq_printf(m, "%d\n", qdev->irq_received_error);
40797 return 0;
40798 }
40799diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
40800index 7c6cafe..460f542 100644
40801--- a/drivers/gpu/drm/qxl/qxl_drv.h
40802+++ b/drivers/gpu/drm/qxl/qxl_drv.h
40803@@ -290,10 +290,10 @@ struct qxl_device {
40804 unsigned int last_sent_io_cmd;
40805
40806 /* interrupt handling */
40807- atomic_t irq_received;
40808- atomic_t irq_received_display;
40809- atomic_t irq_received_cursor;
40810- atomic_t irq_received_io_cmd;
40811+ atomic_unchecked_t irq_received;
40812+ atomic_unchecked_t irq_received_display;
40813+ atomic_unchecked_t irq_received_cursor;
40814+ atomic_unchecked_t irq_received_io_cmd;
40815 unsigned irq_received_error;
40816 wait_queue_head_t display_event;
40817 wait_queue_head_t cursor_event;
40818diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
40819index b110883..dd06418 100644
40820--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
40821+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
40822@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40823
40824 /* TODO copy slow path code from i915 */
40825 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
40826- 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);
40827+ 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);
40828
40829 {
40830 struct qxl_drawable *draw = fb_cmd;
40831@@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40832 struct drm_qxl_reloc reloc;
40833
40834 if (copy_from_user(&reloc,
40835- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
40836+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
40837 sizeof(reloc))) {
40838 ret = -EFAULT;
40839 goto out_free_bos;
40840@@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
40841
40842 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
40843
40844- struct drm_qxl_command *commands =
40845- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
40846+ struct drm_qxl_command __user *commands =
40847+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
40848
40849- if (copy_from_user(&user_cmd, &commands[cmd_num],
40850+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
40851 sizeof(user_cmd)))
40852 return -EFAULT;
40853
40854diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
40855index 0bf1e20..42a7310 100644
40856--- a/drivers/gpu/drm/qxl/qxl_irq.c
40857+++ b/drivers/gpu/drm/qxl/qxl_irq.c
40858@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
40859 if (!pending)
40860 return IRQ_NONE;
40861
40862- atomic_inc(&qdev->irq_received);
40863+ atomic_inc_unchecked(&qdev->irq_received);
40864
40865 if (pending & QXL_INTERRUPT_DISPLAY) {
40866- atomic_inc(&qdev->irq_received_display);
40867+ atomic_inc_unchecked(&qdev->irq_received_display);
40868 wake_up_all(&qdev->display_event);
40869 qxl_queue_garbage_collect(qdev, false);
40870 }
40871 if (pending & QXL_INTERRUPT_CURSOR) {
40872- atomic_inc(&qdev->irq_received_cursor);
40873+ atomic_inc_unchecked(&qdev->irq_received_cursor);
40874 wake_up_all(&qdev->cursor_event);
40875 }
40876 if (pending & QXL_INTERRUPT_IO_CMD) {
40877- atomic_inc(&qdev->irq_received_io_cmd);
40878+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
40879 wake_up_all(&qdev->io_cmd_event);
40880 }
40881 if (pending & QXL_INTERRUPT_ERROR) {
40882@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
40883 init_waitqueue_head(&qdev->io_cmd_event);
40884 INIT_WORK(&qdev->client_monitors_config_work,
40885 qxl_client_monitors_config_work_func);
40886- atomic_set(&qdev->irq_received, 0);
40887- atomic_set(&qdev->irq_received_display, 0);
40888- atomic_set(&qdev->irq_received_cursor, 0);
40889- atomic_set(&qdev->irq_received_io_cmd, 0);
40890+ atomic_set_unchecked(&qdev->irq_received, 0);
40891+ atomic_set_unchecked(&qdev->irq_received_display, 0);
40892+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
40893+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
40894 qdev->irq_received_error = 0;
40895 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
40896 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
40897diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
40898index 0cbc4c9..0e46686 100644
40899--- a/drivers/gpu/drm/qxl/qxl_ttm.c
40900+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
40901@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
40902 }
40903 }
40904
40905-static struct vm_operations_struct qxl_ttm_vm_ops;
40906+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
40907 static const struct vm_operations_struct *ttm_vm_ops;
40908
40909 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
40910@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
40911 return r;
40912 if (unlikely(ttm_vm_ops == NULL)) {
40913 ttm_vm_ops = vma->vm_ops;
40914+ pax_open_kernel();
40915 qxl_ttm_vm_ops = *ttm_vm_ops;
40916 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
40917+ pax_close_kernel();
40918 }
40919 vma->vm_ops = &qxl_ttm_vm_ops;
40920 return 0;
40921@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
40922 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
40923 {
40924 #if defined(CONFIG_DEBUG_FS)
40925- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
40926- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
40927- unsigned i;
40928+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
40929+ {
40930+ .name = "qxl_mem_mm",
40931+ .show = &qxl_mm_dump_table,
40932+ },
40933+ {
40934+ .name = "qxl_surf_mm",
40935+ .show = &qxl_mm_dump_table,
40936+ }
40937+ };
40938
40939- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
40940- if (i == 0)
40941- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
40942- else
40943- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
40944- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
40945- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
40946- qxl_mem_types_list[i].driver_features = 0;
40947- if (i == 0)
40948- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40949- else
40950- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40951+ pax_open_kernel();
40952+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40953+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40954+ pax_close_kernel();
40955
40956- }
40957- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
40958+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
40959 #else
40960 return 0;
40961 #endif
40962diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
40963index 2c45ac9..5d740f8 100644
40964--- a/drivers/gpu/drm/r128/r128_cce.c
40965+++ b/drivers/gpu/drm/r128/r128_cce.c
40966@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
40967
40968 /* GH: Simple idle check.
40969 */
40970- atomic_set(&dev_priv->idle_count, 0);
40971+ atomic_set_unchecked(&dev_priv->idle_count, 0);
40972
40973 /* We don't support anything other than bus-mastering ring mode,
40974 * but the ring can be in either AGP or PCI space for the ring
40975diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
40976index 723e5d6..102dbaf 100644
40977--- a/drivers/gpu/drm/r128/r128_drv.h
40978+++ b/drivers/gpu/drm/r128/r128_drv.h
40979@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
40980 int is_pci;
40981 unsigned long cce_buffers_offset;
40982
40983- atomic_t idle_count;
40984+ atomic_unchecked_t idle_count;
40985
40986 int page_flipping;
40987 int current_page;
40988 u32 crtc_offset;
40989 u32 crtc_offset_cntl;
40990
40991- atomic_t vbl_received;
40992+ atomic_unchecked_t vbl_received;
40993
40994 u32 color_fmt;
40995 unsigned int front_offset;
40996diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
40997index 663f38c..c689495 100644
40998--- a/drivers/gpu/drm/r128/r128_ioc32.c
40999+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41000@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41001 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41002 }
41003
41004-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41005+drm_ioctl_compat_t r128_compat_ioctls[] = {
41006 [DRM_R128_INIT] = compat_r128_init,
41007 [DRM_R128_DEPTH] = compat_r128_depth,
41008 [DRM_R128_STIPPLE] = compat_r128_stipple,
41009@@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41010 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41011 {
41012 unsigned int nr = DRM_IOCTL_NR(cmd);
41013- drm_ioctl_compat_t *fn = NULL;
41014 int ret;
41015
41016 if (nr < DRM_COMMAND_BASE)
41017 return drm_compat_ioctl(filp, cmd, arg);
41018
41019- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41020- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41021-
41022- if (fn != NULL)
41023+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls)) {
41024+ drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41025 ret = (*fn) (filp, cmd, arg);
41026- else
41027+ } else
41028 ret = drm_ioctl(filp, cmd, arg);
41029
41030 return ret;
41031diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41032index c2ae496..30b5993 100644
41033--- a/drivers/gpu/drm/r128/r128_irq.c
41034+++ b/drivers/gpu/drm/r128/r128_irq.c
41035@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41036 if (crtc != 0)
41037 return 0;
41038
41039- return atomic_read(&dev_priv->vbl_received);
41040+ return atomic_read_unchecked(&dev_priv->vbl_received);
41041 }
41042
41043 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41044@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41045 /* VBLANK interrupt */
41046 if (status & R128_CRTC_VBLANK_INT) {
41047 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41048- atomic_inc(&dev_priv->vbl_received);
41049+ atomic_inc_unchecked(&dev_priv->vbl_received);
41050 drm_handle_vblank(dev, 0);
41051 return IRQ_HANDLED;
41052 }
41053diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41054index 575e986..66e62ca 100644
41055--- a/drivers/gpu/drm/r128/r128_state.c
41056+++ b/drivers/gpu/drm/r128/r128_state.c
41057@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41058
41059 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41060 {
41061- if (atomic_read(&dev_priv->idle_count) == 0)
41062+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41063 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41064 else
41065- atomic_set(&dev_priv->idle_count, 0);
41066+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41067 }
41068
41069 #endif
41070diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41071index 4a85bb6..aaea819 100644
41072--- a/drivers/gpu/drm/radeon/mkregtable.c
41073+++ b/drivers/gpu/drm/radeon/mkregtable.c
41074@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41075 regex_t mask_rex;
41076 regmatch_t match[4];
41077 char buf[1024];
41078- size_t end;
41079+ long end;
41080 int len;
41081 int done = 0;
41082 int r;
41083 unsigned o;
41084 struct offset *offset;
41085 char last_reg_s[10];
41086- int last_reg;
41087+ unsigned long last_reg;
41088
41089 if (regcomp
41090 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41091diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41092index 995a8b1..b7cb898 100644
41093--- a/drivers/gpu/drm/radeon/radeon_device.c
41094+++ b/drivers/gpu/drm/radeon/radeon_device.c
41095@@ -1214,7 +1214,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41096 * locking inversion with the driver load path. And the access here is
41097 * completely racy anyway. So don't bother with locking for now.
41098 */
41099- return dev->open_count == 0;
41100+ return local_read(&dev->open_count) == 0;
41101 }
41102
41103 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41104diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41105index 46bd393..6ae4719 100644
41106--- a/drivers/gpu/drm/radeon/radeon_drv.h
41107+++ b/drivers/gpu/drm/radeon/radeon_drv.h
41108@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41109
41110 /* SW interrupt */
41111 wait_queue_head_t swi_queue;
41112- atomic_t swi_emitted;
41113+ atomic_unchecked_t swi_emitted;
41114 int vblank_crtc;
41115 uint32_t irq_enable_reg;
41116 uint32_t r500_disp_irq_reg;
41117diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
41118index 0b98ea1..0881827 100644
41119--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
41120+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
41121@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41122 request = compat_alloc_user_space(sizeof(*request));
41123 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
41124 || __put_user(req32.param, &request->param)
41125- || __put_user((void __user *)(unsigned long)req32.value,
41126+ || __put_user((unsigned long)req32.value,
41127 &request->value))
41128 return -EFAULT;
41129
41130@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41131 #define compat_radeon_cp_setparam NULL
41132 #endif /* X86_64 || IA64 */
41133
41134-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41135+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
41136 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
41137 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
41138 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
41139@@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41140 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41141 {
41142 unsigned int nr = DRM_IOCTL_NR(cmd);
41143- drm_ioctl_compat_t *fn = NULL;
41144 int ret;
41145
41146 if (nr < DRM_COMMAND_BASE)
41147 return drm_compat_ioctl(filp, cmd, arg);
41148
41149- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
41150- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41151-
41152- if (fn != NULL)
41153+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls)) {
41154+ drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41155 ret = (*fn) (filp, cmd, arg);
41156- else
41157+ } else
41158 ret = drm_ioctl(filp, cmd, arg);
41159
41160 return ret;
41161diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
41162index 244b19b..c19226d 100644
41163--- a/drivers/gpu/drm/radeon/radeon_irq.c
41164+++ b/drivers/gpu/drm/radeon/radeon_irq.c
41165@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
41166 unsigned int ret;
41167 RING_LOCALS;
41168
41169- atomic_inc(&dev_priv->swi_emitted);
41170- ret = atomic_read(&dev_priv->swi_emitted);
41171+ atomic_inc_unchecked(&dev_priv->swi_emitted);
41172+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
41173
41174 BEGIN_RING(4);
41175 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
41176@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
41177 drm_radeon_private_t *dev_priv =
41178 (drm_radeon_private_t *) dev->dev_private;
41179
41180- atomic_set(&dev_priv->swi_emitted, 0);
41181+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
41182 init_waitqueue_head(&dev_priv->swi_queue);
41183
41184 dev->max_vblank_count = 0x001fffff;
41185diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
41186index 535403e..5dd655b 100644
41187--- a/drivers/gpu/drm/radeon/radeon_state.c
41188+++ b/drivers/gpu/drm/radeon/radeon_state.c
41189@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
41190 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
41191 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
41192
41193- if (copy_from_user(&depth_boxes, clear->depth_boxes,
41194+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
41195 sarea_priv->nbox * sizeof(depth_boxes[0])))
41196 return -EFAULT;
41197
41198@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
41199 {
41200 drm_radeon_private_t *dev_priv = dev->dev_private;
41201 drm_radeon_getparam_t *param = data;
41202- int value;
41203+ int value = 0;
41204
41205 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
41206
41207diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
41208index 8624979..65e5243 100644
41209--- a/drivers/gpu/drm/radeon/radeon_ttm.c
41210+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
41211@@ -936,7 +936,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
41212 man->size = size >> PAGE_SHIFT;
41213 }
41214
41215-static struct vm_operations_struct radeon_ttm_vm_ops;
41216+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
41217 static const struct vm_operations_struct *ttm_vm_ops = NULL;
41218
41219 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41220@@ -977,8 +977,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
41221 }
41222 if (unlikely(ttm_vm_ops == NULL)) {
41223 ttm_vm_ops = vma->vm_ops;
41224+ pax_open_kernel();
41225 radeon_ttm_vm_ops = *ttm_vm_ops;
41226 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
41227+ pax_close_kernel();
41228 }
41229 vma->vm_ops = &radeon_ttm_vm_ops;
41230 return 0;
41231diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
41232index 054a79f..30d9ac4 100644
41233--- a/drivers/gpu/drm/tegra/dc.c
41234+++ b/drivers/gpu/drm/tegra/dc.c
41235@@ -1242,7 +1242,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
41236 }
41237
41238 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41239- dc->debugfs_files[i].data = dc;
41240+ *(void **)&dc->debugfs_files[i].data = dc;
41241
41242 err = drm_debugfs_create_files(dc->debugfs_files,
41243 ARRAY_SIZE(debugfs_files),
41244diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
41245index f787445..2df2c65 100644
41246--- a/drivers/gpu/drm/tegra/dsi.c
41247+++ b/drivers/gpu/drm/tegra/dsi.c
41248@@ -41,7 +41,7 @@ struct tegra_dsi {
41249 struct clk *clk_lp;
41250 struct clk *clk;
41251
41252- struct drm_info_list *debugfs_files;
41253+ drm_info_list_no_const *debugfs_files;
41254 struct drm_minor *minor;
41255 struct dentry *debugfs;
41256
41257diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41258index ffe2654..03c7b1c 100644
41259--- a/drivers/gpu/drm/tegra/hdmi.c
41260+++ b/drivers/gpu/drm/tegra/hdmi.c
41261@@ -60,7 +60,7 @@ struct tegra_hdmi {
41262 bool stereo;
41263 bool dvi;
41264
41265- struct drm_info_list *debugfs_files;
41266+ drm_info_list_no_const *debugfs_files;
41267 struct drm_minor *minor;
41268 struct dentry *debugfs;
41269 };
41270diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41271index 964387f..4eafc00 100644
41272--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41273+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41274@@ -146,10 +146,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41275 }
41276
41277 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41278- ttm_bo_man_init,
41279- ttm_bo_man_takedown,
41280- ttm_bo_man_get_node,
41281- ttm_bo_man_put_node,
41282- ttm_bo_man_debug
41283+ .init = ttm_bo_man_init,
41284+ .takedown = ttm_bo_man_takedown,
41285+ .get_node = ttm_bo_man_get_node,
41286+ .put_node = ttm_bo_man_put_node,
41287+ .debug = ttm_bo_man_debug
41288 };
41289 EXPORT_SYMBOL(ttm_bo_manager_func);
41290diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41291index a1803fb..c53f6b0 100644
41292--- a/drivers/gpu/drm/ttm/ttm_memory.c
41293+++ b/drivers/gpu/drm/ttm/ttm_memory.c
41294@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41295 zone->glob = glob;
41296 glob->zone_kernel = zone;
41297 ret = kobject_init_and_add(
41298- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41299+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41300 if (unlikely(ret != 0)) {
41301 kobject_put(&zone->kobj);
41302 return ret;
41303@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41304 zone->glob = glob;
41305 glob->zone_dma32 = zone;
41306 ret = kobject_init_and_add(
41307- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41308+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41309 if (unlikely(ret != 0)) {
41310 kobject_put(&zone->kobj);
41311 return ret;
41312diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41313index 09874d6..d6da1de 100644
41314--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41315+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41316@@ -54,7 +54,7 @@
41317
41318 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41319 #define SMALL_ALLOCATION 16
41320-#define FREE_ALL_PAGES (~0U)
41321+#define FREE_ALL_PAGES (~0UL)
41322 /* times are in msecs */
41323 #define PAGE_FREE_INTERVAL 1000
41324
41325@@ -299,14 +299,13 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
41326 * @free_all: If set to true will free all pages in pool
41327 * @gfp: GFP flags.
41328 **/
41329-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
41330+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
41331 gfp_t gfp)
41332 {
41333 unsigned long irq_flags;
41334 struct page *p;
41335 struct page **pages_to_free;
41336- unsigned freed_pages = 0,
41337- npages_to_free = nr_free;
41338+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41339
41340 if (NUM_PAGES_TO_ALLOC < nr_free)
41341 npages_to_free = NUM_PAGES_TO_ALLOC;
41342@@ -366,7 +365,8 @@ restart:
41343 __list_del(&p->lru, &pool->list);
41344
41345 ttm_pool_update_free_locked(pool, freed_pages);
41346- nr_free -= freed_pages;
41347+ if (likely(nr_free != FREE_ALL_PAGES))
41348+ nr_free -= freed_pages;
41349 }
41350
41351 spin_unlock_irqrestore(&pool->lock, irq_flags);
41352@@ -395,7 +395,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41353 unsigned i;
41354 unsigned pool_offset;
41355 struct ttm_page_pool *pool;
41356- int shrink_pages = sc->nr_to_scan;
41357+ unsigned long shrink_pages = sc->nr_to_scan;
41358 unsigned long freed = 0;
41359
41360 if (!mutex_trylock(&lock))
41361@@ -403,7 +403,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41362 pool_offset = ++start_pool % NUM_POOLS;
41363 /* select start pool in round robin fashion */
41364 for (i = 0; i < NUM_POOLS; ++i) {
41365- unsigned nr_free = shrink_pages;
41366+ unsigned long nr_free = shrink_pages;
41367 if (shrink_pages == 0)
41368 break;
41369 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
41370@@ -669,7 +669,7 @@ out:
41371 }
41372
41373 /* Put all pages in pages list to correct pool to wait for reuse */
41374-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
41375+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
41376 enum ttm_caching_state cstate)
41377 {
41378 unsigned long irq_flags;
41379@@ -724,7 +724,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
41380 struct list_head plist;
41381 struct page *p = NULL;
41382 gfp_t gfp_flags = GFP_USER;
41383- unsigned count;
41384+ unsigned long count;
41385 int r;
41386
41387 /* set zero flag for page allocation if required */
41388diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41389index c96db43..c367557 100644
41390--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41391+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41392@@ -56,7 +56,7 @@
41393
41394 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41395 #define SMALL_ALLOCATION 4
41396-#define FREE_ALL_PAGES (~0U)
41397+#define FREE_ALL_PAGES (~0UL)
41398 /* times are in msecs */
41399 #define IS_UNDEFINED (0)
41400 #define IS_WC (1<<1)
41401@@ -413,15 +413,14 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
41402 * @nr_free: If set to true will free all pages in pool
41403 * @gfp: GFP flags.
41404 **/
41405-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41406+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
41407 gfp_t gfp)
41408 {
41409 unsigned long irq_flags;
41410 struct dma_page *dma_p, *tmp;
41411 struct page **pages_to_free;
41412 struct list_head d_pages;
41413- unsigned freed_pages = 0,
41414- npages_to_free = nr_free;
41415+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41416
41417 if (NUM_PAGES_TO_ALLOC < nr_free)
41418 npages_to_free = NUM_PAGES_TO_ALLOC;
41419@@ -494,7 +493,8 @@ restart:
41420 /* remove range of pages from the pool */
41421 if (freed_pages) {
41422 ttm_pool_update_free_locked(pool, freed_pages);
41423- nr_free -= freed_pages;
41424+ if (likely(nr_free != FREE_ALL_PAGES))
41425+ nr_free -= freed_pages;
41426 }
41427
41428 spin_unlock_irqrestore(&pool->lock, irq_flags);
41429@@ -929,7 +929,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
41430 struct dma_page *d_page, *next;
41431 enum pool_type type;
41432 bool is_cached = false;
41433- unsigned count = 0, i, npages = 0;
41434+ unsigned long count = 0, i, npages = 0;
41435 unsigned long irq_flags;
41436
41437 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
41438@@ -1007,7 +1007,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41439 static unsigned start_pool;
41440 unsigned idx = 0;
41441 unsigned pool_offset;
41442- unsigned shrink_pages = sc->nr_to_scan;
41443+ unsigned long shrink_pages = sc->nr_to_scan;
41444 struct device_pools *p;
41445 unsigned long freed = 0;
41446
41447@@ -1020,7 +1020,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41448 goto out;
41449 pool_offset = ++start_pool % _manager->npools;
41450 list_for_each_entry(p, &_manager->pools, pools) {
41451- unsigned nr_free;
41452+ unsigned long nr_free;
41453
41454 if (!p->dev)
41455 continue;
41456@@ -1034,7 +1034,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41457 sc->gfp_mask);
41458 freed += nr_free - shrink_pages;
41459
41460- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
41461+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
41462 p->pool->dev_name, p->pool->name, current->pid,
41463 nr_free, shrink_pages);
41464 }
41465diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
41466index 8cbcb45..a4d9cf7 100644
41467--- a/drivers/gpu/drm/udl/udl_fb.c
41468+++ b/drivers/gpu/drm/udl/udl_fb.c
41469@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
41470 fb_deferred_io_cleanup(info);
41471 kfree(info->fbdefio);
41472 info->fbdefio = NULL;
41473- info->fbops->fb_mmap = udl_fb_mmap;
41474 }
41475
41476 pr_warn("released /dev/fb%d user=%d count=%d\n",
41477diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
41478index ef8c500..01030c8 100644
41479--- a/drivers/gpu/drm/via/via_drv.h
41480+++ b/drivers/gpu/drm/via/via_drv.h
41481@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
41482 typedef uint32_t maskarray_t[5];
41483
41484 typedef struct drm_via_irq {
41485- atomic_t irq_received;
41486+ atomic_unchecked_t irq_received;
41487 uint32_t pending_mask;
41488 uint32_t enable_mask;
41489 wait_queue_head_t irq_queue;
41490@@ -77,7 +77,7 @@ typedef struct drm_via_private {
41491 struct timeval last_vblank;
41492 int last_vblank_valid;
41493 unsigned usec_per_vblank;
41494- atomic_t vbl_received;
41495+ atomic_unchecked_t vbl_received;
41496 drm_via_state_t hc_state;
41497 char pci_buf[VIA_PCI_BUF_SIZE];
41498 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
41499diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
41500index 1319433..a993b0c 100644
41501--- a/drivers/gpu/drm/via/via_irq.c
41502+++ b/drivers/gpu/drm/via/via_irq.c
41503@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
41504 if (crtc != 0)
41505 return 0;
41506
41507- return atomic_read(&dev_priv->vbl_received);
41508+ return atomic_read_unchecked(&dev_priv->vbl_received);
41509 }
41510
41511 irqreturn_t via_driver_irq_handler(int irq, void *arg)
41512@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41513
41514 status = VIA_READ(VIA_REG_INTERRUPT);
41515 if (status & VIA_IRQ_VBLANK_PENDING) {
41516- atomic_inc(&dev_priv->vbl_received);
41517- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
41518+ atomic_inc_unchecked(&dev_priv->vbl_received);
41519+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
41520 do_gettimeofday(&cur_vblank);
41521 if (dev_priv->last_vblank_valid) {
41522 dev_priv->usec_per_vblank =
41523@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41524 dev_priv->last_vblank = cur_vblank;
41525 dev_priv->last_vblank_valid = 1;
41526 }
41527- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
41528+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
41529 DRM_DEBUG("US per vblank is: %u\n",
41530 dev_priv->usec_per_vblank);
41531 }
41532@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41533
41534 for (i = 0; i < dev_priv->num_irqs; ++i) {
41535 if (status & cur_irq->pending_mask) {
41536- atomic_inc(&cur_irq->irq_received);
41537+ atomic_inc_unchecked(&cur_irq->irq_received);
41538 wake_up(&cur_irq->irq_queue);
41539 handled = 1;
41540 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
41541@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
41542 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41543 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
41544 masks[irq][4]));
41545- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
41546+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
41547 } else {
41548 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41549 (((cur_irq_sequence =
41550- atomic_read(&cur_irq->irq_received)) -
41551+ atomic_read_unchecked(&cur_irq->irq_received)) -
41552 *sequence) <= (1 << 23)));
41553 }
41554 *sequence = cur_irq_sequence;
41555@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
41556 }
41557
41558 for (i = 0; i < dev_priv->num_irqs; ++i) {
41559- atomic_set(&cur_irq->irq_received, 0);
41560+ atomic_set_unchecked(&cur_irq->irq_received, 0);
41561 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
41562 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
41563 init_waitqueue_head(&cur_irq->irq_queue);
41564@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
41565 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
41566 case VIA_IRQ_RELATIVE:
41567 irqwait->request.sequence +=
41568- atomic_read(&cur_irq->irq_received);
41569+ atomic_read_unchecked(&cur_irq->irq_received);
41570 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
41571 case VIA_IRQ_ABSOLUTE:
41572 break;
41573diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41574index 4ee799b..69fc0d1 100644
41575--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41576+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41577@@ -446,7 +446,7 @@ struct vmw_private {
41578 * Fencing and IRQs.
41579 */
41580
41581- atomic_t marker_seq;
41582+ atomic_unchecked_t marker_seq;
41583 wait_queue_head_t fence_queue;
41584 wait_queue_head_t fifo_queue;
41585 int fence_queue_waiters; /* Protected by hw_mutex */
41586diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41587index 09e10ae..cb76c60 100644
41588--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41589+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41590@@ -154,7 +154,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
41591 (unsigned int) min,
41592 (unsigned int) fifo->capabilities);
41593
41594- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41595+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41596 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
41597 vmw_marker_queue_init(&fifo->marker_queue);
41598 return vmw_fifo_send_fence(dev_priv, &dummy);
41599@@ -378,7 +378,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
41600 if (reserveable)
41601 iowrite32(bytes, fifo_mem +
41602 SVGA_FIFO_RESERVED);
41603- return fifo_mem + (next_cmd >> 2);
41604+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
41605 } else {
41606 need_bounce = true;
41607 }
41608@@ -498,7 +498,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41609
41610 fm = vmw_fifo_reserve(dev_priv, bytes);
41611 if (unlikely(fm == NULL)) {
41612- *seqno = atomic_read(&dev_priv->marker_seq);
41613+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41614 ret = -ENOMEM;
41615 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
41616 false, 3*HZ);
41617@@ -506,7 +506,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41618 }
41619
41620 do {
41621- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
41622+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
41623 } while (*seqno == 0);
41624
41625 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
41626diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41627index 170b61b..fec7348 100644
41628--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41629+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41630@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
41631 }
41632
41633 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
41634- vmw_gmrid_man_init,
41635- vmw_gmrid_man_takedown,
41636- vmw_gmrid_man_get_node,
41637- vmw_gmrid_man_put_node,
41638- vmw_gmrid_man_debug
41639+ .init = vmw_gmrid_man_init,
41640+ .takedown = vmw_gmrid_man_takedown,
41641+ .get_node = vmw_gmrid_man_get_node,
41642+ .put_node = vmw_gmrid_man_put_node,
41643+ .debug = vmw_gmrid_man_debug
41644 };
41645diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41646index 37881ec..319065d 100644
41647--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41648+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41649@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
41650 int ret;
41651
41652 num_clips = arg->num_clips;
41653- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41654+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41655
41656 if (unlikely(num_clips == 0))
41657 return 0;
41658@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
41659 int ret;
41660
41661 num_clips = arg->num_clips;
41662- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41663+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41664
41665 if (unlikely(num_clips == 0))
41666 return 0;
41667diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41668index 0c42376..6febe77 100644
41669--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41670+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41671@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
41672 * emitted. Then the fence is stale and signaled.
41673 */
41674
41675- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
41676+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
41677 > VMW_FENCE_WRAP);
41678
41679 return ret;
41680@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
41681
41682 if (fifo_idle)
41683 down_read(&fifo_state->rwsem);
41684- signal_seq = atomic_read(&dev_priv->marker_seq);
41685+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
41686 ret = 0;
41687
41688 for (;;) {
41689diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41690index efd1ffd..0ae13ca 100644
41691--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41692+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41693@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
41694 while (!vmw_lag_lt(queue, us)) {
41695 spin_lock(&queue->lock);
41696 if (list_empty(&queue->head))
41697- seqno = atomic_read(&dev_priv->marker_seq);
41698+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41699 else {
41700 marker = list_first_entry(&queue->head,
41701 struct vmw_marker, head);
41702diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
41703index 37ac7b5..d52a5c9 100644
41704--- a/drivers/gpu/vga/vga_switcheroo.c
41705+++ b/drivers/gpu/vga/vga_switcheroo.c
41706@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
41707
41708 /* this version is for the case where the power switch is separate
41709 to the device being powered down. */
41710-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
41711+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
41712 {
41713 /* copy over all the bus versions */
41714 if (dev->bus && dev->bus->pm) {
41715@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
41716 return ret;
41717 }
41718
41719-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
41720+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
41721 {
41722 /* copy over all the bus versions */
41723 if (dev->bus && dev->bus->pm) {
41724diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
41725index 3402033..50b562c 100644
41726--- a/drivers/hid/hid-core.c
41727+++ b/drivers/hid/hid-core.c
41728@@ -2506,7 +2506,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
41729
41730 int hid_add_device(struct hid_device *hdev)
41731 {
41732- static atomic_t id = ATOMIC_INIT(0);
41733+ static atomic_unchecked_t id = ATOMIC_INIT(0);
41734 int ret;
41735
41736 if (WARN_ON(hdev->status & HID_STAT_ADDED))
41737@@ -2548,7 +2548,7 @@ int hid_add_device(struct hid_device *hdev)
41738 /* XXX hack, any other cleaner solution after the driver core
41739 * is converted to allow more than 20 bytes as the device name? */
41740 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
41741- hdev->vendor, hdev->product, atomic_inc_return(&id));
41742+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
41743
41744 hid_debug_register(hdev, dev_name(&hdev->dev));
41745 ret = device_add(&hdev->dev);
41746diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
41747index 71f5692..147d3da 100644
41748--- a/drivers/hid/hid-logitech-dj.c
41749+++ b/drivers/hid/hid-logitech-dj.c
41750@@ -658,6 +658,12 @@ static int logi_dj_raw_event(struct hid_device *hdev,
41751 * device (via hid_input_report() ) and return 1 so hid-core does not do
41752 * anything else with it.
41753 */
41754+ if ((dj_report->device_index < DJ_DEVICE_INDEX_MIN) ||
41755+ (dj_report->device_index > DJ_DEVICE_INDEX_MAX)) {
41756+ dev_err(&hdev->dev, "%s: invalid device index:%d\n",
41757+ __func__, dj_report->device_index);
41758+ return false;
41759+ }
41760
41761 /* case 1) */
41762 if (data[0] != REPORT_ID_DJ_SHORT)
41763diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
41764index bc4269e..b6e6102 100644
41765--- a/drivers/hid/hid-sony.c
41766+++ b/drivers/hid/hid-sony.c
41767@@ -798,6 +798,12 @@ union sixaxis_output_report_01 {
41768 __u8 buf[36];
41769 };
41770
41771+#define DS4_REPORT_0x02_SIZE 37
41772+#define DS4_REPORT_0x05_SIZE 32
41773+#define DS4_REPORT_0x11_SIZE 78
41774+#define DS4_REPORT_0x81_SIZE 7
41775+#define SIXAXIS_REPORT_0xF2_SIZE 18
41776+
41777 static spinlock_t sony_dev_list_lock;
41778 static LIST_HEAD(sony_device_list);
41779 static DEFINE_IDA(sony_device_id_allocator);
41780@@ -811,6 +817,7 @@ struct sony_sc {
41781 struct work_struct state_worker;
41782 struct power_supply battery;
41783 int device_id;
41784+ __u8 *output_report_dmabuf;
41785
41786 #ifdef CONFIG_SONY_FF
41787 __u8 left;
41788@@ -1142,9 +1149,20 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
41789
41790 static int sixaxis_set_operational_bt(struct hid_device *hdev)
41791 {
41792- unsigned char buf[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
41793- return hid_hw_raw_request(hdev, buf[0], buf, sizeof(buf),
41794+ static const __u8 report[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
41795+ __u8 *buf;
41796+ int ret;
41797+
41798+ buf = kmemdup(report, sizeof(report), GFP_KERNEL);
41799+ if (!buf)
41800+ return -ENOMEM;
41801+
41802+ ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(report),
41803 HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
41804+
41805+ kfree(buf);
41806+
41807+ return ret;
41808 }
41809
41810 /*
41811@@ -1153,10 +1171,19 @@ static int sixaxis_set_operational_bt(struct hid_device *hdev)
41812 */
41813 static int dualshock4_set_operational_bt(struct hid_device *hdev)
41814 {
41815- __u8 buf[37] = { 0 };
41816+ __u8 *buf;
41817+ int ret;
41818
41819- return hid_hw_raw_request(hdev, 0x02, buf, sizeof(buf),
41820+ buf = kmalloc(DS4_REPORT_0x02_SIZE, GFP_KERNEL);
41821+ if (!buf)
41822+ return -ENOMEM;
41823+
41824+ ret = hid_hw_raw_request(hdev, 0x02, buf, DS4_REPORT_0x02_SIZE,
41825 HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
41826+
41827+ kfree(buf);
41828+
41829+ return ret;
41830 }
41831
41832 static void sixaxis_set_leds_from_id(int id, __u8 values[MAX_LEDS])
41833@@ -1471,9 +1498,7 @@ error_leds:
41834
41835 static void sixaxis_state_worker(struct work_struct *work)
41836 {
41837- struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41838- int n;
41839- union sixaxis_output_report_01 report = {
41840+ static const union sixaxis_output_report_01 default_report = {
41841 .buf = {
41842 0x01,
41843 0x00, 0xff, 0x00, 0xff, 0x00,
41844@@ -1485,20 +1510,27 @@ static void sixaxis_state_worker(struct work_struct *work)
41845 0x00, 0x00, 0x00, 0x00, 0x00
41846 }
41847 };
41848+ struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41849+ struct sixaxis_output_report *report =
41850+ (struct sixaxis_output_report *)sc->output_report_dmabuf;
41851+ int n;
41852+
41853+ /* Initialize the report with default values */
41854+ memcpy(report, &default_report, sizeof(struct sixaxis_output_report));
41855
41856 #ifdef CONFIG_SONY_FF
41857- report.data.rumble.right_motor_on = sc->right ? 1 : 0;
41858- report.data.rumble.left_motor_force = sc->left;
41859+ report->rumble.right_motor_on = sc->right ? 1 : 0;
41860+ report->rumble.left_motor_force = sc->left;
41861 #endif
41862
41863- report.data.leds_bitmap |= sc->led_state[0] << 1;
41864- report.data.leds_bitmap |= sc->led_state[1] << 2;
41865- report.data.leds_bitmap |= sc->led_state[2] << 3;
41866- report.data.leds_bitmap |= sc->led_state[3] << 4;
41867+ report->leds_bitmap |= sc->led_state[0] << 1;
41868+ report->leds_bitmap |= sc->led_state[1] << 2;
41869+ report->leds_bitmap |= sc->led_state[2] << 3;
41870+ report->leds_bitmap |= sc->led_state[3] << 4;
41871
41872 /* Set flag for all leds off, required for 3rd party INTEC controller */
41873- if ((report.data.leds_bitmap & 0x1E) == 0)
41874- report.data.leds_bitmap |= 0x20;
41875+ if ((report->leds_bitmap & 0x1E) == 0)
41876+ report->leds_bitmap |= 0x20;
41877
41878 /*
41879 * The LEDs in the report are indexed in reverse order to their
41880@@ -1511,28 +1543,30 @@ static void sixaxis_state_worker(struct work_struct *work)
41881 */
41882 for (n = 0; n < 4; n++) {
41883 if (sc->led_delay_on[n] || sc->led_delay_off[n]) {
41884- report.data.led[3 - n].duty_off = sc->led_delay_off[n];
41885- report.data.led[3 - n].duty_on = sc->led_delay_on[n];
41886+ report->led[3 - n].duty_off = sc->led_delay_off[n];
41887+ report->led[3 - n].duty_on = sc->led_delay_on[n];
41888 }
41889 }
41890
41891- hid_hw_raw_request(sc->hdev, report.data.report_id, report.buf,
41892- sizeof(report), HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41893+ hid_hw_raw_request(sc->hdev, report->report_id, (__u8 *)report,
41894+ sizeof(struct sixaxis_output_report),
41895+ HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41896 }
41897
41898 static void dualshock4_state_worker(struct work_struct *work)
41899 {
41900 struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41901 struct hid_device *hdev = sc->hdev;
41902+ __u8 *buf = sc->output_report_dmabuf;
41903 int offset;
41904
41905- __u8 buf[78] = { 0 };
41906-
41907 if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
41908+ memset(buf, 0, DS4_REPORT_0x05_SIZE);
41909 buf[0] = 0x05;
41910 buf[1] = 0xFF;
41911 offset = 4;
41912 } else {
41913+ memset(buf, 0, DS4_REPORT_0x11_SIZE);
41914 buf[0] = 0x11;
41915 buf[1] = 0xB0;
41916 buf[3] = 0x0F;
41917@@ -1560,12 +1594,33 @@ static void dualshock4_state_worker(struct work_struct *work)
41918 buf[offset++] = sc->led_delay_off[3];
41919
41920 if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
41921- hid_hw_output_report(hdev, buf, 32);
41922+ hid_hw_output_report(hdev, buf, DS4_REPORT_0x05_SIZE);
41923 else
41924- hid_hw_raw_request(hdev, 0x11, buf, 78,
41925+ hid_hw_raw_request(hdev, 0x11, buf, DS4_REPORT_0x11_SIZE,
41926 HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41927 }
41928
41929+static int sony_allocate_output_report(struct sony_sc *sc)
41930+{
41931+ if (sc->quirks & SIXAXIS_CONTROLLER)
41932+ sc->output_report_dmabuf =
41933+ kmalloc(sizeof(union sixaxis_output_report_01),
41934+ GFP_KERNEL);
41935+ else if (sc->quirks & DUALSHOCK4_CONTROLLER_BT)
41936+ sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x11_SIZE,
41937+ GFP_KERNEL);
41938+ else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
41939+ sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x05_SIZE,
41940+ GFP_KERNEL);
41941+ else
41942+ return 0;
41943+
41944+ if (!sc->output_report_dmabuf)
41945+ return -ENOMEM;
41946+
41947+ return 0;
41948+}
41949+
41950 #ifdef CONFIG_SONY_FF
41951 static int sony_play_effect(struct input_dev *dev, void *data,
41952 struct ff_effect *effect)
41953@@ -1754,6 +1809,7 @@ static int sony_get_bt_devaddr(struct sony_sc *sc)
41954
41955 static int sony_check_add(struct sony_sc *sc)
41956 {
41957+ __u8 *buf = NULL;
41958 int n, ret;
41959
41960 if ((sc->quirks & DUALSHOCK4_CONTROLLER_BT) ||
41961@@ -1769,36 +1825,44 @@ static int sony_check_add(struct sony_sc *sc)
41962 return 0;
41963 }
41964 } else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
41965- __u8 buf[7];
41966+ buf = kmalloc(DS4_REPORT_0x81_SIZE, GFP_KERNEL);
41967+ if (!buf)
41968+ return -ENOMEM;
41969
41970 /*
41971 * The MAC address of a DS4 controller connected via USB can be
41972 * retrieved with feature report 0x81. The address begins at
41973 * offset 1.
41974 */
41975- ret = hid_hw_raw_request(sc->hdev, 0x81, buf, sizeof(buf),
41976- HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
41977+ ret = hid_hw_raw_request(sc->hdev, 0x81, buf,
41978+ DS4_REPORT_0x81_SIZE, HID_FEATURE_REPORT,
41979+ HID_REQ_GET_REPORT);
41980
41981- if (ret != 7) {
41982+ if (ret != DS4_REPORT_0x81_SIZE) {
41983 hid_err(sc->hdev, "failed to retrieve feature report 0x81 with the DualShock 4 MAC address\n");
41984- return ret < 0 ? ret : -EINVAL;
41985+ ret = ret < 0 ? ret : -EINVAL;
41986+ goto out_free;
41987 }
41988
41989 memcpy(sc->mac_address, &buf[1], sizeof(sc->mac_address));
41990 } else if (sc->quirks & SIXAXIS_CONTROLLER_USB) {
41991- __u8 buf[18];
41992+ buf = kmalloc(SIXAXIS_REPORT_0xF2_SIZE, GFP_KERNEL);
41993+ if (!buf)
41994+ return -ENOMEM;
41995
41996 /*
41997 * The MAC address of a Sixaxis controller connected via USB can
41998 * be retrieved with feature report 0xf2. The address begins at
41999 * offset 4.
42000 */
42001- ret = hid_hw_raw_request(sc->hdev, 0xf2, buf, sizeof(buf),
42002- HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
42003+ ret = hid_hw_raw_request(sc->hdev, 0xf2, buf,
42004+ SIXAXIS_REPORT_0xF2_SIZE, HID_FEATURE_REPORT,
42005+ HID_REQ_GET_REPORT);
42006
42007- if (ret != 18) {
42008+ if (ret != SIXAXIS_REPORT_0xF2_SIZE) {
42009 hid_err(sc->hdev, "failed to retrieve feature report 0xf2 with the Sixaxis MAC address\n");
42010- return ret < 0 ? ret : -EINVAL;
42011+ ret = ret < 0 ? ret : -EINVAL;
42012+ goto out_free;
42013 }
42014
42015 /*
42016@@ -1811,7 +1875,13 @@ static int sony_check_add(struct sony_sc *sc)
42017 return 0;
42018 }
42019
42020- return sony_check_add_dev_list(sc);
42021+ ret = sony_check_add_dev_list(sc);
42022+
42023+out_free:
42024+
42025+ kfree(buf);
42026+
42027+ return ret;
42028 }
42029
42030 static int sony_set_device_id(struct sony_sc *sc)
42031@@ -1895,6 +1965,12 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
42032 return ret;
42033 }
42034
42035+ ret = sony_allocate_output_report(sc);
42036+ if (ret < 0) {
42037+ hid_err(hdev, "failed to allocate the output report buffer\n");
42038+ goto err_stop;
42039+ }
42040+
42041 ret = sony_set_device_id(sc);
42042 if (ret < 0) {
42043 hid_err(hdev, "failed to allocate the device id\n");
42044@@ -1984,6 +2060,7 @@ err_stop:
42045 if (sc->quirks & SONY_BATTERY_SUPPORT)
42046 sony_battery_remove(sc);
42047 sony_cancel_work_sync(sc);
42048+ kfree(sc->output_report_dmabuf);
42049 sony_remove_dev_list(sc);
42050 sony_release_device_id(sc);
42051 hid_hw_stop(hdev);
42052@@ -2004,6 +2081,8 @@ static void sony_remove(struct hid_device *hdev)
42053
42054 sony_cancel_work_sync(sc);
42055
42056+ kfree(sc->output_report_dmabuf);
42057+
42058 sony_remove_dev_list(sc);
42059
42060 sony_release_device_id(sc);
42061diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42062index c13fb5b..55a3802 100644
42063--- a/drivers/hid/hid-wiimote-debug.c
42064+++ b/drivers/hid/hid-wiimote-debug.c
42065@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42066 else if (size == 0)
42067 return -EIO;
42068
42069- if (copy_to_user(u, buf, size))
42070+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42071 return -EFAULT;
42072
42073 *off += size;
42074diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42075index 433f72a..2926005 100644
42076--- a/drivers/hv/channel.c
42077+++ b/drivers/hv/channel.c
42078@@ -366,8 +366,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42079 unsigned long flags;
42080 int ret = 0;
42081
42082- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
42083- atomic_inc(&vmbus_connection.next_gpadl_handle);
42084+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
42085+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
42086
42087 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42088 if (ret)
42089diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42090index 3e4235c..877d0e5 100644
42091--- a/drivers/hv/hv.c
42092+++ b/drivers/hv/hv.c
42093@@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42094 u64 output_address = (output) ? virt_to_phys(output) : 0;
42095 u32 output_address_hi = output_address >> 32;
42096 u32 output_address_lo = output_address & 0xFFFFFFFF;
42097- void *hypercall_page = hv_context.hypercall_page;
42098+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42099
42100 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42101 "=a"(hv_status_lo) : "d" (control_hi),
42102@@ -156,7 +156,7 @@ int hv_init(void)
42103 /* See if the hypercall page is already set */
42104 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42105
42106- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42107+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42108
42109 if (!virtaddr)
42110 goto cleanup;
42111diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42112index 5e90c5d..d8fcefb 100644
42113--- a/drivers/hv/hv_balloon.c
42114+++ b/drivers/hv/hv_balloon.c
42115@@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42116
42117 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42118 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42119-static atomic_t trans_id = ATOMIC_INIT(0);
42120+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42121
42122 static int dm_ring_size = (5 * PAGE_SIZE);
42123
42124@@ -893,7 +893,7 @@ static void hot_add_req(struct work_struct *dummy)
42125 pr_info("Memory hot add failed\n");
42126
42127 dm->state = DM_INITIALIZED;
42128- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42129+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42130 vmbus_sendpacket(dm->dev->channel, &resp,
42131 sizeof(struct dm_hot_add_response),
42132 (unsigned long)NULL,
42133@@ -973,7 +973,7 @@ static void post_status(struct hv_dynmem_device *dm)
42134 memset(&status, 0, sizeof(struct dm_status));
42135 status.hdr.type = DM_STATUS_REPORT;
42136 status.hdr.size = sizeof(struct dm_status);
42137- status.hdr.trans_id = atomic_inc_return(&trans_id);
42138+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42139
42140 /*
42141 * The host expects the guest to report free memory.
42142@@ -993,7 +993,7 @@ static void post_status(struct hv_dynmem_device *dm)
42143 * send the status. This can happen if we were interrupted
42144 * after we picked our transaction ID.
42145 */
42146- if (status.hdr.trans_id != atomic_read(&trans_id))
42147+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42148 return;
42149
42150 /*
42151@@ -1129,7 +1129,7 @@ static void balloon_up(struct work_struct *dummy)
42152 */
42153
42154 do {
42155- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42156+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42157 ret = vmbus_sendpacket(dm_device.dev->channel,
42158 bl_resp,
42159 bl_resp->hdr.size,
42160@@ -1175,7 +1175,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42161
42162 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42163 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42164- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42165+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42166 resp.hdr.size = sizeof(struct dm_unballoon_response);
42167
42168 vmbus_sendpacket(dm_device.dev->channel, &resp,
42169@@ -1239,7 +1239,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42170 memset(&version_req, 0, sizeof(struct dm_version_request));
42171 version_req.hdr.type = DM_VERSION_REQUEST;
42172 version_req.hdr.size = sizeof(struct dm_version_request);
42173- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42174+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42175 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42176 version_req.is_last_attempt = 1;
42177
42178@@ -1409,7 +1409,7 @@ static int balloon_probe(struct hv_device *dev,
42179 memset(&version_req, 0, sizeof(struct dm_version_request));
42180 version_req.hdr.type = DM_VERSION_REQUEST;
42181 version_req.hdr.size = sizeof(struct dm_version_request);
42182- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42183+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42184 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42185 version_req.is_last_attempt = 0;
42186
42187@@ -1440,7 +1440,7 @@ static int balloon_probe(struct hv_device *dev,
42188 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42189 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42190 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42191- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42192+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42193
42194 cap_msg.caps.cap_bits.balloon = 1;
42195 cap_msg.caps.cap_bits.hot_add = 1;
42196diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42197index c386d8d..d6004c4 100644
42198--- a/drivers/hv/hyperv_vmbus.h
42199+++ b/drivers/hv/hyperv_vmbus.h
42200@@ -611,7 +611,7 @@ enum vmbus_connect_state {
42201 struct vmbus_connection {
42202 enum vmbus_connect_state conn_state;
42203
42204- atomic_t next_gpadl_handle;
42205+ atomic_unchecked_t next_gpadl_handle;
42206
42207 /*
42208 * Represents channel interrupts. Each bit position represents a
42209diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42210index 4d6b269..2e23b86 100644
42211--- a/drivers/hv/vmbus_drv.c
42212+++ b/drivers/hv/vmbus_drv.c
42213@@ -807,10 +807,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42214 {
42215 int ret = 0;
42216
42217- static atomic_t device_num = ATOMIC_INIT(0);
42218+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42219
42220 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42221- atomic_inc_return(&device_num));
42222+ atomic_inc_return_unchecked(&device_num));
42223
42224 child_device_obj->device.bus = &hv_bus;
42225 child_device_obj->device.parent = &hv_acpi_dev->dev;
42226diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42227index 579bdf9..75118b5 100644
42228--- a/drivers/hwmon/acpi_power_meter.c
42229+++ b/drivers/hwmon/acpi_power_meter.c
42230@@ -116,7 +116,7 @@ struct sensor_template {
42231 struct device_attribute *devattr,
42232 const char *buf, size_t count);
42233 int index;
42234-};
42235+} __do_const;
42236
42237 /* Averaging interval */
42238 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42239@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42240 struct sensor_template *attrs)
42241 {
42242 struct device *dev = &resource->acpi_dev->dev;
42243- struct sensor_device_attribute *sensors =
42244+ sensor_device_attribute_no_const *sensors =
42245 &resource->sensors[resource->num_sensors];
42246 int res = 0;
42247
42248diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42249index 3288f13..71cfb4e 100644
42250--- a/drivers/hwmon/applesmc.c
42251+++ b/drivers/hwmon/applesmc.c
42252@@ -1106,7 +1106,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42253 {
42254 struct applesmc_node_group *grp;
42255 struct applesmc_dev_attr *node;
42256- struct attribute *attr;
42257+ attribute_no_const *attr;
42258 int ret, i;
42259
42260 for (grp = groups; grp->format; grp++) {
42261diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42262index cccef87..06ce8ec 100644
42263--- a/drivers/hwmon/asus_atk0110.c
42264+++ b/drivers/hwmon/asus_atk0110.c
42265@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42266 struct atk_sensor_data {
42267 struct list_head list;
42268 struct atk_data *data;
42269- struct device_attribute label_attr;
42270- struct device_attribute input_attr;
42271- struct device_attribute limit1_attr;
42272- struct device_attribute limit2_attr;
42273+ device_attribute_no_const label_attr;
42274+ device_attribute_no_const input_attr;
42275+ device_attribute_no_const limit1_attr;
42276+ device_attribute_no_const limit2_attr;
42277 char label_attr_name[ATTR_NAME_SIZE];
42278 char input_attr_name[ATTR_NAME_SIZE];
42279 char limit1_attr_name[ATTR_NAME_SIZE];
42280@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42281 static struct device_attribute atk_name_attr =
42282 __ATTR(name, 0444, atk_name_show, NULL);
42283
42284-static void atk_init_attribute(struct device_attribute *attr, char *name,
42285+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42286 sysfs_show_func show)
42287 {
42288 sysfs_attr_init(&attr->attr);
42289diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42290index d76f0b7..55ae976 100644
42291--- a/drivers/hwmon/coretemp.c
42292+++ b/drivers/hwmon/coretemp.c
42293@@ -784,7 +784,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42294 return NOTIFY_OK;
42295 }
42296
42297-static struct notifier_block coretemp_cpu_notifier __refdata = {
42298+static struct notifier_block coretemp_cpu_notifier = {
42299 .notifier_call = coretemp_cpu_callback,
42300 };
42301
42302diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42303index 7a8a6fb..015c1fd 100644
42304--- a/drivers/hwmon/ibmaem.c
42305+++ b/drivers/hwmon/ibmaem.c
42306@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42307 struct aem_rw_sensor_template *rw)
42308 {
42309 struct device *dev = &data->pdev->dev;
42310- struct sensor_device_attribute *sensors = data->sensors;
42311+ sensor_device_attribute_no_const *sensors = data->sensors;
42312 int err;
42313
42314 /* Set up read-only sensors */
42315diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42316index 14c82da..09b25d7 100644
42317--- a/drivers/hwmon/iio_hwmon.c
42318+++ b/drivers/hwmon/iio_hwmon.c
42319@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42320 {
42321 struct device *dev = &pdev->dev;
42322 struct iio_hwmon_state *st;
42323- struct sensor_device_attribute *a;
42324+ sensor_device_attribute_no_const *a;
42325 int ret, i;
42326 int in_i = 1, temp_i = 1, curr_i = 1;
42327 enum iio_chan_type type;
42328diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42329index 7710f46..427a28d 100644
42330--- a/drivers/hwmon/nct6683.c
42331+++ b/drivers/hwmon/nct6683.c
42332@@ -397,11 +397,11 @@ static struct attribute_group *
42333 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42334 int repeat)
42335 {
42336- struct sensor_device_attribute_2 *a2;
42337- struct sensor_device_attribute *a;
42338+ sensor_device_attribute_2_no_const *a2;
42339+ sensor_device_attribute_no_const *a;
42340 struct sensor_device_template **t;
42341 struct sensor_device_attr_u *su;
42342- struct attribute_group *group;
42343+ attribute_group_no_const *group;
42344 struct attribute **attrs;
42345 int i, j, count;
42346
42347diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42348index 504cbdd..35d6f25 100644
42349--- a/drivers/hwmon/nct6775.c
42350+++ b/drivers/hwmon/nct6775.c
42351@@ -943,10 +943,10 @@ static struct attribute_group *
42352 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42353 int repeat)
42354 {
42355- struct attribute_group *group;
42356+ attribute_group_no_const *group;
42357 struct sensor_device_attr_u *su;
42358- struct sensor_device_attribute *a;
42359- struct sensor_device_attribute_2 *a2;
42360+ sensor_device_attribute_no_const *a;
42361+ sensor_device_attribute_2_no_const *a2;
42362 struct attribute **attrs;
42363 struct sensor_device_template **t;
42364 int i, count;
42365diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42366index 291d11f..3f0dbbd 100644
42367--- a/drivers/hwmon/pmbus/pmbus_core.c
42368+++ b/drivers/hwmon/pmbus/pmbus_core.c
42369@@ -783,7 +783,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42370 return 0;
42371 }
42372
42373-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42374+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42375 const char *name,
42376 umode_t mode,
42377 ssize_t (*show)(struct device *dev,
42378@@ -800,7 +800,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42379 dev_attr->store = store;
42380 }
42381
42382-static void pmbus_attr_init(struct sensor_device_attribute *a,
42383+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42384 const char *name,
42385 umode_t mode,
42386 ssize_t (*show)(struct device *dev,
42387@@ -822,7 +822,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42388 u16 reg, u8 mask)
42389 {
42390 struct pmbus_boolean *boolean;
42391- struct sensor_device_attribute *a;
42392+ sensor_device_attribute_no_const *a;
42393
42394 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42395 if (!boolean)
42396@@ -847,7 +847,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42397 bool update, bool readonly)
42398 {
42399 struct pmbus_sensor *sensor;
42400- struct device_attribute *a;
42401+ device_attribute_no_const *a;
42402
42403 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42404 if (!sensor)
42405@@ -878,7 +878,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42406 const char *lstring, int index)
42407 {
42408 struct pmbus_label *label;
42409- struct device_attribute *a;
42410+ device_attribute_no_const *a;
42411
42412 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42413 if (!label)
42414diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42415index 97cd45a..ac54d8b 100644
42416--- a/drivers/hwmon/sht15.c
42417+++ b/drivers/hwmon/sht15.c
42418@@ -169,7 +169,7 @@ struct sht15_data {
42419 int supply_uv;
42420 bool supply_uv_valid;
42421 struct work_struct update_supply_work;
42422- atomic_t interrupt_handled;
42423+ atomic_unchecked_t interrupt_handled;
42424 };
42425
42426 /**
42427@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
42428 ret = gpio_direction_input(data->pdata->gpio_data);
42429 if (ret)
42430 return ret;
42431- atomic_set(&data->interrupt_handled, 0);
42432+ atomic_set_unchecked(&data->interrupt_handled, 0);
42433
42434 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42435 if (gpio_get_value(data->pdata->gpio_data) == 0) {
42436 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
42437 /* Only relevant if the interrupt hasn't occurred. */
42438- if (!atomic_read(&data->interrupt_handled))
42439+ if (!atomic_read_unchecked(&data->interrupt_handled))
42440 schedule_work(&data->read_work);
42441 }
42442 ret = wait_event_timeout(data->wait_queue,
42443@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
42444
42445 /* First disable the interrupt */
42446 disable_irq_nosync(irq);
42447- atomic_inc(&data->interrupt_handled);
42448+ atomic_inc_unchecked(&data->interrupt_handled);
42449 /* Then schedule a reading work struct */
42450 if (data->state != SHT15_READING_NOTHING)
42451 schedule_work(&data->read_work);
42452@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
42453 * If not, then start the interrupt again - care here as could
42454 * have gone low in meantime so verify it hasn't!
42455 */
42456- atomic_set(&data->interrupt_handled, 0);
42457+ atomic_set_unchecked(&data->interrupt_handled, 0);
42458 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42459 /* If still not occurred or another handler was scheduled */
42460 if (gpio_get_value(data->pdata->gpio_data)
42461- || atomic_read(&data->interrupt_handled))
42462+ || atomic_read_unchecked(&data->interrupt_handled))
42463 return;
42464 }
42465
42466diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
42467index 8df43c5..b07b91d 100644
42468--- a/drivers/hwmon/via-cputemp.c
42469+++ b/drivers/hwmon/via-cputemp.c
42470@@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
42471 return NOTIFY_OK;
42472 }
42473
42474-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
42475+static struct notifier_block via_cputemp_cpu_notifier = {
42476 .notifier_call = via_cputemp_cpu_callback,
42477 };
42478
42479diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
42480index 65e3240..e6c511d 100644
42481--- a/drivers/i2c/busses/i2c-amd756-s4882.c
42482+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
42483@@ -39,7 +39,7 @@
42484 extern struct i2c_adapter amd756_smbus;
42485
42486 static struct i2c_adapter *s4882_adapter;
42487-static struct i2c_algorithm *s4882_algo;
42488+static i2c_algorithm_no_const *s4882_algo;
42489
42490 /* Wrapper access functions for multiplexed SMBus */
42491 static DEFINE_MUTEX(amd756_lock);
42492diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
42493index b19a310..d6eece0 100644
42494--- a/drivers/i2c/busses/i2c-diolan-u2c.c
42495+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
42496@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
42497 /* usb layer */
42498
42499 /* Send command to device, and get response. */
42500-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42501+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42502 {
42503 int ret = 0;
42504 int actual;
42505diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
42506index 88eda09..cf40434 100644
42507--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
42508+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
42509@@ -37,7 +37,7 @@
42510 extern struct i2c_adapter *nforce2_smbus;
42511
42512 static struct i2c_adapter *s4985_adapter;
42513-static struct i2c_algorithm *s4985_algo;
42514+static i2c_algorithm_no_const *s4985_algo;
42515
42516 /* Wrapper access functions for multiplexed SMBus */
42517 static DEFINE_MUTEX(nforce2_lock);
42518diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
42519index 71c7a39..71dd3e0 100644
42520--- a/drivers/i2c/i2c-dev.c
42521+++ b/drivers/i2c/i2c-dev.c
42522@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
42523 break;
42524 }
42525
42526- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
42527+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
42528 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
42529 if (IS_ERR(rdwr_pa[i].buf)) {
42530 res = PTR_ERR(rdwr_pa[i].buf);
42531diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
42532index 0b510ba..4fbb5085 100644
42533--- a/drivers/ide/ide-cd.c
42534+++ b/drivers/ide/ide-cd.c
42535@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
42536 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
42537 if ((unsigned long)buf & alignment
42538 || blk_rq_bytes(rq) & q->dma_pad_mask
42539- || object_is_on_stack(buf))
42540+ || object_starts_on_stack(buf))
42541 drive->dma = 0;
42542 }
42543 }
42544diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
42545index af3e76d..96dfe5e 100644
42546--- a/drivers/iio/industrialio-core.c
42547+++ b/drivers/iio/industrialio-core.c
42548@@ -555,7 +555,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
42549 }
42550
42551 static
42552-int __iio_device_attr_init(struct device_attribute *dev_attr,
42553+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
42554 const char *postfix,
42555 struct iio_chan_spec const *chan,
42556 ssize_t (*readfunc)(struct device *dev,
42557diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
42558index e28a494..f7c2671 100644
42559--- a/drivers/infiniband/core/cm.c
42560+++ b/drivers/infiniband/core/cm.c
42561@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
42562
42563 struct cm_counter_group {
42564 struct kobject obj;
42565- atomic_long_t counter[CM_ATTR_COUNT];
42566+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
42567 };
42568
42569 struct cm_counter_attribute {
42570@@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
42571 struct ib_mad_send_buf *msg = NULL;
42572 int ret;
42573
42574- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42575+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42576 counter[CM_REQ_COUNTER]);
42577
42578 /* Quick state check to discard duplicate REQs. */
42579@@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
42580 if (!cm_id_priv)
42581 return;
42582
42583- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42584+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42585 counter[CM_REP_COUNTER]);
42586 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
42587 if (ret)
42588@@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
42589 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42590 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42591 spin_unlock_irq(&cm_id_priv->lock);
42592- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42593+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42594 counter[CM_RTU_COUNTER]);
42595 goto out;
42596 }
42597@@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
42598 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42599 dreq_msg->local_comm_id);
42600 if (!cm_id_priv) {
42601- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42602+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42603 counter[CM_DREQ_COUNTER]);
42604 cm_issue_drep(work->port, work->mad_recv_wc);
42605 return -EINVAL;
42606@@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
42607 case IB_CM_MRA_REP_RCVD:
42608 break;
42609 case IB_CM_TIMEWAIT:
42610- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42611+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42612 counter[CM_DREQ_COUNTER]);
42613 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42614 goto unlock;
42615@@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
42616 cm_free_msg(msg);
42617 goto deref;
42618 case IB_CM_DREQ_RCVD:
42619- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42620+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42621 counter[CM_DREQ_COUNTER]);
42622 goto unlock;
42623 default:
42624@@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
42625 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42626 cm_id_priv->msg, timeout)) {
42627 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42628- atomic_long_inc(&work->port->
42629+ atomic_long_inc_unchecked(&work->port->
42630 counter_group[CM_RECV_DUPLICATES].
42631 counter[CM_MRA_COUNTER]);
42632 goto out;
42633@@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
42634 break;
42635 case IB_CM_MRA_REQ_RCVD:
42636 case IB_CM_MRA_REP_RCVD:
42637- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42638+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42639 counter[CM_MRA_COUNTER]);
42640 /* fall through */
42641 default:
42642@@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
42643 case IB_CM_LAP_IDLE:
42644 break;
42645 case IB_CM_MRA_LAP_SENT:
42646- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42647+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42648 counter[CM_LAP_COUNTER]);
42649 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42650 goto unlock;
42651@@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
42652 cm_free_msg(msg);
42653 goto deref;
42654 case IB_CM_LAP_RCVD:
42655- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42656+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42657 counter[CM_LAP_COUNTER]);
42658 goto unlock;
42659 default:
42660@@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
42661 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
42662 if (cur_cm_id_priv) {
42663 spin_unlock_irq(&cm.lock);
42664- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42665+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42666 counter[CM_SIDR_REQ_COUNTER]);
42667 goto out; /* Duplicate message. */
42668 }
42669@@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
42670 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
42671 msg->retries = 1;
42672
42673- atomic_long_add(1 + msg->retries,
42674+ atomic_long_add_unchecked(1 + msg->retries,
42675 &port->counter_group[CM_XMIT].counter[attr_index]);
42676 if (msg->retries)
42677- atomic_long_add(msg->retries,
42678+ atomic_long_add_unchecked(msg->retries,
42679 &port->counter_group[CM_XMIT_RETRIES].
42680 counter[attr_index]);
42681
42682@@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
42683 }
42684
42685 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
42686- atomic_long_inc(&port->counter_group[CM_RECV].
42687+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
42688 counter[attr_id - CM_ATTR_ID_OFFSET]);
42689
42690 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
42691@@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
42692 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42693
42694 return sprintf(buf, "%ld\n",
42695- atomic_long_read(&group->counter[cm_attr->index]));
42696+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42697 }
42698
42699 static const struct sysfs_ops cm_counter_ops = {
42700diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
42701index 9f5ad7c..588cd84 100644
42702--- a/drivers/infiniband/core/fmr_pool.c
42703+++ b/drivers/infiniband/core/fmr_pool.c
42704@@ -98,8 +98,8 @@ struct ib_fmr_pool {
42705
42706 struct task_struct *thread;
42707
42708- atomic_t req_ser;
42709- atomic_t flush_ser;
42710+ atomic_unchecked_t req_ser;
42711+ atomic_unchecked_t flush_ser;
42712
42713 wait_queue_head_t force_wait;
42714 };
42715@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42716 struct ib_fmr_pool *pool = pool_ptr;
42717
42718 do {
42719- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
42720+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
42721 ib_fmr_batch_release(pool);
42722
42723- atomic_inc(&pool->flush_ser);
42724+ atomic_inc_unchecked(&pool->flush_ser);
42725 wake_up_interruptible(&pool->force_wait);
42726
42727 if (pool->flush_function)
42728@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42729 }
42730
42731 set_current_state(TASK_INTERRUPTIBLE);
42732- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
42733+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
42734 !kthread_should_stop())
42735 schedule();
42736 __set_current_state(TASK_RUNNING);
42737@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
42738 pool->dirty_watermark = params->dirty_watermark;
42739 pool->dirty_len = 0;
42740 spin_lock_init(&pool->pool_lock);
42741- atomic_set(&pool->req_ser, 0);
42742- atomic_set(&pool->flush_ser, 0);
42743+ atomic_set_unchecked(&pool->req_ser, 0);
42744+ atomic_set_unchecked(&pool->flush_ser, 0);
42745 init_waitqueue_head(&pool->force_wait);
42746
42747 pool->thread = kthread_run(ib_fmr_cleanup_thread,
42748@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
42749 }
42750 spin_unlock_irq(&pool->pool_lock);
42751
42752- serial = atomic_inc_return(&pool->req_ser);
42753+ serial = atomic_inc_return_unchecked(&pool->req_ser);
42754 wake_up_process(pool->thread);
42755
42756 if (wait_event_interruptible(pool->force_wait,
42757- atomic_read(&pool->flush_ser) - serial >= 0))
42758+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
42759 return -EINTR;
42760
42761 return 0;
42762@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
42763 } else {
42764 list_add_tail(&fmr->list, &pool->dirty_list);
42765 if (++pool->dirty_len >= pool->dirty_watermark) {
42766- atomic_inc(&pool->req_ser);
42767+ atomic_inc_unchecked(&pool->req_ser);
42768 wake_up_process(pool->thread);
42769 }
42770 }
42771diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
42772index ec7a298..8742e59 100644
42773--- a/drivers/infiniband/hw/cxgb4/mem.c
42774+++ b/drivers/infiniband/hw/cxgb4/mem.c
42775@@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42776 int err;
42777 struct fw_ri_tpte tpt;
42778 u32 stag_idx;
42779- static atomic_t key;
42780+ static atomic_unchecked_t key;
42781
42782 if (c4iw_fatal_error(rdev))
42783 return -EIO;
42784@@ -270,7 +270,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42785 if (rdev->stats.stag.cur > rdev->stats.stag.max)
42786 rdev->stats.stag.max = rdev->stats.stag.cur;
42787 mutex_unlock(&rdev->stats.lock);
42788- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
42789+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
42790 }
42791 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
42792 __func__, stag_state, type, pdid, stag_idx);
42793diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
42794index 79b3dbc..96e5fcc 100644
42795--- a/drivers/infiniband/hw/ipath/ipath_rc.c
42796+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
42797@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42798 struct ib_atomic_eth *ateth;
42799 struct ipath_ack_entry *e;
42800 u64 vaddr;
42801- atomic64_t *maddr;
42802+ atomic64_unchecked_t *maddr;
42803 u64 sdata;
42804 u32 rkey;
42805 u8 next;
42806@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42807 IB_ACCESS_REMOTE_ATOMIC)))
42808 goto nack_acc_unlck;
42809 /* Perform atomic OP and save result. */
42810- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42811+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42812 sdata = be64_to_cpu(ateth->swap_data);
42813 e = &qp->s_ack_queue[qp->r_head_ack_queue];
42814 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
42815- (u64) atomic64_add_return(sdata, maddr) - sdata :
42816+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42817 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42818 be64_to_cpu(ateth->compare_data),
42819 sdata);
42820diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
42821index 1f95bba..9530f87 100644
42822--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
42823+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
42824@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
42825 unsigned long flags;
42826 struct ib_wc wc;
42827 u64 sdata;
42828- atomic64_t *maddr;
42829+ atomic64_unchecked_t *maddr;
42830 enum ib_wc_status send_status;
42831
42832 /*
42833@@ -382,11 +382,11 @@ again:
42834 IB_ACCESS_REMOTE_ATOMIC)))
42835 goto acc_err;
42836 /* Perform atomic OP and save result. */
42837- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42838+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42839 sdata = wqe->wr.wr.atomic.compare_add;
42840 *(u64 *) sqp->s_sge.sge.vaddr =
42841 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
42842- (u64) atomic64_add_return(sdata, maddr) - sdata :
42843+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42844 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42845 sdata, wqe->wr.wr.atomic.swap);
42846 goto send_comp;
42847diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
42848index 82a7dd8..8fb6ba6 100644
42849--- a/drivers/infiniband/hw/mlx4/mad.c
42850+++ b/drivers/infiniband/hw/mlx4/mad.c
42851@@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
42852
42853 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
42854 {
42855- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
42856+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
42857 cpu_to_be64(0xff00000000000000LL);
42858 }
42859
42860diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
42861index ed327e6..ca1739e0 100644
42862--- a/drivers/infiniband/hw/mlx4/mcg.c
42863+++ b/drivers/infiniband/hw/mlx4/mcg.c
42864@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
42865 {
42866 char name[20];
42867
42868- atomic_set(&ctx->tid, 0);
42869+ atomic_set_unchecked(&ctx->tid, 0);
42870 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
42871 ctx->mcg_wq = create_singlethread_workqueue(name);
42872 if (!ctx->mcg_wq)
42873diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42874index 6eb743f..a7b0f6d 100644
42875--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
42876+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42877@@ -426,7 +426,7 @@ struct mlx4_ib_demux_ctx {
42878 struct list_head mcg_mgid0_list;
42879 struct workqueue_struct *mcg_wq;
42880 struct mlx4_ib_demux_pv_ctx **tun;
42881- atomic_t tid;
42882+ atomic_unchecked_t tid;
42883 int flushing; /* flushing the work queue */
42884 };
42885
42886diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
42887index 9d3e5c1..6f166df 100644
42888--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
42889+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
42890@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
42891 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
42892 }
42893
42894-int mthca_QUERY_FW(struct mthca_dev *dev)
42895+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
42896 {
42897 struct mthca_mailbox *mailbox;
42898 u32 *outbox;
42899@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42900 CMD_TIME_CLASS_B);
42901 }
42902
42903-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42904+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42905 int num_mtt)
42906 {
42907 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
42908@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
42909 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
42910 }
42911
42912-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42913+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42914 int eq_num)
42915 {
42916 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
42917@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
42918 CMD_TIME_CLASS_B);
42919 }
42920
42921-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42922+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42923 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
42924 void *in_mad, void *response_mad)
42925 {
42926diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
42927index ded76c1..0cf0a08 100644
42928--- a/drivers/infiniband/hw/mthca/mthca_main.c
42929+++ b/drivers/infiniband/hw/mthca/mthca_main.c
42930@@ -692,7 +692,7 @@ err_close:
42931 return err;
42932 }
42933
42934-static int mthca_setup_hca(struct mthca_dev *dev)
42935+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
42936 {
42937 int err;
42938
42939diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
42940index ed9a989..6aa5dc2 100644
42941--- a/drivers/infiniband/hw/mthca/mthca_mr.c
42942+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
42943@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
42944 * through the bitmaps)
42945 */
42946
42947-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42948+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42949 {
42950 int o;
42951 int m;
42952@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
42953 return key;
42954 }
42955
42956-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42957+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42958 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
42959 {
42960 struct mthca_mailbox *mailbox;
42961@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
42962 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
42963 }
42964
42965-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
42966+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
42967 u64 *buffer_list, int buffer_size_shift,
42968 int list_len, u64 iova, u64 total_size,
42969 u32 access, struct mthca_mr *mr)
42970diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
42971index 415f8e1..e34214e 100644
42972--- a/drivers/infiniband/hw/mthca/mthca_provider.c
42973+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
42974@@ -764,7 +764,7 @@ unlock:
42975 return 0;
42976 }
42977
42978-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
42979+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
42980 {
42981 struct mthca_dev *dev = to_mdev(ibcq->device);
42982 struct mthca_cq *cq = to_mcq(ibcq);
42983diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
42984index 3b2a6dc..bce26ff 100644
42985--- a/drivers/infiniband/hw/nes/nes.c
42986+++ b/drivers/infiniband/hw/nes/nes.c
42987@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
42988 LIST_HEAD(nes_adapter_list);
42989 static LIST_HEAD(nes_dev_list);
42990
42991-atomic_t qps_destroyed;
42992+atomic_unchecked_t qps_destroyed;
42993
42994 static unsigned int ee_flsh_adapter;
42995 static unsigned int sysfs_nonidx_addr;
42996@@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
42997 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
42998 struct nes_adapter *nesadapter = nesdev->nesadapter;
42999
43000- atomic_inc(&qps_destroyed);
43001+ atomic_inc_unchecked(&qps_destroyed);
43002
43003 /* Free the control structures */
43004
43005diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43006index bd9d132..70d84f4 100644
43007--- a/drivers/infiniband/hw/nes/nes.h
43008+++ b/drivers/infiniband/hw/nes/nes.h
43009@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43010 extern unsigned int wqm_quanta;
43011 extern struct list_head nes_adapter_list;
43012
43013-extern atomic_t cm_connects;
43014-extern atomic_t cm_accepts;
43015-extern atomic_t cm_disconnects;
43016-extern atomic_t cm_closes;
43017-extern atomic_t cm_connecteds;
43018-extern atomic_t cm_connect_reqs;
43019-extern atomic_t cm_rejects;
43020-extern atomic_t mod_qp_timouts;
43021-extern atomic_t qps_created;
43022-extern atomic_t qps_destroyed;
43023-extern atomic_t sw_qps_destroyed;
43024+extern atomic_unchecked_t cm_connects;
43025+extern atomic_unchecked_t cm_accepts;
43026+extern atomic_unchecked_t cm_disconnects;
43027+extern atomic_unchecked_t cm_closes;
43028+extern atomic_unchecked_t cm_connecteds;
43029+extern atomic_unchecked_t cm_connect_reqs;
43030+extern atomic_unchecked_t cm_rejects;
43031+extern atomic_unchecked_t mod_qp_timouts;
43032+extern atomic_unchecked_t qps_created;
43033+extern atomic_unchecked_t qps_destroyed;
43034+extern atomic_unchecked_t sw_qps_destroyed;
43035 extern u32 mh_detected;
43036 extern u32 mh_pauses_sent;
43037 extern u32 cm_packets_sent;
43038@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43039 extern u32 cm_packets_received;
43040 extern u32 cm_packets_dropped;
43041 extern u32 cm_packets_retrans;
43042-extern atomic_t cm_listens_created;
43043-extern atomic_t cm_listens_destroyed;
43044+extern atomic_unchecked_t cm_listens_created;
43045+extern atomic_unchecked_t cm_listens_destroyed;
43046 extern u32 cm_backlog_drops;
43047-extern atomic_t cm_loopbacks;
43048-extern atomic_t cm_nodes_created;
43049-extern atomic_t cm_nodes_destroyed;
43050-extern atomic_t cm_accel_dropped_pkts;
43051-extern atomic_t cm_resets_recvd;
43052-extern atomic_t pau_qps_created;
43053-extern atomic_t pau_qps_destroyed;
43054+extern atomic_unchecked_t cm_loopbacks;
43055+extern atomic_unchecked_t cm_nodes_created;
43056+extern atomic_unchecked_t cm_nodes_destroyed;
43057+extern atomic_unchecked_t cm_accel_dropped_pkts;
43058+extern atomic_unchecked_t cm_resets_recvd;
43059+extern atomic_unchecked_t pau_qps_created;
43060+extern atomic_unchecked_t pau_qps_destroyed;
43061
43062 extern u32 int_mod_timer_init;
43063 extern u32 int_mod_cq_depth_256;
43064diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43065index 6f09a72..cf4399d 100644
43066--- a/drivers/infiniband/hw/nes/nes_cm.c
43067+++ b/drivers/infiniband/hw/nes/nes_cm.c
43068@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43069 u32 cm_packets_retrans;
43070 u32 cm_packets_created;
43071 u32 cm_packets_received;
43072-atomic_t cm_listens_created;
43073-atomic_t cm_listens_destroyed;
43074+atomic_unchecked_t cm_listens_created;
43075+atomic_unchecked_t cm_listens_destroyed;
43076 u32 cm_backlog_drops;
43077-atomic_t cm_loopbacks;
43078-atomic_t cm_nodes_created;
43079-atomic_t cm_nodes_destroyed;
43080-atomic_t cm_accel_dropped_pkts;
43081-atomic_t cm_resets_recvd;
43082+atomic_unchecked_t cm_loopbacks;
43083+atomic_unchecked_t cm_nodes_created;
43084+atomic_unchecked_t cm_nodes_destroyed;
43085+atomic_unchecked_t cm_accel_dropped_pkts;
43086+atomic_unchecked_t cm_resets_recvd;
43087
43088 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43089 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43090@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43091 /* instance of function pointers for client API */
43092 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43093 static struct nes_cm_ops nes_cm_api = {
43094- mini_cm_accelerated,
43095- mini_cm_listen,
43096- mini_cm_del_listen,
43097- mini_cm_connect,
43098- mini_cm_close,
43099- mini_cm_accept,
43100- mini_cm_reject,
43101- mini_cm_recv_pkt,
43102- mini_cm_dealloc_core,
43103- mini_cm_get,
43104- mini_cm_set
43105+ .accelerated = mini_cm_accelerated,
43106+ .listen = mini_cm_listen,
43107+ .stop_listener = mini_cm_del_listen,
43108+ .connect = mini_cm_connect,
43109+ .close = mini_cm_close,
43110+ .accept = mini_cm_accept,
43111+ .reject = mini_cm_reject,
43112+ .recv_pkt = mini_cm_recv_pkt,
43113+ .destroy_cm_core = mini_cm_dealloc_core,
43114+ .get = mini_cm_get,
43115+ .set = mini_cm_set
43116 };
43117
43118 static struct nes_cm_core *g_cm_core;
43119
43120-atomic_t cm_connects;
43121-atomic_t cm_accepts;
43122-atomic_t cm_disconnects;
43123-atomic_t cm_closes;
43124-atomic_t cm_connecteds;
43125-atomic_t cm_connect_reqs;
43126-atomic_t cm_rejects;
43127+atomic_unchecked_t cm_connects;
43128+atomic_unchecked_t cm_accepts;
43129+atomic_unchecked_t cm_disconnects;
43130+atomic_unchecked_t cm_closes;
43131+atomic_unchecked_t cm_connecteds;
43132+atomic_unchecked_t cm_connect_reqs;
43133+atomic_unchecked_t cm_rejects;
43134
43135 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43136 {
43137@@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43138 kfree(listener);
43139 listener = NULL;
43140 ret = 0;
43141- atomic_inc(&cm_listens_destroyed);
43142+ atomic_inc_unchecked(&cm_listens_destroyed);
43143 } else {
43144 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43145 }
43146@@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43147 cm_node->rem_mac);
43148
43149 add_hte_node(cm_core, cm_node);
43150- atomic_inc(&cm_nodes_created);
43151+ atomic_inc_unchecked(&cm_nodes_created);
43152
43153 return cm_node;
43154 }
43155@@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43156 }
43157
43158 atomic_dec(&cm_core->node_cnt);
43159- atomic_inc(&cm_nodes_destroyed);
43160+ atomic_inc_unchecked(&cm_nodes_destroyed);
43161 nesqp = cm_node->nesqp;
43162 if (nesqp) {
43163 nesqp->cm_node = NULL;
43164@@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43165
43166 static void drop_packet(struct sk_buff *skb)
43167 {
43168- atomic_inc(&cm_accel_dropped_pkts);
43169+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43170 dev_kfree_skb_any(skb);
43171 }
43172
43173@@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43174 {
43175
43176 int reset = 0; /* whether to send reset in case of err.. */
43177- atomic_inc(&cm_resets_recvd);
43178+ atomic_inc_unchecked(&cm_resets_recvd);
43179 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43180 " refcnt=%d\n", cm_node, cm_node->state,
43181 atomic_read(&cm_node->ref_count));
43182@@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43183 rem_ref_cm_node(cm_node->cm_core, cm_node);
43184 return NULL;
43185 }
43186- atomic_inc(&cm_loopbacks);
43187+ atomic_inc_unchecked(&cm_loopbacks);
43188 loopbackremotenode->loopbackpartner = cm_node;
43189 loopbackremotenode->tcp_cntxt.rcv_wscale =
43190 NES_CM_DEFAULT_RCV_WND_SCALE;
43191@@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43192 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43193 else {
43194 rem_ref_cm_node(cm_core, cm_node);
43195- atomic_inc(&cm_accel_dropped_pkts);
43196+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43197 dev_kfree_skb_any(skb);
43198 }
43199 break;
43200@@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43201
43202 if ((cm_id) && (cm_id->event_handler)) {
43203 if (issue_disconn) {
43204- atomic_inc(&cm_disconnects);
43205+ atomic_inc_unchecked(&cm_disconnects);
43206 cm_event.event = IW_CM_EVENT_DISCONNECT;
43207 cm_event.status = disconn_status;
43208 cm_event.local_addr = cm_id->local_addr;
43209@@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43210 }
43211
43212 if (issue_close) {
43213- atomic_inc(&cm_closes);
43214+ atomic_inc_unchecked(&cm_closes);
43215 nes_disconnect(nesqp, 1);
43216
43217 cm_id->provider_data = nesqp;
43218@@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43219
43220 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43221 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43222- atomic_inc(&cm_accepts);
43223+ atomic_inc_unchecked(&cm_accepts);
43224
43225 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43226 netdev_refcnt_read(nesvnic->netdev));
43227@@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43228 struct nes_cm_core *cm_core;
43229 u8 *start_buff;
43230
43231- atomic_inc(&cm_rejects);
43232+ atomic_inc_unchecked(&cm_rejects);
43233 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43234 loopback = cm_node->loopbackpartner;
43235 cm_core = cm_node->cm_core;
43236@@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43237 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43238 ntohs(laddr->sin_port));
43239
43240- atomic_inc(&cm_connects);
43241+ atomic_inc_unchecked(&cm_connects);
43242 nesqp->active_conn = 1;
43243
43244 /* cache the cm_id in the qp */
43245@@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43246 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43247 return err;
43248 }
43249- atomic_inc(&cm_listens_created);
43250+ atomic_inc_unchecked(&cm_listens_created);
43251 }
43252
43253 cm_id->add_ref(cm_id);
43254@@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43255
43256 if (nesqp->destroyed)
43257 return;
43258- atomic_inc(&cm_connecteds);
43259+ atomic_inc_unchecked(&cm_connecteds);
43260 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43261 " local port 0x%04X. jiffies = %lu.\n",
43262 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43263@@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43264
43265 cm_id->add_ref(cm_id);
43266 ret = cm_id->event_handler(cm_id, &cm_event);
43267- atomic_inc(&cm_closes);
43268+ atomic_inc_unchecked(&cm_closes);
43269 cm_event.event = IW_CM_EVENT_CLOSE;
43270 cm_event.status = 0;
43271 cm_event.provider_data = cm_id->provider_data;
43272@@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43273 return;
43274 cm_id = cm_node->cm_id;
43275
43276- atomic_inc(&cm_connect_reqs);
43277+ atomic_inc_unchecked(&cm_connect_reqs);
43278 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43279 cm_node, cm_id, jiffies);
43280
43281@@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43282 return;
43283 cm_id = cm_node->cm_id;
43284
43285- atomic_inc(&cm_connect_reqs);
43286+ atomic_inc_unchecked(&cm_connect_reqs);
43287 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43288 cm_node, cm_id, jiffies);
43289
43290diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43291index 4166452..fc952c3 100644
43292--- a/drivers/infiniband/hw/nes/nes_mgt.c
43293+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43294@@ -40,8 +40,8 @@
43295 #include "nes.h"
43296 #include "nes_mgt.h"
43297
43298-atomic_t pau_qps_created;
43299-atomic_t pau_qps_destroyed;
43300+atomic_unchecked_t pau_qps_created;
43301+atomic_unchecked_t pau_qps_destroyed;
43302
43303 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43304 {
43305@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43306 {
43307 struct sk_buff *skb;
43308 unsigned long flags;
43309- atomic_inc(&pau_qps_destroyed);
43310+ atomic_inc_unchecked(&pau_qps_destroyed);
43311
43312 /* Free packets that have not yet been forwarded */
43313 /* Lock is acquired by skb_dequeue when removing the skb */
43314@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43315 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43316 skb_queue_head_init(&nesqp->pau_list);
43317 spin_lock_init(&nesqp->pau_lock);
43318- atomic_inc(&pau_qps_created);
43319+ atomic_inc_unchecked(&pau_qps_created);
43320 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43321 }
43322
43323diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43324index 49eb511..a774366 100644
43325--- a/drivers/infiniband/hw/nes/nes_nic.c
43326+++ b/drivers/infiniband/hw/nes/nes_nic.c
43327@@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43328 target_stat_values[++index] = mh_detected;
43329 target_stat_values[++index] = mh_pauses_sent;
43330 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43331- target_stat_values[++index] = atomic_read(&cm_connects);
43332- target_stat_values[++index] = atomic_read(&cm_accepts);
43333- target_stat_values[++index] = atomic_read(&cm_disconnects);
43334- target_stat_values[++index] = atomic_read(&cm_connecteds);
43335- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43336- target_stat_values[++index] = atomic_read(&cm_rejects);
43337- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43338- target_stat_values[++index] = atomic_read(&qps_created);
43339- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43340- target_stat_values[++index] = atomic_read(&qps_destroyed);
43341- target_stat_values[++index] = atomic_read(&cm_closes);
43342+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43343+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43344+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43345+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43346+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43347+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43348+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43349+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43350+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43351+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43352+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43353 target_stat_values[++index] = cm_packets_sent;
43354 target_stat_values[++index] = cm_packets_bounced;
43355 target_stat_values[++index] = cm_packets_created;
43356 target_stat_values[++index] = cm_packets_received;
43357 target_stat_values[++index] = cm_packets_dropped;
43358 target_stat_values[++index] = cm_packets_retrans;
43359- target_stat_values[++index] = atomic_read(&cm_listens_created);
43360- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43361+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43362+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43363 target_stat_values[++index] = cm_backlog_drops;
43364- target_stat_values[++index] = atomic_read(&cm_loopbacks);
43365- target_stat_values[++index] = atomic_read(&cm_nodes_created);
43366- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43367- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43368- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43369+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43370+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43371+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43372+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43373+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43374 target_stat_values[++index] = nesadapter->free_4kpbl;
43375 target_stat_values[++index] = nesadapter->free_256pbl;
43376 target_stat_values[++index] = int_mod_timer_init;
43377 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43378 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43379 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43380- target_stat_values[++index] = atomic_read(&pau_qps_created);
43381- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43382+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43383+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43384 }
43385
43386 /**
43387diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43388index fef067c..6a25ccd 100644
43389--- a/drivers/infiniband/hw/nes/nes_verbs.c
43390+++ b/drivers/infiniband/hw/nes/nes_verbs.c
43391@@ -46,9 +46,9 @@
43392
43393 #include <rdma/ib_umem.h>
43394
43395-atomic_t mod_qp_timouts;
43396-atomic_t qps_created;
43397-atomic_t sw_qps_destroyed;
43398+atomic_unchecked_t mod_qp_timouts;
43399+atomic_unchecked_t qps_created;
43400+atomic_unchecked_t sw_qps_destroyed;
43401
43402 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43403
43404@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43405 if (init_attr->create_flags)
43406 return ERR_PTR(-EINVAL);
43407
43408- atomic_inc(&qps_created);
43409+ atomic_inc_unchecked(&qps_created);
43410 switch (init_attr->qp_type) {
43411 case IB_QPT_RC:
43412 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
43413@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
43414 struct iw_cm_event cm_event;
43415 int ret = 0;
43416
43417- atomic_inc(&sw_qps_destroyed);
43418+ atomic_inc_unchecked(&sw_qps_destroyed);
43419 nesqp->destroyed = 1;
43420
43421 /* Blow away the connection if it exists. */
43422diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
43423index c00ae09..04e91be 100644
43424--- a/drivers/infiniband/hw/qib/qib.h
43425+++ b/drivers/infiniband/hw/qib/qib.h
43426@@ -52,6 +52,7 @@
43427 #include <linux/kref.h>
43428 #include <linux/sched.h>
43429 #include <linux/kthread.h>
43430+#include <linux/slab.h>
43431
43432 #include "qib_common.h"
43433 #include "qib_verbs.h"
43434diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43435index cdc7df4..a2fdfdb 100644
43436--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43437+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43438@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
43439 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
43440 }
43441
43442-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
43443+static struct rtnl_link_ops ipoib_link_ops = {
43444 .kind = "ipoib",
43445 .maxtype = IFLA_IPOIB_MAX,
43446 .policy = ipoib_policy,
43447diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
43448index e29c04e..adbf68c 100644
43449--- a/drivers/input/gameport/gameport.c
43450+++ b/drivers/input/gameport/gameport.c
43451@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
43452 */
43453 static void gameport_init_port(struct gameport *gameport)
43454 {
43455- static atomic_t gameport_no = ATOMIC_INIT(0);
43456+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
43457
43458 __module_get(THIS_MODULE);
43459
43460 mutex_init(&gameport->drv_mutex);
43461 device_initialize(&gameport->dev);
43462 dev_set_name(&gameport->dev, "gameport%lu",
43463- (unsigned long)atomic_inc_return(&gameport_no) - 1);
43464+ (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
43465 gameport->dev.bus = &gameport_bus;
43466 gameport->dev.release = gameport_release_port;
43467 if (gameport->parent)
43468diff --git a/drivers/input/input.c b/drivers/input/input.c
43469index 0f175f5..4c481c0 100644
43470--- a/drivers/input/input.c
43471+++ b/drivers/input/input.c
43472@@ -1775,7 +1775,7 @@ EXPORT_SYMBOL_GPL(input_class);
43473 */
43474 struct input_dev *input_allocate_device(void)
43475 {
43476- static atomic_t input_no = ATOMIC_INIT(0);
43477+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
43478 struct input_dev *dev;
43479
43480 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
43481@@ -1790,7 +1790,7 @@ struct input_dev *input_allocate_device(void)
43482 INIT_LIST_HEAD(&dev->node);
43483
43484 dev_set_name(&dev->dev, "input%lu",
43485- (unsigned long) atomic_inc_return(&input_no) - 1);
43486+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
43487
43488 __module_get(THIS_MODULE);
43489 }
43490diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
43491index 4a95b22..874c182 100644
43492--- a/drivers/input/joystick/sidewinder.c
43493+++ b/drivers/input/joystick/sidewinder.c
43494@@ -30,6 +30,7 @@
43495 #include <linux/kernel.h>
43496 #include <linux/module.h>
43497 #include <linux/slab.h>
43498+#include <linux/sched.h>
43499 #include <linux/input.h>
43500 #include <linux/gameport.h>
43501 #include <linux/jiffies.h>
43502diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
43503index fc55f0d..11e2aa6 100644
43504--- a/drivers/input/joystick/xpad.c
43505+++ b/drivers/input/joystick/xpad.c
43506@@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
43507
43508 static int xpad_led_probe(struct usb_xpad *xpad)
43509 {
43510- static atomic_t led_seq = ATOMIC_INIT(0);
43511+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
43512 long led_no;
43513 struct xpad_led *led;
43514 struct led_classdev *led_cdev;
43515@@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
43516 if (!led)
43517 return -ENOMEM;
43518
43519- led_no = (long)atomic_inc_return(&led_seq) - 1;
43520+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
43521
43522 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
43523 led->xpad = xpad;
43524diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
43525index afed8e2..3aa8a18 100644
43526--- a/drivers/input/misc/ims-pcu.c
43527+++ b/drivers/input/misc/ims-pcu.c
43528@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
43529
43530 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43531 {
43532- static atomic_t device_no = ATOMIC_INIT(0);
43533+ static atomic_unchecked_t device_no = ATOMIC_INIT(0);
43534
43535 const struct ims_pcu_device_info *info;
43536 int error;
43537@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43538 }
43539
43540 /* Device appears to be operable, complete initialization */
43541- pcu->device_no = atomic_inc_return(&device_no) - 1;
43542+ pcu->device_no = atomic_inc_return_unchecked(&device_no) - 1;
43543
43544 /*
43545 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
43546diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
43547index f4cf664..3204fda 100644
43548--- a/drivers/input/mouse/psmouse.h
43549+++ b/drivers/input/mouse/psmouse.h
43550@@ -117,7 +117,7 @@ struct psmouse_attribute {
43551 ssize_t (*set)(struct psmouse *psmouse, void *data,
43552 const char *buf, size_t count);
43553 bool protect;
43554-};
43555+} __do_const;
43556 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
43557
43558 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
43559diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
43560index b604564..3f14ae4 100644
43561--- a/drivers/input/mousedev.c
43562+++ b/drivers/input/mousedev.c
43563@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
43564
43565 spin_unlock_irq(&client->packet_lock);
43566
43567- if (copy_to_user(buffer, data, count))
43568+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
43569 return -EFAULT;
43570
43571 return count;
43572diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
43573index d399b8b..4913ede 100644
43574--- a/drivers/input/serio/serio.c
43575+++ b/drivers/input/serio/serio.c
43576@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
43577 */
43578 static void serio_init_port(struct serio *serio)
43579 {
43580- static atomic_t serio_no = ATOMIC_INIT(0);
43581+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
43582
43583 __module_get(THIS_MODULE);
43584
43585@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
43586 mutex_init(&serio->drv_mutex);
43587 device_initialize(&serio->dev);
43588 dev_set_name(&serio->dev, "serio%lu",
43589- (unsigned long)atomic_inc_return(&serio_no) - 1);
43590+ (unsigned long)atomic_inc_return_unchecked(&serio_no) - 1);
43591 serio->dev.bus = &serio_bus;
43592 serio->dev.release = serio_release_port;
43593 serio->dev.groups = serio_device_attr_groups;
43594diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
43595index c9a02fe..0debc75 100644
43596--- a/drivers/input/serio/serio_raw.c
43597+++ b/drivers/input/serio/serio_raw.c
43598@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
43599
43600 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43601 {
43602- static atomic_t serio_raw_no = ATOMIC_INIT(0);
43603+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(0);
43604 struct serio_raw *serio_raw;
43605 int err;
43606
43607@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43608 }
43609
43610 snprintf(serio_raw->name, sizeof(serio_raw->name),
43611- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no) - 1);
43612+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no) - 1);
43613 kref_init(&serio_raw->kref);
43614 INIT_LIST_HEAD(&serio_raw->client_list);
43615 init_waitqueue_head(&serio_raw->wait);
43616diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
43617index 505a9ad..356734c 100644
43618--- a/drivers/iommu/amd_iommu.c
43619+++ b/drivers/iommu/amd_iommu.c
43620@@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
43621
43622 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
43623 {
43624+ phys_addr_t physaddr;
43625 WARN_ON(address & 0x7ULL);
43626
43627 memset(cmd, 0, sizeof(*cmd));
43628- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
43629- cmd->data[1] = upper_32_bits(__pa(address));
43630+
43631+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
43632+ if (object_starts_on_stack((void *)address)) {
43633+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
43634+ physaddr = __pa((u64)adjbuf);
43635+ } else
43636+#endif
43637+ physaddr = __pa(address);
43638+
43639+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
43640+ cmd->data[1] = upper_32_bits(physaddr);
43641 cmd->data[2] = 1;
43642 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
43643 }
43644diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
43645index 60558f7..5a02369 100644
43646--- a/drivers/iommu/arm-smmu.c
43647+++ b/drivers/iommu/arm-smmu.c
43648@@ -934,7 +934,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43649 cfg->irptndx = cfg->cbndx;
43650 }
43651
43652- ACCESS_ONCE(smmu_domain->smmu) = smmu;
43653+ ACCESS_ONCE_RW(smmu_domain->smmu) = smmu;
43654 arm_smmu_init_context_bank(smmu_domain);
43655 spin_unlock_irqrestore(&smmu_domain->lock, flags);
43656
43657diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
43658index ed8b048..7fbcc01 100644
43659--- a/drivers/iommu/iommu.c
43660+++ b/drivers/iommu/iommu.c
43661@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
43662 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
43663 {
43664 int err;
43665- struct notifier_block *nb;
43666+ notifier_block_no_const *nb;
43667 struct iommu_callback_data cb = {
43668 .ops = ops,
43669 };
43670diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
43671index 74a1767..5a359e8 100644
43672--- a/drivers/iommu/irq_remapping.c
43673+++ b/drivers/iommu/irq_remapping.c
43674@@ -361,7 +361,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
43675 void panic_if_irq_remap(const char *msg)
43676 {
43677 if (irq_remapping_enabled)
43678- panic(msg);
43679+ panic("%s", msg);
43680 }
43681
43682 static void ir_ack_apic_edge(struct irq_data *data)
43683@@ -382,10 +382,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
43684
43685 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
43686 {
43687- chip->irq_print_chip = ir_print_prefix;
43688- chip->irq_ack = ir_ack_apic_edge;
43689- chip->irq_eoi = ir_ack_apic_level;
43690- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43691+ pax_open_kernel();
43692+ *(void **)&chip->irq_print_chip = ir_print_prefix;
43693+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
43694+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
43695+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43696+ pax_close_kernel();
43697 }
43698
43699 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
43700diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
43701index 38493ff..001538b 100644
43702--- a/drivers/irqchip/irq-gic.c
43703+++ b/drivers/irqchip/irq-gic.c
43704@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
43705 * Supported arch specific GIC irq extension.
43706 * Default make them NULL.
43707 */
43708-struct irq_chip gic_arch_extn = {
43709+irq_chip_no_const gic_arch_extn = {
43710 .irq_eoi = NULL,
43711 .irq_mask = NULL,
43712 .irq_unmask = NULL,
43713@@ -311,7 +311,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
43714 chained_irq_exit(chip, desc);
43715 }
43716
43717-static struct irq_chip gic_chip = {
43718+static irq_chip_no_const gic_chip __read_only = {
43719 .name = "GIC",
43720 .irq_mask = gic_mask_irq,
43721 .irq_unmask = gic_unmask_irq,
43722diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
43723index 542e850..1bb094c 100644
43724--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
43725+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
43726@@ -353,7 +353,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
43727 struct intc_irqpin_iomem *i;
43728 struct resource *io[INTC_IRQPIN_REG_NR];
43729 struct resource *irq;
43730- struct irq_chip *irq_chip;
43731+ irq_chip_no_const *irq_chip;
43732 void (*enable_fn)(struct irq_data *d);
43733 void (*disable_fn)(struct irq_data *d);
43734 const char *name = dev_name(dev);
43735diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
43736index 8777065..a4a9967 100644
43737--- a/drivers/irqchip/irq-renesas-irqc.c
43738+++ b/drivers/irqchip/irq-renesas-irqc.c
43739@@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
43740 struct irqc_priv *p;
43741 struct resource *io;
43742 struct resource *irq;
43743- struct irq_chip *irq_chip;
43744+ irq_chip_no_const *irq_chip;
43745 const char *name = dev_name(&pdev->dev);
43746 int ret;
43747 int k;
43748diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
43749index 6a2df32..dc962f1 100644
43750--- a/drivers/isdn/capi/capi.c
43751+++ b/drivers/isdn/capi/capi.c
43752@@ -81,8 +81,8 @@ struct capiminor {
43753
43754 struct capi20_appl *ap;
43755 u32 ncci;
43756- atomic_t datahandle;
43757- atomic_t msgid;
43758+ atomic_unchecked_t datahandle;
43759+ atomic_unchecked_t msgid;
43760
43761 struct tty_port port;
43762 int ttyinstop;
43763@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
43764 capimsg_setu16(s, 2, mp->ap->applid);
43765 capimsg_setu8 (s, 4, CAPI_DATA_B3);
43766 capimsg_setu8 (s, 5, CAPI_RESP);
43767- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
43768+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
43769 capimsg_setu32(s, 8, mp->ncci);
43770 capimsg_setu16(s, 12, datahandle);
43771 }
43772@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
43773 mp->outbytes -= len;
43774 spin_unlock_bh(&mp->outlock);
43775
43776- datahandle = atomic_inc_return(&mp->datahandle);
43777+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
43778 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
43779 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43780 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43781 capimsg_setu16(skb->data, 2, mp->ap->applid);
43782 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
43783 capimsg_setu8 (skb->data, 5, CAPI_REQ);
43784- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
43785+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
43786 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
43787 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
43788 capimsg_setu16(skb->data, 16, len); /* Data length */
43789diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
43790index aecec6d..11e13c5 100644
43791--- a/drivers/isdn/gigaset/bas-gigaset.c
43792+++ b/drivers/isdn/gigaset/bas-gigaset.c
43793@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
43794
43795
43796 static const struct gigaset_ops gigops = {
43797- gigaset_write_cmd,
43798- gigaset_write_room,
43799- gigaset_chars_in_buffer,
43800- gigaset_brkchars,
43801- gigaset_init_bchannel,
43802- gigaset_close_bchannel,
43803- gigaset_initbcshw,
43804- gigaset_freebcshw,
43805- gigaset_reinitbcshw,
43806- gigaset_initcshw,
43807- gigaset_freecshw,
43808- gigaset_set_modem_ctrl,
43809- gigaset_baud_rate,
43810- gigaset_set_line_ctrl,
43811- gigaset_isoc_send_skb,
43812- gigaset_isoc_input,
43813+ .write_cmd = gigaset_write_cmd,
43814+ .write_room = gigaset_write_room,
43815+ .chars_in_buffer = gigaset_chars_in_buffer,
43816+ .brkchars = gigaset_brkchars,
43817+ .init_bchannel = gigaset_init_bchannel,
43818+ .close_bchannel = gigaset_close_bchannel,
43819+ .initbcshw = gigaset_initbcshw,
43820+ .freebcshw = gigaset_freebcshw,
43821+ .reinitbcshw = gigaset_reinitbcshw,
43822+ .initcshw = gigaset_initcshw,
43823+ .freecshw = gigaset_freecshw,
43824+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43825+ .baud_rate = gigaset_baud_rate,
43826+ .set_line_ctrl = gigaset_set_line_ctrl,
43827+ .send_skb = gigaset_isoc_send_skb,
43828+ .handle_input = gigaset_isoc_input,
43829 };
43830
43831 /* bas_gigaset_init
43832diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
43833index 600c79b..3752bab 100644
43834--- a/drivers/isdn/gigaset/interface.c
43835+++ b/drivers/isdn/gigaset/interface.c
43836@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
43837 }
43838 tty->driver_data = cs;
43839
43840- ++cs->port.count;
43841+ atomic_inc(&cs->port.count);
43842
43843- if (cs->port.count == 1) {
43844+ if (atomic_read(&cs->port.count) == 1) {
43845 tty_port_tty_set(&cs->port, tty);
43846 cs->port.low_latency = 1;
43847 }
43848@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
43849
43850 if (!cs->connected)
43851 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
43852- else if (!cs->port.count)
43853+ else if (!atomic_read(&cs->port.count))
43854 dev_warn(cs->dev, "%s: device not opened\n", __func__);
43855- else if (!--cs->port.count)
43856+ else if (!atomic_dec_return(&cs->port.count))
43857 tty_port_tty_set(&cs->port, NULL);
43858
43859 mutex_unlock(&cs->mutex);
43860diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
43861index 8c91fd5..14f13ce 100644
43862--- a/drivers/isdn/gigaset/ser-gigaset.c
43863+++ b/drivers/isdn/gigaset/ser-gigaset.c
43864@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
43865 }
43866
43867 static const struct gigaset_ops ops = {
43868- gigaset_write_cmd,
43869- gigaset_write_room,
43870- gigaset_chars_in_buffer,
43871- gigaset_brkchars,
43872- gigaset_init_bchannel,
43873- gigaset_close_bchannel,
43874- gigaset_initbcshw,
43875- gigaset_freebcshw,
43876- gigaset_reinitbcshw,
43877- gigaset_initcshw,
43878- gigaset_freecshw,
43879- gigaset_set_modem_ctrl,
43880- gigaset_baud_rate,
43881- gigaset_set_line_ctrl,
43882- gigaset_m10x_send_skb, /* asyncdata.c */
43883- gigaset_m10x_input, /* asyncdata.c */
43884+ .write_cmd = gigaset_write_cmd,
43885+ .write_room = gigaset_write_room,
43886+ .chars_in_buffer = gigaset_chars_in_buffer,
43887+ .brkchars = gigaset_brkchars,
43888+ .init_bchannel = gigaset_init_bchannel,
43889+ .close_bchannel = gigaset_close_bchannel,
43890+ .initbcshw = gigaset_initbcshw,
43891+ .freebcshw = gigaset_freebcshw,
43892+ .reinitbcshw = gigaset_reinitbcshw,
43893+ .initcshw = gigaset_initcshw,
43894+ .freecshw = gigaset_freecshw,
43895+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43896+ .baud_rate = gigaset_baud_rate,
43897+ .set_line_ctrl = gigaset_set_line_ctrl,
43898+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
43899+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
43900 };
43901
43902
43903diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
43904index a8e652d..edadaa4 100644
43905--- a/drivers/isdn/gigaset/usb-gigaset.c
43906+++ b/drivers/isdn/gigaset/usb-gigaset.c
43907@@ -548,7 +548,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
43908 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
43909 memcpy(cs->hw.usb->bchars, buf, 6);
43910 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
43911- 0, 0, &buf, 6, 2000);
43912+ 0, 0, buf, 6, 2000);
43913 }
43914
43915 static void gigaset_freebcshw(struct bc_state *bcs)
43916@@ -867,22 +867,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
43917 }
43918
43919 static const struct gigaset_ops ops = {
43920- gigaset_write_cmd,
43921- gigaset_write_room,
43922- gigaset_chars_in_buffer,
43923- gigaset_brkchars,
43924- gigaset_init_bchannel,
43925- gigaset_close_bchannel,
43926- gigaset_initbcshw,
43927- gigaset_freebcshw,
43928- gigaset_reinitbcshw,
43929- gigaset_initcshw,
43930- gigaset_freecshw,
43931- gigaset_set_modem_ctrl,
43932- gigaset_baud_rate,
43933- gigaset_set_line_ctrl,
43934- gigaset_m10x_send_skb,
43935- gigaset_m10x_input,
43936+ .write_cmd = gigaset_write_cmd,
43937+ .write_room = gigaset_write_room,
43938+ .chars_in_buffer = gigaset_chars_in_buffer,
43939+ .brkchars = gigaset_brkchars,
43940+ .init_bchannel = gigaset_init_bchannel,
43941+ .close_bchannel = gigaset_close_bchannel,
43942+ .initbcshw = gigaset_initbcshw,
43943+ .freebcshw = gigaset_freebcshw,
43944+ .reinitbcshw = gigaset_reinitbcshw,
43945+ .initcshw = gigaset_initcshw,
43946+ .freecshw = gigaset_freecshw,
43947+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43948+ .baud_rate = gigaset_baud_rate,
43949+ .set_line_ctrl = gigaset_set_line_ctrl,
43950+ .send_skb = gigaset_m10x_send_skb,
43951+ .handle_input = gigaset_m10x_input,
43952 };
43953
43954 /*
43955diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
43956index 4d9b195..455075c 100644
43957--- a/drivers/isdn/hardware/avm/b1.c
43958+++ b/drivers/isdn/hardware/avm/b1.c
43959@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
43960 }
43961 if (left) {
43962 if (t4file->user) {
43963- if (copy_from_user(buf, dp, left))
43964+ if (left > sizeof buf || copy_from_user(buf, dp, left))
43965 return -EFAULT;
43966 } else {
43967 memcpy(buf, dp, left);
43968@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
43969 }
43970 if (left) {
43971 if (config->user) {
43972- if (copy_from_user(buf, dp, left))
43973+ if (left > sizeof buf || copy_from_user(buf, dp, left))
43974 return -EFAULT;
43975 } else {
43976 memcpy(buf, dp, left);
43977diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
43978index 9b856e1..fa03c92 100644
43979--- a/drivers/isdn/i4l/isdn_common.c
43980+++ b/drivers/isdn/i4l/isdn_common.c
43981@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
43982 } else
43983 return -EINVAL;
43984 case IIOCDBGVAR:
43985+ if (!capable(CAP_SYS_RAWIO))
43986+ return -EPERM;
43987 if (arg) {
43988 if (copy_to_user(argp, &dev, sizeof(ulong)))
43989 return -EFAULT;
43990diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
43991index 91d5730..336523e 100644
43992--- a/drivers/isdn/i4l/isdn_concap.c
43993+++ b/drivers/isdn/i4l/isdn_concap.c
43994@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
43995 }
43996
43997 struct concap_device_ops isdn_concap_reliable_dl_dops = {
43998- &isdn_concap_dl_data_req,
43999- &isdn_concap_dl_connect_req,
44000- &isdn_concap_dl_disconn_req
44001+ .data_req = &isdn_concap_dl_data_req,
44002+ .connect_req = &isdn_concap_dl_connect_req,
44003+ .disconn_req = &isdn_concap_dl_disconn_req
44004 };
44005
44006 /* The following should better go into a dedicated source file such that
44007diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
44008index bc91261..2ef7e36 100644
44009--- a/drivers/isdn/i4l/isdn_tty.c
44010+++ b/drivers/isdn/i4l/isdn_tty.c
44011@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
44012
44013 #ifdef ISDN_DEBUG_MODEM_OPEN
44014 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
44015- port->count);
44016+ atomic_read(&port->count));
44017 #endif
44018- port->count++;
44019+ atomic_inc(&port->count);
44020 port->tty = tty;
44021 /*
44022 * Start up serial port
44023@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44024 #endif
44025 return;
44026 }
44027- if ((tty->count == 1) && (port->count != 1)) {
44028+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
44029 /*
44030 * Uh, oh. tty->count is 1, which means that the tty
44031 * structure will be freed. Info->count should always
44032@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44033 * serial port won't be shutdown.
44034 */
44035 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
44036- "info->count is %d\n", port->count);
44037- port->count = 1;
44038+ "info->count is %d\n", atomic_read(&port->count));
44039+ atomic_set(&port->count, 1);
44040 }
44041- if (--port->count < 0) {
44042+ if (atomic_dec_return(&port->count) < 0) {
44043 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
44044- info->line, port->count);
44045- port->count = 0;
44046+ info->line, atomic_read(&port->count));
44047+ atomic_set(&port->count, 0);
44048 }
44049- if (port->count) {
44050+ if (atomic_read(&port->count)) {
44051 #ifdef ISDN_DEBUG_MODEM_OPEN
44052 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
44053 #endif
44054@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
44055 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
44056 return;
44057 isdn_tty_shutdown(info);
44058- port->count = 0;
44059+ atomic_set(&port->count, 0);
44060 port->flags &= ~ASYNC_NORMAL_ACTIVE;
44061 port->tty = NULL;
44062 wake_up_interruptible(&port->open_wait);
44063@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
44064 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
44065 modem_info *info = &dev->mdm.info[i];
44066
44067- if (info->port.count == 0)
44068+ if (atomic_read(&info->port.count) == 0)
44069 continue;
44070 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
44071 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
44072diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
44073index e2d4e58..40cd045 100644
44074--- a/drivers/isdn/i4l/isdn_x25iface.c
44075+++ b/drivers/isdn/i4l/isdn_x25iface.c
44076@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
44077
44078
44079 static struct concap_proto_ops ix25_pops = {
44080- &isdn_x25iface_proto_new,
44081- &isdn_x25iface_proto_del,
44082- &isdn_x25iface_proto_restart,
44083- &isdn_x25iface_proto_close,
44084- &isdn_x25iface_xmit,
44085- &isdn_x25iface_receive,
44086- &isdn_x25iface_connect_ind,
44087- &isdn_x25iface_disconn_ind
44088+ .proto_new = &isdn_x25iface_proto_new,
44089+ .proto_del = &isdn_x25iface_proto_del,
44090+ .restart = &isdn_x25iface_proto_restart,
44091+ .close = &isdn_x25iface_proto_close,
44092+ .encap_and_xmit = &isdn_x25iface_xmit,
44093+ .data_ind = &isdn_x25iface_receive,
44094+ .connect_ind = &isdn_x25iface_connect_ind,
44095+ .disconn_ind = &isdn_x25iface_disconn_ind
44096 };
44097
44098 /* error message helper function */
44099diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
44100index 6a7447c..cae33fe 100644
44101--- a/drivers/isdn/icn/icn.c
44102+++ b/drivers/isdn/icn/icn.c
44103@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
44104 if (count > len)
44105 count = len;
44106 if (user) {
44107- if (copy_from_user(msg, buf, count))
44108+ if (count > sizeof msg || copy_from_user(msg, buf, count))
44109 return -EFAULT;
44110 } else
44111 memcpy(msg, buf, count);
44112diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
44113index 87f7dff..7300125 100644
44114--- a/drivers/isdn/mISDN/dsp_cmx.c
44115+++ b/drivers/isdn/mISDN/dsp_cmx.c
44116@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
44117 static u16 dsp_count; /* last sample count */
44118 static int dsp_count_valid; /* if we have last sample count */
44119
44120-void
44121+void __intentional_overflow(-1)
44122 dsp_cmx_send(void *arg)
44123 {
44124 struct dsp_conf *conf;
44125diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
44126index f58a354..fbae176 100644
44127--- a/drivers/leds/leds-clevo-mail.c
44128+++ b/drivers/leds/leds-clevo-mail.c
44129@@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
44130 * detected as working, but in reality it is not) as low as
44131 * possible.
44132 */
44133-static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
44134+static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
44135 {
44136 .callback = clevo_mail_led_dmi_callback,
44137 .ident = "Clevo D410J",
44138diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
44139index 046cb70..6b20d39 100644
44140--- a/drivers/leds/leds-ss4200.c
44141+++ b/drivers/leds/leds-ss4200.c
44142@@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
44143 * detected as working, but in reality it is not) as low as
44144 * possible.
44145 */
44146-static struct dmi_system_id nas_led_whitelist[] __initdata = {
44147+static struct dmi_system_id nas_led_whitelist[] __initconst = {
44148 {
44149 .callback = ss4200_led_dmi_callback,
44150 .ident = "Intel SS4200-E",
44151diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
44152index 6590558..a74c5dd 100644
44153--- a/drivers/lguest/core.c
44154+++ b/drivers/lguest/core.c
44155@@ -96,9 +96,17 @@ static __init int map_switcher(void)
44156 * The end address needs +1 because __get_vm_area allocates an
44157 * extra guard page, so we need space for that.
44158 */
44159+
44160+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
44161+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44162+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
44163+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44164+#else
44165 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44166 VM_ALLOC, switcher_addr, switcher_addr
44167 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44168+#endif
44169+
44170 if (!switcher_vma) {
44171 err = -ENOMEM;
44172 printk("lguest: could not map switcher pages high\n");
44173@@ -121,7 +129,7 @@ static __init int map_switcher(void)
44174 * Now the Switcher is mapped at the right address, we can't fail!
44175 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
44176 */
44177- memcpy(switcher_vma->addr, start_switcher_text,
44178+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
44179 end_switcher_text - start_switcher_text);
44180
44181 printk(KERN_INFO "lguest: mapped switcher at %p\n",
44182diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
44183index e8b55c3..3514c37 100644
44184--- a/drivers/lguest/page_tables.c
44185+++ b/drivers/lguest/page_tables.c
44186@@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
44187 /*:*/
44188
44189 #ifdef CONFIG_X86_PAE
44190-static void release_pmd(pmd_t *spmd)
44191+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
44192 {
44193 /* If the entry's not present, there's nothing to release. */
44194 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
44195diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
44196index 922a1ac..9dd0c2a 100644
44197--- a/drivers/lguest/x86/core.c
44198+++ b/drivers/lguest/x86/core.c
44199@@ -59,7 +59,7 @@ static struct {
44200 /* Offset from where switcher.S was compiled to where we've copied it */
44201 static unsigned long switcher_offset(void)
44202 {
44203- return switcher_addr - (unsigned long)start_switcher_text;
44204+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
44205 }
44206
44207 /* This cpu's struct lguest_pages (after the Switcher text page) */
44208@@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
44209 * These copies are pretty cheap, so we do them unconditionally: */
44210 /* Save the current Host top-level page directory.
44211 */
44212+
44213+#ifdef CONFIG_PAX_PER_CPU_PGD
44214+ pages->state.host_cr3 = read_cr3();
44215+#else
44216 pages->state.host_cr3 = __pa(current->mm->pgd);
44217+#endif
44218+
44219 /*
44220 * Set up the Guest's page tables to see this CPU's pages (and no
44221 * other CPU's pages).
44222@@ -477,7 +483,7 @@ void __init lguest_arch_host_init(void)
44223 * compiled-in switcher code and the high-mapped copy we just made.
44224 */
44225 for (i = 0; i < IDT_ENTRIES; i++)
44226- default_idt_entries[i] += switcher_offset();
44227+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
44228
44229 /*
44230 * Set up the Switcher's per-cpu areas.
44231@@ -560,7 +566,7 @@ void __init lguest_arch_host_init(void)
44232 * it will be undisturbed when we switch. To change %cs and jump we
44233 * need this structure to feed to Intel's "lcall" instruction.
44234 */
44235- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
44236+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
44237 lguest_entry.segment = LGUEST_CS;
44238
44239 /*
44240diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
44241index 40634b0..4f5855e 100644
44242--- a/drivers/lguest/x86/switcher_32.S
44243+++ b/drivers/lguest/x86/switcher_32.S
44244@@ -87,6 +87,7 @@
44245 #include <asm/page.h>
44246 #include <asm/segment.h>
44247 #include <asm/lguest.h>
44248+#include <asm/processor-flags.h>
44249
44250 // We mark the start of the code to copy
44251 // It's placed in .text tho it's never run here
44252@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
44253 // Changes type when we load it: damn Intel!
44254 // For after we switch over our page tables
44255 // That entry will be read-only: we'd crash.
44256+
44257+#ifdef CONFIG_PAX_KERNEXEC
44258+ mov %cr0, %edx
44259+ xor $X86_CR0_WP, %edx
44260+ mov %edx, %cr0
44261+#endif
44262+
44263 movl $(GDT_ENTRY_TSS*8), %edx
44264 ltr %dx
44265
44266@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
44267 // Let's clear it again for our return.
44268 // The GDT descriptor of the Host
44269 // Points to the table after two "size" bytes
44270- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
44271+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
44272 // Clear "used" from type field (byte 5, bit 2)
44273- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
44274+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
44275+
44276+#ifdef CONFIG_PAX_KERNEXEC
44277+ mov %cr0, %eax
44278+ xor $X86_CR0_WP, %eax
44279+ mov %eax, %cr0
44280+#endif
44281
44282 // Once our page table's switched, the Guest is live!
44283 // The Host fades as we run this final step.
44284@@ -295,13 +309,12 @@ deliver_to_host:
44285 // I consulted gcc, and it gave
44286 // These instructions, which I gladly credit:
44287 leal (%edx,%ebx,8), %eax
44288- movzwl (%eax),%edx
44289- movl 4(%eax), %eax
44290- xorw %ax, %ax
44291- orl %eax, %edx
44292+ movl 4(%eax), %edx
44293+ movw (%eax), %dx
44294 // Now the address of the handler's in %edx
44295 // We call it now: its "iret" drops us home.
44296- jmp *%edx
44297+ ljmp $__KERNEL_CS, $1f
44298+1: jmp *%edx
44299
44300 // Every interrupt can come to us here
44301 // But we must truly tell each apart.
44302diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
44303index a08e3ee..df8ade2 100644
44304--- a/drivers/md/bcache/closure.h
44305+++ b/drivers/md/bcache/closure.h
44306@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
44307 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
44308 struct workqueue_struct *wq)
44309 {
44310- BUG_ON(object_is_on_stack(cl));
44311+ BUG_ON(object_starts_on_stack(cl));
44312 closure_set_ip(cl);
44313 cl->fn = fn;
44314 cl->wq = wq;
44315diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
44316index da3604e..7789cb4c 100644
44317--- a/drivers/md/bitmap.c
44318+++ b/drivers/md/bitmap.c
44319@@ -1771,7 +1771,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
44320 chunk_kb ? "KB" : "B");
44321 if (bitmap->storage.file) {
44322 seq_printf(seq, ", file: ");
44323- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
44324+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
44325 }
44326
44327 seq_printf(seq, "\n");
44328diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
44329index 0be9381..114262b 100644
44330--- a/drivers/md/dm-ioctl.c
44331+++ b/drivers/md/dm-ioctl.c
44332@@ -1769,7 +1769,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
44333 cmd == DM_LIST_VERSIONS_CMD)
44334 return 0;
44335
44336- if ((cmd == DM_DEV_CREATE_CMD)) {
44337+ if (cmd == DM_DEV_CREATE_CMD) {
44338 if (!*param->name) {
44339 DMWARN("name not supplied when creating device");
44340 return -EINVAL;
44341diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
44342index 7dfdb5c..4caada6 100644
44343--- a/drivers/md/dm-raid1.c
44344+++ b/drivers/md/dm-raid1.c
44345@@ -40,7 +40,7 @@ enum dm_raid1_error {
44346
44347 struct mirror {
44348 struct mirror_set *ms;
44349- atomic_t error_count;
44350+ atomic_unchecked_t error_count;
44351 unsigned long error_type;
44352 struct dm_dev *dev;
44353 sector_t offset;
44354@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
44355 struct mirror *m;
44356
44357 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
44358- if (!atomic_read(&m->error_count))
44359+ if (!atomic_read_unchecked(&m->error_count))
44360 return m;
44361
44362 return NULL;
44363@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
44364 * simple way to tell if a device has encountered
44365 * errors.
44366 */
44367- atomic_inc(&m->error_count);
44368+ atomic_inc_unchecked(&m->error_count);
44369
44370 if (test_and_set_bit(error_type, &m->error_type))
44371 return;
44372@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
44373 struct mirror *m = get_default_mirror(ms);
44374
44375 do {
44376- if (likely(!atomic_read(&m->error_count)))
44377+ if (likely(!atomic_read_unchecked(&m->error_count)))
44378 return m;
44379
44380 if (m-- == ms->mirror)
44381@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
44382 {
44383 struct mirror *default_mirror = get_default_mirror(m->ms);
44384
44385- return !atomic_read(&default_mirror->error_count);
44386+ return !atomic_read_unchecked(&default_mirror->error_count);
44387 }
44388
44389 static int mirror_available(struct mirror_set *ms, struct bio *bio)
44390@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
44391 */
44392 if (likely(region_in_sync(ms, region, 1)))
44393 m = choose_mirror(ms, bio->bi_iter.bi_sector);
44394- else if (m && atomic_read(&m->error_count))
44395+ else if (m && atomic_read_unchecked(&m->error_count))
44396 m = NULL;
44397
44398 if (likely(m))
44399@@ -927,7 +927,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
44400 }
44401
44402 ms->mirror[mirror].ms = ms;
44403- atomic_set(&(ms->mirror[mirror].error_count), 0);
44404+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
44405 ms->mirror[mirror].error_type = 0;
44406 ms->mirror[mirror].offset = offset;
44407
44408@@ -1342,7 +1342,7 @@ static void mirror_resume(struct dm_target *ti)
44409 */
44410 static char device_status_char(struct mirror *m)
44411 {
44412- if (!atomic_read(&(m->error_count)))
44413+ if (!atomic_read_unchecked(&(m->error_count)))
44414 return 'A';
44415
44416 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
44417diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
44418index 87f86c7..a1a4100 100644
44419--- a/drivers/md/dm-stats.c
44420+++ b/drivers/md/dm-stats.c
44421@@ -382,7 +382,7 @@ do_sync_free:
44422 synchronize_rcu_expedited();
44423 dm_stat_free(&s->rcu_head);
44424 } else {
44425- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
44426+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
44427 call_rcu(&s->rcu_head, dm_stat_free);
44428 }
44429 return 0;
44430@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
44431 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
44432 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
44433 ));
44434- ACCESS_ONCE(last->last_sector) = end_sector;
44435- ACCESS_ONCE(last->last_rw) = bi_rw;
44436+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
44437+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
44438 }
44439
44440 rcu_read_lock();
44441diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
44442index f8b37d4..5c5cafd 100644
44443--- a/drivers/md/dm-stripe.c
44444+++ b/drivers/md/dm-stripe.c
44445@@ -21,7 +21,7 @@ struct stripe {
44446 struct dm_dev *dev;
44447 sector_t physical_start;
44448
44449- atomic_t error_count;
44450+ atomic_unchecked_t error_count;
44451 };
44452
44453 struct stripe_c {
44454@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
44455 kfree(sc);
44456 return r;
44457 }
44458- atomic_set(&(sc->stripe[i].error_count), 0);
44459+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
44460 }
44461
44462 ti->private = sc;
44463@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
44464 DMEMIT("%d ", sc->stripes);
44465 for (i = 0; i < sc->stripes; i++) {
44466 DMEMIT("%s ", sc->stripe[i].dev->name);
44467- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
44468+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
44469 'D' : 'A';
44470 }
44471 buffer[i] = '\0';
44472@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
44473 */
44474 for (i = 0; i < sc->stripes; i++)
44475 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
44476- atomic_inc(&(sc->stripe[i].error_count));
44477- if (atomic_read(&(sc->stripe[i].error_count)) <
44478+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
44479+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
44480 DM_IO_ERROR_THRESHOLD)
44481 schedule_work(&sc->trigger_event);
44482 }
44483diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
44484index b2bd1eb..38f7a44 100644
44485--- a/drivers/md/dm-table.c
44486+++ b/drivers/md/dm-table.c
44487@@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
44488 if (!dev_size)
44489 return 0;
44490
44491- if ((start >= dev_size) || (start + len > dev_size)) {
44492+ if ((start >= dev_size) || (len > dev_size - start)) {
44493 DMWARN("%s: %s too small for target: "
44494 "start=%llu, len=%llu, dev_size=%llu",
44495 dm_device_name(ti->table->md), bdevname(bdev, b),
44496diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
44497index e9d33ad..dae9880d 100644
44498--- a/drivers/md/dm-thin-metadata.c
44499+++ b/drivers/md/dm-thin-metadata.c
44500@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44501 {
44502 pmd->info.tm = pmd->tm;
44503 pmd->info.levels = 2;
44504- pmd->info.value_type.context = pmd->data_sm;
44505+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44506 pmd->info.value_type.size = sizeof(__le64);
44507 pmd->info.value_type.inc = data_block_inc;
44508 pmd->info.value_type.dec = data_block_dec;
44509@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44510
44511 pmd->bl_info.tm = pmd->tm;
44512 pmd->bl_info.levels = 1;
44513- pmd->bl_info.value_type.context = pmd->data_sm;
44514+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44515 pmd->bl_info.value_type.size = sizeof(__le64);
44516 pmd->bl_info.value_type.inc = data_block_inc;
44517 pmd->bl_info.value_type.dec = data_block_dec;
44518diff --git a/drivers/md/dm.c b/drivers/md/dm.c
44519index 58f3927..bfbad3e 100644
44520--- a/drivers/md/dm.c
44521+++ b/drivers/md/dm.c
44522@@ -183,9 +183,9 @@ struct mapped_device {
44523 /*
44524 * Event handling.
44525 */
44526- atomic_t event_nr;
44527+ atomic_unchecked_t event_nr;
44528 wait_queue_head_t eventq;
44529- atomic_t uevent_seq;
44530+ atomic_unchecked_t uevent_seq;
44531 struct list_head uevent_list;
44532 spinlock_t uevent_lock; /* Protect access to uevent_list */
44533
44534@@ -2071,8 +2071,8 @@ static struct mapped_device *alloc_dev(int minor)
44535 spin_lock_init(&md->deferred_lock);
44536 atomic_set(&md->holders, 1);
44537 atomic_set(&md->open_count, 0);
44538- atomic_set(&md->event_nr, 0);
44539- atomic_set(&md->uevent_seq, 0);
44540+ atomic_set_unchecked(&md->event_nr, 0);
44541+ atomic_set_unchecked(&md->uevent_seq, 0);
44542 INIT_LIST_HEAD(&md->uevent_list);
44543 INIT_LIST_HEAD(&md->table_devices);
44544 spin_lock_init(&md->uevent_lock);
44545@@ -2228,7 +2228,7 @@ static void event_callback(void *context)
44546
44547 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
44548
44549- atomic_inc(&md->event_nr);
44550+ atomic_inc_unchecked(&md->event_nr);
44551 wake_up(&md->eventq);
44552 }
44553
44554@@ -2921,18 +2921,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
44555
44556 uint32_t dm_next_uevent_seq(struct mapped_device *md)
44557 {
44558- return atomic_add_return(1, &md->uevent_seq);
44559+ return atomic_add_return_unchecked(1, &md->uevent_seq);
44560 }
44561
44562 uint32_t dm_get_event_nr(struct mapped_device *md)
44563 {
44564- return atomic_read(&md->event_nr);
44565+ return atomic_read_unchecked(&md->event_nr);
44566 }
44567
44568 int dm_wait_event(struct mapped_device *md, int event_nr)
44569 {
44570 return wait_event_interruptible(md->eventq,
44571- (event_nr != atomic_read(&md->event_nr)));
44572+ (event_nr != atomic_read_unchecked(&md->event_nr)));
44573 }
44574
44575 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
44576diff --git a/drivers/md/md.c b/drivers/md/md.c
44577index 9233c71..ed5243a 100644
44578--- a/drivers/md/md.c
44579+++ b/drivers/md/md.c
44580@@ -190,10 +190,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
44581 * start build, activate spare
44582 */
44583 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
44584-static atomic_t md_event_count;
44585+static atomic_unchecked_t md_event_count;
44586 void md_new_event(struct mddev *mddev)
44587 {
44588- atomic_inc(&md_event_count);
44589+ atomic_inc_unchecked(&md_event_count);
44590 wake_up(&md_event_waiters);
44591 }
44592 EXPORT_SYMBOL_GPL(md_new_event);
44593@@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
44594 */
44595 static void md_new_event_inintr(struct mddev *mddev)
44596 {
44597- atomic_inc(&md_event_count);
44598+ atomic_inc_unchecked(&md_event_count);
44599 wake_up(&md_event_waiters);
44600 }
44601
44602@@ -1426,7 +1426,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
44603 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
44604 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
44605 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
44606- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44607+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44608
44609 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
44610 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
44611@@ -1677,7 +1677,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
44612 else
44613 sb->resync_offset = cpu_to_le64(0);
44614
44615- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
44616+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
44617
44618 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
44619 sb->size = cpu_to_le64(mddev->dev_sectors);
44620@@ -2547,7 +2547,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
44621 static ssize_t
44622 errors_show(struct md_rdev *rdev, char *page)
44623 {
44624- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
44625+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
44626 }
44627
44628 static ssize_t
44629@@ -2556,7 +2556,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
44630 char *e;
44631 unsigned long n = simple_strtoul(buf, &e, 10);
44632 if (*buf && (*e == 0 || *e == '\n')) {
44633- atomic_set(&rdev->corrected_errors, n);
44634+ atomic_set_unchecked(&rdev->corrected_errors, n);
44635 return len;
44636 }
44637 return -EINVAL;
44638@@ -3000,8 +3000,8 @@ int md_rdev_init(struct md_rdev *rdev)
44639 rdev->sb_loaded = 0;
44640 rdev->bb_page = NULL;
44641 atomic_set(&rdev->nr_pending, 0);
44642- atomic_set(&rdev->read_errors, 0);
44643- atomic_set(&rdev->corrected_errors, 0);
44644+ atomic_set_unchecked(&rdev->read_errors, 0);
44645+ atomic_set_unchecked(&rdev->corrected_errors, 0);
44646
44647 INIT_LIST_HEAD(&rdev->same_set);
44648 init_waitqueue_head(&rdev->blocked_wait);
44649@@ -6855,7 +6855,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
44650
44651 spin_unlock(&pers_lock);
44652 seq_printf(seq, "\n");
44653- seq->poll_event = atomic_read(&md_event_count);
44654+ seq->poll_event = atomic_read_unchecked(&md_event_count);
44655 return 0;
44656 }
44657 if (v == (void*)2) {
44658@@ -6958,7 +6958,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
44659 return error;
44660
44661 seq = file->private_data;
44662- seq->poll_event = atomic_read(&md_event_count);
44663+ seq->poll_event = atomic_read_unchecked(&md_event_count);
44664 return error;
44665 }
44666
44667@@ -6975,7 +6975,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
44668 /* always allow read */
44669 mask = POLLIN | POLLRDNORM;
44670
44671- if (seq->poll_event != atomic_read(&md_event_count))
44672+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
44673 mask |= POLLERR | POLLPRI;
44674 return mask;
44675 }
44676@@ -7022,7 +7022,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
44677 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
44678 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
44679 (int)part_stat_read(&disk->part0, sectors[1]) -
44680- atomic_read(&disk->sync_io);
44681+ atomic_read_unchecked(&disk->sync_io);
44682 /* sync IO will cause sync_io to increase before the disk_stats
44683 * as sync_io is counted when a request starts, and
44684 * disk_stats is counted when it completes.
44685diff --git a/drivers/md/md.h b/drivers/md/md.h
44686index 03cec5b..0a658c1 100644
44687--- a/drivers/md/md.h
44688+++ b/drivers/md/md.h
44689@@ -94,13 +94,13 @@ struct md_rdev {
44690 * only maintained for arrays that
44691 * support hot removal
44692 */
44693- atomic_t read_errors; /* number of consecutive read errors that
44694+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
44695 * we have tried to ignore.
44696 */
44697 struct timespec last_read_error; /* monotonic time since our
44698 * last read error
44699 */
44700- atomic_t corrected_errors; /* number of corrected read errors,
44701+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
44702 * for reporting to userspace and storing
44703 * in superblock.
44704 */
44705@@ -448,7 +448,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
44706
44707 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
44708 {
44709- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44710+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44711 }
44712
44713 struct md_personality
44714diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
44715index f4e22bc..8f83114 100644
44716--- a/drivers/md/persistent-data/dm-space-map-metadata.c
44717+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
44718@@ -681,7 +681,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
44719 * Flick into a mode where all blocks get allocated in the new area.
44720 */
44721 smm->begin = old_len;
44722- memcpy(sm, &bootstrap_ops, sizeof(*sm));
44723+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
44724
44725 /*
44726 * Extend.
44727@@ -712,7 +712,7 @@ out:
44728 /*
44729 * Switch back to normal behaviour.
44730 */
44731- memcpy(sm, &ops, sizeof(*sm));
44732+ memcpy((void *)sm, &ops, sizeof(*sm));
44733 return r;
44734 }
44735
44736diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
44737index 3e6d115..ffecdeb 100644
44738--- a/drivers/md/persistent-data/dm-space-map.h
44739+++ b/drivers/md/persistent-data/dm-space-map.h
44740@@ -71,6 +71,7 @@ struct dm_space_map {
44741 dm_sm_threshold_fn fn,
44742 void *context);
44743 };
44744+typedef struct dm_space_map __no_const dm_space_map_no_const;
44745
44746 /*----------------------------------------------------------------*/
44747
44748diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
44749index 40b35be..a327e11 100644
44750--- a/drivers/md/raid1.c
44751+++ b/drivers/md/raid1.c
44752@@ -1931,7 +1931,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
44753 if (r1_sync_page_io(rdev, sect, s,
44754 bio->bi_io_vec[idx].bv_page,
44755 READ) != 0)
44756- atomic_add(s, &rdev->corrected_errors);
44757+ atomic_add_unchecked(s, &rdev->corrected_errors);
44758 }
44759 sectors -= s;
44760 sect += s;
44761@@ -2164,7 +2164,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
44762 !test_bit(Faulty, &rdev->flags)) {
44763 if (r1_sync_page_io(rdev, sect, s,
44764 conf->tmppage, READ)) {
44765- atomic_add(s, &rdev->corrected_errors);
44766+ atomic_add_unchecked(s, &rdev->corrected_errors);
44767 printk(KERN_INFO
44768 "md/raid1:%s: read error corrected "
44769 "(%d sectors at %llu on %s)\n",
44770diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
44771index 32e282f..5cec803 100644
44772--- a/drivers/md/raid10.c
44773+++ b/drivers/md/raid10.c
44774@@ -1944,7 +1944,7 @@ static void end_sync_read(struct bio *bio, int error)
44775 /* The write handler will notice the lack of
44776 * R10BIO_Uptodate and record any errors etc
44777 */
44778- atomic_add(r10_bio->sectors,
44779+ atomic_add_unchecked(r10_bio->sectors,
44780 &conf->mirrors[d].rdev->corrected_errors);
44781
44782 /* for reconstruct, we always reschedule after a read.
44783@@ -2301,7 +2301,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44784 {
44785 struct timespec cur_time_mon;
44786 unsigned long hours_since_last;
44787- unsigned int read_errors = atomic_read(&rdev->read_errors);
44788+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
44789
44790 ktime_get_ts(&cur_time_mon);
44791
44792@@ -2323,9 +2323,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44793 * overflowing the shift of read_errors by hours_since_last.
44794 */
44795 if (hours_since_last >= 8 * sizeof(read_errors))
44796- atomic_set(&rdev->read_errors, 0);
44797+ atomic_set_unchecked(&rdev->read_errors, 0);
44798 else
44799- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
44800+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
44801 }
44802
44803 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
44804@@ -2379,8 +2379,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44805 return;
44806
44807 check_decay_read_errors(mddev, rdev);
44808- atomic_inc(&rdev->read_errors);
44809- if (atomic_read(&rdev->read_errors) > max_read_errors) {
44810+ atomic_inc_unchecked(&rdev->read_errors);
44811+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
44812 char b[BDEVNAME_SIZE];
44813 bdevname(rdev->bdev, b);
44814
44815@@ -2388,7 +2388,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44816 "md/raid10:%s: %s: Raid device exceeded "
44817 "read_error threshold [cur %d:max %d]\n",
44818 mdname(mddev), b,
44819- atomic_read(&rdev->read_errors), max_read_errors);
44820+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
44821 printk(KERN_NOTICE
44822 "md/raid10:%s: %s: Failing raid device\n",
44823 mdname(mddev), b);
44824@@ -2543,7 +2543,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44825 sect +
44826 choose_data_offset(r10_bio, rdev)),
44827 bdevname(rdev->bdev, b));
44828- atomic_add(s, &rdev->corrected_errors);
44829+ atomic_add_unchecked(s, &rdev->corrected_errors);
44830 }
44831
44832 rdev_dec_pending(rdev, mddev);
44833diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
44834index 9c66e59..42a8eac 100644
44835--- a/drivers/md/raid5.c
44836+++ b/drivers/md/raid5.c
44837@@ -1730,6 +1730,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
44838 return 1;
44839 }
44840
44841+#ifdef CONFIG_GRKERNSEC_HIDESYM
44842+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
44843+#endif
44844+
44845 static int grow_stripes(struct r5conf *conf, int num)
44846 {
44847 struct kmem_cache *sc;
44848@@ -1741,7 +1745,11 @@ static int grow_stripes(struct r5conf *conf, int num)
44849 "raid%d-%s", conf->level, mdname(conf->mddev));
44850 else
44851 sprintf(conf->cache_name[0],
44852+#ifdef CONFIG_GRKERNSEC_HIDESYM
44853+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
44854+#else
44855 "raid%d-%p", conf->level, conf->mddev);
44856+#endif
44857 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
44858
44859 conf->active_name = 0;
44860@@ -2017,21 +2025,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
44861 mdname(conf->mddev), STRIPE_SECTORS,
44862 (unsigned long long)s,
44863 bdevname(rdev->bdev, b));
44864- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
44865+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
44866 clear_bit(R5_ReadError, &sh->dev[i].flags);
44867 clear_bit(R5_ReWrite, &sh->dev[i].flags);
44868 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
44869 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
44870
44871- if (atomic_read(&rdev->read_errors))
44872- atomic_set(&rdev->read_errors, 0);
44873+ if (atomic_read_unchecked(&rdev->read_errors))
44874+ atomic_set_unchecked(&rdev->read_errors, 0);
44875 } else {
44876 const char *bdn = bdevname(rdev->bdev, b);
44877 int retry = 0;
44878 int set_bad = 0;
44879
44880 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
44881- atomic_inc(&rdev->read_errors);
44882+ atomic_inc_unchecked(&rdev->read_errors);
44883 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
44884 printk_ratelimited(
44885 KERN_WARNING
44886@@ -2059,7 +2067,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
44887 mdname(conf->mddev),
44888 (unsigned long long)s,
44889 bdn);
44890- } else if (atomic_read(&rdev->read_errors)
44891+ } else if (atomic_read_unchecked(&rdev->read_errors)
44892 > conf->max_nr_stripes)
44893 printk(KERN_WARNING
44894 "md/raid:%s: Too many read errors, failing device %s.\n",
44895diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
44896index 983db75..ef9248c 100644
44897--- a/drivers/media/dvb-core/dvbdev.c
44898+++ b/drivers/media/dvb-core/dvbdev.c
44899@@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
44900 const struct dvb_device *template, void *priv, int type)
44901 {
44902 struct dvb_device *dvbdev;
44903- struct file_operations *dvbdevfops;
44904+ file_operations_no_const *dvbdevfops;
44905 struct device *clsdev;
44906 int minor;
44907 int id;
44908diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
44909index 6ad22b6..6e90e2a 100644
44910--- a/drivers/media/dvb-frontends/af9033.h
44911+++ b/drivers/media/dvb-frontends/af9033.h
44912@@ -96,6 +96,6 @@ struct af9033_ops {
44913 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
44914 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
44915 int onoff);
44916-};
44917+} __no_const;
44918
44919 #endif /* AF9033_H */
44920diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
44921index 9b6c3bb..baeb5c7 100644
44922--- a/drivers/media/dvb-frontends/dib3000.h
44923+++ b/drivers/media/dvb-frontends/dib3000.h
44924@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
44925 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
44926 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
44927 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
44928-};
44929+} __no_const;
44930
44931 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
44932 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
44933diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
44934index 1fea0e9..321ce8f 100644
44935--- a/drivers/media/dvb-frontends/dib7000p.h
44936+++ b/drivers/media/dvb-frontends/dib7000p.h
44937@@ -64,7 +64,7 @@ struct dib7000p_ops {
44938 int (*get_adc_power)(struct dvb_frontend *fe);
44939 int (*slave_reset)(struct dvb_frontend *fe);
44940 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
44941-};
44942+} __no_const;
44943
44944 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
44945 void *dib7000p_attach(struct dib7000p_ops *ops);
44946diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
44947index 84cc103..5780c54 100644
44948--- a/drivers/media/dvb-frontends/dib8000.h
44949+++ b/drivers/media/dvb-frontends/dib8000.h
44950@@ -61,7 +61,7 @@ struct dib8000_ops {
44951 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
44952 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
44953 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
44954-};
44955+} __no_const;
44956
44957 #if IS_ENABLED(CONFIG_DVB_DIB8000)
44958 void *dib8000_attach(struct dib8000_ops *ops);
44959diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
44960index ce27e6d..b70435a 100644
44961--- a/drivers/media/pci/cx88/cx88-video.c
44962+++ b/drivers/media/pci/cx88/cx88-video.c
44963@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
44964
44965 /* ------------------------------------------------------------------ */
44966
44967-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44968-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44969-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44970+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44971+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44972+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44973
44974 module_param_array(video_nr, int, NULL, 0444);
44975 module_param_array(vbi_nr, int, NULL, 0444);
44976diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
44977index 802642d..5534900 100644
44978--- a/drivers/media/pci/ivtv/ivtv-driver.c
44979+++ b/drivers/media/pci/ivtv/ivtv-driver.c
44980@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
44981 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
44982
44983 /* ivtv instance counter */
44984-static atomic_t ivtv_instance = ATOMIC_INIT(0);
44985+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
44986
44987 /* Parameter declarations */
44988 static int cardtype[IVTV_MAX_CARDS];
44989diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
44990index 8cbe6b4..ea3601c 100644
44991--- a/drivers/media/pci/solo6x10/solo6x10-core.c
44992+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
44993@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
44994
44995 static int solo_sysfs_init(struct solo_dev *solo_dev)
44996 {
44997- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
44998+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
44999 struct device *dev = &solo_dev->dev;
45000 const char *driver;
45001 int i;
45002diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
45003index c7141f2..5301fec 100644
45004--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
45005+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
45006@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
45007
45008 int solo_g723_init(struct solo_dev *solo_dev)
45009 {
45010- static struct snd_device_ops ops = { NULL };
45011+ static struct snd_device_ops ops = { };
45012 struct snd_card *card;
45013 struct snd_kcontrol_new kctl;
45014 char name[32];
45015diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45016index 8c84846..27b4f83 100644
45017--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
45018+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45019@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
45020
45021 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
45022 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
45023- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
45024+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
45025 if (p2m_id < 0)
45026 p2m_id = -p2m_id;
45027 }
45028diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
45029index 72017b7..dd37ae6 100644
45030--- a/drivers/media/pci/solo6x10/solo6x10.h
45031+++ b/drivers/media/pci/solo6x10/solo6x10.h
45032@@ -219,7 +219,7 @@ struct solo_dev {
45033
45034 /* P2M DMA Engine */
45035 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
45036- atomic_t p2m_count;
45037+ atomic_unchecked_t p2m_count;
45038 int p2m_jiffies;
45039 unsigned int p2m_timeouts;
45040
45041diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
45042index 63f0b64..a017c1c 100644
45043--- a/drivers/media/pci/tw68/tw68-core.c
45044+++ b/drivers/media/pci/tw68/tw68-core.c
45045@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
45046 module_param_array(card, int, NULL, 0444);
45047 MODULE_PARM_DESC(card, "card type");
45048
45049-static atomic_t tw68_instance = ATOMIC_INIT(0);
45050+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
45051
45052 /* ------------------------------------------------------------------ */
45053
45054diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
45055index 64ab6fb..ef4a8b9 100644
45056--- a/drivers/media/platform/omap/omap_vout.c
45057+++ b/drivers/media/platform/omap/omap_vout.c
45058@@ -63,7 +63,6 @@ enum omap_vout_channels {
45059 OMAP_VIDEO2,
45060 };
45061
45062-static struct videobuf_queue_ops video_vbq_ops;
45063 /* Variables configurable through module params*/
45064 static u32 video1_numbuffers = 3;
45065 static u32 video2_numbuffers = 3;
45066@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
45067 {
45068 struct videobuf_queue *q;
45069 struct omap_vout_device *vout = NULL;
45070+ static struct videobuf_queue_ops video_vbq_ops = {
45071+ .buf_setup = omap_vout_buffer_setup,
45072+ .buf_prepare = omap_vout_buffer_prepare,
45073+ .buf_release = omap_vout_buffer_release,
45074+ .buf_queue = omap_vout_buffer_queue,
45075+ };
45076
45077 vout = video_drvdata(file);
45078 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
45079@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
45080 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
45081
45082 q = &vout->vbq;
45083- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
45084- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
45085- video_vbq_ops.buf_release = omap_vout_buffer_release;
45086- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
45087 spin_lock_init(&vout->vbq_lock);
45088
45089 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
45090diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
45091index fb2acc5..a2fcbdc4 100644
45092--- a/drivers/media/platform/s5p-tv/mixer.h
45093+++ b/drivers/media/platform/s5p-tv/mixer.h
45094@@ -156,7 +156,7 @@ struct mxr_layer {
45095 /** layer index (unique identifier) */
45096 int idx;
45097 /** callbacks for layer methods */
45098- struct mxr_layer_ops ops;
45099+ struct mxr_layer_ops *ops;
45100 /** format array */
45101 const struct mxr_format **fmt_array;
45102 /** size of format array */
45103diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45104index 74344c7..a39e70e 100644
45105--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45106+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45107@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
45108 {
45109 struct mxr_layer *layer;
45110 int ret;
45111- struct mxr_layer_ops ops = {
45112+ static struct mxr_layer_ops ops = {
45113 .release = mxr_graph_layer_release,
45114 .buffer_set = mxr_graph_buffer_set,
45115 .stream_set = mxr_graph_stream_set,
45116diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
45117index b713403..53cb5ad 100644
45118--- a/drivers/media/platform/s5p-tv/mixer_reg.c
45119+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
45120@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
45121 layer->update_buf = next;
45122 }
45123
45124- layer->ops.buffer_set(layer, layer->update_buf);
45125+ layer->ops->buffer_set(layer, layer->update_buf);
45126
45127 if (done && done != layer->shadow_buf)
45128 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
45129diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
45130index b4d2696..91df48e 100644
45131--- a/drivers/media/platform/s5p-tv/mixer_video.c
45132+++ b/drivers/media/platform/s5p-tv/mixer_video.c
45133@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
45134 layer->geo.src.height = layer->geo.src.full_height;
45135
45136 mxr_geometry_dump(mdev, &layer->geo);
45137- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45138+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45139 mxr_geometry_dump(mdev, &layer->geo);
45140 }
45141
45142@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
45143 layer->geo.dst.full_width = mbus_fmt.width;
45144 layer->geo.dst.full_height = mbus_fmt.height;
45145 layer->geo.dst.field = mbus_fmt.field;
45146- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45147+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45148
45149 mxr_geometry_dump(mdev, &layer->geo);
45150 }
45151@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
45152 /* set source size to highest accepted value */
45153 geo->src.full_width = max(geo->dst.full_width, pix->width);
45154 geo->src.full_height = max(geo->dst.full_height, pix->height);
45155- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45156+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45157 mxr_geometry_dump(mdev, &layer->geo);
45158 /* set cropping to total visible screen */
45159 geo->src.width = pix->width;
45160@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
45161 geo->src.x_offset = 0;
45162 geo->src.y_offset = 0;
45163 /* assure consistency of geometry */
45164- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45165+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45166 mxr_geometry_dump(mdev, &layer->geo);
45167 /* set full size to lowest possible value */
45168 geo->src.full_width = 0;
45169 geo->src.full_height = 0;
45170- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45171+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45172 mxr_geometry_dump(mdev, &layer->geo);
45173
45174 /* returning results */
45175@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
45176 target->width = s->r.width;
45177 target->height = s->r.height;
45178
45179- layer->ops.fix_geometry(layer, stage, s->flags);
45180+ layer->ops->fix_geometry(layer, stage, s->flags);
45181
45182 /* retrieve update selection rectangle */
45183 res.left = target->x_offset;
45184@@ -954,13 +954,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
45185 mxr_output_get(mdev);
45186
45187 mxr_layer_update_output(layer);
45188- layer->ops.format_set(layer);
45189+ layer->ops->format_set(layer);
45190 /* enabling layer in hardware */
45191 spin_lock_irqsave(&layer->enq_slock, flags);
45192 layer->state = MXR_LAYER_STREAMING;
45193 spin_unlock_irqrestore(&layer->enq_slock, flags);
45194
45195- layer->ops.stream_set(layer, MXR_ENABLE);
45196+ layer->ops->stream_set(layer, MXR_ENABLE);
45197 mxr_streamer_get(mdev);
45198
45199 return 0;
45200@@ -1030,7 +1030,7 @@ static void stop_streaming(struct vb2_queue *vq)
45201 spin_unlock_irqrestore(&layer->enq_slock, flags);
45202
45203 /* disabling layer in hardware */
45204- layer->ops.stream_set(layer, MXR_DISABLE);
45205+ layer->ops->stream_set(layer, MXR_DISABLE);
45206 /* remove one streamer */
45207 mxr_streamer_put(mdev);
45208 /* allow changes in output configuration */
45209@@ -1068,8 +1068,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
45210
45211 void mxr_layer_release(struct mxr_layer *layer)
45212 {
45213- if (layer->ops.release)
45214- layer->ops.release(layer);
45215+ if (layer->ops->release)
45216+ layer->ops->release(layer);
45217 }
45218
45219 void mxr_base_layer_release(struct mxr_layer *layer)
45220@@ -1095,7 +1095,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
45221
45222 layer->mdev = mdev;
45223 layer->idx = idx;
45224- layer->ops = *ops;
45225+ layer->ops = ops;
45226
45227 spin_lock_init(&layer->enq_slock);
45228 INIT_LIST_HEAD(&layer->enq_list);
45229diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45230index c9388c4..ce71ece 100644
45231--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45232+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45233@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
45234 {
45235 struct mxr_layer *layer;
45236 int ret;
45237- struct mxr_layer_ops ops = {
45238+ static struct mxr_layer_ops ops = {
45239 .release = mxr_vp_layer_release,
45240 .buffer_set = mxr_vp_buffer_set,
45241 .stream_set = mxr_vp_stream_set,
45242diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
45243index 82affae..42833ec 100644
45244--- a/drivers/media/radio/radio-cadet.c
45245+++ b/drivers/media/radio/radio-cadet.c
45246@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45247 unsigned char readbuf[RDS_BUFFER];
45248 int i = 0;
45249
45250+ if (count > RDS_BUFFER)
45251+ return -EFAULT;
45252 mutex_lock(&dev->lock);
45253 if (dev->rdsstat == 0)
45254 cadet_start_rds(dev);
45255@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45256 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
45257 mutex_unlock(&dev->lock);
45258
45259- if (i && copy_to_user(data, readbuf, i))
45260- return -EFAULT;
45261+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
45262+ i = -EFAULT;
45263+
45264 return i;
45265 }
45266
45267diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
45268index 5236035..c622c74 100644
45269--- a/drivers/media/radio/radio-maxiradio.c
45270+++ b/drivers/media/radio/radio-maxiradio.c
45271@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
45272 /* TEA5757 pin mappings */
45273 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
45274
45275-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
45276+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
45277
45278 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
45279 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
45280diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
45281index 050b3bb..79f62b9 100644
45282--- a/drivers/media/radio/radio-shark.c
45283+++ b/drivers/media/radio/radio-shark.c
45284@@ -79,7 +79,7 @@ struct shark_device {
45285 u32 last_val;
45286 };
45287
45288-static atomic_t shark_instance = ATOMIC_INIT(0);
45289+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45290
45291 static void shark_write_val(struct snd_tea575x *tea, u32 val)
45292 {
45293diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
45294index 8654e0d..0608a64 100644
45295--- a/drivers/media/radio/radio-shark2.c
45296+++ b/drivers/media/radio/radio-shark2.c
45297@@ -74,7 +74,7 @@ struct shark_device {
45298 u8 *transfer_buffer;
45299 };
45300
45301-static atomic_t shark_instance = ATOMIC_INIT(0);
45302+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45303
45304 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
45305 {
45306diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
45307index 633022b..7f10754 100644
45308--- a/drivers/media/radio/radio-si476x.c
45309+++ b/drivers/media/radio/radio-si476x.c
45310@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
45311 struct si476x_radio *radio;
45312 struct v4l2_ctrl *ctrl;
45313
45314- static atomic_t instance = ATOMIC_INIT(0);
45315+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
45316
45317 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
45318 if (!radio)
45319diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45320index 9fd1527..8927230 100644
45321--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
45322+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45323@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
45324
45325 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
45326 {
45327- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
45328- char result[64];
45329- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
45330- sizeof(result), 0);
45331+ char *buf;
45332+ char *result;
45333+ int retval;
45334+
45335+ buf = kmalloc(2, GFP_KERNEL);
45336+ if (buf == NULL)
45337+ return -ENOMEM;
45338+ result = kmalloc(64, GFP_KERNEL);
45339+ if (result == NULL) {
45340+ kfree(buf);
45341+ return -ENOMEM;
45342+ }
45343+
45344+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
45345+ buf[1] = enable ? 1 : 0;
45346+
45347+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
45348+
45349+ kfree(buf);
45350+ kfree(result);
45351+ return retval;
45352 }
45353
45354 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
45355 {
45356- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
45357- char state[3];
45358- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
45359+ char *buf;
45360+ char *state;
45361+ int retval;
45362+
45363+ buf = kmalloc(2, GFP_KERNEL);
45364+ if (buf == NULL)
45365+ return -ENOMEM;
45366+ state = kmalloc(3, GFP_KERNEL);
45367+ if (state == NULL) {
45368+ kfree(buf);
45369+ return -ENOMEM;
45370+ }
45371+
45372+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
45373+ buf[1] = enable ? 1 : 0;
45374+
45375+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
45376+
45377+ kfree(buf);
45378+ kfree(state);
45379+ return retval;
45380 }
45381
45382 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45383 {
45384- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
45385- char state[3];
45386+ char *query;
45387+ char *state;
45388 int ret;
45389+ query = kmalloc(1, GFP_KERNEL);
45390+ if (query == NULL)
45391+ return -ENOMEM;
45392+ state = kmalloc(3, GFP_KERNEL);
45393+ if (state == NULL) {
45394+ kfree(query);
45395+ return -ENOMEM;
45396+ }
45397+
45398+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
45399
45400 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
45401
45402- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
45403- sizeof(state), 0);
45404+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
45405 if (ret < 0) {
45406 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
45407 "state info\n");
45408@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45409
45410 /* Copy this pointer as we are gonna need it in the release phase */
45411 cinergyt2_usb_device = adap->dev;
45412-
45413+ kfree(query);
45414+ kfree(state);
45415 return 0;
45416 }
45417
45418@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
45419 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45420 {
45421 struct cinergyt2_state *st = d->priv;
45422- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
45423+ u8 *key, *cmd;
45424 int i;
45425
45426+ cmd = kmalloc(1, GFP_KERNEL);
45427+ if (cmd == NULL)
45428+ return -EINVAL;
45429+ key = kzalloc(5, GFP_KERNEL);
45430+ if (key == NULL) {
45431+ kfree(cmd);
45432+ return -EINVAL;
45433+ }
45434+
45435+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
45436+
45437 *state = REMOTE_NO_KEY_PRESSED;
45438
45439- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
45440+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
45441 if (key[4] == 0xff) {
45442 /* key repeat */
45443 st->rc_counter++;
45444@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45445 *event = d->last_event;
45446 deb_rc("repeat key, event %x\n",
45447 *event);
45448- return 0;
45449+ goto out;
45450 }
45451 }
45452 deb_rc("repeated key (non repeatable)\n");
45453 }
45454- return 0;
45455+ goto out;
45456 }
45457
45458 /* hack to pass checksum on the custom field */
45459@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45460
45461 deb_rc("key: %*ph\n", 5, key);
45462 }
45463+out:
45464+ kfree(cmd);
45465+ kfree(key);
45466 return 0;
45467 }
45468
45469diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45470index c890fe4..f9b2ae6 100644
45471--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45472+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45473@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
45474 fe_status_t *status)
45475 {
45476 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45477- struct dvbt_get_status_msg result;
45478- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45479+ struct dvbt_get_status_msg *result;
45480+ u8 *cmd;
45481 int ret;
45482
45483- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
45484- sizeof(result), 0);
45485+ cmd = kmalloc(1, GFP_KERNEL);
45486+ if (cmd == NULL)
45487+ return -ENOMEM;
45488+ result = kmalloc(sizeof(*result), GFP_KERNEL);
45489+ if (result == NULL) {
45490+ kfree(cmd);
45491+ return -ENOMEM;
45492+ }
45493+
45494+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45495+
45496+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
45497+ sizeof(*result), 0);
45498 if (ret < 0)
45499- return ret;
45500+ goto out;
45501
45502 *status = 0;
45503
45504- if (0xffff - le16_to_cpu(result.gain) > 30)
45505+ if (0xffff - le16_to_cpu(result->gain) > 30)
45506 *status |= FE_HAS_SIGNAL;
45507- if (result.lock_bits & (1 << 6))
45508+ if (result->lock_bits & (1 << 6))
45509 *status |= FE_HAS_LOCK;
45510- if (result.lock_bits & (1 << 5))
45511+ if (result->lock_bits & (1 << 5))
45512 *status |= FE_HAS_SYNC;
45513- if (result.lock_bits & (1 << 4))
45514+ if (result->lock_bits & (1 << 4))
45515 *status |= FE_HAS_CARRIER;
45516- if (result.lock_bits & (1 << 1))
45517+ if (result->lock_bits & (1 << 1))
45518 *status |= FE_HAS_VITERBI;
45519
45520 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
45521 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
45522 *status &= ~FE_HAS_LOCK;
45523
45524- return 0;
45525+out:
45526+ kfree(cmd);
45527+ kfree(result);
45528+ return ret;
45529 }
45530
45531 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
45532 {
45533 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45534- struct dvbt_get_status_msg status;
45535- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45536+ struct dvbt_get_status_msg *status;
45537+ char *cmd;
45538 int ret;
45539
45540- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45541- sizeof(status), 0);
45542+ cmd = kmalloc(1, GFP_KERNEL);
45543+ if (cmd == NULL)
45544+ return -ENOMEM;
45545+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45546+ if (status == NULL) {
45547+ kfree(cmd);
45548+ return -ENOMEM;
45549+ }
45550+
45551+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45552+
45553+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45554+ sizeof(*status), 0);
45555 if (ret < 0)
45556- return ret;
45557+ goto out;
45558
45559- *ber = le32_to_cpu(status.viterbi_error_rate);
45560+ *ber = le32_to_cpu(status->viterbi_error_rate);
45561+out:
45562+ kfree(cmd);
45563+ kfree(status);
45564 return 0;
45565 }
45566
45567 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
45568 {
45569 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45570- struct dvbt_get_status_msg status;
45571- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45572+ struct dvbt_get_status_msg *status;
45573+ u8 *cmd;
45574 int ret;
45575
45576- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
45577- sizeof(status), 0);
45578+ cmd = kmalloc(1, GFP_KERNEL);
45579+ if (cmd == NULL)
45580+ return -ENOMEM;
45581+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45582+ if (status == NULL) {
45583+ kfree(cmd);
45584+ return -ENOMEM;
45585+ }
45586+
45587+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45588+
45589+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
45590+ sizeof(*status), 0);
45591 if (ret < 0) {
45592 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
45593 ret);
45594- return ret;
45595+ goto out;
45596 }
45597- *unc = le32_to_cpu(status.uncorrected_block_count);
45598- return 0;
45599+ *unc = le32_to_cpu(status->uncorrected_block_count);
45600+
45601+out:
45602+ kfree(cmd);
45603+ kfree(status);
45604+ return ret;
45605 }
45606
45607 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
45608 u16 *strength)
45609 {
45610 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45611- struct dvbt_get_status_msg status;
45612- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45613+ struct dvbt_get_status_msg *status;
45614+ char *cmd;
45615 int ret;
45616
45617- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45618- sizeof(status), 0);
45619+ cmd = kmalloc(1, GFP_KERNEL);
45620+ if (cmd == NULL)
45621+ return -ENOMEM;
45622+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45623+ if (status == NULL) {
45624+ kfree(cmd);
45625+ return -ENOMEM;
45626+ }
45627+
45628+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45629+
45630+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45631+ sizeof(*status), 0);
45632 if (ret < 0) {
45633 err("cinergyt2_fe_read_signal_strength() Failed!"
45634 " (Error=%d)\n", ret);
45635- return ret;
45636+ goto out;
45637 }
45638- *strength = (0xffff - le16_to_cpu(status.gain));
45639+ *strength = (0xffff - le16_to_cpu(status->gain));
45640+
45641+out:
45642+ kfree(cmd);
45643+ kfree(status);
45644 return 0;
45645 }
45646
45647 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
45648 {
45649 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45650- struct dvbt_get_status_msg status;
45651- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45652+ struct dvbt_get_status_msg *status;
45653+ char *cmd;
45654 int ret;
45655
45656- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45657- sizeof(status), 0);
45658+ cmd = kmalloc(1, GFP_KERNEL);
45659+ if (cmd == NULL)
45660+ return -ENOMEM;
45661+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45662+ if (status == NULL) {
45663+ kfree(cmd);
45664+ return -ENOMEM;
45665+ }
45666+
45667+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45668+
45669+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45670+ sizeof(*status), 0);
45671 if (ret < 0) {
45672 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
45673- return ret;
45674+ goto out;
45675 }
45676- *snr = (status.snr << 8) | status.snr;
45677- return 0;
45678+ *snr = (status->snr << 8) | status->snr;
45679+
45680+out:
45681+ kfree(cmd);
45682+ kfree(status);
45683+ return ret;
45684 }
45685
45686 static int cinergyt2_fe_init(struct dvb_frontend *fe)
45687@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
45688 {
45689 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
45690 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45691- struct dvbt_set_parameters_msg param;
45692- char result[2];
45693+ struct dvbt_set_parameters_msg *param;
45694+ char *result;
45695 int err;
45696
45697- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45698- param.tps = cpu_to_le16(compute_tps(fep));
45699- param.freq = cpu_to_le32(fep->frequency / 1000);
45700- param.flags = 0;
45701+ result = kmalloc(2, GFP_KERNEL);
45702+ if (result == NULL)
45703+ return -ENOMEM;
45704+ param = kmalloc(sizeof(*param), GFP_KERNEL);
45705+ if (param == NULL) {
45706+ kfree(result);
45707+ return -ENOMEM;
45708+ }
45709+
45710+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45711+ param->tps = cpu_to_le16(compute_tps(fep));
45712+ param->freq = cpu_to_le32(fep->frequency / 1000);
45713+ param->flags = 0;
45714
45715 switch (fep->bandwidth_hz) {
45716 default:
45717 case 8000000:
45718- param.bandwidth = 8;
45719+ param->bandwidth = 8;
45720 break;
45721 case 7000000:
45722- param.bandwidth = 7;
45723+ param->bandwidth = 7;
45724 break;
45725 case 6000000:
45726- param.bandwidth = 6;
45727+ param->bandwidth = 6;
45728 break;
45729 }
45730
45731 err = dvb_usb_generic_rw(state->d,
45732- (char *)&param, sizeof(param),
45733- result, sizeof(result), 0);
45734+ (char *)param, sizeof(*param),
45735+ result, 2, 0);
45736 if (err < 0)
45737 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
45738
45739- return (err < 0) ? err : 0;
45740+ kfree(result);
45741+ kfree(param);
45742+ return err;
45743 }
45744
45745 static void cinergyt2_fe_release(struct dvb_frontend *fe)
45746diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45747index 733a7ff..f8b52e3 100644
45748--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45749+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45750@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
45751
45752 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
45753 {
45754- struct hexline hx;
45755- u8 reset;
45756+ struct hexline *hx;
45757+ u8 *reset;
45758 int ret,pos=0;
45759
45760+ reset = kmalloc(1, GFP_KERNEL);
45761+ if (reset == NULL)
45762+ return -ENOMEM;
45763+
45764+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
45765+ if (hx == NULL) {
45766+ kfree(reset);
45767+ return -ENOMEM;
45768+ }
45769+
45770 /* stop the CPU */
45771- reset = 1;
45772- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
45773+ reset[0] = 1;
45774+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
45775 err("could not stop the USB controller CPU.");
45776
45777- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
45778- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
45779- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
45780+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
45781+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
45782+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
45783
45784- if (ret != hx.len) {
45785+ if (ret != hx->len) {
45786 err("error while transferring firmware "
45787 "(transferred size: %d, block size: %d)",
45788- ret,hx.len);
45789+ ret,hx->len);
45790 ret = -EINVAL;
45791 break;
45792 }
45793 }
45794 if (ret < 0) {
45795 err("firmware download failed at %d with %d",pos,ret);
45796+ kfree(reset);
45797+ kfree(hx);
45798 return ret;
45799 }
45800
45801 if (ret == 0) {
45802 /* restart the CPU */
45803- reset = 0;
45804- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
45805+ reset[0] = 0;
45806+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
45807 err("could not restart the USB controller CPU.");
45808 ret = -EINVAL;
45809 }
45810 } else
45811 ret = -EIO;
45812
45813+ kfree(reset);
45814+ kfree(hx);
45815+
45816 return ret;
45817 }
45818 EXPORT_SYMBOL(usb_cypress_load_firmware);
45819diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
45820index 1a3df10..57997a5 100644
45821--- a/drivers/media/usb/dvb-usb/dw2102.c
45822+++ b/drivers/media/usb/dvb-usb/dw2102.c
45823@@ -118,7 +118,7 @@ struct su3000_state {
45824
45825 struct s6x0_state {
45826 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
45827-};
45828+} __no_const;
45829
45830 /* debug */
45831 static int dvb_usb_dw2102_debug;
45832diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
45833index 6b0b8b6b..4038398 100644
45834--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
45835+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
45836@@ -87,8 +87,11 @@ struct technisat_usb2_state {
45837 static int technisat_usb2_i2c_access(struct usb_device *udev,
45838 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
45839 {
45840- u8 b[64];
45841- int ret, actual_length;
45842+ u8 *b = kmalloc(64, GFP_KERNEL);
45843+ int ret, actual_length, error = 0;
45844+
45845+ if (b == NULL)
45846+ return -ENOMEM;
45847
45848 deb_i2c("i2c-access: %02x, tx: ", device_addr);
45849 debug_dump(tx, txlen, deb_i2c);
45850@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45851
45852 if (ret < 0) {
45853 err("i2c-error: out failed %02x = %d", device_addr, ret);
45854- return -ENODEV;
45855+ error = -ENODEV;
45856+ goto out;
45857 }
45858
45859 ret = usb_bulk_msg(udev,
45860@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45861 b, 64, &actual_length, 1000);
45862 if (ret < 0) {
45863 err("i2c-error: in failed %02x = %d", device_addr, ret);
45864- return -ENODEV;
45865+ error = -ENODEV;
45866+ goto out;
45867 }
45868
45869 if (b[0] != I2C_STATUS_OK) {
45870@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45871 /* handle tuner-i2c-nak */
45872 if (!(b[0] == I2C_STATUS_NAK &&
45873 device_addr == 0x60
45874- /* && device_is_technisat_usb2 */))
45875- return -ENODEV;
45876+ /* && device_is_technisat_usb2 */)) {
45877+ error = -ENODEV;
45878+ goto out;
45879+ }
45880 }
45881
45882 deb_i2c("status: %d, ", b[0]);
45883@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45884
45885 deb_i2c("\n");
45886
45887- return 0;
45888+out:
45889+ kfree(b);
45890+ return error;
45891 }
45892
45893 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
45894@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
45895 {
45896 int ret;
45897
45898- u8 led[8] = {
45899- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
45900- 0
45901- };
45902+ u8 *led = kzalloc(8, GFP_KERNEL);
45903+
45904+ if (led == NULL)
45905+ return -ENOMEM;
45906
45907 if (disable_led_control && state != TECH_LED_OFF)
45908 return 0;
45909
45910+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
45911+
45912 switch (state) {
45913 case TECH_LED_ON:
45914 led[1] = 0x82;
45915@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
45916 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
45917 USB_TYPE_VENDOR | USB_DIR_OUT,
45918 0, 0,
45919- led, sizeof(led), 500);
45920+ led, 8, 500);
45921
45922 mutex_unlock(&d->i2c_mutex);
45923+
45924+ kfree(led);
45925+
45926 return ret;
45927 }
45928
45929 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
45930 {
45931 int ret;
45932- u8 b = 0;
45933+ u8 *b = kzalloc(1, GFP_KERNEL);
45934+
45935+ if (b == NULL)
45936+ return -ENOMEM;
45937
45938 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
45939 return -EAGAIN;
45940@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
45941 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
45942 USB_TYPE_VENDOR | USB_DIR_OUT,
45943 (red << 8) | green, 0,
45944- &b, 1, 500);
45945+ b, 1, 500);
45946
45947 mutex_unlock(&d->i2c_mutex);
45948
45949+ kfree(b);
45950+
45951 return ret;
45952 }
45953
45954@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
45955 struct dvb_usb_device_description **desc, int *cold)
45956 {
45957 int ret;
45958- u8 version[3];
45959+ u8 *version = kmalloc(3, GFP_KERNEL);
45960
45961 /* first select the interface */
45962 if (usb_set_interface(udev, 0, 1) != 0)
45963@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
45964
45965 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
45966
45967+ if (version == NULL)
45968+ return 0;
45969+
45970 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
45971 GET_VERSION_INFO_VENDOR_REQUEST,
45972 USB_TYPE_VENDOR | USB_DIR_IN,
45973 0, 0,
45974- version, sizeof(version), 500);
45975+ version, 3, 500);
45976
45977 if (ret < 0)
45978 *cold = 1;
45979@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
45980 *cold = 0;
45981 }
45982
45983+ kfree(version);
45984+
45985 return 0;
45986 }
45987
45988@@ -591,10 +615,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
45989
45990 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
45991 {
45992- u8 buf[62], *b;
45993+ u8 *buf, *b;
45994 int ret;
45995 struct ir_raw_event ev;
45996
45997+ buf = kmalloc(62, GFP_KERNEL);
45998+
45999+ if (buf == NULL)
46000+ return -ENOMEM;
46001+
46002 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
46003 buf[1] = 0x08;
46004 buf[2] = 0x8f;
46005@@ -617,16 +646,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46006 GET_IR_DATA_VENDOR_REQUEST,
46007 USB_TYPE_VENDOR | USB_DIR_IN,
46008 0x8080, 0,
46009- buf, sizeof(buf), 500);
46010+ buf, 62, 500);
46011
46012 unlock:
46013 mutex_unlock(&d->i2c_mutex);
46014
46015- if (ret < 0)
46016+ if (ret < 0) {
46017+ kfree(buf);
46018 return ret;
46019+ }
46020
46021- if (ret == 1)
46022+ if (ret == 1) {
46023+ kfree(buf);
46024 return 0; /* no key pressed */
46025+ }
46026
46027 /* decoding */
46028 b = buf+1;
46029@@ -653,6 +686,8 @@ unlock:
46030
46031 ir_raw_event_handle(d->rc_dev);
46032
46033+ kfree(buf);
46034+
46035 return 1;
46036 }
46037
46038diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46039index e502a5f..2a27f40 100644
46040--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46041+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46042@@ -427,7 +427,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46043 * by passing a very big num_planes value */
46044 uplane = compat_alloc_user_space(num_planes *
46045 sizeof(struct v4l2_plane));
46046- kp->m.planes = (__force struct v4l2_plane *)uplane;
46047+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
46048
46049 while (--num_planes >= 0) {
46050 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
46051@@ -498,7 +498,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46052 if (num_planes == 0)
46053 return 0;
46054
46055- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
46056+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
46057 if (get_user(p, &up->m.planes))
46058 return -EFAULT;
46059 uplane32 = compat_ptr(p);
46060@@ -562,7 +562,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
46061 get_user(kp->flags, &up->flags) ||
46062 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
46063 return -EFAULT;
46064- kp->base = (__force void *)compat_ptr(tmp);
46065+ kp->base = (__force_kernel void *)compat_ptr(tmp);
46066 return 0;
46067 }
46068
46069@@ -667,7 +667,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46070 n * sizeof(struct v4l2_ext_control32)))
46071 return -EFAULT;
46072 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
46073- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
46074+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
46075 while (--n >= 0) {
46076 u32 id;
46077
46078@@ -694,7 +694,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46079 {
46080 struct v4l2_ext_control32 __user *ucontrols;
46081 struct v4l2_ext_control __user *kcontrols =
46082- (__force struct v4l2_ext_control __user *)kp->controls;
46083+ (struct v4l2_ext_control __force_user *)kp->controls;
46084 int n = kp->count;
46085 compat_caddr_t p;
46086
46087@@ -778,7 +778,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
46088 get_user(tmp, &up->edid) ||
46089 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
46090 return -EFAULT;
46091- kp->edid = (__force u8 *)compat_ptr(tmp);
46092+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
46093 return 0;
46094 }
46095
46096diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
46097index 015f92a..59e311e 100644
46098--- a/drivers/media/v4l2-core/v4l2-device.c
46099+++ b/drivers/media/v4l2-core/v4l2-device.c
46100@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
46101 EXPORT_SYMBOL_GPL(v4l2_device_put);
46102
46103 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
46104- atomic_t *instance)
46105+ atomic_unchecked_t *instance)
46106 {
46107- int num = atomic_inc_return(instance) - 1;
46108+ int num = atomic_inc_return_unchecked(instance) - 1;
46109 int len = strlen(basename);
46110
46111 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
46112diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
46113index 9ccb19a..d131468 100644
46114--- a/drivers/media/v4l2-core/v4l2-ioctl.c
46115+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
46116@@ -2142,7 +2142,8 @@ struct v4l2_ioctl_info {
46117 struct file *file, void *fh, void *p);
46118 } u;
46119 void (*debug)(const void *arg, bool write_only);
46120-};
46121+} __do_const;
46122+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
46123
46124 /* This control needs a priority check */
46125 #define INFO_FL_PRIO (1 << 0)
46126@@ -2326,7 +2327,7 @@ static long __video_do_ioctl(struct file *file,
46127 struct video_device *vfd = video_devdata(file);
46128 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
46129 bool write_only = false;
46130- struct v4l2_ioctl_info default_info;
46131+ v4l2_ioctl_info_no_const default_info;
46132 const struct v4l2_ioctl_info *info;
46133 void *fh = file->private_data;
46134 struct v4l2_fh *vfh = NULL;
46135@@ -2413,7 +2414,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46136 ret = -EINVAL;
46137 break;
46138 }
46139- *user_ptr = (void __user *)buf->m.planes;
46140+ *user_ptr = (void __force_user *)buf->m.planes;
46141 *kernel_ptr = (void **)&buf->m.planes;
46142 *array_size = sizeof(struct v4l2_plane) * buf->length;
46143 ret = 1;
46144@@ -2430,7 +2431,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46145 ret = -EINVAL;
46146 break;
46147 }
46148- *user_ptr = (void __user *)edid->edid;
46149+ *user_ptr = (void __force_user *)edid->edid;
46150 *kernel_ptr = (void **)&edid->edid;
46151 *array_size = edid->blocks * 128;
46152 ret = 1;
46153@@ -2448,7 +2449,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46154 ret = -EINVAL;
46155 break;
46156 }
46157- *user_ptr = (void __user *)ctrls->controls;
46158+ *user_ptr = (void __force_user *)ctrls->controls;
46159 *kernel_ptr = (void **)&ctrls->controls;
46160 *array_size = sizeof(struct v4l2_ext_control)
46161 * ctrls->count;
46162@@ -2549,7 +2550,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
46163 }
46164
46165 if (has_array_args) {
46166- *kernel_ptr = (void __force *)user_ptr;
46167+ *kernel_ptr = (void __force_kernel *)user_ptr;
46168 if (copy_to_user(user_ptr, mbuf, array_size))
46169 err = -EFAULT;
46170 goto out_array_args;
46171diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
46172index 187f836..679544b 100644
46173--- a/drivers/message/fusion/mptbase.c
46174+++ b/drivers/message/fusion/mptbase.c
46175@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46176 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
46177 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
46178
46179+#ifdef CONFIG_GRKERNSEC_HIDESYM
46180+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
46181+#else
46182 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
46183 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
46184+#endif
46185+
46186 /*
46187 * Rounding UP to nearest 4-kB boundary here...
46188 */
46189@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46190 ioc->facts.GlobalCredits);
46191
46192 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
46193+#ifdef CONFIG_GRKERNSEC_HIDESYM
46194+ NULL, NULL);
46195+#else
46196 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
46197+#endif
46198 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
46199 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
46200 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
46201diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
46202index 0707fa2..70ca794 100644
46203--- a/drivers/message/fusion/mptsas.c
46204+++ b/drivers/message/fusion/mptsas.c
46205@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
46206 return 0;
46207 }
46208
46209+static inline void
46210+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46211+{
46212+ if (phy_info->port_details) {
46213+ phy_info->port_details->rphy = rphy;
46214+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46215+ ioc->name, rphy));
46216+ }
46217+
46218+ if (rphy) {
46219+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46220+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46221+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46222+ ioc->name, rphy, rphy->dev.release));
46223+ }
46224+}
46225+
46226 /* no mutex */
46227 static void
46228 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
46229@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
46230 return NULL;
46231 }
46232
46233-static inline void
46234-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46235-{
46236- if (phy_info->port_details) {
46237- phy_info->port_details->rphy = rphy;
46238- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46239- ioc->name, rphy));
46240- }
46241-
46242- if (rphy) {
46243- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46244- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46245- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46246- ioc->name, rphy, rphy->dev.release));
46247- }
46248-}
46249-
46250 static inline struct sas_port *
46251 mptsas_get_port(struct mptsas_phyinfo *phy_info)
46252 {
46253diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
46254index b7d87cd..3fb36da 100644
46255--- a/drivers/message/i2o/i2o_proc.c
46256+++ b/drivers/message/i2o/i2o_proc.c
46257@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
46258 "Array Controller Device"
46259 };
46260
46261-static char *chtostr(char *tmp, u8 *chars, int n)
46262-{
46263- tmp[0] = 0;
46264- return strncat(tmp, (char *)chars, n);
46265-}
46266-
46267 static int i2o_report_query_status(struct seq_file *seq, int block_status,
46268 char *group)
46269 {
46270@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
46271 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
46272 {
46273 struct i2o_controller *c = (struct i2o_controller *)seq->private;
46274- static u32 work32[5];
46275- static u8 *work8 = (u8 *) work32;
46276- static u16 *work16 = (u16 *) work32;
46277+ u32 work32[5];
46278+ u8 *work8 = (u8 *) work32;
46279+ u16 *work16 = (u16 *) work32;
46280 int token;
46281 u32 hwcap;
46282
46283@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46284 } *result;
46285
46286 i2o_exec_execute_ddm_table ddm_table;
46287- char tmp[28 + 1];
46288
46289 result = kmalloc(sizeof(*result), GFP_KERNEL);
46290 if (!result)
46291@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46292
46293 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
46294 seq_printf(seq, "%-#8x", ddm_table.module_id);
46295- seq_printf(seq, "%-29s",
46296- chtostr(tmp, ddm_table.module_name_version, 28));
46297+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
46298 seq_printf(seq, "%9d ", ddm_table.data_size);
46299 seq_printf(seq, "%8d", ddm_table.code_size);
46300
46301@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46302
46303 i2o_driver_result_table *result;
46304 i2o_driver_store_table *dst;
46305- char tmp[28 + 1];
46306
46307 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
46308 if (result == NULL)
46309@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46310
46311 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
46312 seq_printf(seq, "%-#8x", dst->module_id);
46313- seq_printf(seq, "%-29s",
46314- chtostr(tmp, dst->module_name_version, 28));
46315- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
46316+ seq_printf(seq, "%-.28s", dst->module_name_version);
46317+ seq_printf(seq, "%-.8s", dst->date);
46318 seq_printf(seq, "%8d ", dst->module_size);
46319 seq_printf(seq, "%8d ", dst->mpb_size);
46320 seq_printf(seq, "0x%04x", dst->module_flags);
46321@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
46322 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46323 {
46324 struct i2o_device *d = (struct i2o_device *)seq->private;
46325- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46326+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46327 // == (allow) 512d bytes (max)
46328- static u16 *work16 = (u16 *) work32;
46329+ u16 *work16 = (u16 *) work32;
46330 int token;
46331- char tmp[16 + 1];
46332
46333 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
46334
46335@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46336 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
46337 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
46338 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
46339- seq_printf(seq, "Vendor info : %s\n",
46340- chtostr(tmp, (u8 *) (work32 + 2), 16));
46341- seq_printf(seq, "Product info : %s\n",
46342- chtostr(tmp, (u8 *) (work32 + 6), 16));
46343- seq_printf(seq, "Description : %s\n",
46344- chtostr(tmp, (u8 *) (work32 + 10), 16));
46345- seq_printf(seq, "Product rev. : %s\n",
46346- chtostr(tmp, (u8 *) (work32 + 14), 8));
46347+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
46348+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
46349+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
46350+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
46351
46352 seq_printf(seq, "Serial number : ");
46353 print_serial_number(seq, (u8 *) (work32 + 16),
46354@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46355 u8 pad[256]; // allow up to 256 byte (max) serial number
46356 } result;
46357
46358- char tmp[24 + 1];
46359-
46360 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
46361
46362 if (token < 0) {
46363@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46364 }
46365
46366 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
46367- seq_printf(seq, "Module name : %s\n",
46368- chtostr(tmp, result.module_name, 24));
46369- seq_printf(seq, "Module revision : %s\n",
46370- chtostr(tmp, result.module_rev, 8));
46371+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
46372+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
46373
46374 seq_printf(seq, "Serial number : ");
46375 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
46376@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46377 u8 instance_number[4];
46378 } result;
46379
46380- char tmp[64 + 1];
46381-
46382 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
46383
46384 if (token < 0) {
46385@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46386 return 0;
46387 }
46388
46389- seq_printf(seq, "Device name : %s\n",
46390- chtostr(tmp, result.device_name, 64));
46391- seq_printf(seq, "Service name : %s\n",
46392- chtostr(tmp, result.service_name, 64));
46393- seq_printf(seq, "Physical name : %s\n",
46394- chtostr(tmp, result.physical_location, 64));
46395- seq_printf(seq, "Instance number : %s\n",
46396- chtostr(tmp, result.instance_number, 4));
46397+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
46398+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
46399+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
46400+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
46401
46402 return 0;
46403 }
46404@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46405 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
46406 {
46407 struct i2o_device *d = (struct i2o_device *)seq->private;
46408- static u32 work32[12];
46409- static u16 *work16 = (u16 *) work32;
46410- static u8 *work8 = (u8 *) work32;
46411+ u32 work32[12];
46412+ u16 *work16 = (u16 *) work32;
46413+ u8 *work8 = (u8 *) work32;
46414 int token;
46415
46416 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
46417diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
46418index 92752fb..a7494f6 100644
46419--- a/drivers/message/i2o/iop.c
46420+++ b/drivers/message/i2o/iop.c
46421@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
46422
46423 spin_lock_irqsave(&c->context_list_lock, flags);
46424
46425- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
46426- atomic_inc(&c->context_list_counter);
46427+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
46428+ atomic_inc_unchecked(&c->context_list_counter);
46429
46430- entry->context = atomic_read(&c->context_list_counter);
46431+ entry->context = atomic_read_unchecked(&c->context_list_counter);
46432
46433 list_add(&entry->list, &c->context_list);
46434
46435@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
46436
46437 #if BITS_PER_LONG == 64
46438 spin_lock_init(&c->context_list_lock);
46439- atomic_set(&c->context_list_counter, 0);
46440+ atomic_set_unchecked(&c->context_list_counter, 0);
46441 INIT_LIST_HEAD(&c->context_list);
46442 #endif
46443
46444diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
46445index b2c7e3b..85aa4764 100644
46446--- a/drivers/mfd/ab8500-debugfs.c
46447+++ b/drivers/mfd/ab8500-debugfs.c
46448@@ -100,7 +100,7 @@ static int irq_last;
46449 static u32 *irq_count;
46450 static int num_irqs;
46451
46452-static struct device_attribute **dev_attr;
46453+static device_attribute_no_const **dev_attr;
46454 static char **event_name;
46455
46456 static u8 avg_sample = SAMPLE_16;
46457diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
46458index c880c89..45a7c68 100644
46459--- a/drivers/mfd/max8925-i2c.c
46460+++ b/drivers/mfd/max8925-i2c.c
46461@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
46462 const struct i2c_device_id *id)
46463 {
46464 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
46465- static struct max8925_chip *chip;
46466+ struct max8925_chip *chip;
46467 struct device_node *node = client->dev.of_node;
46468
46469 if (node && !pdata) {
46470diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
46471index 7612d89..70549c2 100644
46472--- a/drivers/mfd/tps65910.c
46473+++ b/drivers/mfd/tps65910.c
46474@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
46475 struct tps65910_platform_data *pdata)
46476 {
46477 int ret = 0;
46478- static struct regmap_irq_chip *tps6591x_irqs_chip;
46479+ struct regmap_irq_chip *tps6591x_irqs_chip;
46480
46481 if (!irq) {
46482 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
46483diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
46484index 1b772ef..01e77d33 100644
46485--- a/drivers/mfd/twl4030-irq.c
46486+++ b/drivers/mfd/twl4030-irq.c
46487@@ -34,6 +34,7 @@
46488 #include <linux/of.h>
46489 #include <linux/irqdomain.h>
46490 #include <linux/i2c/twl.h>
46491+#include <asm/pgtable.h>
46492
46493 #include "twl-core.h"
46494
46495@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
46496 * Install an irq handler for each of the SIH modules;
46497 * clone dummy irq_chip since PIH can't *do* anything
46498 */
46499- twl4030_irq_chip = dummy_irq_chip;
46500- twl4030_irq_chip.name = "twl4030";
46501+ pax_open_kernel();
46502+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
46503+ *(const char **)&twl4030_irq_chip.name = "twl4030";
46504
46505- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46506+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46507+ pax_close_kernel();
46508
46509 for (i = irq_base; i < irq_end; i++) {
46510 irq_set_chip_and_handler(i, &twl4030_irq_chip,
46511diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
46512index 464419b..64bae8d 100644
46513--- a/drivers/misc/c2port/core.c
46514+++ b/drivers/misc/c2port/core.c
46515@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
46516 goto error_idr_alloc;
46517 c2dev->id = ret;
46518
46519- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46520+ pax_open_kernel();
46521+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46522+ pax_close_kernel();
46523
46524 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
46525 "c2port%d", c2dev->id);
46526diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
46527index 3f2b625..945e179 100644
46528--- a/drivers/misc/eeprom/sunxi_sid.c
46529+++ b/drivers/misc/eeprom/sunxi_sid.c
46530@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
46531
46532 platform_set_drvdata(pdev, sid_data);
46533
46534- sid_bin_attr.size = sid_data->keysize;
46535+ pax_open_kernel();
46536+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
46537+ pax_close_kernel();
46538 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
46539 return -ENODEV;
46540
46541diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
46542index 36f5d52..32311c3 100644
46543--- a/drivers/misc/kgdbts.c
46544+++ b/drivers/misc/kgdbts.c
46545@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
46546 char before[BREAK_INSTR_SIZE];
46547 char after[BREAK_INSTR_SIZE];
46548
46549- probe_kernel_read(before, (char *)kgdbts_break_test,
46550+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
46551 BREAK_INSTR_SIZE);
46552 init_simple_test();
46553 ts.tst = plant_and_detach_test;
46554@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
46555 /* Activate test with initial breakpoint */
46556 if (!is_early)
46557 kgdb_breakpoint();
46558- probe_kernel_read(after, (char *)kgdbts_break_test,
46559+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
46560 BREAK_INSTR_SIZE);
46561 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
46562 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
46563diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
46564index 3ef4627..8d00486 100644
46565--- a/drivers/misc/lis3lv02d/lis3lv02d.c
46566+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
46567@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
46568 * the lid is closed. This leads to interrupts as soon as a little move
46569 * is done.
46570 */
46571- atomic_inc(&lis3->count);
46572+ atomic_inc_unchecked(&lis3->count);
46573
46574 wake_up_interruptible(&lis3->misc_wait);
46575 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
46576@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
46577 if (lis3->pm_dev)
46578 pm_runtime_get_sync(lis3->pm_dev);
46579
46580- atomic_set(&lis3->count, 0);
46581+ atomic_set_unchecked(&lis3->count, 0);
46582 return 0;
46583 }
46584
46585@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
46586 add_wait_queue(&lis3->misc_wait, &wait);
46587 while (true) {
46588 set_current_state(TASK_INTERRUPTIBLE);
46589- data = atomic_xchg(&lis3->count, 0);
46590+ data = atomic_xchg_unchecked(&lis3->count, 0);
46591 if (data)
46592 break;
46593
46594@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
46595 struct lis3lv02d, miscdev);
46596
46597 poll_wait(file, &lis3->misc_wait, wait);
46598- if (atomic_read(&lis3->count))
46599+ if (atomic_read_unchecked(&lis3->count))
46600 return POLLIN | POLLRDNORM;
46601 return 0;
46602 }
46603diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
46604index c439c82..1f20f57 100644
46605--- a/drivers/misc/lis3lv02d/lis3lv02d.h
46606+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
46607@@ -297,7 +297,7 @@ struct lis3lv02d {
46608 struct input_polled_dev *idev; /* input device */
46609 struct platform_device *pdev; /* platform device */
46610 struct regulator_bulk_data regulators[2];
46611- atomic_t count; /* interrupt count after last read */
46612+ atomic_unchecked_t count; /* interrupt count after last read */
46613 union axis_conversion ac; /* hw -> logical axis */
46614 int mapped_btns[3];
46615
46616diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
46617index 2f30bad..c4c13d0 100644
46618--- a/drivers/misc/sgi-gru/gruhandles.c
46619+++ b/drivers/misc/sgi-gru/gruhandles.c
46620@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
46621 unsigned long nsec;
46622
46623 nsec = CLKS2NSEC(clks);
46624- atomic_long_inc(&mcs_op_statistics[op].count);
46625- atomic_long_add(nsec, &mcs_op_statistics[op].total);
46626+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
46627+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
46628 if (mcs_op_statistics[op].max < nsec)
46629 mcs_op_statistics[op].max = nsec;
46630 }
46631diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
46632index 4f76359..cdfcb2e 100644
46633--- a/drivers/misc/sgi-gru/gruprocfs.c
46634+++ b/drivers/misc/sgi-gru/gruprocfs.c
46635@@ -32,9 +32,9 @@
46636
46637 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
46638
46639-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
46640+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
46641 {
46642- unsigned long val = atomic_long_read(v);
46643+ unsigned long val = atomic_long_read_unchecked(v);
46644
46645 seq_printf(s, "%16lu %s\n", val, id);
46646 }
46647@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
46648
46649 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
46650 for (op = 0; op < mcsop_last; op++) {
46651- count = atomic_long_read(&mcs_op_statistics[op].count);
46652- total = atomic_long_read(&mcs_op_statistics[op].total);
46653+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
46654+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
46655 max = mcs_op_statistics[op].max;
46656 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
46657 count ? total / count : 0, max);
46658diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
46659index 5c3ce24..4915ccb 100644
46660--- a/drivers/misc/sgi-gru/grutables.h
46661+++ b/drivers/misc/sgi-gru/grutables.h
46662@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
46663 * GRU statistics.
46664 */
46665 struct gru_stats_s {
46666- atomic_long_t vdata_alloc;
46667- atomic_long_t vdata_free;
46668- atomic_long_t gts_alloc;
46669- atomic_long_t gts_free;
46670- atomic_long_t gms_alloc;
46671- atomic_long_t gms_free;
46672- atomic_long_t gts_double_allocate;
46673- atomic_long_t assign_context;
46674- atomic_long_t assign_context_failed;
46675- atomic_long_t free_context;
46676- atomic_long_t load_user_context;
46677- atomic_long_t load_kernel_context;
46678- atomic_long_t lock_kernel_context;
46679- atomic_long_t unlock_kernel_context;
46680- atomic_long_t steal_user_context;
46681- atomic_long_t steal_kernel_context;
46682- atomic_long_t steal_context_failed;
46683- atomic_long_t nopfn;
46684- atomic_long_t asid_new;
46685- atomic_long_t asid_next;
46686- atomic_long_t asid_wrap;
46687- atomic_long_t asid_reuse;
46688- atomic_long_t intr;
46689- atomic_long_t intr_cbr;
46690- atomic_long_t intr_tfh;
46691- atomic_long_t intr_spurious;
46692- atomic_long_t intr_mm_lock_failed;
46693- atomic_long_t call_os;
46694- atomic_long_t call_os_wait_queue;
46695- atomic_long_t user_flush_tlb;
46696- atomic_long_t user_unload_context;
46697- atomic_long_t user_exception;
46698- atomic_long_t set_context_option;
46699- atomic_long_t check_context_retarget_intr;
46700- atomic_long_t check_context_unload;
46701- atomic_long_t tlb_dropin;
46702- atomic_long_t tlb_preload_page;
46703- atomic_long_t tlb_dropin_fail_no_asid;
46704- atomic_long_t tlb_dropin_fail_upm;
46705- atomic_long_t tlb_dropin_fail_invalid;
46706- atomic_long_t tlb_dropin_fail_range_active;
46707- atomic_long_t tlb_dropin_fail_idle;
46708- atomic_long_t tlb_dropin_fail_fmm;
46709- atomic_long_t tlb_dropin_fail_no_exception;
46710- atomic_long_t tfh_stale_on_fault;
46711- atomic_long_t mmu_invalidate_range;
46712- atomic_long_t mmu_invalidate_page;
46713- atomic_long_t flush_tlb;
46714- atomic_long_t flush_tlb_gru;
46715- atomic_long_t flush_tlb_gru_tgh;
46716- atomic_long_t flush_tlb_gru_zero_asid;
46717+ atomic_long_unchecked_t vdata_alloc;
46718+ atomic_long_unchecked_t vdata_free;
46719+ atomic_long_unchecked_t gts_alloc;
46720+ atomic_long_unchecked_t gts_free;
46721+ atomic_long_unchecked_t gms_alloc;
46722+ atomic_long_unchecked_t gms_free;
46723+ atomic_long_unchecked_t gts_double_allocate;
46724+ atomic_long_unchecked_t assign_context;
46725+ atomic_long_unchecked_t assign_context_failed;
46726+ atomic_long_unchecked_t free_context;
46727+ atomic_long_unchecked_t load_user_context;
46728+ atomic_long_unchecked_t load_kernel_context;
46729+ atomic_long_unchecked_t lock_kernel_context;
46730+ atomic_long_unchecked_t unlock_kernel_context;
46731+ atomic_long_unchecked_t steal_user_context;
46732+ atomic_long_unchecked_t steal_kernel_context;
46733+ atomic_long_unchecked_t steal_context_failed;
46734+ atomic_long_unchecked_t nopfn;
46735+ atomic_long_unchecked_t asid_new;
46736+ atomic_long_unchecked_t asid_next;
46737+ atomic_long_unchecked_t asid_wrap;
46738+ atomic_long_unchecked_t asid_reuse;
46739+ atomic_long_unchecked_t intr;
46740+ atomic_long_unchecked_t intr_cbr;
46741+ atomic_long_unchecked_t intr_tfh;
46742+ atomic_long_unchecked_t intr_spurious;
46743+ atomic_long_unchecked_t intr_mm_lock_failed;
46744+ atomic_long_unchecked_t call_os;
46745+ atomic_long_unchecked_t call_os_wait_queue;
46746+ atomic_long_unchecked_t user_flush_tlb;
46747+ atomic_long_unchecked_t user_unload_context;
46748+ atomic_long_unchecked_t user_exception;
46749+ atomic_long_unchecked_t set_context_option;
46750+ atomic_long_unchecked_t check_context_retarget_intr;
46751+ atomic_long_unchecked_t check_context_unload;
46752+ atomic_long_unchecked_t tlb_dropin;
46753+ atomic_long_unchecked_t tlb_preload_page;
46754+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
46755+ atomic_long_unchecked_t tlb_dropin_fail_upm;
46756+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
46757+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
46758+ atomic_long_unchecked_t tlb_dropin_fail_idle;
46759+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
46760+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
46761+ atomic_long_unchecked_t tfh_stale_on_fault;
46762+ atomic_long_unchecked_t mmu_invalidate_range;
46763+ atomic_long_unchecked_t mmu_invalidate_page;
46764+ atomic_long_unchecked_t flush_tlb;
46765+ atomic_long_unchecked_t flush_tlb_gru;
46766+ atomic_long_unchecked_t flush_tlb_gru_tgh;
46767+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
46768
46769- atomic_long_t copy_gpa;
46770- atomic_long_t read_gpa;
46771+ atomic_long_unchecked_t copy_gpa;
46772+ atomic_long_unchecked_t read_gpa;
46773
46774- atomic_long_t mesq_receive;
46775- atomic_long_t mesq_receive_none;
46776- atomic_long_t mesq_send;
46777- atomic_long_t mesq_send_failed;
46778- atomic_long_t mesq_noop;
46779- atomic_long_t mesq_send_unexpected_error;
46780- atomic_long_t mesq_send_lb_overflow;
46781- atomic_long_t mesq_send_qlimit_reached;
46782- atomic_long_t mesq_send_amo_nacked;
46783- atomic_long_t mesq_send_put_nacked;
46784- atomic_long_t mesq_page_overflow;
46785- atomic_long_t mesq_qf_locked;
46786- atomic_long_t mesq_qf_noop_not_full;
46787- atomic_long_t mesq_qf_switch_head_failed;
46788- atomic_long_t mesq_qf_unexpected_error;
46789- atomic_long_t mesq_noop_unexpected_error;
46790- atomic_long_t mesq_noop_lb_overflow;
46791- atomic_long_t mesq_noop_qlimit_reached;
46792- atomic_long_t mesq_noop_amo_nacked;
46793- atomic_long_t mesq_noop_put_nacked;
46794- atomic_long_t mesq_noop_page_overflow;
46795+ atomic_long_unchecked_t mesq_receive;
46796+ atomic_long_unchecked_t mesq_receive_none;
46797+ atomic_long_unchecked_t mesq_send;
46798+ atomic_long_unchecked_t mesq_send_failed;
46799+ atomic_long_unchecked_t mesq_noop;
46800+ atomic_long_unchecked_t mesq_send_unexpected_error;
46801+ atomic_long_unchecked_t mesq_send_lb_overflow;
46802+ atomic_long_unchecked_t mesq_send_qlimit_reached;
46803+ atomic_long_unchecked_t mesq_send_amo_nacked;
46804+ atomic_long_unchecked_t mesq_send_put_nacked;
46805+ atomic_long_unchecked_t mesq_page_overflow;
46806+ atomic_long_unchecked_t mesq_qf_locked;
46807+ atomic_long_unchecked_t mesq_qf_noop_not_full;
46808+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
46809+ atomic_long_unchecked_t mesq_qf_unexpected_error;
46810+ atomic_long_unchecked_t mesq_noop_unexpected_error;
46811+ atomic_long_unchecked_t mesq_noop_lb_overflow;
46812+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
46813+ atomic_long_unchecked_t mesq_noop_amo_nacked;
46814+ atomic_long_unchecked_t mesq_noop_put_nacked;
46815+ atomic_long_unchecked_t mesq_noop_page_overflow;
46816
46817 };
46818
46819@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
46820 tghop_invalidate, mcsop_last};
46821
46822 struct mcs_op_statistic {
46823- atomic_long_t count;
46824- atomic_long_t total;
46825+ atomic_long_unchecked_t count;
46826+ atomic_long_unchecked_t total;
46827 unsigned long max;
46828 };
46829
46830@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
46831
46832 #define STAT(id) do { \
46833 if (gru_options & OPT_STATS) \
46834- atomic_long_inc(&gru_stats.id); \
46835+ atomic_long_inc_unchecked(&gru_stats.id); \
46836 } while (0)
46837
46838 #ifdef CONFIG_SGI_GRU_DEBUG
46839diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
46840index c862cd4..0d176fe 100644
46841--- a/drivers/misc/sgi-xp/xp.h
46842+++ b/drivers/misc/sgi-xp/xp.h
46843@@ -288,7 +288,7 @@ struct xpc_interface {
46844 xpc_notify_func, void *);
46845 void (*received) (short, int, void *);
46846 enum xp_retval (*partid_to_nasids) (short, void *);
46847-};
46848+} __no_const;
46849
46850 extern struct xpc_interface xpc_interface;
46851
46852diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
46853index 01be66d..e3a0c7e 100644
46854--- a/drivers/misc/sgi-xp/xp_main.c
46855+++ b/drivers/misc/sgi-xp/xp_main.c
46856@@ -78,13 +78,13 @@ xpc_notloaded(void)
46857 }
46858
46859 struct xpc_interface xpc_interface = {
46860- (void (*)(int))xpc_notloaded,
46861- (void (*)(int))xpc_notloaded,
46862- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
46863- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
46864+ .connect = (void (*)(int))xpc_notloaded,
46865+ .disconnect = (void (*)(int))xpc_notloaded,
46866+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
46867+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
46868 void *))xpc_notloaded,
46869- (void (*)(short, int, void *))xpc_notloaded,
46870- (enum xp_retval(*)(short, void *))xpc_notloaded
46871+ .received = (void (*)(short, int, void *))xpc_notloaded,
46872+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
46873 };
46874 EXPORT_SYMBOL_GPL(xpc_interface);
46875
46876diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
46877index b94d5f7..7f494c5 100644
46878--- a/drivers/misc/sgi-xp/xpc.h
46879+++ b/drivers/misc/sgi-xp/xpc.h
46880@@ -835,6 +835,7 @@ struct xpc_arch_operations {
46881 void (*received_payload) (struct xpc_channel *, void *);
46882 void (*notify_senders_of_disconnect) (struct xpc_channel *);
46883 };
46884+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
46885
46886 /* struct xpc_partition act_state values (for XPC HB) */
46887
46888@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
46889 /* found in xpc_main.c */
46890 extern struct device *xpc_part;
46891 extern struct device *xpc_chan;
46892-extern struct xpc_arch_operations xpc_arch_ops;
46893+extern xpc_arch_operations_no_const xpc_arch_ops;
46894 extern int xpc_disengage_timelimit;
46895 extern int xpc_disengage_timedout;
46896 extern int xpc_activate_IRQ_rcvd;
46897diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
46898index 82dc574..8539ab2 100644
46899--- a/drivers/misc/sgi-xp/xpc_main.c
46900+++ b/drivers/misc/sgi-xp/xpc_main.c
46901@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
46902 .notifier_call = xpc_system_die,
46903 };
46904
46905-struct xpc_arch_operations xpc_arch_ops;
46906+xpc_arch_operations_no_const xpc_arch_ops;
46907
46908 /*
46909 * Timer function to enforce the timelimit on the partition disengage.
46910@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
46911
46912 if (((die_args->trapnr == X86_TRAP_MF) ||
46913 (die_args->trapnr == X86_TRAP_XF)) &&
46914- !user_mode_vm(die_args->regs))
46915+ !user_mode(die_args->regs))
46916 xpc_die_deactivate();
46917
46918 break;
46919diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
46920index a11451f..9e1bbad 100644
46921--- a/drivers/mmc/card/block.c
46922+++ b/drivers/mmc/card/block.c
46923@@ -574,7 +574,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
46924 if (idata->ic.postsleep_min_us)
46925 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
46926
46927- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
46928+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
46929 err = -EFAULT;
46930 goto cmd_rel_host;
46931 }
46932diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
46933index 7911e05..d0f9dda 100644
46934--- a/drivers/mmc/core/mmc_ops.c
46935+++ b/drivers/mmc/core/mmc_ops.c
46936@@ -267,7 +267,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
46937 void *data_buf;
46938 int is_on_stack;
46939
46940- is_on_stack = object_is_on_stack(buf);
46941+ is_on_stack = object_starts_on_stack(buf);
46942 if (is_on_stack) {
46943 /*
46944 * dma onto stack is unsafe/nonportable, but callers to this
46945diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
46946index 01b99e8..5c325e3 100644
46947--- a/drivers/mmc/host/dw_mmc.h
46948+++ b/drivers/mmc/host/dw_mmc.h
46949@@ -265,5 +265,5 @@ struct dw_mci_drv_data {
46950 int (*parse_dt)(struct dw_mci *host);
46951 int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
46952 struct dw_mci_tuning_data *tuning_data);
46953-};
46954+} __do_const;
46955 #endif /* _DW_MMC_H_ */
46956diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
46957index 43af791..86f4c48 100644
46958--- a/drivers/mmc/host/mmci.c
46959+++ b/drivers/mmc/host/mmci.c
46960@@ -1628,7 +1628,9 @@ static int mmci_probe(struct amba_device *dev,
46961 mmc->caps |= MMC_CAP_CMD23;
46962
46963 if (variant->busy_detect) {
46964- mmci_ops.card_busy = mmci_card_busy;
46965+ pax_open_kernel();
46966+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
46967+ pax_close_kernel();
46968 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
46969 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
46970 mmc->max_busy_timeout = 0;
46971diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
46972index 9c2b9cb..cebb09a 100644
46973--- a/drivers/mmc/host/omap_hsmmc.c
46974+++ b/drivers/mmc/host/omap_hsmmc.c
46975@@ -2113,7 +2113,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
46976
46977 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
46978 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
46979- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
46980+ pax_open_kernel();
46981+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
46982+ pax_close_kernel();
46983 }
46984
46985 pm_runtime_enable(host->dev);
46986diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
46987index 587ee0e..b3bbcab 100644
46988--- a/drivers/mmc/host/sdhci-esdhc-imx.c
46989+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
46990@@ -1054,9 +1054,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
46991 host->mmc->caps |= MMC_CAP_1_8V_DDR;
46992 }
46993
46994- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
46995- sdhci_esdhc_ops.platform_execute_tuning =
46996+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
46997+ pax_open_kernel();
46998+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
46999 esdhc_executing_tuning;
47000+ pax_close_kernel();
47001+ }
47002
47003 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
47004 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
47005diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
47006index 0ce6eb1..8dcce1b 100644
47007--- a/drivers/mmc/host/sdhci-s3c.c
47008+++ b/drivers/mmc/host/sdhci-s3c.c
47009@@ -584,9 +584,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
47010 * we can use overriding functions instead of default.
47011 */
47012 if (sc->no_divider) {
47013- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47014- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47015- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47016+ pax_open_kernel();
47017+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47018+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47019+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47020+ pax_close_kernel();
47021 }
47022
47023 /* It supports additional host capabilities if needed */
47024diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
47025index 423666b..81ff5eb 100644
47026--- a/drivers/mtd/chips/cfi_cmdset_0020.c
47027+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
47028@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
47029 size_t totlen = 0, thislen;
47030 int ret = 0;
47031 size_t buflen = 0;
47032- static char *buffer;
47033+ char *buffer;
47034
47035 if (!ECCBUF_SIZE) {
47036 /* We should fall back to a general writev implementation.
47037diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
47038index b3b7ca1..5dd4634 100644
47039--- a/drivers/mtd/nand/denali.c
47040+++ b/drivers/mtd/nand/denali.c
47041@@ -24,6 +24,7 @@
47042 #include <linux/slab.h>
47043 #include <linux/mtd/mtd.h>
47044 #include <linux/module.h>
47045+#include <linux/slab.h>
47046
47047 #include "denali.h"
47048
47049diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47050index 959cb9b..8520fe5 100644
47051--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47052+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47053@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
47054
47055 /* first try to map the upper buffer directly */
47056 if (virt_addr_valid(this->upper_buf) &&
47057- !object_is_on_stack(this->upper_buf)) {
47058+ !object_starts_on_stack(this->upper_buf)) {
47059 sg_init_one(sgl, this->upper_buf, this->upper_len);
47060 ret = dma_map_sg(this->dev, sgl, 1, dr);
47061 if (ret == 0)
47062diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
47063index 51b9d6a..52af9a7 100644
47064--- a/drivers/mtd/nftlmount.c
47065+++ b/drivers/mtd/nftlmount.c
47066@@ -24,6 +24,7 @@
47067 #include <asm/errno.h>
47068 #include <linux/delay.h>
47069 #include <linux/slab.h>
47070+#include <linux/sched.h>
47071 #include <linux/mtd/mtd.h>
47072 #include <linux/mtd/nand.h>
47073 #include <linux/mtd/nftl.h>
47074diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
47075index c23184a..4115c41 100644
47076--- a/drivers/mtd/sm_ftl.c
47077+++ b/drivers/mtd/sm_ftl.c
47078@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
47079 #define SM_CIS_VENDOR_OFFSET 0x59
47080 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
47081 {
47082- struct attribute_group *attr_group;
47083+ attribute_group_no_const *attr_group;
47084 struct attribute **attributes;
47085 struct sm_sysfs_attribute *vendor_attribute;
47086 char *vendor;
47087diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
47088index a5115fb..81b03f6 100644
47089--- a/drivers/net/bonding/bond_main.c
47090+++ b/drivers/net/bonding/bond_main.c
47091@@ -3749,7 +3749,7 @@ int bond_3ad_xor_xmit(struct sk_buff *skb, struct net_device *dev)
47092 bond_dev_queue_xmit(bond, skb, slave->dev);
47093 } else {
47094 dev_kfree_skb_any(skb);
47095- atomic_long_inc(&dev->tx_dropped);
47096+ atomic_long_inc_unchecked(&dev->tx_dropped);
47097 }
47098
47099 return NETDEV_TX_OK;
47100diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
47101index 45f09a6..f154f8d 100644
47102--- a/drivers/net/bonding/bond_netlink.c
47103+++ b/drivers/net/bonding/bond_netlink.c
47104@@ -585,7 +585,7 @@ nla_put_failure:
47105 return -EMSGSIZE;
47106 }
47107
47108-struct rtnl_link_ops bond_link_ops __read_mostly = {
47109+struct rtnl_link_ops bond_link_ops = {
47110 .kind = "bond",
47111 .priv_size = sizeof(struct bonding),
47112 .setup = bond_setup,
47113diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
47114index 5e40a8b..126bfda 100644
47115--- a/drivers/net/caif/caif_hsi.c
47116+++ b/drivers/net/caif/caif_hsi.c
47117@@ -1445,7 +1445,7 @@ err:
47118 return -ENODEV;
47119 }
47120
47121-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
47122+static struct rtnl_link_ops caif_hsi_link_ops = {
47123 .kind = "cfhsi",
47124 .priv_size = sizeof(struct cfhsi),
47125 .setup = cfhsi_setup,
47126diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
47127index 98d73aa..63ef9da 100644
47128--- a/drivers/net/can/Kconfig
47129+++ b/drivers/net/can/Kconfig
47130@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
47131
47132 config CAN_FLEXCAN
47133 tristate "Support for Freescale FLEXCAN based chips"
47134- depends on ARM || PPC
47135+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
47136 ---help---
47137 Say Y here if you want to support for Freescale FlexCAN.
47138
47139diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
47140index 2cfe501..477d4b5 100644
47141--- a/drivers/net/can/dev.c
47142+++ b/drivers/net/can/dev.c
47143@@ -868,7 +868,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
47144 return -EOPNOTSUPP;
47145 }
47146
47147-static struct rtnl_link_ops can_link_ops __read_mostly = {
47148+static struct rtnl_link_ops can_link_ops = {
47149 .kind = "can",
47150 .maxtype = IFLA_CAN_MAX,
47151 .policy = can_policy,
47152diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
47153index 4e94057..32032ff 100644
47154--- a/drivers/net/can/vcan.c
47155+++ b/drivers/net/can/vcan.c
47156@@ -166,7 +166,7 @@ static void vcan_setup(struct net_device *dev)
47157 dev->destructor = free_netdev;
47158 }
47159
47160-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
47161+static struct rtnl_link_ops vcan_link_ops = {
47162 .kind = "vcan",
47163 .setup = vcan_setup,
47164 };
47165diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
47166index ff435fb..d408b1f 100644
47167--- a/drivers/net/dummy.c
47168+++ b/drivers/net/dummy.c
47169@@ -149,7 +149,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
47170 return 0;
47171 }
47172
47173-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
47174+static struct rtnl_link_ops dummy_link_ops = {
47175 .kind = "dummy",
47176 .setup = dummy_setup,
47177 .validate = dummy_validate,
47178diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
47179index 1d162cc..b546a75 100644
47180--- a/drivers/net/ethernet/8390/ax88796.c
47181+++ b/drivers/net/ethernet/8390/ax88796.c
47182@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
47183 if (ax->plat->reg_offsets)
47184 ei_local->reg_offset = ax->plat->reg_offsets;
47185 else {
47186+ resource_size_t _mem_size = mem_size;
47187+ do_div(_mem_size, 0x18);
47188 ei_local->reg_offset = ax->reg_offsets;
47189 for (ret = 0; ret < 0x18; ret++)
47190- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
47191+ ax->reg_offsets[ret] = _mem_size * ret;
47192 }
47193
47194 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
47195diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
47196index 4efc435..4ab9e14 100644
47197--- a/drivers/net/ethernet/altera/altera_tse_main.c
47198+++ b/drivers/net/ethernet/altera/altera_tse_main.c
47199@@ -1224,7 +1224,7 @@ static int tse_shutdown(struct net_device *dev)
47200 return 0;
47201 }
47202
47203-static struct net_device_ops altera_tse_netdev_ops = {
47204+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
47205 .ndo_open = tse_open,
47206 .ndo_stop = tse_shutdown,
47207 .ndo_start_xmit = tse_start_xmit,
47208@@ -1461,11 +1461,13 @@ static int altera_tse_probe(struct platform_device *pdev)
47209 ndev->netdev_ops = &altera_tse_netdev_ops;
47210 altera_tse_set_ethtool_ops(ndev);
47211
47212+ pax_open_kernel();
47213 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
47214
47215 if (priv->hash_filter)
47216 altera_tse_netdev_ops.ndo_set_rx_mode =
47217 tse_set_rx_mode_hashfilter;
47218+ pax_close_kernel();
47219
47220 /* Scatter/gather IO is not supported,
47221 * so it is turned off
47222diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47223index caade30..3e257d9 100644
47224--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47225+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47226@@ -1072,14 +1072,14 @@ do { \
47227 * operations, everything works on mask values.
47228 */
47229 #define XMDIO_READ(_pdata, _mmd, _reg) \
47230- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
47231+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
47232 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
47233
47234 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
47235 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
47236
47237 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
47238- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
47239+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
47240 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
47241
47242 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
47243diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47244index 8a50b01..39c1ad0 100644
47245--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47246+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47247@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
47248
47249 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
47250
47251- pdata->hw_if.config_dcb_tc(pdata);
47252+ pdata->hw_if->config_dcb_tc(pdata);
47253
47254 return 0;
47255 }
47256@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
47257
47258 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
47259
47260- pdata->hw_if.config_dcb_pfc(pdata);
47261+ pdata->hw_if->config_dcb_pfc(pdata);
47262
47263 return 0;
47264 }
47265diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47266index 6fc5da0..61ac2cb 100644
47267--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47268+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47269@@ -235,7 +235,7 @@ err_ring:
47270
47271 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47272 {
47273- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47274+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47275 struct xgbe_channel *channel;
47276 struct xgbe_ring *ring;
47277 struct xgbe_ring_data *rdata;
47278@@ -276,7 +276,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47279
47280 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
47281 {
47282- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47283+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47284 struct xgbe_channel *channel;
47285 struct xgbe_ring *ring;
47286 struct xgbe_ring_desc *rdesc;
47287@@ -505,7 +505,7 @@ err_out:
47288 static void xgbe_realloc_skb(struct xgbe_channel *channel)
47289 {
47290 struct xgbe_prv_data *pdata = channel->pdata;
47291- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47292+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47293 struct xgbe_ring *ring = channel->rx_ring;
47294 struct xgbe_ring_data *rdata;
47295 struct sk_buff *skb = NULL;
47296@@ -546,17 +546,12 @@ static void xgbe_realloc_skb(struct xgbe_channel *channel)
47297 DBGPR("<--xgbe_realloc_skb\n");
47298 }
47299
47300-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
47301-{
47302- DBGPR("-->xgbe_init_function_ptrs_desc\n");
47303-
47304- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
47305- desc_if->free_ring_resources = xgbe_free_ring_resources;
47306- desc_if->map_tx_skb = xgbe_map_tx_skb;
47307- desc_if->realloc_skb = xgbe_realloc_skb;
47308- desc_if->unmap_skb = xgbe_unmap_skb;
47309- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
47310- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
47311-
47312- DBGPR("<--xgbe_init_function_ptrs_desc\n");
47313-}
47314+const struct xgbe_desc_if default_xgbe_desc_if = {
47315+ .alloc_ring_resources = xgbe_alloc_ring_resources,
47316+ .free_ring_resources = xgbe_free_ring_resources,
47317+ .map_tx_skb = xgbe_map_tx_skb,
47318+ .realloc_skb = xgbe_realloc_skb,
47319+ .unmap_skb = xgbe_unmap_skb,
47320+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
47321+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
47322+};
47323diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47324index 9da3a03..022f15c 100644
47325--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47326+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47327@@ -2462,7 +2462,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
47328
47329 static int xgbe_init(struct xgbe_prv_data *pdata)
47330 {
47331- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47332+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47333 int ret;
47334
47335 DBGPR("-->xgbe_init\n");
47336@@ -2524,101 +2524,96 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
47337 return 0;
47338 }
47339
47340-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
47341-{
47342- DBGPR("-->xgbe_init_function_ptrs\n");
47343-
47344- hw_if->tx_complete = xgbe_tx_complete;
47345-
47346- hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
47347- hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
47348- hw_if->add_mac_addresses = xgbe_add_mac_addresses;
47349- hw_if->set_mac_address = xgbe_set_mac_address;
47350-
47351- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
47352- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
47353-
47354- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
47355- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
47356- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
47357- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
47358- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
47359-
47360- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
47361- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
47362-
47363- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
47364- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
47365- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
47366-
47367- hw_if->enable_tx = xgbe_enable_tx;
47368- hw_if->disable_tx = xgbe_disable_tx;
47369- hw_if->enable_rx = xgbe_enable_rx;
47370- hw_if->disable_rx = xgbe_disable_rx;
47371-
47372- hw_if->powerup_tx = xgbe_powerup_tx;
47373- hw_if->powerdown_tx = xgbe_powerdown_tx;
47374- hw_if->powerup_rx = xgbe_powerup_rx;
47375- hw_if->powerdown_rx = xgbe_powerdown_rx;
47376-
47377- hw_if->pre_xmit = xgbe_pre_xmit;
47378- hw_if->dev_read = xgbe_dev_read;
47379- hw_if->enable_int = xgbe_enable_int;
47380- hw_if->disable_int = xgbe_disable_int;
47381- hw_if->init = xgbe_init;
47382- hw_if->exit = xgbe_exit;
47383+const struct xgbe_hw_if default_xgbe_hw_if = {
47384+ .tx_complete = xgbe_tx_complete,
47385+
47386+ .set_promiscuous_mode = xgbe_set_promiscuous_mode,
47387+ .set_all_multicast_mode = xgbe_set_all_multicast_mode,
47388+ .add_mac_addresses = xgbe_add_mac_addresses,
47389+ .set_mac_address = xgbe_set_mac_address,
47390+
47391+ .enable_rx_csum = xgbe_enable_rx_csum,
47392+ .disable_rx_csum = xgbe_disable_rx_csum,
47393+
47394+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
47395+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
47396+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
47397+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
47398+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
47399+
47400+ .read_mmd_regs = xgbe_read_mmd_regs,
47401+ .write_mmd_regs = xgbe_write_mmd_regs,
47402+
47403+ .set_gmii_speed = xgbe_set_gmii_speed,
47404+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
47405+ .set_xgmii_speed = xgbe_set_xgmii_speed,
47406+
47407+ .enable_tx = xgbe_enable_tx,
47408+ .disable_tx = xgbe_disable_tx,
47409+ .enable_rx = xgbe_enable_rx,
47410+ .disable_rx = xgbe_disable_rx,
47411+
47412+ .powerup_tx = xgbe_powerup_tx,
47413+ .powerdown_tx = xgbe_powerdown_tx,
47414+ .powerup_rx = xgbe_powerup_rx,
47415+ .powerdown_rx = xgbe_powerdown_rx,
47416+
47417+ .pre_xmit = xgbe_pre_xmit,
47418+ .dev_read = xgbe_dev_read,
47419+ .enable_int = xgbe_enable_int,
47420+ .disable_int = xgbe_disable_int,
47421+ .init = xgbe_init,
47422+ .exit = xgbe_exit,
47423
47424 /* Descriptor related Sequences have to be initialized here */
47425- hw_if->tx_desc_init = xgbe_tx_desc_init;
47426- hw_if->rx_desc_init = xgbe_rx_desc_init;
47427- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
47428- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
47429- hw_if->is_last_desc = xgbe_is_last_desc;
47430- hw_if->is_context_desc = xgbe_is_context_desc;
47431+ .tx_desc_init = xgbe_tx_desc_init,
47432+ .rx_desc_init = xgbe_rx_desc_init,
47433+ .tx_desc_reset = xgbe_tx_desc_reset,
47434+ .rx_desc_reset = xgbe_rx_desc_reset,
47435+ .is_last_desc = xgbe_is_last_desc,
47436+ .is_context_desc = xgbe_is_context_desc,
47437
47438 /* For FLOW ctrl */
47439- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
47440- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
47441+ .config_tx_flow_control = xgbe_config_tx_flow_control,
47442+ .config_rx_flow_control = xgbe_config_rx_flow_control,
47443
47444 /* For RX coalescing */
47445- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
47446- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
47447- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
47448- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
47449+ .config_rx_coalesce = xgbe_config_rx_coalesce,
47450+ .config_tx_coalesce = xgbe_config_tx_coalesce,
47451+ .usec_to_riwt = xgbe_usec_to_riwt,
47452+ .riwt_to_usec = xgbe_riwt_to_usec,
47453
47454 /* For RX and TX threshold config */
47455- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
47456- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
47457+ .config_rx_threshold = xgbe_config_rx_threshold,
47458+ .config_tx_threshold = xgbe_config_tx_threshold,
47459
47460 /* For RX and TX Store and Forward Mode config */
47461- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
47462- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
47463+ .config_rsf_mode = xgbe_config_rsf_mode,
47464+ .config_tsf_mode = xgbe_config_tsf_mode,
47465
47466 /* For TX DMA Operating on Second Frame config */
47467- hw_if->config_osp_mode = xgbe_config_osp_mode;
47468+ .config_osp_mode = xgbe_config_osp_mode,
47469
47470 /* For RX and TX PBL config */
47471- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
47472- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
47473- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
47474- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
47475- hw_if->config_pblx8 = xgbe_config_pblx8;
47476+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
47477+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
47478+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
47479+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
47480+ .config_pblx8 = xgbe_config_pblx8,
47481
47482 /* For MMC statistics support */
47483- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
47484- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
47485- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
47486+ .tx_mmc_int = xgbe_tx_mmc_int,
47487+ .rx_mmc_int = xgbe_rx_mmc_int,
47488+ .read_mmc_stats = xgbe_read_mmc_stats,
47489
47490 /* For PTP config */
47491- hw_if->config_tstamp = xgbe_config_tstamp;
47492- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
47493- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
47494- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
47495- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
47496+ .config_tstamp = xgbe_config_tstamp,
47497+ .update_tstamp_addend = xgbe_update_tstamp_addend,
47498+ .set_tstamp_time = xgbe_set_tstamp_time,
47499+ .get_tstamp_time = xgbe_get_tstamp_time,
47500+ .get_tx_tstamp = xgbe_get_tx_tstamp,
47501
47502 /* For Data Center Bridging config */
47503- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
47504- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
47505-
47506- DBGPR("<--xgbe_init_function_ptrs\n");
47507-}
47508+ .config_dcb_tc = xgbe_config_dcb_tc,
47509+ .config_dcb_pfc = xgbe_config_dcb_pfc,
47510+};
47511diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47512index 2349ea9..a83a677 100644
47513--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47514+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47515@@ -154,7 +154,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
47516
47517 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47518 {
47519- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47520+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47521 struct xgbe_channel *channel;
47522 enum xgbe_int int_id;
47523 unsigned int i;
47524@@ -176,7 +176,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47525
47526 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47527 {
47528- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47529+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47530 struct xgbe_channel *channel;
47531 enum xgbe_int int_id;
47532 unsigned int i;
47533@@ -199,7 +199,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47534 static irqreturn_t xgbe_isr(int irq, void *data)
47535 {
47536 struct xgbe_prv_data *pdata = data;
47537- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47538+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47539 struct xgbe_channel *channel;
47540 unsigned int dma_isr, dma_ch_isr;
47541 unsigned int mac_isr, mac_tssr;
47542@@ -446,7 +446,7 @@ static void xgbe_napi_disable(struct xgbe_prv_data *pdata, unsigned int del)
47543
47544 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47545 {
47546- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47547+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47548
47549 DBGPR("-->xgbe_init_tx_coalesce\n");
47550
47551@@ -460,7 +460,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47552
47553 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47554 {
47555- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47556+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47557
47558 DBGPR("-->xgbe_init_rx_coalesce\n");
47559
47560@@ -474,7 +474,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47561
47562 static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
47563 {
47564- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47565+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47566 struct xgbe_channel *channel;
47567 struct xgbe_ring *ring;
47568 struct xgbe_ring_data *rdata;
47569@@ -499,7 +499,7 @@ static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
47570
47571 static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
47572 {
47573- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47574+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47575 struct xgbe_channel *channel;
47576 struct xgbe_ring *ring;
47577 struct xgbe_ring_data *rdata;
47578@@ -525,7 +525,7 @@ static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
47579 static void xgbe_adjust_link(struct net_device *netdev)
47580 {
47581 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47582- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47583+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47584 struct phy_device *phydev = pdata->phydev;
47585 int new_state = 0;
47586
47587@@ -633,7 +633,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
47588 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47589 {
47590 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47591- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47592+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47593 unsigned long flags;
47594
47595 DBGPR("-->xgbe_powerdown\n");
47596@@ -671,7 +671,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47597 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47598 {
47599 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47600- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47601+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47602 unsigned long flags;
47603
47604 DBGPR("-->xgbe_powerup\n");
47605@@ -708,7 +708,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47606
47607 static int xgbe_start(struct xgbe_prv_data *pdata)
47608 {
47609- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47610+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47611 struct net_device *netdev = pdata->netdev;
47612
47613 DBGPR("-->xgbe_start\n");
47614@@ -734,7 +734,7 @@ static int xgbe_start(struct xgbe_prv_data *pdata)
47615
47616 static void xgbe_stop(struct xgbe_prv_data *pdata)
47617 {
47618- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47619+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47620 struct net_device *netdev = pdata->netdev;
47621
47622 DBGPR("-->xgbe_stop\n");
47623@@ -754,7 +754,7 @@ static void xgbe_stop(struct xgbe_prv_data *pdata)
47624
47625 static void xgbe_restart_dev(struct xgbe_prv_data *pdata, unsigned int reset)
47626 {
47627- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47628+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47629
47630 DBGPR("-->xgbe_restart_dev\n");
47631
47632@@ -951,7 +951,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
47633 return -ERANGE;
47634 }
47635
47636- pdata->hw_if.config_tstamp(pdata, mac_tscr);
47637+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
47638
47639 memcpy(&pdata->tstamp_config, &config, sizeof(config));
47640
47641@@ -1089,8 +1089,8 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
47642 static int xgbe_open(struct net_device *netdev)
47643 {
47644 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47645- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47646- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47647+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47648+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47649 int ret;
47650
47651 DBGPR("-->xgbe_open\n");
47652@@ -1170,8 +1170,8 @@ err_phy_init:
47653 static int xgbe_close(struct net_device *netdev)
47654 {
47655 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47656- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47657- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47658+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47659+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47660
47661 DBGPR("-->xgbe_close\n");
47662
47663@@ -1205,8 +1205,8 @@ static int xgbe_close(struct net_device *netdev)
47664 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
47665 {
47666 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47667- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47668- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47669+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47670+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47671 struct xgbe_channel *channel;
47672 struct xgbe_ring *ring;
47673 struct xgbe_packet_data *packet;
47674@@ -1275,7 +1275,7 @@ tx_netdev_return:
47675 static void xgbe_set_rx_mode(struct net_device *netdev)
47676 {
47677 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47678- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47679+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47680 unsigned int pr_mode, am_mode;
47681
47682 DBGPR("-->xgbe_set_rx_mode\n");
47683@@ -1294,7 +1294,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
47684 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
47685 {
47686 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47687- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47688+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47689 struct sockaddr *saddr = addr;
47690
47691 DBGPR("-->xgbe_set_mac_address\n");
47692@@ -1361,7 +1361,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
47693
47694 DBGPR("-->%s\n", __func__);
47695
47696- pdata->hw_if.read_mmc_stats(pdata);
47697+ pdata->hw_if->read_mmc_stats(pdata);
47698
47699 s->rx_packets = pstats->rxframecount_gb;
47700 s->rx_bytes = pstats->rxoctetcount_gb;
47701@@ -1388,7 +1388,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
47702 u16 vid)
47703 {
47704 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47705- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47706+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47707
47708 DBGPR("-->%s\n", __func__);
47709
47710@@ -1404,7 +1404,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
47711 u16 vid)
47712 {
47713 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47714- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47715+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47716
47717 DBGPR("-->%s\n", __func__);
47718
47719@@ -1464,7 +1464,7 @@ static int xgbe_set_features(struct net_device *netdev,
47720 netdev_features_t features)
47721 {
47722 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47723- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47724+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47725 netdev_features_t rxcsum, rxvlan, rxvlan_filter;
47726
47727 rxcsum = pdata->netdev_features & NETIF_F_RXCSUM;
47728@@ -1520,7 +1520,7 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
47729 static void xgbe_rx_refresh(struct xgbe_channel *channel)
47730 {
47731 struct xgbe_prv_data *pdata = channel->pdata;
47732- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47733+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47734 struct xgbe_ring *ring = channel->rx_ring;
47735 struct xgbe_ring_data *rdata;
47736
47737@@ -1536,8 +1536,8 @@ static void xgbe_rx_refresh(struct xgbe_channel *channel)
47738 static int xgbe_tx_poll(struct xgbe_channel *channel)
47739 {
47740 struct xgbe_prv_data *pdata = channel->pdata;
47741- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47742- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47743+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47744+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47745 struct xgbe_ring *ring = channel->tx_ring;
47746 struct xgbe_ring_data *rdata;
47747 struct xgbe_ring_desc *rdesc;
47748@@ -1589,7 +1589,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
47749 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
47750 {
47751 struct xgbe_prv_data *pdata = channel->pdata;
47752- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47753+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47754 struct xgbe_ring *ring = channel->rx_ring;
47755 struct xgbe_ring_data *rdata;
47756 struct xgbe_packet_data *packet;
47757diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47758index 49508ec..2617cca 100644
47759--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47760+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47761@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
47762
47763 DBGPR("-->%s\n", __func__);
47764
47765- pdata->hw_if.read_mmc_stats(pdata);
47766+ pdata->hw_if->read_mmc_stats(pdata);
47767 for (i = 0; i < XGBE_STATS_COUNT; i++) {
47768 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
47769 *data++ = *(u64 *)stat;
47770@@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
47771 struct ethtool_coalesce *ec)
47772 {
47773 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47774- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47775+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47776 unsigned int riwt;
47777
47778 DBGPR("-->xgbe_get_coalesce\n");
47779@@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
47780 struct ethtool_coalesce *ec)
47781 {
47782 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47783- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47784+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47785 unsigned int rx_frames, rx_riwt, rx_usecs;
47786 unsigned int tx_frames, tx_usecs;
47787
47788diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47789index f5a8fa0..0bb58ff 100644
47790--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47791+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47792@@ -209,12 +209,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
47793 DBGPR("<--xgbe_default_config\n");
47794 }
47795
47796-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
47797-{
47798- xgbe_init_function_ptrs_dev(&pdata->hw_if);
47799- xgbe_init_function_ptrs_desc(&pdata->desc_if);
47800-}
47801-
47802 static int xgbe_probe(struct platform_device *pdev)
47803 {
47804 struct xgbe_prv_data *pdata;
47805@@ -327,9 +321,8 @@ static int xgbe_probe(struct platform_device *pdev)
47806 netdev->base_addr = (unsigned long)pdata->xgmac_regs;
47807
47808 /* Set all the function pointers */
47809- xgbe_init_all_fptrs(pdata);
47810- hw_if = &pdata->hw_if;
47811- desc_if = &pdata->desc_if;
47812+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
47813+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
47814
47815 /* Issue software reset to device */
47816 hw_if->exit(pdata);
47817diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47818index 363b210..b241389 100644
47819--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47820+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47821@@ -126,7 +126,7 @@
47822 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
47823 {
47824 struct xgbe_prv_data *pdata = mii->priv;
47825- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47826+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47827 int mmd_data;
47828
47829 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
47830@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
47831 u16 mmd_val)
47832 {
47833 struct xgbe_prv_data *pdata = mii->priv;
47834- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47835+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47836 int mmd_data = mmd_val;
47837
47838 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
47839diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47840index a1bf9d1c..84adcab 100644
47841--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47842+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47843@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
47844 tstamp_cc);
47845 u64 nsec;
47846
47847- nsec = pdata->hw_if.get_tstamp_time(pdata);
47848+ nsec = pdata->hw_if->get_tstamp_time(pdata);
47849
47850 return nsec;
47851 }
47852@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
47853
47854 spin_lock_irqsave(&pdata->tstamp_lock, flags);
47855
47856- pdata->hw_if.update_tstamp_addend(pdata, addend);
47857+ pdata->hw_if->update_tstamp_addend(pdata, addend);
47858
47859 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
47860
47861diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
47862index 789957d..d7d0245 100644
47863--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
47864+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
47865@@ -583,8 +583,8 @@ struct xgbe_prv_data {
47866
47867 int irq_number;
47868
47869- struct xgbe_hw_if hw_if;
47870- struct xgbe_desc_if desc_if;
47871+ const struct xgbe_hw_if *hw_if;
47872+ const struct xgbe_desc_if *desc_if;
47873
47874 /* AXI DMA settings */
47875 unsigned int axdomain;
47876@@ -697,6 +697,9 @@ struct xgbe_prv_data {
47877 #endif
47878 };
47879
47880+extern const struct xgbe_hw_if default_xgbe_hw_if;
47881+extern const struct xgbe_desc_if default_xgbe_desc_if;
47882+
47883 /* Function prototypes*/
47884
47885 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
47886diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47887index adcacda..fa6e0ae 100644
47888--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47889+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47890@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
47891 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
47892 {
47893 /* RX_MODE controlling object */
47894- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
47895+ bnx2x_init_rx_mode_obj(bp);
47896
47897 /* multicast configuration controlling object */
47898 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
47899diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47900index 7bc2924..2112002 100644
47901--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47902+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47903@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
47904 return rc;
47905 }
47906
47907-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
47908- struct bnx2x_rx_mode_obj *o)
47909+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
47910 {
47911 if (CHIP_IS_E1x(bp)) {
47912- o->wait_comp = bnx2x_empty_rx_mode_wait;
47913- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
47914+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
47915+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
47916 } else {
47917- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
47918- o->config_rx_mode = bnx2x_set_rx_mode_e2;
47919+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
47920+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
47921 }
47922 }
47923
47924diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47925index e97275f..52e28bc 100644
47926--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47927+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47928@@ -1409,8 +1409,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
47929
47930 /********************* RX MODE ****************/
47931
47932-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
47933- struct bnx2x_rx_mode_obj *o);
47934+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
47935
47936 /**
47937 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
47938diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
47939index 31c9f82..e65e986 100644
47940--- a/drivers/net/ethernet/broadcom/tg3.h
47941+++ b/drivers/net/ethernet/broadcom/tg3.h
47942@@ -150,6 +150,7 @@
47943 #define CHIPREV_ID_5750_A0 0x4000
47944 #define CHIPREV_ID_5750_A1 0x4001
47945 #define CHIPREV_ID_5750_A3 0x4003
47946+#define CHIPREV_ID_5750_C1 0x4201
47947 #define CHIPREV_ID_5750_C2 0x4202
47948 #define CHIPREV_ID_5752_A0_HW 0x5000
47949 #define CHIPREV_ID_5752_A0 0x6000
47950diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
47951index 903466e..b285864 100644
47952--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
47953+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
47954@@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
47955 }
47956
47957 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
47958- bna_cb_ioceth_enable,
47959- bna_cb_ioceth_disable,
47960- bna_cb_ioceth_hbfail,
47961- bna_cb_ioceth_reset
47962+ .enable_cbfn = bna_cb_ioceth_enable,
47963+ .disable_cbfn = bna_cb_ioceth_disable,
47964+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
47965+ .reset_cbfn = bna_cb_ioceth_reset
47966 };
47967
47968 static void bna_attr_init(struct bna_ioceth *ioceth)
47969diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
47970index 8cffcdf..aadf043 100644
47971--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
47972+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
47973@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
47974 */
47975 struct l2t_skb_cb {
47976 arp_failure_handler_func arp_failure_handler;
47977-};
47978+} __no_const;
47979
47980 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
47981
47982diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
47983index 279873c..11e1921 100644
47984--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
47985+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
47986@@ -2365,7 +2365,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
47987
47988 int i;
47989 struct adapter *ap = netdev2adap(dev);
47990- static const unsigned int *reg_ranges;
47991+ const unsigned int *reg_ranges;
47992 int arr_size = 0, buf_size = 0;
47993
47994 if (is_t4(ap->params.chip)) {
47995diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
47996index cf8b6ff..274271e 100644
47997--- a/drivers/net/ethernet/dec/tulip/de4x5.c
47998+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
47999@@ -5387,7 +5387,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48000 for (i=0; i<ETH_ALEN; i++) {
48001 tmp.addr[i] = dev->dev_addr[i];
48002 }
48003- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48004+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48005 break;
48006
48007 case DE4X5_SET_HWADDR: /* Set the hardware address */
48008@@ -5427,7 +5427,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48009 spin_lock_irqsave(&lp->lock, flags);
48010 memcpy(&statbuf, &lp->pktStats, ioc->len);
48011 spin_unlock_irqrestore(&lp->lock, flags);
48012- if (copy_to_user(ioc->data, &statbuf, ioc->len))
48013+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
48014 return -EFAULT;
48015 break;
48016 }
48017diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
48018index 597c463..5cc1a7f 100644
48019--- a/drivers/net/ethernet/emulex/benet/be_main.c
48020+++ b/drivers/net/ethernet/emulex/benet/be_main.c
48021@@ -537,7 +537,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
48022
48023 if (wrapped)
48024 newacc += 65536;
48025- ACCESS_ONCE(*acc) = newacc;
48026+ ACCESS_ONCE_RW(*acc) = newacc;
48027 }
48028
48029 static void populate_erx_stats(struct be_adapter *adapter,
48030diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
48031index c77fa4a..7fd42fc 100644
48032--- a/drivers/net/ethernet/faraday/ftgmac100.c
48033+++ b/drivers/net/ethernet/faraday/ftgmac100.c
48034@@ -30,6 +30,8 @@
48035 #include <linux/netdevice.h>
48036 #include <linux/phy.h>
48037 #include <linux/platform_device.h>
48038+#include <linux/interrupt.h>
48039+#include <linux/irqreturn.h>
48040 #include <net/ip.h>
48041
48042 #include "ftgmac100.h"
48043diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
48044index 4ff1adc..0ea6bf4 100644
48045--- a/drivers/net/ethernet/faraday/ftmac100.c
48046+++ b/drivers/net/ethernet/faraday/ftmac100.c
48047@@ -31,6 +31,8 @@
48048 #include <linux/module.h>
48049 #include <linux/netdevice.h>
48050 #include <linux/platform_device.h>
48051+#include <linux/interrupt.h>
48052+#include <linux/irqreturn.h>
48053
48054 #include "ftmac100.h"
48055
48056diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48057index 537b621..07f87ce 100644
48058--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48059+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48060@@ -401,7 +401,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
48061 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
48062
48063 /* Update the base adjustement value. */
48064- ACCESS_ONCE(pf->ptp_base_adj) = incval;
48065+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
48066 smp_mb(); /* Force the above update. */
48067 }
48068
48069diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48070index 5fd4b52..87aa34b 100644
48071--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48072+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48073@@ -794,7 +794,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
48074 }
48075
48076 /* update the base incval used to calculate frequency adjustment */
48077- ACCESS_ONCE(adapter->base_incval) = incval;
48078+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
48079 smp_mb();
48080
48081 /* need lock to prevent incorrect read while modifying cyclecounter */
48082diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48083index 454d9fe..59f0f0b 100644
48084--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48085+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48086@@ -458,8 +458,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
48087 wmb();
48088
48089 /* we want to dirty this cache line once */
48090- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
48091- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
48092+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
48093+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
48094
48095 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
48096
48097diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48098index 2bbd01f..e8baa64 100644
48099--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
48100+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48101@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48102 struct __vxge_hw_fifo *fifo;
48103 struct vxge_hw_fifo_config *config;
48104 u32 txdl_size, txdl_per_memblock;
48105- struct vxge_hw_mempool_cbs fifo_mp_callback;
48106+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
48107+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
48108+ };
48109+
48110 struct __vxge_hw_virtualpath *vpath;
48111
48112 if ((vp == NULL) || (attr == NULL)) {
48113@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48114 goto exit;
48115 }
48116
48117- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
48118-
48119 fifo->mempool =
48120 __vxge_hw_mempool_create(vpath->hldev,
48121 fifo->config->memblock_size,
48122diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48123index 2bb48d5..d1a865d 100644
48124--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48125+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48126@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
48127 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
48128 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
48129 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
48130- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48131+ pax_open_kernel();
48132+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48133+ pax_close_kernel();
48134 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48135 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
48136 max_tx_rings = QLCNIC_MAX_TX_RINGS;
48137diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48138index be7d7a6..a8983f8 100644
48139--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48140+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48141@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
48142 case QLCNIC_NON_PRIV_FUNC:
48143 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
48144 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48145- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48146+ pax_open_kernel();
48147+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48148+ pax_close_kernel();
48149 break;
48150 case QLCNIC_PRIV_FUNC:
48151 ahw->op_mode = QLCNIC_PRIV_FUNC;
48152 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
48153- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48154+ pax_open_kernel();
48155+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48156+ pax_close_kernel();
48157 break;
48158 case QLCNIC_MGMT_FUNC:
48159 ahw->op_mode = QLCNIC_MGMT_FUNC;
48160 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48161- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48162+ pax_open_kernel();
48163+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48164+ pax_close_kernel();
48165 break;
48166 default:
48167 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
48168diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48169index c9f57fb..208bdc1 100644
48170--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48171+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48172@@ -1285,7 +1285,7 @@ flash_temp:
48173 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
48174 {
48175 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
48176- static const struct qlcnic_dump_operations *fw_dump_ops;
48177+ const struct qlcnic_dump_operations *fw_dump_ops;
48178 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
48179 u32 entry_offset, dump, no_entries, buf_offset = 0;
48180 int i, k, ops_cnt, ops_index, dump_size = 0;
48181diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
48182index cf154f7..c948d1b 100644
48183--- a/drivers/net/ethernet/realtek/r8169.c
48184+++ b/drivers/net/ethernet/realtek/r8169.c
48185@@ -788,22 +788,22 @@ struct rtl8169_private {
48186 struct mdio_ops {
48187 void (*write)(struct rtl8169_private *, int, int);
48188 int (*read)(struct rtl8169_private *, int);
48189- } mdio_ops;
48190+ } __no_const mdio_ops;
48191
48192 struct pll_power_ops {
48193 void (*down)(struct rtl8169_private *);
48194 void (*up)(struct rtl8169_private *);
48195- } pll_power_ops;
48196+ } __no_const pll_power_ops;
48197
48198 struct jumbo_ops {
48199 void (*enable)(struct rtl8169_private *);
48200 void (*disable)(struct rtl8169_private *);
48201- } jumbo_ops;
48202+ } __no_const jumbo_ops;
48203
48204 struct csi_ops {
48205 void (*write)(struct rtl8169_private *, int, int);
48206 u32 (*read)(struct rtl8169_private *, int);
48207- } csi_ops;
48208+ } __no_const csi_ops;
48209
48210 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
48211 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
48212diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
48213index 6b861e3..204ac86 100644
48214--- a/drivers/net/ethernet/sfc/ptp.c
48215+++ b/drivers/net/ethernet/sfc/ptp.c
48216@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
48217 ptp->start.dma_addr);
48218
48219 /* Clear flag that signals MC ready */
48220- ACCESS_ONCE(*start) = 0;
48221+ ACCESS_ONCE_RW(*start) = 0;
48222 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
48223 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
48224 EFX_BUG_ON_PARANOID(rc);
48225diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48226index 08c483b..2c4a553 100644
48227--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48228+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48229@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
48230
48231 writel(value, ioaddr + MMC_CNTRL);
48232
48233- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48234- MMC_CNTRL, value);
48235+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48236+// MMC_CNTRL, value);
48237 }
48238
48239 /* To mask all all interrupts.*/
48240diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
48241index 2f48f79..8ae1a1a 100644
48242--- a/drivers/net/hyperv/hyperv_net.h
48243+++ b/drivers/net/hyperv/hyperv_net.h
48244@@ -171,7 +171,7 @@ struct rndis_device {
48245 enum rndis_device_state state;
48246 bool link_state;
48247 bool link_change;
48248- atomic_t new_req_id;
48249+ atomic_unchecked_t new_req_id;
48250
48251 spinlock_t request_lock;
48252 struct list_head req_list;
48253diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
48254index 2b86f0b..ecc996f 100644
48255--- a/drivers/net/hyperv/rndis_filter.c
48256+++ b/drivers/net/hyperv/rndis_filter.c
48257@@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
48258 * template
48259 */
48260 set = &rndis_msg->msg.set_req;
48261- set->req_id = atomic_inc_return(&dev->new_req_id);
48262+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48263
48264 /* Add to the request list */
48265 spin_lock_irqsave(&dev->request_lock, flags);
48266@@ -911,7 +911,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
48267
48268 /* Setup the rndis set */
48269 halt = &request->request_msg.msg.halt_req;
48270- halt->req_id = atomic_inc_return(&dev->new_req_id);
48271+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48272
48273 /* Ignore return since this msg is optional. */
48274 rndis_filter_send_request(dev, request);
48275diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
48276index 6cbc56a..5f7e6c8 100644
48277--- a/drivers/net/ieee802154/fakehard.c
48278+++ b/drivers/net/ieee802154/fakehard.c
48279@@ -365,7 +365,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
48280 phy->transmit_power = 0xbf;
48281
48282 dev->netdev_ops = &fake_ops;
48283- dev->ml_priv = &fake_mlme;
48284+ dev->ml_priv = (void *)&fake_mlme;
48285
48286 priv = netdev_priv(dev);
48287 priv->phy = phy;
48288diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
48289index 34f846b..4a0d5b1 100644
48290--- a/drivers/net/ifb.c
48291+++ b/drivers/net/ifb.c
48292@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
48293 return 0;
48294 }
48295
48296-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
48297+static struct rtnl_link_ops ifb_link_ops = {
48298 .kind = "ifb",
48299 .priv_size = sizeof(struct ifb_private),
48300 .setup = ifb_setup,
48301diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
48302index bfb0b6e..5c396ce 100644
48303--- a/drivers/net/macvlan.c
48304+++ b/drivers/net/macvlan.c
48305@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
48306 free_nskb:
48307 kfree_skb(nskb);
48308 err:
48309- atomic_long_inc(&skb->dev->rx_dropped);
48310+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
48311 }
48312
48313 static void macvlan_flush_sources(struct macvlan_port *port,
48314@@ -1454,13 +1454,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
48315 int macvlan_link_register(struct rtnl_link_ops *ops)
48316 {
48317 /* common fields */
48318- ops->priv_size = sizeof(struct macvlan_dev);
48319- ops->validate = macvlan_validate;
48320- ops->maxtype = IFLA_MACVLAN_MAX;
48321- ops->policy = macvlan_policy;
48322- ops->changelink = macvlan_changelink;
48323- ops->get_size = macvlan_get_size;
48324- ops->fill_info = macvlan_fill_info;
48325+ pax_open_kernel();
48326+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
48327+ *(void **)&ops->validate = macvlan_validate;
48328+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
48329+ *(const void **)&ops->policy = macvlan_policy;
48330+ *(void **)&ops->changelink = macvlan_changelink;
48331+ *(void **)&ops->get_size = macvlan_get_size;
48332+ *(void **)&ops->fill_info = macvlan_fill_info;
48333+ pax_close_kernel();
48334
48335 return rtnl_link_register(ops);
48336 };
48337@@ -1540,7 +1542,7 @@ static int macvlan_device_event(struct notifier_block *unused,
48338 return NOTIFY_DONE;
48339 }
48340
48341-static struct notifier_block macvlan_notifier_block __read_mostly = {
48342+static struct notifier_block macvlan_notifier_block = {
48343 .notifier_call = macvlan_device_event,
48344 };
48345
48346diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
48347index 880cc09..6a68ba6 100644
48348--- a/drivers/net/macvtap.c
48349+++ b/drivers/net/macvtap.c
48350@@ -422,7 +422,7 @@ static void macvtap_setup(struct net_device *dev)
48351 dev->tx_queue_len = TUN_READQ_SIZE;
48352 }
48353
48354-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
48355+static struct rtnl_link_ops macvtap_link_ops = {
48356 .kind = "macvtap",
48357 .setup = macvtap_setup,
48358 .newlink = macvtap_newlink,
48359@@ -1020,7 +1020,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
48360 }
48361
48362 ret = 0;
48363- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48364+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48365 put_user(q->flags, &ifr->ifr_flags))
48366 ret = -EFAULT;
48367 macvtap_put_vlan(vlan);
48368@@ -1190,7 +1190,7 @@ static int macvtap_device_event(struct notifier_block *unused,
48369 return NOTIFY_DONE;
48370 }
48371
48372-static struct notifier_block macvtap_notifier_block __read_mostly = {
48373+static struct notifier_block macvtap_notifier_block = {
48374 .notifier_call = macvtap_device_event,
48375 };
48376
48377diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
48378index 34924df..a747360 100644
48379--- a/drivers/net/nlmon.c
48380+++ b/drivers/net/nlmon.c
48381@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
48382 return 0;
48383 }
48384
48385-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
48386+static struct rtnl_link_ops nlmon_link_ops = {
48387 .kind = "nlmon",
48388 .priv_size = sizeof(struct nlmon),
48389 .setup = nlmon_setup,
48390diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
48391index 794a473..9fd437b 100644
48392--- a/drivers/net/ppp/ppp_generic.c
48393+++ b/drivers/net/ppp/ppp_generic.c
48394@@ -1020,7 +1020,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48395 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
48396 struct ppp_stats stats;
48397 struct ppp_comp_stats cstats;
48398- char *vers;
48399
48400 switch (cmd) {
48401 case SIOCGPPPSTATS:
48402@@ -1042,8 +1041,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48403 break;
48404
48405 case SIOCGPPPVER:
48406- vers = PPP_VERSION;
48407- if (copy_to_user(addr, vers, strlen(vers) + 1))
48408+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
48409 break;
48410 err = 0;
48411 break;
48412diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
48413index 079f7ad..b2a2bfa7 100644
48414--- a/drivers/net/slip/slhc.c
48415+++ b/drivers/net/slip/slhc.c
48416@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
48417 register struct tcphdr *thp;
48418 register struct iphdr *ip;
48419 register struct cstate *cs;
48420- int len, hdrlen;
48421+ long len, hdrlen;
48422 unsigned char *cp = icp;
48423
48424 /* We've got a compressed packet; read the change byte */
48425diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
48426index 2368395..bf6fe96 100644
48427--- a/drivers/net/team/team.c
48428+++ b/drivers/net/team/team.c
48429@@ -2090,7 +2090,7 @@ static unsigned int team_get_num_rx_queues(void)
48430 return TEAM_DEFAULT_NUM_RX_QUEUES;
48431 }
48432
48433-static struct rtnl_link_ops team_link_ops __read_mostly = {
48434+static struct rtnl_link_ops team_link_ops = {
48435 .kind = DRV_NAME,
48436 .priv_size = sizeof(struct team),
48437 .setup = team_setup,
48438@@ -2880,7 +2880,7 @@ static int team_device_event(struct notifier_block *unused,
48439 return NOTIFY_DONE;
48440 }
48441
48442-static struct notifier_block team_notifier_block __read_mostly = {
48443+static struct notifier_block team_notifier_block = {
48444 .notifier_call = team_device_event,
48445 };
48446
48447diff --git a/drivers/net/tun.c b/drivers/net/tun.c
48448index 9dd3746..74f191e 100644
48449--- a/drivers/net/tun.c
48450+++ b/drivers/net/tun.c
48451@@ -1426,7 +1426,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
48452 return -EINVAL;
48453 }
48454
48455-static struct rtnl_link_ops tun_link_ops __read_mostly = {
48456+static struct rtnl_link_ops tun_link_ops = {
48457 .kind = DRV_NAME,
48458 .priv_size = sizeof(struct tun_struct),
48459 .setup = tun_setup,
48460@@ -1868,7 +1868,7 @@ unlock:
48461 }
48462
48463 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48464- unsigned long arg, int ifreq_len)
48465+ unsigned long arg, size_t ifreq_len)
48466 {
48467 struct tun_file *tfile = file->private_data;
48468 struct tun_struct *tun;
48469@@ -1881,6 +1881,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48470 unsigned int ifindex;
48471 int ret;
48472
48473+ if (ifreq_len > sizeof ifr)
48474+ return -EFAULT;
48475+
48476 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
48477 if (copy_from_user(&ifr, argp, ifreq_len))
48478 return -EFAULT;
48479diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
48480index babda7d..e40c90a 100644
48481--- a/drivers/net/usb/hso.c
48482+++ b/drivers/net/usb/hso.c
48483@@ -71,7 +71,7 @@
48484 #include <asm/byteorder.h>
48485 #include <linux/serial_core.h>
48486 #include <linux/serial.h>
48487-
48488+#include <asm/local.h>
48489
48490 #define MOD_AUTHOR "Option Wireless"
48491 #define MOD_DESCRIPTION "USB High Speed Option driver"
48492@@ -1178,7 +1178,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
48493 struct urb *urb;
48494
48495 urb = serial->rx_urb[0];
48496- if (serial->port.count > 0) {
48497+ if (atomic_read(&serial->port.count) > 0) {
48498 count = put_rxbuf_data(urb, serial);
48499 if (count == -1)
48500 return;
48501@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
48502 DUMP1(urb->transfer_buffer, urb->actual_length);
48503
48504 /* Anyone listening? */
48505- if (serial->port.count == 0)
48506+ if (atomic_read(&serial->port.count) == 0)
48507 return;
48508
48509 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
48510@@ -1278,8 +1278,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48511 tty_port_tty_set(&serial->port, tty);
48512
48513 /* check for port already opened, if not set the termios */
48514- serial->port.count++;
48515- if (serial->port.count == 1) {
48516+ if (atomic_inc_return(&serial->port.count) == 1) {
48517 serial->rx_state = RX_IDLE;
48518 /* Force default termio settings */
48519 _hso_serial_set_termios(tty, NULL);
48520@@ -1289,7 +1288,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48521 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
48522 if (result) {
48523 hso_stop_serial_device(serial->parent);
48524- serial->port.count--;
48525+ atomic_dec(&serial->port.count);
48526 kref_put(&serial->parent->ref, hso_serial_ref_free);
48527 }
48528 } else {
48529@@ -1326,10 +1325,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
48530
48531 /* reset the rts and dtr */
48532 /* do the actual close */
48533- serial->port.count--;
48534+ atomic_dec(&serial->port.count);
48535
48536- if (serial->port.count <= 0) {
48537- serial->port.count = 0;
48538+ if (atomic_read(&serial->port.count) <= 0) {
48539+ atomic_set(&serial->port.count, 0);
48540 tty_port_tty_set(&serial->port, NULL);
48541 if (!usb_gone)
48542 hso_stop_serial_device(serial->parent);
48543@@ -1404,7 +1403,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
48544
48545 /* the actual setup */
48546 spin_lock_irqsave(&serial->serial_lock, flags);
48547- if (serial->port.count)
48548+ if (atomic_read(&serial->port.count))
48549 _hso_serial_set_termios(tty, old);
48550 else
48551 tty->termios = *old;
48552@@ -1873,7 +1872,7 @@ static void intr_callback(struct urb *urb)
48553 D1("Pending read interrupt on port %d\n", i);
48554 spin_lock(&serial->serial_lock);
48555 if (serial->rx_state == RX_IDLE &&
48556- serial->port.count > 0) {
48557+ atomic_read(&serial->port.count) > 0) {
48558 /* Setup and send a ctrl req read on
48559 * port i */
48560 if (!serial->rx_urb_filled[0]) {
48561@@ -3047,7 +3046,7 @@ static int hso_resume(struct usb_interface *iface)
48562 /* Start all serial ports */
48563 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
48564 if (serial_table[i] && (serial_table[i]->interface == iface)) {
48565- if (dev2ser(serial_table[i])->port.count) {
48566+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
48567 result =
48568 hso_start_serial_device(serial_table[i], GFP_NOIO);
48569 hso_kick_transmit(dev2ser(serial_table[i]));
48570diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
48571index c6554c7..7e2ebd7 100644
48572--- a/drivers/net/usb/r8152.c
48573+++ b/drivers/net/usb/r8152.c
48574@@ -577,7 +577,7 @@ struct r8152 {
48575 void (*unload)(struct r8152 *);
48576 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
48577 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
48578- } rtl_ops;
48579+ } __no_const rtl_ops;
48580
48581 int intr_interval;
48582 u32 saved_wolopts;
48583diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
48584index a2515887..6d13233 100644
48585--- a/drivers/net/usb/sierra_net.c
48586+++ b/drivers/net/usb/sierra_net.c
48587@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
48588 /* atomic counter partially included in MAC address to make sure 2 devices
48589 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
48590 */
48591-static atomic_t iface_counter = ATOMIC_INIT(0);
48592+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
48593
48594 /*
48595 * SYNC Timer Delay definition used to set the expiry time
48596@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
48597 dev->net->netdev_ops = &sierra_net_device_ops;
48598
48599 /* change MAC addr to include, ifacenum, and to be unique */
48600- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
48601+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
48602 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
48603
48604 /* we will have to manufacture ethernet headers, prepare template */
48605diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
48606index b0bc8ea..3af931b5 100644
48607--- a/drivers/net/virtio_net.c
48608+++ b/drivers/net/virtio_net.c
48609@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
48610 #define RECEIVE_AVG_WEIGHT 64
48611
48612 /* Minimum alignment for mergeable packet buffers. */
48613-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
48614+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
48615
48616 #define VIRTNET_DRIVER_VERSION "1.0.0"
48617
48618diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
48619index 42b2d6a5..2a2cb41 100644
48620--- a/drivers/net/vxlan.c
48621+++ b/drivers/net/vxlan.c
48622@@ -2695,7 +2695,7 @@ nla_put_failure:
48623 return -EMSGSIZE;
48624 }
48625
48626-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
48627+static struct rtnl_link_ops vxlan_link_ops = {
48628 .kind = "vxlan",
48629 .maxtype = IFLA_VXLAN_MAX,
48630 .policy = vxlan_policy,
48631@@ -2742,7 +2742,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
48632 return NOTIFY_DONE;
48633 }
48634
48635-static struct notifier_block vxlan_notifier_block __read_mostly = {
48636+static struct notifier_block vxlan_notifier_block = {
48637 .notifier_call = vxlan_lowerdev_event,
48638 };
48639
48640diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
48641index 5920c99..ff2e4a5 100644
48642--- a/drivers/net/wan/lmc/lmc_media.c
48643+++ b/drivers/net/wan/lmc/lmc_media.c
48644@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
48645 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
48646
48647 lmc_media_t lmc_ds3_media = {
48648- lmc_ds3_init, /* special media init stuff */
48649- lmc_ds3_default, /* reset to default state */
48650- lmc_ds3_set_status, /* reset status to state provided */
48651- lmc_dummy_set_1, /* set clock source */
48652- lmc_dummy_set2_1, /* set line speed */
48653- lmc_ds3_set_100ft, /* set cable length */
48654- lmc_ds3_set_scram, /* set scrambler */
48655- lmc_ds3_get_link_status, /* get link status */
48656- lmc_dummy_set_1, /* set link status */
48657- lmc_ds3_set_crc_length, /* set CRC length */
48658- lmc_dummy_set_1, /* set T1 or E1 circuit type */
48659- lmc_ds3_watchdog
48660+ .init = lmc_ds3_init, /* special media init stuff */
48661+ .defaults = lmc_ds3_default, /* reset to default state */
48662+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
48663+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
48664+ .set_speed = lmc_dummy_set2_1, /* set line speed */
48665+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
48666+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
48667+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
48668+ .set_link_status = lmc_dummy_set_1, /* set link status */
48669+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
48670+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48671+ .watchdog = lmc_ds3_watchdog
48672 };
48673
48674 lmc_media_t lmc_hssi_media = {
48675- lmc_hssi_init, /* special media init stuff */
48676- lmc_hssi_default, /* reset to default state */
48677- lmc_hssi_set_status, /* reset status to state provided */
48678- lmc_hssi_set_clock, /* set clock source */
48679- lmc_dummy_set2_1, /* set line speed */
48680- lmc_dummy_set_1, /* set cable length */
48681- lmc_dummy_set_1, /* set scrambler */
48682- lmc_hssi_get_link_status, /* get link status */
48683- lmc_hssi_set_link_status, /* set link status */
48684- lmc_hssi_set_crc_length, /* set CRC length */
48685- lmc_dummy_set_1, /* set T1 or E1 circuit type */
48686- lmc_hssi_watchdog
48687+ .init = lmc_hssi_init, /* special media init stuff */
48688+ .defaults = lmc_hssi_default, /* reset to default state */
48689+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
48690+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
48691+ .set_speed = lmc_dummy_set2_1, /* set line speed */
48692+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
48693+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48694+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
48695+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
48696+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
48697+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48698+ .watchdog = lmc_hssi_watchdog
48699 };
48700
48701-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
48702- lmc_ssi_default, /* reset to default state */
48703- lmc_ssi_set_status, /* reset status to state provided */
48704- lmc_ssi_set_clock, /* set clock source */
48705- lmc_ssi_set_speed, /* set line speed */
48706- lmc_dummy_set_1, /* set cable length */
48707- lmc_dummy_set_1, /* set scrambler */
48708- lmc_ssi_get_link_status, /* get link status */
48709- lmc_ssi_set_link_status, /* set link status */
48710- lmc_ssi_set_crc_length, /* set CRC length */
48711- lmc_dummy_set_1, /* set T1 or E1 circuit type */
48712- lmc_ssi_watchdog
48713+lmc_media_t lmc_ssi_media = {
48714+ .init = lmc_ssi_init, /* special media init stuff */
48715+ .defaults = lmc_ssi_default, /* reset to default state */
48716+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
48717+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
48718+ .set_speed = lmc_ssi_set_speed, /* set line speed */
48719+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
48720+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48721+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
48722+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
48723+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
48724+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48725+ .watchdog = lmc_ssi_watchdog
48726 };
48727
48728 lmc_media_t lmc_t1_media = {
48729- lmc_t1_init, /* special media init stuff */
48730- lmc_t1_default, /* reset to default state */
48731- lmc_t1_set_status, /* reset status to state provided */
48732- lmc_t1_set_clock, /* set clock source */
48733- lmc_dummy_set2_1, /* set line speed */
48734- lmc_dummy_set_1, /* set cable length */
48735- lmc_dummy_set_1, /* set scrambler */
48736- lmc_t1_get_link_status, /* get link status */
48737- lmc_dummy_set_1, /* set link status */
48738- lmc_t1_set_crc_length, /* set CRC length */
48739- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
48740- lmc_t1_watchdog
48741+ .init = lmc_t1_init, /* special media init stuff */
48742+ .defaults = lmc_t1_default, /* reset to default state */
48743+ .set_status = lmc_t1_set_status, /* reset status to state provided */
48744+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
48745+ .set_speed = lmc_dummy_set2_1, /* set line speed */
48746+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
48747+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48748+ .get_link_status = lmc_t1_get_link_status, /* get link status */
48749+ .set_link_status = lmc_dummy_set_1, /* set link status */
48750+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
48751+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
48752+ .watchdog = lmc_t1_watchdog
48753 };
48754
48755 static void
48756diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
48757index feacc3b..5bac0de 100644
48758--- a/drivers/net/wan/z85230.c
48759+++ b/drivers/net/wan/z85230.c
48760@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
48761
48762 struct z8530_irqhandler z8530_sync =
48763 {
48764- z8530_rx,
48765- z8530_tx,
48766- z8530_status
48767+ .rx = z8530_rx,
48768+ .tx = z8530_tx,
48769+ .status = z8530_status
48770 };
48771
48772 EXPORT_SYMBOL(z8530_sync);
48773@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
48774 }
48775
48776 static struct z8530_irqhandler z8530_dma_sync = {
48777- z8530_dma_rx,
48778- z8530_dma_tx,
48779- z8530_dma_status
48780+ .rx = z8530_dma_rx,
48781+ .tx = z8530_dma_tx,
48782+ .status = z8530_dma_status
48783 };
48784
48785 static struct z8530_irqhandler z8530_txdma_sync = {
48786- z8530_rx,
48787- z8530_dma_tx,
48788- z8530_dma_status
48789+ .rx = z8530_rx,
48790+ .tx = z8530_dma_tx,
48791+ .status = z8530_dma_status
48792 };
48793
48794 /**
48795@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
48796
48797 struct z8530_irqhandler z8530_nop=
48798 {
48799- z8530_rx_clear,
48800- z8530_tx_clear,
48801- z8530_status_clear
48802+ .rx = z8530_rx_clear,
48803+ .tx = z8530_tx_clear,
48804+ .status = z8530_status_clear
48805 };
48806
48807
48808diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
48809index 0b60295..b8bfa5b 100644
48810--- a/drivers/net/wimax/i2400m/rx.c
48811+++ b/drivers/net/wimax/i2400m/rx.c
48812@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
48813 if (i2400m->rx_roq == NULL)
48814 goto error_roq_alloc;
48815
48816- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
48817+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
48818 GFP_KERNEL);
48819 if (rd == NULL) {
48820 result = -ENOMEM;
48821diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
48822index e71a2ce..2268d61 100644
48823--- a/drivers/net/wireless/airo.c
48824+++ b/drivers/net/wireless/airo.c
48825@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
48826 struct airo_info *ai = dev->ml_priv;
48827 int ridcode;
48828 int enabled;
48829- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
48830+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
48831 unsigned char *iobuf;
48832
48833 /* Only super-user can write RIDs */
48834diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
48835index da92bfa..5a9001a 100644
48836--- a/drivers/net/wireless/at76c50x-usb.c
48837+++ b/drivers/net/wireless/at76c50x-usb.c
48838@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
48839 }
48840
48841 /* Convert timeout from the DFU status to jiffies */
48842-static inline unsigned long at76_get_timeout(struct dfu_status *s)
48843+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
48844 {
48845 return msecs_to_jiffies((s->poll_timeout[2] << 16)
48846 | (s->poll_timeout[1] << 8)
48847diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
48848index 676bd4e..0b807a3 100644
48849--- a/drivers/net/wireless/ath/ath10k/htc.c
48850+++ b/drivers/net/wireless/ath/ath10k/htc.c
48851@@ -848,7 +848,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
48852 /* registered target arrival callback from the HIF layer */
48853 int ath10k_htc_init(struct ath10k *ar)
48854 {
48855- struct ath10k_hif_cb htc_callbacks;
48856+ static struct ath10k_hif_cb htc_callbacks = {
48857+ .rx_completion = ath10k_htc_rx_completion_handler,
48858+ .tx_completion = ath10k_htc_tx_completion_handler,
48859+ };
48860 struct ath10k_htc_ep *ep = NULL;
48861 struct ath10k_htc *htc = &ar->htc;
48862
48863@@ -857,8 +860,6 @@ int ath10k_htc_init(struct ath10k *ar)
48864 ath10k_htc_reset_endpoint_states(htc);
48865
48866 /* setup HIF layer callbacks */
48867- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
48868- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
48869 htc->ar = ar;
48870
48871 /* Get HIF default pipe for HTC message exchange */
48872diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
48873index 527179c..a890150 100644
48874--- a/drivers/net/wireless/ath/ath10k/htc.h
48875+++ b/drivers/net/wireless/ath/ath10k/htc.h
48876@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
48877
48878 struct ath10k_htc_ops {
48879 void (*target_send_suspend_complete)(struct ath10k *ar);
48880-};
48881+} __no_const;
48882
48883 struct ath10k_htc_ep_ops {
48884 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
48885 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
48886 void (*ep_tx_credits)(struct ath10k *);
48887-};
48888+} __no_const;
48889
48890 /* service connection information */
48891 struct ath10k_htc_svc_conn_req {
48892diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48893index 2a93519..7052786 100644
48894--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48895+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48896@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48897 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
48898 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
48899
48900- ACCESS_ONCE(ads->ds_link) = i->link;
48901- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
48902+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
48903+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
48904
48905 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
48906 ctl6 = SM(i->keytype, AR_EncrType);
48907@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48908
48909 if ((i->is_first || i->is_last) &&
48910 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
48911- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
48912+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
48913 | set11nTries(i->rates, 1)
48914 | set11nTries(i->rates, 2)
48915 | set11nTries(i->rates, 3)
48916 | (i->dur_update ? AR_DurUpdateEna : 0)
48917 | SM(0, AR_BurstDur);
48918
48919- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
48920+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
48921 | set11nRate(i->rates, 1)
48922 | set11nRate(i->rates, 2)
48923 | set11nRate(i->rates, 3);
48924 } else {
48925- ACCESS_ONCE(ads->ds_ctl2) = 0;
48926- ACCESS_ONCE(ads->ds_ctl3) = 0;
48927+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
48928+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
48929 }
48930
48931 if (!i->is_first) {
48932- ACCESS_ONCE(ads->ds_ctl0) = 0;
48933- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
48934- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
48935+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
48936+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
48937+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
48938 return;
48939 }
48940
48941@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48942 break;
48943 }
48944
48945- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
48946+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
48947 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
48948 | SM(i->txpower, AR_XmitPower0)
48949 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
48950@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48951 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
48952 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
48953
48954- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
48955- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
48956+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
48957+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
48958
48959 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
48960 return;
48961
48962- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
48963+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
48964 | set11nPktDurRTSCTS(i->rates, 1);
48965
48966- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
48967+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
48968 | set11nPktDurRTSCTS(i->rates, 3);
48969
48970- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
48971+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
48972 | set11nRateFlags(i->rates, 1)
48973 | set11nRateFlags(i->rates, 2)
48974 | set11nRateFlags(i->rates, 3)
48975 | SM(i->rtscts_rate, AR_RTSCTSRate);
48976
48977- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
48978- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
48979- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
48980+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
48981+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
48982+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
48983 }
48984
48985 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
48986diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
48987index 057b165..98ae88f 100644
48988--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
48989+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
48990@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48991 (i->qcu << AR_TxQcuNum_S) | desc_len;
48992
48993 checksum += val;
48994- ACCESS_ONCE(ads->info) = val;
48995+ ACCESS_ONCE_RW(ads->info) = val;
48996
48997 checksum += i->link;
48998- ACCESS_ONCE(ads->link) = i->link;
48999+ ACCESS_ONCE_RW(ads->link) = i->link;
49000
49001 checksum += i->buf_addr[0];
49002- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
49003+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
49004 checksum += i->buf_addr[1];
49005- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
49006+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
49007 checksum += i->buf_addr[2];
49008- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
49009+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
49010 checksum += i->buf_addr[3];
49011- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
49012+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
49013
49014 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
49015- ACCESS_ONCE(ads->ctl3) = val;
49016+ ACCESS_ONCE_RW(ads->ctl3) = val;
49017 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
49018- ACCESS_ONCE(ads->ctl5) = val;
49019+ ACCESS_ONCE_RW(ads->ctl5) = val;
49020 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
49021- ACCESS_ONCE(ads->ctl7) = val;
49022+ ACCESS_ONCE_RW(ads->ctl7) = val;
49023 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
49024- ACCESS_ONCE(ads->ctl9) = val;
49025+ ACCESS_ONCE_RW(ads->ctl9) = val;
49026
49027 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
49028- ACCESS_ONCE(ads->ctl10) = checksum;
49029+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
49030
49031 if (i->is_first || i->is_last) {
49032- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
49033+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
49034 | set11nTries(i->rates, 1)
49035 | set11nTries(i->rates, 2)
49036 | set11nTries(i->rates, 3)
49037 | (i->dur_update ? AR_DurUpdateEna : 0)
49038 | SM(0, AR_BurstDur);
49039
49040- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
49041+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
49042 | set11nRate(i->rates, 1)
49043 | set11nRate(i->rates, 2)
49044 | set11nRate(i->rates, 3);
49045 } else {
49046- ACCESS_ONCE(ads->ctl13) = 0;
49047- ACCESS_ONCE(ads->ctl14) = 0;
49048+ ACCESS_ONCE_RW(ads->ctl13) = 0;
49049+ ACCESS_ONCE_RW(ads->ctl14) = 0;
49050 }
49051
49052 ads->ctl20 = 0;
49053@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49054
49055 ctl17 = SM(i->keytype, AR_EncrType);
49056 if (!i->is_first) {
49057- ACCESS_ONCE(ads->ctl11) = 0;
49058- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49059- ACCESS_ONCE(ads->ctl15) = 0;
49060- ACCESS_ONCE(ads->ctl16) = 0;
49061- ACCESS_ONCE(ads->ctl17) = ctl17;
49062- ACCESS_ONCE(ads->ctl18) = 0;
49063- ACCESS_ONCE(ads->ctl19) = 0;
49064+ ACCESS_ONCE_RW(ads->ctl11) = 0;
49065+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49066+ ACCESS_ONCE_RW(ads->ctl15) = 0;
49067+ ACCESS_ONCE_RW(ads->ctl16) = 0;
49068+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49069+ ACCESS_ONCE_RW(ads->ctl18) = 0;
49070+ ACCESS_ONCE_RW(ads->ctl19) = 0;
49071 return;
49072 }
49073
49074- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49075+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49076 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49077 | SM(i->txpower, AR_XmitPower0)
49078 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49079@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49080 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
49081 ctl12 |= SM(val, AR_PAPRDChainMask);
49082
49083- ACCESS_ONCE(ads->ctl12) = ctl12;
49084- ACCESS_ONCE(ads->ctl17) = ctl17;
49085+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
49086+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49087
49088- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49089+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49090 | set11nPktDurRTSCTS(i->rates, 1);
49091
49092- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49093+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49094 | set11nPktDurRTSCTS(i->rates, 3);
49095
49096- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
49097+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
49098 | set11nRateFlags(i->rates, 1)
49099 | set11nRateFlags(i->rates, 2)
49100 | set11nRateFlags(i->rates, 3)
49101 | SM(i->rtscts_rate, AR_RTSCTSRate);
49102
49103- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
49104+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
49105
49106- ACCESS_ONCE(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
49107- ACCESS_ONCE(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
49108- ACCESS_ONCE(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
49109+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
49110+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
49111+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
49112 }
49113
49114 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
49115diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
49116index 975074f..e9440da 100644
49117--- a/drivers/net/wireless/ath/ath9k/hw.h
49118+++ b/drivers/net/wireless/ath/ath9k/hw.h
49119@@ -630,7 +630,7 @@ struct ath_hw_private_ops {
49120
49121 /* ANI */
49122 void (*ani_cache_ini_regs)(struct ath_hw *ah);
49123-};
49124+} __no_const;
49125
49126 /**
49127 * struct ath_spec_scan - parameters for Atheros spectral scan
49128@@ -708,7 +708,7 @@ struct ath_hw_ops {
49129 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
49130 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
49131 #endif
49132-};
49133+} __no_const;
49134
49135 struct ath_nf_limits {
49136 s16 max;
49137diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
49138index 4f18a6b..b07d92f 100644
49139--- a/drivers/net/wireless/ath/ath9k/main.c
49140+++ b/drivers/net/wireless/ath/ath9k/main.c
49141@@ -2454,16 +2454,18 @@ void ath9k_fill_chanctx_ops(void)
49142 if (!ath9k_is_chanctx_enabled())
49143 return;
49144
49145- ath9k_ops.hw_scan = ath9k_hw_scan;
49146- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49147- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49148- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49149- ath9k_ops.add_chanctx = ath9k_add_chanctx;
49150- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49151- ath9k_ops.change_chanctx = ath9k_change_chanctx;
49152- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49153- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49154- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49155+ pax_open_kernel();
49156+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
49157+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49158+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49159+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49160+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
49161+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49162+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
49163+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49164+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49165+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49166+ pax_close_kernel();
49167 }
49168
49169 #endif
49170diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
49171index 058a9f2..d5cb1ba 100644
49172--- a/drivers/net/wireless/b43/phy_lp.c
49173+++ b/drivers/net/wireless/b43/phy_lp.c
49174@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
49175 {
49176 struct ssb_bus *bus = dev->dev->sdev->bus;
49177
49178- static const struct b206x_channel *chandata = NULL;
49179+ const struct b206x_channel *chandata = NULL;
49180 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
49181 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
49182 u16 old_comm15, scale;
49183diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
49184index dc1d20c..f7a4f06 100644
49185--- a/drivers/net/wireless/iwlegacy/3945-mac.c
49186+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
49187@@ -3633,7 +3633,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
49188 */
49189 if (il3945_mod_params.disable_hw_scan) {
49190 D_INFO("Disabling hw_scan\n");
49191- il3945_mac_ops.hw_scan = NULL;
49192+ pax_open_kernel();
49193+ *(void **)&il3945_mac_ops.hw_scan = NULL;
49194+ pax_close_kernel();
49195 }
49196
49197 D_INFO("*** LOAD DRIVER ***\n");
49198diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49199index 0ffb6ff..c0b7f0e 100644
49200--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49201+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49202@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
49203 {
49204 struct iwl_priv *priv = file->private_data;
49205 char buf[64];
49206- int buf_size;
49207+ size_t buf_size;
49208 u32 offset, len;
49209
49210 memset(buf, 0, sizeof(buf));
49211@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
49212 struct iwl_priv *priv = file->private_data;
49213
49214 char buf[8];
49215- int buf_size;
49216+ size_t buf_size;
49217 u32 reset_flag;
49218
49219 memset(buf, 0, sizeof(buf));
49220@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
49221 {
49222 struct iwl_priv *priv = file->private_data;
49223 char buf[8];
49224- int buf_size;
49225+ size_t buf_size;
49226 int ht40;
49227
49228 memset(buf, 0, sizeof(buf));
49229@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
49230 {
49231 struct iwl_priv *priv = file->private_data;
49232 char buf[8];
49233- int buf_size;
49234+ size_t buf_size;
49235 int value;
49236
49237 memset(buf, 0, sizeof(buf));
49238@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
49239 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
49240 DEBUGFS_READ_FILE_OPS(current_sleep_command);
49241
49242-static const char *fmt_value = " %-30s %10u\n";
49243-static const char *fmt_hex = " %-30s 0x%02X\n";
49244-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
49245-static const char *fmt_header =
49246+static const char fmt_value[] = " %-30s %10u\n";
49247+static const char fmt_hex[] = " %-30s 0x%02X\n";
49248+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
49249+static const char fmt_header[] =
49250 "%-32s current cumulative delta max\n";
49251
49252 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
49253@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
49254 {
49255 struct iwl_priv *priv = file->private_data;
49256 char buf[8];
49257- int buf_size;
49258+ size_t buf_size;
49259 int clear;
49260
49261 memset(buf, 0, sizeof(buf));
49262@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
49263 {
49264 struct iwl_priv *priv = file->private_data;
49265 char buf[8];
49266- int buf_size;
49267+ size_t buf_size;
49268 int trace;
49269
49270 memset(buf, 0, sizeof(buf));
49271@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
49272 {
49273 struct iwl_priv *priv = file->private_data;
49274 char buf[8];
49275- int buf_size;
49276+ size_t buf_size;
49277 int missed;
49278
49279 memset(buf, 0, sizeof(buf));
49280@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
49281
49282 struct iwl_priv *priv = file->private_data;
49283 char buf[8];
49284- int buf_size;
49285+ size_t buf_size;
49286 int plcp;
49287
49288 memset(buf, 0, sizeof(buf));
49289@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
49290
49291 struct iwl_priv *priv = file->private_data;
49292 char buf[8];
49293- int buf_size;
49294+ size_t buf_size;
49295 int flush;
49296
49297 memset(buf, 0, sizeof(buf));
49298@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
49299
49300 struct iwl_priv *priv = file->private_data;
49301 char buf[8];
49302- int buf_size;
49303+ size_t buf_size;
49304 int rts;
49305
49306 if (!priv->cfg->ht_params)
49307@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
49308 {
49309 struct iwl_priv *priv = file->private_data;
49310 char buf[8];
49311- int buf_size;
49312+ size_t buf_size;
49313
49314 memset(buf, 0, sizeof(buf));
49315 buf_size = min(count, sizeof(buf) - 1);
49316@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
49317 struct iwl_priv *priv = file->private_data;
49318 u32 event_log_flag;
49319 char buf[8];
49320- int buf_size;
49321+ size_t buf_size;
49322
49323 /* check that the interface is up */
49324 if (!iwl_is_ready(priv))
49325@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
49326 struct iwl_priv *priv = file->private_data;
49327 char buf[8];
49328 u32 calib_disabled;
49329- int buf_size;
49330+ size_t buf_size;
49331
49332 memset(buf, 0, sizeof(buf));
49333 buf_size = min(count, sizeof(buf) - 1);
49334diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
49335index dd2f3f8..fb1ae88 100644
49336--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
49337+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
49338@@ -1689,7 +1689,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
49339 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
49340
49341 char buf[8];
49342- int buf_size;
49343+ size_t buf_size;
49344 u32 reset_flag;
49345
49346 memset(buf, 0, sizeof(buf));
49347@@ -1710,7 +1710,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
49348 {
49349 struct iwl_trans *trans = file->private_data;
49350 char buf[8];
49351- int buf_size;
49352+ size_t buf_size;
49353 int csr;
49354
49355 memset(buf, 0, sizeof(buf));
49356diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
49357index c9ad4cf..49a2fa0 100644
49358--- a/drivers/net/wireless/mac80211_hwsim.c
49359+++ b/drivers/net/wireless/mac80211_hwsim.c
49360@@ -2577,20 +2577,20 @@ static int __init init_mac80211_hwsim(void)
49361 if (channels < 1)
49362 return -EINVAL;
49363
49364- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
49365- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49366- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49367- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49368- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49369- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49370- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49371- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49372- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49373- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49374- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
49375- mac80211_hwsim_assign_vif_chanctx;
49376- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
49377- mac80211_hwsim_unassign_vif_chanctx;
49378+ pax_open_kernel();
49379+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
49380+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49381+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49382+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49383+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49384+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49385+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49386+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49387+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49388+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49389+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
49390+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
49391+ pax_close_kernel();
49392
49393 spin_lock_init(&hwsim_radio_lock);
49394 INIT_LIST_HEAD(&hwsim_radios);
49395diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
49396index 1a4facd..a2ecbbd 100644
49397--- a/drivers/net/wireless/rndis_wlan.c
49398+++ b/drivers/net/wireless/rndis_wlan.c
49399@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
49400
49401 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
49402
49403- if (rts_threshold < 0 || rts_threshold > 2347)
49404+ if (rts_threshold > 2347)
49405 rts_threshold = 2347;
49406
49407 tmp = cpu_to_le32(rts_threshold);
49408diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
49409index d13f25c..2573994 100644
49410--- a/drivers/net/wireless/rt2x00/rt2x00.h
49411+++ b/drivers/net/wireless/rt2x00/rt2x00.h
49412@@ -375,7 +375,7 @@ struct rt2x00_intf {
49413 * for hardware which doesn't support hardware
49414 * sequence counting.
49415 */
49416- atomic_t seqno;
49417+ atomic_unchecked_t seqno;
49418 };
49419
49420 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
49421diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
49422index 66ff364..3ce34f7 100644
49423--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
49424+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
49425@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
49426 * sequence counter given by mac80211.
49427 */
49428 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
49429- seqno = atomic_add_return(0x10, &intf->seqno);
49430+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
49431 else
49432- seqno = atomic_read(&intf->seqno);
49433+ seqno = atomic_read_unchecked(&intf->seqno);
49434
49435 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
49436 hdr->seq_ctrl |= cpu_to_le16(seqno);
49437diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
49438index b661f896..ddf7d2b 100644
49439--- a/drivers/net/wireless/ti/wl1251/sdio.c
49440+++ b/drivers/net/wireless/ti/wl1251/sdio.c
49441@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
49442
49443 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
49444
49445- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49446- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49447+ pax_open_kernel();
49448+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49449+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49450+ pax_close_kernel();
49451
49452 wl1251_info("using dedicated interrupt line");
49453 } else {
49454- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49455- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49456+ pax_open_kernel();
49457+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49458+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49459+ pax_close_kernel();
49460
49461 wl1251_info("using SDIO interrupt");
49462 }
49463diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
49464index 0bccf12..3d95068 100644
49465--- a/drivers/net/wireless/ti/wl12xx/main.c
49466+++ b/drivers/net/wireless/ti/wl12xx/main.c
49467@@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49468 sizeof(wl->conf.mem));
49469
49470 /* read data preparation is only needed by wl127x */
49471- wl->ops->prepare_read = wl127x_prepare_read;
49472+ pax_open_kernel();
49473+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49474+ pax_close_kernel();
49475
49476 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49477 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49478@@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49479 sizeof(wl->conf.mem));
49480
49481 /* read data preparation is only needed by wl127x */
49482- wl->ops->prepare_read = wl127x_prepare_read;
49483+ pax_open_kernel();
49484+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49485+ pax_close_kernel();
49486
49487 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49488 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49489diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
49490index 7af1936..128bb35 100644
49491--- a/drivers/net/wireless/ti/wl18xx/main.c
49492+++ b/drivers/net/wireless/ti/wl18xx/main.c
49493@@ -1916,8 +1916,10 @@ static int wl18xx_setup(struct wl1271 *wl)
49494 }
49495
49496 if (!checksum_param) {
49497- wl18xx_ops.set_rx_csum = NULL;
49498- wl18xx_ops.init_vif = NULL;
49499+ pax_open_kernel();
49500+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
49501+ *(void **)&wl18xx_ops.init_vif = NULL;
49502+ pax_close_kernel();
49503 }
49504
49505 /* Enable 11a Band only if we have 5G antennas */
49506diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
49507index a912dc0..a8225ba 100644
49508--- a/drivers/net/wireless/zd1211rw/zd_usb.c
49509+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
49510@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
49511 {
49512 struct zd_usb *usb = urb->context;
49513 struct zd_usb_interrupt *intr = &usb->intr;
49514- int len;
49515+ unsigned int len;
49516 u16 int_num;
49517
49518 ZD_ASSERT(in_interrupt());
49519diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
49520index 683671a..4519fc2 100644
49521--- a/drivers/nfc/nfcwilink.c
49522+++ b/drivers/nfc/nfcwilink.c
49523@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
49524
49525 static int nfcwilink_probe(struct platform_device *pdev)
49526 {
49527- static struct nfcwilink *drv;
49528+ struct nfcwilink *drv;
49529 int rc;
49530 __u32 protocols;
49531
49532diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
49533index d93b2b6..ae50401 100644
49534--- a/drivers/oprofile/buffer_sync.c
49535+++ b/drivers/oprofile/buffer_sync.c
49536@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
49537 if (cookie == NO_COOKIE)
49538 offset = pc;
49539 if (cookie == INVALID_COOKIE) {
49540- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49541+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49542 offset = pc;
49543 }
49544 if (cookie != last_cookie) {
49545@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
49546 /* add userspace sample */
49547
49548 if (!mm) {
49549- atomic_inc(&oprofile_stats.sample_lost_no_mm);
49550+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
49551 return 0;
49552 }
49553
49554 cookie = lookup_dcookie(mm, s->eip, &offset);
49555
49556 if (cookie == INVALID_COOKIE) {
49557- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49558+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49559 return 0;
49560 }
49561
49562@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
49563 /* ignore backtraces if failed to add a sample */
49564 if (state == sb_bt_start) {
49565 state = sb_bt_ignore;
49566- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
49567+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
49568 }
49569 }
49570 release_mm(mm);
49571diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
49572index c0cc4e7..44d4e54 100644
49573--- a/drivers/oprofile/event_buffer.c
49574+++ b/drivers/oprofile/event_buffer.c
49575@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
49576 }
49577
49578 if (buffer_pos == buffer_size) {
49579- atomic_inc(&oprofile_stats.event_lost_overflow);
49580+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
49581 return;
49582 }
49583
49584diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
49585index ed2c3ec..deda85a 100644
49586--- a/drivers/oprofile/oprof.c
49587+++ b/drivers/oprofile/oprof.c
49588@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
49589 if (oprofile_ops.switch_events())
49590 return;
49591
49592- atomic_inc(&oprofile_stats.multiplex_counter);
49593+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
49594 start_switch_worker();
49595 }
49596
49597diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
49598index ee2cfce..7f8f699 100644
49599--- a/drivers/oprofile/oprofile_files.c
49600+++ b/drivers/oprofile/oprofile_files.c
49601@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
49602
49603 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
49604
49605-static ssize_t timeout_read(struct file *file, char __user *buf,
49606+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
49607 size_t count, loff_t *offset)
49608 {
49609 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
49610diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
49611index 59659ce..6c860a0 100644
49612--- a/drivers/oprofile/oprofile_stats.c
49613+++ b/drivers/oprofile/oprofile_stats.c
49614@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
49615 cpu_buf->sample_invalid_eip = 0;
49616 }
49617
49618- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
49619- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
49620- atomic_set(&oprofile_stats.event_lost_overflow, 0);
49621- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
49622- atomic_set(&oprofile_stats.multiplex_counter, 0);
49623+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
49624+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
49625+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
49626+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
49627+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
49628 }
49629
49630
49631diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
49632index 1fc622b..8c48fc3 100644
49633--- a/drivers/oprofile/oprofile_stats.h
49634+++ b/drivers/oprofile/oprofile_stats.h
49635@@ -13,11 +13,11 @@
49636 #include <linux/atomic.h>
49637
49638 struct oprofile_stat_struct {
49639- atomic_t sample_lost_no_mm;
49640- atomic_t sample_lost_no_mapping;
49641- atomic_t bt_lost_no_mapping;
49642- atomic_t event_lost_overflow;
49643- atomic_t multiplex_counter;
49644+ atomic_unchecked_t sample_lost_no_mm;
49645+ atomic_unchecked_t sample_lost_no_mapping;
49646+ atomic_unchecked_t bt_lost_no_mapping;
49647+ atomic_unchecked_t event_lost_overflow;
49648+ atomic_unchecked_t multiplex_counter;
49649 };
49650
49651 extern struct oprofile_stat_struct oprofile_stats;
49652diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
49653index 3f49345..c750d0b 100644
49654--- a/drivers/oprofile/oprofilefs.c
49655+++ b/drivers/oprofile/oprofilefs.c
49656@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
49657
49658 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
49659 {
49660- atomic_t *val = file->private_data;
49661- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
49662+ atomic_unchecked_t *val = file->private_data;
49663+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
49664 }
49665
49666
49667@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
49668
49669
49670 int oprofilefs_create_ro_atomic(struct dentry *root,
49671- char const *name, atomic_t *val)
49672+ char const *name, atomic_unchecked_t *val)
49673 {
49674 return __oprofilefs_create_file(root, name,
49675 &atomic_ro_fops, 0444, val);
49676diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
49677index bdef916..88c7dee 100644
49678--- a/drivers/oprofile/timer_int.c
49679+++ b/drivers/oprofile/timer_int.c
49680@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
49681 return NOTIFY_OK;
49682 }
49683
49684-static struct notifier_block __refdata oprofile_cpu_notifier = {
49685+static struct notifier_block oprofile_cpu_notifier = {
49686 .notifier_call = oprofile_cpu_notify,
49687 };
49688
49689diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
49690index 3b47080..6cd05dd 100644
49691--- a/drivers/parport/procfs.c
49692+++ b/drivers/parport/procfs.c
49693@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
49694
49695 *ppos += len;
49696
49697- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
49698+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
49699 }
49700
49701 #ifdef CONFIG_PARPORT_1284
49702@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
49703
49704 *ppos += len;
49705
49706- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
49707+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
49708 }
49709 #endif /* IEEE1284.3 support. */
49710
49711diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
49712index 6ca2399..68d866b 100644
49713--- a/drivers/pci/hotplug/acpiphp_ibm.c
49714+++ b/drivers/pci/hotplug/acpiphp_ibm.c
49715@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
49716 goto init_cleanup;
49717 }
49718
49719- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
49720+ pax_open_kernel();
49721+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
49722+ pax_close_kernel();
49723 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
49724
49725 return retval;
49726diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
49727index 66b7bbe..26bee78 100644
49728--- a/drivers/pci/hotplug/cpcihp_generic.c
49729+++ b/drivers/pci/hotplug/cpcihp_generic.c
49730@@ -73,7 +73,6 @@ static u16 port;
49731 static unsigned int enum_bit;
49732 static u8 enum_mask;
49733
49734-static struct cpci_hp_controller_ops generic_hpc_ops;
49735 static struct cpci_hp_controller generic_hpc;
49736
49737 static int __init validate_parameters(void)
49738@@ -139,6 +138,10 @@ static int query_enum(void)
49739 return ((value & enum_mask) == enum_mask);
49740 }
49741
49742+static struct cpci_hp_controller_ops generic_hpc_ops = {
49743+ .query_enum = query_enum,
49744+};
49745+
49746 static int __init cpcihp_generic_init(void)
49747 {
49748 int status;
49749@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
49750 pci_dev_put(dev);
49751
49752 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
49753- generic_hpc_ops.query_enum = query_enum;
49754 generic_hpc.ops = &generic_hpc_ops;
49755
49756 status = cpci_hp_register_controller(&generic_hpc);
49757diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
49758index 7ecf34e..effed62 100644
49759--- a/drivers/pci/hotplug/cpcihp_zt5550.c
49760+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
49761@@ -59,7 +59,6 @@
49762 /* local variables */
49763 static bool debug;
49764 static bool poll;
49765-static struct cpci_hp_controller_ops zt5550_hpc_ops;
49766 static struct cpci_hp_controller zt5550_hpc;
49767
49768 /* Primary cPCI bus bridge device */
49769@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
49770 return 0;
49771 }
49772
49773+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
49774+ .query_enum = zt5550_hc_query_enum,
49775+};
49776+
49777 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
49778 {
49779 int status;
49780@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
49781 dbg("returned from zt5550_hc_config");
49782
49783 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
49784- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
49785 zt5550_hpc.ops = &zt5550_hpc_ops;
49786 if (!poll) {
49787 zt5550_hpc.irq = hc_dev->irq;
49788 zt5550_hpc.irq_flags = IRQF_SHARED;
49789 zt5550_hpc.dev_id = hc_dev;
49790
49791- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
49792- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
49793- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
49794+ pax_open_kernel();
49795+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
49796+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
49797+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
49798+ pax_open_kernel();
49799 } else {
49800 info("using ENUM# polling mode");
49801 }
49802diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
49803index 1e08ff8c..3cd145f 100644
49804--- a/drivers/pci/hotplug/cpqphp_nvram.c
49805+++ b/drivers/pci/hotplug/cpqphp_nvram.c
49806@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
49807
49808 void compaq_nvram_init (void __iomem *rom_start)
49809 {
49810+#ifndef CONFIG_PAX_KERNEXEC
49811 if (rom_start)
49812 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
49813+#endif
49814
49815 dbg("int15 entry = %p\n", compaq_int15_entry_point);
49816
49817diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
49818index 56d8486..f26113f 100644
49819--- a/drivers/pci/hotplug/pci_hotplug_core.c
49820+++ b/drivers/pci/hotplug/pci_hotplug_core.c
49821@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
49822 return -EINVAL;
49823 }
49824
49825- slot->ops->owner = owner;
49826- slot->ops->mod_name = mod_name;
49827+ pax_open_kernel();
49828+ *(struct module **)&slot->ops->owner = owner;
49829+ *(const char **)&slot->ops->mod_name = mod_name;
49830+ pax_close_kernel();
49831
49832 mutex_lock(&pci_hp_mutex);
49833 /*
49834diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
49835index 07aa722..84514b4 100644
49836--- a/drivers/pci/hotplug/pciehp_core.c
49837+++ b/drivers/pci/hotplug/pciehp_core.c
49838@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
49839 struct slot *slot = ctrl->slot;
49840 struct hotplug_slot *hotplug = NULL;
49841 struct hotplug_slot_info *info = NULL;
49842- struct hotplug_slot_ops *ops = NULL;
49843+ hotplug_slot_ops_no_const *ops = NULL;
49844 char name[SLOT_NAME_SIZE];
49845 int retval = -ENOMEM;
49846
49847diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
49848index 084587d..4a8f9df 100644
49849--- a/drivers/pci/msi.c
49850+++ b/drivers/pci/msi.c
49851@@ -488,8 +488,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
49852 {
49853 struct attribute **msi_attrs;
49854 struct attribute *msi_attr;
49855- struct device_attribute *msi_dev_attr;
49856- struct attribute_group *msi_irq_group;
49857+ device_attribute_no_const *msi_dev_attr;
49858+ attribute_group_no_const *msi_irq_group;
49859 const struct attribute_group **msi_irq_groups;
49860 struct msi_desc *entry;
49861 int ret = -ENOMEM;
49862@@ -549,7 +549,7 @@ error_attrs:
49863 count = 0;
49864 msi_attr = msi_attrs[count];
49865 while (msi_attr) {
49866- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
49867+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
49868 kfree(msi_attr->name);
49869 kfree(msi_dev_attr);
49870 ++count;
49871diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
49872index 2c6643f..3a6d8e0 100644
49873--- a/drivers/pci/pci-sysfs.c
49874+++ b/drivers/pci/pci-sysfs.c
49875@@ -1133,7 +1133,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
49876 {
49877 /* allocate attribute structure, piggyback attribute name */
49878 int name_len = write_combine ? 13 : 10;
49879- struct bin_attribute *res_attr;
49880+ bin_attribute_no_const *res_attr;
49881 int retval;
49882
49883 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
49884@@ -1310,7 +1310,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
49885 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
49886 {
49887 int retval;
49888- struct bin_attribute *attr;
49889+ bin_attribute_no_const *attr;
49890
49891 /* If the device has VPD, try to expose it in sysfs. */
49892 if (dev->vpd) {
49893@@ -1357,7 +1357,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
49894 {
49895 int retval;
49896 int rom_size = 0;
49897- struct bin_attribute *attr;
49898+ bin_attribute_no_const *attr;
49899
49900 if (!sysfs_initialized)
49901 return -EACCES;
49902diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
49903index 4a3902d..7f1fc42 100644
49904--- a/drivers/pci/pci.h
49905+++ b/drivers/pci/pci.h
49906@@ -93,7 +93,7 @@ struct pci_vpd_ops {
49907 struct pci_vpd {
49908 unsigned int len;
49909 const struct pci_vpd_ops *ops;
49910- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
49911+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
49912 };
49913
49914 int pci_vpd_pci22_init(struct pci_dev *dev);
49915diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
49916index e1e7026..d28dd33 100644
49917--- a/drivers/pci/pcie/aspm.c
49918+++ b/drivers/pci/pcie/aspm.c
49919@@ -27,9 +27,9 @@
49920 #define MODULE_PARAM_PREFIX "pcie_aspm."
49921
49922 /* Note: those are not register definitions */
49923-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
49924-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
49925-#define ASPM_STATE_L1 (4) /* L1 state */
49926+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
49927+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
49928+#define ASPM_STATE_L1 (4U) /* L1 state */
49929 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
49930 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
49931
49932diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
49933index c8ca98c..b1bc005 100644
49934--- a/drivers/pci/probe.c
49935+++ b/drivers/pci/probe.c
49936@@ -177,7 +177,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
49937 struct pci_bus_region region, inverted_region;
49938 bool bar_too_big = false, bar_too_high = false, bar_invalid = false;
49939
49940- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
49941+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
49942
49943 /* No printks while decoding is disabled! */
49944 if (!dev->mmio_always_on) {
49945diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
49946index 3f155e7..0f4b1f0 100644
49947--- a/drivers/pci/proc.c
49948+++ b/drivers/pci/proc.c
49949@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
49950 static int __init pci_proc_init(void)
49951 {
49952 struct pci_dev *dev = NULL;
49953+
49954+#ifdef CONFIG_GRKERNSEC_PROC_ADD
49955+#ifdef CONFIG_GRKERNSEC_PROC_USER
49956+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
49957+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49958+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
49959+#endif
49960+#else
49961 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
49962+#endif
49963 proc_create("devices", 0, proc_bus_pci_dir,
49964 &proc_bus_pci_dev_operations);
49965 proc_initialized = 1;
49966diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
49967index d866db8..c827d1f 100644
49968--- a/drivers/platform/chrome/chromeos_laptop.c
49969+++ b/drivers/platform/chrome/chromeos_laptop.c
49970@@ -479,7 +479,7 @@ static struct chromeos_laptop cr48 = {
49971 .callback = chromeos_laptop_dmi_matched, \
49972 .driver_data = (void *)&board_
49973
49974-static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
49975+static struct dmi_system_id chromeos_laptop_dmi_table[] __initconst = {
49976 {
49977 .ident = "Samsung Series 5 550",
49978 .matches = {
49979diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
49980index c5af23b..3d62d5e 100644
49981--- a/drivers/platform/x86/alienware-wmi.c
49982+++ b/drivers/platform/x86/alienware-wmi.c
49983@@ -150,7 +150,7 @@ struct wmax_led_args {
49984 } __packed;
49985
49986 static struct platform_device *platform_device;
49987-static struct device_attribute *zone_dev_attrs;
49988+static device_attribute_no_const *zone_dev_attrs;
49989 static struct attribute **zone_attrs;
49990 static struct platform_zone *zone_data;
49991
49992@@ -161,7 +161,7 @@ static struct platform_driver platform_driver = {
49993 }
49994 };
49995
49996-static struct attribute_group zone_attribute_group = {
49997+static attribute_group_no_const zone_attribute_group = {
49998 .name = "rgb_zones",
49999 };
50000
50001diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
50002index 21fc932..ee9394a 100644
50003--- a/drivers/platform/x86/asus-wmi.c
50004+++ b/drivers/platform/x86/asus-wmi.c
50005@@ -1590,6 +1590,10 @@ static int show_dsts(struct seq_file *m, void *data)
50006 int err;
50007 u32 retval = -1;
50008
50009+#ifdef CONFIG_GRKERNSEC_KMEM
50010+ return -EPERM;
50011+#endif
50012+
50013 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
50014
50015 if (err < 0)
50016@@ -1606,6 +1610,10 @@ static int show_devs(struct seq_file *m, void *data)
50017 int err;
50018 u32 retval = -1;
50019
50020+#ifdef CONFIG_GRKERNSEC_KMEM
50021+ return -EPERM;
50022+#endif
50023+
50024 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
50025 &retval);
50026
50027@@ -1630,6 +1638,10 @@ static int show_call(struct seq_file *m, void *data)
50028 union acpi_object *obj;
50029 acpi_status status;
50030
50031+#ifdef CONFIG_GRKERNSEC_KMEM
50032+ return -EPERM;
50033+#endif
50034+
50035 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
50036 1, asus->debug.method_id,
50037 &input, &output);
50038diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
50039index 62f8030..c7f2a45 100644
50040--- a/drivers/platform/x86/msi-laptop.c
50041+++ b/drivers/platform/x86/msi-laptop.c
50042@@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
50043
50044 if (!quirks->ec_read_only) {
50045 /* allow userland write sysfs file */
50046- dev_attr_bluetooth.store = store_bluetooth;
50047- dev_attr_wlan.store = store_wlan;
50048- dev_attr_threeg.store = store_threeg;
50049- dev_attr_bluetooth.attr.mode |= S_IWUSR;
50050- dev_attr_wlan.attr.mode |= S_IWUSR;
50051- dev_attr_threeg.attr.mode |= S_IWUSR;
50052+ pax_open_kernel();
50053+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
50054+ *(void **)&dev_attr_wlan.store = store_wlan;
50055+ *(void **)&dev_attr_threeg.store = store_threeg;
50056+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
50057+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
50058+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
50059+ pax_close_kernel();
50060 }
50061
50062 /* disable hardware control by fn key */
50063diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
50064index 70222f2..8c8ce66 100644
50065--- a/drivers/platform/x86/msi-wmi.c
50066+++ b/drivers/platform/x86/msi-wmi.c
50067@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
50068 static void msi_wmi_notify(u32 value, void *context)
50069 {
50070 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
50071- static struct key_entry *key;
50072+ struct key_entry *key;
50073 union acpi_object *obj;
50074 acpi_status status;
50075
50076diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
50077index 26ad9ff..7c52909 100644
50078--- a/drivers/platform/x86/sony-laptop.c
50079+++ b/drivers/platform/x86/sony-laptop.c
50080@@ -2527,7 +2527,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
50081 }
50082
50083 /* High speed charging function */
50084-static struct device_attribute *hsc_handle;
50085+static device_attribute_no_const *hsc_handle;
50086
50087 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
50088 struct device_attribute *attr,
50089@@ -2601,7 +2601,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
50090 }
50091
50092 /* low battery function */
50093-static struct device_attribute *lowbatt_handle;
50094+static device_attribute_no_const *lowbatt_handle;
50095
50096 static ssize_t sony_nc_lowbatt_store(struct device *dev,
50097 struct device_attribute *attr,
50098@@ -2667,7 +2667,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
50099 }
50100
50101 /* fan speed function */
50102-static struct device_attribute *fan_handle, *hsf_handle;
50103+static device_attribute_no_const *fan_handle, *hsf_handle;
50104
50105 static ssize_t sony_nc_hsfan_store(struct device *dev,
50106 struct device_attribute *attr,
50107@@ -2774,7 +2774,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
50108 }
50109
50110 /* USB charge function */
50111-static struct device_attribute *uc_handle;
50112+static device_attribute_no_const *uc_handle;
50113
50114 static ssize_t sony_nc_usb_charge_store(struct device *dev,
50115 struct device_attribute *attr,
50116@@ -2848,7 +2848,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
50117 }
50118
50119 /* Panel ID function */
50120-static struct device_attribute *panel_handle;
50121+static device_attribute_no_const *panel_handle;
50122
50123 static ssize_t sony_nc_panelid_show(struct device *dev,
50124 struct device_attribute *attr, char *buffer)
50125@@ -2895,7 +2895,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
50126 }
50127
50128 /* smart connect function */
50129-static struct device_attribute *sc_handle;
50130+static device_attribute_no_const *sc_handle;
50131
50132 static ssize_t sony_nc_smart_conn_store(struct device *dev,
50133 struct device_attribute *attr,
50134diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
50135index cf0f893..5955997 100644
50136--- a/drivers/platform/x86/thinkpad_acpi.c
50137+++ b/drivers/platform/x86/thinkpad_acpi.c
50138@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
50139 return 0;
50140 }
50141
50142-void static hotkey_mask_warn_incomplete_mask(void)
50143+static void hotkey_mask_warn_incomplete_mask(void)
50144 {
50145 /* log only what the user can fix... */
50146 const u32 wantedmask = hotkey_driver_mask &
50147@@ -2438,10 +2438,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
50148 && !tp_features.bright_unkfw)
50149 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
50150 }
50151+}
50152
50153 #undef TPACPI_COMPARE_KEY
50154 #undef TPACPI_MAY_SEND_KEY
50155-}
50156
50157 /*
50158 * Polling driver
50159diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
50160index 438d4c7..ca8a2fb 100644
50161--- a/drivers/pnp/pnpbios/bioscalls.c
50162+++ b/drivers/pnp/pnpbios/bioscalls.c
50163@@ -59,7 +59,7 @@ do { \
50164 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
50165 } while(0)
50166
50167-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
50168+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
50169 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
50170
50171 /*
50172@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50173
50174 cpu = get_cpu();
50175 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
50176+
50177+ pax_open_kernel();
50178 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
50179+ pax_close_kernel();
50180
50181 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
50182 spin_lock_irqsave(&pnp_bios_lock, flags);
50183@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50184 :"memory");
50185 spin_unlock_irqrestore(&pnp_bios_lock, flags);
50186
50187+ pax_open_kernel();
50188 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
50189+ pax_close_kernel();
50190+
50191 put_cpu();
50192
50193 /* If we get here and this is set then the PnP BIOS faulted on us. */
50194@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
50195 return status;
50196 }
50197
50198-void pnpbios_calls_init(union pnp_bios_install_struct *header)
50199+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
50200 {
50201 int i;
50202
50203@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50204 pnp_bios_callpoint.offset = header->fields.pm16offset;
50205 pnp_bios_callpoint.segment = PNP_CS16;
50206
50207+ pax_open_kernel();
50208+
50209 for_each_possible_cpu(i) {
50210 struct desc_struct *gdt = get_cpu_gdt_table(i);
50211 if (!gdt)
50212@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50213 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
50214 (unsigned long)__va(header->fields.pm16dseg));
50215 }
50216+
50217+ pax_close_kernel();
50218 }
50219diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
50220index 0c52e2a..3421ab7 100644
50221--- a/drivers/power/pda_power.c
50222+++ b/drivers/power/pda_power.c
50223@@ -37,7 +37,11 @@ static int polling;
50224
50225 #if IS_ENABLED(CONFIG_USB_PHY)
50226 static struct usb_phy *transceiver;
50227-static struct notifier_block otg_nb;
50228+static int otg_handle_notification(struct notifier_block *nb,
50229+ unsigned long event, void *unused);
50230+static struct notifier_block otg_nb = {
50231+ .notifier_call = otg_handle_notification
50232+};
50233 #endif
50234
50235 static struct regulator *ac_draw;
50236@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
50237
50238 #if IS_ENABLED(CONFIG_USB_PHY)
50239 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
50240- otg_nb.notifier_call = otg_handle_notification;
50241 ret = usb_register_notifier(transceiver, &otg_nb);
50242 if (ret) {
50243 dev_err(dev, "failure to register otg notifier\n");
50244diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
50245index cc439fd..8fa30df 100644
50246--- a/drivers/power/power_supply.h
50247+++ b/drivers/power/power_supply.h
50248@@ -16,12 +16,12 @@ struct power_supply;
50249
50250 #ifdef CONFIG_SYSFS
50251
50252-extern void power_supply_init_attrs(struct device_type *dev_type);
50253+extern void power_supply_init_attrs(void);
50254 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
50255
50256 #else
50257
50258-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
50259+static inline void power_supply_init_attrs(void) {}
50260 #define power_supply_uevent NULL
50261
50262 #endif /* CONFIG_SYSFS */
50263diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
50264index 694e8cd..9f03483 100644
50265--- a/drivers/power/power_supply_core.c
50266+++ b/drivers/power/power_supply_core.c
50267@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
50268 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
50269 EXPORT_SYMBOL_GPL(power_supply_notifier);
50270
50271-static struct device_type power_supply_dev_type;
50272+extern const struct attribute_group *power_supply_attr_groups[];
50273+static struct device_type power_supply_dev_type = {
50274+ .groups = power_supply_attr_groups,
50275+};
50276
50277 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
50278 struct power_supply *supply)
50279@@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
50280 return PTR_ERR(power_supply_class);
50281
50282 power_supply_class->dev_uevent = power_supply_uevent;
50283- power_supply_init_attrs(&power_supply_dev_type);
50284+ power_supply_init_attrs();
50285
50286 return 0;
50287 }
50288diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
50289index 62653f5..d0bb485 100644
50290--- a/drivers/power/power_supply_sysfs.c
50291+++ b/drivers/power/power_supply_sysfs.c
50292@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
50293 .is_visible = power_supply_attr_is_visible,
50294 };
50295
50296-static const struct attribute_group *power_supply_attr_groups[] = {
50297+const struct attribute_group *power_supply_attr_groups[] = {
50298 &power_supply_attr_group,
50299 NULL,
50300 };
50301
50302-void power_supply_init_attrs(struct device_type *dev_type)
50303+void power_supply_init_attrs(void)
50304 {
50305 int i;
50306
50307- dev_type->groups = power_supply_attr_groups;
50308-
50309 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
50310 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
50311 }
50312diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
50313index 84419af..268ede8 100644
50314--- a/drivers/powercap/powercap_sys.c
50315+++ b/drivers/powercap/powercap_sys.c
50316@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
50317 struct device_attribute name_attr;
50318 };
50319
50320+static ssize_t show_constraint_name(struct device *dev,
50321+ struct device_attribute *dev_attr,
50322+ char *buf);
50323+
50324 static struct powercap_constraint_attr
50325- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
50326+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
50327+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
50328+ .power_limit_attr = {
50329+ .attr = {
50330+ .name = NULL,
50331+ .mode = S_IWUSR | S_IRUGO
50332+ },
50333+ .show = show_constraint_power_limit_uw,
50334+ .store = store_constraint_power_limit_uw
50335+ },
50336+
50337+ .time_window_attr = {
50338+ .attr = {
50339+ .name = NULL,
50340+ .mode = S_IWUSR | S_IRUGO
50341+ },
50342+ .show = show_constraint_time_window_us,
50343+ .store = store_constraint_time_window_us
50344+ },
50345+
50346+ .max_power_attr = {
50347+ .attr = {
50348+ .name = NULL,
50349+ .mode = S_IRUGO
50350+ },
50351+ .show = show_constraint_max_power_uw,
50352+ .store = NULL
50353+ },
50354+
50355+ .min_power_attr = {
50356+ .attr = {
50357+ .name = NULL,
50358+ .mode = S_IRUGO
50359+ },
50360+ .show = show_constraint_min_power_uw,
50361+ .store = NULL
50362+ },
50363+
50364+ .max_time_window_attr = {
50365+ .attr = {
50366+ .name = NULL,
50367+ .mode = S_IRUGO
50368+ },
50369+ .show = show_constraint_max_time_window_us,
50370+ .store = NULL
50371+ },
50372+
50373+ .min_time_window_attr = {
50374+ .attr = {
50375+ .name = NULL,
50376+ .mode = S_IRUGO
50377+ },
50378+ .show = show_constraint_min_time_window_us,
50379+ .store = NULL
50380+ },
50381+
50382+ .name_attr = {
50383+ .attr = {
50384+ .name = NULL,
50385+ .mode = S_IRUGO
50386+ },
50387+ .show = show_constraint_name,
50388+ .store = NULL
50389+ }
50390+ }
50391+};
50392
50393 /* A list of powercap control_types */
50394 static LIST_HEAD(powercap_cntrl_list);
50395@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
50396 }
50397
50398 static int create_constraint_attribute(int id, const char *name,
50399- int mode,
50400- struct device_attribute *dev_attr,
50401- ssize_t (*show)(struct device *,
50402- struct device_attribute *, char *),
50403- ssize_t (*store)(struct device *,
50404- struct device_attribute *,
50405- const char *, size_t)
50406- )
50407+ struct device_attribute *dev_attr)
50408 {
50409+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
50410
50411- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
50412- id, name);
50413- if (!dev_attr->attr.name)
50414+ if (!name)
50415 return -ENOMEM;
50416- dev_attr->attr.mode = mode;
50417- dev_attr->show = show;
50418- dev_attr->store = store;
50419+
50420+ pax_open_kernel();
50421+ *(const char **)&dev_attr->attr.name = name;
50422+ pax_close_kernel();
50423
50424 return 0;
50425 }
50426@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
50427
50428 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
50429 ret = create_constraint_attribute(i, "power_limit_uw",
50430- S_IWUSR | S_IRUGO,
50431- &constraint_attrs[i].power_limit_attr,
50432- show_constraint_power_limit_uw,
50433- store_constraint_power_limit_uw);
50434+ &constraint_attrs[i].power_limit_attr);
50435 if (ret)
50436 goto err_alloc;
50437 ret = create_constraint_attribute(i, "time_window_us",
50438- S_IWUSR | S_IRUGO,
50439- &constraint_attrs[i].time_window_attr,
50440- show_constraint_time_window_us,
50441- store_constraint_time_window_us);
50442+ &constraint_attrs[i].time_window_attr);
50443 if (ret)
50444 goto err_alloc;
50445- ret = create_constraint_attribute(i, "name", S_IRUGO,
50446- &constraint_attrs[i].name_attr,
50447- show_constraint_name,
50448- NULL);
50449+ ret = create_constraint_attribute(i, "name",
50450+ &constraint_attrs[i].name_attr);
50451 if (ret)
50452 goto err_alloc;
50453- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
50454- &constraint_attrs[i].max_power_attr,
50455- show_constraint_max_power_uw,
50456- NULL);
50457+ ret = create_constraint_attribute(i, "max_power_uw",
50458+ &constraint_attrs[i].max_power_attr);
50459 if (ret)
50460 goto err_alloc;
50461- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
50462- &constraint_attrs[i].min_power_attr,
50463- show_constraint_min_power_uw,
50464- NULL);
50465+ ret = create_constraint_attribute(i, "min_power_uw",
50466+ &constraint_attrs[i].min_power_attr);
50467 if (ret)
50468 goto err_alloc;
50469 ret = create_constraint_attribute(i, "max_time_window_us",
50470- S_IRUGO,
50471- &constraint_attrs[i].max_time_window_attr,
50472- show_constraint_max_time_window_us,
50473- NULL);
50474+ &constraint_attrs[i].max_time_window_attr);
50475 if (ret)
50476 goto err_alloc;
50477 ret = create_constraint_attribute(i, "min_time_window_us",
50478- S_IRUGO,
50479- &constraint_attrs[i].min_time_window_attr,
50480- show_constraint_min_time_window_us,
50481- NULL);
50482+ &constraint_attrs[i].min_time_window_attr);
50483 if (ret)
50484 goto err_alloc;
50485
50486@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
50487 power_zone->zone_dev_attrs[count++] =
50488 &dev_attr_max_energy_range_uj.attr;
50489 if (power_zone->ops->get_energy_uj) {
50490+ pax_open_kernel();
50491 if (power_zone->ops->reset_energy_uj)
50492- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50493+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50494 else
50495- dev_attr_energy_uj.attr.mode = S_IRUGO;
50496+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
50497+ pax_close_kernel();
50498 power_zone->zone_dev_attrs[count++] =
50499 &dev_attr_energy_uj.attr;
50500 }
50501diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
50502index 9c5d414..c7900ce 100644
50503--- a/drivers/ptp/ptp_private.h
50504+++ b/drivers/ptp/ptp_private.h
50505@@ -51,7 +51,7 @@ struct ptp_clock {
50506 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
50507 wait_queue_head_t tsev_wq;
50508 int defunct; /* tells readers to go away when clock is being removed */
50509- struct device_attribute *pin_dev_attr;
50510+ device_attribute_no_const *pin_dev_attr;
50511 struct attribute **pin_attr;
50512 struct attribute_group pin_attr_group;
50513 };
50514diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
50515index 302e626..12579af 100644
50516--- a/drivers/ptp/ptp_sysfs.c
50517+++ b/drivers/ptp/ptp_sysfs.c
50518@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
50519 goto no_pin_attr;
50520
50521 for (i = 0; i < n_pins; i++) {
50522- struct device_attribute *da = &ptp->pin_dev_attr[i];
50523+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
50524 sysfs_attr_init(&da->attr);
50525 da->attr.name = info->pin_config[i].name;
50526 da->attr.mode = 0644;
50527diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
50528index cd87c0c..715ecbe 100644
50529--- a/drivers/regulator/core.c
50530+++ b/drivers/regulator/core.c
50531@@ -3567,7 +3567,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50532 {
50533 const struct regulation_constraints *constraints = NULL;
50534 const struct regulator_init_data *init_data;
50535- static atomic_t regulator_no = ATOMIC_INIT(0);
50536+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
50537 struct regulator_dev *rdev;
50538 struct device *dev;
50539 int ret, i;
50540@@ -3641,7 +3641,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50541 rdev->dev.class = &regulator_class;
50542 rdev->dev.parent = dev;
50543 dev_set_name(&rdev->dev, "regulator.%d",
50544- atomic_inc_return(&regulator_no) - 1);
50545+ atomic_inc_return_unchecked(&regulator_no) - 1);
50546 ret = device_register(&rdev->dev);
50547 if (ret != 0) {
50548 put_device(&rdev->dev);
50549diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
50550index 7eee2ca..4024513 100644
50551--- a/drivers/regulator/max8660.c
50552+++ b/drivers/regulator/max8660.c
50553@@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
50554 max8660->shadow_regs[MAX8660_OVER1] = 5;
50555 } else {
50556 /* Otherwise devices can be toggled via software */
50557- max8660_dcdc_ops.enable = max8660_dcdc_enable;
50558- max8660_dcdc_ops.disable = max8660_dcdc_disable;
50559+ pax_open_kernel();
50560+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
50561+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
50562+ pax_close_kernel();
50563 }
50564
50565 /*
50566diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
50567index dbedf17..18ff6b7 100644
50568--- a/drivers/regulator/max8973-regulator.c
50569+++ b/drivers/regulator/max8973-regulator.c
50570@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
50571 if (!pdata || !pdata->enable_ext_control) {
50572 max->desc.enable_reg = MAX8973_VOUT;
50573 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
50574- max->ops.enable = regulator_enable_regmap;
50575- max->ops.disable = regulator_disable_regmap;
50576- max->ops.is_enabled = regulator_is_enabled_regmap;
50577+ pax_open_kernel();
50578+ *(void **)&max->ops.enable = regulator_enable_regmap;
50579+ *(void **)&max->ops.disable = regulator_disable_regmap;
50580+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
50581+ pax_close_kernel();
50582 }
50583
50584 if (pdata) {
50585diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
50586index 793b662..85f74cd 100644
50587--- a/drivers/regulator/mc13892-regulator.c
50588+++ b/drivers/regulator/mc13892-regulator.c
50589@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
50590 mc13xxx_unlock(mc13892);
50591
50592 /* update mc13892_vcam ops */
50593+ pax_open_kernel();
50594 memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
50595 sizeof(struct regulator_ops));
50596- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
50597- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
50598+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
50599+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
50600+ pax_close_kernel();
50601 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
50602
50603 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
50604diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
50605index 5b2e761..c8c8a4a 100644
50606--- a/drivers/rtc/rtc-cmos.c
50607+++ b/drivers/rtc/rtc-cmos.c
50608@@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
50609 hpet_rtc_timer_init();
50610
50611 /* export at least the first block of NVRAM */
50612- nvram.size = address_space - NVRAM_OFFSET;
50613+ pax_open_kernel();
50614+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
50615+ pax_close_kernel();
50616 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
50617 if (retval < 0) {
50618 dev_dbg(dev, "can't create nvram file? %d\n", retval);
50619diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
50620index d049393..bb20be0 100644
50621--- a/drivers/rtc/rtc-dev.c
50622+++ b/drivers/rtc/rtc-dev.c
50623@@ -16,6 +16,7 @@
50624 #include <linux/module.h>
50625 #include <linux/rtc.h>
50626 #include <linux/sched.h>
50627+#include <linux/grsecurity.h>
50628 #include "rtc-core.h"
50629
50630 static dev_t rtc_devt;
50631@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
50632 if (copy_from_user(&tm, uarg, sizeof(tm)))
50633 return -EFAULT;
50634
50635+ gr_log_timechange();
50636+
50637 return rtc_set_time(rtc, &tm);
50638
50639 case RTC_PIE_ON:
50640diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
50641index bb43cf7..ee4d274 100644
50642--- a/drivers/rtc/rtc-ds1307.c
50643+++ b/drivers/rtc/rtc-ds1307.c
50644@@ -107,7 +107,7 @@ struct ds1307 {
50645 u8 offset; /* register's offset */
50646 u8 regs[11];
50647 u16 nvram_offset;
50648- struct bin_attribute *nvram;
50649+ bin_attribute_no_const *nvram;
50650 enum ds_type type;
50651 unsigned long flags;
50652 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
50653diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
50654index 11880c1..b823aa4 100644
50655--- a/drivers/rtc/rtc-m48t59.c
50656+++ b/drivers/rtc/rtc-m48t59.c
50657@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
50658 if (IS_ERR(m48t59->rtc))
50659 return PTR_ERR(m48t59->rtc);
50660
50661- m48t59_nvram_attr.size = pdata->offset;
50662+ pax_open_kernel();
50663+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
50664+ pax_close_kernel();
50665
50666 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
50667 if (ret)
50668diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
50669index e693af6..2e525b6 100644
50670--- a/drivers/scsi/bfa/bfa_fcpim.h
50671+++ b/drivers/scsi/bfa/bfa_fcpim.h
50672@@ -36,7 +36,7 @@ struct bfa_iotag_s {
50673
50674 struct bfa_itn_s {
50675 bfa_isr_func_t isr;
50676-};
50677+} __no_const;
50678
50679 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
50680 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
50681diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
50682index 0f19455..ef7adb5 100644
50683--- a/drivers/scsi/bfa/bfa_fcs.c
50684+++ b/drivers/scsi/bfa/bfa_fcs.c
50685@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
50686 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
50687
50688 static struct bfa_fcs_mod_s fcs_modules[] = {
50689- { bfa_fcs_port_attach, NULL, NULL },
50690- { bfa_fcs_uf_attach, NULL, NULL },
50691- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
50692- bfa_fcs_fabric_modexit },
50693+ {
50694+ .attach = bfa_fcs_port_attach,
50695+ .modinit = NULL,
50696+ .modexit = NULL
50697+ },
50698+ {
50699+ .attach = bfa_fcs_uf_attach,
50700+ .modinit = NULL,
50701+ .modexit = NULL
50702+ },
50703+ {
50704+ .attach = bfa_fcs_fabric_attach,
50705+ .modinit = bfa_fcs_fabric_modinit,
50706+ .modexit = bfa_fcs_fabric_modexit
50707+ },
50708 };
50709
50710 /*
50711diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
50712index ff75ef8..2dfe00a 100644
50713--- a/drivers/scsi/bfa/bfa_fcs_lport.c
50714+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
50715@@ -89,15 +89,26 @@ static struct {
50716 void (*offline) (struct bfa_fcs_lport_s *port);
50717 } __port_action[] = {
50718 {
50719- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
50720- bfa_fcs_lport_unknown_offline}, {
50721- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
50722- bfa_fcs_lport_fab_offline}, {
50723- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
50724- bfa_fcs_lport_n2n_offline}, {
50725- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
50726- bfa_fcs_lport_loop_offline},
50727- };
50728+ .init = bfa_fcs_lport_unknown_init,
50729+ .online = bfa_fcs_lport_unknown_online,
50730+ .offline = bfa_fcs_lport_unknown_offline
50731+ },
50732+ {
50733+ .init = bfa_fcs_lport_fab_init,
50734+ .online = bfa_fcs_lport_fab_online,
50735+ .offline = bfa_fcs_lport_fab_offline
50736+ },
50737+ {
50738+ .init = bfa_fcs_lport_n2n_init,
50739+ .online = bfa_fcs_lport_n2n_online,
50740+ .offline = bfa_fcs_lport_n2n_offline
50741+ },
50742+ {
50743+ .init = bfa_fcs_lport_loop_init,
50744+ .online = bfa_fcs_lport_loop_online,
50745+ .offline = bfa_fcs_lport_loop_offline
50746+ },
50747+};
50748
50749 /*
50750 * fcs_port_sm FCS logical port state machine
50751diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
50752index a38aafa0..fe8f03b 100644
50753--- a/drivers/scsi/bfa/bfa_ioc.h
50754+++ b/drivers/scsi/bfa/bfa_ioc.h
50755@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
50756 bfa_ioc_disable_cbfn_t disable_cbfn;
50757 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
50758 bfa_ioc_reset_cbfn_t reset_cbfn;
50759-};
50760+} __no_const;
50761
50762 /*
50763 * IOC event notification mechanism.
50764@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
50765 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
50766 enum bfi_ioc_state fwstate);
50767 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
50768-};
50769+} __no_const;
50770
50771 /*
50772 * Queue element to wait for room in request queue. FIFO order is
50773diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
50774index a14c784..6de6790 100644
50775--- a/drivers/scsi/bfa/bfa_modules.h
50776+++ b/drivers/scsi/bfa/bfa_modules.h
50777@@ -78,12 +78,12 @@ enum {
50778 \
50779 extern struct bfa_module_s hal_mod_ ## __mod; \
50780 struct bfa_module_s hal_mod_ ## __mod = { \
50781- bfa_ ## __mod ## _meminfo, \
50782- bfa_ ## __mod ## _attach, \
50783- bfa_ ## __mod ## _detach, \
50784- bfa_ ## __mod ## _start, \
50785- bfa_ ## __mod ## _stop, \
50786- bfa_ ## __mod ## _iocdisable, \
50787+ .meminfo = bfa_ ## __mod ## _meminfo, \
50788+ .attach = bfa_ ## __mod ## _attach, \
50789+ .detach = bfa_ ## __mod ## _detach, \
50790+ .start = bfa_ ## __mod ## _start, \
50791+ .stop = bfa_ ## __mod ## _stop, \
50792+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
50793 }
50794
50795 #define BFA_CACHELINE_SZ (256)
50796diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
50797index 045c4e1..13de803 100644
50798--- a/drivers/scsi/fcoe/fcoe_sysfs.c
50799+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
50800@@ -33,8 +33,8 @@
50801 */
50802 #include "libfcoe.h"
50803
50804-static atomic_t ctlr_num;
50805-static atomic_t fcf_num;
50806+static atomic_unchecked_t ctlr_num;
50807+static atomic_unchecked_t fcf_num;
50808
50809 /*
50810 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
50811@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
50812 if (!ctlr)
50813 goto out;
50814
50815- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
50816+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
50817 ctlr->f = f;
50818 ctlr->mode = FIP_CONN_TYPE_FABRIC;
50819 INIT_LIST_HEAD(&ctlr->fcfs);
50820@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
50821 fcf->dev.parent = &ctlr->dev;
50822 fcf->dev.bus = &fcoe_bus_type;
50823 fcf->dev.type = &fcoe_fcf_device_type;
50824- fcf->id = atomic_inc_return(&fcf_num) - 1;
50825+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
50826 fcf->state = FCOE_FCF_STATE_UNKNOWN;
50827
50828 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
50829@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
50830 {
50831 int error;
50832
50833- atomic_set(&ctlr_num, 0);
50834- atomic_set(&fcf_num, 0);
50835+ atomic_set_unchecked(&ctlr_num, 0);
50836+ atomic_set_unchecked(&fcf_num, 0);
50837
50838 error = bus_register(&fcoe_bus_type);
50839 if (error)
50840diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
50841index 6de80e3..a11e0ac 100644
50842--- a/drivers/scsi/hosts.c
50843+++ b/drivers/scsi/hosts.c
50844@@ -42,7 +42,7 @@
50845 #include "scsi_logging.h"
50846
50847
50848-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
50849+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
50850
50851
50852 static void scsi_host_cls_release(struct device *dev)
50853@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
50854 * subtract one because we increment first then return, but we need to
50855 * know what the next host number was before increment
50856 */
50857- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
50858+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
50859 shost->dma_channel = 0xff;
50860
50861 /* These three are default values which can be overridden */
50862diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
50863index cef5d49..01e280e 100644
50864--- a/drivers/scsi/hpsa.c
50865+++ b/drivers/scsi/hpsa.c
50866@@ -701,10 +701,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
50867 unsigned long flags;
50868
50869 if (h->transMethod & CFGTBL_Trans_io_accel1)
50870- return h->access.command_completed(h, q);
50871+ return h->access->command_completed(h, q);
50872
50873 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
50874- return h->access.command_completed(h, q);
50875+ return h->access->command_completed(h, q);
50876
50877 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
50878 a = rq->head[rq->current_entry];
50879@@ -5454,7 +5454,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
50880 while (!list_empty(&h->reqQ)) {
50881 c = list_entry(h->reqQ.next, struct CommandList, list);
50882 /* can't do anything if fifo is full */
50883- if ((h->access.fifo_full(h))) {
50884+ if ((h->access->fifo_full(h))) {
50885 h->fifo_recently_full = 1;
50886 dev_warn(&h->pdev->dev, "fifo full\n");
50887 break;
50888@@ -5476,7 +5476,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
50889
50890 /* Tell the controller execute command */
50891 spin_unlock_irqrestore(&h->lock, *flags);
50892- h->access.submit_command(h, c);
50893+ h->access->submit_command(h, c);
50894 spin_lock_irqsave(&h->lock, *flags);
50895 }
50896 }
50897@@ -5492,17 +5492,17 @@ static void lock_and_start_io(struct ctlr_info *h)
50898
50899 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
50900 {
50901- return h->access.command_completed(h, q);
50902+ return h->access->command_completed(h, q);
50903 }
50904
50905 static inline bool interrupt_pending(struct ctlr_info *h)
50906 {
50907- return h->access.intr_pending(h);
50908+ return h->access->intr_pending(h);
50909 }
50910
50911 static inline long interrupt_not_for_us(struct ctlr_info *h)
50912 {
50913- return (h->access.intr_pending(h) == 0) ||
50914+ return (h->access->intr_pending(h) == 0) ||
50915 (h->interrupts_enabled == 0);
50916 }
50917
50918@@ -6445,7 +6445,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
50919 if (prod_index < 0)
50920 return -ENODEV;
50921 h->product_name = products[prod_index].product_name;
50922- h->access = *(products[prod_index].access);
50923+ h->access = products[prod_index].access;
50924
50925 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
50926 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
50927@@ -6790,7 +6790,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
50928 unsigned long flags;
50929 u32 lockup_detected;
50930
50931- h->access.set_intr_mask(h, HPSA_INTR_OFF);
50932+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
50933 spin_lock_irqsave(&h->lock, flags);
50934 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
50935 if (!lockup_detected) {
50936@@ -7037,7 +7037,7 @@ reinit_after_soft_reset:
50937 }
50938
50939 /* make sure the board interrupts are off */
50940- h->access.set_intr_mask(h, HPSA_INTR_OFF);
50941+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
50942
50943 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
50944 goto clean2;
50945@@ -7072,7 +7072,7 @@ reinit_after_soft_reset:
50946 * fake ones to scoop up any residual completions.
50947 */
50948 spin_lock_irqsave(&h->lock, flags);
50949- h->access.set_intr_mask(h, HPSA_INTR_OFF);
50950+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
50951 spin_unlock_irqrestore(&h->lock, flags);
50952 free_irqs(h);
50953 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
50954@@ -7091,9 +7091,9 @@ reinit_after_soft_reset:
50955 dev_info(&h->pdev->dev, "Board READY.\n");
50956 dev_info(&h->pdev->dev,
50957 "Waiting for stale completions to drain.\n");
50958- h->access.set_intr_mask(h, HPSA_INTR_ON);
50959+ h->access->set_intr_mask(h, HPSA_INTR_ON);
50960 msleep(10000);
50961- h->access.set_intr_mask(h, HPSA_INTR_OFF);
50962+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
50963
50964 rc = controller_reset_failed(h->cfgtable);
50965 if (rc)
50966@@ -7119,7 +7119,7 @@ reinit_after_soft_reset:
50967 h->drv_req_rescan = 0;
50968
50969 /* Turn the interrupts on so we can service requests */
50970- h->access.set_intr_mask(h, HPSA_INTR_ON);
50971+ h->access->set_intr_mask(h, HPSA_INTR_ON);
50972
50973 hpsa_hba_inquiry(h);
50974 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
50975@@ -7184,7 +7184,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
50976 * To write all data in the battery backed cache to disks
50977 */
50978 hpsa_flush_cache(h);
50979- h->access.set_intr_mask(h, HPSA_INTR_OFF);
50980+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
50981 hpsa_free_irqs_and_disable_msix(h);
50982 }
50983
50984@@ -7302,7 +7302,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
50985 CFGTBL_Trans_enable_directed_msix |
50986 (trans_support & (CFGTBL_Trans_io_accel1 |
50987 CFGTBL_Trans_io_accel2));
50988- struct access_method access = SA5_performant_access;
50989+ struct access_method *access = &SA5_performant_access;
50990
50991 /* This is a bit complicated. There are 8 registers on
50992 * the controller which we write to to tell it 8 different
50993@@ -7344,7 +7344,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
50994 * perform the superfluous readl() after each command submission.
50995 */
50996 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
50997- access = SA5_performant_access_no_read;
50998+ access = &SA5_performant_access_no_read;
50999
51000 /* Controller spec: zero out this buffer. */
51001 for (i = 0; i < h->nreply_queues; i++)
51002@@ -7374,12 +7374,12 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51003 * enable outbound interrupt coalescing in accelerator mode;
51004 */
51005 if (trans_support & CFGTBL_Trans_io_accel1) {
51006- access = SA5_ioaccel_mode1_access;
51007+ access = &SA5_ioaccel_mode1_access;
51008 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51009 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51010 } else {
51011 if (trans_support & CFGTBL_Trans_io_accel2) {
51012- access = SA5_ioaccel_mode2_access;
51013+ access = &SA5_ioaccel_mode2_access;
51014 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51015 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51016 }
51017diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
51018index 24472ce..8782caf 100644
51019--- a/drivers/scsi/hpsa.h
51020+++ b/drivers/scsi/hpsa.h
51021@@ -127,7 +127,7 @@ struct ctlr_info {
51022 unsigned int msix_vector;
51023 unsigned int msi_vector;
51024 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
51025- struct access_method access;
51026+ struct access_method *access;
51027 char hba_mode_enabled;
51028
51029 /* queue and queue Info */
51030@@ -536,43 +536,43 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
51031 }
51032
51033 static struct access_method SA5_access = {
51034- SA5_submit_command,
51035- SA5_intr_mask,
51036- SA5_fifo_full,
51037- SA5_intr_pending,
51038- SA5_completed,
51039+ .submit_command = SA5_submit_command,
51040+ .set_intr_mask = SA5_intr_mask,
51041+ .fifo_full = SA5_fifo_full,
51042+ .intr_pending = SA5_intr_pending,
51043+ .command_completed = SA5_completed,
51044 };
51045
51046 static struct access_method SA5_ioaccel_mode1_access = {
51047- SA5_submit_command,
51048- SA5_performant_intr_mask,
51049- SA5_fifo_full,
51050- SA5_ioaccel_mode1_intr_pending,
51051- SA5_ioaccel_mode1_completed,
51052+ .submit_command = SA5_submit_command,
51053+ .set_intr_mask = SA5_performant_intr_mask,
51054+ .fifo_full = SA5_fifo_full,
51055+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
51056+ .command_completed = SA5_ioaccel_mode1_completed,
51057 };
51058
51059 static struct access_method SA5_ioaccel_mode2_access = {
51060- SA5_submit_command_ioaccel2,
51061- SA5_performant_intr_mask,
51062- SA5_fifo_full,
51063- SA5_performant_intr_pending,
51064- SA5_performant_completed,
51065+ .submit_command = SA5_submit_command_ioaccel2,
51066+ .set_intr_mask = SA5_performant_intr_mask,
51067+ .fifo_full = SA5_fifo_full,
51068+ .intr_pending = SA5_performant_intr_pending,
51069+ .command_completed = SA5_performant_completed,
51070 };
51071
51072 static struct access_method SA5_performant_access = {
51073- SA5_submit_command,
51074- SA5_performant_intr_mask,
51075- SA5_fifo_full,
51076- SA5_performant_intr_pending,
51077- SA5_performant_completed,
51078+ .submit_command = SA5_submit_command,
51079+ .set_intr_mask = SA5_performant_intr_mask,
51080+ .fifo_full = SA5_fifo_full,
51081+ .intr_pending = SA5_performant_intr_pending,
51082+ .command_completed = SA5_performant_completed,
51083 };
51084
51085 static struct access_method SA5_performant_access_no_read = {
51086- SA5_submit_command_no_read,
51087- SA5_performant_intr_mask,
51088- SA5_fifo_full,
51089- SA5_performant_intr_pending,
51090- SA5_performant_completed,
51091+ .submit_command = SA5_submit_command_no_read,
51092+ .set_intr_mask = SA5_performant_intr_mask,
51093+ .fifo_full = SA5_fifo_full,
51094+ .intr_pending = SA5_performant_intr_pending,
51095+ .command_completed = SA5_performant_completed,
51096 };
51097
51098 struct board_type {
51099diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
51100index 1b3a094..068e683 100644
51101--- a/drivers/scsi/libfc/fc_exch.c
51102+++ b/drivers/scsi/libfc/fc_exch.c
51103@@ -101,12 +101,12 @@ struct fc_exch_mgr {
51104 u16 pool_max_index;
51105
51106 struct {
51107- atomic_t no_free_exch;
51108- atomic_t no_free_exch_xid;
51109- atomic_t xid_not_found;
51110- atomic_t xid_busy;
51111- atomic_t seq_not_found;
51112- atomic_t non_bls_resp;
51113+ atomic_unchecked_t no_free_exch;
51114+ atomic_unchecked_t no_free_exch_xid;
51115+ atomic_unchecked_t xid_not_found;
51116+ atomic_unchecked_t xid_busy;
51117+ atomic_unchecked_t seq_not_found;
51118+ atomic_unchecked_t non_bls_resp;
51119 } stats;
51120 };
51121
51122@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
51123 /* allocate memory for exchange */
51124 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
51125 if (!ep) {
51126- atomic_inc(&mp->stats.no_free_exch);
51127+ atomic_inc_unchecked(&mp->stats.no_free_exch);
51128 goto out;
51129 }
51130 memset(ep, 0, sizeof(*ep));
51131@@ -874,7 +874,7 @@ out:
51132 return ep;
51133 err:
51134 spin_unlock_bh(&pool->lock);
51135- atomic_inc(&mp->stats.no_free_exch_xid);
51136+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
51137 mempool_free(ep, mp->ep_pool);
51138 return NULL;
51139 }
51140@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51141 xid = ntohs(fh->fh_ox_id); /* we originated exch */
51142 ep = fc_exch_find(mp, xid);
51143 if (!ep) {
51144- atomic_inc(&mp->stats.xid_not_found);
51145+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51146 reject = FC_RJT_OX_ID;
51147 goto out;
51148 }
51149@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51150 ep = fc_exch_find(mp, xid);
51151 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
51152 if (ep) {
51153- atomic_inc(&mp->stats.xid_busy);
51154+ atomic_inc_unchecked(&mp->stats.xid_busy);
51155 reject = FC_RJT_RX_ID;
51156 goto rel;
51157 }
51158@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51159 }
51160 xid = ep->xid; /* get our XID */
51161 } else if (!ep) {
51162- atomic_inc(&mp->stats.xid_not_found);
51163+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51164 reject = FC_RJT_RX_ID; /* XID not found */
51165 goto out;
51166 }
51167@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51168 } else {
51169 sp = &ep->seq;
51170 if (sp->id != fh->fh_seq_id) {
51171- atomic_inc(&mp->stats.seq_not_found);
51172+ atomic_inc_unchecked(&mp->stats.seq_not_found);
51173 if (f_ctl & FC_FC_END_SEQ) {
51174 /*
51175 * Update sequence_id based on incoming last
51176@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51177
51178 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
51179 if (!ep) {
51180- atomic_inc(&mp->stats.xid_not_found);
51181+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51182 goto out;
51183 }
51184 if (ep->esb_stat & ESB_ST_COMPLETE) {
51185- atomic_inc(&mp->stats.xid_not_found);
51186+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51187 goto rel;
51188 }
51189 if (ep->rxid == FC_XID_UNKNOWN)
51190 ep->rxid = ntohs(fh->fh_rx_id);
51191 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
51192- atomic_inc(&mp->stats.xid_not_found);
51193+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51194 goto rel;
51195 }
51196 if (ep->did != ntoh24(fh->fh_s_id) &&
51197 ep->did != FC_FID_FLOGI) {
51198- atomic_inc(&mp->stats.xid_not_found);
51199+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51200 goto rel;
51201 }
51202 sof = fr_sof(fp);
51203@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51204 sp->ssb_stat |= SSB_ST_RESP;
51205 sp->id = fh->fh_seq_id;
51206 } else if (sp->id != fh->fh_seq_id) {
51207- atomic_inc(&mp->stats.seq_not_found);
51208+ atomic_inc_unchecked(&mp->stats.seq_not_found);
51209 goto rel;
51210 }
51211
51212@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51213 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
51214
51215 if (!sp)
51216- atomic_inc(&mp->stats.xid_not_found);
51217+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51218 else
51219- atomic_inc(&mp->stats.non_bls_resp);
51220+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
51221
51222 fc_frame_free(fp);
51223 }
51224@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
51225
51226 list_for_each_entry(ema, &lport->ema_list, ema_list) {
51227 mp = ema->mp;
51228- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
51229+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
51230 st->fc_no_free_exch_xid +=
51231- atomic_read(&mp->stats.no_free_exch_xid);
51232- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
51233- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
51234- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
51235- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
51236+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
51237+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
51238+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
51239+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
51240+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
51241 }
51242 }
51243 EXPORT_SYMBOL(fc_exch_update_stats);
51244diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
51245index 766098a..1c6c971 100644
51246--- a/drivers/scsi/libsas/sas_ata.c
51247+++ b/drivers/scsi/libsas/sas_ata.c
51248@@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
51249 .postreset = ata_std_postreset,
51250 .error_handler = ata_std_error_handler,
51251 .post_internal_cmd = sas_ata_post_internal,
51252- .qc_defer = ata_std_qc_defer,
51253+ .qc_defer = ata_std_qc_defer,
51254 .qc_prep = ata_noop_qc_prep,
51255 .qc_issue = sas_ata_qc_issue,
51256 .qc_fill_rtf = sas_ata_qc_fill_rtf,
51257diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
51258index 434e903..5a4a79b 100644
51259--- a/drivers/scsi/lpfc/lpfc.h
51260+++ b/drivers/scsi/lpfc/lpfc.h
51261@@ -430,7 +430,7 @@ struct lpfc_vport {
51262 struct dentry *debug_nodelist;
51263 struct dentry *vport_debugfs_root;
51264 struct lpfc_debugfs_trc *disc_trc;
51265- atomic_t disc_trc_cnt;
51266+ atomic_unchecked_t disc_trc_cnt;
51267 #endif
51268 uint8_t stat_data_enabled;
51269 uint8_t stat_data_blocked;
51270@@ -880,8 +880,8 @@ struct lpfc_hba {
51271 struct timer_list fabric_block_timer;
51272 unsigned long bit_flags;
51273 #define FABRIC_COMANDS_BLOCKED 0
51274- atomic_t num_rsrc_err;
51275- atomic_t num_cmd_success;
51276+ atomic_unchecked_t num_rsrc_err;
51277+ atomic_unchecked_t num_cmd_success;
51278 unsigned long last_rsrc_error_time;
51279 unsigned long last_ramp_down_time;
51280 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
51281@@ -916,7 +916,7 @@ struct lpfc_hba {
51282
51283 struct dentry *debug_slow_ring_trc;
51284 struct lpfc_debugfs_trc *slow_ring_trc;
51285- atomic_t slow_ring_trc_cnt;
51286+ atomic_unchecked_t slow_ring_trc_cnt;
51287 /* iDiag debugfs sub-directory */
51288 struct dentry *idiag_root;
51289 struct dentry *idiag_pci_cfg;
51290diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
51291index 786a2af..562c6a2 100644
51292--- a/drivers/scsi/lpfc/lpfc_debugfs.c
51293+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
51294@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
51295
51296 #include <linux/debugfs.h>
51297
51298-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51299+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51300 static unsigned long lpfc_debugfs_start_time = 0L;
51301
51302 /* iDiag */
51303@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
51304 lpfc_debugfs_enable = 0;
51305
51306 len = 0;
51307- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
51308+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
51309 (lpfc_debugfs_max_disc_trc - 1);
51310 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
51311 dtp = vport->disc_trc + i;
51312@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
51313 lpfc_debugfs_enable = 0;
51314
51315 len = 0;
51316- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
51317+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
51318 (lpfc_debugfs_max_slow_ring_trc - 1);
51319 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
51320 dtp = phba->slow_ring_trc + i;
51321@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
51322 !vport || !vport->disc_trc)
51323 return;
51324
51325- index = atomic_inc_return(&vport->disc_trc_cnt) &
51326+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
51327 (lpfc_debugfs_max_disc_trc - 1);
51328 dtp = vport->disc_trc + index;
51329 dtp->fmt = fmt;
51330 dtp->data1 = data1;
51331 dtp->data2 = data2;
51332 dtp->data3 = data3;
51333- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51334+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51335 dtp->jif = jiffies;
51336 #endif
51337 return;
51338@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
51339 !phba || !phba->slow_ring_trc)
51340 return;
51341
51342- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
51343+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
51344 (lpfc_debugfs_max_slow_ring_trc - 1);
51345 dtp = phba->slow_ring_trc + index;
51346 dtp->fmt = fmt;
51347 dtp->data1 = data1;
51348 dtp->data2 = data2;
51349 dtp->data3 = data3;
51350- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51351+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51352 dtp->jif = jiffies;
51353 #endif
51354 return;
51355@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51356 "slow_ring buffer\n");
51357 goto debug_failed;
51358 }
51359- atomic_set(&phba->slow_ring_trc_cnt, 0);
51360+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
51361 memset(phba->slow_ring_trc, 0,
51362 (sizeof(struct lpfc_debugfs_trc) *
51363 lpfc_debugfs_max_slow_ring_trc));
51364@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51365 "buffer\n");
51366 goto debug_failed;
51367 }
51368- atomic_set(&vport->disc_trc_cnt, 0);
51369+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
51370
51371 snprintf(name, sizeof(name), "discovery_trace");
51372 vport->debug_disc_trc =
51373diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
51374index 0b2c53a..aec2b45 100644
51375--- a/drivers/scsi/lpfc/lpfc_init.c
51376+++ b/drivers/scsi/lpfc/lpfc_init.c
51377@@ -11290,8 +11290,10 @@ lpfc_init(void)
51378 "misc_register returned with status %d", error);
51379
51380 if (lpfc_enable_npiv) {
51381- lpfc_transport_functions.vport_create = lpfc_vport_create;
51382- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51383+ pax_open_kernel();
51384+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
51385+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51386+ pax_close_kernel();
51387 }
51388 lpfc_transport_template =
51389 fc_attach_transport(&lpfc_transport_functions);
51390diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
51391index b99399f..d29dc75 100644
51392--- a/drivers/scsi/lpfc/lpfc_scsi.c
51393+++ b/drivers/scsi/lpfc/lpfc_scsi.c
51394@@ -383,7 +383,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
51395 unsigned long expires;
51396
51397 spin_lock_irqsave(&phba->hbalock, flags);
51398- atomic_inc(&phba->num_rsrc_err);
51399+ atomic_inc_unchecked(&phba->num_rsrc_err);
51400 phba->last_rsrc_error_time = jiffies;
51401
51402 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
51403@@ -425,8 +425,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51404 unsigned long num_rsrc_err, num_cmd_success;
51405 int i;
51406
51407- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
51408- num_cmd_success = atomic_read(&phba->num_cmd_success);
51409+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
51410+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
51411
51412 /*
51413 * The error and success command counters are global per
51414@@ -454,8 +454,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51415 }
51416 }
51417 lpfc_destroy_vport_work_array(phba, vports);
51418- atomic_set(&phba->num_rsrc_err, 0);
51419- atomic_set(&phba->num_cmd_success, 0);
51420+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
51421+ atomic_set_unchecked(&phba->num_cmd_success, 0);
51422 }
51423
51424 /**
51425diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51426index c80ed04..e674f01 100644
51427--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51428+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51429@@ -1561,7 +1561,7 @@ _scsih_get_resync(struct device *dev)
51430 {
51431 struct scsi_device *sdev = to_scsi_device(dev);
51432 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51433- static struct _raid_device *raid_device;
51434+ struct _raid_device *raid_device;
51435 unsigned long flags;
51436 Mpi2RaidVolPage0_t vol_pg0;
51437 Mpi2ConfigReply_t mpi_reply;
51438@@ -1613,7 +1613,7 @@ _scsih_get_state(struct device *dev)
51439 {
51440 struct scsi_device *sdev = to_scsi_device(dev);
51441 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51442- static struct _raid_device *raid_device;
51443+ struct _raid_device *raid_device;
51444 unsigned long flags;
51445 Mpi2RaidVolPage0_t vol_pg0;
51446 Mpi2ConfigReply_t mpi_reply;
51447@@ -6663,7 +6663,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
51448 Mpi2EventDataIrOperationStatus_t *event_data =
51449 (Mpi2EventDataIrOperationStatus_t *)
51450 fw_event->event_data;
51451- static struct _raid_device *raid_device;
51452+ struct _raid_device *raid_device;
51453 unsigned long flags;
51454 u16 handle;
51455
51456@@ -7134,7 +7134,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
51457 u64 sas_address;
51458 struct _sas_device *sas_device;
51459 struct _sas_node *expander_device;
51460- static struct _raid_device *raid_device;
51461+ struct _raid_device *raid_device;
51462 u8 retry_count;
51463 unsigned long flags;
51464
51465diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
51466index bcb64eb..f08cf71 100644
51467--- a/drivers/scsi/pmcraid.c
51468+++ b/drivers/scsi/pmcraid.c
51469@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
51470 res->scsi_dev = scsi_dev;
51471 scsi_dev->hostdata = res;
51472 res->change_detected = 0;
51473- atomic_set(&res->read_failures, 0);
51474- atomic_set(&res->write_failures, 0);
51475+ atomic_set_unchecked(&res->read_failures, 0);
51476+ atomic_set_unchecked(&res->write_failures, 0);
51477 rc = 0;
51478 }
51479 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
51480@@ -2687,9 +2687,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
51481
51482 /* If this was a SCSI read/write command keep count of errors */
51483 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
51484- atomic_inc(&res->read_failures);
51485+ atomic_inc_unchecked(&res->read_failures);
51486 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
51487- atomic_inc(&res->write_failures);
51488+ atomic_inc_unchecked(&res->write_failures);
51489
51490 if (!RES_IS_GSCSI(res->cfg_entry) &&
51491 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
51492@@ -3545,7 +3545,7 @@ static int pmcraid_queuecommand_lck(
51493 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51494 * hrrq_id assigned here in queuecommand
51495 */
51496- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51497+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51498 pinstance->num_hrrq;
51499 cmd->cmd_done = pmcraid_io_done;
51500
51501@@ -3857,7 +3857,7 @@ static long pmcraid_ioctl_passthrough(
51502 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51503 * hrrq_id assigned here in queuecommand
51504 */
51505- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51506+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51507 pinstance->num_hrrq;
51508
51509 if (request_size) {
51510@@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
51511
51512 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
51513 /* add resources only after host is added into system */
51514- if (!atomic_read(&pinstance->expose_resources))
51515+ if (!atomic_read_unchecked(&pinstance->expose_resources))
51516 return;
51517
51518 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
51519@@ -5312,8 +5312,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
51520 init_waitqueue_head(&pinstance->reset_wait_q);
51521
51522 atomic_set(&pinstance->outstanding_cmds, 0);
51523- atomic_set(&pinstance->last_message_id, 0);
51524- atomic_set(&pinstance->expose_resources, 0);
51525+ atomic_set_unchecked(&pinstance->last_message_id, 0);
51526+ atomic_set_unchecked(&pinstance->expose_resources, 0);
51527
51528 INIT_LIST_HEAD(&pinstance->free_res_q);
51529 INIT_LIST_HEAD(&pinstance->used_res_q);
51530@@ -6026,7 +6026,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
51531 /* Schedule worker thread to handle CCN and take care of adding and
51532 * removing devices to OS
51533 */
51534- atomic_set(&pinstance->expose_resources, 1);
51535+ atomic_set_unchecked(&pinstance->expose_resources, 1);
51536 schedule_work(&pinstance->worker_q);
51537 return rc;
51538
51539diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
51540index e1d150f..6c6df44 100644
51541--- a/drivers/scsi/pmcraid.h
51542+++ b/drivers/scsi/pmcraid.h
51543@@ -748,7 +748,7 @@ struct pmcraid_instance {
51544 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
51545
51546 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
51547- atomic_t last_message_id;
51548+ atomic_unchecked_t last_message_id;
51549
51550 /* configuration table */
51551 struct pmcraid_config_table *cfg_table;
51552@@ -777,7 +777,7 @@ struct pmcraid_instance {
51553 atomic_t outstanding_cmds;
51554
51555 /* should add/delete resources to mid-layer now ?*/
51556- atomic_t expose_resources;
51557+ atomic_unchecked_t expose_resources;
51558
51559
51560
51561@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
51562 struct pmcraid_config_table_entry_ext cfg_entry_ext;
51563 };
51564 struct scsi_device *scsi_dev; /* Link scsi_device structure */
51565- atomic_t read_failures; /* count of failed READ commands */
51566- atomic_t write_failures; /* count of failed WRITE commands */
51567+ atomic_unchecked_t read_failures; /* count of failed READ commands */
51568+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
51569
51570 /* To indicate add/delete/modify during CCN */
51571 u8 change_detected;
51572diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
51573index 82b92c4..3178171 100644
51574--- a/drivers/scsi/qla2xxx/qla_attr.c
51575+++ b/drivers/scsi/qla2xxx/qla_attr.c
51576@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
51577 return 0;
51578 }
51579
51580-struct fc_function_template qla2xxx_transport_functions = {
51581+fc_function_template_no_const qla2xxx_transport_functions = {
51582
51583 .show_host_node_name = 1,
51584 .show_host_port_name = 1,
51585@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
51586 .bsg_timeout = qla24xx_bsg_timeout,
51587 };
51588
51589-struct fc_function_template qla2xxx_transport_vport_functions = {
51590+fc_function_template_no_const qla2xxx_transport_vport_functions = {
51591
51592 .show_host_node_name = 1,
51593 .show_host_port_name = 1,
51594diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
51595index b1865a7..a7723d3 100644
51596--- a/drivers/scsi/qla2xxx/qla_gbl.h
51597+++ b/drivers/scsi/qla2xxx/qla_gbl.h
51598@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
51599 struct device_attribute;
51600 extern struct device_attribute *qla2x00_host_attrs[];
51601 struct fc_function_template;
51602-extern struct fc_function_template qla2xxx_transport_functions;
51603-extern struct fc_function_template qla2xxx_transport_vport_functions;
51604+extern fc_function_template_no_const qla2xxx_transport_functions;
51605+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
51606 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
51607 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
51608 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
51609diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
51610index db3dbd9..2492392 100644
51611--- a/drivers/scsi/qla2xxx/qla_os.c
51612+++ b/drivers/scsi/qla2xxx/qla_os.c
51613@@ -1507,8 +1507,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
51614 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
51615 /* Ok, a 64bit DMA mask is applicable. */
51616 ha->flags.enable_64bit_addressing = 1;
51617- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
51618- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
51619+ pax_open_kernel();
51620+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
51621+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
51622+ pax_close_kernel();
51623 return;
51624 }
51625 }
51626diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
51627index 8f6d0fb..1b21097 100644
51628--- a/drivers/scsi/qla4xxx/ql4_def.h
51629+++ b/drivers/scsi/qla4xxx/ql4_def.h
51630@@ -305,7 +305,7 @@ struct ddb_entry {
51631 * (4000 only) */
51632 atomic_t relogin_timer; /* Max Time to wait for
51633 * relogin to complete */
51634- atomic_t relogin_retry_count; /* Num of times relogin has been
51635+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
51636 * retried */
51637 uint32_t default_time2wait; /* Default Min time between
51638 * relogins (+aens) */
51639diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
51640index 199fcf7..3c3a918 100644
51641--- a/drivers/scsi/qla4xxx/ql4_os.c
51642+++ b/drivers/scsi/qla4xxx/ql4_os.c
51643@@ -4496,12 +4496,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
51644 */
51645 if (!iscsi_is_session_online(cls_sess)) {
51646 /* Reset retry relogin timer */
51647- atomic_inc(&ddb_entry->relogin_retry_count);
51648+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
51649 DEBUG2(ql4_printk(KERN_INFO, ha,
51650 "%s: index[%d] relogin timed out-retrying"
51651 " relogin (%d), retry (%d)\n", __func__,
51652 ddb_entry->fw_ddb_index,
51653- atomic_read(&ddb_entry->relogin_retry_count),
51654+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
51655 ddb_entry->default_time2wait + 4));
51656 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
51657 atomic_set(&ddb_entry->retry_relogin_timer,
51658@@ -6609,7 +6609,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
51659
51660 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
51661 atomic_set(&ddb_entry->relogin_timer, 0);
51662- atomic_set(&ddb_entry->relogin_retry_count, 0);
51663+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
51664 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
51665 ddb_entry->default_relogin_timeout =
51666 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
51667diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
51668index 79c77b4..ef6ec0b 100644
51669--- a/drivers/scsi/scsi.c
51670+++ b/drivers/scsi/scsi.c
51671@@ -645,7 +645,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
51672 struct Scsi_Host *host = cmd->device->host;
51673 int rtn = 0;
51674
51675- atomic_inc(&cmd->device->iorequest_cnt);
51676+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
51677
51678 /* check if the device is still usable */
51679 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
51680diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
51681index 50a6e1a..de5252e 100644
51682--- a/drivers/scsi/scsi_lib.c
51683+++ b/drivers/scsi/scsi_lib.c
51684@@ -1583,7 +1583,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
51685 shost = sdev->host;
51686 scsi_init_cmd_errh(cmd);
51687 cmd->result = DID_NO_CONNECT << 16;
51688- atomic_inc(&cmd->device->iorequest_cnt);
51689+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
51690
51691 /*
51692 * SCSI request completion path will do scsi_device_unbusy(),
51693@@ -1606,9 +1606,9 @@ static void scsi_softirq_done(struct request *rq)
51694
51695 INIT_LIST_HEAD(&cmd->eh_entry);
51696
51697- atomic_inc(&cmd->device->iodone_cnt);
51698+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
51699 if (cmd->result)
51700- atomic_inc(&cmd->device->ioerr_cnt);
51701+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
51702
51703 disposition = scsi_decide_disposition(cmd);
51704 if (disposition != SUCCESS &&
51705diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
51706index f4cb7b3..dfa79c4 100644
51707--- a/drivers/scsi/scsi_sysfs.c
51708+++ b/drivers/scsi/scsi_sysfs.c
51709@@ -805,7 +805,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
51710 char *buf) \
51711 { \
51712 struct scsi_device *sdev = to_scsi_device(dev); \
51713- unsigned long long count = atomic_read(&sdev->field); \
51714+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
51715 return snprintf(buf, 20, "0x%llx\n", count); \
51716 } \
51717 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
51718diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
51719index 5d6f348..18778a6b 100644
51720--- a/drivers/scsi/scsi_transport_fc.c
51721+++ b/drivers/scsi/scsi_transport_fc.c
51722@@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
51723 * Netlink Infrastructure
51724 */
51725
51726-static atomic_t fc_event_seq;
51727+static atomic_unchecked_t fc_event_seq;
51728
51729 /**
51730 * fc_get_event_number - Obtain the next sequential FC event number
51731@@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
51732 u32
51733 fc_get_event_number(void)
51734 {
51735- return atomic_add_return(1, &fc_event_seq);
51736+ return atomic_add_return_unchecked(1, &fc_event_seq);
51737 }
51738 EXPORT_SYMBOL(fc_get_event_number);
51739
51740@@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
51741 {
51742 int error;
51743
51744- atomic_set(&fc_event_seq, 0);
51745+ atomic_set_unchecked(&fc_event_seq, 0);
51746
51747 error = transport_class_register(&fc_host_class);
51748 if (error)
51749@@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
51750 char *cp;
51751
51752 *val = simple_strtoul(buf, &cp, 0);
51753- if ((*cp && (*cp != '\n')) || (*val < 0))
51754+ if (*cp && (*cp != '\n'))
51755 return -EINVAL;
51756 /*
51757 * Check for overflow; dev_loss_tmo is u32
51758diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
51759index 67d43e3..8cee73c 100644
51760--- a/drivers/scsi/scsi_transport_iscsi.c
51761+++ b/drivers/scsi/scsi_transport_iscsi.c
51762@@ -79,7 +79,7 @@ struct iscsi_internal {
51763 struct transport_container session_cont;
51764 };
51765
51766-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
51767+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
51768 static struct workqueue_struct *iscsi_eh_timer_workq;
51769
51770 static DEFINE_IDA(iscsi_sess_ida);
51771@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
51772 int err;
51773
51774 ihost = shost->shost_data;
51775- session->sid = atomic_add_return(1, &iscsi_session_nr);
51776+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
51777
51778 if (target_id == ISCSI_MAX_TARGET) {
51779 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
51780@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
51781 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
51782 ISCSI_TRANSPORT_VERSION);
51783
51784- atomic_set(&iscsi_session_nr, 0);
51785+ atomic_set_unchecked(&iscsi_session_nr, 0);
51786
51787 err = class_register(&iscsi_transport_class);
51788 if (err)
51789diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
51790index ae45bd9..c32a586 100644
51791--- a/drivers/scsi/scsi_transport_srp.c
51792+++ b/drivers/scsi/scsi_transport_srp.c
51793@@ -35,7 +35,7 @@
51794 #include "scsi_priv.h"
51795
51796 struct srp_host_attrs {
51797- atomic_t next_port_id;
51798+ atomic_unchecked_t next_port_id;
51799 };
51800 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
51801
51802@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
51803 struct Scsi_Host *shost = dev_to_shost(dev);
51804 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
51805
51806- atomic_set(&srp_host->next_port_id, 0);
51807+ atomic_set_unchecked(&srp_host->next_port_id, 0);
51808 return 0;
51809 }
51810
51811@@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
51812 rport_fast_io_fail_timedout);
51813 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
51814
51815- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
51816+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
51817 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
51818
51819 transport_setup_device(&rport->dev);
51820diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
51821index cfba74c..415f09b 100644
51822--- a/drivers/scsi/sd.c
51823+++ b/drivers/scsi/sd.c
51824@@ -3022,7 +3022,7 @@ static int sd_probe(struct device *dev)
51825 sdkp->disk = gd;
51826 sdkp->index = index;
51827 atomic_set(&sdkp->openers, 0);
51828- atomic_set(&sdkp->device->ioerr_cnt, 0);
51829+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
51830
51831 if (!sdp->request_queue->rq_timeout) {
51832 if (sdp->type != TYPE_MOD)
51833diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
51834index 6035444..c82edd4 100644
51835--- a/drivers/scsi/sg.c
51836+++ b/drivers/scsi/sg.c
51837@@ -1138,7 +1138,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
51838 sdp->disk->disk_name,
51839 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
51840 NULL,
51841- (char *)arg);
51842+ (char __user *)arg);
51843 case BLKTRACESTART:
51844 return blk_trace_startstop(sdp->device->request_queue, 1);
51845 case BLKTRACESTOP:
51846diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
51847index 11a5043..e36f04c 100644
51848--- a/drivers/soc/tegra/fuse/fuse-tegra.c
51849+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
51850@@ -70,7 +70,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
51851 return i;
51852 }
51853
51854-static struct bin_attribute fuse_bin_attr = {
51855+static bin_attribute_no_const fuse_bin_attr = {
51856 .attr = { .name = "fuse", .mode = S_IRUGO, },
51857 .read = fuse_read,
51858 };
51859diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
51860index 50f20f2..6bd81e0 100644
51861--- a/drivers/spi/spi.c
51862+++ b/drivers/spi/spi.c
51863@@ -2224,7 +2224,7 @@ int spi_bus_unlock(struct spi_master *master)
51864 EXPORT_SYMBOL_GPL(spi_bus_unlock);
51865
51866 /* portable code must never pass more than 32 bytes */
51867-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
51868+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
51869
51870 static u8 *buf;
51871
51872diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
51873index b41429f..2de5373 100644
51874--- a/drivers/staging/android/timed_output.c
51875+++ b/drivers/staging/android/timed_output.c
51876@@ -25,7 +25,7 @@
51877 #include "timed_output.h"
51878
51879 static struct class *timed_output_class;
51880-static atomic_t device_count;
51881+static atomic_unchecked_t device_count;
51882
51883 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
51884 char *buf)
51885@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
51886 timed_output_class = class_create(THIS_MODULE, "timed_output");
51887 if (IS_ERR(timed_output_class))
51888 return PTR_ERR(timed_output_class);
51889- atomic_set(&device_count, 0);
51890+ atomic_set_unchecked(&device_count, 0);
51891 timed_output_class->dev_groups = timed_output_groups;
51892 }
51893
51894@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
51895 if (ret < 0)
51896 return ret;
51897
51898- tdev->index = atomic_inc_return(&device_count);
51899+ tdev->index = atomic_inc_return_unchecked(&device_count);
51900 tdev->dev = device_create(timed_output_class, NULL,
51901 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
51902 if (IS_ERR(tdev->dev))
51903diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
51904index 001348c..cfaac8a 100644
51905--- a/drivers/staging/gdm724x/gdm_tty.c
51906+++ b/drivers/staging/gdm724x/gdm_tty.c
51907@@ -44,7 +44,7 @@
51908 #define gdm_tty_send_control(n, r, v, d, l) (\
51909 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
51910
51911-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
51912+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
51913
51914 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
51915 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
51916diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
51917index 9cb222e..8766f26 100644
51918--- a/drivers/staging/imx-drm/imx-drm-core.c
51919+++ b/drivers/staging/imx-drm/imx-drm-core.c
51920@@ -357,7 +357,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
51921 if (imxdrm->pipes >= MAX_CRTC)
51922 return -EINVAL;
51923
51924- if (imxdrm->drm->open_count)
51925+ if (local_read(&imxdrm->drm->open_count))
51926 return -EBUSY;
51927
51928 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
51929diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
51930index 503b2d7..c904931 100644
51931--- a/drivers/staging/line6/driver.c
51932+++ b/drivers/staging/line6/driver.c
51933@@ -463,7 +463,7 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
51934 {
51935 struct usb_device *usbdev = line6->usbdev;
51936 int ret;
51937- unsigned char len;
51938+ unsigned char *plen;
51939
51940 /* query the serial number: */
51941 ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
51942@@ -476,27 +476,34 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
51943 return ret;
51944 }
51945
51946+ plen = kmalloc(1, GFP_KERNEL);
51947+ if (plen == NULL)
51948+ return -ENOMEM;
51949+
51950 /* Wait for data length. We'll get 0xff until length arrives. */
51951 do {
51952 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
51953 USB_TYPE_VENDOR | USB_RECIP_DEVICE |
51954 USB_DIR_IN,
51955- 0x0012, 0x0000, &len, 1,
51956+ 0x0012, 0x0000, plen, 1,
51957 LINE6_TIMEOUT * HZ);
51958 if (ret < 0) {
51959 dev_err(line6->ifcdev,
51960 "receive length failed (error %d)\n", ret);
51961+ kfree(plen);
51962 return ret;
51963 }
51964- } while (len == 0xff);
51965+ } while (*plen == 0xff);
51966
51967- if (len != datalen) {
51968+ if (*plen != datalen) {
51969 /* should be equal or something went wrong */
51970 dev_err(line6->ifcdev,
51971 "length mismatch (expected %d, got %d)\n",
51972- (int)datalen, (int)len);
51973+ (int)datalen, (int)*plen);
51974+ kfree(plen);
51975 return -EINVAL;
51976 }
51977+ kfree(plen);
51978
51979 /* receive the result: */
51980 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
51981@@ -520,7 +527,7 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
51982 {
51983 struct usb_device *usbdev = line6->usbdev;
51984 int ret;
51985- unsigned char status;
51986+ unsigned char *status;
51987
51988 ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
51989 USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
51990@@ -533,26 +540,34 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
51991 return ret;
51992 }
51993
51994+ status = kmalloc(1, GFP_KERNEL);
51995+ if (status == NULL)
51996+ return -ENOMEM;
51997+
51998 do {
51999 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0),
52000 0x67,
52001 USB_TYPE_VENDOR | USB_RECIP_DEVICE |
52002 USB_DIR_IN,
52003 0x0012, 0x0000,
52004- &status, 1, LINE6_TIMEOUT * HZ);
52005+ status, 1, LINE6_TIMEOUT * HZ);
52006
52007 if (ret < 0) {
52008 dev_err(line6->ifcdev,
52009 "receiving status failed (error %d)\n", ret);
52010+ kfree(status);
52011 return ret;
52012 }
52013- } while (status == 0xff);
52014+ } while (*status == 0xff);
52015
52016- if (status != 0) {
52017+ if (*status != 0) {
52018 dev_err(line6->ifcdev, "write failed (error %d)\n", ret);
52019+ kfree(status);
52020 return -EINVAL;
52021 }
52022
52023+ kfree(status);
52024+
52025 return 0;
52026 }
52027
52028diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c
52029index 6943715..0a93632 100644
52030--- a/drivers/staging/line6/toneport.c
52031+++ b/drivers/staging/line6/toneport.c
52032@@ -11,6 +11,7 @@
52033 */
52034
52035 #include <linux/wait.h>
52036+#include <linux/slab.h>
52037 #include <sound/control.h>
52038
52039 #include "audio.h"
52040@@ -307,14 +308,20 @@ static void toneport_destruct(struct usb_interface *interface)
52041 */
52042 static void toneport_setup(struct usb_line6_toneport *toneport)
52043 {
52044- int ticks;
52045+ int *ticks;
52046 struct usb_line6 *line6 = &toneport->line6;
52047 struct usb_device *usbdev = line6->usbdev;
52048 u16 idProduct = le16_to_cpu(usbdev->descriptor.idProduct);
52049
52050+ ticks = kmalloc(sizeof(int), GFP_KERNEL);
52051+ if (ticks == NULL)
52052+ return;
52053+
52054 /* sync time on device with host: */
52055- ticks = (int)get_seconds();
52056- line6_write_data(line6, 0x80c6, &ticks, 4);
52057+ *ticks = (int)get_seconds();
52058+ line6_write_data(line6, 0x80c6, ticks, sizeof(int));
52059+
52060+ kfree(ticks);
52061
52062 /* enable device: */
52063 toneport_send_cmd(usbdev, 0x0301, 0x0000);
52064diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
52065index a94f336..6a1924d 100644
52066--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
52067+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
52068@@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
52069 return 0;
52070 }
52071
52072-sfw_test_client_ops_t brw_test_client;
52073-void brw_init_test_client(void)
52074-{
52075- brw_test_client.tso_init = brw_client_init;
52076- brw_test_client.tso_fini = brw_client_fini;
52077- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
52078- brw_test_client.tso_done_rpc = brw_client_done_rpc;
52079+sfw_test_client_ops_t brw_test_client = {
52080+ .tso_init = brw_client_init,
52081+ .tso_fini = brw_client_fini,
52082+ .tso_prep_rpc = brw_client_prep_rpc,
52083+ .tso_done_rpc = brw_client_done_rpc,
52084 };
52085
52086 srpc_service_t brw_test_service;
52087diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
52088index df04ab7..1deb1ac 100644
52089--- a/drivers/staging/lustre/lnet/selftest/framework.c
52090+++ b/drivers/staging/lustre/lnet/selftest/framework.c
52091@@ -1632,12 +1632,10 @@ static srpc_service_t sfw_services[] = {
52092
52093 extern sfw_test_client_ops_t ping_test_client;
52094 extern srpc_service_t ping_test_service;
52095-extern void ping_init_test_client(void);
52096 extern void ping_init_test_service(void);
52097
52098 extern sfw_test_client_ops_t brw_test_client;
52099 extern srpc_service_t brw_test_service;
52100-extern void brw_init_test_client(void);
52101 extern void brw_init_test_service(void);
52102
52103
52104@@ -1681,12 +1679,10 @@ sfw_startup (void)
52105 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
52106 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
52107
52108- brw_init_test_client();
52109 brw_init_test_service();
52110 rc = sfw_register_test(&brw_test_service, &brw_test_client);
52111 LASSERT (rc == 0);
52112
52113- ping_init_test_client();
52114 ping_init_test_service();
52115 rc = sfw_register_test(&ping_test_service, &ping_test_client);
52116 LASSERT (rc == 0);
52117diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
52118index 750cac4..e4d751f 100644
52119--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
52120+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
52121@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
52122 return 0;
52123 }
52124
52125-sfw_test_client_ops_t ping_test_client;
52126-void ping_init_test_client(void)
52127-{
52128- ping_test_client.tso_init = ping_client_init;
52129- ping_test_client.tso_fini = ping_client_fini;
52130- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
52131- ping_test_client.tso_done_rpc = ping_client_done_rpc;
52132-}
52133+sfw_test_client_ops_t ping_test_client = {
52134+ .tso_init = ping_client_init,
52135+ .tso_fini = ping_client_fini,
52136+ .tso_prep_rpc = ping_client_prep_rpc,
52137+ .tso_done_rpc = ping_client_done_rpc,
52138+};
52139
52140 srpc_service_t ping_test_service;
52141 void ping_init_test_service(void)
52142diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52143index 14ac46f..eca2c16 100644
52144--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
52145+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52146@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
52147 ldlm_completion_callback lcs_completion;
52148 ldlm_blocking_callback lcs_blocking;
52149 ldlm_glimpse_callback lcs_glimpse;
52150-};
52151+} __no_const;
52152
52153 /* ldlm_lockd.c */
52154 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
52155diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
52156index 2a88b80..62e7e5f 100644
52157--- a/drivers/staging/lustre/lustre/include/obd.h
52158+++ b/drivers/staging/lustre/lustre/include/obd.h
52159@@ -1362,7 +1362,7 @@ struct md_ops {
52160 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
52161 * wrapper function in include/linux/obd_class.h.
52162 */
52163-};
52164+} __no_const;
52165
52166 struct lsm_operations {
52167 void (*lsm_free)(struct lov_stripe_md *);
52168diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52169index b798daa..b28ca8f 100644
52170--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52171+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52172@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
52173 int added = (mode == LCK_NL);
52174 int overlaps = 0;
52175 int splitted = 0;
52176- const struct ldlm_callback_suite null_cbs = { NULL };
52177+ const struct ldlm_callback_suite null_cbs = { };
52178
52179 CDEBUG(D_DLMTRACE, "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
52180 *flags, new->l_policy_data.l_flock.owner,
52181diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52182index bbe2c68..c6b4275 100644
52183--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52184+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52185@@ -236,7 +236,7 @@ int proc_console_max_delay_cs(struct ctl_table *table, int write,
52186 void __user *buffer, size_t *lenp, loff_t *ppos)
52187 {
52188 int rc, max_delay_cs;
52189- struct ctl_table dummy = *table;
52190+ ctl_table_no_const dummy = *table;
52191 long d;
52192
52193 dummy.data = &max_delay_cs;
52194@@ -268,7 +268,7 @@ int proc_console_min_delay_cs(struct ctl_table *table, int write,
52195 void __user *buffer, size_t *lenp, loff_t *ppos)
52196 {
52197 int rc, min_delay_cs;
52198- struct ctl_table dummy = *table;
52199+ ctl_table_no_const dummy = *table;
52200 long d;
52201
52202 dummy.data = &min_delay_cs;
52203@@ -300,7 +300,7 @@ int proc_console_backoff(struct ctl_table *table, int write,
52204 void __user *buffer, size_t *lenp, loff_t *ppos)
52205 {
52206 int rc, backoff;
52207- struct ctl_table dummy = *table;
52208+ ctl_table_no_const dummy = *table;
52209
52210 dummy.data = &backoff;
52211 dummy.proc_handler = &proc_dointvec;
52212diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
52213index 2c4fc74..b04ca79 100644
52214--- a/drivers/staging/lustre/lustre/libcfs/module.c
52215+++ b/drivers/staging/lustre/lustre/libcfs/module.c
52216@@ -315,11 +315,11 @@ out:
52217
52218
52219 struct cfs_psdev_ops libcfs_psdev_ops = {
52220- libcfs_psdev_open,
52221- libcfs_psdev_release,
52222- NULL,
52223- NULL,
52224- libcfs_ioctl
52225+ .p_open = libcfs_psdev_open,
52226+ .p_close = libcfs_psdev_release,
52227+ .p_read = NULL,
52228+ .p_write = NULL,
52229+ .p_ioctl = libcfs_ioctl
52230 };
52231
52232 extern int insert_proc(void);
52233diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
52234index b0bb709..0117c96 100644
52235--- a/drivers/staging/lustre/lustre/llite/dir.c
52236+++ b/drivers/staging/lustre/lustre/llite/dir.c
52237@@ -661,7 +661,7 @@ int ll_dir_setdirstripe(struct inode *dir, struct lmv_user_md *lump,
52238 int mode;
52239 int err;
52240
52241- mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
52242+ mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current_umask()) | S_IFDIR;
52243 op_data = ll_prep_md_op_data(NULL, dir, NULL, filename,
52244 strlen(filename), mode, LUSTRE_OPC_MKDIR,
52245 lump);
52246diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
52247index b2b6c3c..302e4e4 100644
52248--- a/drivers/staging/octeon/ethernet-rx.c
52249+++ b/drivers/staging/octeon/ethernet-rx.c
52250@@ -416,11 +416,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52251 /* Increment RX stats for virtual ports */
52252 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
52253 #ifdef CONFIG_64BIT
52254- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
52255- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
52256+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
52257+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
52258 #else
52259- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
52260- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
52261+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
52262+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
52263 #endif
52264 }
52265 netif_receive_skb(skb);
52266@@ -431,9 +431,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52267 dev->name);
52268 */
52269 #ifdef CONFIG_64BIT
52270- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
52271+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52272 #else
52273- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
52274+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
52275 #endif
52276 dev_kfree_skb_irq(skb);
52277 }
52278diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
52279index 8f9e3fb..d283fb9 100644
52280--- a/drivers/staging/octeon/ethernet.c
52281+++ b/drivers/staging/octeon/ethernet.c
52282@@ -247,11 +247,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
52283 * since the RX tasklet also increments it.
52284 */
52285 #ifdef CONFIG_64BIT
52286- atomic64_add(rx_status.dropped_packets,
52287- (atomic64_t *)&priv->stats.rx_dropped);
52288+ atomic64_add_unchecked(rx_status.dropped_packets,
52289+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52290 #else
52291- atomic_add(rx_status.dropped_packets,
52292- (atomic_t *)&priv->stats.rx_dropped);
52293+ atomic_add_unchecked(rx_status.dropped_packets,
52294+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
52295 #endif
52296 }
52297
52298diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
52299index 9191993..30e9817 100644
52300--- a/drivers/staging/rtl8188eu/include/hal_intf.h
52301+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
52302@@ -225,7 +225,7 @@ struct hal_ops {
52303
52304 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
52305 void (*hal_reset_security_engine)(struct adapter *adapter);
52306-};
52307+} __no_const;
52308
52309 enum rt_eeprom_type {
52310 EEPROM_93C46,
52311diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
52312index 070cc03..6806e37 100644
52313--- a/drivers/staging/rtl8712/rtl871x_io.h
52314+++ b/drivers/staging/rtl8712/rtl871x_io.h
52315@@ -108,7 +108,7 @@ struct _io_ops {
52316 u8 *pmem);
52317 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
52318 u8 *pmem);
52319-};
52320+} __no_const;
52321
52322 struct io_req {
52323 struct list_head list;
52324diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
52325index 2bf2e2f..84421c9 100644
52326--- a/drivers/staging/unisys/visorchipset/visorchipset.h
52327+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
52328@@ -228,7 +228,7 @@ typedef struct {
52329 void (*device_resume)(ulong busNo, ulong devNo);
52330 int (*get_channel_info)(uuid_le typeGuid, ulong *minSize,
52331 ulong *maxSize);
52332-} VISORCHIPSET_BUSDEV_NOTIFIERS;
52333+} __no_const VISORCHIPSET_BUSDEV_NOTIFIERS;
52334
52335 /* These functions live inside visorchipset, and will be called to indicate
52336 * responses to specific events (by code outside of visorchipset).
52337@@ -243,7 +243,7 @@ typedef struct {
52338 void (*device_destroy)(ulong busNo, ulong devNo, int response);
52339 void (*device_pause)(ulong busNo, ulong devNo, int response);
52340 void (*device_resume)(ulong busNo, ulong devNo, int response);
52341-} VISORCHIPSET_BUSDEV_RESPONDERS;
52342+} __no_const VISORCHIPSET_BUSDEV_RESPONDERS;
52343
52344 /** Register functions (in the bus driver) to get called by visorchipset
52345 * whenever a bus or device appears for which this service partition is
52346diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
52347index ae0dade..803d53a 100644
52348--- a/drivers/staging/vt6655/hostap.c
52349+++ b/drivers/staging/vt6655/hostap.c
52350@@ -65,14 +65,13 @@
52351 *
52352 */
52353
52354+static net_device_ops_no_const apdev_netdev_ops;
52355+
52356 static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
52357 {
52358 struct vnt_private *apdev_priv;
52359 struct net_device *dev = pDevice->dev;
52360 int ret;
52361- const struct net_device_ops apdev_netdev_ops = {
52362- .ndo_start_xmit = pDevice->tx_80211,
52363- };
52364
52365 pr_debug("%s: Enabling hostapd mode\n", dev->name);
52366
52367@@ -84,6 +83,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
52368 *apdev_priv = *pDevice;
52369 eth_hw_addr_inherit(pDevice->apdev, dev);
52370
52371+ /* only half broken now */
52372+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
52373 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
52374
52375 pDevice->apdev->type = ARPHRD_IEEE80211;
52376diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
52377index e7e9372..161f530 100644
52378--- a/drivers/target/sbp/sbp_target.c
52379+++ b/drivers/target/sbp/sbp_target.c
52380@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
52381
52382 #define SESSION_MAINTENANCE_INTERVAL HZ
52383
52384-static atomic_t login_id = ATOMIC_INIT(0);
52385+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
52386
52387 static void session_maintenance_work(struct work_struct *);
52388 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
52389@@ -444,7 +444,7 @@ static void sbp_management_request_login(
52390 login->lun = se_lun;
52391 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
52392 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
52393- login->login_id = atomic_inc_return(&login_id);
52394+ login->login_id = atomic_inc_return_unchecked(&login_id);
52395
52396 login->tgt_agt = sbp_target_agent_register(login);
52397 if (IS_ERR(login->tgt_agt)) {
52398diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
52399index c45f9e9..00e85f0 100644
52400--- a/drivers/target/target_core_device.c
52401+++ b/drivers/target/target_core_device.c
52402@@ -1532,7 +1532,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
52403 spin_lock_init(&dev->se_tmr_lock);
52404 spin_lock_init(&dev->qf_cmd_lock);
52405 sema_init(&dev->caw_sem, 1);
52406- atomic_set(&dev->dev_ordered_id, 0);
52407+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
52408 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
52409 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
52410 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
52411diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
52412index be877bf..7be9cd4 100644
52413--- a/drivers/target/target_core_transport.c
52414+++ b/drivers/target/target_core_transport.c
52415@@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
52416 * Used to determine when ORDERED commands should go from
52417 * Dormant to Active status.
52418 */
52419- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
52420+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
52421 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
52422 cmd->se_ordered_id, cmd->sam_task_attr,
52423 dev->transport->name);
52424diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
52425index edc1cce..769e4cb 100644
52426--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
52427+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
52428@@ -209,8 +209,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
52429 platform_set_drvdata(pdev, priv);
52430
52431 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
52432- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52433- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52434+ pax_open_kernel();
52435+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52436+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52437+ pax_close_kernel();
52438 }
52439 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
52440 priv, &int3400_thermal_ops,
52441diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
52442index 62143ba..ae21165 100644
52443--- a/drivers/thermal/of-thermal.c
52444+++ b/drivers/thermal/of-thermal.c
52445@@ -30,6 +30,7 @@
52446 #include <linux/err.h>
52447 #include <linux/export.h>
52448 #include <linux/string.h>
52449+#include <linux/mm.h>
52450
52451 #include "thermal_core.h"
52452
52453@@ -341,8 +342,10 @@ thermal_zone_of_add_sensor(struct device_node *zone,
52454 tz->get_trend = get_trend;
52455 tz->sensor_data = data;
52456
52457- tzd->ops->get_temp = of_thermal_get_temp;
52458- tzd->ops->get_trend = of_thermal_get_trend;
52459+ pax_open_kernel();
52460+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
52461+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
52462+ pax_close_kernel();
52463 mutex_unlock(&tzd->lock);
52464
52465 return tzd;
52466@@ -473,8 +476,10 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
52467 return;
52468
52469 mutex_lock(&tzd->lock);
52470- tzd->ops->get_temp = NULL;
52471- tzd->ops->get_trend = NULL;
52472+ pax_open_kernel();
52473+ *(void **)&tzd->ops->get_temp = NULL;
52474+ *(void **)&tzd->ops->get_trend = NULL;
52475+ pax_close_kernel();
52476
52477 tz->get_temp = NULL;
52478 tz->get_trend = NULL;
52479diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
52480index fd66f57..48e6376 100644
52481--- a/drivers/tty/cyclades.c
52482+++ b/drivers/tty/cyclades.c
52483@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
52484 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
52485 info->port.count);
52486 #endif
52487- info->port.count++;
52488+ atomic_inc(&info->port.count);
52489 #ifdef CY_DEBUG_COUNT
52490 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
52491- current->pid, info->port.count);
52492+ current->pid, atomic_read(&info->port.count));
52493 #endif
52494
52495 /*
52496@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
52497 for (j = 0; j < cy_card[i].nports; j++) {
52498 info = &cy_card[i].ports[j];
52499
52500- if (info->port.count) {
52501+ if (atomic_read(&info->port.count)) {
52502 /* XXX is the ldisc num worth this? */
52503 struct tty_struct *tty;
52504 struct tty_ldisc *ld;
52505diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
52506index 4fcec1d..5a036f7 100644
52507--- a/drivers/tty/hvc/hvc_console.c
52508+++ b/drivers/tty/hvc/hvc_console.c
52509@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
52510
52511 spin_lock_irqsave(&hp->port.lock, flags);
52512 /* Check and then increment for fast path open. */
52513- if (hp->port.count++ > 0) {
52514+ if (atomic_inc_return(&hp->port.count) > 1) {
52515 spin_unlock_irqrestore(&hp->port.lock, flags);
52516 hvc_kick();
52517 return 0;
52518@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52519
52520 spin_lock_irqsave(&hp->port.lock, flags);
52521
52522- if (--hp->port.count == 0) {
52523+ if (atomic_dec_return(&hp->port.count) == 0) {
52524 spin_unlock_irqrestore(&hp->port.lock, flags);
52525 /* We are done with the tty pointer now. */
52526 tty_port_tty_set(&hp->port, NULL);
52527@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52528 */
52529 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
52530 } else {
52531- if (hp->port.count < 0)
52532+ if (atomic_read(&hp->port.count) < 0)
52533 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
52534- hp->vtermno, hp->port.count);
52535+ hp->vtermno, atomic_read(&hp->port.count));
52536 spin_unlock_irqrestore(&hp->port.lock, flags);
52537 }
52538 }
52539@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
52540 * open->hangup case this can be called after the final close so prevent
52541 * that from happening for now.
52542 */
52543- if (hp->port.count <= 0) {
52544+ if (atomic_read(&hp->port.count) <= 0) {
52545 spin_unlock_irqrestore(&hp->port.lock, flags);
52546 return;
52547 }
52548
52549- hp->port.count = 0;
52550+ atomic_set(&hp->port.count, 0);
52551 spin_unlock_irqrestore(&hp->port.lock, flags);
52552 tty_port_tty_set(&hp->port, NULL);
52553
52554@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
52555 return -EPIPE;
52556
52557 /* FIXME what's this (unprotected) check for? */
52558- if (hp->port.count <= 0)
52559+ if (atomic_read(&hp->port.count) <= 0)
52560 return -EIO;
52561
52562 spin_lock_irqsave(&hp->lock, flags);
52563diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
52564index 81e939e..95ead10 100644
52565--- a/drivers/tty/hvc/hvcs.c
52566+++ b/drivers/tty/hvc/hvcs.c
52567@@ -83,6 +83,7 @@
52568 #include <asm/hvcserver.h>
52569 #include <asm/uaccess.h>
52570 #include <asm/vio.h>
52571+#include <asm/local.h>
52572
52573 /*
52574 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
52575@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
52576
52577 spin_lock_irqsave(&hvcsd->lock, flags);
52578
52579- if (hvcsd->port.count > 0) {
52580+ if (atomic_read(&hvcsd->port.count) > 0) {
52581 spin_unlock_irqrestore(&hvcsd->lock, flags);
52582 printk(KERN_INFO "HVCS: vterm state unchanged. "
52583 "The hvcs device node is still in use.\n");
52584@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
52585 }
52586 }
52587
52588- hvcsd->port.count = 0;
52589+ atomic_set(&hvcsd->port.count, 0);
52590 hvcsd->port.tty = tty;
52591 tty->driver_data = hvcsd;
52592
52593@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
52594 unsigned long flags;
52595
52596 spin_lock_irqsave(&hvcsd->lock, flags);
52597- hvcsd->port.count++;
52598+ atomic_inc(&hvcsd->port.count);
52599 hvcsd->todo_mask |= HVCS_SCHED_READ;
52600 spin_unlock_irqrestore(&hvcsd->lock, flags);
52601
52602@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
52603 hvcsd = tty->driver_data;
52604
52605 spin_lock_irqsave(&hvcsd->lock, flags);
52606- if (--hvcsd->port.count == 0) {
52607+ if (atomic_dec_and_test(&hvcsd->port.count)) {
52608
52609 vio_disable_interrupts(hvcsd->vdev);
52610
52611@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
52612
52613 free_irq(irq, hvcsd);
52614 return;
52615- } else if (hvcsd->port.count < 0) {
52616+ } else if (atomic_read(&hvcsd->port.count) < 0) {
52617 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
52618 " is missmanaged.\n",
52619- hvcsd->vdev->unit_address, hvcsd->port.count);
52620+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
52621 }
52622
52623 spin_unlock_irqrestore(&hvcsd->lock, flags);
52624@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
52625
52626 spin_lock_irqsave(&hvcsd->lock, flags);
52627 /* Preserve this so that we know how many kref refs to put */
52628- temp_open_count = hvcsd->port.count;
52629+ temp_open_count = atomic_read(&hvcsd->port.count);
52630
52631 /*
52632 * Don't kref put inside the spinlock because the destruction
52633@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
52634 tty->driver_data = NULL;
52635 hvcsd->port.tty = NULL;
52636
52637- hvcsd->port.count = 0;
52638+ atomic_set(&hvcsd->port.count, 0);
52639
52640 /* This will drop any buffered data on the floor which is OK in a hangup
52641 * scenario. */
52642@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
52643 * the middle of a write operation? This is a crummy place to do this
52644 * but we want to keep it all in the spinlock.
52645 */
52646- if (hvcsd->port.count <= 0) {
52647+ if (atomic_read(&hvcsd->port.count) <= 0) {
52648 spin_unlock_irqrestore(&hvcsd->lock, flags);
52649 return -ENODEV;
52650 }
52651@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
52652 {
52653 struct hvcs_struct *hvcsd = tty->driver_data;
52654
52655- if (!hvcsd || hvcsd->port.count <= 0)
52656+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
52657 return 0;
52658
52659 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
52660diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
52661index 4190199..06d5bfa 100644
52662--- a/drivers/tty/hvc/hvsi.c
52663+++ b/drivers/tty/hvc/hvsi.c
52664@@ -85,7 +85,7 @@ struct hvsi_struct {
52665 int n_outbuf;
52666 uint32_t vtermno;
52667 uint32_t virq;
52668- atomic_t seqno; /* HVSI packet sequence number */
52669+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
52670 uint16_t mctrl;
52671 uint8_t state; /* HVSI protocol state */
52672 uint8_t flags;
52673@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
52674
52675 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
52676 packet.hdr.len = sizeof(struct hvsi_query_response);
52677- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52678+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52679 packet.verb = VSV_SEND_VERSION_NUMBER;
52680 packet.u.version = HVSI_VERSION;
52681 packet.query_seqno = query_seqno+1;
52682@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
52683
52684 packet.hdr.type = VS_QUERY_PACKET_HEADER;
52685 packet.hdr.len = sizeof(struct hvsi_query);
52686- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52687+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52688 packet.verb = verb;
52689
52690 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
52691@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
52692 int wrote;
52693
52694 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
52695- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52696+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52697 packet.hdr.len = sizeof(struct hvsi_control);
52698 packet.verb = VSV_SET_MODEM_CTL;
52699 packet.mask = HVSI_TSDTR;
52700@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
52701 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
52702
52703 packet.hdr.type = VS_DATA_PACKET_HEADER;
52704- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52705+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52706 packet.hdr.len = count + sizeof(struct hvsi_header);
52707 memcpy(&packet.data, buf, count);
52708
52709@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
52710 struct hvsi_control packet __ALIGNED__;
52711
52712 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
52713- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52714+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52715 packet.hdr.len = 6;
52716 packet.verb = VSV_CLOSE_PROTOCOL;
52717
52718@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
52719
52720 tty_port_tty_set(&hp->port, tty);
52721 spin_lock_irqsave(&hp->lock, flags);
52722- hp->port.count++;
52723+ atomic_inc(&hp->port.count);
52724 atomic_set(&hp->seqno, 0);
52725 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
52726 spin_unlock_irqrestore(&hp->lock, flags);
52727@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
52728
52729 spin_lock_irqsave(&hp->lock, flags);
52730
52731- if (--hp->port.count == 0) {
52732+ if (atomic_dec_return(&hp->port.count) == 0) {
52733 tty_port_tty_set(&hp->port, NULL);
52734 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
52735
52736@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
52737
52738 spin_lock_irqsave(&hp->lock, flags);
52739 }
52740- } else if (hp->port.count < 0)
52741+ } else if (atomic_read(&hp->port.count) < 0)
52742 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
52743- hp - hvsi_ports, hp->port.count);
52744+ hp - hvsi_ports, atomic_read(&hp->port.count));
52745
52746 spin_unlock_irqrestore(&hp->lock, flags);
52747 }
52748@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
52749 tty_port_tty_set(&hp->port, NULL);
52750
52751 spin_lock_irqsave(&hp->lock, flags);
52752- hp->port.count = 0;
52753+ atomic_set(&hp->port.count, 0);
52754 hp->n_outbuf = 0;
52755 spin_unlock_irqrestore(&hp->lock, flags);
52756 }
52757diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
52758index 7ae6c29..05c6dba 100644
52759--- a/drivers/tty/hvc/hvsi_lib.c
52760+++ b/drivers/tty/hvc/hvsi_lib.c
52761@@ -8,7 +8,7 @@
52762
52763 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
52764 {
52765- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
52766+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
52767
52768 /* Assumes that always succeeds, works in practice */
52769 return pv->put_chars(pv->termno, (char *)packet, packet->len);
52770@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
52771
52772 /* Reset state */
52773 pv->established = 0;
52774- atomic_set(&pv->seqno, 0);
52775+ atomic_set_unchecked(&pv->seqno, 0);
52776
52777 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
52778
52779diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
52780index 345cebb..d5a1e9e 100644
52781--- a/drivers/tty/ipwireless/tty.c
52782+++ b/drivers/tty/ipwireless/tty.c
52783@@ -28,6 +28,7 @@
52784 #include <linux/tty_driver.h>
52785 #include <linux/tty_flip.h>
52786 #include <linux/uaccess.h>
52787+#include <asm/local.h>
52788
52789 #include "tty.h"
52790 #include "network.h"
52791@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
52792 return -ENODEV;
52793
52794 mutex_lock(&tty->ipw_tty_mutex);
52795- if (tty->port.count == 0)
52796+ if (atomic_read(&tty->port.count) == 0)
52797 tty->tx_bytes_queued = 0;
52798
52799- tty->port.count++;
52800+ atomic_inc(&tty->port.count);
52801
52802 tty->port.tty = linux_tty;
52803 linux_tty->driver_data = tty;
52804@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
52805
52806 static void do_ipw_close(struct ipw_tty *tty)
52807 {
52808- tty->port.count--;
52809-
52810- if (tty->port.count == 0) {
52811+ if (atomic_dec_return(&tty->port.count) == 0) {
52812 struct tty_struct *linux_tty = tty->port.tty;
52813
52814 if (linux_tty != NULL) {
52815@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
52816 return;
52817
52818 mutex_lock(&tty->ipw_tty_mutex);
52819- if (tty->port.count == 0) {
52820+ if (atomic_read(&tty->port.count) == 0) {
52821 mutex_unlock(&tty->ipw_tty_mutex);
52822 return;
52823 }
52824@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
52825
52826 mutex_lock(&tty->ipw_tty_mutex);
52827
52828- if (!tty->port.count) {
52829+ if (!atomic_read(&tty->port.count)) {
52830 mutex_unlock(&tty->ipw_tty_mutex);
52831 return;
52832 }
52833@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
52834 return -ENODEV;
52835
52836 mutex_lock(&tty->ipw_tty_mutex);
52837- if (!tty->port.count) {
52838+ if (!atomic_read(&tty->port.count)) {
52839 mutex_unlock(&tty->ipw_tty_mutex);
52840 return -EINVAL;
52841 }
52842@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
52843 if (!tty)
52844 return -ENODEV;
52845
52846- if (!tty->port.count)
52847+ if (!atomic_read(&tty->port.count))
52848 return -EINVAL;
52849
52850 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
52851@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
52852 if (!tty)
52853 return 0;
52854
52855- if (!tty->port.count)
52856+ if (!atomic_read(&tty->port.count))
52857 return 0;
52858
52859 return tty->tx_bytes_queued;
52860@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
52861 if (!tty)
52862 return -ENODEV;
52863
52864- if (!tty->port.count)
52865+ if (!atomic_read(&tty->port.count))
52866 return -EINVAL;
52867
52868 return get_control_lines(tty);
52869@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
52870 if (!tty)
52871 return -ENODEV;
52872
52873- if (!tty->port.count)
52874+ if (!atomic_read(&tty->port.count))
52875 return -EINVAL;
52876
52877 return set_control_lines(tty, set, clear);
52878@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
52879 if (!tty)
52880 return -ENODEV;
52881
52882- if (!tty->port.count)
52883+ if (!atomic_read(&tty->port.count))
52884 return -EINVAL;
52885
52886 /* FIXME: Exactly how is the tty object locked here .. */
52887@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
52888 * are gone */
52889 mutex_lock(&ttyj->ipw_tty_mutex);
52890 }
52891- while (ttyj->port.count)
52892+ while (atomic_read(&ttyj->port.count))
52893 do_ipw_close(ttyj);
52894 ipwireless_disassociate_network_ttys(network,
52895 ttyj->channel_idx);
52896diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
52897index 14c54e0..1efd4f2 100644
52898--- a/drivers/tty/moxa.c
52899+++ b/drivers/tty/moxa.c
52900@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
52901 }
52902
52903 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
52904- ch->port.count++;
52905+ atomic_inc(&ch->port.count);
52906 tty->driver_data = ch;
52907 tty_port_tty_set(&ch->port, tty);
52908 mutex_lock(&ch->port.mutex);
52909diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
52910index c434376..114ce13 100644
52911--- a/drivers/tty/n_gsm.c
52912+++ b/drivers/tty/n_gsm.c
52913@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
52914 spin_lock_init(&dlci->lock);
52915 mutex_init(&dlci->mutex);
52916 dlci->fifo = &dlci->_fifo;
52917- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
52918+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
52919 kfree(dlci);
52920 return NULL;
52921 }
52922@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
52923 struct gsm_dlci *dlci = tty->driver_data;
52924 struct tty_port *port = &dlci->port;
52925
52926- port->count++;
52927+ atomic_inc(&port->count);
52928 tty_port_tty_set(port, tty);
52929
52930 dlci->modem_rx = 0;
52931diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
52932index 2e900a9..576d216 100644
52933--- a/drivers/tty/n_tty.c
52934+++ b/drivers/tty/n_tty.c
52935@@ -115,7 +115,7 @@ struct n_tty_data {
52936 int minimum_to_wake;
52937
52938 /* consumer-published */
52939- size_t read_tail;
52940+ size_t read_tail __intentional_overflow(-1);
52941 size_t line_start;
52942
52943 /* protected by output lock */
52944@@ -2522,6 +2522,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
52945 {
52946 *ops = tty_ldisc_N_TTY;
52947 ops->owner = NULL;
52948- ops->refcount = ops->flags = 0;
52949+ atomic_set(&ops->refcount, 0);
52950+ ops->flags = 0;
52951 }
52952 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
52953diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
52954index 7c4447a..70fbc1e 100644
52955--- a/drivers/tty/pty.c
52956+++ b/drivers/tty/pty.c
52957@@ -830,8 +830,10 @@ static void __init unix98_pty_init(void)
52958 panic("Couldn't register Unix98 pts driver");
52959
52960 /* Now create the /dev/ptmx special device */
52961+ pax_open_kernel();
52962 tty_default_fops(&ptmx_fops);
52963- ptmx_fops.open = ptmx_open;
52964+ *(void **)&ptmx_fops.open = ptmx_open;
52965+ pax_close_kernel();
52966
52967 cdev_init(&ptmx_cdev, &ptmx_fops);
52968 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
52969diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
52970index 383c4c7..d408e21 100644
52971--- a/drivers/tty/rocket.c
52972+++ b/drivers/tty/rocket.c
52973@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
52974 tty->driver_data = info;
52975 tty_port_tty_set(port, tty);
52976
52977- if (port->count++ == 0) {
52978+ if (atomic_inc_return(&port->count) == 1) {
52979 atomic_inc(&rp_num_ports_open);
52980
52981 #ifdef ROCKET_DEBUG_OPEN
52982@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
52983 #endif
52984 }
52985 #ifdef ROCKET_DEBUG_OPEN
52986- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
52987+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
52988 #endif
52989
52990 /*
52991@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
52992 spin_unlock_irqrestore(&info->port.lock, flags);
52993 return;
52994 }
52995- if (info->port.count)
52996+ if (atomic_read(&info->port.count))
52997 atomic_dec(&rp_num_ports_open);
52998 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
52999 spin_unlock_irqrestore(&info->port.lock, flags);
53000diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
53001index aa28209..e08fb85 100644
53002--- a/drivers/tty/serial/ioc4_serial.c
53003+++ b/drivers/tty/serial/ioc4_serial.c
53004@@ -437,7 +437,7 @@ struct ioc4_soft {
53005 } is_intr_info[MAX_IOC4_INTR_ENTS];
53006
53007 /* Number of entries active in the above array */
53008- atomic_t is_num_intrs;
53009+ atomic_unchecked_t is_num_intrs;
53010 } is_intr_type[IOC4_NUM_INTR_TYPES];
53011
53012 /* is_ir_lock must be held while
53013@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
53014 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
53015 || (type == IOC4_OTHER_INTR_TYPE)));
53016
53017- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
53018+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
53019 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
53020
53021 /* Save off the lower level interrupt handler */
53022@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
53023
53024 soft = arg;
53025 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
53026- num_intrs = (int)atomic_read(
53027+ num_intrs = (int)atomic_read_unchecked(
53028 &soft->is_intr_type[intr_type].is_num_intrs);
53029
53030 this_mir = this_ir = pending_intrs(soft, intr_type);
53031diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
53032index 129dc5b..1da5bb8 100644
53033--- a/drivers/tty/serial/kgdb_nmi.c
53034+++ b/drivers/tty/serial/kgdb_nmi.c
53035@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
53036 * I/O utilities that messages sent to the console will automatically
53037 * be displayed on the dbg_io.
53038 */
53039- dbg_io_ops->is_console = true;
53040+ pax_open_kernel();
53041+ *(int *)&dbg_io_ops->is_console = true;
53042+ pax_close_kernel();
53043
53044 return 0;
53045 }
53046diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
53047index a260cde..6b2b5ce 100644
53048--- a/drivers/tty/serial/kgdboc.c
53049+++ b/drivers/tty/serial/kgdboc.c
53050@@ -24,8 +24,9 @@
53051 #define MAX_CONFIG_LEN 40
53052
53053 static struct kgdb_io kgdboc_io_ops;
53054+static struct kgdb_io kgdboc_io_ops_console;
53055
53056-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
53057+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
53058 static int configured = -1;
53059
53060 static char config[MAX_CONFIG_LEN];
53061@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
53062 kgdboc_unregister_kbd();
53063 if (configured == 1)
53064 kgdb_unregister_io_module(&kgdboc_io_ops);
53065+ else if (configured == 2)
53066+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
53067 }
53068
53069 static int configure_kgdboc(void)
53070@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
53071 int err;
53072 char *cptr = config;
53073 struct console *cons;
53074+ int is_console = 0;
53075
53076 err = kgdboc_option_setup(config);
53077 if (err || !strlen(config) || isspace(config[0]))
53078 goto noconfig;
53079
53080 err = -ENODEV;
53081- kgdboc_io_ops.is_console = 0;
53082 kgdb_tty_driver = NULL;
53083
53084 kgdboc_use_kms = 0;
53085@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
53086 int idx;
53087 if (cons->device && cons->device(cons, &idx) == p &&
53088 idx == tty_line) {
53089- kgdboc_io_ops.is_console = 1;
53090+ is_console = 1;
53091 break;
53092 }
53093 cons = cons->next;
53094@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
53095 kgdb_tty_line = tty_line;
53096
53097 do_register:
53098- err = kgdb_register_io_module(&kgdboc_io_ops);
53099+ if (is_console) {
53100+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
53101+ configured = 2;
53102+ } else {
53103+ err = kgdb_register_io_module(&kgdboc_io_ops);
53104+ configured = 1;
53105+ }
53106 if (err)
53107 goto noconfig;
53108
53109@@ -205,8 +214,6 @@ do_register:
53110 if (err)
53111 goto nmi_con_failed;
53112
53113- configured = 1;
53114-
53115 return 0;
53116
53117 nmi_con_failed:
53118@@ -223,7 +230,7 @@ noconfig:
53119 static int __init init_kgdboc(void)
53120 {
53121 /* Already configured? */
53122- if (configured == 1)
53123+ if (configured >= 1)
53124 return 0;
53125
53126 return configure_kgdboc();
53127@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
53128 if (config[len - 1] == '\n')
53129 config[len - 1] = '\0';
53130
53131- if (configured == 1)
53132+ if (configured >= 1)
53133 cleanup_kgdboc();
53134
53135 /* Go and configure with the new params. */
53136@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
53137 .post_exception = kgdboc_post_exp_handler,
53138 };
53139
53140+static struct kgdb_io kgdboc_io_ops_console = {
53141+ .name = "kgdboc",
53142+ .read_char = kgdboc_get_char,
53143+ .write_char = kgdboc_put_char,
53144+ .pre_exception = kgdboc_pre_exp_handler,
53145+ .post_exception = kgdboc_post_exp_handler,
53146+ .is_console = 1
53147+};
53148+
53149 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
53150 /* This is only available if kgdboc is a built in for early debugging */
53151 static int __init kgdboc_early_init(char *opt)
53152diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
53153index 4b6c783..9a19db3 100644
53154--- a/drivers/tty/serial/msm_serial.c
53155+++ b/drivers/tty/serial/msm_serial.c
53156@@ -1028,7 +1028,7 @@ static struct uart_driver msm_uart_driver = {
53157 .cons = MSM_CONSOLE,
53158 };
53159
53160-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
53161+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
53162
53163 static const struct of_device_id msm_uartdm_table[] = {
53164 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
53165@@ -1047,7 +1047,7 @@ static int msm_serial_probe(struct platform_device *pdev)
53166 int irq;
53167
53168 if (pdev->id == -1)
53169- pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
53170+ pdev->id = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
53171
53172 if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
53173 return -ENXIO;
53174diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
53175index c78f43a..22b1dab 100644
53176--- a/drivers/tty/serial/samsung.c
53177+++ b/drivers/tty/serial/samsung.c
53178@@ -478,11 +478,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
53179 }
53180 }
53181
53182+static int s3c64xx_serial_startup(struct uart_port *port);
53183 static int s3c24xx_serial_startup(struct uart_port *port)
53184 {
53185 struct s3c24xx_uart_port *ourport = to_ourport(port);
53186 int ret;
53187
53188+ /* Startup sequence is different for s3c64xx and higher SoC's */
53189+ if (s3c24xx_serial_has_interrupt_mask(port))
53190+ return s3c64xx_serial_startup(port);
53191+
53192 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
53193 port, (unsigned long long)port->mapbase, port->membase);
53194
53195@@ -1155,10 +1160,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
53196 /* setup info for port */
53197 port->dev = &platdev->dev;
53198
53199- /* Startup sequence is different for s3c64xx and higher SoC's */
53200- if (s3c24xx_serial_has_interrupt_mask(port))
53201- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
53202-
53203 port->uartclk = 1;
53204
53205 if (cfg->uart_flags & UPF_CONS_FLOW) {
53206diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
53207index eaeb9a0..01a238c 100644
53208--- a/drivers/tty/serial/serial_core.c
53209+++ b/drivers/tty/serial/serial_core.c
53210@@ -1339,7 +1339,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
53211
53212 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
53213
53214- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
53215+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
53216 return;
53217
53218 /*
53219@@ -1466,7 +1466,7 @@ static void uart_hangup(struct tty_struct *tty)
53220 uart_flush_buffer(tty);
53221 uart_shutdown(tty, state);
53222 spin_lock_irqsave(&port->lock, flags);
53223- port->count = 0;
53224+ atomic_set(&port->count, 0);
53225 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
53226 spin_unlock_irqrestore(&port->lock, flags);
53227 tty_port_tty_set(port, NULL);
53228@@ -1564,7 +1564,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53229 goto end;
53230 }
53231
53232- port->count++;
53233+ atomic_inc(&port->count);
53234 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
53235 retval = -ENXIO;
53236 goto err_dec_count;
53237@@ -1596,7 +1596,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53238 end:
53239 return retval;
53240 err_dec_count:
53241- port->count--;
53242+ atomic_dec(&port->count);
53243 mutex_unlock(&port->mutex);
53244 goto end;
53245 }
53246diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
53247index b799170..87dafd5 100644
53248--- a/drivers/tty/synclink.c
53249+++ b/drivers/tty/synclink.c
53250@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53251
53252 if (debug_level >= DEBUG_LEVEL_INFO)
53253 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
53254- __FILE__,__LINE__, info->device_name, info->port.count);
53255+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53256
53257 if (tty_port_close_start(&info->port, tty, filp) == 0)
53258 goto cleanup;
53259@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53260 cleanup:
53261 if (debug_level >= DEBUG_LEVEL_INFO)
53262 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
53263- tty->driver->name, info->port.count);
53264+ tty->driver->name, atomic_read(&info->port.count));
53265
53266 } /* end of mgsl_close() */
53267
53268@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
53269
53270 mgsl_flush_buffer(tty);
53271 shutdown(info);
53272-
53273- info->port.count = 0;
53274+
53275+ atomic_set(&info->port.count, 0);
53276 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53277 info->port.tty = NULL;
53278
53279@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53280
53281 if (debug_level >= DEBUG_LEVEL_INFO)
53282 printk("%s(%d):block_til_ready before block on %s count=%d\n",
53283- __FILE__,__LINE__, tty->driver->name, port->count );
53284+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53285
53286 spin_lock_irqsave(&info->irq_spinlock, flags);
53287- port->count--;
53288+ atomic_dec(&port->count);
53289 spin_unlock_irqrestore(&info->irq_spinlock, flags);
53290 port->blocked_open++;
53291
53292@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53293
53294 if (debug_level >= DEBUG_LEVEL_INFO)
53295 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
53296- __FILE__,__LINE__, tty->driver->name, port->count );
53297+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53298
53299 tty_unlock(tty);
53300 schedule();
53301@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53302
53303 /* FIXME: Racy on hangup during close wait */
53304 if (!tty_hung_up_p(filp))
53305- port->count++;
53306+ atomic_inc(&port->count);
53307 port->blocked_open--;
53308
53309 if (debug_level >= DEBUG_LEVEL_INFO)
53310 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
53311- __FILE__,__LINE__, tty->driver->name, port->count );
53312+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53313
53314 if (!retval)
53315 port->flags |= ASYNC_NORMAL_ACTIVE;
53316@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53317
53318 if (debug_level >= DEBUG_LEVEL_INFO)
53319 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
53320- __FILE__,__LINE__,tty->driver->name, info->port.count);
53321+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53322
53323 /* If port is closing, signal caller to try again */
53324 if (info->port.flags & ASYNC_CLOSING){
53325@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53326 spin_unlock_irqrestore(&info->netlock, flags);
53327 goto cleanup;
53328 }
53329- info->port.count++;
53330+ atomic_inc(&info->port.count);
53331 spin_unlock_irqrestore(&info->netlock, flags);
53332
53333- if (info->port.count == 1) {
53334+ if (atomic_read(&info->port.count) == 1) {
53335 /* 1st open on this device, init hardware */
53336 retval = startup(info);
53337 if (retval < 0)
53338@@ -3442,8 +3442,8 @@ cleanup:
53339 if (retval) {
53340 if (tty->count == 1)
53341 info->port.tty = NULL; /* tty layer will release tty struct */
53342- if(info->port.count)
53343- info->port.count--;
53344+ if (atomic_read(&info->port.count))
53345+ atomic_dec(&info->port.count);
53346 }
53347
53348 return retval;
53349@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53350 unsigned short new_crctype;
53351
53352 /* return error if TTY interface open */
53353- if (info->port.count)
53354+ if (atomic_read(&info->port.count))
53355 return -EBUSY;
53356
53357 switch (encoding)
53358@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
53359
53360 /* arbitrate between network and tty opens */
53361 spin_lock_irqsave(&info->netlock, flags);
53362- if (info->port.count != 0 || info->netcount != 0) {
53363+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53364 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53365 spin_unlock_irqrestore(&info->netlock, flags);
53366 return -EBUSY;
53367@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53368 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53369
53370 /* return error if TTY interface open */
53371- if (info->port.count)
53372+ if (atomic_read(&info->port.count))
53373 return -EBUSY;
53374
53375 if (cmd != SIOCWANDEV)
53376diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
53377index 0e8c39b..e0cb171 100644
53378--- a/drivers/tty/synclink_gt.c
53379+++ b/drivers/tty/synclink_gt.c
53380@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53381 tty->driver_data = info;
53382 info->port.tty = tty;
53383
53384- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
53385+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
53386
53387 /* If port is closing, signal caller to try again */
53388 if (info->port.flags & ASYNC_CLOSING){
53389@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53390 mutex_unlock(&info->port.mutex);
53391 goto cleanup;
53392 }
53393- info->port.count++;
53394+ atomic_inc(&info->port.count);
53395 spin_unlock_irqrestore(&info->netlock, flags);
53396
53397- if (info->port.count == 1) {
53398+ if (atomic_read(&info->port.count) == 1) {
53399 /* 1st open on this device, init hardware */
53400 retval = startup(info);
53401 if (retval < 0) {
53402@@ -715,8 +715,8 @@ cleanup:
53403 if (retval) {
53404 if (tty->count == 1)
53405 info->port.tty = NULL; /* tty layer will release tty struct */
53406- if(info->port.count)
53407- info->port.count--;
53408+ if(atomic_read(&info->port.count))
53409+ atomic_dec(&info->port.count);
53410 }
53411
53412 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
53413@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53414
53415 if (sanity_check(info, tty->name, "close"))
53416 return;
53417- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
53418+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
53419
53420 if (tty_port_close_start(&info->port, tty, filp) == 0)
53421 goto cleanup;
53422@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53423 tty_port_close_end(&info->port, tty);
53424 info->port.tty = NULL;
53425 cleanup:
53426- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
53427+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
53428 }
53429
53430 static void hangup(struct tty_struct *tty)
53431@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
53432 shutdown(info);
53433
53434 spin_lock_irqsave(&info->port.lock, flags);
53435- info->port.count = 0;
53436+ atomic_set(&info->port.count, 0);
53437 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53438 info->port.tty = NULL;
53439 spin_unlock_irqrestore(&info->port.lock, flags);
53440@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53441 unsigned short new_crctype;
53442
53443 /* return error if TTY interface open */
53444- if (info->port.count)
53445+ if (atomic_read(&info->port.count))
53446 return -EBUSY;
53447
53448 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
53449@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
53450
53451 /* arbitrate between network and tty opens */
53452 spin_lock_irqsave(&info->netlock, flags);
53453- if (info->port.count != 0 || info->netcount != 0) {
53454+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53455 DBGINFO(("%s hdlc_open busy\n", dev->name));
53456 spin_unlock_irqrestore(&info->netlock, flags);
53457 return -EBUSY;
53458@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53459 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
53460
53461 /* return error if TTY interface open */
53462- if (info->port.count)
53463+ if (atomic_read(&info->port.count))
53464 return -EBUSY;
53465
53466 if (cmd != SIOCWANDEV)
53467@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
53468 if (port == NULL)
53469 continue;
53470 spin_lock(&port->lock);
53471- if ((port->port.count || port->netcount) &&
53472+ if ((atomic_read(&port->port.count) || port->netcount) &&
53473 port->pending_bh && !port->bh_running &&
53474 !port->bh_requested) {
53475 DBGISR(("%s bh queued\n", port->device_name));
53476@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53477 add_wait_queue(&port->open_wait, &wait);
53478
53479 spin_lock_irqsave(&info->lock, flags);
53480- port->count--;
53481+ atomic_dec(&port->count);
53482 spin_unlock_irqrestore(&info->lock, flags);
53483 port->blocked_open++;
53484
53485@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53486 remove_wait_queue(&port->open_wait, &wait);
53487
53488 if (!tty_hung_up_p(filp))
53489- port->count++;
53490+ atomic_inc(&port->count);
53491 port->blocked_open--;
53492
53493 if (!retval)
53494diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
53495index c3f9091..abe4601 100644
53496--- a/drivers/tty/synclinkmp.c
53497+++ b/drivers/tty/synclinkmp.c
53498@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53499
53500 if (debug_level >= DEBUG_LEVEL_INFO)
53501 printk("%s(%d):%s open(), old ref count = %d\n",
53502- __FILE__,__LINE__,tty->driver->name, info->port.count);
53503+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53504
53505 /* If port is closing, signal caller to try again */
53506 if (info->port.flags & ASYNC_CLOSING){
53507@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53508 spin_unlock_irqrestore(&info->netlock, flags);
53509 goto cleanup;
53510 }
53511- info->port.count++;
53512+ atomic_inc(&info->port.count);
53513 spin_unlock_irqrestore(&info->netlock, flags);
53514
53515- if (info->port.count == 1) {
53516+ if (atomic_read(&info->port.count) == 1) {
53517 /* 1st open on this device, init hardware */
53518 retval = startup(info);
53519 if (retval < 0)
53520@@ -796,8 +796,8 @@ cleanup:
53521 if (retval) {
53522 if (tty->count == 1)
53523 info->port.tty = NULL; /* tty layer will release tty struct */
53524- if(info->port.count)
53525- info->port.count--;
53526+ if(atomic_read(&info->port.count))
53527+ atomic_dec(&info->port.count);
53528 }
53529
53530 return retval;
53531@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53532
53533 if (debug_level >= DEBUG_LEVEL_INFO)
53534 printk("%s(%d):%s close() entry, count=%d\n",
53535- __FILE__,__LINE__, info->device_name, info->port.count);
53536+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53537
53538 if (tty_port_close_start(&info->port, tty, filp) == 0)
53539 goto cleanup;
53540@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53541 cleanup:
53542 if (debug_level >= DEBUG_LEVEL_INFO)
53543 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
53544- tty->driver->name, info->port.count);
53545+ tty->driver->name, atomic_read(&info->port.count));
53546 }
53547
53548 /* Called by tty_hangup() when a hangup is signaled.
53549@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
53550 shutdown(info);
53551
53552 spin_lock_irqsave(&info->port.lock, flags);
53553- info->port.count = 0;
53554+ atomic_set(&info->port.count, 0);
53555 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53556 info->port.tty = NULL;
53557 spin_unlock_irqrestore(&info->port.lock, flags);
53558@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53559 unsigned short new_crctype;
53560
53561 /* return error if TTY interface open */
53562- if (info->port.count)
53563+ if (atomic_read(&info->port.count))
53564 return -EBUSY;
53565
53566 switch (encoding)
53567@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
53568
53569 /* arbitrate between network and tty opens */
53570 spin_lock_irqsave(&info->netlock, flags);
53571- if (info->port.count != 0 || info->netcount != 0) {
53572+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53573 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53574 spin_unlock_irqrestore(&info->netlock, flags);
53575 return -EBUSY;
53576@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53577 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53578
53579 /* return error if TTY interface open */
53580- if (info->port.count)
53581+ if (atomic_read(&info->port.count))
53582 return -EBUSY;
53583
53584 if (cmd != SIOCWANDEV)
53585@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
53586 * do not request bottom half processing if the
53587 * device is not open in a normal mode.
53588 */
53589- if ( port && (port->port.count || port->netcount) &&
53590+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
53591 port->pending_bh && !port->bh_running &&
53592 !port->bh_requested ) {
53593 if ( debug_level >= DEBUG_LEVEL_ISR )
53594@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53595
53596 if (debug_level >= DEBUG_LEVEL_INFO)
53597 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
53598- __FILE__,__LINE__, tty->driver->name, port->count );
53599+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53600
53601 spin_lock_irqsave(&info->lock, flags);
53602- port->count--;
53603+ atomic_dec(&port->count);
53604 spin_unlock_irqrestore(&info->lock, flags);
53605 port->blocked_open++;
53606
53607@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53608
53609 if (debug_level >= DEBUG_LEVEL_INFO)
53610 printk("%s(%d):%s block_til_ready() count=%d\n",
53611- __FILE__,__LINE__, tty->driver->name, port->count );
53612+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53613
53614 tty_unlock(tty);
53615 schedule();
53616@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53617 set_current_state(TASK_RUNNING);
53618 remove_wait_queue(&port->open_wait, &wait);
53619 if (!tty_hung_up_p(filp))
53620- port->count++;
53621+ atomic_inc(&port->count);
53622 port->blocked_open--;
53623
53624 if (debug_level >= DEBUG_LEVEL_INFO)
53625 printk("%s(%d):%s block_til_ready() after, count=%d\n",
53626- __FILE__,__LINE__, tty->driver->name, port->count );
53627+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53628
53629 if (!retval)
53630 port->flags |= ASYNC_NORMAL_ACTIVE;
53631diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
53632index 42bad18..447d7a2 100644
53633--- a/drivers/tty/sysrq.c
53634+++ b/drivers/tty/sysrq.c
53635@@ -1084,7 +1084,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
53636 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
53637 size_t count, loff_t *ppos)
53638 {
53639- if (count) {
53640+ if (count && capable(CAP_SYS_ADMIN)) {
53641 char c;
53642
53643 if (get_user(c, buf))
53644diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
53645index 0508a1d..b610592 100644
53646--- a/drivers/tty/tty_io.c
53647+++ b/drivers/tty/tty_io.c
53648@@ -3498,7 +3498,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
53649
53650 void tty_default_fops(struct file_operations *fops)
53651 {
53652- *fops = tty_fops;
53653+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
53654 }
53655
53656 /*
53657diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
53658index 2d822aa..a566234 100644
53659--- a/drivers/tty/tty_ldisc.c
53660+++ b/drivers/tty/tty_ldisc.c
53661@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
53662 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53663 tty_ldiscs[disc] = new_ldisc;
53664 new_ldisc->num = disc;
53665- new_ldisc->refcount = 0;
53666+ atomic_set(&new_ldisc->refcount, 0);
53667 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
53668
53669 return ret;
53670@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
53671 return -EINVAL;
53672
53673 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53674- if (tty_ldiscs[disc]->refcount)
53675+ if (atomic_read(&tty_ldiscs[disc]->refcount))
53676 ret = -EBUSY;
53677 else
53678 tty_ldiscs[disc] = NULL;
53679@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
53680 if (ldops) {
53681 ret = ERR_PTR(-EAGAIN);
53682 if (try_module_get(ldops->owner)) {
53683- ldops->refcount++;
53684+ atomic_inc(&ldops->refcount);
53685 ret = ldops;
53686 }
53687 }
53688@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
53689 unsigned long flags;
53690
53691 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53692- ldops->refcount--;
53693+ atomic_dec(&ldops->refcount);
53694 module_put(ldops->owner);
53695 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
53696 }
53697diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
53698index 1b93357..ea9f82c 100644
53699--- a/drivers/tty/tty_port.c
53700+++ b/drivers/tty/tty_port.c
53701@@ -237,7 +237,7 @@ void tty_port_hangup(struct tty_port *port)
53702 unsigned long flags;
53703
53704 spin_lock_irqsave(&port->lock, flags);
53705- port->count = 0;
53706+ atomic_set(&port->count, 0);
53707 port->flags &= ~ASYNC_NORMAL_ACTIVE;
53708 tty = port->tty;
53709 if (tty)
53710@@ -399,7 +399,7 @@ int tty_port_block_til_ready(struct tty_port *port,
53711
53712 /* The port lock protects the port counts */
53713 spin_lock_irqsave(&port->lock, flags);
53714- port->count--;
53715+ atomic_dec(&port->count);
53716 port->blocked_open++;
53717 spin_unlock_irqrestore(&port->lock, flags);
53718
53719@@ -441,7 +441,7 @@ int tty_port_block_til_ready(struct tty_port *port,
53720 we must not mess that up further */
53721 spin_lock_irqsave(&port->lock, flags);
53722 if (!tty_hung_up_p(filp))
53723- port->count++;
53724+ atomic_inc(&port->count);
53725 port->blocked_open--;
53726 if (retval == 0)
53727 port->flags |= ASYNC_NORMAL_ACTIVE;
53728@@ -479,19 +479,19 @@ int tty_port_close_start(struct tty_port *port,
53729 return 0;
53730 }
53731
53732- if (tty->count == 1 && port->count != 1) {
53733+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
53734 printk(KERN_WARNING
53735 "tty_port_close_start: tty->count = 1 port count = %d.\n",
53736- port->count);
53737- port->count = 1;
53738+ atomic_read(&port->count));
53739+ atomic_set(&port->count, 1);
53740 }
53741- if (--port->count < 0) {
53742+ if (atomic_dec_return(&port->count) < 0) {
53743 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
53744- port->count);
53745- port->count = 0;
53746+ atomic_read(&port->count));
53747+ atomic_set(&port->count, 0);
53748 }
53749
53750- if (port->count) {
53751+ if (atomic_read(&port->count)) {
53752 spin_unlock_irqrestore(&port->lock, flags);
53753 return 0;
53754 }
53755@@ -592,7 +592,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
53756 struct file *filp)
53757 {
53758 spin_lock_irq(&port->lock);
53759- ++port->count;
53760+ atomic_inc(&port->count);
53761 spin_unlock_irq(&port->lock);
53762 tty_port_tty_set(port, tty);
53763
53764diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
53765index c039cfe..0b463b0 100644
53766--- a/drivers/tty/vt/keyboard.c
53767+++ b/drivers/tty/vt/keyboard.c
53768@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
53769 kbd->kbdmode == VC_OFF) &&
53770 value != KVAL(K_SAK))
53771 return; /* SAK is allowed even in raw mode */
53772+
53773+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
53774+ {
53775+ void *func = fn_handler[value];
53776+ if (func == fn_show_state || func == fn_show_ptregs ||
53777+ func == fn_show_mem)
53778+ return;
53779+ }
53780+#endif
53781+
53782 fn_handler[value](vc);
53783 }
53784
53785@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
53786 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
53787 return -EFAULT;
53788
53789- if (!capable(CAP_SYS_TTY_CONFIG))
53790- perm = 0;
53791-
53792 switch (cmd) {
53793 case KDGKBENT:
53794 /* Ensure another thread doesn't free it under us */
53795@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
53796 spin_unlock_irqrestore(&kbd_event_lock, flags);
53797 return put_user(val, &user_kbe->kb_value);
53798 case KDSKBENT:
53799+ if (!capable(CAP_SYS_TTY_CONFIG))
53800+ perm = 0;
53801+
53802 if (!perm)
53803 return -EPERM;
53804 if (!i && v == K_NOSUCHMAP) {
53805@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
53806 int i, j, k;
53807 int ret;
53808
53809- if (!capable(CAP_SYS_TTY_CONFIG))
53810- perm = 0;
53811-
53812 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
53813 if (!kbs) {
53814 ret = -ENOMEM;
53815@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
53816 kfree(kbs);
53817 return ((p && *p) ? -EOVERFLOW : 0);
53818 case KDSKBSENT:
53819+ if (!capable(CAP_SYS_TTY_CONFIG))
53820+ perm = 0;
53821+
53822 if (!perm) {
53823 ret = -EPERM;
53824 goto reterr;
53825diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
53826index 60fa627..7214965 100644
53827--- a/drivers/uio/uio.c
53828+++ b/drivers/uio/uio.c
53829@@ -25,6 +25,7 @@
53830 #include <linux/kobject.h>
53831 #include <linux/cdev.h>
53832 #include <linux/uio_driver.h>
53833+#include <asm/local.h>
53834
53835 #define UIO_MAX_DEVICES (1U << MINORBITS)
53836
53837@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
53838 struct device_attribute *attr, char *buf)
53839 {
53840 struct uio_device *idev = dev_get_drvdata(dev);
53841- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
53842+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
53843 }
53844 static DEVICE_ATTR_RO(event);
53845
53846@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
53847 {
53848 struct uio_device *idev = info->uio_dev;
53849
53850- atomic_inc(&idev->event);
53851+ atomic_inc_unchecked(&idev->event);
53852 wake_up_interruptible(&idev->wait);
53853 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
53854 }
53855@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
53856 }
53857
53858 listener->dev = idev;
53859- listener->event_count = atomic_read(&idev->event);
53860+ listener->event_count = atomic_read_unchecked(&idev->event);
53861 filep->private_data = listener;
53862
53863 if (idev->info->open) {
53864@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
53865 return -EIO;
53866
53867 poll_wait(filep, &idev->wait, wait);
53868- if (listener->event_count != atomic_read(&idev->event))
53869+ if (listener->event_count != atomic_read_unchecked(&idev->event))
53870 return POLLIN | POLLRDNORM;
53871 return 0;
53872 }
53873@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
53874 do {
53875 set_current_state(TASK_INTERRUPTIBLE);
53876
53877- event_count = atomic_read(&idev->event);
53878+ event_count = atomic_read_unchecked(&idev->event);
53879 if (event_count != listener->event_count) {
53880 if (copy_to_user(buf, &event_count, count))
53881 retval = -EFAULT;
53882@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
53883 static int uio_find_mem_index(struct vm_area_struct *vma)
53884 {
53885 struct uio_device *idev = vma->vm_private_data;
53886+ unsigned long size;
53887
53888 if (vma->vm_pgoff < MAX_UIO_MAPS) {
53889- if (idev->info->mem[vma->vm_pgoff].size == 0)
53890+ size = idev->info->mem[vma->vm_pgoff].size;
53891+ if (size == 0)
53892+ return -1;
53893+ if (vma->vm_end - vma->vm_start > size)
53894 return -1;
53895 return (int)vma->vm_pgoff;
53896 }
53897@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
53898 idev->owner = owner;
53899 idev->info = info;
53900 init_waitqueue_head(&idev->wait);
53901- atomic_set(&idev->event, 0);
53902+ atomic_set_unchecked(&idev->event, 0);
53903
53904 ret = uio_get_minor(idev);
53905 if (ret)
53906diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
53907index 813d4d3..a71934f 100644
53908--- a/drivers/usb/atm/cxacru.c
53909+++ b/drivers/usb/atm/cxacru.c
53910@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
53911 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
53912 if (ret < 2)
53913 return -EINVAL;
53914- if (index < 0 || index > 0x7f)
53915+ if (index > 0x7f)
53916 return -EINVAL;
53917 pos += tmp;
53918
53919diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
53920index dada014..1d0d517 100644
53921--- a/drivers/usb/atm/usbatm.c
53922+++ b/drivers/usb/atm/usbatm.c
53923@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53924 if (printk_ratelimit())
53925 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
53926 __func__, vpi, vci);
53927- atomic_inc(&vcc->stats->rx_err);
53928+ atomic_inc_unchecked(&vcc->stats->rx_err);
53929 return;
53930 }
53931
53932@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53933 if (length > ATM_MAX_AAL5_PDU) {
53934 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
53935 __func__, length, vcc);
53936- atomic_inc(&vcc->stats->rx_err);
53937+ atomic_inc_unchecked(&vcc->stats->rx_err);
53938 goto out;
53939 }
53940
53941@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53942 if (sarb->len < pdu_length) {
53943 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
53944 __func__, pdu_length, sarb->len, vcc);
53945- atomic_inc(&vcc->stats->rx_err);
53946+ atomic_inc_unchecked(&vcc->stats->rx_err);
53947 goto out;
53948 }
53949
53950 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
53951 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
53952 __func__, vcc);
53953- atomic_inc(&vcc->stats->rx_err);
53954+ atomic_inc_unchecked(&vcc->stats->rx_err);
53955 goto out;
53956 }
53957
53958@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53959 if (printk_ratelimit())
53960 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
53961 __func__, length);
53962- atomic_inc(&vcc->stats->rx_drop);
53963+ atomic_inc_unchecked(&vcc->stats->rx_drop);
53964 goto out;
53965 }
53966
53967@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53968
53969 vcc->push(vcc, skb);
53970
53971- atomic_inc(&vcc->stats->rx);
53972+ atomic_inc_unchecked(&vcc->stats->rx);
53973 out:
53974 skb_trim(sarb, 0);
53975 }
53976@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
53977 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
53978
53979 usbatm_pop(vcc, skb);
53980- atomic_inc(&vcc->stats->tx);
53981+ atomic_inc_unchecked(&vcc->stats->tx);
53982
53983 skb = skb_dequeue(&instance->sndqueue);
53984 }
53985@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
53986 if (!left--)
53987 return sprintf(page,
53988 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
53989- atomic_read(&atm_dev->stats.aal5.tx),
53990- atomic_read(&atm_dev->stats.aal5.tx_err),
53991- atomic_read(&atm_dev->stats.aal5.rx),
53992- atomic_read(&atm_dev->stats.aal5.rx_err),
53993- atomic_read(&atm_dev->stats.aal5.rx_drop));
53994+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
53995+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
53996+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
53997+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
53998+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
53999
54000 if (!left--) {
54001 if (instance->disconnected)
54002diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
54003index 2a3bbdf..91d72cf 100644
54004--- a/drivers/usb/core/devices.c
54005+++ b/drivers/usb/core/devices.c
54006@@ -126,7 +126,7 @@ static const char format_endpt[] =
54007 * time it gets called.
54008 */
54009 static struct device_connect_event {
54010- atomic_t count;
54011+ atomic_unchecked_t count;
54012 wait_queue_head_t wait;
54013 } device_event = {
54014 .count = ATOMIC_INIT(1),
54015@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
54016
54017 void usbfs_conn_disc_event(void)
54018 {
54019- atomic_add(2, &device_event.count);
54020+ atomic_add_unchecked(2, &device_event.count);
54021 wake_up(&device_event.wait);
54022 }
54023
54024@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
54025
54026 poll_wait(file, &device_event.wait, wait);
54027
54028- event_count = atomic_read(&device_event.count);
54029+ event_count = atomic_read_unchecked(&device_event.count);
54030 if (file->f_version != event_count) {
54031 file->f_version = event_count;
54032 return POLLIN | POLLRDNORM;
54033diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
54034index 0b59731..46ee7d1 100644
54035--- a/drivers/usb/core/devio.c
54036+++ b/drivers/usb/core/devio.c
54037@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
54038 struct usb_dev_state *ps = file->private_data;
54039 struct usb_device *dev = ps->dev;
54040 ssize_t ret = 0;
54041- unsigned len;
54042+ size_t len;
54043 loff_t pos;
54044 int i;
54045
54046@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
54047 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
54048 struct usb_config_descriptor *config =
54049 (struct usb_config_descriptor *)dev->rawdescriptors[i];
54050- unsigned int length = le16_to_cpu(config->wTotalLength);
54051+ size_t length = le16_to_cpu(config->wTotalLength);
54052
54053 if (*ppos < pos + length) {
54054
54055 /* The descriptor may claim to be longer than it
54056 * really is. Here is the actual allocated length. */
54057- unsigned alloclen =
54058+ size_t alloclen =
54059 le16_to_cpu(dev->config[i].desc.wTotalLength);
54060
54061- len = length - (*ppos - pos);
54062+ len = length + pos - *ppos;
54063 if (len > nbytes)
54064 len = nbytes;
54065
54066 /* Simply don't write (skip over) unallocated parts */
54067 if (alloclen > (*ppos - pos)) {
54068- alloclen -= (*ppos - pos);
54069+ alloclen = alloclen + pos - *ppos;
54070 if (copy_to_user(buf,
54071 dev->rawdescriptors[i] + (*ppos - pos),
54072 min(len, alloclen))) {
54073diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
54074index a6efb41..6f72549b 100644
54075--- a/drivers/usb/core/hcd.c
54076+++ b/drivers/usb/core/hcd.c
54077@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54078 */
54079 usb_get_urb(urb);
54080 atomic_inc(&urb->use_count);
54081- atomic_inc(&urb->dev->urbnum);
54082+ atomic_inc_unchecked(&urb->dev->urbnum);
54083 usbmon_urb_submit(&hcd->self, urb);
54084
54085 /* NOTE requirements on root-hub callers (usbfs and the hub
54086@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54087 urb->hcpriv = NULL;
54088 INIT_LIST_HEAD(&urb->urb_list);
54089 atomic_dec(&urb->use_count);
54090- atomic_dec(&urb->dev->urbnum);
54091+ atomic_dec_unchecked(&urb->dev->urbnum);
54092 if (atomic_read(&urb->reject))
54093 wake_up(&usb_kill_urb_queue);
54094 usb_put_urb(urb);
54095diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
54096index b649fef..c7107a0 100644
54097--- a/drivers/usb/core/hub.c
54098+++ b/drivers/usb/core/hub.c
54099@@ -26,6 +26,7 @@
54100 #include <linux/mutex.h>
54101 #include <linux/random.h>
54102 #include <linux/pm_qos.h>
54103+#include <linux/grsecurity.h>
54104
54105 #include <asm/uaccess.h>
54106 #include <asm/byteorder.h>
54107@@ -4666,6 +4667,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
54108 goto done;
54109 return;
54110 }
54111+
54112+ if (gr_handle_new_usb())
54113+ goto done;
54114+
54115 if (hub_is_superspeed(hub->hdev))
54116 unit_load = 150;
54117 else
54118diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
54119index f7b7713..23d07ec 100644
54120--- a/drivers/usb/core/message.c
54121+++ b/drivers/usb/core/message.c
54122@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
54123 * Return: If successful, the number of bytes transferred. Otherwise, a negative
54124 * error number.
54125 */
54126-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54127+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54128 __u8 requesttype, __u16 value, __u16 index, void *data,
54129 __u16 size, int timeout)
54130 {
54131@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
54132 * If successful, 0. Otherwise a negative error number. The number of actual
54133 * bytes transferred will be stored in the @actual_length parameter.
54134 */
54135-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54136+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54137 void *data, int len, int *actual_length, int timeout)
54138 {
54139 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
54140@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
54141 * bytes transferred will be stored in the @actual_length parameter.
54142 *
54143 */
54144-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54145+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54146 void *data, int len, int *actual_length, int timeout)
54147 {
54148 struct urb *urb;
54149diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
54150index 1236c60..d47a51c 100644
54151--- a/drivers/usb/core/sysfs.c
54152+++ b/drivers/usb/core/sysfs.c
54153@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
54154 struct usb_device *udev;
54155
54156 udev = to_usb_device(dev);
54157- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
54158+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
54159 }
54160 static DEVICE_ATTR_RO(urbnum);
54161
54162diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
54163index 2dd2362..1135437 100644
54164--- a/drivers/usb/core/usb.c
54165+++ b/drivers/usb/core/usb.c
54166@@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
54167 set_dev_node(&dev->dev, dev_to_node(bus->controller));
54168 dev->state = USB_STATE_ATTACHED;
54169 dev->lpm_disable_count = 1;
54170- atomic_set(&dev->urbnum, 0);
54171+ atomic_set_unchecked(&dev->urbnum, 0);
54172
54173 INIT_LIST_HEAD(&dev->ep0.urb_list);
54174 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
54175diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
54176index 8cfc319..4868255 100644
54177--- a/drivers/usb/early/ehci-dbgp.c
54178+++ b/drivers/usb/early/ehci-dbgp.c
54179@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
54180
54181 #ifdef CONFIG_KGDB
54182 static struct kgdb_io kgdbdbgp_io_ops;
54183-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
54184+static struct kgdb_io kgdbdbgp_io_ops_console;
54185+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
54186 #else
54187 #define dbgp_kgdb_mode (0)
54188 #endif
54189@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
54190 .write_char = kgdbdbgp_write_char,
54191 };
54192
54193+static struct kgdb_io kgdbdbgp_io_ops_console = {
54194+ .name = "kgdbdbgp",
54195+ .read_char = kgdbdbgp_read_char,
54196+ .write_char = kgdbdbgp_write_char,
54197+ .is_console = 1
54198+};
54199+
54200 static int kgdbdbgp_wait_time;
54201
54202 static int __init kgdbdbgp_parse_config(char *str)
54203@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
54204 ptr++;
54205 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
54206 }
54207- kgdb_register_io_module(&kgdbdbgp_io_ops);
54208- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
54209+ if (early_dbgp_console.index != -1)
54210+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
54211+ else
54212+ kgdb_register_io_module(&kgdbdbgp_io_ops);
54213
54214 return 0;
54215 }
54216diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
54217index f7b2032..fbb340c 100644
54218--- a/drivers/usb/gadget/function/f_uac1.c
54219+++ b/drivers/usb/gadget/function/f_uac1.c
54220@@ -14,6 +14,7 @@
54221 #include <linux/module.h>
54222 #include <linux/device.h>
54223 #include <linux/atomic.h>
54224+#include <linux/module.h>
54225
54226 #include "u_uac1.h"
54227
54228diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
54229index 491082a..dfd7d17 100644
54230--- a/drivers/usb/gadget/function/u_serial.c
54231+++ b/drivers/usb/gadget/function/u_serial.c
54232@@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54233 spin_lock_irq(&port->port_lock);
54234
54235 /* already open? Great. */
54236- if (port->port.count) {
54237+ if (atomic_read(&port->port.count)) {
54238 status = 0;
54239- port->port.count++;
54240+ atomic_inc(&port->port.count);
54241
54242 /* currently opening/closing? wait ... */
54243 } else if (port->openclose) {
54244@@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54245 tty->driver_data = port;
54246 port->port.tty = tty;
54247
54248- port->port.count = 1;
54249+ atomic_set(&port->port.count, 1);
54250 port->openclose = false;
54251
54252 /* if connected, start the I/O stream */
54253@@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54254
54255 spin_lock_irq(&port->port_lock);
54256
54257- if (port->port.count != 1) {
54258- if (port->port.count == 0)
54259+ if (atomic_read(&port->port.count) != 1) {
54260+ if (atomic_read(&port->port.count) == 0)
54261 WARN_ON(1);
54262 else
54263- --port->port.count;
54264+ atomic_dec(&port->port.count);
54265 goto exit;
54266 }
54267
54268@@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54269 * and sleep if necessary
54270 */
54271 port->openclose = true;
54272- port->port.count = 0;
54273+ atomic_set(&port->port.count, 0);
54274
54275 gser = port->port_usb;
54276 if (gser && gser->disconnect)
54277@@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
54278 int cond;
54279
54280 spin_lock_irq(&port->port_lock);
54281- cond = (port->port.count == 0) && !port->openclose;
54282+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
54283 spin_unlock_irq(&port->port_lock);
54284 return cond;
54285 }
54286@@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
54287 /* if it's already open, start I/O ... and notify the serial
54288 * protocol about open/close status (connect/disconnect).
54289 */
54290- if (port->port.count) {
54291+ if (atomic_read(&port->port.count)) {
54292 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
54293 gs_start_io(port);
54294 if (gser->connect)
54295@@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
54296
54297 port->port_usb = NULL;
54298 gser->ioport = NULL;
54299- if (port->port.count > 0 || port->openclose) {
54300+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
54301 wake_up_interruptible(&port->drain_wait);
54302 if (port->port.tty)
54303 tty_hangup(port->port.tty);
54304@@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
54305
54306 /* finally, free any unused/unusable I/O buffers */
54307 spin_lock_irqsave(&port->port_lock, flags);
54308- if (port->port.count == 0 && !port->openclose)
54309+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
54310 gs_buf_free(&port->port_write_buf);
54311 gs_free_requests(gser->out, &port->read_pool, NULL);
54312 gs_free_requests(gser->out, &port->read_queue, NULL);
54313diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
54314index a44a07f..ecea924 100644
54315--- a/drivers/usb/gadget/function/u_uac1.c
54316+++ b/drivers/usb/gadget/function/u_uac1.c
54317@@ -17,6 +17,7 @@
54318 #include <linux/ctype.h>
54319 #include <linux/random.h>
54320 #include <linux/syscalls.h>
54321+#include <linux/module.h>
54322
54323 #include "u_uac1.h"
54324
54325diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
54326index 5728829..fefc6bf 100644
54327--- a/drivers/usb/host/ehci-hub.c
54328+++ b/drivers/usb/host/ehci-hub.c
54329@@ -771,7 +771,7 @@ static struct urb *request_single_step_set_feature_urb(
54330 urb->transfer_flags = URB_DIR_IN;
54331 usb_get_urb(urb);
54332 atomic_inc(&urb->use_count);
54333- atomic_inc(&urb->dev->urbnum);
54334+ atomic_inc_unchecked(&urb->dev->urbnum);
54335 urb->setup_dma = dma_map_single(
54336 hcd->self.controller,
54337 urb->setup_packet,
54338@@ -838,7 +838,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
54339 urb->status = -EINPROGRESS;
54340 usb_get_urb(urb);
54341 atomic_inc(&urb->use_count);
54342- atomic_inc(&urb->dev->urbnum);
54343+ atomic_inc_unchecked(&urb->dev->urbnum);
54344 retval = submit_single_step_set_feature(hcd, urb, 0);
54345 if (!retval && !wait_for_completion_timeout(&done,
54346 msecs_to_jiffies(2000))) {
54347diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
54348index 1db0626..4948782 100644
54349--- a/drivers/usb/host/hwa-hc.c
54350+++ b/drivers/usb/host/hwa-hc.c
54351@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54352 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
54353 struct wahc *wa = &hwahc->wa;
54354 struct device *dev = &wa->usb_iface->dev;
54355- u8 mas_le[UWB_NUM_MAS/8];
54356+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
54357+
54358+ if (mas_le == NULL)
54359+ return -ENOMEM;
54360
54361 /* Set the stream index */
54362 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
54363@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54364 WUSB_REQ_SET_WUSB_MAS,
54365 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
54366 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
54367- mas_le, 32, USB_CTRL_SET_TIMEOUT);
54368+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
54369 if (result < 0)
54370 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
54371 out:
54372+ kfree(mas_le);
54373+
54374 return result;
54375 }
54376
54377diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
54378index b3d245e..99549ed 100644
54379--- a/drivers/usb/misc/appledisplay.c
54380+++ b/drivers/usb/misc/appledisplay.c
54381@@ -84,7 +84,7 @@ struct appledisplay {
54382 struct mutex sysfslock; /* concurrent read and write */
54383 };
54384
54385-static atomic_t count_displays = ATOMIC_INIT(0);
54386+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
54387 static struct workqueue_struct *wq;
54388
54389 static void appledisplay_complete(struct urb *urb)
54390@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
54391
54392 /* Register backlight device */
54393 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
54394- atomic_inc_return(&count_displays) - 1);
54395+ atomic_inc_return_unchecked(&count_displays) - 1);
54396 memset(&props, 0, sizeof(struct backlight_properties));
54397 props.type = BACKLIGHT_RAW;
54398 props.max_brightness = 0xff;
54399diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
54400index 8d7fc48..01c4986 100644
54401--- a/drivers/usb/serial/console.c
54402+++ b/drivers/usb/serial/console.c
54403@@ -123,7 +123,7 @@ static int usb_console_setup(struct console *co, char *options)
54404
54405 info->port = port;
54406
54407- ++port->port.count;
54408+ atomic_inc(&port->port.count);
54409 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
54410 if (serial->type->set_termios) {
54411 /*
54412@@ -167,7 +167,7 @@ static int usb_console_setup(struct console *co, char *options)
54413 }
54414 /* Now that any required fake tty operations are completed restore
54415 * the tty port count */
54416- --port->port.count;
54417+ atomic_dec(&port->port.count);
54418 /* The console is special in terms of closing the device so
54419 * indicate this port is now acting as a system console. */
54420 port->port.console = 1;
54421@@ -180,7 +180,7 @@ static int usb_console_setup(struct console *co, char *options)
54422 free_tty:
54423 kfree(tty);
54424 reset_open_count:
54425- port->port.count = 0;
54426+ atomic_set(&port->port.count, 0);
54427 usb_autopm_put_interface(serial->interface);
54428 error_get_interface:
54429 usb_serial_put(serial);
54430@@ -191,7 +191,7 @@ static int usb_console_setup(struct console *co, char *options)
54431 static void usb_console_write(struct console *co,
54432 const char *buf, unsigned count)
54433 {
54434- static struct usbcons_info *info = &usbcons_info;
54435+ struct usbcons_info *info = &usbcons_info;
54436 struct usb_serial_port *port = info->port;
54437 struct usb_serial *serial;
54438 int retval = -ENODEV;
54439diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
54440index 307e339..6aa97cb 100644
54441--- a/drivers/usb/storage/usb.h
54442+++ b/drivers/usb/storage/usb.h
54443@@ -63,7 +63,7 @@ struct us_unusual_dev {
54444 __u8 useProtocol;
54445 __u8 useTransport;
54446 int (*initFunction)(struct us_data *);
54447-};
54448+} __do_const;
54449
54450
54451 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
54452diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
54453index a863a98..d272795 100644
54454--- a/drivers/usb/usbip/vhci.h
54455+++ b/drivers/usb/usbip/vhci.h
54456@@ -83,7 +83,7 @@ struct vhci_hcd {
54457 unsigned resuming:1;
54458 unsigned long re_timeout;
54459
54460- atomic_t seqnum;
54461+ atomic_unchecked_t seqnum;
54462
54463 /*
54464 * NOTE:
54465diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
54466index c02374b..32d47a9 100644
54467--- a/drivers/usb/usbip/vhci_hcd.c
54468+++ b/drivers/usb/usbip/vhci_hcd.c
54469@@ -439,7 +439,7 @@ static void vhci_tx_urb(struct urb *urb)
54470
54471 spin_lock(&vdev->priv_lock);
54472
54473- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
54474+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54475 if (priv->seqnum == 0xffff)
54476 dev_info(&urb->dev->dev, "seqnum max\n");
54477
54478@@ -686,7 +686,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
54479 return -ENOMEM;
54480 }
54481
54482- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
54483+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54484 if (unlink->seqnum == 0xffff)
54485 pr_info("seqnum max\n");
54486
54487@@ -891,7 +891,7 @@ static int vhci_start(struct usb_hcd *hcd)
54488 vdev->rhport = rhport;
54489 }
54490
54491- atomic_set(&vhci->seqnum, 0);
54492+ atomic_set_unchecked(&vhci->seqnum, 0);
54493 spin_lock_init(&vhci->lock);
54494
54495 hcd->power_budget = 0; /* no limit */
54496diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
54497index 00e4a54..d676f85 100644
54498--- a/drivers/usb/usbip/vhci_rx.c
54499+++ b/drivers/usb/usbip/vhci_rx.c
54500@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
54501 if (!urb) {
54502 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
54503 pr_info("max seqnum %d\n",
54504- atomic_read(&the_controller->seqnum));
54505+ atomic_read_unchecked(&the_controller->seqnum));
54506 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
54507 return;
54508 }
54509diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
54510index edc7267..9f65ce2 100644
54511--- a/drivers/usb/wusbcore/wa-hc.h
54512+++ b/drivers/usb/wusbcore/wa-hc.h
54513@@ -240,7 +240,7 @@ struct wahc {
54514 spinlock_t xfer_list_lock;
54515 struct work_struct xfer_enqueue_work;
54516 struct work_struct xfer_error_work;
54517- atomic_t xfer_id_count;
54518+ atomic_unchecked_t xfer_id_count;
54519
54520 kernel_ulong_t quirks;
54521 };
54522@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
54523 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
54524 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
54525 wa->dto_in_use = 0;
54526- atomic_set(&wa->xfer_id_count, 1);
54527+ atomic_set_unchecked(&wa->xfer_id_count, 1);
54528 /* init the buf in URBs */
54529 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
54530 usb_init_urb(&(wa->buf_in_urbs[index]));
54531diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
54532index 69af4fd..da390d7 100644
54533--- a/drivers/usb/wusbcore/wa-xfer.c
54534+++ b/drivers/usb/wusbcore/wa-xfer.c
54535@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
54536 */
54537 static void wa_xfer_id_init(struct wa_xfer *xfer)
54538 {
54539- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
54540+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
54541 }
54542
54543 /* Return the xfer's ID. */
54544diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
54545index f018d8d..ccab63f 100644
54546--- a/drivers/vfio/vfio.c
54547+++ b/drivers/vfio/vfio.c
54548@@ -481,7 +481,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
54549 return 0;
54550
54551 /* TODO Prevent device auto probing */
54552- WARN("Device %s added to live group %d!\n", dev_name(dev),
54553+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
54554 iommu_group_id(group->iommu_group));
54555
54556 return 0;
54557diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
54558index 5174eba..451e6bc 100644
54559--- a/drivers/vhost/vringh.c
54560+++ b/drivers/vhost/vringh.c
54561@@ -530,17 +530,17 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
54562 /* Userspace access helpers: in this case, addresses are really userspace. */
54563 static inline int getu16_user(u16 *val, const u16 *p)
54564 {
54565- return get_user(*val, (__force u16 __user *)p);
54566+ return get_user(*val, (u16 __force_user *)p);
54567 }
54568
54569 static inline int putu16_user(u16 *p, u16 val)
54570 {
54571- return put_user(val, (__force u16 __user *)p);
54572+ return put_user(val, (u16 __force_user *)p);
54573 }
54574
54575 static inline int copydesc_user(void *dst, const void *src, size_t len)
54576 {
54577- return copy_from_user(dst, (__force void __user *)src, len) ?
54578+ return copy_from_user(dst, (void __force_user *)src, len) ?
54579 -EFAULT : 0;
54580 }
54581
54582@@ -548,19 +548,19 @@ static inline int putused_user(struct vring_used_elem *dst,
54583 const struct vring_used_elem *src,
54584 unsigned int num)
54585 {
54586- return copy_to_user((__force void __user *)dst, src,
54587+ return copy_to_user((void __force_user *)dst, src,
54588 sizeof(*dst) * num) ? -EFAULT : 0;
54589 }
54590
54591 static inline int xfer_from_user(void *src, void *dst, size_t len)
54592 {
54593- return copy_from_user(dst, (__force void __user *)src, len) ?
54594+ return copy_from_user(dst, (void __force_user *)src, len) ?
54595 -EFAULT : 0;
54596 }
54597
54598 static inline int xfer_to_user(void *dst, void *src, size_t len)
54599 {
54600- return copy_to_user((__force void __user *)dst, src, len) ?
54601+ return copy_to_user((void __force_user *)dst, src, len) ?
54602 -EFAULT : 0;
54603 }
54604
54605@@ -596,9 +596,9 @@ int vringh_init_user(struct vringh *vrh, u32 features,
54606 vrh->last_used_idx = 0;
54607 vrh->vring.num = num;
54608 /* vring expects kernel addresses, but only used via accessors. */
54609- vrh->vring.desc = (__force struct vring_desc *)desc;
54610- vrh->vring.avail = (__force struct vring_avail *)avail;
54611- vrh->vring.used = (__force struct vring_used *)used;
54612+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
54613+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
54614+ vrh->vring.used = (__force_kernel struct vring_used *)used;
54615 return 0;
54616 }
54617 EXPORT_SYMBOL(vringh_init_user);
54618@@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
54619
54620 static inline int putu16_kern(u16 *p, u16 val)
54621 {
54622- ACCESS_ONCE(*p) = val;
54623+ ACCESS_ONCE_RW(*p) = val;
54624 return 0;
54625 }
54626
54627diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
54628index 84a110a..96312c3 100644
54629--- a/drivers/video/backlight/kb3886_bl.c
54630+++ b/drivers/video/backlight/kb3886_bl.c
54631@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
54632 static unsigned long kb3886bl_flags;
54633 #define KB3886BL_SUSPENDED 0x01
54634
54635-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
54636+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
54637 {
54638 .ident = "Sahara Touch-iT",
54639 .matches = {
54640diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
54641index 1b0b233..6f34c2c 100644
54642--- a/drivers/video/fbdev/arcfb.c
54643+++ b/drivers/video/fbdev/arcfb.c
54644@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
54645 return -ENOSPC;
54646
54647 err = 0;
54648- if ((count + p) > fbmemlength) {
54649+ if (count > (fbmemlength - p)) {
54650 count = fbmemlength - p;
54651 err = -ENOSPC;
54652 }
54653diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
54654index aedf2fb..47c9aca 100644
54655--- a/drivers/video/fbdev/aty/aty128fb.c
54656+++ b/drivers/video/fbdev/aty/aty128fb.c
54657@@ -149,7 +149,7 @@ enum {
54658 };
54659
54660 /* Must match above enum */
54661-static char * const r128_family[] = {
54662+static const char * const r128_family[] = {
54663 "AGP",
54664 "PCI",
54665 "PRO AGP",
54666diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
54667index 37ec09b..98f8862 100644
54668--- a/drivers/video/fbdev/aty/atyfb_base.c
54669+++ b/drivers/video/fbdev/aty/atyfb_base.c
54670@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
54671 par->accel_flags = var->accel_flags; /* hack */
54672
54673 if (var->accel_flags) {
54674- info->fbops->fb_sync = atyfb_sync;
54675+ pax_open_kernel();
54676+ *(void **)&info->fbops->fb_sync = atyfb_sync;
54677+ pax_close_kernel();
54678 info->flags &= ~FBINFO_HWACCEL_DISABLED;
54679 } else {
54680- info->fbops->fb_sync = NULL;
54681+ pax_open_kernel();
54682+ *(void **)&info->fbops->fb_sync = NULL;
54683+ pax_close_kernel();
54684 info->flags |= FBINFO_HWACCEL_DISABLED;
54685 }
54686
54687diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
54688index 2fa0317..4983f2a 100644
54689--- a/drivers/video/fbdev/aty/mach64_cursor.c
54690+++ b/drivers/video/fbdev/aty/mach64_cursor.c
54691@@ -8,6 +8,7 @@
54692 #include "../core/fb_draw.h"
54693
54694 #include <asm/io.h>
54695+#include <asm/pgtable.h>
54696
54697 #ifdef __sparc__
54698 #include <asm/fbio.h>
54699@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
54700 info->sprite.buf_align = 16; /* and 64 lines tall. */
54701 info->sprite.flags = FB_PIXMAP_IO;
54702
54703- info->fbops->fb_cursor = atyfb_cursor;
54704+ pax_open_kernel();
54705+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
54706+ pax_close_kernel();
54707
54708 return 0;
54709 }
54710diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
54711index 900aa4e..6d49418 100644
54712--- a/drivers/video/fbdev/core/fb_defio.c
54713+++ b/drivers/video/fbdev/core/fb_defio.c
54714@@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
54715
54716 BUG_ON(!fbdefio);
54717 mutex_init(&fbdefio->lock);
54718- info->fbops->fb_mmap = fb_deferred_io_mmap;
54719+ pax_open_kernel();
54720+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
54721+ pax_close_kernel();
54722 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
54723 INIT_LIST_HEAD(&fbdefio->pagelist);
54724 if (fbdefio->delay == 0) /* set a default of 1 s */
54725@@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
54726 page->mapping = NULL;
54727 }
54728
54729- info->fbops->fb_mmap = NULL;
54730+ *(void **)&info->fbops->fb_mmap = NULL;
54731 mutex_destroy(&fbdefio->lock);
54732 }
54733 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
54734diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
54735index 0705d88..d9429bf 100644
54736--- a/drivers/video/fbdev/core/fbmem.c
54737+++ b/drivers/video/fbdev/core/fbmem.c
54738@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
54739 __u32 data;
54740 int err;
54741
54742- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
54743+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
54744
54745 data = (__u32) (unsigned long) fix->smem_start;
54746 err |= put_user(data, &fix32->smem_start);
54747diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
54748index 4254336..282567e 100644
54749--- a/drivers/video/fbdev/hyperv_fb.c
54750+++ b/drivers/video/fbdev/hyperv_fb.c
54751@@ -240,7 +240,7 @@ static uint screen_fb_size;
54752 static inline int synthvid_send(struct hv_device *hdev,
54753 struct synthvid_msg *msg)
54754 {
54755- static atomic64_t request_id = ATOMIC64_INIT(0);
54756+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
54757 int ret;
54758
54759 msg->pipe_hdr.type = PIPE_MSG_DATA;
54760@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
54761
54762 ret = vmbus_sendpacket(hdev->channel, msg,
54763 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
54764- atomic64_inc_return(&request_id),
54765+ atomic64_inc_return_unchecked(&request_id),
54766 VM_PKT_DATA_INBAND, 0);
54767
54768 if (ret)
54769diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
54770index 7672d2e..b56437f 100644
54771--- a/drivers/video/fbdev/i810/i810_accel.c
54772+++ b/drivers/video/fbdev/i810/i810_accel.c
54773@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
54774 }
54775 }
54776 printk("ringbuffer lockup!!!\n");
54777+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
54778 i810_report_error(mmio);
54779 par->dev_flags |= LOCKUP;
54780 info->pixmap.scan_align = 1;
54781diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54782index a01147f..5d896f8 100644
54783--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54784+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54785@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
54786
54787 #ifdef CONFIG_FB_MATROX_MYSTIQUE
54788 struct matrox_switch matrox_mystique = {
54789- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
54790+ .preinit = MGA1064_preinit,
54791+ .reset = MGA1064_reset,
54792+ .init = MGA1064_init,
54793+ .restore = MGA1064_restore,
54794 };
54795 EXPORT_SYMBOL(matrox_mystique);
54796 #endif
54797
54798 #ifdef CONFIG_FB_MATROX_G
54799 struct matrox_switch matrox_G100 = {
54800- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
54801+ .preinit = MGAG100_preinit,
54802+ .reset = MGAG100_reset,
54803+ .init = MGAG100_init,
54804+ .restore = MGAG100_restore,
54805 };
54806 EXPORT_SYMBOL(matrox_G100);
54807 #endif
54808diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54809index 195ad7c..09743fc 100644
54810--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54811+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54812@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
54813 }
54814
54815 struct matrox_switch matrox_millennium = {
54816- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
54817+ .preinit = Ti3026_preinit,
54818+ .reset = Ti3026_reset,
54819+ .init = Ti3026_init,
54820+ .restore = Ti3026_restore
54821 };
54822 EXPORT_SYMBOL(matrox_millennium);
54823 #endif
54824diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54825index fe92eed..106e085 100644
54826--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54827+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54828@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
54829 struct mb862xxfb_par *par = info->par;
54830
54831 if (info->var.bits_per_pixel == 32) {
54832- info->fbops->fb_fillrect = cfb_fillrect;
54833- info->fbops->fb_copyarea = cfb_copyarea;
54834- info->fbops->fb_imageblit = cfb_imageblit;
54835+ pax_open_kernel();
54836+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
54837+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
54838+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
54839+ pax_close_kernel();
54840 } else {
54841 outreg(disp, GC_L0EM, 3);
54842- info->fbops->fb_fillrect = mb86290fb_fillrect;
54843- info->fbops->fb_copyarea = mb86290fb_copyarea;
54844- info->fbops->fb_imageblit = mb86290fb_imageblit;
54845+ pax_open_kernel();
54846+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
54847+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
54848+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
54849+ pax_close_kernel();
54850 }
54851 outreg(draw, GDC_REG_DRAW_BASE, 0);
54852 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
54853diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
54854index def0412..fed6529 100644
54855--- a/drivers/video/fbdev/nvidia/nvidia.c
54856+++ b/drivers/video/fbdev/nvidia/nvidia.c
54857@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
54858 info->fix.line_length = (info->var.xres_virtual *
54859 info->var.bits_per_pixel) >> 3;
54860 if (info->var.accel_flags) {
54861- info->fbops->fb_imageblit = nvidiafb_imageblit;
54862- info->fbops->fb_fillrect = nvidiafb_fillrect;
54863- info->fbops->fb_copyarea = nvidiafb_copyarea;
54864- info->fbops->fb_sync = nvidiafb_sync;
54865+ pax_open_kernel();
54866+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
54867+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
54868+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
54869+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
54870+ pax_close_kernel();
54871 info->pixmap.scan_align = 4;
54872 info->flags &= ~FBINFO_HWACCEL_DISABLED;
54873 info->flags |= FBINFO_READS_FAST;
54874 NVResetGraphics(info);
54875 } else {
54876- info->fbops->fb_imageblit = cfb_imageblit;
54877- info->fbops->fb_fillrect = cfb_fillrect;
54878- info->fbops->fb_copyarea = cfb_copyarea;
54879- info->fbops->fb_sync = NULL;
54880+ pax_open_kernel();
54881+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
54882+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
54883+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
54884+ *(void **)&info->fbops->fb_sync = NULL;
54885+ pax_close_kernel();
54886 info->pixmap.scan_align = 1;
54887 info->flags |= FBINFO_HWACCEL_DISABLED;
54888 info->flags &= ~FBINFO_READS_FAST;
54889@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
54890 info->pixmap.size = 8 * 1024;
54891 info->pixmap.flags = FB_PIXMAP_SYSTEM;
54892
54893- if (!hwcur)
54894- info->fbops->fb_cursor = NULL;
54895+ if (!hwcur) {
54896+ pax_open_kernel();
54897+ *(void **)&info->fbops->fb_cursor = NULL;
54898+ pax_close_kernel();
54899+ }
54900
54901 info->var.accel_flags = (!noaccel);
54902
54903diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
54904index 2412a0d..294215b 100644
54905--- a/drivers/video/fbdev/omap2/dss/display.c
54906+++ b/drivers/video/fbdev/omap2/dss/display.c
54907@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
54908 if (dssdev->name == NULL)
54909 dssdev->name = dssdev->alias;
54910
54911+ pax_open_kernel();
54912 if (drv && drv->get_resolution == NULL)
54913- drv->get_resolution = omapdss_default_get_resolution;
54914+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
54915 if (drv && drv->get_recommended_bpp == NULL)
54916- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
54917+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
54918 if (drv && drv->get_timings == NULL)
54919- drv->get_timings = omapdss_default_get_timings;
54920+ *(void **)&drv->get_timings = omapdss_default_get_timings;
54921+ pax_close_kernel();
54922
54923 mutex_lock(&panel_list_mutex);
54924 list_add_tail(&dssdev->panel_list, &panel_list);
54925diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
54926index 83433cb..71e9b98 100644
54927--- a/drivers/video/fbdev/s1d13xxxfb.c
54928+++ b/drivers/video/fbdev/s1d13xxxfb.c
54929@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
54930
54931 switch(prod_id) {
54932 case S1D13506_PROD_ID: /* activate acceleration */
54933- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
54934- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
54935+ pax_open_kernel();
54936+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
54937+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
54938+ pax_close_kernel();
54939 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
54940 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
54941 break;
54942diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
54943index 2bcc84a..29dd1ea 100644
54944--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
54945+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
54946@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
54947 }
54948
54949 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
54950- lcdc_sys_write_index,
54951- lcdc_sys_write_data,
54952- lcdc_sys_read_data,
54953+ .write_index = lcdc_sys_write_index,
54954+ .write_data = lcdc_sys_write_data,
54955+ .read_data = lcdc_sys_read_data,
54956 };
54957
54958 static int sh_mobile_lcdc_sginit(struct fb_info *info,
54959diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
54960index d513ed6..90b0de9 100644
54961--- a/drivers/video/fbdev/smscufx.c
54962+++ b/drivers/video/fbdev/smscufx.c
54963@@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
54964 fb_deferred_io_cleanup(info);
54965 kfree(info->fbdefio);
54966 info->fbdefio = NULL;
54967- info->fbops->fb_mmap = ufx_ops_mmap;
54968+ pax_open_kernel();
54969+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
54970+ pax_close_kernel();
54971 }
54972
54973 pr_debug("released /dev/fb%d user=%d count=%d",
54974diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
54975index 046d51d..be564da 100644
54976--- a/drivers/video/fbdev/udlfb.c
54977+++ b/drivers/video/fbdev/udlfb.c
54978@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
54979 dlfb_urb_completion(urb);
54980
54981 error:
54982- atomic_add(bytes_sent, &dev->bytes_sent);
54983- atomic_add(bytes_identical, &dev->bytes_identical);
54984- atomic_add(width*height*2, &dev->bytes_rendered);
54985+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
54986+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
54987+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
54988 end_cycles = get_cycles();
54989- atomic_add(((unsigned int) ((end_cycles - start_cycles)
54990+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
54991 >> 10)), /* Kcycles */
54992 &dev->cpu_kcycles_used);
54993
54994@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
54995 dlfb_urb_completion(urb);
54996
54997 error:
54998- atomic_add(bytes_sent, &dev->bytes_sent);
54999- atomic_add(bytes_identical, &dev->bytes_identical);
55000- atomic_add(bytes_rendered, &dev->bytes_rendered);
55001+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
55002+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
55003+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
55004 end_cycles = get_cycles();
55005- atomic_add(((unsigned int) ((end_cycles - start_cycles)
55006+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
55007 >> 10)), /* Kcycles */
55008 &dev->cpu_kcycles_used);
55009 }
55010@@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
55011 fb_deferred_io_cleanup(info);
55012 kfree(info->fbdefio);
55013 info->fbdefio = NULL;
55014- info->fbops->fb_mmap = dlfb_ops_mmap;
55015+ pax_open_kernel();
55016+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
55017+ pax_close_kernel();
55018 }
55019
55020 pr_warn("released /dev/fb%d user=%d count=%d\n",
55021@@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
55022 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55023 struct dlfb_data *dev = fb_info->par;
55024 return snprintf(buf, PAGE_SIZE, "%u\n",
55025- atomic_read(&dev->bytes_rendered));
55026+ atomic_read_unchecked(&dev->bytes_rendered));
55027 }
55028
55029 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55030@@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55031 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55032 struct dlfb_data *dev = fb_info->par;
55033 return snprintf(buf, PAGE_SIZE, "%u\n",
55034- atomic_read(&dev->bytes_identical));
55035+ atomic_read_unchecked(&dev->bytes_identical));
55036 }
55037
55038 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55039@@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55040 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55041 struct dlfb_data *dev = fb_info->par;
55042 return snprintf(buf, PAGE_SIZE, "%u\n",
55043- atomic_read(&dev->bytes_sent));
55044+ atomic_read_unchecked(&dev->bytes_sent));
55045 }
55046
55047 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55048@@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55049 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55050 struct dlfb_data *dev = fb_info->par;
55051 return snprintf(buf, PAGE_SIZE, "%u\n",
55052- atomic_read(&dev->cpu_kcycles_used));
55053+ atomic_read_unchecked(&dev->cpu_kcycles_used));
55054 }
55055
55056 static ssize_t edid_show(
55057@@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
55058 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55059 struct dlfb_data *dev = fb_info->par;
55060
55061- atomic_set(&dev->bytes_rendered, 0);
55062- atomic_set(&dev->bytes_identical, 0);
55063- atomic_set(&dev->bytes_sent, 0);
55064- atomic_set(&dev->cpu_kcycles_used, 0);
55065+ atomic_set_unchecked(&dev->bytes_rendered, 0);
55066+ atomic_set_unchecked(&dev->bytes_identical, 0);
55067+ atomic_set_unchecked(&dev->bytes_sent, 0);
55068+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
55069
55070 return count;
55071 }
55072diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
55073index 509d452..7c9d2de 100644
55074--- a/drivers/video/fbdev/uvesafb.c
55075+++ b/drivers/video/fbdev/uvesafb.c
55076@@ -19,6 +19,7 @@
55077 #include <linux/io.h>
55078 #include <linux/mutex.h>
55079 #include <linux/slab.h>
55080+#include <linux/moduleloader.h>
55081 #include <video/edid.h>
55082 #include <video/uvesafb.h>
55083 #ifdef CONFIG_X86
55084@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
55085 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
55086 par->pmi_setpal = par->ypan = 0;
55087 } else {
55088+
55089+#ifdef CONFIG_PAX_KERNEXEC
55090+#ifdef CONFIG_MODULES
55091+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
55092+#endif
55093+ if (!par->pmi_code) {
55094+ par->pmi_setpal = par->ypan = 0;
55095+ return 0;
55096+ }
55097+#endif
55098+
55099 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
55100 + task->t.regs.edi);
55101+
55102+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55103+ pax_open_kernel();
55104+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
55105+ pax_close_kernel();
55106+
55107+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
55108+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
55109+#else
55110 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
55111 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
55112+#endif
55113+
55114 printk(KERN_INFO "uvesafb: protected mode interface info at "
55115 "%04x:%04x\n",
55116 (u16)task->t.regs.es, (u16)task->t.regs.edi);
55117@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
55118 par->ypan = ypan;
55119
55120 if (par->pmi_setpal || par->ypan) {
55121+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
55122 if (__supported_pte_mask & _PAGE_NX) {
55123 par->pmi_setpal = par->ypan = 0;
55124 printk(KERN_WARNING "uvesafb: NX protection is active, "
55125 "better not use the PMI.\n");
55126- } else {
55127+ } else
55128+#endif
55129 uvesafb_vbe_getpmi(task, par);
55130- }
55131 }
55132 #else
55133 /* The protected mode interface is not available on non-x86. */
55134@@ -1453,8 +1477,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55135 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
55136
55137 /* Disable blanking if the user requested so. */
55138- if (!blank)
55139- info->fbops->fb_blank = NULL;
55140+ if (!blank) {
55141+ pax_open_kernel();
55142+ *(void **)&info->fbops->fb_blank = NULL;
55143+ pax_close_kernel();
55144+ }
55145
55146 /*
55147 * Find out how much IO memory is required for the mode with
55148@@ -1525,8 +1552,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55149 info->flags = FBINFO_FLAG_DEFAULT |
55150 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
55151
55152- if (!par->ypan)
55153- info->fbops->fb_pan_display = NULL;
55154+ if (!par->ypan) {
55155+ pax_open_kernel();
55156+ *(void **)&info->fbops->fb_pan_display = NULL;
55157+ pax_close_kernel();
55158+ }
55159 }
55160
55161 static void uvesafb_init_mtrr(struct fb_info *info)
55162@@ -1787,6 +1817,11 @@ out_mode:
55163 out:
55164 kfree(par->vbe_modes);
55165
55166+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55167+ if (par->pmi_code)
55168+ module_free_exec(NULL, par->pmi_code);
55169+#endif
55170+
55171 framebuffer_release(info);
55172 return err;
55173 }
55174@@ -1811,6 +1846,11 @@ static int uvesafb_remove(struct platform_device *dev)
55175 kfree(par->vbe_state_orig);
55176 kfree(par->vbe_state_saved);
55177
55178+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55179+ if (par->pmi_code)
55180+ module_free_exec(NULL, par->pmi_code);
55181+#endif
55182+
55183 framebuffer_release(info);
55184 }
55185 return 0;
55186diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
55187index 6170e7f..dd63031 100644
55188--- a/drivers/video/fbdev/vesafb.c
55189+++ b/drivers/video/fbdev/vesafb.c
55190@@ -9,6 +9,7 @@
55191 */
55192
55193 #include <linux/module.h>
55194+#include <linux/moduleloader.h>
55195 #include <linux/kernel.h>
55196 #include <linux/errno.h>
55197 #include <linux/string.h>
55198@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
55199 static int vram_total; /* Set total amount of memory */
55200 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
55201 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
55202-static void (*pmi_start)(void) __read_mostly;
55203-static void (*pmi_pal) (void) __read_mostly;
55204+static void (*pmi_start)(void) __read_only;
55205+static void (*pmi_pal) (void) __read_only;
55206 static int depth __read_mostly;
55207 static int vga_compat __read_mostly;
55208 /* --------------------------------------------------------------------- */
55209@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
55210 unsigned int size_remap;
55211 unsigned int size_total;
55212 char *option = NULL;
55213+ void *pmi_code = NULL;
55214
55215 /* ignore error return of fb_get_options */
55216 fb_get_options("vesafb", &option);
55217@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
55218 size_remap = size_total;
55219 vesafb_fix.smem_len = size_remap;
55220
55221-#ifndef __i386__
55222- screen_info.vesapm_seg = 0;
55223-#endif
55224-
55225 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
55226 printk(KERN_WARNING
55227 "vesafb: cannot reserve video memory at 0x%lx\n",
55228@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
55229 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
55230 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
55231
55232+#ifdef __i386__
55233+
55234+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55235+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
55236+ if (!pmi_code)
55237+#elif !defined(CONFIG_PAX_KERNEXEC)
55238+ if (0)
55239+#endif
55240+
55241+#endif
55242+ screen_info.vesapm_seg = 0;
55243+
55244 if (screen_info.vesapm_seg) {
55245- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
55246- screen_info.vesapm_seg,screen_info.vesapm_off);
55247+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
55248+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
55249 }
55250
55251 if (screen_info.vesapm_seg < 0xc000)
55252@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
55253
55254 if (ypan || pmi_setpal) {
55255 unsigned short *pmi_base;
55256+
55257 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
55258- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
55259- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
55260+
55261+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55262+ pax_open_kernel();
55263+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
55264+#else
55265+ pmi_code = pmi_base;
55266+#endif
55267+
55268+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
55269+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
55270+
55271+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55272+ pmi_start = ktva_ktla(pmi_start);
55273+ pmi_pal = ktva_ktla(pmi_pal);
55274+ pax_close_kernel();
55275+#endif
55276+
55277 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
55278 if (pmi_base[3]) {
55279 printk(KERN_INFO "vesafb: pmi: ports = ");
55280@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
55281 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
55282 (ypan ? FBINFO_HWACCEL_YPAN : 0);
55283
55284- if (!ypan)
55285- info->fbops->fb_pan_display = NULL;
55286+ if (!ypan) {
55287+ pax_open_kernel();
55288+ *(void **)&info->fbops->fb_pan_display = NULL;
55289+ pax_close_kernel();
55290+ }
55291
55292 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
55293 err = -ENOMEM;
55294@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
55295 fb_info(info, "%s frame buffer device\n", info->fix.id);
55296 return 0;
55297 err:
55298+
55299+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55300+ module_free_exec(NULL, pmi_code);
55301+#endif
55302+
55303 if (info->screen_base)
55304 iounmap(info->screen_base);
55305 framebuffer_release(info);
55306diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
55307index 88714ae..16c2e11 100644
55308--- a/drivers/video/fbdev/via/via_clock.h
55309+++ b/drivers/video/fbdev/via/via_clock.h
55310@@ -56,7 +56,7 @@ struct via_clock {
55311
55312 void (*set_engine_pll_state)(u8 state);
55313 void (*set_engine_pll)(struct via_pll_config config);
55314-};
55315+} __no_const;
55316
55317
55318 static inline u32 get_pll_internal_frequency(u32 ref_freq,
55319diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
55320index 3c14e43..2630570 100644
55321--- a/drivers/video/logo/logo_linux_clut224.ppm
55322+++ b/drivers/video/logo/logo_linux_clut224.ppm
55323@@ -2,1603 +2,1123 @@ P3
55324 # Standard 224-color Linux logo
55325 80 80
55326 255
55327- 0 0 0 0 0 0 0 0 0 0 0 0
55328- 0 0 0 0 0 0 0 0 0 0 0 0
55329- 0 0 0 0 0 0 0 0 0 0 0 0
55330- 0 0 0 0 0 0 0 0 0 0 0 0
55331- 0 0 0 0 0 0 0 0 0 0 0 0
55332- 0 0 0 0 0 0 0 0 0 0 0 0
55333- 0 0 0 0 0 0 0 0 0 0 0 0
55334- 0 0 0 0 0 0 0 0 0 0 0 0
55335- 0 0 0 0 0 0 0 0 0 0 0 0
55336- 6 6 6 6 6 6 10 10 10 10 10 10
55337- 10 10 10 6 6 6 6 6 6 6 6 6
55338- 0 0 0 0 0 0 0 0 0 0 0 0
55339- 0 0 0 0 0 0 0 0 0 0 0 0
55340- 0 0 0 0 0 0 0 0 0 0 0 0
55341- 0 0 0 0 0 0 0 0 0 0 0 0
55342- 0 0 0 0 0 0 0 0 0 0 0 0
55343- 0 0 0 0 0 0 0 0 0 0 0 0
55344- 0 0 0 0 0 0 0 0 0 0 0 0
55345- 0 0 0 0 0 0 0 0 0 0 0 0
55346- 0 0 0 0 0 0 0 0 0 0 0 0
55347- 0 0 0 0 0 0 0 0 0 0 0 0
55348- 0 0 0 0 0 0 0 0 0 0 0 0
55349- 0 0 0 0 0 0 0 0 0 0 0 0
55350- 0 0 0 0 0 0 0 0 0 0 0 0
55351- 0 0 0 0 0 0 0 0 0 0 0 0
55352- 0 0 0 0 0 0 0 0 0 0 0 0
55353- 0 0 0 0 0 0 0 0 0 0 0 0
55354- 0 0 0 0 0 0 0 0 0 0 0 0
55355- 0 0 0 6 6 6 10 10 10 14 14 14
55356- 22 22 22 26 26 26 30 30 30 34 34 34
55357- 30 30 30 30 30 30 26 26 26 18 18 18
55358- 14 14 14 10 10 10 6 6 6 0 0 0
55359- 0 0 0 0 0 0 0 0 0 0 0 0
55360- 0 0 0 0 0 0 0 0 0 0 0 0
55361- 0 0 0 0 0 0 0 0 0 0 0 0
55362- 0 0 0 0 0 0 0 0 0 0 0 0
55363- 0 0 0 0 0 0 0 0 0 0 0 0
55364- 0 0 0 0 0 0 0 0 0 0 0 0
55365- 0 0 0 0 0 0 0 0 0 0 0 0
55366- 0 0 0 0 0 0 0 0 0 0 0 0
55367- 0 0 0 0 0 0 0 0 0 0 0 0
55368- 0 0 0 0 0 1 0 0 1 0 0 0
55369- 0 0 0 0 0 0 0 0 0 0 0 0
55370- 0 0 0 0 0 0 0 0 0 0 0 0
55371- 0 0 0 0 0 0 0 0 0 0 0 0
55372- 0 0 0 0 0 0 0 0 0 0 0 0
55373- 0 0 0 0 0 0 0 0 0 0 0 0
55374- 0 0 0 0 0 0 0 0 0 0 0 0
55375- 6 6 6 14 14 14 26 26 26 42 42 42
55376- 54 54 54 66 66 66 78 78 78 78 78 78
55377- 78 78 78 74 74 74 66 66 66 54 54 54
55378- 42 42 42 26 26 26 18 18 18 10 10 10
55379- 6 6 6 0 0 0 0 0 0 0 0 0
55380- 0 0 0 0 0 0 0 0 0 0 0 0
55381- 0 0 0 0 0 0 0 0 0 0 0 0
55382- 0 0 0 0 0 0 0 0 0 0 0 0
55383- 0 0 0 0 0 0 0 0 0 0 0 0
55384- 0 0 0 0 0 0 0 0 0 0 0 0
55385- 0 0 0 0 0 0 0 0 0 0 0 0
55386- 0 0 0 0 0 0 0 0 0 0 0 0
55387- 0 0 0 0 0 0 0 0 0 0 0 0
55388- 0 0 1 0 0 0 0 0 0 0 0 0
55389- 0 0 0 0 0 0 0 0 0 0 0 0
55390- 0 0 0 0 0 0 0 0 0 0 0 0
55391- 0 0 0 0 0 0 0 0 0 0 0 0
55392- 0 0 0 0 0 0 0 0 0 0 0 0
55393- 0 0 0 0 0 0 0 0 0 0 0 0
55394- 0 0 0 0 0 0 0 0 0 10 10 10
55395- 22 22 22 42 42 42 66 66 66 86 86 86
55396- 66 66 66 38 38 38 38 38 38 22 22 22
55397- 26 26 26 34 34 34 54 54 54 66 66 66
55398- 86 86 86 70 70 70 46 46 46 26 26 26
55399- 14 14 14 6 6 6 0 0 0 0 0 0
55400- 0 0 0 0 0 0 0 0 0 0 0 0
55401- 0 0 0 0 0 0 0 0 0 0 0 0
55402- 0 0 0 0 0 0 0 0 0 0 0 0
55403- 0 0 0 0 0 0 0 0 0 0 0 0
55404- 0 0 0 0 0 0 0 0 0 0 0 0
55405- 0 0 0 0 0 0 0 0 0 0 0 0
55406- 0 0 0 0 0 0 0 0 0 0 0 0
55407- 0 0 0 0 0 0 0 0 0 0 0 0
55408- 0 0 1 0 0 1 0 0 1 0 0 0
55409- 0 0 0 0 0 0 0 0 0 0 0 0
55410- 0 0 0 0 0 0 0 0 0 0 0 0
55411- 0 0 0 0 0 0 0 0 0 0 0 0
55412- 0 0 0 0 0 0 0 0 0 0 0 0
55413- 0 0 0 0 0 0 0 0 0 0 0 0
55414- 0 0 0 0 0 0 10 10 10 26 26 26
55415- 50 50 50 82 82 82 58 58 58 6 6 6
55416- 2 2 6 2 2 6 2 2 6 2 2 6
55417- 2 2 6 2 2 6 2 2 6 2 2 6
55418- 6 6 6 54 54 54 86 86 86 66 66 66
55419- 38 38 38 18 18 18 6 6 6 0 0 0
55420- 0 0 0 0 0 0 0 0 0 0 0 0
55421- 0 0 0 0 0 0 0 0 0 0 0 0
55422- 0 0 0 0 0 0 0 0 0 0 0 0
55423- 0 0 0 0 0 0 0 0 0 0 0 0
55424- 0 0 0 0 0 0 0 0 0 0 0 0
55425- 0 0 0 0 0 0 0 0 0 0 0 0
55426- 0 0 0 0 0 0 0 0 0 0 0 0
55427- 0 0 0 0 0 0 0 0 0 0 0 0
55428- 0 0 0 0 0 0 0 0 0 0 0 0
55429- 0 0 0 0 0 0 0 0 0 0 0 0
55430- 0 0 0 0 0 0 0 0 0 0 0 0
55431- 0 0 0 0 0 0 0 0 0 0 0 0
55432- 0 0 0 0 0 0 0 0 0 0 0 0
55433- 0 0 0 0 0 0 0 0 0 0 0 0
55434- 0 0 0 6 6 6 22 22 22 50 50 50
55435- 78 78 78 34 34 34 2 2 6 2 2 6
55436- 2 2 6 2 2 6 2 2 6 2 2 6
55437- 2 2 6 2 2 6 2 2 6 2 2 6
55438- 2 2 6 2 2 6 6 6 6 70 70 70
55439- 78 78 78 46 46 46 22 22 22 6 6 6
55440- 0 0 0 0 0 0 0 0 0 0 0 0
55441- 0 0 0 0 0 0 0 0 0 0 0 0
55442- 0 0 0 0 0 0 0 0 0 0 0 0
55443- 0 0 0 0 0 0 0 0 0 0 0 0
55444- 0 0 0 0 0 0 0 0 0 0 0 0
55445- 0 0 0 0 0 0 0 0 0 0 0 0
55446- 0 0 0 0 0 0 0 0 0 0 0 0
55447- 0 0 0 0 0 0 0 0 0 0 0 0
55448- 0 0 1 0 0 1 0 0 1 0 0 0
55449- 0 0 0 0 0 0 0 0 0 0 0 0
55450- 0 0 0 0 0 0 0 0 0 0 0 0
55451- 0 0 0 0 0 0 0 0 0 0 0 0
55452- 0 0 0 0 0 0 0 0 0 0 0 0
55453- 0 0 0 0 0 0 0 0 0 0 0 0
55454- 6 6 6 18 18 18 42 42 42 82 82 82
55455- 26 26 26 2 2 6 2 2 6 2 2 6
55456- 2 2 6 2 2 6 2 2 6 2 2 6
55457- 2 2 6 2 2 6 2 2 6 14 14 14
55458- 46 46 46 34 34 34 6 6 6 2 2 6
55459- 42 42 42 78 78 78 42 42 42 18 18 18
55460- 6 6 6 0 0 0 0 0 0 0 0 0
55461- 0 0 0 0 0 0 0 0 0 0 0 0
55462- 0 0 0 0 0 0 0 0 0 0 0 0
55463- 0 0 0 0 0 0 0 0 0 0 0 0
55464- 0 0 0 0 0 0 0 0 0 0 0 0
55465- 0 0 0 0 0 0 0 0 0 0 0 0
55466- 0 0 0 0 0 0 0 0 0 0 0 0
55467- 0 0 0 0 0 0 0 0 0 0 0 0
55468- 0 0 1 0 0 0 0 0 1 0 0 0
55469- 0 0 0 0 0 0 0 0 0 0 0 0
55470- 0 0 0 0 0 0 0 0 0 0 0 0
55471- 0 0 0 0 0 0 0 0 0 0 0 0
55472- 0 0 0 0 0 0 0 0 0 0 0 0
55473- 0 0 0 0 0 0 0 0 0 0 0 0
55474- 10 10 10 30 30 30 66 66 66 58 58 58
55475- 2 2 6 2 2 6 2 2 6 2 2 6
55476- 2 2 6 2 2 6 2 2 6 2 2 6
55477- 2 2 6 2 2 6 2 2 6 26 26 26
55478- 86 86 86 101 101 101 46 46 46 10 10 10
55479- 2 2 6 58 58 58 70 70 70 34 34 34
55480- 10 10 10 0 0 0 0 0 0 0 0 0
55481- 0 0 0 0 0 0 0 0 0 0 0 0
55482- 0 0 0 0 0 0 0 0 0 0 0 0
55483- 0 0 0 0 0 0 0 0 0 0 0 0
55484- 0 0 0 0 0 0 0 0 0 0 0 0
55485- 0 0 0 0 0 0 0 0 0 0 0 0
55486- 0 0 0 0 0 0 0 0 0 0 0 0
55487- 0 0 0 0 0 0 0 0 0 0 0 0
55488- 0 0 1 0 0 1 0 0 1 0 0 0
55489- 0 0 0 0 0 0 0 0 0 0 0 0
55490- 0 0 0 0 0 0 0 0 0 0 0 0
55491- 0 0 0 0 0 0 0 0 0 0 0 0
55492- 0 0 0 0 0 0 0 0 0 0 0 0
55493- 0 0 0 0 0 0 0 0 0 0 0 0
55494- 14 14 14 42 42 42 86 86 86 10 10 10
55495- 2 2 6 2 2 6 2 2 6 2 2 6
55496- 2 2 6 2 2 6 2 2 6 2 2 6
55497- 2 2 6 2 2 6 2 2 6 30 30 30
55498- 94 94 94 94 94 94 58 58 58 26 26 26
55499- 2 2 6 6 6 6 78 78 78 54 54 54
55500- 22 22 22 6 6 6 0 0 0 0 0 0
55501- 0 0 0 0 0 0 0 0 0 0 0 0
55502- 0 0 0 0 0 0 0 0 0 0 0 0
55503- 0 0 0 0 0 0 0 0 0 0 0 0
55504- 0 0 0 0 0 0 0 0 0 0 0 0
55505- 0 0 0 0 0 0 0 0 0 0 0 0
55506- 0 0 0 0 0 0 0 0 0 0 0 0
55507- 0 0 0 0 0 0 0 0 0 0 0 0
55508- 0 0 0 0 0 0 0 0 0 0 0 0
55509- 0 0 0 0 0 0 0 0 0 0 0 0
55510- 0 0 0 0 0 0 0 0 0 0 0 0
55511- 0 0 0 0 0 0 0 0 0 0 0 0
55512- 0 0 0 0 0 0 0 0 0 0 0 0
55513- 0 0 0 0 0 0 0 0 0 6 6 6
55514- 22 22 22 62 62 62 62 62 62 2 2 6
55515- 2 2 6 2 2 6 2 2 6 2 2 6
55516- 2 2 6 2 2 6 2 2 6 2 2 6
55517- 2 2 6 2 2 6 2 2 6 26 26 26
55518- 54 54 54 38 38 38 18 18 18 10 10 10
55519- 2 2 6 2 2 6 34 34 34 82 82 82
55520- 38 38 38 14 14 14 0 0 0 0 0 0
55521- 0 0 0 0 0 0 0 0 0 0 0 0
55522- 0 0 0 0 0 0 0 0 0 0 0 0
55523- 0 0 0 0 0 0 0 0 0 0 0 0
55524- 0 0 0 0 0 0 0 0 0 0 0 0
55525- 0 0 0 0 0 0 0 0 0 0 0 0
55526- 0 0 0 0 0 0 0 0 0 0 0 0
55527- 0 0 0 0 0 0 0 0 0 0 0 0
55528- 0 0 0 0 0 1 0 0 1 0 0 0
55529- 0 0 0 0 0 0 0 0 0 0 0 0
55530- 0 0 0 0 0 0 0 0 0 0 0 0
55531- 0 0 0 0 0 0 0 0 0 0 0 0
55532- 0 0 0 0 0 0 0 0 0 0 0 0
55533- 0 0 0 0 0 0 0 0 0 6 6 6
55534- 30 30 30 78 78 78 30 30 30 2 2 6
55535- 2 2 6 2 2 6 2 2 6 2 2 6
55536- 2 2 6 2 2 6 2 2 6 2 2 6
55537- 2 2 6 2 2 6 2 2 6 10 10 10
55538- 10 10 10 2 2 6 2 2 6 2 2 6
55539- 2 2 6 2 2 6 2 2 6 78 78 78
55540- 50 50 50 18 18 18 6 6 6 0 0 0
55541- 0 0 0 0 0 0 0 0 0 0 0 0
55542- 0 0 0 0 0 0 0 0 0 0 0 0
55543- 0 0 0 0 0 0 0 0 0 0 0 0
55544- 0 0 0 0 0 0 0 0 0 0 0 0
55545- 0 0 0 0 0 0 0 0 0 0 0 0
55546- 0 0 0 0 0 0 0 0 0 0 0 0
55547- 0 0 0 0 0 0 0 0 0 0 0 0
55548- 0 0 1 0 0 0 0 0 0 0 0 0
55549- 0 0 0 0 0 0 0 0 0 0 0 0
55550- 0 0 0 0 0 0 0 0 0 0 0 0
55551- 0 0 0 0 0 0 0 0 0 0 0 0
55552- 0 0 0 0 0 0 0 0 0 0 0 0
55553- 0 0 0 0 0 0 0 0 0 10 10 10
55554- 38 38 38 86 86 86 14 14 14 2 2 6
55555- 2 2 6 2 2 6 2 2 6 2 2 6
55556- 2 2 6 2 2 6 2 2 6 2 2 6
55557- 2 2 6 2 2 6 2 2 6 2 2 6
55558- 2 2 6 2 2 6 2 2 6 2 2 6
55559- 2 2 6 2 2 6 2 2 6 54 54 54
55560- 66 66 66 26 26 26 6 6 6 0 0 0
55561- 0 0 0 0 0 0 0 0 0 0 0 0
55562- 0 0 0 0 0 0 0 0 0 0 0 0
55563- 0 0 0 0 0 0 0 0 0 0 0 0
55564- 0 0 0 0 0 0 0 0 0 0 0 0
55565- 0 0 0 0 0 0 0 0 0 0 0 0
55566- 0 0 0 0 0 0 0 0 0 0 0 0
55567- 0 0 0 0 0 0 0 0 0 0 0 0
55568- 0 0 0 0 0 1 0 0 1 0 0 0
55569- 0 0 0 0 0 0 0 0 0 0 0 0
55570- 0 0 0 0 0 0 0 0 0 0 0 0
55571- 0 0 0 0 0 0 0 0 0 0 0 0
55572- 0 0 0 0 0 0 0 0 0 0 0 0
55573- 0 0 0 0 0 0 0 0 0 14 14 14
55574- 42 42 42 82 82 82 2 2 6 2 2 6
55575- 2 2 6 6 6 6 10 10 10 2 2 6
55576- 2 2 6 2 2 6 2 2 6 2 2 6
55577- 2 2 6 2 2 6 2 2 6 6 6 6
55578- 14 14 14 10 10 10 2 2 6 2 2 6
55579- 2 2 6 2 2 6 2 2 6 18 18 18
55580- 82 82 82 34 34 34 10 10 10 0 0 0
55581- 0 0 0 0 0 0 0 0 0 0 0 0
55582- 0 0 0 0 0 0 0 0 0 0 0 0
55583- 0 0 0 0 0 0 0 0 0 0 0 0
55584- 0 0 0 0 0 0 0 0 0 0 0 0
55585- 0 0 0 0 0 0 0 0 0 0 0 0
55586- 0 0 0 0 0 0 0 0 0 0 0 0
55587- 0 0 0 0 0 0 0 0 0 0 0 0
55588- 0 0 1 0 0 0 0 0 0 0 0 0
55589- 0 0 0 0 0 0 0 0 0 0 0 0
55590- 0 0 0 0 0 0 0 0 0 0 0 0
55591- 0 0 0 0 0 0 0 0 0 0 0 0
55592- 0 0 0 0 0 0 0 0 0 0 0 0
55593- 0 0 0 0 0 0 0 0 0 14 14 14
55594- 46 46 46 86 86 86 2 2 6 2 2 6
55595- 6 6 6 6 6 6 22 22 22 34 34 34
55596- 6 6 6 2 2 6 2 2 6 2 2 6
55597- 2 2 6 2 2 6 18 18 18 34 34 34
55598- 10 10 10 50 50 50 22 22 22 2 2 6
55599- 2 2 6 2 2 6 2 2 6 10 10 10
55600- 86 86 86 42 42 42 14 14 14 0 0 0
55601- 0 0 0 0 0 0 0 0 0 0 0 0
55602- 0 0 0 0 0 0 0 0 0 0 0 0
55603- 0 0 0 0 0 0 0 0 0 0 0 0
55604- 0 0 0 0 0 0 0 0 0 0 0 0
55605- 0 0 0 0 0 0 0 0 0 0 0 0
55606- 0 0 0 0 0 0 0 0 0 0 0 0
55607- 0 0 0 0 0 0 0 0 0 0 0 0
55608- 0 0 1 0 0 1 0 0 1 0 0 0
55609- 0 0 0 0 0 0 0 0 0 0 0 0
55610- 0 0 0 0 0 0 0 0 0 0 0 0
55611- 0 0 0 0 0 0 0 0 0 0 0 0
55612- 0 0 0 0 0 0 0 0 0 0 0 0
55613- 0 0 0 0 0 0 0 0 0 14 14 14
55614- 46 46 46 86 86 86 2 2 6 2 2 6
55615- 38 38 38 116 116 116 94 94 94 22 22 22
55616- 22 22 22 2 2 6 2 2 6 2 2 6
55617- 14 14 14 86 86 86 138 138 138 162 162 162
55618-154 154 154 38 38 38 26 26 26 6 6 6
55619- 2 2 6 2 2 6 2 2 6 2 2 6
55620- 86 86 86 46 46 46 14 14 14 0 0 0
55621- 0 0 0 0 0 0 0 0 0 0 0 0
55622- 0 0 0 0 0 0 0 0 0 0 0 0
55623- 0 0 0 0 0 0 0 0 0 0 0 0
55624- 0 0 0 0 0 0 0 0 0 0 0 0
55625- 0 0 0 0 0 0 0 0 0 0 0 0
55626- 0 0 0 0 0 0 0 0 0 0 0 0
55627- 0 0 0 0 0 0 0 0 0 0 0 0
55628- 0 0 0 0 0 0 0 0 0 0 0 0
55629- 0 0 0 0 0 0 0 0 0 0 0 0
55630- 0 0 0 0 0 0 0 0 0 0 0 0
55631- 0 0 0 0 0 0 0 0 0 0 0 0
55632- 0 0 0 0 0 0 0 0 0 0 0 0
55633- 0 0 0 0 0 0 0 0 0 14 14 14
55634- 46 46 46 86 86 86 2 2 6 14 14 14
55635-134 134 134 198 198 198 195 195 195 116 116 116
55636- 10 10 10 2 2 6 2 2 6 6 6 6
55637-101 98 89 187 187 187 210 210 210 218 218 218
55638-214 214 214 134 134 134 14 14 14 6 6 6
55639- 2 2 6 2 2 6 2 2 6 2 2 6
55640- 86 86 86 50 50 50 18 18 18 6 6 6
55641- 0 0 0 0 0 0 0 0 0 0 0 0
55642- 0 0 0 0 0 0 0 0 0 0 0 0
55643- 0 0 0 0 0 0 0 0 0 0 0 0
55644- 0 0 0 0 0 0 0 0 0 0 0 0
55645- 0 0 0 0 0 0 0 0 0 0 0 0
55646- 0 0 0 0 0 0 0 0 0 0 0 0
55647- 0 0 0 0 0 0 0 0 1 0 0 0
55648- 0 0 1 0 0 1 0 0 1 0 0 0
55649- 0 0 0 0 0 0 0 0 0 0 0 0
55650- 0 0 0 0 0 0 0 0 0 0 0 0
55651- 0 0 0 0 0 0 0 0 0 0 0 0
55652- 0 0 0 0 0 0 0 0 0 0 0 0
55653- 0 0 0 0 0 0 0 0 0 14 14 14
55654- 46 46 46 86 86 86 2 2 6 54 54 54
55655-218 218 218 195 195 195 226 226 226 246 246 246
55656- 58 58 58 2 2 6 2 2 6 30 30 30
55657-210 210 210 253 253 253 174 174 174 123 123 123
55658-221 221 221 234 234 234 74 74 74 2 2 6
55659- 2 2 6 2 2 6 2 2 6 2 2 6
55660- 70 70 70 58 58 58 22 22 22 6 6 6
55661- 0 0 0 0 0 0 0 0 0 0 0 0
55662- 0 0 0 0 0 0 0 0 0 0 0 0
55663- 0 0 0 0 0 0 0 0 0 0 0 0
55664- 0 0 0 0 0 0 0 0 0 0 0 0
55665- 0 0 0 0 0 0 0 0 0 0 0 0
55666- 0 0 0 0 0 0 0 0 0 0 0 0
55667- 0 0 0 0 0 0 0 0 0 0 0 0
55668- 0 0 0 0 0 0 0 0 0 0 0 0
55669- 0 0 0 0 0 0 0 0 0 0 0 0
55670- 0 0 0 0 0 0 0 0 0 0 0 0
55671- 0 0 0 0 0 0 0 0 0 0 0 0
55672- 0 0 0 0 0 0 0 0 0 0 0 0
55673- 0 0 0 0 0 0 0 0 0 14 14 14
55674- 46 46 46 82 82 82 2 2 6 106 106 106
55675-170 170 170 26 26 26 86 86 86 226 226 226
55676-123 123 123 10 10 10 14 14 14 46 46 46
55677-231 231 231 190 190 190 6 6 6 70 70 70
55678- 90 90 90 238 238 238 158 158 158 2 2 6
55679- 2 2 6 2 2 6 2 2 6 2 2 6
55680- 70 70 70 58 58 58 22 22 22 6 6 6
55681- 0 0 0 0 0 0 0 0 0 0 0 0
55682- 0 0 0 0 0 0 0 0 0 0 0 0
55683- 0 0 0 0 0 0 0 0 0 0 0 0
55684- 0 0 0 0 0 0 0 0 0 0 0 0
55685- 0 0 0 0 0 0 0 0 0 0 0 0
55686- 0 0 0 0 0 0 0 0 0 0 0 0
55687- 0 0 0 0 0 0 0 0 1 0 0 0
55688- 0 0 1 0 0 1 0 0 1 0 0 0
55689- 0 0 0 0 0 0 0 0 0 0 0 0
55690- 0 0 0 0 0 0 0 0 0 0 0 0
55691- 0 0 0 0 0 0 0 0 0 0 0 0
55692- 0 0 0 0 0 0 0 0 0 0 0 0
55693- 0 0 0 0 0 0 0 0 0 14 14 14
55694- 42 42 42 86 86 86 6 6 6 116 116 116
55695-106 106 106 6 6 6 70 70 70 149 149 149
55696-128 128 128 18 18 18 38 38 38 54 54 54
55697-221 221 221 106 106 106 2 2 6 14 14 14
55698- 46 46 46 190 190 190 198 198 198 2 2 6
55699- 2 2 6 2 2 6 2 2 6 2 2 6
55700- 74 74 74 62 62 62 22 22 22 6 6 6
55701- 0 0 0 0 0 0 0 0 0 0 0 0
55702- 0 0 0 0 0 0 0 0 0 0 0 0
55703- 0 0 0 0 0 0 0 0 0 0 0 0
55704- 0 0 0 0 0 0 0 0 0 0 0 0
55705- 0 0 0 0 0 0 0 0 0 0 0 0
55706- 0 0 0 0 0 0 0 0 0 0 0 0
55707- 0 0 0 0 0 0 0 0 1 0 0 0
55708- 0 0 1 0 0 0 0 0 1 0 0 0
55709- 0 0 0 0 0 0 0 0 0 0 0 0
55710- 0 0 0 0 0 0 0 0 0 0 0 0
55711- 0 0 0 0 0 0 0 0 0 0 0 0
55712- 0 0 0 0 0 0 0 0 0 0 0 0
55713- 0 0 0 0 0 0 0 0 0 14 14 14
55714- 42 42 42 94 94 94 14 14 14 101 101 101
55715-128 128 128 2 2 6 18 18 18 116 116 116
55716-118 98 46 121 92 8 121 92 8 98 78 10
55717-162 162 162 106 106 106 2 2 6 2 2 6
55718- 2 2 6 195 195 195 195 195 195 6 6 6
55719- 2 2 6 2 2 6 2 2 6 2 2 6
55720- 74 74 74 62 62 62 22 22 22 6 6 6
55721- 0 0 0 0 0 0 0 0 0 0 0 0
55722- 0 0 0 0 0 0 0 0 0 0 0 0
55723- 0 0 0 0 0 0 0 0 0 0 0 0
55724- 0 0 0 0 0 0 0 0 0 0 0 0
55725- 0 0 0 0 0 0 0 0 0 0 0 0
55726- 0 0 0 0 0 0 0 0 0 0 0 0
55727- 0 0 0 0 0 0 0 0 1 0 0 1
55728- 0 0 1 0 0 0 0 0 1 0 0 0
55729- 0 0 0 0 0 0 0 0 0 0 0 0
55730- 0 0 0 0 0 0 0 0 0 0 0 0
55731- 0 0 0 0 0 0 0 0 0 0 0 0
55732- 0 0 0 0 0 0 0 0 0 0 0 0
55733- 0 0 0 0 0 0 0 0 0 10 10 10
55734- 38 38 38 90 90 90 14 14 14 58 58 58
55735-210 210 210 26 26 26 54 38 6 154 114 10
55736-226 170 11 236 186 11 225 175 15 184 144 12
55737-215 174 15 175 146 61 37 26 9 2 2 6
55738- 70 70 70 246 246 246 138 138 138 2 2 6
55739- 2 2 6 2 2 6 2 2 6 2 2 6
55740- 70 70 70 66 66 66 26 26 26 6 6 6
55741- 0 0 0 0 0 0 0 0 0 0 0 0
55742- 0 0 0 0 0 0 0 0 0 0 0 0
55743- 0 0 0 0 0 0 0 0 0 0 0 0
55744- 0 0 0 0 0 0 0 0 0 0 0 0
55745- 0 0 0 0 0 0 0 0 0 0 0 0
55746- 0 0 0 0 0 0 0 0 0 0 0 0
55747- 0 0 0 0 0 0 0 0 0 0 0 0
55748- 0 0 0 0 0 0 0 0 0 0 0 0
55749- 0 0 0 0 0 0 0 0 0 0 0 0
55750- 0 0 0 0 0 0 0 0 0 0 0 0
55751- 0 0 0 0 0 0 0 0 0 0 0 0
55752- 0 0 0 0 0 0 0 0 0 0 0 0
55753- 0 0 0 0 0 0 0 0 0 10 10 10
55754- 38 38 38 86 86 86 14 14 14 10 10 10
55755-195 195 195 188 164 115 192 133 9 225 175 15
55756-239 182 13 234 190 10 232 195 16 232 200 30
55757-245 207 45 241 208 19 232 195 16 184 144 12
55758-218 194 134 211 206 186 42 42 42 2 2 6
55759- 2 2 6 2 2 6 2 2 6 2 2 6
55760- 50 50 50 74 74 74 30 30 30 6 6 6
55761- 0 0 0 0 0 0 0 0 0 0 0 0
55762- 0 0 0 0 0 0 0 0 0 0 0 0
55763- 0 0 0 0 0 0 0 0 0 0 0 0
55764- 0 0 0 0 0 0 0 0 0 0 0 0
55765- 0 0 0 0 0 0 0 0 0 0 0 0
55766- 0 0 0 0 0 0 0 0 0 0 0 0
55767- 0 0 0 0 0 0 0 0 0 0 0 0
55768- 0 0 0 0 0 0 0 0 0 0 0 0
55769- 0 0 0 0 0 0 0 0 0 0 0 0
55770- 0 0 0 0 0 0 0 0 0 0 0 0
55771- 0 0 0 0 0 0 0 0 0 0 0 0
55772- 0 0 0 0 0 0 0 0 0 0 0 0
55773- 0 0 0 0 0 0 0 0 0 10 10 10
55774- 34 34 34 86 86 86 14 14 14 2 2 6
55775-121 87 25 192 133 9 219 162 10 239 182 13
55776-236 186 11 232 195 16 241 208 19 244 214 54
55777-246 218 60 246 218 38 246 215 20 241 208 19
55778-241 208 19 226 184 13 121 87 25 2 2 6
55779- 2 2 6 2 2 6 2 2 6 2 2 6
55780- 50 50 50 82 82 82 34 34 34 10 10 10
55781- 0 0 0 0 0 0 0 0 0 0 0 0
55782- 0 0 0 0 0 0 0 0 0 0 0 0
55783- 0 0 0 0 0 0 0 0 0 0 0 0
55784- 0 0 0 0 0 0 0 0 0 0 0 0
55785- 0 0 0 0 0 0 0 0 0 0 0 0
55786- 0 0 0 0 0 0 0 0 0 0 0 0
55787- 0 0 0 0 0 0 0 0 0 0 0 0
55788- 0 0 0 0 0 0 0 0 0 0 0 0
55789- 0 0 0 0 0 0 0 0 0 0 0 0
55790- 0 0 0 0 0 0 0 0 0 0 0 0
55791- 0 0 0 0 0 0 0 0 0 0 0 0
55792- 0 0 0 0 0 0 0 0 0 0 0 0
55793- 0 0 0 0 0 0 0 0 0 10 10 10
55794- 34 34 34 82 82 82 30 30 30 61 42 6
55795-180 123 7 206 145 10 230 174 11 239 182 13
55796-234 190 10 238 202 15 241 208 19 246 218 74
55797-246 218 38 246 215 20 246 215 20 246 215 20
55798-226 184 13 215 174 15 184 144 12 6 6 6
55799- 2 2 6 2 2 6 2 2 6 2 2 6
55800- 26 26 26 94 94 94 42 42 42 14 14 14
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- 0 0 0 0 0 0 0 0 0 0 0 0
55805- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10
55814- 30 30 30 78 78 78 50 50 50 104 69 6
55815-192 133 9 216 158 10 236 178 12 236 186 11
55816-232 195 16 241 208 19 244 214 54 245 215 43
55817-246 215 20 246 215 20 241 208 19 198 155 10
55818-200 144 11 216 158 10 156 118 10 2 2 6
55819- 2 2 6 2 2 6 2 2 6 2 2 6
55820- 6 6 6 90 90 90 54 54 54 18 18 18
55821- 6 6 6 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 0 0 0 0 0 0 0 0 0
55824- 0 0 0 0 0 0 0 0 0 0 0 0
55825- 0 0 0 0 0 0 0 0 0 0 0 0
55826- 0 0 0 0 0 0 0 0 0 0 0 0
55827- 0 0 0 0 0 0 0 0 0 0 0 0
55828- 0 0 0 0 0 0 0 0 0 0 0 0
55829- 0 0 0 0 0 0 0 0 0 0 0 0
55830- 0 0 0 0 0 0 0 0 0 0 0 0
55831- 0 0 0 0 0 0 0 0 0 0 0 0
55832- 0 0 0 0 0 0 0 0 0 0 0 0
55833- 0 0 0 0 0 0 0 0 0 10 10 10
55834- 30 30 30 78 78 78 46 46 46 22 22 22
55835-137 92 6 210 162 10 239 182 13 238 190 10
55836-238 202 15 241 208 19 246 215 20 246 215 20
55837-241 208 19 203 166 17 185 133 11 210 150 10
55838-216 158 10 210 150 10 102 78 10 2 2 6
55839- 6 6 6 54 54 54 14 14 14 2 2 6
55840- 2 2 6 62 62 62 74 74 74 30 30 30
55841- 10 10 10 0 0 0 0 0 0 0 0 0
55842- 0 0 0 0 0 0 0 0 0 0 0 0
55843- 0 0 0 0 0 0 0 0 0 0 0 0
55844- 0 0 0 0 0 0 0 0 0 0 0 0
55845- 0 0 0 0 0 0 0 0 0 0 0 0
55846- 0 0 0 0 0 0 0 0 0 0 0 0
55847- 0 0 0 0 0 0 0 0 0 0 0 0
55848- 0 0 0 0 0 0 0 0 0 0 0 0
55849- 0 0 0 0 0 0 0 0 0 0 0 0
55850- 0 0 0 0 0 0 0 0 0 0 0 0
55851- 0 0 0 0 0 0 0 0 0 0 0 0
55852- 0 0 0 0 0 0 0 0 0 0 0 0
55853- 0 0 0 0 0 0 0 0 0 10 10 10
55854- 34 34 34 78 78 78 50 50 50 6 6 6
55855- 94 70 30 139 102 15 190 146 13 226 184 13
55856-232 200 30 232 195 16 215 174 15 190 146 13
55857-168 122 10 192 133 9 210 150 10 213 154 11
55858-202 150 34 182 157 106 101 98 89 2 2 6
55859- 2 2 6 78 78 78 116 116 116 58 58 58
55860- 2 2 6 22 22 22 90 90 90 46 46 46
55861- 18 18 18 6 6 6 0 0 0 0 0 0
55862- 0 0 0 0 0 0 0 0 0 0 0 0
55863- 0 0 0 0 0 0 0 0 0 0 0 0
55864- 0 0 0 0 0 0 0 0 0 0 0 0
55865- 0 0 0 0 0 0 0 0 0 0 0 0
55866- 0 0 0 0 0 0 0 0 0 0 0 0
55867- 0 0 0 0 0 0 0 0 0 0 0 0
55868- 0 0 0 0 0 0 0 0 0 0 0 0
55869- 0 0 0 0 0 0 0 0 0 0 0 0
55870- 0 0 0 0 0 0 0 0 0 0 0 0
55871- 0 0 0 0 0 0 0 0 0 0 0 0
55872- 0 0 0 0 0 0 0 0 0 0 0 0
55873- 0 0 0 0 0 0 0 0 0 10 10 10
55874- 38 38 38 86 86 86 50 50 50 6 6 6
55875-128 128 128 174 154 114 156 107 11 168 122 10
55876-198 155 10 184 144 12 197 138 11 200 144 11
55877-206 145 10 206 145 10 197 138 11 188 164 115
55878-195 195 195 198 198 198 174 174 174 14 14 14
55879- 2 2 6 22 22 22 116 116 116 116 116 116
55880- 22 22 22 2 2 6 74 74 74 70 70 70
55881- 30 30 30 10 10 10 0 0 0 0 0 0
55882- 0 0 0 0 0 0 0 0 0 0 0 0
55883- 0 0 0 0 0 0 0 0 0 0 0 0
55884- 0 0 0 0 0 0 0 0 0 0 0 0
55885- 0 0 0 0 0 0 0 0 0 0 0 0
55886- 0 0 0 0 0 0 0 0 0 0 0 0
55887- 0 0 0 0 0 0 0 0 0 0 0 0
55888- 0 0 0 0 0 0 0 0 0 0 0 0
55889- 0 0 0 0 0 0 0 0 0 0 0 0
55890- 0 0 0 0 0 0 0 0 0 0 0 0
55891- 0 0 0 0 0 0 0 0 0 0 0 0
55892- 0 0 0 0 0 0 0 0 0 0 0 0
55893- 0 0 0 0 0 0 6 6 6 18 18 18
55894- 50 50 50 101 101 101 26 26 26 10 10 10
55895-138 138 138 190 190 190 174 154 114 156 107 11
55896-197 138 11 200 144 11 197 138 11 192 133 9
55897-180 123 7 190 142 34 190 178 144 187 187 187
55898-202 202 202 221 221 221 214 214 214 66 66 66
55899- 2 2 6 2 2 6 50 50 50 62 62 62
55900- 6 6 6 2 2 6 10 10 10 90 90 90
55901- 50 50 50 18 18 18 6 6 6 0 0 0
55902- 0 0 0 0 0 0 0 0 0 0 0 0
55903- 0 0 0 0 0 0 0 0 0 0 0 0
55904- 0 0 0 0 0 0 0 0 0 0 0 0
55905- 0 0 0 0 0 0 0 0 0 0 0 0
55906- 0 0 0 0 0 0 0 0 0 0 0 0
55907- 0 0 0 0 0 0 0 0 0 0 0 0
55908- 0 0 0 0 0 0 0 0 0 0 0 0
55909- 0 0 0 0 0 0 0 0 0 0 0 0
55910- 0 0 0 0 0 0 0 0 0 0 0 0
55911- 0 0 0 0 0 0 0 0 0 0 0 0
55912- 0 0 0 0 0 0 0 0 0 0 0 0
55913- 0 0 0 0 0 0 10 10 10 34 34 34
55914- 74 74 74 74 74 74 2 2 6 6 6 6
55915-144 144 144 198 198 198 190 190 190 178 166 146
55916-154 121 60 156 107 11 156 107 11 168 124 44
55917-174 154 114 187 187 187 190 190 190 210 210 210
55918-246 246 246 253 253 253 253 253 253 182 182 182
55919- 6 6 6 2 2 6 2 2 6 2 2 6
55920- 2 2 6 2 2 6 2 2 6 62 62 62
55921- 74 74 74 34 34 34 14 14 14 0 0 0
55922- 0 0 0 0 0 0 0 0 0 0 0 0
55923- 0 0 0 0 0 0 0 0 0 0 0 0
55924- 0 0 0 0 0 0 0 0 0 0 0 0
55925- 0 0 0 0 0 0 0 0 0 0 0 0
55926- 0 0 0 0 0 0 0 0 0 0 0 0
55927- 0 0 0 0 0 0 0 0 0 0 0 0
55928- 0 0 0 0 0 0 0 0 0 0 0 0
55929- 0 0 0 0 0 0 0 0 0 0 0 0
55930- 0 0 0 0 0 0 0 0 0 0 0 0
55931- 0 0 0 0 0 0 0 0 0 0 0 0
55932- 0 0 0 0 0 0 0 0 0 0 0 0
55933- 0 0 0 10 10 10 22 22 22 54 54 54
55934- 94 94 94 18 18 18 2 2 6 46 46 46
55935-234 234 234 221 221 221 190 190 190 190 190 190
55936-190 190 190 187 187 187 187 187 187 190 190 190
55937-190 190 190 195 195 195 214 214 214 242 242 242
55938-253 253 253 253 253 253 253 253 253 253 253 253
55939- 82 82 82 2 2 6 2 2 6 2 2 6
55940- 2 2 6 2 2 6 2 2 6 14 14 14
55941- 86 86 86 54 54 54 22 22 22 6 6 6
55942- 0 0 0 0 0 0 0 0 0 0 0 0
55943- 0 0 0 0 0 0 0 0 0 0 0 0
55944- 0 0 0 0 0 0 0 0 0 0 0 0
55945- 0 0 0 0 0 0 0 0 0 0 0 0
55946- 0 0 0 0 0 0 0 0 0 0 0 0
55947- 0 0 0 0 0 0 0 0 0 0 0 0
55948- 0 0 0 0 0 0 0 0 0 0 0 0
55949- 0 0 0 0 0 0 0 0 0 0 0 0
55950- 0 0 0 0 0 0 0 0 0 0 0 0
55951- 0 0 0 0 0 0 0 0 0 0 0 0
55952- 0 0 0 0 0 0 0 0 0 0 0 0
55953- 6 6 6 18 18 18 46 46 46 90 90 90
55954- 46 46 46 18 18 18 6 6 6 182 182 182
55955-253 253 253 246 246 246 206 206 206 190 190 190
55956-190 190 190 190 190 190 190 190 190 190 190 190
55957-206 206 206 231 231 231 250 250 250 253 253 253
55958-253 253 253 253 253 253 253 253 253 253 253 253
55959-202 202 202 14 14 14 2 2 6 2 2 6
55960- 2 2 6 2 2 6 2 2 6 2 2 6
55961- 42 42 42 86 86 86 42 42 42 18 18 18
55962- 6 6 6 0 0 0 0 0 0 0 0 0
55963- 0 0 0 0 0 0 0 0 0 0 0 0
55964- 0 0 0 0 0 0 0 0 0 0 0 0
55965- 0 0 0 0 0 0 0 0 0 0 0 0
55966- 0 0 0 0 0 0 0 0 0 0 0 0
55967- 0 0 0 0 0 0 0 0 0 0 0 0
55968- 0 0 0 0 0 0 0 0 0 0 0 0
55969- 0 0 0 0 0 0 0 0 0 0 0 0
55970- 0 0 0 0 0 0 0 0 0 0 0 0
55971- 0 0 0 0 0 0 0 0 0 0 0 0
55972- 0 0 0 0 0 0 0 0 0 6 6 6
55973- 14 14 14 38 38 38 74 74 74 66 66 66
55974- 2 2 6 6 6 6 90 90 90 250 250 250
55975-253 253 253 253 253 253 238 238 238 198 198 198
55976-190 190 190 190 190 190 195 195 195 221 221 221
55977-246 246 246 253 253 253 253 253 253 253 253 253
55978-253 253 253 253 253 253 253 253 253 253 253 253
55979-253 253 253 82 82 82 2 2 6 2 2 6
55980- 2 2 6 2 2 6 2 2 6 2 2 6
55981- 2 2 6 78 78 78 70 70 70 34 34 34
55982- 14 14 14 6 6 6 0 0 0 0 0 0
55983- 0 0 0 0 0 0 0 0 0 0 0 0
55984- 0 0 0 0 0 0 0 0 0 0 0 0
55985- 0 0 0 0 0 0 0 0 0 0 0 0
55986- 0 0 0 0 0 0 0 0 0 0 0 0
55987- 0 0 0 0 0 0 0 0 0 0 0 0
55988- 0 0 0 0 0 0 0 0 0 0 0 0
55989- 0 0 0 0 0 0 0 0 0 0 0 0
55990- 0 0 0 0 0 0 0 0 0 0 0 0
55991- 0 0 0 0 0 0 0 0 0 0 0 0
55992- 0 0 0 0 0 0 0 0 0 14 14 14
55993- 34 34 34 66 66 66 78 78 78 6 6 6
55994- 2 2 6 18 18 18 218 218 218 253 253 253
55995-253 253 253 253 253 253 253 253 253 246 246 246
55996-226 226 226 231 231 231 246 246 246 253 253 253
55997-253 253 253 253 253 253 253 253 253 253 253 253
55998-253 253 253 253 253 253 253 253 253 253 253 253
55999-253 253 253 178 178 178 2 2 6 2 2 6
56000- 2 2 6 2 2 6 2 2 6 2 2 6
56001- 2 2 6 18 18 18 90 90 90 62 62 62
56002- 30 30 30 10 10 10 0 0 0 0 0 0
56003- 0 0 0 0 0 0 0 0 0 0 0 0
56004- 0 0 0 0 0 0 0 0 0 0 0 0
56005- 0 0 0 0 0 0 0 0 0 0 0 0
56006- 0 0 0 0 0 0 0 0 0 0 0 0
56007- 0 0 0 0 0 0 0 0 0 0 0 0
56008- 0 0 0 0 0 0 0 0 0 0 0 0
56009- 0 0 0 0 0 0 0 0 0 0 0 0
56010- 0 0 0 0 0 0 0 0 0 0 0 0
56011- 0 0 0 0 0 0 0 0 0 0 0 0
56012- 0 0 0 0 0 0 10 10 10 26 26 26
56013- 58 58 58 90 90 90 18 18 18 2 2 6
56014- 2 2 6 110 110 110 253 253 253 253 253 253
56015-253 253 253 253 253 253 253 253 253 253 253 253
56016-250 250 250 253 253 253 253 253 253 253 253 253
56017-253 253 253 253 253 253 253 253 253 253 253 253
56018-253 253 253 253 253 253 253 253 253 253 253 253
56019-253 253 253 231 231 231 18 18 18 2 2 6
56020- 2 2 6 2 2 6 2 2 6 2 2 6
56021- 2 2 6 2 2 6 18 18 18 94 94 94
56022- 54 54 54 26 26 26 10 10 10 0 0 0
56023- 0 0 0 0 0 0 0 0 0 0 0 0
56024- 0 0 0 0 0 0 0 0 0 0 0 0
56025- 0 0 0 0 0 0 0 0 0 0 0 0
56026- 0 0 0 0 0 0 0 0 0 0 0 0
56027- 0 0 0 0 0 0 0 0 0 0 0 0
56028- 0 0 0 0 0 0 0 0 0 0 0 0
56029- 0 0 0 0 0 0 0 0 0 0 0 0
56030- 0 0 0 0 0 0 0 0 0 0 0 0
56031- 0 0 0 0 0 0 0 0 0 0 0 0
56032- 0 0 0 6 6 6 22 22 22 50 50 50
56033- 90 90 90 26 26 26 2 2 6 2 2 6
56034- 14 14 14 195 195 195 250 250 250 253 253 253
56035-253 253 253 253 253 253 253 253 253 253 253 253
56036-253 253 253 253 253 253 253 253 253 253 253 253
56037-253 253 253 253 253 253 253 253 253 253 253 253
56038-253 253 253 253 253 253 253 253 253 253 253 253
56039-250 250 250 242 242 242 54 54 54 2 2 6
56040- 2 2 6 2 2 6 2 2 6 2 2 6
56041- 2 2 6 2 2 6 2 2 6 38 38 38
56042- 86 86 86 50 50 50 22 22 22 6 6 6
56043- 0 0 0 0 0 0 0 0 0 0 0 0
56044- 0 0 0 0 0 0 0 0 0 0 0 0
56045- 0 0 0 0 0 0 0 0 0 0 0 0
56046- 0 0 0 0 0 0 0 0 0 0 0 0
56047- 0 0 0 0 0 0 0 0 0 0 0 0
56048- 0 0 0 0 0 0 0 0 0 0 0 0
56049- 0 0 0 0 0 0 0 0 0 0 0 0
56050- 0 0 0 0 0 0 0 0 0 0 0 0
56051- 0 0 0 0 0 0 0 0 0 0 0 0
56052- 6 6 6 14 14 14 38 38 38 82 82 82
56053- 34 34 34 2 2 6 2 2 6 2 2 6
56054- 42 42 42 195 195 195 246 246 246 253 253 253
56055-253 253 253 253 253 253 253 253 253 250 250 250
56056-242 242 242 242 242 242 250 250 250 253 253 253
56057-253 253 253 253 253 253 253 253 253 253 253 253
56058-253 253 253 250 250 250 246 246 246 238 238 238
56059-226 226 226 231 231 231 101 101 101 6 6 6
56060- 2 2 6 2 2 6 2 2 6 2 2 6
56061- 2 2 6 2 2 6 2 2 6 2 2 6
56062- 38 38 38 82 82 82 42 42 42 14 14 14
56063- 6 6 6 0 0 0 0 0 0 0 0 0
56064- 0 0 0 0 0 0 0 0 0 0 0 0
56065- 0 0 0 0 0 0 0 0 0 0 0 0
56066- 0 0 0 0 0 0 0 0 0 0 0 0
56067- 0 0 0 0 0 0 0 0 0 0 0 0
56068- 0 0 0 0 0 0 0 0 0 0 0 0
56069- 0 0 0 0 0 0 0 0 0 0 0 0
56070- 0 0 0 0 0 0 0 0 0 0 0 0
56071- 0 0 0 0 0 0 0 0 0 0 0 0
56072- 10 10 10 26 26 26 62 62 62 66 66 66
56073- 2 2 6 2 2 6 2 2 6 6 6 6
56074- 70 70 70 170 170 170 206 206 206 234 234 234
56075-246 246 246 250 250 250 250 250 250 238 238 238
56076-226 226 226 231 231 231 238 238 238 250 250 250
56077-250 250 250 250 250 250 246 246 246 231 231 231
56078-214 214 214 206 206 206 202 202 202 202 202 202
56079-198 198 198 202 202 202 182 182 182 18 18 18
56080- 2 2 6 2 2 6 2 2 6 2 2 6
56081- 2 2 6 2 2 6 2 2 6 2 2 6
56082- 2 2 6 62 62 62 66 66 66 30 30 30
56083- 10 10 10 0 0 0 0 0 0 0 0 0
56084- 0 0 0 0 0 0 0 0 0 0 0 0
56085- 0 0 0 0 0 0 0 0 0 0 0 0
56086- 0 0 0 0 0 0 0 0 0 0 0 0
56087- 0 0 0 0 0 0 0 0 0 0 0 0
56088- 0 0 0 0 0 0 0 0 0 0 0 0
56089- 0 0 0 0 0 0 0 0 0 0 0 0
56090- 0 0 0 0 0 0 0 0 0 0 0 0
56091- 0 0 0 0 0 0 0 0 0 0 0 0
56092- 14 14 14 42 42 42 82 82 82 18 18 18
56093- 2 2 6 2 2 6 2 2 6 10 10 10
56094- 94 94 94 182 182 182 218 218 218 242 242 242
56095-250 250 250 253 253 253 253 253 253 250 250 250
56096-234 234 234 253 253 253 253 253 253 253 253 253
56097-253 253 253 253 253 253 253 253 253 246 246 246
56098-238 238 238 226 226 226 210 210 210 202 202 202
56099-195 195 195 195 195 195 210 210 210 158 158 158
56100- 6 6 6 14 14 14 50 50 50 14 14 14
56101- 2 2 6 2 2 6 2 2 6 2 2 6
56102- 2 2 6 6 6 6 86 86 86 46 46 46
56103- 18 18 18 6 6 6 0 0 0 0 0 0
56104- 0 0 0 0 0 0 0 0 0 0 0 0
56105- 0 0 0 0 0 0 0 0 0 0 0 0
56106- 0 0 0 0 0 0 0 0 0 0 0 0
56107- 0 0 0 0 0 0 0 0 0 0 0 0
56108- 0 0 0 0 0 0 0 0 0 0 0 0
56109- 0 0 0 0 0 0 0 0 0 0 0 0
56110- 0 0 0 0 0 0 0 0 0 0 0 0
56111- 0 0 0 0 0 0 0 0 0 6 6 6
56112- 22 22 22 54 54 54 70 70 70 2 2 6
56113- 2 2 6 10 10 10 2 2 6 22 22 22
56114-166 166 166 231 231 231 250 250 250 253 253 253
56115-253 253 253 253 253 253 253 253 253 250 250 250
56116-242 242 242 253 253 253 253 253 253 253 253 253
56117-253 253 253 253 253 253 253 253 253 253 253 253
56118-253 253 253 253 253 253 253 253 253 246 246 246
56119-231 231 231 206 206 206 198 198 198 226 226 226
56120- 94 94 94 2 2 6 6 6 6 38 38 38
56121- 30 30 30 2 2 6 2 2 6 2 2 6
56122- 2 2 6 2 2 6 62 62 62 66 66 66
56123- 26 26 26 10 10 10 0 0 0 0 0 0
56124- 0 0 0 0 0 0 0 0 0 0 0 0
56125- 0 0 0 0 0 0 0 0 0 0 0 0
56126- 0 0 0 0 0 0 0 0 0 0 0 0
56127- 0 0 0 0 0 0 0 0 0 0 0 0
56128- 0 0 0 0 0 0 0 0 0 0 0 0
56129- 0 0 0 0 0 0 0 0 0 0 0 0
56130- 0 0 0 0 0 0 0 0 0 0 0 0
56131- 0 0 0 0 0 0 0 0 0 10 10 10
56132- 30 30 30 74 74 74 50 50 50 2 2 6
56133- 26 26 26 26 26 26 2 2 6 106 106 106
56134-238 238 238 253 253 253 253 253 253 253 253 253
56135-253 253 253 253 253 253 253 253 253 253 253 253
56136-253 253 253 253 253 253 253 253 253 253 253 253
56137-253 253 253 253 253 253 253 253 253 253 253 253
56138-253 253 253 253 253 253 253 253 253 253 253 253
56139-253 253 253 246 246 246 218 218 218 202 202 202
56140-210 210 210 14 14 14 2 2 6 2 2 6
56141- 30 30 30 22 22 22 2 2 6 2 2 6
56142- 2 2 6 2 2 6 18 18 18 86 86 86
56143- 42 42 42 14 14 14 0 0 0 0 0 0
56144- 0 0 0 0 0 0 0 0 0 0 0 0
56145- 0 0 0 0 0 0 0 0 0 0 0 0
56146- 0 0 0 0 0 0 0 0 0 0 0 0
56147- 0 0 0 0 0 0 0 0 0 0 0 0
56148- 0 0 0 0 0 0 0 0 0 0 0 0
56149- 0 0 0 0 0 0 0 0 0 0 0 0
56150- 0 0 0 0 0 0 0 0 0 0 0 0
56151- 0 0 0 0 0 0 0 0 0 14 14 14
56152- 42 42 42 90 90 90 22 22 22 2 2 6
56153- 42 42 42 2 2 6 18 18 18 218 218 218
56154-253 253 253 253 253 253 253 253 253 253 253 253
56155-253 253 253 253 253 253 253 253 253 253 253 253
56156-253 253 253 253 253 253 253 253 253 253 253 253
56157-253 253 253 253 253 253 253 253 253 253 253 253
56158-253 253 253 253 253 253 253 253 253 253 253 253
56159-253 253 253 253 253 253 250 250 250 221 221 221
56160-218 218 218 101 101 101 2 2 6 14 14 14
56161- 18 18 18 38 38 38 10 10 10 2 2 6
56162- 2 2 6 2 2 6 2 2 6 78 78 78
56163- 58 58 58 22 22 22 6 6 6 0 0 0
56164- 0 0 0 0 0 0 0 0 0 0 0 0
56165- 0 0 0 0 0 0 0 0 0 0 0 0
56166- 0 0 0 0 0 0 0 0 0 0 0 0
56167- 0 0 0 0 0 0 0 0 0 0 0 0
56168- 0 0 0 0 0 0 0 0 0 0 0 0
56169- 0 0 0 0 0 0 0 0 0 0 0 0
56170- 0 0 0 0 0 0 0 0 0 0 0 0
56171- 0 0 0 0 0 0 6 6 6 18 18 18
56172- 54 54 54 82 82 82 2 2 6 26 26 26
56173- 22 22 22 2 2 6 123 123 123 253 253 253
56174-253 253 253 253 253 253 253 253 253 253 253 253
56175-253 253 253 253 253 253 253 253 253 253 253 253
56176-253 253 253 253 253 253 253 253 253 253 253 253
56177-253 253 253 253 253 253 253 253 253 253 253 253
56178-253 253 253 253 253 253 253 253 253 253 253 253
56179-253 253 253 253 253 253 253 253 253 250 250 250
56180-238 238 238 198 198 198 6 6 6 38 38 38
56181- 58 58 58 26 26 26 38 38 38 2 2 6
56182- 2 2 6 2 2 6 2 2 6 46 46 46
56183- 78 78 78 30 30 30 10 10 10 0 0 0
56184- 0 0 0 0 0 0 0 0 0 0 0 0
56185- 0 0 0 0 0 0 0 0 0 0 0 0
56186- 0 0 0 0 0 0 0 0 0 0 0 0
56187- 0 0 0 0 0 0 0 0 0 0 0 0
56188- 0 0 0 0 0 0 0 0 0 0 0 0
56189- 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 10 10 10 30 30 30
56192- 74 74 74 58 58 58 2 2 6 42 42 42
56193- 2 2 6 22 22 22 231 231 231 253 253 253
56194-253 253 253 253 253 253 253 253 253 253 253 253
56195-253 253 253 253 253 253 253 253 253 250 250 250
56196-253 253 253 253 253 253 253 253 253 253 253 253
56197-253 253 253 253 253 253 253 253 253 253 253 253
56198-253 253 253 253 253 253 253 253 253 253 253 253
56199-253 253 253 253 253 253 253 253 253 253 253 253
56200-253 253 253 246 246 246 46 46 46 38 38 38
56201- 42 42 42 14 14 14 38 38 38 14 14 14
56202- 2 2 6 2 2 6 2 2 6 6 6 6
56203- 86 86 86 46 46 46 14 14 14 0 0 0
56204- 0 0 0 0 0 0 0 0 0 0 0 0
56205- 0 0 0 0 0 0 0 0 0 0 0 0
56206- 0 0 0 0 0 0 0 0 0 0 0 0
56207- 0 0 0 0 0 0 0 0 0 0 0 0
56208- 0 0 0 0 0 0 0 0 0 0 0 0
56209- 0 0 0 0 0 0 0 0 0 0 0 0
56210- 0 0 0 0 0 0 0 0 0 0 0 0
56211- 0 0 0 6 6 6 14 14 14 42 42 42
56212- 90 90 90 18 18 18 18 18 18 26 26 26
56213- 2 2 6 116 116 116 253 253 253 253 253 253
56214-253 253 253 253 253 253 253 253 253 253 253 253
56215-253 253 253 253 253 253 250 250 250 238 238 238
56216-253 253 253 253 253 253 253 253 253 253 253 253
56217-253 253 253 253 253 253 253 253 253 253 253 253
56218-253 253 253 253 253 253 253 253 253 253 253 253
56219-253 253 253 253 253 253 253 253 253 253 253 253
56220-253 253 253 253 253 253 94 94 94 6 6 6
56221- 2 2 6 2 2 6 10 10 10 34 34 34
56222- 2 2 6 2 2 6 2 2 6 2 2 6
56223- 74 74 74 58 58 58 22 22 22 6 6 6
56224- 0 0 0 0 0 0 0 0 0 0 0 0
56225- 0 0 0 0 0 0 0 0 0 0 0 0
56226- 0 0 0 0 0 0 0 0 0 0 0 0
56227- 0 0 0 0 0 0 0 0 0 0 0 0
56228- 0 0 0 0 0 0 0 0 0 0 0 0
56229- 0 0 0 0 0 0 0 0 0 0 0 0
56230- 0 0 0 0 0 0 0 0 0 0 0 0
56231- 0 0 0 10 10 10 26 26 26 66 66 66
56232- 82 82 82 2 2 6 38 38 38 6 6 6
56233- 14 14 14 210 210 210 253 253 253 253 253 253
56234-253 253 253 253 253 253 253 253 253 253 253 253
56235-253 253 253 253 253 253 246 246 246 242 242 242
56236-253 253 253 253 253 253 253 253 253 253 253 253
56237-253 253 253 253 253 253 253 253 253 253 253 253
56238-253 253 253 253 253 253 253 253 253 253 253 253
56239-253 253 253 253 253 253 253 253 253 253 253 253
56240-253 253 253 253 253 253 144 144 144 2 2 6
56241- 2 2 6 2 2 6 2 2 6 46 46 46
56242- 2 2 6 2 2 6 2 2 6 2 2 6
56243- 42 42 42 74 74 74 30 30 30 10 10 10
56244- 0 0 0 0 0 0 0 0 0 0 0 0
56245- 0 0 0 0 0 0 0 0 0 0 0 0
56246- 0 0 0 0 0 0 0 0 0 0 0 0
56247- 0 0 0 0 0 0 0 0 0 0 0 0
56248- 0 0 0 0 0 0 0 0 0 0 0 0
56249- 0 0 0 0 0 0 0 0 0 0 0 0
56250- 0 0 0 0 0 0 0 0 0 0 0 0
56251- 6 6 6 14 14 14 42 42 42 90 90 90
56252- 26 26 26 6 6 6 42 42 42 2 2 6
56253- 74 74 74 250 250 250 253 253 253 253 253 253
56254-253 253 253 253 253 253 253 253 253 253 253 253
56255-253 253 253 253 253 253 242 242 242 242 242 242
56256-253 253 253 253 253 253 253 253 253 253 253 253
56257-253 253 253 253 253 253 253 253 253 253 253 253
56258-253 253 253 253 253 253 253 253 253 253 253 253
56259-253 253 253 253 253 253 253 253 253 253 253 253
56260-253 253 253 253 253 253 182 182 182 2 2 6
56261- 2 2 6 2 2 6 2 2 6 46 46 46
56262- 2 2 6 2 2 6 2 2 6 2 2 6
56263- 10 10 10 86 86 86 38 38 38 10 10 10
56264- 0 0 0 0 0 0 0 0 0 0 0 0
56265- 0 0 0 0 0 0 0 0 0 0 0 0
56266- 0 0 0 0 0 0 0 0 0 0 0 0
56267- 0 0 0 0 0 0 0 0 0 0 0 0
56268- 0 0 0 0 0 0 0 0 0 0 0 0
56269- 0 0 0 0 0 0 0 0 0 0 0 0
56270- 0 0 0 0 0 0 0 0 0 0 0 0
56271- 10 10 10 26 26 26 66 66 66 82 82 82
56272- 2 2 6 22 22 22 18 18 18 2 2 6
56273-149 149 149 253 253 253 253 253 253 253 253 253
56274-253 253 253 253 253 253 253 253 253 253 253 253
56275-253 253 253 253 253 253 234 234 234 242 242 242
56276-253 253 253 253 253 253 253 253 253 253 253 253
56277-253 253 253 253 253 253 253 253 253 253 253 253
56278-253 253 253 253 253 253 253 253 253 253 253 253
56279-253 253 253 253 253 253 253 253 253 253 253 253
56280-253 253 253 253 253 253 206 206 206 2 2 6
56281- 2 2 6 2 2 6 2 2 6 38 38 38
56282- 2 2 6 2 2 6 2 2 6 2 2 6
56283- 6 6 6 86 86 86 46 46 46 14 14 14
56284- 0 0 0 0 0 0 0 0 0 0 0 0
56285- 0 0 0 0 0 0 0 0 0 0 0 0
56286- 0 0 0 0 0 0 0 0 0 0 0 0
56287- 0 0 0 0 0 0 0 0 0 0 0 0
56288- 0 0 0 0 0 0 0 0 0 0 0 0
56289- 0 0 0 0 0 0 0 0 0 0 0 0
56290- 0 0 0 0 0 0 0 0 0 6 6 6
56291- 18 18 18 46 46 46 86 86 86 18 18 18
56292- 2 2 6 34 34 34 10 10 10 6 6 6
56293-210 210 210 253 253 253 253 253 253 253 253 253
56294-253 253 253 253 253 253 253 253 253 253 253 253
56295-253 253 253 253 253 253 234 234 234 242 242 242
56296-253 253 253 253 253 253 253 253 253 253 253 253
56297-253 253 253 253 253 253 253 253 253 253 253 253
56298-253 253 253 253 253 253 253 253 253 253 253 253
56299-253 253 253 253 253 253 253 253 253 253 253 253
56300-253 253 253 253 253 253 221 221 221 6 6 6
56301- 2 2 6 2 2 6 6 6 6 30 30 30
56302- 2 2 6 2 2 6 2 2 6 2 2 6
56303- 2 2 6 82 82 82 54 54 54 18 18 18
56304- 6 6 6 0 0 0 0 0 0 0 0 0
56305- 0 0 0 0 0 0 0 0 0 0 0 0
56306- 0 0 0 0 0 0 0 0 0 0 0 0
56307- 0 0 0 0 0 0 0 0 0 0 0 0
56308- 0 0 0 0 0 0 0 0 0 0 0 0
56309- 0 0 0 0 0 0 0 0 0 0 0 0
56310- 0 0 0 0 0 0 0 0 0 10 10 10
56311- 26 26 26 66 66 66 62 62 62 2 2 6
56312- 2 2 6 38 38 38 10 10 10 26 26 26
56313-238 238 238 253 253 253 253 253 253 253 253 253
56314-253 253 253 253 253 253 253 253 253 253 253 253
56315-253 253 253 253 253 253 231 231 231 238 238 238
56316-253 253 253 253 253 253 253 253 253 253 253 253
56317-253 253 253 253 253 253 253 253 253 253 253 253
56318-253 253 253 253 253 253 253 253 253 253 253 253
56319-253 253 253 253 253 253 253 253 253 253 253 253
56320-253 253 253 253 253 253 231 231 231 6 6 6
56321- 2 2 6 2 2 6 10 10 10 30 30 30
56322- 2 2 6 2 2 6 2 2 6 2 2 6
56323- 2 2 6 66 66 66 58 58 58 22 22 22
56324- 6 6 6 0 0 0 0 0 0 0 0 0
56325- 0 0 0 0 0 0 0 0 0 0 0 0
56326- 0 0 0 0 0 0 0 0 0 0 0 0
56327- 0 0 0 0 0 0 0 0 0 0 0 0
56328- 0 0 0 0 0 0 0 0 0 0 0 0
56329- 0 0 0 0 0 0 0 0 0 0 0 0
56330- 0 0 0 0 0 0 0 0 0 10 10 10
56331- 38 38 38 78 78 78 6 6 6 2 2 6
56332- 2 2 6 46 46 46 14 14 14 42 42 42
56333-246 246 246 253 253 253 253 253 253 253 253 253
56334-253 253 253 253 253 253 253 253 253 253 253 253
56335-253 253 253 253 253 253 231 231 231 242 242 242
56336-253 253 253 253 253 253 253 253 253 253 253 253
56337-253 253 253 253 253 253 253 253 253 253 253 253
56338-253 253 253 253 253 253 253 253 253 253 253 253
56339-253 253 253 253 253 253 253 253 253 253 253 253
56340-253 253 253 253 253 253 234 234 234 10 10 10
56341- 2 2 6 2 2 6 22 22 22 14 14 14
56342- 2 2 6 2 2 6 2 2 6 2 2 6
56343- 2 2 6 66 66 66 62 62 62 22 22 22
56344- 6 6 6 0 0 0 0 0 0 0 0 0
56345- 0 0 0 0 0 0 0 0 0 0 0 0
56346- 0 0 0 0 0 0 0 0 0 0 0 0
56347- 0 0 0 0 0 0 0 0 0 0 0 0
56348- 0 0 0 0 0 0 0 0 0 0 0 0
56349- 0 0 0 0 0 0 0 0 0 0 0 0
56350- 0 0 0 0 0 0 6 6 6 18 18 18
56351- 50 50 50 74 74 74 2 2 6 2 2 6
56352- 14 14 14 70 70 70 34 34 34 62 62 62
56353-250 250 250 253 253 253 253 253 253 253 253 253
56354-253 253 253 253 253 253 253 253 253 253 253 253
56355-253 253 253 253 253 253 231 231 231 246 246 246
56356-253 253 253 253 253 253 253 253 253 253 253 253
56357-253 253 253 253 253 253 253 253 253 253 253 253
56358-253 253 253 253 253 253 253 253 253 253 253 253
56359-253 253 253 253 253 253 253 253 253 253 253 253
56360-253 253 253 253 253 253 234 234 234 14 14 14
56361- 2 2 6 2 2 6 30 30 30 2 2 6
56362- 2 2 6 2 2 6 2 2 6 2 2 6
56363- 2 2 6 66 66 66 62 62 62 22 22 22
56364- 6 6 6 0 0 0 0 0 0 0 0 0
56365- 0 0 0 0 0 0 0 0 0 0 0 0
56366- 0 0 0 0 0 0 0 0 0 0 0 0
56367- 0 0 0 0 0 0 0 0 0 0 0 0
56368- 0 0 0 0 0 0 0 0 0 0 0 0
56369- 0 0 0 0 0 0 0 0 0 0 0 0
56370- 0 0 0 0 0 0 6 6 6 18 18 18
56371- 54 54 54 62 62 62 2 2 6 2 2 6
56372- 2 2 6 30 30 30 46 46 46 70 70 70
56373-250 250 250 253 253 253 253 253 253 253 253 253
56374-253 253 253 253 253 253 253 253 253 253 253 253
56375-253 253 253 253 253 253 231 231 231 246 246 246
56376-253 253 253 253 253 253 253 253 253 253 253 253
56377-253 253 253 253 253 253 253 253 253 253 253 253
56378-253 253 253 253 253 253 253 253 253 253 253 253
56379-253 253 253 253 253 253 253 253 253 253 253 253
56380-253 253 253 253 253 253 226 226 226 10 10 10
56381- 2 2 6 6 6 6 30 30 30 2 2 6
56382- 2 2 6 2 2 6 2 2 6 2 2 6
56383- 2 2 6 66 66 66 58 58 58 22 22 22
56384- 6 6 6 0 0 0 0 0 0 0 0 0
56385- 0 0 0 0 0 0 0 0 0 0 0 0
56386- 0 0 0 0 0 0 0 0 0 0 0 0
56387- 0 0 0 0 0 0 0 0 0 0 0 0
56388- 0 0 0 0 0 0 0 0 0 0 0 0
56389- 0 0 0 0 0 0 0 0 0 0 0 0
56390- 0 0 0 0 0 0 6 6 6 22 22 22
56391- 58 58 58 62 62 62 2 2 6 2 2 6
56392- 2 2 6 2 2 6 30 30 30 78 78 78
56393-250 250 250 253 253 253 253 253 253 253 253 253
56394-253 253 253 253 253 253 253 253 253 253 253 253
56395-253 253 253 253 253 253 231 231 231 246 246 246
56396-253 253 253 253 253 253 253 253 253 253 253 253
56397-253 253 253 253 253 253 253 253 253 253 253 253
56398-253 253 253 253 253 253 253 253 253 253 253 253
56399-253 253 253 253 253 253 253 253 253 253 253 253
56400-253 253 253 253 253 253 206 206 206 2 2 6
56401- 22 22 22 34 34 34 18 14 6 22 22 22
56402- 26 26 26 18 18 18 6 6 6 2 2 6
56403- 2 2 6 82 82 82 54 54 54 18 18 18
56404- 6 6 6 0 0 0 0 0 0 0 0 0
56405- 0 0 0 0 0 0 0 0 0 0 0 0
56406- 0 0 0 0 0 0 0 0 0 0 0 0
56407- 0 0 0 0 0 0 0 0 0 0 0 0
56408- 0 0 0 0 0 0 0 0 0 0 0 0
56409- 0 0 0 0 0 0 0 0 0 0 0 0
56410- 0 0 0 0 0 0 6 6 6 26 26 26
56411- 62 62 62 106 106 106 74 54 14 185 133 11
56412-210 162 10 121 92 8 6 6 6 62 62 62
56413-238 238 238 253 253 253 253 253 253 253 253 253
56414-253 253 253 253 253 253 253 253 253 253 253 253
56415-253 253 253 253 253 253 231 231 231 246 246 246
56416-253 253 253 253 253 253 253 253 253 253 253 253
56417-253 253 253 253 253 253 253 253 253 253 253 253
56418-253 253 253 253 253 253 253 253 253 253 253 253
56419-253 253 253 253 253 253 253 253 253 253 253 253
56420-253 253 253 253 253 253 158 158 158 18 18 18
56421- 14 14 14 2 2 6 2 2 6 2 2 6
56422- 6 6 6 18 18 18 66 66 66 38 38 38
56423- 6 6 6 94 94 94 50 50 50 18 18 18
56424- 6 6 6 0 0 0 0 0 0 0 0 0
56425- 0 0 0 0 0 0 0 0 0 0 0 0
56426- 0 0 0 0 0 0 0 0 0 0 0 0
56427- 0 0 0 0 0 0 0 0 0 0 0 0
56428- 0 0 0 0 0 0 0 0 0 0 0 0
56429- 0 0 0 0 0 0 0 0 0 6 6 6
56430- 10 10 10 10 10 10 18 18 18 38 38 38
56431- 78 78 78 142 134 106 216 158 10 242 186 14
56432-246 190 14 246 190 14 156 118 10 10 10 10
56433- 90 90 90 238 238 238 253 253 253 253 253 253
56434-253 253 253 253 253 253 253 253 253 253 253 253
56435-253 253 253 253 253 253 231 231 231 250 250 250
56436-253 253 253 253 253 253 253 253 253 253 253 253
56437-253 253 253 253 253 253 253 253 253 253 253 253
56438-253 253 253 253 253 253 253 253 253 253 253 253
56439-253 253 253 253 253 253 253 253 253 246 230 190
56440-238 204 91 238 204 91 181 142 44 37 26 9
56441- 2 2 6 2 2 6 2 2 6 2 2 6
56442- 2 2 6 2 2 6 38 38 38 46 46 46
56443- 26 26 26 106 106 106 54 54 54 18 18 18
56444- 6 6 6 0 0 0 0 0 0 0 0 0
56445- 0 0 0 0 0 0 0 0 0 0 0 0
56446- 0 0 0 0 0 0 0 0 0 0 0 0
56447- 0 0 0 0 0 0 0 0 0 0 0 0
56448- 0 0 0 0 0 0 0 0 0 0 0 0
56449- 0 0 0 6 6 6 14 14 14 22 22 22
56450- 30 30 30 38 38 38 50 50 50 70 70 70
56451-106 106 106 190 142 34 226 170 11 242 186 14
56452-246 190 14 246 190 14 246 190 14 154 114 10
56453- 6 6 6 74 74 74 226 226 226 253 253 253
56454-253 253 253 253 253 253 253 253 253 253 253 253
56455-253 253 253 253 253 253 231 231 231 250 250 250
56456-253 253 253 253 253 253 253 253 253 253 253 253
56457-253 253 253 253 253 253 253 253 253 253 253 253
56458-253 253 253 253 253 253 253 253 253 253 253 253
56459-253 253 253 253 253 253 253 253 253 228 184 62
56460-241 196 14 241 208 19 232 195 16 38 30 10
56461- 2 2 6 2 2 6 2 2 6 2 2 6
56462- 2 2 6 6 6 6 30 30 30 26 26 26
56463-203 166 17 154 142 90 66 66 66 26 26 26
56464- 6 6 6 0 0 0 0 0 0 0 0 0
56465- 0 0 0 0 0 0 0 0 0 0 0 0
56466- 0 0 0 0 0 0 0 0 0 0 0 0
56467- 0 0 0 0 0 0 0 0 0 0 0 0
56468- 0 0 0 0 0 0 0 0 0 0 0 0
56469- 6 6 6 18 18 18 38 38 38 58 58 58
56470- 78 78 78 86 86 86 101 101 101 123 123 123
56471-175 146 61 210 150 10 234 174 13 246 186 14
56472-246 190 14 246 190 14 246 190 14 238 190 10
56473-102 78 10 2 2 6 46 46 46 198 198 198
56474-253 253 253 253 253 253 253 253 253 253 253 253
56475-253 253 253 253 253 253 234 234 234 242 242 242
56476-253 253 253 253 253 253 253 253 253 253 253 253
56477-253 253 253 253 253 253 253 253 253 253 253 253
56478-253 253 253 253 253 253 253 253 253 253 253 253
56479-253 253 253 253 253 253 253 253 253 224 178 62
56480-242 186 14 241 196 14 210 166 10 22 18 6
56481- 2 2 6 2 2 6 2 2 6 2 2 6
56482- 2 2 6 2 2 6 6 6 6 121 92 8
56483-238 202 15 232 195 16 82 82 82 34 34 34
56484- 10 10 10 0 0 0 0 0 0 0 0 0
56485- 0 0 0 0 0 0 0 0 0 0 0 0
56486- 0 0 0 0 0 0 0 0 0 0 0 0
56487- 0 0 0 0 0 0 0 0 0 0 0 0
56488- 0 0 0 0 0 0 0 0 0 0 0 0
56489- 14 14 14 38 38 38 70 70 70 154 122 46
56490-190 142 34 200 144 11 197 138 11 197 138 11
56491-213 154 11 226 170 11 242 186 14 246 190 14
56492-246 190 14 246 190 14 246 190 14 246 190 14
56493-225 175 15 46 32 6 2 2 6 22 22 22
56494-158 158 158 250 250 250 253 253 253 253 253 253
56495-253 253 253 253 253 253 253 253 253 253 253 253
56496-253 253 253 253 253 253 253 253 253 253 253 253
56497-253 253 253 253 253 253 253 253 253 253 253 253
56498-253 253 253 253 253 253 253 253 253 253 253 253
56499-253 253 253 250 250 250 242 242 242 224 178 62
56500-239 182 13 236 186 11 213 154 11 46 32 6
56501- 2 2 6 2 2 6 2 2 6 2 2 6
56502- 2 2 6 2 2 6 61 42 6 225 175 15
56503-238 190 10 236 186 11 112 100 78 42 42 42
56504- 14 14 14 0 0 0 0 0 0 0 0 0
56505- 0 0 0 0 0 0 0 0 0 0 0 0
56506- 0 0 0 0 0 0 0 0 0 0 0 0
56507- 0 0 0 0 0 0 0 0 0 0 0 0
56508- 0 0 0 0 0 0 0 0 0 6 6 6
56509- 22 22 22 54 54 54 154 122 46 213 154 11
56510-226 170 11 230 174 11 226 170 11 226 170 11
56511-236 178 12 242 186 14 246 190 14 246 190 14
56512-246 190 14 246 190 14 246 190 14 246 190 14
56513-241 196 14 184 144 12 10 10 10 2 2 6
56514- 6 6 6 116 116 116 242 242 242 253 253 253
56515-253 253 253 253 253 253 253 253 253 253 253 253
56516-253 253 253 253 253 253 253 253 253 253 253 253
56517-253 253 253 253 253 253 253 253 253 253 253 253
56518-253 253 253 253 253 253 253 253 253 253 253 253
56519-253 253 253 231 231 231 198 198 198 214 170 54
56520-236 178 12 236 178 12 210 150 10 137 92 6
56521- 18 14 6 2 2 6 2 2 6 2 2 6
56522- 6 6 6 70 47 6 200 144 11 236 178 12
56523-239 182 13 239 182 13 124 112 88 58 58 58
56524- 22 22 22 6 6 6 0 0 0 0 0 0
56525- 0 0 0 0 0 0 0 0 0 0 0 0
56526- 0 0 0 0 0 0 0 0 0 0 0 0
56527- 0 0 0 0 0 0 0 0 0 0 0 0
56528- 0 0 0 0 0 0 0 0 0 10 10 10
56529- 30 30 30 70 70 70 180 133 36 226 170 11
56530-239 182 13 242 186 14 242 186 14 246 186 14
56531-246 190 14 246 190 14 246 190 14 246 190 14
56532-246 190 14 246 190 14 246 190 14 246 190 14
56533-246 190 14 232 195 16 98 70 6 2 2 6
56534- 2 2 6 2 2 6 66 66 66 221 221 221
56535-253 253 253 253 253 253 253 253 253 253 253 253
56536-253 253 253 253 253 253 253 253 253 253 253 253
56537-253 253 253 253 253 253 253 253 253 253 253 253
56538-253 253 253 253 253 253 253 253 253 253 253 253
56539-253 253 253 206 206 206 198 198 198 214 166 58
56540-230 174 11 230 174 11 216 158 10 192 133 9
56541-163 110 8 116 81 8 102 78 10 116 81 8
56542-167 114 7 197 138 11 226 170 11 239 182 13
56543-242 186 14 242 186 14 162 146 94 78 78 78
56544- 34 34 34 14 14 14 6 6 6 0 0 0
56545- 0 0 0 0 0 0 0 0 0 0 0 0
56546- 0 0 0 0 0 0 0 0 0 0 0 0
56547- 0 0 0 0 0 0 0 0 0 0 0 0
56548- 0 0 0 0 0 0 0 0 0 6 6 6
56549- 30 30 30 78 78 78 190 142 34 226 170 11
56550-239 182 13 246 190 14 246 190 14 246 190 14
56551-246 190 14 246 190 14 246 190 14 246 190 14
56552-246 190 14 246 190 14 246 190 14 246 190 14
56553-246 190 14 241 196 14 203 166 17 22 18 6
56554- 2 2 6 2 2 6 2 2 6 38 38 38
56555-218 218 218 253 253 253 253 253 253 253 253 253
56556-253 253 253 253 253 253 253 253 253 253 253 253
56557-253 253 253 253 253 253 253 253 253 253 253 253
56558-253 253 253 253 253 253 253 253 253 253 253 253
56559-250 250 250 206 206 206 198 198 198 202 162 69
56560-226 170 11 236 178 12 224 166 10 210 150 10
56561-200 144 11 197 138 11 192 133 9 197 138 11
56562-210 150 10 226 170 11 242 186 14 246 190 14
56563-246 190 14 246 186 14 225 175 15 124 112 88
56564- 62 62 62 30 30 30 14 14 14 6 6 6
56565- 0 0 0 0 0 0 0 0 0 0 0 0
56566- 0 0 0 0 0 0 0 0 0 0 0 0
56567- 0 0 0 0 0 0 0 0 0 0 0 0
56568- 0 0 0 0 0 0 0 0 0 10 10 10
56569- 30 30 30 78 78 78 174 135 50 224 166 10
56570-239 182 13 246 190 14 246 190 14 246 190 14
56571-246 190 14 246 190 14 246 190 14 246 190 14
56572-246 190 14 246 190 14 246 190 14 246 190 14
56573-246 190 14 246 190 14 241 196 14 139 102 15
56574- 2 2 6 2 2 6 2 2 6 2 2 6
56575- 78 78 78 250 250 250 253 253 253 253 253 253
56576-253 253 253 253 253 253 253 253 253 253 253 253
56577-253 253 253 253 253 253 253 253 253 253 253 253
56578-253 253 253 253 253 253 253 253 253 253 253 253
56579-250 250 250 214 214 214 198 198 198 190 150 46
56580-219 162 10 236 178 12 234 174 13 224 166 10
56581-216 158 10 213 154 11 213 154 11 216 158 10
56582-226 170 11 239 182 13 246 190 14 246 190 14
56583-246 190 14 246 190 14 242 186 14 206 162 42
56584-101 101 101 58 58 58 30 30 30 14 14 14
56585- 6 6 6 0 0 0 0 0 0 0 0 0
56586- 0 0 0 0 0 0 0 0 0 0 0 0
56587- 0 0 0 0 0 0 0 0 0 0 0 0
56588- 0 0 0 0 0 0 0 0 0 10 10 10
56589- 30 30 30 74 74 74 174 135 50 216 158 10
56590-236 178 12 246 190 14 246 190 14 246 190 14
56591-246 190 14 246 190 14 246 190 14 246 190 14
56592-246 190 14 246 190 14 246 190 14 246 190 14
56593-246 190 14 246 190 14 241 196 14 226 184 13
56594- 61 42 6 2 2 6 2 2 6 2 2 6
56595- 22 22 22 238 238 238 253 253 253 253 253 253
56596-253 253 253 253 253 253 253 253 253 253 253 253
56597-253 253 253 253 253 253 253 253 253 253 253 253
56598-253 253 253 253 253 253 253 253 253 253 253 253
56599-253 253 253 226 226 226 187 187 187 180 133 36
56600-216 158 10 236 178 12 239 182 13 236 178 12
56601-230 174 11 226 170 11 226 170 11 230 174 11
56602-236 178 12 242 186 14 246 190 14 246 190 14
56603-246 190 14 246 190 14 246 186 14 239 182 13
56604-206 162 42 106 106 106 66 66 66 34 34 34
56605- 14 14 14 6 6 6 0 0 0 0 0 0
56606- 0 0 0 0 0 0 0 0 0 0 0 0
56607- 0 0 0 0 0 0 0 0 0 0 0 0
56608- 0 0 0 0 0 0 0 0 0 6 6 6
56609- 26 26 26 70 70 70 163 133 67 213 154 11
56610-236 178 12 246 190 14 246 190 14 246 190 14
56611-246 190 14 246 190 14 246 190 14 246 190 14
56612-246 190 14 246 190 14 246 190 14 246 190 14
56613-246 190 14 246 190 14 246 190 14 241 196 14
56614-190 146 13 18 14 6 2 2 6 2 2 6
56615- 46 46 46 246 246 246 253 253 253 253 253 253
56616-253 253 253 253 253 253 253 253 253 253 253 253
56617-253 253 253 253 253 253 253 253 253 253 253 253
56618-253 253 253 253 253 253 253 253 253 253 253 253
56619-253 253 253 221 221 221 86 86 86 156 107 11
56620-216 158 10 236 178 12 242 186 14 246 186 14
56621-242 186 14 239 182 13 239 182 13 242 186 14
56622-242 186 14 246 186 14 246 190 14 246 190 14
56623-246 190 14 246 190 14 246 190 14 246 190 14
56624-242 186 14 225 175 15 142 122 72 66 66 66
56625- 30 30 30 10 10 10 0 0 0 0 0 0
56626- 0 0 0 0 0 0 0 0 0 0 0 0
56627- 0 0 0 0 0 0 0 0 0 0 0 0
56628- 0 0 0 0 0 0 0 0 0 6 6 6
56629- 26 26 26 70 70 70 163 133 67 210 150 10
56630-236 178 12 246 190 14 246 190 14 246 190 14
56631-246 190 14 246 190 14 246 190 14 246 190 14
56632-246 190 14 246 190 14 246 190 14 246 190 14
56633-246 190 14 246 190 14 246 190 14 246 190 14
56634-232 195 16 121 92 8 34 34 34 106 106 106
56635-221 221 221 253 253 253 253 253 253 253 253 253
56636-253 253 253 253 253 253 253 253 253 253 253 253
56637-253 253 253 253 253 253 253 253 253 253 253 253
56638-253 253 253 253 253 253 253 253 253 253 253 253
56639-242 242 242 82 82 82 18 14 6 163 110 8
56640-216 158 10 236 178 12 242 186 14 246 190 14
56641-246 190 14 246 190 14 246 190 14 246 190 14
56642-246 190 14 246 190 14 246 190 14 246 190 14
56643-246 190 14 246 190 14 246 190 14 246 190 14
56644-246 190 14 246 190 14 242 186 14 163 133 67
56645- 46 46 46 18 18 18 6 6 6 0 0 0
56646- 0 0 0 0 0 0 0 0 0 0 0 0
56647- 0 0 0 0 0 0 0 0 0 0 0 0
56648- 0 0 0 0 0 0 0 0 0 10 10 10
56649- 30 30 30 78 78 78 163 133 67 210 150 10
56650-236 178 12 246 186 14 246 190 14 246 190 14
56651-246 190 14 246 190 14 246 190 14 246 190 14
56652-246 190 14 246 190 14 246 190 14 246 190 14
56653-246 190 14 246 190 14 246 190 14 246 190 14
56654-241 196 14 215 174 15 190 178 144 253 253 253
56655-253 253 253 253 253 253 253 253 253 253 253 253
56656-253 253 253 253 253 253 253 253 253 253 253 253
56657-253 253 253 253 253 253 253 253 253 253 253 253
56658-253 253 253 253 253 253 253 253 253 218 218 218
56659- 58 58 58 2 2 6 22 18 6 167 114 7
56660-216 158 10 236 178 12 246 186 14 246 190 14
56661-246 190 14 246 190 14 246 190 14 246 190 14
56662-246 190 14 246 190 14 246 190 14 246 190 14
56663-246 190 14 246 190 14 246 190 14 246 190 14
56664-246 190 14 246 186 14 242 186 14 190 150 46
56665- 54 54 54 22 22 22 6 6 6 0 0 0
56666- 0 0 0 0 0 0 0 0 0 0 0 0
56667- 0 0 0 0 0 0 0 0 0 0 0 0
56668- 0 0 0 0 0 0 0 0 0 14 14 14
56669- 38 38 38 86 86 86 180 133 36 213 154 11
56670-236 178 12 246 186 14 246 190 14 246 190 14
56671-246 190 14 246 190 14 246 190 14 246 190 14
56672-246 190 14 246 190 14 246 190 14 246 190 14
56673-246 190 14 246 190 14 246 190 14 246 190 14
56674-246 190 14 232 195 16 190 146 13 214 214 214
56675-253 253 253 253 253 253 253 253 253 253 253 253
56676-253 253 253 253 253 253 253 253 253 253 253 253
56677-253 253 253 253 253 253 253 253 253 253 253 253
56678-253 253 253 250 250 250 170 170 170 26 26 26
56679- 2 2 6 2 2 6 37 26 9 163 110 8
56680-219 162 10 239 182 13 246 186 14 246 190 14
56681-246 190 14 246 190 14 246 190 14 246 190 14
56682-246 190 14 246 190 14 246 190 14 246 190 14
56683-246 190 14 246 190 14 246 190 14 246 190 14
56684-246 186 14 236 178 12 224 166 10 142 122 72
56685- 46 46 46 18 18 18 6 6 6 0 0 0
56686- 0 0 0 0 0 0 0 0 0 0 0 0
56687- 0 0 0 0 0 0 0 0 0 0 0 0
56688- 0 0 0 0 0 0 6 6 6 18 18 18
56689- 50 50 50 109 106 95 192 133 9 224 166 10
56690-242 186 14 246 190 14 246 190 14 246 190 14
56691-246 190 14 246 190 14 246 190 14 246 190 14
56692-246 190 14 246 190 14 246 190 14 246 190 14
56693-246 190 14 246 190 14 246 190 14 246 190 14
56694-242 186 14 226 184 13 210 162 10 142 110 46
56695-226 226 226 253 253 253 253 253 253 253 253 253
56696-253 253 253 253 253 253 253 253 253 253 253 253
56697-253 253 253 253 253 253 253 253 253 253 253 253
56698-198 198 198 66 66 66 2 2 6 2 2 6
56699- 2 2 6 2 2 6 50 34 6 156 107 11
56700-219 162 10 239 182 13 246 186 14 246 190 14
56701-246 190 14 246 190 14 246 190 14 246 190 14
56702-246 190 14 246 190 14 246 190 14 246 190 14
56703-246 190 14 246 190 14 246 190 14 242 186 14
56704-234 174 13 213 154 11 154 122 46 66 66 66
56705- 30 30 30 10 10 10 0 0 0 0 0 0
56706- 0 0 0 0 0 0 0 0 0 0 0 0
56707- 0 0 0 0 0 0 0 0 0 0 0 0
56708- 0 0 0 0 0 0 6 6 6 22 22 22
56709- 58 58 58 154 121 60 206 145 10 234 174 13
56710-242 186 14 246 186 14 246 190 14 246 190 14
56711-246 190 14 246 190 14 246 190 14 246 190 14
56712-246 190 14 246 190 14 246 190 14 246 190 14
56713-246 190 14 246 190 14 246 190 14 246 190 14
56714-246 186 14 236 178 12 210 162 10 163 110 8
56715- 61 42 6 138 138 138 218 218 218 250 250 250
56716-253 253 253 253 253 253 253 253 253 250 250 250
56717-242 242 242 210 210 210 144 144 144 66 66 66
56718- 6 6 6 2 2 6 2 2 6 2 2 6
56719- 2 2 6 2 2 6 61 42 6 163 110 8
56720-216 158 10 236 178 12 246 190 14 246 190 14
56721-246 190 14 246 190 14 246 190 14 246 190 14
56722-246 190 14 246 190 14 246 190 14 246 190 14
56723-246 190 14 239 182 13 230 174 11 216 158 10
56724-190 142 34 124 112 88 70 70 70 38 38 38
56725- 18 18 18 6 6 6 0 0 0 0 0 0
56726- 0 0 0 0 0 0 0 0 0 0 0 0
56727- 0 0 0 0 0 0 0 0 0 0 0 0
56728- 0 0 0 0 0 0 6 6 6 22 22 22
56729- 62 62 62 168 124 44 206 145 10 224 166 10
56730-236 178 12 239 182 13 242 186 14 242 186 14
56731-246 186 14 246 190 14 246 190 14 246 190 14
56732-246 190 14 246 190 14 246 190 14 246 190 14
56733-246 190 14 246 190 14 246 190 14 246 190 14
56734-246 190 14 236 178 12 216 158 10 175 118 6
56735- 80 54 7 2 2 6 6 6 6 30 30 30
56736- 54 54 54 62 62 62 50 50 50 38 38 38
56737- 14 14 14 2 2 6 2 2 6 2 2 6
56738- 2 2 6 2 2 6 2 2 6 2 2 6
56739- 2 2 6 6 6 6 80 54 7 167 114 7
56740-213 154 11 236 178 12 246 190 14 246 190 14
56741-246 190 14 246 190 14 246 190 14 246 190 14
56742-246 190 14 242 186 14 239 182 13 239 182 13
56743-230 174 11 210 150 10 174 135 50 124 112 88
56744- 82 82 82 54 54 54 34 34 34 18 18 18
56745- 6 6 6 0 0 0 0 0 0 0 0 0
56746- 0 0 0 0 0 0 0 0 0 0 0 0
56747- 0 0 0 0 0 0 0 0 0 0 0 0
56748- 0 0 0 0 0 0 6 6 6 18 18 18
56749- 50 50 50 158 118 36 192 133 9 200 144 11
56750-216 158 10 219 162 10 224 166 10 226 170 11
56751-230 174 11 236 178 12 239 182 13 239 182 13
56752-242 186 14 246 186 14 246 190 14 246 190 14
56753-246 190 14 246 190 14 246 190 14 246 190 14
56754-246 186 14 230 174 11 210 150 10 163 110 8
56755-104 69 6 10 10 10 2 2 6 2 2 6
56756- 2 2 6 2 2 6 2 2 6 2 2 6
56757- 2 2 6 2 2 6 2 2 6 2 2 6
56758- 2 2 6 2 2 6 2 2 6 2 2 6
56759- 2 2 6 6 6 6 91 60 6 167 114 7
56760-206 145 10 230 174 11 242 186 14 246 190 14
56761-246 190 14 246 190 14 246 186 14 242 186 14
56762-239 182 13 230 174 11 224 166 10 213 154 11
56763-180 133 36 124 112 88 86 86 86 58 58 58
56764- 38 38 38 22 22 22 10 10 10 6 6 6
56765- 0 0 0 0 0 0 0 0 0 0 0 0
56766- 0 0 0 0 0 0 0 0 0 0 0 0
56767- 0 0 0 0 0 0 0 0 0 0 0 0
56768- 0 0 0 0 0 0 0 0 0 14 14 14
56769- 34 34 34 70 70 70 138 110 50 158 118 36
56770-167 114 7 180 123 7 192 133 9 197 138 11
56771-200 144 11 206 145 10 213 154 11 219 162 10
56772-224 166 10 230 174 11 239 182 13 242 186 14
56773-246 186 14 246 186 14 246 186 14 246 186 14
56774-239 182 13 216 158 10 185 133 11 152 99 6
56775-104 69 6 18 14 6 2 2 6 2 2 6
56776- 2 2 6 2 2 6 2 2 6 2 2 6
56777- 2 2 6 2 2 6 2 2 6 2 2 6
56778- 2 2 6 2 2 6 2 2 6 2 2 6
56779- 2 2 6 6 6 6 80 54 7 152 99 6
56780-192 133 9 219 162 10 236 178 12 239 182 13
56781-246 186 14 242 186 14 239 182 13 236 178 12
56782-224 166 10 206 145 10 192 133 9 154 121 60
56783- 94 94 94 62 62 62 42 42 42 22 22 22
56784- 14 14 14 6 6 6 0 0 0 0 0 0
56785- 0 0 0 0 0 0 0 0 0 0 0 0
56786- 0 0 0 0 0 0 0 0 0 0 0 0
56787- 0 0 0 0 0 0 0 0 0 0 0 0
56788- 0 0 0 0 0 0 0 0 0 6 6 6
56789- 18 18 18 34 34 34 58 58 58 78 78 78
56790-101 98 89 124 112 88 142 110 46 156 107 11
56791-163 110 8 167 114 7 175 118 6 180 123 7
56792-185 133 11 197 138 11 210 150 10 219 162 10
56793-226 170 11 236 178 12 236 178 12 234 174 13
56794-219 162 10 197 138 11 163 110 8 130 83 6
56795- 91 60 6 10 10 10 2 2 6 2 2 6
56796- 18 18 18 38 38 38 38 38 38 38 38 38
56797- 38 38 38 38 38 38 38 38 38 38 38 38
56798- 38 38 38 38 38 38 26 26 26 2 2 6
56799- 2 2 6 6 6 6 70 47 6 137 92 6
56800-175 118 6 200 144 11 219 162 10 230 174 11
56801-234 174 13 230 174 11 219 162 10 210 150 10
56802-192 133 9 163 110 8 124 112 88 82 82 82
56803- 50 50 50 30 30 30 14 14 14 6 6 6
56804- 0 0 0 0 0 0 0 0 0 0 0 0
56805- 0 0 0 0 0 0 0 0 0 0 0 0
56806- 0 0 0 0 0 0 0 0 0 0 0 0
56807- 0 0 0 0 0 0 0 0 0 0 0 0
56808- 0 0 0 0 0 0 0 0 0 0 0 0
56809- 6 6 6 14 14 14 22 22 22 34 34 34
56810- 42 42 42 58 58 58 74 74 74 86 86 86
56811-101 98 89 122 102 70 130 98 46 121 87 25
56812-137 92 6 152 99 6 163 110 8 180 123 7
56813-185 133 11 197 138 11 206 145 10 200 144 11
56814-180 123 7 156 107 11 130 83 6 104 69 6
56815- 50 34 6 54 54 54 110 110 110 101 98 89
56816- 86 86 86 82 82 82 78 78 78 78 78 78
56817- 78 78 78 78 78 78 78 78 78 78 78 78
56818- 78 78 78 82 82 82 86 86 86 94 94 94
56819-106 106 106 101 101 101 86 66 34 124 80 6
56820-156 107 11 180 123 7 192 133 9 200 144 11
56821-206 145 10 200 144 11 192 133 9 175 118 6
56822-139 102 15 109 106 95 70 70 70 42 42 42
56823- 22 22 22 10 10 10 0 0 0 0 0 0
56824- 0 0 0 0 0 0 0 0 0 0 0 0
56825- 0 0 0 0 0 0 0 0 0 0 0 0
56826- 0 0 0 0 0 0 0 0 0 0 0 0
56827- 0 0 0 0 0 0 0 0 0 0 0 0
56828- 0 0 0 0 0 0 0 0 0 0 0 0
56829- 0 0 0 0 0 0 6 6 6 10 10 10
56830- 14 14 14 22 22 22 30 30 30 38 38 38
56831- 50 50 50 62 62 62 74 74 74 90 90 90
56832-101 98 89 112 100 78 121 87 25 124 80 6
56833-137 92 6 152 99 6 152 99 6 152 99 6
56834-138 86 6 124 80 6 98 70 6 86 66 30
56835-101 98 89 82 82 82 58 58 58 46 46 46
56836- 38 38 38 34 34 34 34 34 34 34 34 34
56837- 34 34 34 34 34 34 34 34 34 34 34 34
56838- 34 34 34 34 34 34 38 38 38 42 42 42
56839- 54 54 54 82 82 82 94 86 76 91 60 6
56840-134 86 6 156 107 11 167 114 7 175 118 6
56841-175 118 6 167 114 7 152 99 6 121 87 25
56842-101 98 89 62 62 62 34 34 34 18 18 18
56843- 6 6 6 0 0 0 0 0 0 0 0 0
56844- 0 0 0 0 0 0 0 0 0 0 0 0
56845- 0 0 0 0 0 0 0 0 0 0 0 0
56846- 0 0 0 0 0 0 0 0 0 0 0 0
56847- 0 0 0 0 0 0 0 0 0 0 0 0
56848- 0 0 0 0 0 0 0 0 0 0 0 0
56849- 0 0 0 0 0 0 0 0 0 0 0 0
56850- 0 0 0 6 6 6 6 6 6 10 10 10
56851- 18 18 18 22 22 22 30 30 30 42 42 42
56852- 50 50 50 66 66 66 86 86 86 101 98 89
56853-106 86 58 98 70 6 104 69 6 104 69 6
56854-104 69 6 91 60 6 82 62 34 90 90 90
56855- 62 62 62 38 38 38 22 22 22 14 14 14
56856- 10 10 10 10 10 10 10 10 10 10 10 10
56857- 10 10 10 10 10 10 6 6 6 10 10 10
56858- 10 10 10 10 10 10 10 10 10 14 14 14
56859- 22 22 22 42 42 42 70 70 70 89 81 66
56860- 80 54 7 104 69 6 124 80 6 137 92 6
56861-134 86 6 116 81 8 100 82 52 86 86 86
56862- 58 58 58 30 30 30 14 14 14 6 6 6
56863- 0 0 0 0 0 0 0 0 0 0 0 0
56864- 0 0 0 0 0 0 0 0 0 0 0 0
56865- 0 0 0 0 0 0 0 0 0 0 0 0
56866- 0 0 0 0 0 0 0 0 0 0 0 0
56867- 0 0 0 0 0 0 0 0 0 0 0 0
56868- 0 0 0 0 0 0 0 0 0 0 0 0
56869- 0 0 0 0 0 0 0 0 0 0 0 0
56870- 0 0 0 0 0 0 0 0 0 0 0 0
56871- 0 0 0 6 6 6 10 10 10 14 14 14
56872- 18 18 18 26 26 26 38 38 38 54 54 54
56873- 70 70 70 86 86 86 94 86 76 89 81 66
56874- 89 81 66 86 86 86 74 74 74 50 50 50
56875- 30 30 30 14 14 14 6 6 6 0 0 0
56876- 0 0 0 0 0 0 0 0 0 0 0 0
56877- 0 0 0 0 0 0 0 0 0 0 0 0
56878- 0 0 0 0 0 0 0 0 0 0 0 0
56879- 6 6 6 18 18 18 34 34 34 58 58 58
56880- 82 82 82 89 81 66 89 81 66 89 81 66
56881- 94 86 66 94 86 76 74 74 74 50 50 50
56882- 26 26 26 14 14 14 6 6 6 0 0 0
56883- 0 0 0 0 0 0 0 0 0 0 0 0
56884- 0 0 0 0 0 0 0 0 0 0 0 0
56885- 0 0 0 0 0 0 0 0 0 0 0 0
56886- 0 0 0 0 0 0 0 0 0 0 0 0
56887- 0 0 0 0 0 0 0 0 0 0 0 0
56888- 0 0 0 0 0 0 0 0 0 0 0 0
56889- 0 0 0 0 0 0 0 0 0 0 0 0
56890- 0 0 0 0 0 0 0 0 0 0 0 0
56891- 0 0 0 0 0 0 0 0 0 0 0 0
56892- 6 6 6 6 6 6 14 14 14 18 18 18
56893- 30 30 30 38 38 38 46 46 46 54 54 54
56894- 50 50 50 42 42 42 30 30 30 18 18 18
56895- 10 10 10 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 0 0 0
56898- 0 0 0 0 0 0 0 0 0 0 0 0
56899- 0 0 0 6 6 6 14 14 14 26 26 26
56900- 38 38 38 50 50 50 58 58 58 58 58 58
56901- 54 54 54 42 42 42 30 30 30 18 18 18
56902- 10 10 10 0 0 0 0 0 0 0 0 0
56903- 0 0 0 0 0 0 0 0 0 0 0 0
56904- 0 0 0 0 0 0 0 0 0 0 0 0
56905- 0 0 0 0 0 0 0 0 0 0 0 0
56906- 0 0 0 0 0 0 0 0 0 0 0 0
56907- 0 0 0 0 0 0 0 0 0 0 0 0
56908- 0 0 0 0 0 0 0 0 0 0 0 0
56909- 0 0 0 0 0 0 0 0 0 0 0 0
56910- 0 0 0 0 0 0 0 0 0 0 0 0
56911- 0 0 0 0 0 0 0 0 0 0 0 0
56912- 0 0 0 0 0 0 0 0 0 6 6 6
56913- 6 6 6 10 10 10 14 14 14 18 18 18
56914- 18 18 18 14 14 14 10 10 10 6 6 6
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 0 0 0 0 0 0 0 0 0
56918- 0 0 0 0 0 0 0 0 0 0 0 0
56919- 0 0 0 0 0 0 0 0 0 6 6 6
56920- 14 14 14 18 18 18 22 22 22 22 22 22
56921- 18 18 18 14 14 14 10 10 10 6 6 6
56922- 0 0 0 0 0 0 0 0 0 0 0 0
56923- 0 0 0 0 0 0 0 0 0 0 0 0
56924- 0 0 0 0 0 0 0 0 0 0 0 0
56925- 0 0 0 0 0 0 0 0 0 0 0 0
56926- 0 0 0 0 0 0 0 0 0 0 0 0
56927+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56928+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56929+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56930+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56931+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56932+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56933+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56934+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56935+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56936+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56937+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56938+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56939+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56940+4 4 4 4 4 4
56941+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56942+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56943+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56944+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56945+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56946+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56947+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56948+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56949+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56950+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56951+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56952+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56953+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56954+4 4 4 4 4 4
56955+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56956+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56957+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56958+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56959+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56960+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56961+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56962+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56963+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56964+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56965+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56966+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56967+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56968+4 4 4 4 4 4
56969+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56970+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56971+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56972+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56973+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56974+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56975+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56976+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56977+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56978+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56979+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56980+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56981+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56982+4 4 4 4 4 4
56983+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56984+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56985+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56986+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56987+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56988+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56989+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56990+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56991+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56992+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56993+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56994+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56995+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56996+4 4 4 4 4 4
56997+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56998+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56999+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57000+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57001+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57002+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57003+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57004+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57005+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57006+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57007+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57008+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57009+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57010+4 4 4 4 4 4
57011+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57012+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57013+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57014+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57015+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
57016+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
57017+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57018+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57019+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57020+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
57021+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57022+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
57023+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57024+4 4 4 4 4 4
57025+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57026+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57027+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57028+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57029+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
57030+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
57031+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57032+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57033+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57034+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
57035+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
57036+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
57037+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57038+4 4 4 4 4 4
57039+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57040+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57041+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57042+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57043+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
57044+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
57045+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57046+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57047+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57048+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
57049+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
57050+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
57051+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
57052+4 4 4 4 4 4
57053+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57054+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57055+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57056+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
57057+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
57058+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
57059+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
57060+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57061+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57062+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
57063+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
57064+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
57065+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
57066+4 4 4 4 4 4
57067+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57068+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57069+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57070+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
57071+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
57072+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
57073+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
57074+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57075+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
57076+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
57077+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
57078+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
57079+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
57080+4 4 4 4 4 4
57081+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57082+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57083+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57084+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
57085+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
57086+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
57087+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
57088+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
57089+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
57090+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
57091+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
57092+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
57093+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
57094+4 4 4 4 4 4
57095+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57096+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57097+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
57098+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
57099+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
57100+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
57101+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
57102+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
57103+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
57104+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
57105+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
57106+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
57107+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
57108+4 4 4 4 4 4
57109+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57110+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57111+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
57112+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
57113+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
57114+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
57115+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
57116+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
57117+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
57118+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
57119+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
57120+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
57121+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
57122+4 4 4 4 4 4
57123+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57124+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57125+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
57126+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
57127+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
57128+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
57129+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
57130+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
57131+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
57132+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
57133+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
57134+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
57135+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57136+4 4 4 4 4 4
57137+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57138+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57139+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
57140+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
57141+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
57142+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
57143+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
57144+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
57145+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
57146+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
57147+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
57148+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
57149+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
57150+4 4 4 4 4 4
57151+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57152+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
57153+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
57154+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
57155+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
57156+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
57157+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
57158+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
57159+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
57160+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
57161+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
57162+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
57163+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
57164+4 4 4 4 4 4
57165+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57166+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
57167+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
57168+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
57169+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57170+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
57171+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
57172+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
57173+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
57174+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
57175+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
57176+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
57177+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
57178+0 0 0 4 4 4
57179+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57180+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
57181+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
57182+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
57183+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
57184+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
57185+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
57186+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
57187+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
57188+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
57189+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
57190+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
57191+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
57192+2 0 0 0 0 0
57193+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
57194+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
57195+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
57196+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
57197+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
57198+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
57199+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
57200+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
57201+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
57202+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
57203+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
57204+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
57205+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
57206+37 38 37 0 0 0
57207+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57208+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
57209+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
57210+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
57211+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
57212+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
57213+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
57214+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
57215+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
57216+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
57217+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
57218+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
57219+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
57220+85 115 134 4 0 0
57221+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
57222+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
57223+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
57224+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
57225+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
57226+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
57227+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
57228+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
57229+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
57230+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
57231+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
57232+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
57233+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
57234+60 73 81 4 0 0
57235+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
57236+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
57237+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
57238+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
57239+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
57240+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
57241+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
57242+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
57243+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
57244+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
57245+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
57246+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
57247+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
57248+16 19 21 4 0 0
57249+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
57250+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
57251+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
57252+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
57253+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
57254+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
57255+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
57256+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
57257+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
57258+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
57259+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
57260+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
57261+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
57262+4 0 0 4 3 3
57263+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
57264+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
57265+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
57266+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
57267+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
57268+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
57269+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
57270+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
57271+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
57272+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
57273+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
57274+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
57275+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
57276+3 2 2 4 4 4
57277+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
57278+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
57279+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
57280+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57281+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
57282+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
57283+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
57284+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
57285+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
57286+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
57287+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
57288+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
57289+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
57290+4 4 4 4 4 4
57291+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
57292+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
57293+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
57294+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
57295+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
57296+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
57297+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
57298+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
57299+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
57300+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
57301+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
57302+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
57303+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
57304+4 4 4 4 4 4
57305+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
57306+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
57307+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
57308+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
57309+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
57310+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57311+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
57312+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
57313+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
57314+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
57315+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
57316+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
57317+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
57318+5 5 5 5 5 5
57319+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
57320+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
57321+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
57322+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
57323+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
57324+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57325+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
57326+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
57327+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
57328+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
57329+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
57330+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
57331+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
57332+5 5 5 4 4 4
57333+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
57334+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
57335+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
57336+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
57337+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57338+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
57339+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
57340+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
57341+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
57342+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
57343+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
57344+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
57345+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57346+4 4 4 4 4 4
57347+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
57348+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
57349+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
57350+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
57351+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
57352+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57353+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57354+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
57355+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
57356+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
57357+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
57358+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
57359+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57360+4 4 4 4 4 4
57361+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
57362+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
57363+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
57364+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
57365+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57366+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
57367+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
57368+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
57369+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
57370+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
57371+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
57372+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57373+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57374+4 4 4 4 4 4
57375+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
57376+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
57377+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
57378+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
57379+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57380+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57381+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57382+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
57383+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
57384+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
57385+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
57386+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57387+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57388+4 4 4 4 4 4
57389+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
57390+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
57391+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
57392+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
57393+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57394+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
57395+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57396+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
57397+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
57398+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
57399+4 0 0 4 3 3 5 5 5 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
57403+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
57404+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
57405+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
57406+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
57407+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57408+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
57409+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
57410+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
57411+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
57412+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
57413+6 6 6 4 0 0 6 6 6 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
57417+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
57418+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
57419+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
57420+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
57421+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57422+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
57423+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
57424+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
57425+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
57426+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
57427+4 0 0 3 2 2 5 5 5 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
57431+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
57432+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
57433+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
57434+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57435+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
57436+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
57437+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
57438+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
57439+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
57440+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
57441+4 0 0 4 3 3 5 5 5 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
57445+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
57446+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
57447+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
57448+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57449+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57450+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
57451+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
57452+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
57453+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
57454+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
57455+4 0 0 4 3 3 5 5 5 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
57459+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
57460+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
57461+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57462+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57463+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57464+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
57465+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
57466+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
57467+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
57468+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
57469+4 0 0 3 3 3 5 5 5 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
57473+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
57474+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
57475+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57476+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57477+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57478+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
57479+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
57480+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
57481+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57482+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57483+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57484+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57486+4 4 4 4 4 4
57487+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57488+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
57489+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57490+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
57491+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
57492+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
57493+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
57494+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
57495+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57496+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57497+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57498+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57499+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57500+4 4 4 4 4 4
57501+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57502+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
57503+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57504+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
57505+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57506+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
57507+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
57508+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
57509+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57510+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57511+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57514+4 4 4 4 4 4
57515+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
57516+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
57517+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
57518+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
57519+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
57520+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
57521+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
57522+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
57523+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57524+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57525+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57528+4 4 4 4 4 4
57529+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
57530+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
57531+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57532+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
57533+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
57534+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
57535+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
57536+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
57537+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57538+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57539+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57540+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57541+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57542+4 4 4 4 4 4
57543+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
57544+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
57545+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
57546+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
57547+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
57548+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
57549+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
57550+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
57551+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57552+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57553+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57554+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57555+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57556+4 4 4 4 4 4
57557+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
57558+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
57559+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57560+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
57561+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
57562+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
57563+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
57564+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
57565+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
57566+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57567+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57568+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57569+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57570+4 4 4 4 4 4
57571+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
57572+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
57573+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
57574+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
57575+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
57576+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
57577+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
57578+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
57579+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57580+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57581+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57582+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57583+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57584+4 4 4 4 4 4
57585+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57586+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
57587+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57588+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
57589+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
57590+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
57591+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
57592+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
57593+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57594+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57595+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57596+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57597+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57598+4 4 4 4 4 4
57599+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
57600+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
57601+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
57602+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
57603+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
57604+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
57605+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57606+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
57607+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57608+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57609+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57610+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57611+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57612+4 4 4 4 4 4
57613+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57614+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
57615+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
57616+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
57617+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
57618+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
57619+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57620+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
57621+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57622+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57623+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57624+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57625+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57626+4 4 4 4 4 4
57627+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
57628+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
57629+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
57630+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
57631+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
57632+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
57633+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
57634+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
57635+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
57636+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57637+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57638+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57639+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57640+4 4 4 4 4 4
57641+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57642+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
57643+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
57644+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
57645+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
57646+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
57647+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
57648+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
57649+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
57650+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57651+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57652+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57653+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57654+4 4 4 4 4 4
57655+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
57656+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
57657+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
57658+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
57659+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
57660+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
57661+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
57662+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
57663+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
57664+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57665+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57666+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57667+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57668+4 4 4 4 4 4
57669+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57670+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
57671+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
57672+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
57673+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
57674+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
57675+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
57676+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
57677+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
57678+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57679+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57680+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57681+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57682+4 4 4 4 4 4
57683+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
57684+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
57685+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
57686+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
57687+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
57688+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
57689+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
57690+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
57691+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
57692+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
57693+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57694+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57695+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57696+4 4 4 4 4 4
57697+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
57698+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
57699+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
57700+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
57701+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
57702+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
57703+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
57704+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
57705+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
57706+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
57707+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57708+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57709+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57710+4 4 4 4 4 4
57711+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
57712+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
57713+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
57714+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
57715+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
57716+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
57717+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57718+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
57719+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
57720+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
57721+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57722+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57723+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57724+4 4 4 4 4 4
57725+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
57726+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
57727+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
57728+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
57729+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
57730+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
57731+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
57732+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
57733+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
57734+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
57735+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57736+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57737+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57738+4 4 4 4 4 4
57739+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
57740+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
57741+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
57742+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
57743+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
57744+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
57745+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
57746+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
57747+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
57748+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
57749+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57750+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57751+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57752+4 4 4 4 4 4
57753+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57754+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
57755+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
57756+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
57757+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
57758+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
57759+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
57760+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
57761+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
57762+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
57763+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57764+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57765+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57766+4 4 4 4 4 4
57767+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
57768+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
57769+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
57770+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
57771+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
57772+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
57773+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
57774+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
57775+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
57776+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
57777+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57778+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57779+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57780+4 4 4 4 4 4
57781+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
57782+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
57783+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
57784+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
57785+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
57786+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
57787+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
57788+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
57789+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57790+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57791+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57792+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57793+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57794+4 4 4 4 4 4
57795+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
57796+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57797+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
57798+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
57799+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
57800+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
57801+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
57802+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
57803+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
57804+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57805+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57806+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57807+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57808+4 4 4 4 4 4
57809+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
57810+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
57811+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
57812+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
57813+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
57814+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
57815+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
57816+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
57817+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
57818+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57819+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57820+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57821+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57822+4 4 4 4 4 4
57823+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
57824+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
57825+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
57826+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
57827+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
57828+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
57829+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
57830+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
57831+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57832+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57833+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57834+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57835+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57836+4 4 4 4 4 4
57837+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
57838+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
57839+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
57840+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
57841+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
57842+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
57843+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
57844+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
57845+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57846+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57847+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57848+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57849+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57850+4 4 4 4 4 4
57851+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
57852+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
57853+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
57854+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
57855+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
57856+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
57857+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
57858+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
57859+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57860+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57861+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57862+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57863+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57864+4 4 4 4 4 4
57865+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57866+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
57867+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57868+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
57869+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
57870+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
57871+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
57872+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
57873+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57874+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57875+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57876+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57877+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57878+4 4 4 4 4 4
57879+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57880+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
57881+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
57882+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
57883+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
57884+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
57885+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
57886+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
57887+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57888+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57889+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57890+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57891+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57892+4 4 4 4 4 4
57893+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57894+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
57895+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
57896+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
57897+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
57898+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
57899+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
57900+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57901+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57902+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57903+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57904+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57905+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57906+4 4 4 4 4 4
57907+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57908+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57909+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
57910+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
57911+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
57912+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
57913+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
57914+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57915+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57916+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57917+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57918+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57919+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57920+4 4 4 4 4 4
57921+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57922+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57923+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57924+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57925+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
57926+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
57927+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
57928+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57929+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57930+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57931+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57932+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57933+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57934+4 4 4 4 4 4
57935+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57936+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57937+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57938+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
57939+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
57940+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
57941+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
57942+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57943+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57944+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57945+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57946+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57947+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57948+4 4 4 4 4 4
57949+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57950+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57951+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57952+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
57953+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57954+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
57955+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
57956+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57957+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57958+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57959+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57960+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57961+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57962+4 4 4 4 4 4
57963+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57964+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57965+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57966+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
57967+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
57968+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
57969+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
57970+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57971+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57972+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57973+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57974+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57975+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57976+4 4 4 4 4 4
57977+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57978+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57979+4 4 4 4 4 4 4 4 4 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 5 5 5
57981+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
57982+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57983+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57984+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57985+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57986+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57987+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57988+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57989+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57990+4 4 4 4 4 4
57991+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57992+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57993+4 4 4 4 4 4 4 4 4 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 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
57996+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
57997+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
57998+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57999+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58000+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58001+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58002+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58003+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58004+4 4 4 4 4 4
58005+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58006+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58007+4 4 4 4 4 4 4 4 4 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 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
58010+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
58011+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58012+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58013+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58014+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58015+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58016+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58017+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58018+4 4 4 4 4 4
58019+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58020+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58021+4 4 4 4 4 4 4 4 4 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 5 5 5 4 3 3 6 6 6
58024+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
58025+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58026+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58027+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58028+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58029+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58030+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58031+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58032+4 4 4 4 4 4
58033+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58034+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58035+4 4 4 4 4 4 4 4 4 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 5 5 5 4 3 3
58038+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
58039+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58040+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58041+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58042+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58043+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58044+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58045+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58046+4 4 4 4 4 4
58047diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
58048index fef20db..d28b1ab 100644
58049--- a/drivers/xen/xenfs/xenstored.c
58050+++ b/drivers/xen/xenfs/xenstored.c
58051@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
58052 static int xsd_kva_open(struct inode *inode, struct file *file)
58053 {
58054 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
58055+#ifdef CONFIG_GRKERNSEC_HIDESYM
58056+ NULL);
58057+#else
58058 xen_store_interface);
58059+#endif
58060+
58061 if (!file->private_data)
58062 return -ENOMEM;
58063 return 0;
58064diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
58065index eb14e05..5156de7 100644
58066--- a/fs/9p/vfs_addr.c
58067+++ b/fs/9p/vfs_addr.c
58068@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
58069
58070 retval = v9fs_file_write_internal(inode,
58071 v9inode->writeback_fid,
58072- (__force const char __user *)buffer,
58073+ (const char __force_user *)buffer,
58074 len, &offset, 0);
58075 if (retval > 0)
58076 retval = 0;
58077diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
58078index 296482f..183ddc3 100644
58079--- a/fs/9p/vfs_inode.c
58080+++ b/fs/9p/vfs_inode.c
58081@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
58082 void
58083 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
58084 {
58085- char *s = nd_get_link(nd);
58086+ const char *s = nd_get_link(nd);
58087
58088 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
58089 dentry, IS_ERR(s) ? "<error>" : s);
58090diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
58091index 370b24c..ff0be7b 100644
58092--- a/fs/Kconfig.binfmt
58093+++ b/fs/Kconfig.binfmt
58094@@ -103,7 +103,7 @@ config HAVE_AOUT
58095
58096 config BINFMT_AOUT
58097 tristate "Kernel support for a.out and ECOFF binaries"
58098- depends on HAVE_AOUT
58099+ depends on HAVE_AOUT && BROKEN
58100 ---help---
58101 A.out (Assembler.OUTput) is a set of formats for libraries and
58102 executables used in the earliest versions of UNIX. Linux used
58103diff --git a/fs/afs/inode.c b/fs/afs/inode.c
58104index 2946712..f737435 100644
58105--- a/fs/afs/inode.c
58106+++ b/fs/afs/inode.c
58107@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58108 struct afs_vnode *vnode;
58109 struct super_block *sb;
58110 struct inode *inode;
58111- static atomic_t afs_autocell_ino;
58112+ static atomic_unchecked_t afs_autocell_ino;
58113
58114 _enter("{%x:%u},%*.*s,",
58115 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
58116@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58117 data.fid.unique = 0;
58118 data.fid.vnode = 0;
58119
58120- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
58121+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
58122 afs_iget5_autocell_test, afs_iget5_set,
58123 &data);
58124 if (!inode) {
58125diff --git a/fs/aio.c b/fs/aio.c
58126index 14b9315..365980f 100644
58127--- a/fs/aio.c
58128+++ b/fs/aio.c
58129@@ -388,7 +388,7 @@ static int aio_setup_ring(struct kioctx *ctx)
58130 size += sizeof(struct io_event) * nr_events;
58131
58132 nr_pages = PFN_UP(size);
58133- if (nr_pages < 0)
58134+ if (nr_pages <= 0)
58135 return -EINVAL;
58136
58137 file = aio_private_file(ctx, nr_pages);
58138diff --git a/fs/attr.c b/fs/attr.c
58139index 6530ced..4a827e2 100644
58140--- a/fs/attr.c
58141+++ b/fs/attr.c
58142@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
58143 unsigned long limit;
58144
58145 limit = rlimit(RLIMIT_FSIZE);
58146+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
58147 if (limit != RLIM_INFINITY && offset > limit)
58148 goto out_sig;
58149 if (offset > inode->i_sb->s_maxbytes)
58150diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
58151index 116fd38..c04182da 100644
58152--- a/fs/autofs4/waitq.c
58153+++ b/fs/autofs4/waitq.c
58154@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
58155 {
58156 unsigned long sigpipe, flags;
58157 mm_segment_t fs;
58158- const char *data = (const char *)addr;
58159+ const char __user *data = (const char __force_user *)addr;
58160 ssize_t wr = 0;
58161
58162 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
58163@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
58164 return 1;
58165 }
58166
58167+#ifdef CONFIG_GRKERNSEC_HIDESYM
58168+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
58169+#endif
58170+
58171 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58172 enum autofs_notify notify)
58173 {
58174@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58175
58176 /* If this is a direct mount request create a dummy name */
58177 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
58178+#ifdef CONFIG_GRKERNSEC_HIDESYM
58179+ /* this name does get written to userland via autofs4_write() */
58180+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
58181+#else
58182 qstr.len = sprintf(name, "%p", dentry);
58183+#endif
58184 else {
58185 qstr.len = autofs4_getpath(sbi, dentry, &name);
58186 if (!qstr.len) {
58187diff --git a/fs/befs/endian.h b/fs/befs/endian.h
58188index 2722387..56059b5 100644
58189--- a/fs/befs/endian.h
58190+++ b/fs/befs/endian.h
58191@@ -11,7 +11,7 @@
58192
58193 #include <asm/byteorder.h>
58194
58195-static inline u64
58196+static inline u64 __intentional_overflow(-1)
58197 fs64_to_cpu(const struct super_block *sb, fs64 n)
58198 {
58199 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58200@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
58201 return (__force fs64)cpu_to_be64(n);
58202 }
58203
58204-static inline u32
58205+static inline u32 __intentional_overflow(-1)
58206 fs32_to_cpu(const struct super_block *sb, fs32 n)
58207 {
58208 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58209@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
58210 return (__force fs32)cpu_to_be32(n);
58211 }
58212
58213-static inline u16
58214+static inline u16 __intentional_overflow(-1)
58215 fs16_to_cpu(const struct super_block *sb, fs16 n)
58216 {
58217 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58218diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
58219index 929dec0..84bd914 100644
58220--- a/fs/binfmt_aout.c
58221+++ b/fs/binfmt_aout.c
58222@@ -16,6 +16,7 @@
58223 #include <linux/string.h>
58224 #include <linux/fs.h>
58225 #include <linux/file.h>
58226+#include <linux/security.h>
58227 #include <linux/stat.h>
58228 #include <linux/fcntl.h>
58229 #include <linux/ptrace.h>
58230@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
58231 #endif
58232 # define START_STACK(u) ((void __user *)u.start_stack)
58233
58234+ memset(&dump, 0, sizeof(dump));
58235+
58236 fs = get_fs();
58237 set_fs(KERNEL_DS);
58238 has_dumped = 1;
58239@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
58240
58241 /* If the size of the dump file exceeds the rlimit, then see what would happen
58242 if we wrote the stack, but not the data area. */
58243+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
58244 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
58245 dump.u_dsize = 0;
58246
58247 /* Make sure we have enough room to write the stack and data areas. */
58248+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
58249 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
58250 dump.u_ssize = 0;
58251
58252@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
58253 rlim = rlimit(RLIMIT_DATA);
58254 if (rlim >= RLIM_INFINITY)
58255 rlim = ~0;
58256+
58257+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
58258 if (ex.a_data + ex.a_bss > rlim)
58259 return -ENOMEM;
58260
58261@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
58262
58263 install_exec_creds(bprm);
58264
58265+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58266+ current->mm->pax_flags = 0UL;
58267+#endif
58268+
58269+#ifdef CONFIG_PAX_PAGEEXEC
58270+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
58271+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
58272+
58273+#ifdef CONFIG_PAX_EMUTRAMP
58274+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
58275+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
58276+#endif
58277+
58278+#ifdef CONFIG_PAX_MPROTECT
58279+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
58280+ current->mm->pax_flags |= MF_PAX_MPROTECT;
58281+#endif
58282+
58283+ }
58284+#endif
58285+
58286 if (N_MAGIC(ex) == OMAGIC) {
58287 unsigned long text_addr, map_size;
58288 loff_t pos;
58289@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
58290 return error;
58291
58292 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
58293- PROT_READ | PROT_WRITE | PROT_EXEC,
58294+ PROT_READ | PROT_WRITE,
58295 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
58296 fd_offset + ex.a_text);
58297 if (error != N_DATADDR(ex))
58298diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
58299index d8fc060..cbd44d5 100644
58300--- a/fs/binfmt_elf.c
58301+++ b/fs/binfmt_elf.c
58302@@ -34,6 +34,7 @@
58303 #include <linux/utsname.h>
58304 #include <linux/coredump.h>
58305 #include <linux/sched.h>
58306+#include <linux/xattr.h>
58307 #include <asm/uaccess.h>
58308 #include <asm/param.h>
58309 #include <asm/page.h>
58310@@ -47,7 +48,7 @@
58311
58312 static int load_elf_binary(struct linux_binprm *bprm);
58313 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
58314- int, int, unsigned long);
58315+ int, int, unsigned long) __intentional_overflow(-1);
58316
58317 #ifdef CONFIG_USELIB
58318 static int load_elf_library(struct file *);
58319@@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
58320 #define elf_core_dump NULL
58321 #endif
58322
58323+#ifdef CONFIG_PAX_MPROTECT
58324+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
58325+#endif
58326+
58327+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58328+static void elf_handle_mmap(struct file *file);
58329+#endif
58330+
58331 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
58332 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
58333 #else
58334@@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
58335 .load_binary = load_elf_binary,
58336 .load_shlib = load_elf_library,
58337 .core_dump = elf_core_dump,
58338+
58339+#ifdef CONFIG_PAX_MPROTECT
58340+ .handle_mprotect= elf_handle_mprotect,
58341+#endif
58342+
58343+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58344+ .handle_mmap = elf_handle_mmap,
58345+#endif
58346+
58347 .min_coredump = ELF_EXEC_PAGESIZE,
58348 };
58349
58350@@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
58351
58352 static int set_brk(unsigned long start, unsigned long end)
58353 {
58354+ unsigned long e = end;
58355+
58356 start = ELF_PAGEALIGN(start);
58357 end = ELF_PAGEALIGN(end);
58358 if (end > start) {
58359@@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
58360 if (BAD_ADDR(addr))
58361 return addr;
58362 }
58363- current->mm->start_brk = current->mm->brk = end;
58364+ current->mm->start_brk = current->mm->brk = e;
58365 return 0;
58366 }
58367
58368@@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58369 elf_addr_t __user *u_rand_bytes;
58370 const char *k_platform = ELF_PLATFORM;
58371 const char *k_base_platform = ELF_BASE_PLATFORM;
58372- unsigned char k_rand_bytes[16];
58373+ u32 k_rand_bytes[4];
58374 int items;
58375 elf_addr_t *elf_info;
58376 int ei_index = 0;
58377 const struct cred *cred = current_cred();
58378 struct vm_area_struct *vma;
58379+ unsigned long saved_auxv[AT_VECTOR_SIZE];
58380
58381 /*
58382 * In some cases (e.g. Hyper-Threading), we want to avoid L1
58383@@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58384 * Generate 16 random bytes for userspace PRNG seeding.
58385 */
58386 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
58387- u_rand_bytes = (elf_addr_t __user *)
58388- STACK_ALLOC(p, sizeof(k_rand_bytes));
58389+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
58390+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
58391+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
58392+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
58393+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
58394+ u_rand_bytes = (elf_addr_t __user *) p;
58395 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
58396 return -EFAULT;
58397
58398@@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58399 return -EFAULT;
58400 current->mm->env_end = p;
58401
58402+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
58403+
58404 /* Put the elf_info on the stack in the right place. */
58405 sp = (elf_addr_t __user *)envp + 1;
58406- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
58407+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
58408 return -EFAULT;
58409 return 0;
58410 }
58411@@ -393,15 +420,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
58412 an ELF header */
58413
58414 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58415- struct file *interpreter, unsigned long *interp_map_addr,
58416- unsigned long no_base)
58417+ struct file *interpreter, unsigned long no_base)
58418 {
58419 struct elf_phdr *elf_phdata;
58420 struct elf_phdr *eppnt;
58421- unsigned long load_addr = 0;
58422+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
58423 int load_addr_set = 0;
58424 unsigned long last_bss = 0, elf_bss = 0;
58425- unsigned long error = ~0UL;
58426+ unsigned long error = -EINVAL;
58427 unsigned long total_size;
58428 int retval, i, size;
58429
58430@@ -447,6 +473,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58431 goto out_close;
58432 }
58433
58434+#ifdef CONFIG_PAX_SEGMEXEC
58435+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
58436+ pax_task_size = SEGMEXEC_TASK_SIZE;
58437+#endif
58438+
58439 eppnt = elf_phdata;
58440 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
58441 if (eppnt->p_type == PT_LOAD) {
58442@@ -470,8 +501,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58443 map_addr = elf_map(interpreter, load_addr + vaddr,
58444 eppnt, elf_prot, elf_type, total_size);
58445 total_size = 0;
58446- if (!*interp_map_addr)
58447- *interp_map_addr = map_addr;
58448 error = map_addr;
58449 if (BAD_ADDR(map_addr))
58450 goto out_close;
58451@@ -490,8 +519,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58452 k = load_addr + eppnt->p_vaddr;
58453 if (BAD_ADDR(k) ||
58454 eppnt->p_filesz > eppnt->p_memsz ||
58455- eppnt->p_memsz > TASK_SIZE ||
58456- TASK_SIZE - eppnt->p_memsz < k) {
58457+ eppnt->p_memsz > pax_task_size ||
58458+ pax_task_size - eppnt->p_memsz < k) {
58459 error = -ENOMEM;
58460 goto out_close;
58461 }
58462@@ -530,9 +559,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58463 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
58464
58465 /* Map the last of the bss segment */
58466- error = vm_brk(elf_bss, last_bss - elf_bss);
58467- if (BAD_ADDR(error))
58468- goto out_close;
58469+ if (last_bss > elf_bss) {
58470+ error = vm_brk(elf_bss, last_bss - elf_bss);
58471+ if (BAD_ADDR(error))
58472+ goto out_close;
58473+ }
58474 }
58475
58476 error = load_addr;
58477@@ -543,6 +574,336 @@ out:
58478 return error;
58479 }
58480
58481+#ifdef CONFIG_PAX_PT_PAX_FLAGS
58482+#ifdef CONFIG_PAX_SOFTMODE
58483+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
58484+{
58485+ unsigned long pax_flags = 0UL;
58486+
58487+#ifdef CONFIG_PAX_PAGEEXEC
58488+ if (elf_phdata->p_flags & PF_PAGEEXEC)
58489+ pax_flags |= MF_PAX_PAGEEXEC;
58490+#endif
58491+
58492+#ifdef CONFIG_PAX_SEGMEXEC
58493+ if (elf_phdata->p_flags & PF_SEGMEXEC)
58494+ pax_flags |= MF_PAX_SEGMEXEC;
58495+#endif
58496+
58497+#ifdef CONFIG_PAX_EMUTRAMP
58498+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
58499+ pax_flags |= MF_PAX_EMUTRAMP;
58500+#endif
58501+
58502+#ifdef CONFIG_PAX_MPROTECT
58503+ if (elf_phdata->p_flags & PF_MPROTECT)
58504+ pax_flags |= MF_PAX_MPROTECT;
58505+#endif
58506+
58507+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58508+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
58509+ pax_flags |= MF_PAX_RANDMMAP;
58510+#endif
58511+
58512+ return pax_flags;
58513+}
58514+#endif
58515+
58516+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
58517+{
58518+ unsigned long pax_flags = 0UL;
58519+
58520+#ifdef CONFIG_PAX_PAGEEXEC
58521+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
58522+ pax_flags |= MF_PAX_PAGEEXEC;
58523+#endif
58524+
58525+#ifdef CONFIG_PAX_SEGMEXEC
58526+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
58527+ pax_flags |= MF_PAX_SEGMEXEC;
58528+#endif
58529+
58530+#ifdef CONFIG_PAX_EMUTRAMP
58531+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
58532+ pax_flags |= MF_PAX_EMUTRAMP;
58533+#endif
58534+
58535+#ifdef CONFIG_PAX_MPROTECT
58536+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
58537+ pax_flags |= MF_PAX_MPROTECT;
58538+#endif
58539+
58540+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58541+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
58542+ pax_flags |= MF_PAX_RANDMMAP;
58543+#endif
58544+
58545+ return pax_flags;
58546+}
58547+#endif
58548+
58549+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
58550+#ifdef CONFIG_PAX_SOFTMODE
58551+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
58552+{
58553+ unsigned long pax_flags = 0UL;
58554+
58555+#ifdef CONFIG_PAX_PAGEEXEC
58556+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
58557+ pax_flags |= MF_PAX_PAGEEXEC;
58558+#endif
58559+
58560+#ifdef CONFIG_PAX_SEGMEXEC
58561+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
58562+ pax_flags |= MF_PAX_SEGMEXEC;
58563+#endif
58564+
58565+#ifdef CONFIG_PAX_EMUTRAMP
58566+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
58567+ pax_flags |= MF_PAX_EMUTRAMP;
58568+#endif
58569+
58570+#ifdef CONFIG_PAX_MPROTECT
58571+ if (pax_flags_softmode & MF_PAX_MPROTECT)
58572+ pax_flags |= MF_PAX_MPROTECT;
58573+#endif
58574+
58575+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58576+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
58577+ pax_flags |= MF_PAX_RANDMMAP;
58578+#endif
58579+
58580+ return pax_flags;
58581+}
58582+#endif
58583+
58584+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
58585+{
58586+ unsigned long pax_flags = 0UL;
58587+
58588+#ifdef CONFIG_PAX_PAGEEXEC
58589+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
58590+ pax_flags |= MF_PAX_PAGEEXEC;
58591+#endif
58592+
58593+#ifdef CONFIG_PAX_SEGMEXEC
58594+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
58595+ pax_flags |= MF_PAX_SEGMEXEC;
58596+#endif
58597+
58598+#ifdef CONFIG_PAX_EMUTRAMP
58599+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
58600+ pax_flags |= MF_PAX_EMUTRAMP;
58601+#endif
58602+
58603+#ifdef CONFIG_PAX_MPROTECT
58604+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
58605+ pax_flags |= MF_PAX_MPROTECT;
58606+#endif
58607+
58608+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58609+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
58610+ pax_flags |= MF_PAX_RANDMMAP;
58611+#endif
58612+
58613+ return pax_flags;
58614+}
58615+#endif
58616+
58617+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58618+static unsigned long pax_parse_defaults(void)
58619+{
58620+ unsigned long pax_flags = 0UL;
58621+
58622+#ifdef CONFIG_PAX_SOFTMODE
58623+ if (pax_softmode)
58624+ return pax_flags;
58625+#endif
58626+
58627+#ifdef CONFIG_PAX_PAGEEXEC
58628+ pax_flags |= MF_PAX_PAGEEXEC;
58629+#endif
58630+
58631+#ifdef CONFIG_PAX_SEGMEXEC
58632+ pax_flags |= MF_PAX_SEGMEXEC;
58633+#endif
58634+
58635+#ifdef CONFIG_PAX_MPROTECT
58636+ pax_flags |= MF_PAX_MPROTECT;
58637+#endif
58638+
58639+#ifdef CONFIG_PAX_RANDMMAP
58640+ if (randomize_va_space)
58641+ pax_flags |= MF_PAX_RANDMMAP;
58642+#endif
58643+
58644+ return pax_flags;
58645+}
58646+
58647+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
58648+{
58649+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
58650+
58651+#ifdef CONFIG_PAX_EI_PAX
58652+
58653+#ifdef CONFIG_PAX_SOFTMODE
58654+ if (pax_softmode)
58655+ return pax_flags;
58656+#endif
58657+
58658+ pax_flags = 0UL;
58659+
58660+#ifdef CONFIG_PAX_PAGEEXEC
58661+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
58662+ pax_flags |= MF_PAX_PAGEEXEC;
58663+#endif
58664+
58665+#ifdef CONFIG_PAX_SEGMEXEC
58666+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
58667+ pax_flags |= MF_PAX_SEGMEXEC;
58668+#endif
58669+
58670+#ifdef CONFIG_PAX_EMUTRAMP
58671+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
58672+ pax_flags |= MF_PAX_EMUTRAMP;
58673+#endif
58674+
58675+#ifdef CONFIG_PAX_MPROTECT
58676+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
58677+ pax_flags |= MF_PAX_MPROTECT;
58678+#endif
58679+
58680+#ifdef CONFIG_PAX_ASLR
58681+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
58682+ pax_flags |= MF_PAX_RANDMMAP;
58683+#endif
58684+
58685+#endif
58686+
58687+ return pax_flags;
58688+
58689+}
58690+
58691+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
58692+{
58693+
58694+#ifdef CONFIG_PAX_PT_PAX_FLAGS
58695+ unsigned long i;
58696+
58697+ for (i = 0UL; i < elf_ex->e_phnum; i++)
58698+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
58699+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
58700+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
58701+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
58702+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
58703+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
58704+ return PAX_PARSE_FLAGS_FALLBACK;
58705+
58706+#ifdef CONFIG_PAX_SOFTMODE
58707+ if (pax_softmode)
58708+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
58709+ else
58710+#endif
58711+
58712+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
58713+ break;
58714+ }
58715+#endif
58716+
58717+ return PAX_PARSE_FLAGS_FALLBACK;
58718+}
58719+
58720+static unsigned long pax_parse_xattr_pax(struct file * const file)
58721+{
58722+
58723+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
58724+ ssize_t xattr_size, i;
58725+ unsigned char xattr_value[sizeof("pemrs") - 1];
58726+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
58727+
58728+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
58729+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
58730+ return PAX_PARSE_FLAGS_FALLBACK;
58731+
58732+ for (i = 0; i < xattr_size; i++)
58733+ switch (xattr_value[i]) {
58734+ default:
58735+ return PAX_PARSE_FLAGS_FALLBACK;
58736+
58737+#define parse_flag(option1, option2, flag) \
58738+ case option1: \
58739+ if (pax_flags_hardmode & MF_PAX_##flag) \
58740+ return PAX_PARSE_FLAGS_FALLBACK;\
58741+ pax_flags_hardmode |= MF_PAX_##flag; \
58742+ break; \
58743+ case option2: \
58744+ if (pax_flags_softmode & MF_PAX_##flag) \
58745+ return PAX_PARSE_FLAGS_FALLBACK;\
58746+ pax_flags_softmode |= MF_PAX_##flag; \
58747+ break;
58748+
58749+ parse_flag('p', 'P', PAGEEXEC);
58750+ parse_flag('e', 'E', EMUTRAMP);
58751+ parse_flag('m', 'M', MPROTECT);
58752+ parse_flag('r', 'R', RANDMMAP);
58753+ parse_flag('s', 'S', SEGMEXEC);
58754+
58755+#undef parse_flag
58756+ }
58757+
58758+ if (pax_flags_hardmode & pax_flags_softmode)
58759+ return PAX_PARSE_FLAGS_FALLBACK;
58760+
58761+#ifdef CONFIG_PAX_SOFTMODE
58762+ if (pax_softmode)
58763+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
58764+ else
58765+#endif
58766+
58767+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
58768+#else
58769+ return PAX_PARSE_FLAGS_FALLBACK;
58770+#endif
58771+
58772+}
58773+
58774+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
58775+{
58776+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
58777+
58778+ pax_flags = pax_parse_defaults();
58779+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
58780+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
58781+ xattr_pax_flags = pax_parse_xattr_pax(file);
58782+
58783+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
58784+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
58785+ pt_pax_flags != xattr_pax_flags)
58786+ return -EINVAL;
58787+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58788+ pax_flags = xattr_pax_flags;
58789+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58790+ pax_flags = pt_pax_flags;
58791+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58792+ pax_flags = ei_pax_flags;
58793+
58794+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
58795+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58796+ if ((__supported_pte_mask & _PAGE_NX))
58797+ pax_flags &= ~MF_PAX_SEGMEXEC;
58798+ else
58799+ pax_flags &= ~MF_PAX_PAGEEXEC;
58800+ }
58801+#endif
58802+
58803+ if (0 > pax_check_flags(&pax_flags))
58804+ return -EINVAL;
58805+
58806+ current->mm->pax_flags = pax_flags;
58807+ return 0;
58808+}
58809+#endif
58810+
58811 /*
58812 * These are the functions used to load ELF style executables and shared
58813 * libraries. There is no binary dependent code anywhere else.
58814@@ -556,6 +917,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
58815 {
58816 unsigned int random_variable = 0;
58817
58818+#ifdef CONFIG_PAX_RANDUSTACK
58819+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
58820+ return stack_top - current->mm->delta_stack;
58821+#endif
58822+
58823 if ((current->flags & PF_RANDOMIZE) &&
58824 !(current->personality & ADDR_NO_RANDOMIZE)) {
58825 random_variable = get_random_int() & STACK_RND_MASK;
58826@@ -574,7 +940,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
58827 unsigned long load_addr = 0, load_bias = 0;
58828 int load_addr_set = 0;
58829 char * elf_interpreter = NULL;
58830- unsigned long error;
58831+ unsigned long error = 0;
58832 struct elf_phdr *elf_ppnt, *elf_phdata;
58833 unsigned long elf_bss, elf_brk;
58834 int retval, i;
58835@@ -589,6 +955,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
58836 struct elfhdr elf_ex;
58837 struct elfhdr interp_elf_ex;
58838 } *loc;
58839+ unsigned long pax_task_size;
58840
58841 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
58842 if (!loc) {
58843@@ -726,6 +1093,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
58844 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
58845 may depend on the personality. */
58846 SET_PERSONALITY(loc->elf_ex);
58847+
58848+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58849+ current->mm->pax_flags = 0UL;
58850+#endif
58851+
58852+#ifdef CONFIG_PAX_DLRESOLVE
58853+ current->mm->call_dl_resolve = 0UL;
58854+#endif
58855+
58856+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
58857+ current->mm->call_syscall = 0UL;
58858+#endif
58859+
58860+#ifdef CONFIG_PAX_ASLR
58861+ current->mm->delta_mmap = 0UL;
58862+ current->mm->delta_stack = 0UL;
58863+#endif
58864+
58865+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58866+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
58867+ send_sig(SIGKILL, current, 0);
58868+ goto out_free_dentry;
58869+ }
58870+#endif
58871+
58872+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
58873+ pax_set_initial_flags(bprm);
58874+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
58875+ if (pax_set_initial_flags_func)
58876+ (pax_set_initial_flags_func)(bprm);
58877+#endif
58878+
58879+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
58880+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
58881+ current->mm->context.user_cs_limit = PAGE_SIZE;
58882+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
58883+ }
58884+#endif
58885+
58886+#ifdef CONFIG_PAX_SEGMEXEC
58887+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
58888+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
58889+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
58890+ pax_task_size = SEGMEXEC_TASK_SIZE;
58891+ current->mm->def_flags |= VM_NOHUGEPAGE;
58892+ } else
58893+#endif
58894+
58895+ pax_task_size = TASK_SIZE;
58896+
58897+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
58898+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58899+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
58900+ put_cpu();
58901+ }
58902+#endif
58903+
58904+#ifdef CONFIG_PAX_ASLR
58905+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
58906+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
58907+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
58908+ }
58909+#endif
58910+
58911+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
58912+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58913+ executable_stack = EXSTACK_DISABLE_X;
58914+ current->personality &= ~READ_IMPLIES_EXEC;
58915+ } else
58916+#endif
58917+
58918 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
58919 current->personality |= READ_IMPLIES_EXEC;
58920
58921@@ -811,6 +1249,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
58922 #else
58923 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
58924 #endif
58925+
58926+#ifdef CONFIG_PAX_RANDMMAP
58927+ /* PaX: randomize base address at the default exe base if requested */
58928+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
58929+#ifdef CONFIG_SPARC64
58930+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
58931+#else
58932+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
58933+#endif
58934+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
58935+ elf_flags |= MAP_FIXED;
58936+ }
58937+#endif
58938+
58939 }
58940
58941 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
58942@@ -842,9 +1294,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
58943 * allowed task size. Note that p_filesz must always be
58944 * <= p_memsz so it is only necessary to check p_memsz.
58945 */
58946- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
58947- elf_ppnt->p_memsz > TASK_SIZE ||
58948- TASK_SIZE - elf_ppnt->p_memsz < k) {
58949+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
58950+ elf_ppnt->p_memsz > pax_task_size ||
58951+ pax_task_size - elf_ppnt->p_memsz < k) {
58952 /* set_brk can never work. Avoid overflows. */
58953 retval = -EINVAL;
58954 goto out_free_dentry;
58955@@ -880,16 +1332,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
58956 if (retval)
58957 goto out_free_dentry;
58958 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
58959- retval = -EFAULT; /* Nobody gets to see this, but.. */
58960- goto out_free_dentry;
58961+ /*
58962+ * This bss-zeroing can fail if the ELF
58963+ * file specifies odd protections. So
58964+ * we don't check the return value
58965+ */
58966 }
58967
58968+#ifdef CONFIG_PAX_RANDMMAP
58969+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
58970+ unsigned long start, size, flags;
58971+ vm_flags_t vm_flags;
58972+
58973+ start = ELF_PAGEALIGN(elf_brk);
58974+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
58975+ flags = MAP_FIXED | MAP_PRIVATE;
58976+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
58977+
58978+ down_write(&current->mm->mmap_sem);
58979+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
58980+ retval = -ENOMEM;
58981+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
58982+// if (current->personality & ADDR_NO_RANDOMIZE)
58983+// vm_flags |= VM_READ | VM_MAYREAD;
58984+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
58985+ retval = IS_ERR_VALUE(start) ? start : 0;
58986+ }
58987+ up_write(&current->mm->mmap_sem);
58988+ if (retval == 0)
58989+ retval = set_brk(start + size, start + size + PAGE_SIZE);
58990+ if (retval < 0)
58991+ goto out_free_dentry;
58992+ }
58993+#endif
58994+
58995 if (elf_interpreter) {
58996- unsigned long interp_map_addr = 0;
58997-
58998 elf_entry = load_elf_interp(&loc->interp_elf_ex,
58999 interpreter,
59000- &interp_map_addr,
59001 load_bias);
59002 if (!IS_ERR((void *)elf_entry)) {
59003 /*
59004@@ -1115,7 +1594,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
59005 * Decide what to dump of a segment, part, all or none.
59006 */
59007 static unsigned long vma_dump_size(struct vm_area_struct *vma,
59008- unsigned long mm_flags)
59009+ unsigned long mm_flags, long signr)
59010 {
59011 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
59012
59013@@ -1153,7 +1632,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
59014 if (vma->vm_file == NULL)
59015 return 0;
59016
59017- if (FILTER(MAPPED_PRIVATE))
59018+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
59019 goto whole;
59020
59021 /*
59022@@ -1360,9 +1839,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
59023 {
59024 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
59025 int i = 0;
59026- do
59027+ do {
59028 i += 2;
59029- while (auxv[i - 2] != AT_NULL);
59030+ } while (auxv[i - 2] != AT_NULL);
59031 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
59032 }
59033
59034@@ -1371,7 +1850,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
59035 {
59036 mm_segment_t old_fs = get_fs();
59037 set_fs(KERNEL_DS);
59038- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
59039+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
59040 set_fs(old_fs);
59041 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
59042 }
59043@@ -1995,14 +2474,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
59044 }
59045
59046 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
59047- unsigned long mm_flags)
59048+ struct coredump_params *cprm)
59049 {
59050 struct vm_area_struct *vma;
59051 size_t size = 0;
59052
59053 for (vma = first_vma(current, gate_vma); vma != NULL;
59054 vma = next_vma(vma, gate_vma))
59055- size += vma_dump_size(vma, mm_flags);
59056+ size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59057 return size;
59058 }
59059
59060@@ -2093,7 +2572,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59061
59062 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
59063
59064- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
59065+ offset += elf_core_vma_data_size(gate_vma, cprm);
59066 offset += elf_core_extra_data_size();
59067 e_shoff = offset;
59068
59069@@ -2121,7 +2600,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59070 phdr.p_offset = offset;
59071 phdr.p_vaddr = vma->vm_start;
59072 phdr.p_paddr = 0;
59073- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
59074+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59075 phdr.p_memsz = vma->vm_end - vma->vm_start;
59076 offset += phdr.p_filesz;
59077 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
59078@@ -2154,7 +2633,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59079 unsigned long addr;
59080 unsigned long end;
59081
59082- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
59083+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59084
59085 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
59086 struct page *page;
59087@@ -2195,6 +2674,167 @@ out:
59088
59089 #endif /* CONFIG_ELF_CORE */
59090
59091+#ifdef CONFIG_PAX_MPROTECT
59092+/* PaX: non-PIC ELF libraries need relocations on their executable segments
59093+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
59094+ * we'll remove VM_MAYWRITE for good on RELRO segments.
59095+ *
59096+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
59097+ * basis because we want to allow the common case and not the special ones.
59098+ */
59099+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
59100+{
59101+ struct elfhdr elf_h;
59102+ struct elf_phdr elf_p;
59103+ unsigned long i;
59104+ unsigned long oldflags;
59105+ bool is_textrel_rw, is_textrel_rx, is_relro;
59106+
59107+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
59108+ return;
59109+
59110+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
59111+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
59112+
59113+#ifdef CONFIG_PAX_ELFRELOCS
59114+ /* possible TEXTREL */
59115+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
59116+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
59117+#else
59118+ is_textrel_rw = false;
59119+ is_textrel_rx = false;
59120+#endif
59121+
59122+ /* possible RELRO */
59123+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
59124+
59125+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
59126+ return;
59127+
59128+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59129+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59130+
59131+#ifdef CONFIG_PAX_ETEXECRELOCS
59132+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59133+#else
59134+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
59135+#endif
59136+
59137+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59138+ !elf_check_arch(&elf_h) ||
59139+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59140+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59141+ return;
59142+
59143+ for (i = 0UL; i < elf_h.e_phnum; i++) {
59144+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59145+ return;
59146+ switch (elf_p.p_type) {
59147+ case PT_DYNAMIC:
59148+ if (!is_textrel_rw && !is_textrel_rx)
59149+ continue;
59150+ i = 0UL;
59151+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
59152+ elf_dyn dyn;
59153+
59154+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
59155+ break;
59156+ if (dyn.d_tag == DT_NULL)
59157+ break;
59158+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
59159+ gr_log_textrel(vma);
59160+ if (is_textrel_rw)
59161+ vma->vm_flags |= VM_MAYWRITE;
59162+ else
59163+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
59164+ vma->vm_flags &= ~VM_MAYWRITE;
59165+ break;
59166+ }
59167+ i++;
59168+ }
59169+ is_textrel_rw = false;
59170+ is_textrel_rx = false;
59171+ continue;
59172+
59173+ case PT_GNU_RELRO:
59174+ if (!is_relro)
59175+ continue;
59176+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
59177+ vma->vm_flags &= ~VM_MAYWRITE;
59178+ is_relro = false;
59179+ continue;
59180+
59181+#ifdef CONFIG_PAX_PT_PAX_FLAGS
59182+ case PT_PAX_FLAGS: {
59183+ const char *msg_mprotect = "", *msg_emutramp = "";
59184+ char *buffer_lib, *buffer_exe;
59185+
59186+ if (elf_p.p_flags & PF_NOMPROTECT)
59187+ msg_mprotect = "MPROTECT disabled";
59188+
59189+#ifdef CONFIG_PAX_EMUTRAMP
59190+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
59191+ msg_emutramp = "EMUTRAMP enabled";
59192+#endif
59193+
59194+ if (!msg_mprotect[0] && !msg_emutramp[0])
59195+ continue;
59196+
59197+ if (!printk_ratelimit())
59198+ continue;
59199+
59200+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
59201+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
59202+ if (buffer_lib && buffer_exe) {
59203+ char *path_lib, *path_exe;
59204+
59205+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
59206+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
59207+
59208+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
59209+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
59210+
59211+ }
59212+ free_page((unsigned long)buffer_exe);
59213+ free_page((unsigned long)buffer_lib);
59214+ continue;
59215+ }
59216+#endif
59217+
59218+ }
59219+ }
59220+}
59221+#endif
59222+
59223+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59224+
59225+extern int grsec_enable_log_rwxmaps;
59226+
59227+static void elf_handle_mmap(struct file *file)
59228+{
59229+ struct elfhdr elf_h;
59230+ struct elf_phdr elf_p;
59231+ unsigned long i;
59232+
59233+ if (!grsec_enable_log_rwxmaps)
59234+ return;
59235+
59236+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59237+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59238+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
59239+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59240+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59241+ return;
59242+
59243+ for (i = 0UL; i < elf_h.e_phnum; i++) {
59244+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59245+ return;
59246+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
59247+ gr_log_ptgnustack(file);
59248+ }
59249+}
59250+#endif
59251+
59252 static int __init init_elf_binfmt(void)
59253 {
59254 register_binfmt(&elf_format);
59255diff --git a/fs/block_dev.c b/fs/block_dev.c
59256index 1d9c9f3..2905786 100644
59257--- a/fs/block_dev.c
59258+++ b/fs/block_dev.c
59259@@ -697,7 +697,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
59260 else if (bdev->bd_contains == bdev)
59261 return true; /* is a whole device which isn't held */
59262
59263- else if (whole->bd_holder == bd_may_claim)
59264+ else if (whole->bd_holder == (void *)bd_may_claim)
59265 return true; /* is a partition of a device that is being partitioned */
59266 else if (whole->bd_holder != NULL)
59267 return false; /* is a partition of a held device */
59268diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
59269index 150822e..75bb326 100644
59270--- a/fs/btrfs/ctree.c
59271+++ b/fs/btrfs/ctree.c
59272@@ -1173,9 +1173,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
59273 free_extent_buffer(buf);
59274 add_root_to_dirty_list(root);
59275 } else {
59276- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
59277- parent_start = parent->start;
59278- else
59279+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
59280+ if (parent)
59281+ parent_start = parent->start;
59282+ else
59283+ parent_start = 0;
59284+ } else
59285 parent_start = 0;
59286
59287 WARN_ON(trans->transid != btrfs_header_generation(parent));
59288diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
59289index 054577b..9b342cc 100644
59290--- a/fs/btrfs/delayed-inode.c
59291+++ b/fs/btrfs/delayed-inode.c
59292@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
59293
59294 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
59295 {
59296- int seq = atomic_inc_return(&delayed_root->items_seq);
59297+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
59298 if ((atomic_dec_return(&delayed_root->items) <
59299 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
59300 waitqueue_active(&delayed_root->wait))
59301@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
59302
59303 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
59304 {
59305- int val = atomic_read(&delayed_root->items_seq);
59306+ int val = atomic_read_unchecked(&delayed_root->items_seq);
59307
59308 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
59309 return 1;
59310@@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
59311 int seq;
59312 int ret;
59313
59314- seq = atomic_read(&delayed_root->items_seq);
59315+ seq = atomic_read_unchecked(&delayed_root->items_seq);
59316
59317 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
59318 if (ret)
59319diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
59320index f70119f..ab5894d 100644
59321--- a/fs/btrfs/delayed-inode.h
59322+++ b/fs/btrfs/delayed-inode.h
59323@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
59324 */
59325 struct list_head prepare_list;
59326 atomic_t items; /* for delayed items */
59327- atomic_t items_seq; /* for delayed items */
59328+ atomic_unchecked_t items_seq; /* for delayed items */
59329 int nodes; /* for delayed nodes */
59330 wait_queue_head_t wait;
59331 };
59332@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
59333 struct btrfs_delayed_root *delayed_root)
59334 {
59335 atomic_set(&delayed_root->items, 0);
59336- atomic_set(&delayed_root->items_seq, 0);
59337+ atomic_set_unchecked(&delayed_root->items_seq, 0);
59338 delayed_root->nodes = 0;
59339 spin_lock_init(&delayed_root->lock);
59340 init_waitqueue_head(&delayed_root->wait);
59341diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
59342index 4399f0c..a34d8b4 100644
59343--- a/fs/btrfs/ioctl.c
59344+++ b/fs/btrfs/ioctl.c
59345@@ -3953,9 +3953,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
59346 for (i = 0; i < num_types; i++) {
59347 struct btrfs_space_info *tmp;
59348
59349+ /* Don't copy in more than we allocated */
59350 if (!slot_count)
59351 break;
59352
59353+ slot_count--;
59354+
59355 info = NULL;
59356 rcu_read_lock();
59357 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
59358@@ -3977,10 +3980,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
59359 memcpy(dest, &space, sizeof(space));
59360 dest++;
59361 space_args.total_spaces++;
59362- slot_count--;
59363 }
59364- if (!slot_count)
59365- break;
59366 }
59367 up_read(&info->groups_sem);
59368 }
59369diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
59370index cde9c03..ad4d4db 100644
59371--- a/fs/btrfs/super.c
59372+++ b/fs/btrfs/super.c
59373@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
59374 function, line, errstr);
59375 return;
59376 }
59377- ACCESS_ONCE(trans->transaction->aborted) = errno;
59378+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
59379 /* Wake up anybody who may be waiting on this transaction */
59380 wake_up(&root->fs_info->transaction_wait);
59381 wake_up(&root->fs_info->transaction_blocked_wait);
59382diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
59383index b2e7bb4..3719201 100644
59384--- a/fs/btrfs/sysfs.c
59385+++ b/fs/btrfs/sysfs.c
59386@@ -480,7 +480,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
59387 for (set = 0; set < FEAT_MAX; set++) {
59388 int i;
59389 struct attribute *attrs[2];
59390- struct attribute_group agroup = {
59391+ attribute_group_no_const agroup = {
59392 .name = "features",
59393 .attrs = attrs,
59394 };
59395diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
59396index 2299bfd..4098e72 100644
59397--- a/fs/btrfs/tests/free-space-tests.c
59398+++ b/fs/btrfs/tests/free-space-tests.c
59399@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59400 * extent entry.
59401 */
59402 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
59403- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59404+ pax_open_kernel();
59405+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59406+ pax_close_kernel();
59407
59408 /*
59409 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
59410@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59411 if (ret)
59412 return ret;
59413
59414- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59415+ pax_open_kernel();
59416+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59417+ pax_close_kernel();
59418 __btrfs_remove_free_space_cache(cache->free_space_ctl);
59419
59420 return 0;
59421diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
59422index 154990c..d0cf699 100644
59423--- a/fs/btrfs/tree-log.h
59424+++ b/fs/btrfs/tree-log.h
59425@@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
59426 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
59427 struct btrfs_trans_handle *trans)
59428 {
59429- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
59430+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
59431 }
59432
59433 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
59434diff --git a/fs/buffer.c b/fs/buffer.c
59435index 20805db..2e8fc69 100644
59436--- a/fs/buffer.c
59437+++ b/fs/buffer.c
59438@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
59439 bh_cachep = kmem_cache_create("buffer_head",
59440 sizeof(struct buffer_head), 0,
59441 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
59442- SLAB_MEM_SPREAD),
59443+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
59444 NULL);
59445
59446 /*
59447diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
59448index fbb08e9..0fda764 100644
59449--- a/fs/cachefiles/bind.c
59450+++ b/fs/cachefiles/bind.c
59451@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
59452 args);
59453
59454 /* start by checking things over */
59455- ASSERT(cache->fstop_percent >= 0 &&
59456- cache->fstop_percent < cache->fcull_percent &&
59457+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
59458 cache->fcull_percent < cache->frun_percent &&
59459 cache->frun_percent < 100);
59460
59461- ASSERT(cache->bstop_percent >= 0 &&
59462- cache->bstop_percent < cache->bcull_percent &&
59463+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
59464 cache->bcull_percent < cache->brun_percent &&
59465 cache->brun_percent < 100);
59466
59467diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
59468index ce1b115..4a6852c 100644
59469--- a/fs/cachefiles/daemon.c
59470+++ b/fs/cachefiles/daemon.c
59471@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
59472 if (n > buflen)
59473 return -EMSGSIZE;
59474
59475- if (copy_to_user(_buffer, buffer, n) != 0)
59476+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
59477 return -EFAULT;
59478
59479 return n;
59480@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
59481 if (test_bit(CACHEFILES_DEAD, &cache->flags))
59482 return -EIO;
59483
59484- if (datalen < 0 || datalen > PAGE_SIZE - 1)
59485+ if (datalen > PAGE_SIZE - 1)
59486 return -EOPNOTSUPP;
59487
59488 /* drag the command string into the kernel so we can parse it */
59489@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
59490 if (args[0] != '%' || args[1] != '\0')
59491 return -EINVAL;
59492
59493- if (fstop < 0 || fstop >= cache->fcull_percent)
59494+ if (fstop >= cache->fcull_percent)
59495 return cachefiles_daemon_range_error(cache, args);
59496
59497 cache->fstop_percent = fstop;
59498@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
59499 if (args[0] != '%' || args[1] != '\0')
59500 return -EINVAL;
59501
59502- if (bstop < 0 || bstop >= cache->bcull_percent)
59503+ if (bstop >= cache->bcull_percent)
59504 return cachefiles_daemon_range_error(cache, args);
59505
59506 cache->bstop_percent = bstop;
59507diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
59508index 8c52472..c4e3a69 100644
59509--- a/fs/cachefiles/internal.h
59510+++ b/fs/cachefiles/internal.h
59511@@ -66,7 +66,7 @@ struct cachefiles_cache {
59512 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
59513 struct rb_root active_nodes; /* active nodes (can't be culled) */
59514 rwlock_t active_lock; /* lock for active_nodes */
59515- atomic_t gravecounter; /* graveyard uniquifier */
59516+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
59517 unsigned frun_percent; /* when to stop culling (% files) */
59518 unsigned fcull_percent; /* when to start culling (% files) */
59519 unsigned fstop_percent; /* when to stop allocating (% files) */
59520@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
59521 * proc.c
59522 */
59523 #ifdef CONFIG_CACHEFILES_HISTOGRAM
59524-extern atomic_t cachefiles_lookup_histogram[HZ];
59525-extern atomic_t cachefiles_mkdir_histogram[HZ];
59526-extern atomic_t cachefiles_create_histogram[HZ];
59527+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59528+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59529+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
59530
59531 extern int __init cachefiles_proc_init(void);
59532 extern void cachefiles_proc_cleanup(void);
59533 static inline
59534-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
59535+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
59536 {
59537 unsigned long jif = jiffies - start_jif;
59538 if (jif >= HZ)
59539 jif = HZ - 1;
59540- atomic_inc(&histogram[jif]);
59541+ atomic_inc_unchecked(&histogram[jif]);
59542 }
59543
59544 #else
59545diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
59546index e12f189..ed17244 100644
59547--- a/fs/cachefiles/namei.c
59548+++ b/fs/cachefiles/namei.c
59549@@ -312,7 +312,7 @@ try_again:
59550 /* first step is to make up a grave dentry in the graveyard */
59551 sprintf(nbuffer, "%08x%08x",
59552 (uint32_t) get_seconds(),
59553- (uint32_t) atomic_inc_return(&cache->gravecounter));
59554+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
59555
59556 /* do the multiway lock magic */
59557 trap = lock_rename(cache->graveyard, dir);
59558diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
59559index eccd339..4c1d995 100644
59560--- a/fs/cachefiles/proc.c
59561+++ b/fs/cachefiles/proc.c
59562@@ -14,9 +14,9 @@
59563 #include <linux/seq_file.h>
59564 #include "internal.h"
59565
59566-atomic_t cachefiles_lookup_histogram[HZ];
59567-atomic_t cachefiles_mkdir_histogram[HZ];
59568-atomic_t cachefiles_create_histogram[HZ];
59569+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59570+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59571+atomic_unchecked_t cachefiles_create_histogram[HZ];
59572
59573 /*
59574 * display the latency histogram
59575@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
59576 return 0;
59577 default:
59578 index = (unsigned long) v - 3;
59579- x = atomic_read(&cachefiles_lookup_histogram[index]);
59580- y = atomic_read(&cachefiles_mkdir_histogram[index]);
59581- z = atomic_read(&cachefiles_create_histogram[index]);
59582+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
59583+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
59584+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
59585 if (x == 0 && y == 0 && z == 0)
59586 return 0;
59587
59588diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
59589index 695e788..f4a9d4d 100644
59590--- a/fs/ceph/dir.c
59591+++ b/fs/ceph/dir.c
59592@@ -129,6 +129,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
59593 struct dentry *dentry, *last;
59594 struct ceph_dentry_info *di;
59595 int err = 0;
59596+ char d_name[DNAME_INLINE_LEN];
59597+ const unsigned char *name;
59598
59599 /* claim ref on last dentry we returned */
59600 last = fi->dentry;
59601@@ -192,7 +194,12 @@ more:
59602
59603 dout(" %llu (%llu) dentry %p %.*s %p\n", di->offset, ctx->pos,
59604 dentry, dentry->d_name.len, dentry->d_name.name, dentry->d_inode);
59605- if (!dir_emit(ctx, dentry->d_name.name,
59606+ name = dentry->d_name.name;
59607+ if (name == dentry->d_iname) {
59608+ memcpy(d_name, name, dentry->d_name.len);
59609+ name = d_name;
59610+ }
59611+ if (!dir_emit(ctx, name,
59612 dentry->d_name.len,
59613 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
59614 dentry->d_inode->i_mode >> 12)) {
59615@@ -250,7 +257,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
59616 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
59617 struct ceph_mds_client *mdsc = fsc->mdsc;
59618 unsigned frag = fpos_frag(ctx->pos);
59619- int off = fpos_off(ctx->pos);
59620+ unsigned int off = fpos_off(ctx->pos);
59621 int err;
59622 u32 ftype;
59623 struct ceph_mds_reply_info_parsed *rinfo;
59624diff --git a/fs/ceph/super.c b/fs/ceph/super.c
59625index f6e1237..796ffd1 100644
59626--- a/fs/ceph/super.c
59627+++ b/fs/ceph/super.c
59628@@ -895,7 +895,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
59629 /*
59630 * construct our own bdi so we can control readahead, etc.
59631 */
59632-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
59633+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
59634
59635 static int ceph_register_bdi(struct super_block *sb,
59636 struct ceph_fs_client *fsc)
59637@@ -912,7 +912,7 @@ static int ceph_register_bdi(struct super_block *sb,
59638 default_backing_dev_info.ra_pages;
59639
59640 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
59641- atomic_long_inc_return(&bdi_seq));
59642+ atomic_long_inc_return_unchecked(&bdi_seq));
59643 if (!err)
59644 sb->s_bdi = &fsc->backing_dev_info;
59645 return err;
59646diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
59647index 44ec726..bcb06a3 100644
59648--- a/fs/cifs/cifs_debug.c
59649+++ b/fs/cifs/cifs_debug.c
59650@@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
59651
59652 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
59653 #ifdef CONFIG_CIFS_STATS2
59654- atomic_set(&totBufAllocCount, 0);
59655- atomic_set(&totSmBufAllocCount, 0);
59656+ atomic_set_unchecked(&totBufAllocCount, 0);
59657+ atomic_set_unchecked(&totSmBufAllocCount, 0);
59658 #endif /* CONFIG_CIFS_STATS2 */
59659 spin_lock(&cifs_tcp_ses_lock);
59660 list_for_each(tmp1, &cifs_tcp_ses_list) {
59661@@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
59662 tcon = list_entry(tmp3,
59663 struct cifs_tcon,
59664 tcon_list);
59665- atomic_set(&tcon->num_smbs_sent, 0);
59666+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
59667 if (server->ops->clear_stats)
59668 server->ops->clear_stats(tcon);
59669 }
59670@@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
59671 smBufAllocCount.counter, cifs_min_small);
59672 #ifdef CONFIG_CIFS_STATS2
59673 seq_printf(m, "Total Large %d Small %d Allocations\n",
59674- atomic_read(&totBufAllocCount),
59675- atomic_read(&totSmBufAllocCount));
59676+ atomic_read_unchecked(&totBufAllocCount),
59677+ atomic_read_unchecked(&totSmBufAllocCount));
59678 #endif /* CONFIG_CIFS_STATS2 */
59679
59680 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
59681@@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
59682 if (tcon->need_reconnect)
59683 seq_puts(m, "\tDISCONNECTED ");
59684 seq_printf(m, "\nSMBs: %d",
59685- atomic_read(&tcon->num_smbs_sent));
59686+ atomic_read_unchecked(&tcon->num_smbs_sent));
59687 if (server->ops->print_stats)
59688 server->ops->print_stats(m, tcon);
59689 }
59690diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
59691index 9d7996e..35ad5cf4 100644
59692--- a/fs/cifs/cifsfs.c
59693+++ b/fs/cifs/cifsfs.c
59694@@ -1093,7 +1093,7 @@ cifs_init_request_bufs(void)
59695 */
59696 cifs_req_cachep = kmem_cache_create("cifs_request",
59697 CIFSMaxBufSize + max_hdr_size, 0,
59698- SLAB_HWCACHE_ALIGN, NULL);
59699+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
59700 if (cifs_req_cachep == NULL)
59701 return -ENOMEM;
59702
59703@@ -1120,7 +1120,7 @@ cifs_init_request_bufs(void)
59704 efficient to alloc 1 per page off the slab compared to 17K (5page)
59705 alloc of large cifs buffers even when page debugging is on */
59706 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
59707- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
59708+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
59709 NULL);
59710 if (cifs_sm_req_cachep == NULL) {
59711 mempool_destroy(cifs_req_poolp);
59712@@ -1205,8 +1205,8 @@ init_cifs(void)
59713 atomic_set(&bufAllocCount, 0);
59714 atomic_set(&smBufAllocCount, 0);
59715 #ifdef CONFIG_CIFS_STATS2
59716- atomic_set(&totBufAllocCount, 0);
59717- atomic_set(&totSmBufAllocCount, 0);
59718+ atomic_set_unchecked(&totBufAllocCount, 0);
59719+ atomic_set_unchecked(&totSmBufAllocCount, 0);
59720 #endif /* CONFIG_CIFS_STATS2 */
59721
59722 atomic_set(&midCount, 0);
59723diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
59724index 02a33e5..3a28b5a 100644
59725--- a/fs/cifs/cifsglob.h
59726+++ b/fs/cifs/cifsglob.h
59727@@ -823,35 +823,35 @@ struct cifs_tcon {
59728 __u16 Flags; /* optional support bits */
59729 enum statusEnum tidStatus;
59730 #ifdef CONFIG_CIFS_STATS
59731- atomic_t num_smbs_sent;
59732+ atomic_unchecked_t num_smbs_sent;
59733 union {
59734 struct {
59735- atomic_t num_writes;
59736- atomic_t num_reads;
59737- atomic_t num_flushes;
59738- atomic_t num_oplock_brks;
59739- atomic_t num_opens;
59740- atomic_t num_closes;
59741- atomic_t num_deletes;
59742- atomic_t num_mkdirs;
59743- atomic_t num_posixopens;
59744- atomic_t num_posixmkdirs;
59745- atomic_t num_rmdirs;
59746- atomic_t num_renames;
59747- atomic_t num_t2renames;
59748- atomic_t num_ffirst;
59749- atomic_t num_fnext;
59750- atomic_t num_fclose;
59751- atomic_t num_hardlinks;
59752- atomic_t num_symlinks;
59753- atomic_t num_locks;
59754- atomic_t num_acl_get;
59755- atomic_t num_acl_set;
59756+ atomic_unchecked_t num_writes;
59757+ atomic_unchecked_t num_reads;
59758+ atomic_unchecked_t num_flushes;
59759+ atomic_unchecked_t num_oplock_brks;
59760+ atomic_unchecked_t num_opens;
59761+ atomic_unchecked_t num_closes;
59762+ atomic_unchecked_t num_deletes;
59763+ atomic_unchecked_t num_mkdirs;
59764+ atomic_unchecked_t num_posixopens;
59765+ atomic_unchecked_t num_posixmkdirs;
59766+ atomic_unchecked_t num_rmdirs;
59767+ atomic_unchecked_t num_renames;
59768+ atomic_unchecked_t num_t2renames;
59769+ atomic_unchecked_t num_ffirst;
59770+ atomic_unchecked_t num_fnext;
59771+ atomic_unchecked_t num_fclose;
59772+ atomic_unchecked_t num_hardlinks;
59773+ atomic_unchecked_t num_symlinks;
59774+ atomic_unchecked_t num_locks;
59775+ atomic_unchecked_t num_acl_get;
59776+ atomic_unchecked_t num_acl_set;
59777 } cifs_stats;
59778 #ifdef CONFIG_CIFS_SMB2
59779 struct {
59780- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
59781- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
59782+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
59783+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
59784 } smb2_stats;
59785 #endif /* CONFIG_CIFS_SMB2 */
59786 } stats;
59787@@ -1192,7 +1192,7 @@ convert_delimiter(char *path, char delim)
59788 }
59789
59790 #ifdef CONFIG_CIFS_STATS
59791-#define cifs_stats_inc atomic_inc
59792+#define cifs_stats_inc atomic_inc_unchecked
59793
59794 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
59795 unsigned int bytes)
59796@@ -1559,8 +1559,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
59797 /* Various Debug counters */
59798 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
59799 #ifdef CONFIG_CIFS_STATS2
59800-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
59801-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
59802+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
59803+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
59804 #endif
59805 GLOBAL_EXTERN atomic_t smBufAllocCount;
59806 GLOBAL_EXTERN atomic_t midCount;
59807diff --git a/fs/cifs/file.c b/fs/cifs/file.c
59808index 3e4d00a..38a122d 100644
59809--- a/fs/cifs/file.c
59810+++ b/fs/cifs/file.c
59811@@ -2056,10 +2056,14 @@ static int cifs_writepages(struct address_space *mapping,
59812 index = mapping->writeback_index; /* Start from prev offset */
59813 end = -1;
59814 } else {
59815- index = wbc->range_start >> PAGE_CACHE_SHIFT;
59816- end = wbc->range_end >> PAGE_CACHE_SHIFT;
59817- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
59818+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
59819 range_whole = true;
59820+ index = 0;
59821+ end = ULONG_MAX;
59822+ } else {
59823+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
59824+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
59825+ }
59826 scanned = true;
59827 }
59828 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
59829diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
59830index b7415d5..3984ec0 100644
59831--- a/fs/cifs/misc.c
59832+++ b/fs/cifs/misc.c
59833@@ -170,7 +170,7 @@ cifs_buf_get(void)
59834 memset(ret_buf, 0, buf_size + 3);
59835 atomic_inc(&bufAllocCount);
59836 #ifdef CONFIG_CIFS_STATS2
59837- atomic_inc(&totBufAllocCount);
59838+ atomic_inc_unchecked(&totBufAllocCount);
59839 #endif /* CONFIG_CIFS_STATS2 */
59840 }
59841
59842@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
59843 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
59844 atomic_inc(&smBufAllocCount);
59845 #ifdef CONFIG_CIFS_STATS2
59846- atomic_inc(&totSmBufAllocCount);
59847+ atomic_inc_unchecked(&totSmBufAllocCount);
59848 #endif /* CONFIG_CIFS_STATS2 */
59849
59850 }
59851diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
59852index d297903..1cb7516 100644
59853--- a/fs/cifs/smb1ops.c
59854+++ b/fs/cifs/smb1ops.c
59855@@ -622,27 +622,27 @@ static void
59856 cifs_clear_stats(struct cifs_tcon *tcon)
59857 {
59858 #ifdef CONFIG_CIFS_STATS
59859- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
59860- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
59861- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
59862- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
59863- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
59864- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
59865- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
59866- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
59867- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
59868- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
59869- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
59870- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
59871- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
59872- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
59873- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
59874- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
59875- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
59876- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
59877- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
59878- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
59879- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
59880+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
59881+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
59882+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
59883+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
59884+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
59885+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
59886+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
59887+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
59888+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
59889+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
59890+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
59891+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
59892+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
59893+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
59894+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
59895+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
59896+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
59897+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
59898+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
59899+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
59900+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
59901 #endif
59902 }
59903
59904@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
59905 {
59906 #ifdef CONFIG_CIFS_STATS
59907 seq_printf(m, " Oplocks breaks: %d",
59908- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
59909+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
59910 seq_printf(m, "\nReads: %d Bytes: %llu",
59911- atomic_read(&tcon->stats.cifs_stats.num_reads),
59912+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
59913 (long long)(tcon->bytes_read));
59914 seq_printf(m, "\nWrites: %d Bytes: %llu",
59915- atomic_read(&tcon->stats.cifs_stats.num_writes),
59916+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
59917 (long long)(tcon->bytes_written));
59918 seq_printf(m, "\nFlushes: %d",
59919- atomic_read(&tcon->stats.cifs_stats.num_flushes));
59920+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
59921 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
59922- atomic_read(&tcon->stats.cifs_stats.num_locks),
59923- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
59924- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
59925+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
59926+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
59927+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
59928 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
59929- atomic_read(&tcon->stats.cifs_stats.num_opens),
59930- atomic_read(&tcon->stats.cifs_stats.num_closes),
59931- atomic_read(&tcon->stats.cifs_stats.num_deletes));
59932+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
59933+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
59934+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
59935 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
59936- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
59937- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
59938+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
59939+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
59940 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
59941- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
59942- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
59943+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
59944+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
59945 seq_printf(m, "\nRenames: %d T2 Renames %d",
59946- atomic_read(&tcon->stats.cifs_stats.num_renames),
59947- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
59948+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
59949+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
59950 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
59951- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
59952- atomic_read(&tcon->stats.cifs_stats.num_fnext),
59953- atomic_read(&tcon->stats.cifs_stats.num_fclose));
59954+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
59955+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
59956+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
59957 #endif
59958 }
59959
59960diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
59961index c5f521b..1a40865 100644
59962--- a/fs/cifs/smb2ops.c
59963+++ b/fs/cifs/smb2ops.c
59964@@ -417,8 +417,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
59965 #ifdef CONFIG_CIFS_STATS
59966 int i;
59967 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
59968- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
59969- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
59970+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
59971+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
59972 }
59973 #endif
59974 }
59975@@ -458,65 +458,65 @@ static void
59976 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
59977 {
59978 #ifdef CONFIG_CIFS_STATS
59979- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
59980- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
59981+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
59982+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
59983 seq_printf(m, "\nNegotiates: %d sent %d failed",
59984- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
59985- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
59986+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
59987+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
59988 seq_printf(m, "\nSessionSetups: %d sent %d failed",
59989- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
59990- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
59991+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
59992+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
59993 seq_printf(m, "\nLogoffs: %d sent %d failed",
59994- atomic_read(&sent[SMB2_LOGOFF_HE]),
59995- atomic_read(&failed[SMB2_LOGOFF_HE]));
59996+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
59997+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
59998 seq_printf(m, "\nTreeConnects: %d sent %d failed",
59999- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
60000- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
60001+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
60002+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
60003 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
60004- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
60005- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
60006+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
60007+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
60008 seq_printf(m, "\nCreates: %d sent %d failed",
60009- atomic_read(&sent[SMB2_CREATE_HE]),
60010- atomic_read(&failed[SMB2_CREATE_HE]));
60011+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
60012+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
60013 seq_printf(m, "\nCloses: %d sent %d failed",
60014- atomic_read(&sent[SMB2_CLOSE_HE]),
60015- atomic_read(&failed[SMB2_CLOSE_HE]));
60016+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
60017+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
60018 seq_printf(m, "\nFlushes: %d sent %d failed",
60019- atomic_read(&sent[SMB2_FLUSH_HE]),
60020- atomic_read(&failed[SMB2_FLUSH_HE]));
60021+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
60022+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
60023 seq_printf(m, "\nReads: %d sent %d failed",
60024- atomic_read(&sent[SMB2_READ_HE]),
60025- atomic_read(&failed[SMB2_READ_HE]));
60026+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
60027+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
60028 seq_printf(m, "\nWrites: %d sent %d failed",
60029- atomic_read(&sent[SMB2_WRITE_HE]),
60030- atomic_read(&failed[SMB2_WRITE_HE]));
60031+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
60032+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
60033 seq_printf(m, "\nLocks: %d sent %d failed",
60034- atomic_read(&sent[SMB2_LOCK_HE]),
60035- atomic_read(&failed[SMB2_LOCK_HE]));
60036+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
60037+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
60038 seq_printf(m, "\nIOCTLs: %d sent %d failed",
60039- atomic_read(&sent[SMB2_IOCTL_HE]),
60040- atomic_read(&failed[SMB2_IOCTL_HE]));
60041+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
60042+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
60043 seq_printf(m, "\nCancels: %d sent %d failed",
60044- atomic_read(&sent[SMB2_CANCEL_HE]),
60045- atomic_read(&failed[SMB2_CANCEL_HE]));
60046+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
60047+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
60048 seq_printf(m, "\nEchos: %d sent %d failed",
60049- atomic_read(&sent[SMB2_ECHO_HE]),
60050- atomic_read(&failed[SMB2_ECHO_HE]));
60051+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
60052+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
60053 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
60054- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
60055- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
60056+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
60057+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
60058 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
60059- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
60060- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
60061+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
60062+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
60063 seq_printf(m, "\nQueryInfos: %d sent %d failed",
60064- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
60065- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
60066+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
60067+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
60068 seq_printf(m, "\nSetInfos: %d sent %d failed",
60069- atomic_read(&sent[SMB2_SET_INFO_HE]),
60070- atomic_read(&failed[SMB2_SET_INFO_HE]));
60071+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
60072+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
60073 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
60074- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
60075- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
60076+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
60077+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
60078 #endif
60079 }
60080
60081diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
60082index 8f1672b..af339c07 100644
60083--- a/fs/cifs/smb2pdu.c
60084+++ b/fs/cifs/smb2pdu.c
60085@@ -2145,8 +2145,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
60086 default:
60087 cifs_dbg(VFS, "info level %u isn't supported\n",
60088 srch_inf->info_level);
60089- rc = -EINVAL;
60090- goto qdir_exit;
60091+ return -EINVAL;
60092 }
60093
60094 req->FileIndex = cpu_to_le32(index);
60095diff --git a/fs/coda/cache.c b/fs/coda/cache.c
60096index 46ee6f2..89a9e7f 100644
60097--- a/fs/coda/cache.c
60098+++ b/fs/coda/cache.c
60099@@ -24,7 +24,7 @@
60100 #include "coda_linux.h"
60101 #include "coda_cache.h"
60102
60103-static atomic_t permission_epoch = ATOMIC_INIT(0);
60104+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
60105
60106 /* replace or extend an acl cache hit */
60107 void coda_cache_enter(struct inode *inode, int mask)
60108@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
60109 struct coda_inode_info *cii = ITOC(inode);
60110
60111 spin_lock(&cii->c_lock);
60112- cii->c_cached_epoch = atomic_read(&permission_epoch);
60113+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
60114 if (!uid_eq(cii->c_uid, current_fsuid())) {
60115 cii->c_uid = current_fsuid();
60116 cii->c_cached_perm = mask;
60117@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
60118 {
60119 struct coda_inode_info *cii = ITOC(inode);
60120 spin_lock(&cii->c_lock);
60121- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
60122+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
60123 spin_unlock(&cii->c_lock);
60124 }
60125
60126 /* remove all acl caches */
60127 void coda_cache_clear_all(struct super_block *sb)
60128 {
60129- atomic_inc(&permission_epoch);
60130+ atomic_inc_unchecked(&permission_epoch);
60131 }
60132
60133
60134@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
60135 spin_lock(&cii->c_lock);
60136 hit = (mask & cii->c_cached_perm) == mask &&
60137 uid_eq(cii->c_uid, current_fsuid()) &&
60138- cii->c_cached_epoch == atomic_read(&permission_epoch);
60139+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
60140 spin_unlock(&cii->c_lock);
60141
60142 return hit;
60143diff --git a/fs/compat.c b/fs/compat.c
60144index b13df99..6f6f4a3 100644
60145--- a/fs/compat.c
60146+++ b/fs/compat.c
60147@@ -54,7 +54,7 @@
60148 #include <asm/ioctls.h>
60149 #include "internal.h"
60150
60151-int compat_log = 1;
60152+int compat_log = 0;
60153
60154 int compat_printk(const char *fmt, ...)
60155 {
60156@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
60157
60158 set_fs(KERNEL_DS);
60159 /* The __user pointer cast is valid because of the set_fs() */
60160- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
60161+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
60162 set_fs(oldfs);
60163 /* truncating is ok because it's a user address */
60164 if (!ret)
60165@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
60166 goto out;
60167
60168 ret = -EINVAL;
60169- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
60170+ if (nr_segs > UIO_MAXIOV)
60171 goto out;
60172 if (nr_segs > fast_segs) {
60173 ret = -ENOMEM;
60174@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
60175 struct compat_readdir_callback {
60176 struct dir_context ctx;
60177 struct compat_old_linux_dirent __user *dirent;
60178+ struct file * file;
60179 int result;
60180 };
60181
60182@@ -861,6 +862,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
60183 buf->result = -EOVERFLOW;
60184 return -EOVERFLOW;
60185 }
60186+
60187+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60188+ return 0;
60189+
60190 buf->result++;
60191 dirent = buf->dirent;
60192 if (!access_ok(VERIFY_WRITE, dirent,
60193@@ -892,6 +897,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
60194 if (!f.file)
60195 return -EBADF;
60196
60197+ buf.file = f.file;
60198 error = iterate_dir(f.file, &buf.ctx);
60199 if (buf.result)
60200 error = buf.result;
60201@@ -911,6 +917,7 @@ struct compat_getdents_callback {
60202 struct dir_context ctx;
60203 struct compat_linux_dirent __user *current_dir;
60204 struct compat_linux_dirent __user *previous;
60205+ struct file * file;
60206 int count;
60207 int error;
60208 };
60209@@ -932,6 +939,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
60210 buf->error = -EOVERFLOW;
60211 return -EOVERFLOW;
60212 }
60213+
60214+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60215+ return 0;
60216+
60217 dirent = buf->previous;
60218 if (dirent) {
60219 if (__put_user(offset, &dirent->d_off))
60220@@ -977,6 +988,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
60221 if (!f.file)
60222 return -EBADF;
60223
60224+ buf.file = f.file;
60225 error = iterate_dir(f.file, &buf.ctx);
60226 if (error >= 0)
60227 error = buf.error;
60228@@ -997,6 +1009,7 @@ struct compat_getdents_callback64 {
60229 struct dir_context ctx;
60230 struct linux_dirent64 __user *current_dir;
60231 struct linux_dirent64 __user *previous;
60232+ struct file * file;
60233 int count;
60234 int error;
60235 };
60236@@ -1013,6 +1026,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
60237 buf->error = -EINVAL; /* only used if we fail.. */
60238 if (reclen > buf->count)
60239 return -EINVAL;
60240+
60241+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60242+ return 0;
60243+
60244 dirent = buf->previous;
60245
60246 if (dirent) {
60247@@ -1062,6 +1079,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
60248 if (!f.file)
60249 return -EBADF;
60250
60251+ buf.file = f.file;
60252 error = iterate_dir(f.file, &buf.ctx);
60253 if (error >= 0)
60254 error = buf.error;
60255diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
60256index 4d24d17..4f8c09e 100644
60257--- a/fs/compat_binfmt_elf.c
60258+++ b/fs/compat_binfmt_elf.c
60259@@ -30,11 +30,13 @@
60260 #undef elf_phdr
60261 #undef elf_shdr
60262 #undef elf_note
60263+#undef elf_dyn
60264 #undef elf_addr_t
60265 #define elfhdr elf32_hdr
60266 #define elf_phdr elf32_phdr
60267 #define elf_shdr elf32_shdr
60268 #define elf_note elf32_note
60269+#define elf_dyn Elf32_Dyn
60270 #define elf_addr_t Elf32_Addr
60271
60272 /*
60273diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
60274index afec645..9c65620 100644
60275--- a/fs/compat_ioctl.c
60276+++ b/fs/compat_ioctl.c
60277@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
60278 return -EFAULT;
60279 if (__get_user(udata, &ss32->iomem_base))
60280 return -EFAULT;
60281- ss.iomem_base = compat_ptr(udata);
60282+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
60283 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
60284 __get_user(ss.port_high, &ss32->port_high))
60285 return -EFAULT;
60286@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
60287 for (i = 0; i < nmsgs; i++) {
60288 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
60289 return -EFAULT;
60290- if (get_user(datap, &umsgs[i].buf) ||
60291- put_user(compat_ptr(datap), &tmsgs[i].buf))
60292+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
60293+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
60294 return -EFAULT;
60295 }
60296 return sys_ioctl(fd, cmd, (unsigned long)tdata);
60297@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
60298 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
60299 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
60300 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
60301- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
60302+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
60303 return -EFAULT;
60304
60305 return ioctl_preallocate(file, p);
60306@@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
60307 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
60308 {
60309 unsigned int a, b;
60310- a = *(unsigned int *)p;
60311- b = *(unsigned int *)q;
60312+ a = *(const unsigned int *)p;
60313+ b = *(const unsigned int *)q;
60314 if (a > b)
60315 return 1;
60316 if (a < b)
60317diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
60318index 668dcab..daebcd6 100644
60319--- a/fs/configfs/dir.c
60320+++ b/fs/configfs/dir.c
60321@@ -1548,7 +1548,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60322 }
60323 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
60324 struct configfs_dirent *next;
60325- const char *name;
60326+ const unsigned char * name;
60327+ char d_name[sizeof(next->s_dentry->d_iname)];
60328 int len;
60329 struct inode *inode = NULL;
60330
60331@@ -1557,7 +1558,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60332 continue;
60333
60334 name = configfs_get_name(next);
60335- len = strlen(name);
60336+ if (next->s_dentry && name == next->s_dentry->d_iname) {
60337+ len = next->s_dentry->d_name.len;
60338+ memcpy(d_name, name, len);
60339+ name = d_name;
60340+ } else
60341+ len = strlen(name);
60342
60343 /*
60344 * We'll have a dentry and an inode for
60345diff --git a/fs/coredump.c b/fs/coredump.c
60346index b5c86ff..0dac262 100644
60347--- a/fs/coredump.c
60348+++ b/fs/coredump.c
60349@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
60350 struct pipe_inode_info *pipe = file->private_data;
60351
60352 pipe_lock(pipe);
60353- pipe->readers++;
60354- pipe->writers--;
60355+ atomic_inc(&pipe->readers);
60356+ atomic_dec(&pipe->writers);
60357 wake_up_interruptible_sync(&pipe->wait);
60358 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60359 pipe_unlock(pipe);
60360@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
60361 * We actually want wait_event_freezable() but then we need
60362 * to clear TIF_SIGPENDING and improve dump_interrupted().
60363 */
60364- wait_event_interruptible(pipe->wait, pipe->readers == 1);
60365+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
60366
60367 pipe_lock(pipe);
60368- pipe->readers--;
60369- pipe->writers++;
60370+ atomic_dec(&pipe->readers);
60371+ atomic_inc(&pipe->writers);
60372 pipe_unlock(pipe);
60373 }
60374
60375@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
60376 struct files_struct *displaced;
60377 bool need_nonrelative = false;
60378 bool core_dumped = false;
60379- static atomic_t core_dump_count = ATOMIC_INIT(0);
60380+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
60381+ long signr = siginfo->si_signo;
60382+ int dumpable;
60383 struct coredump_params cprm = {
60384 .siginfo = siginfo,
60385 .regs = signal_pt_regs(),
60386@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
60387 .mm_flags = mm->flags,
60388 };
60389
60390- audit_core_dumps(siginfo->si_signo);
60391+ audit_core_dumps(signr);
60392+
60393+ dumpable = __get_dumpable(cprm.mm_flags);
60394+
60395+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
60396+ gr_handle_brute_attach(dumpable);
60397
60398 binfmt = mm->binfmt;
60399 if (!binfmt || !binfmt->core_dump)
60400 goto fail;
60401- if (!__get_dumpable(cprm.mm_flags))
60402+ if (!dumpable)
60403 goto fail;
60404
60405 cred = prepare_creds();
60406@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
60407 need_nonrelative = true;
60408 }
60409
60410- retval = coredump_wait(siginfo->si_signo, &core_state);
60411+ retval = coredump_wait(signr, &core_state);
60412 if (retval < 0)
60413 goto fail_creds;
60414
60415@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
60416 }
60417 cprm.limit = RLIM_INFINITY;
60418
60419- dump_count = atomic_inc_return(&core_dump_count);
60420+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
60421 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
60422 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
60423 task_tgid_vnr(current), current->comm);
60424@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
60425 } else {
60426 struct inode *inode;
60427
60428+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
60429+
60430 if (cprm.limit < binfmt->min_coredump)
60431 goto fail_unlock;
60432
60433@@ -681,7 +690,7 @@ close_fail:
60434 filp_close(cprm.file, NULL);
60435 fail_dropcount:
60436 if (ispipe)
60437- atomic_dec(&core_dump_count);
60438+ atomic_dec_unchecked(&core_dump_count);
60439 fail_unlock:
60440 kfree(cn.corename);
60441 coredump_finish(mm, core_dumped);
60442@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
60443 struct file *file = cprm->file;
60444 loff_t pos = file->f_pos;
60445 ssize_t n;
60446+
60447+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
60448 if (cprm->written + nr > cprm->limit)
60449 return 0;
60450 while (nr) {
60451diff --git a/fs/dcache.c b/fs/dcache.c
60452index 03dca3c..f66c622 100644
60453--- a/fs/dcache.c
60454+++ b/fs/dcache.c
60455@@ -508,7 +508,7 @@ static void __dentry_kill(struct dentry *dentry)
60456 * dentry_iput drops the locks, at which point nobody (except
60457 * transient RCU lookups) can reach this dentry.
60458 */
60459- BUG_ON((int)dentry->d_lockref.count > 0);
60460+ BUG_ON((int)__lockref_read(&dentry->d_lockref) > 0);
60461 this_cpu_dec(nr_dentry);
60462 if (dentry->d_op && dentry->d_op->d_release)
60463 dentry->d_op->d_release(dentry);
60464@@ -561,7 +561,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
60465 struct dentry *parent = dentry->d_parent;
60466 if (IS_ROOT(dentry))
60467 return NULL;
60468- if (unlikely((int)dentry->d_lockref.count < 0))
60469+ if (unlikely((int)__lockref_read(&dentry->d_lockref) < 0))
60470 return NULL;
60471 if (likely(spin_trylock(&parent->d_lock)))
60472 return parent;
60473@@ -638,7 +638,7 @@ repeat:
60474 dentry->d_flags |= DCACHE_REFERENCED;
60475 dentry_lru_add(dentry);
60476
60477- dentry->d_lockref.count--;
60478+ __lockref_dec(&dentry->d_lockref);
60479 spin_unlock(&dentry->d_lock);
60480 return;
60481
60482@@ -653,7 +653,7 @@ EXPORT_SYMBOL(dput);
60483 /* This must be called with d_lock held */
60484 static inline void __dget_dlock(struct dentry *dentry)
60485 {
60486- dentry->d_lockref.count++;
60487+ __lockref_inc(&dentry->d_lockref);
60488 }
60489
60490 static inline void __dget(struct dentry *dentry)
60491@@ -694,8 +694,8 @@ repeat:
60492 goto repeat;
60493 }
60494 rcu_read_unlock();
60495- BUG_ON(!ret->d_lockref.count);
60496- ret->d_lockref.count++;
60497+ BUG_ON(!__lockref_read(&ret->d_lockref));
60498+ __lockref_inc(&ret->d_lockref);
60499 spin_unlock(&ret->d_lock);
60500 return ret;
60501 }
60502@@ -773,9 +773,9 @@ restart:
60503 spin_lock(&inode->i_lock);
60504 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
60505 spin_lock(&dentry->d_lock);
60506- if (!dentry->d_lockref.count) {
60507+ if (!__lockref_read(&dentry->d_lockref)) {
60508 struct dentry *parent = lock_parent(dentry);
60509- if (likely(!dentry->d_lockref.count)) {
60510+ if (likely(!__lockref_read(&dentry->d_lockref))) {
60511 __dentry_kill(dentry);
60512 dput(parent);
60513 goto restart;
60514@@ -810,7 +810,7 @@ static void shrink_dentry_list(struct list_head *list)
60515 * We found an inuse dentry which was not removed from
60516 * the LRU because of laziness during lookup. Do not free it.
60517 */
60518- if ((int)dentry->d_lockref.count > 0) {
60519+ if ((int)__lockref_read(&dentry->d_lockref) > 0) {
60520 spin_unlock(&dentry->d_lock);
60521 if (parent)
60522 spin_unlock(&parent->d_lock);
60523@@ -848,8 +848,8 @@ static void shrink_dentry_list(struct list_head *list)
60524 dentry = parent;
60525 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
60526 parent = lock_parent(dentry);
60527- if (dentry->d_lockref.count != 1) {
60528- dentry->d_lockref.count--;
60529+ if (__lockref_read(&dentry->d_lockref) != 1) {
60530+ __lockref_inc(&dentry->d_lockref);
60531 spin_unlock(&dentry->d_lock);
60532 if (parent)
60533 spin_unlock(&parent->d_lock);
60534@@ -889,7 +889,7 @@ dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg)
60535 * counts, just remove them from the LRU. Otherwise give them
60536 * another pass through the LRU.
60537 */
60538- if (dentry->d_lockref.count) {
60539+ if (__lockref_read(&dentry->d_lockref) > 0) {
60540 d_lru_isolate(dentry);
60541 spin_unlock(&dentry->d_lock);
60542 return LRU_REMOVED;
60543@@ -1225,7 +1225,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
60544 } else {
60545 if (dentry->d_flags & DCACHE_LRU_LIST)
60546 d_lru_del(dentry);
60547- if (!dentry->d_lockref.count) {
60548+ if (!__lockref_read(&dentry->d_lockref)) {
60549 d_shrink_add(dentry, &data->dispose);
60550 data->found++;
60551 }
60552@@ -1273,7 +1273,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60553 return D_WALK_CONTINUE;
60554
60555 /* root with refcount 1 is fine */
60556- if (dentry == _data && dentry->d_lockref.count == 1)
60557+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
60558 return D_WALK_CONTINUE;
60559
60560 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
60561@@ -1282,7 +1282,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60562 dentry->d_inode ?
60563 dentry->d_inode->i_ino : 0UL,
60564 dentry,
60565- dentry->d_lockref.count,
60566+ __lockref_read(&dentry->d_lockref),
60567 dentry->d_sb->s_type->name,
60568 dentry->d_sb->s_id);
60569 WARN_ON(1);
60570@@ -1423,7 +1423,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
60571 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
60572 if (name->len > DNAME_INLINE_LEN-1) {
60573 size_t size = offsetof(struct external_name, name[1]);
60574- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
60575+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
60576 if (!p) {
60577 kmem_cache_free(dentry_cache, dentry);
60578 return NULL;
60579@@ -1443,7 +1443,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
60580 smp_wmb();
60581 dentry->d_name.name = dname;
60582
60583- dentry->d_lockref.count = 1;
60584+ __lockref_set(&dentry->d_lockref, 1);
60585 dentry->d_flags = 0;
60586 spin_lock_init(&dentry->d_lock);
60587 seqcount_init(&dentry->d_seq);
60588@@ -2183,7 +2183,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
60589 goto next;
60590 }
60591
60592- dentry->d_lockref.count++;
60593+ __lockref_inc(&dentry->d_lockref);
60594 found = dentry;
60595 spin_unlock(&dentry->d_lock);
60596 break;
60597@@ -2282,7 +2282,7 @@ again:
60598 spin_lock(&dentry->d_lock);
60599 inode = dentry->d_inode;
60600 isdir = S_ISDIR(inode->i_mode);
60601- if (dentry->d_lockref.count == 1) {
60602+ if (__lockref_read(&dentry->d_lockref) == 1) {
60603 if (!spin_trylock(&inode->i_lock)) {
60604 spin_unlock(&dentry->d_lock);
60605 cpu_relax();
60606@@ -3308,7 +3308,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
60607
60608 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
60609 dentry->d_flags |= DCACHE_GENOCIDE;
60610- dentry->d_lockref.count--;
60611+ __lockref_dec(&dentry->d_lockref);
60612 }
60613 }
60614 return D_WALK_CONTINUE;
60615@@ -3424,7 +3424,8 @@ void __init vfs_caches_init(unsigned long mempages)
60616 mempages -= reserve;
60617
60618 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
60619- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
60620+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
60621+ SLAB_NO_SANITIZE, NULL);
60622
60623 dcache_init();
60624 inode_init();
60625diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
60626index 05f2960..b012481 100644
60627--- a/fs/debugfs/inode.c
60628+++ b/fs/debugfs/inode.c
60629@@ -416,7 +416,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
60630 */
60631 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
60632 {
60633+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
60634+ return __create_file(name, S_IFDIR | S_IRWXU,
60635+#else
60636 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
60637+#endif
60638 parent, NULL, NULL);
60639 }
60640 EXPORT_SYMBOL_GPL(debugfs_create_dir);
60641diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
60642index 1686dc2..9611c50 100644
60643--- a/fs/ecryptfs/inode.c
60644+++ b/fs/ecryptfs/inode.c
60645@@ -664,7 +664,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
60646 old_fs = get_fs();
60647 set_fs(get_ds());
60648 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
60649- (char __user *)lower_buf,
60650+ (char __force_user *)lower_buf,
60651 PATH_MAX);
60652 set_fs(old_fs);
60653 if (rc < 0)
60654diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
60655index e4141f2..d8263e8 100644
60656--- a/fs/ecryptfs/miscdev.c
60657+++ b/fs/ecryptfs/miscdev.c
60658@@ -304,7 +304,7 @@ check_list:
60659 goto out_unlock_msg_ctx;
60660 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
60661 if (msg_ctx->msg) {
60662- if (copy_to_user(&buf[i], packet_length, packet_length_size))
60663+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
60664 goto out_unlock_msg_ctx;
60665 i += packet_length_size;
60666 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
60667diff --git a/fs/exec.c b/fs/exec.c
60668index 7302b75..b917171 100644
60669--- a/fs/exec.c
60670+++ b/fs/exec.c
60671@@ -56,8 +56,20 @@
60672 #include <linux/pipe_fs_i.h>
60673 #include <linux/oom.h>
60674 #include <linux/compat.h>
60675+#include <linux/random.h>
60676+#include <linux/seq_file.h>
60677+#include <linux/coredump.h>
60678+#include <linux/mman.h>
60679+
60680+#ifdef CONFIG_PAX_REFCOUNT
60681+#include <linux/kallsyms.h>
60682+#include <linux/kdebug.h>
60683+#endif
60684+
60685+#include <trace/events/fs.h>
60686
60687 #include <asm/uaccess.h>
60688+#include <asm/sections.h>
60689 #include <asm/mmu_context.h>
60690 #include <asm/tlb.h>
60691
60692@@ -66,19 +78,34 @@
60693
60694 #include <trace/events/sched.h>
60695
60696+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
60697+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
60698+{
60699+ 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");
60700+}
60701+#endif
60702+
60703+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
60704+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
60705+EXPORT_SYMBOL(pax_set_initial_flags_func);
60706+#endif
60707+
60708 int suid_dumpable = 0;
60709
60710 static LIST_HEAD(formats);
60711 static DEFINE_RWLOCK(binfmt_lock);
60712
60713+extern int gr_process_kernel_exec_ban(void);
60714+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
60715+
60716 void __register_binfmt(struct linux_binfmt * fmt, int insert)
60717 {
60718 BUG_ON(!fmt);
60719 if (WARN_ON(!fmt->load_binary))
60720 return;
60721 write_lock(&binfmt_lock);
60722- insert ? list_add(&fmt->lh, &formats) :
60723- list_add_tail(&fmt->lh, &formats);
60724+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
60725+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
60726 write_unlock(&binfmt_lock);
60727 }
60728
60729@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
60730 void unregister_binfmt(struct linux_binfmt * fmt)
60731 {
60732 write_lock(&binfmt_lock);
60733- list_del(&fmt->lh);
60734+ pax_list_del((struct list_head *)&fmt->lh);
60735 write_unlock(&binfmt_lock);
60736 }
60737
60738@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
60739 int write)
60740 {
60741 struct page *page;
60742- int ret;
60743
60744-#ifdef CONFIG_STACK_GROWSUP
60745- if (write) {
60746- ret = expand_downwards(bprm->vma, pos);
60747- if (ret < 0)
60748- return NULL;
60749- }
60750-#endif
60751- ret = get_user_pages(current, bprm->mm, pos,
60752- 1, write, 1, &page, NULL);
60753- if (ret <= 0)
60754+ if (0 > expand_downwards(bprm->vma, pos))
60755+ return NULL;
60756+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
60757 return NULL;
60758
60759 if (write) {
60760@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
60761 if (size <= ARG_MAX)
60762 return page;
60763
60764+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60765+ // only allow 512KB for argv+env on suid/sgid binaries
60766+ // to prevent easy ASLR exhaustion
60767+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
60768+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
60769+ (size > (512 * 1024))) {
60770+ put_page(page);
60771+ return NULL;
60772+ }
60773+#endif
60774+
60775 /*
60776 * Limit to 1/4-th the stack size for the argv+env strings.
60777 * This ensures that:
60778@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
60779 vma->vm_end = STACK_TOP_MAX;
60780 vma->vm_start = vma->vm_end - PAGE_SIZE;
60781 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
60782+
60783+#ifdef CONFIG_PAX_SEGMEXEC
60784+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
60785+#endif
60786+
60787 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
60788 INIT_LIST_HEAD(&vma->anon_vma_chain);
60789
60790@@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
60791 mm->stack_vm = mm->total_vm = 1;
60792 up_write(&mm->mmap_sem);
60793 bprm->p = vma->vm_end - sizeof(void *);
60794+
60795+#ifdef CONFIG_PAX_RANDUSTACK
60796+ if (randomize_va_space)
60797+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
60798+#endif
60799+
60800 return 0;
60801 err:
60802 up_write(&mm->mmap_sem);
60803@@ -395,7 +436,7 @@ struct user_arg_ptr {
60804 } ptr;
60805 };
60806
60807-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60808+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60809 {
60810 const char __user *native;
60811
60812@@ -404,14 +445,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60813 compat_uptr_t compat;
60814
60815 if (get_user(compat, argv.ptr.compat + nr))
60816- return ERR_PTR(-EFAULT);
60817+ return (const char __force_user *)ERR_PTR(-EFAULT);
60818
60819 return compat_ptr(compat);
60820 }
60821 #endif
60822
60823 if (get_user(native, argv.ptr.native + nr))
60824- return ERR_PTR(-EFAULT);
60825+ return (const char __force_user *)ERR_PTR(-EFAULT);
60826
60827 return native;
60828 }
60829@@ -430,7 +471,7 @@ static int count(struct user_arg_ptr argv, int max)
60830 if (!p)
60831 break;
60832
60833- if (IS_ERR(p))
60834+ if (IS_ERR((const char __force_kernel *)p))
60835 return -EFAULT;
60836
60837 if (i >= max)
60838@@ -465,7 +506,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
60839
60840 ret = -EFAULT;
60841 str = get_user_arg_ptr(argv, argc);
60842- if (IS_ERR(str))
60843+ if (IS_ERR((const char __force_kernel *)str))
60844 goto out;
60845
60846 len = strnlen_user(str, MAX_ARG_STRLEN);
60847@@ -547,7 +588,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
60848 int r;
60849 mm_segment_t oldfs = get_fs();
60850 struct user_arg_ptr argv = {
60851- .ptr.native = (const char __user *const __user *)__argv,
60852+ .ptr.native = (const char __user * const __force_user *)__argv,
60853 };
60854
60855 set_fs(KERNEL_DS);
60856@@ -582,7 +623,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
60857 unsigned long new_end = old_end - shift;
60858 struct mmu_gather tlb;
60859
60860- BUG_ON(new_start > new_end);
60861+ if (new_start >= new_end || new_start < mmap_min_addr)
60862+ return -ENOMEM;
60863
60864 /*
60865 * ensure there are no vmas between where we want to go
60866@@ -591,6 +633,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
60867 if (vma != find_vma(mm, new_start))
60868 return -EFAULT;
60869
60870+#ifdef CONFIG_PAX_SEGMEXEC
60871+ BUG_ON(pax_find_mirror_vma(vma));
60872+#endif
60873+
60874 /*
60875 * cover the whole range: [new_start, old_end)
60876 */
60877@@ -671,10 +717,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
60878 stack_top = arch_align_stack(stack_top);
60879 stack_top = PAGE_ALIGN(stack_top);
60880
60881- if (unlikely(stack_top < mmap_min_addr) ||
60882- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
60883- return -ENOMEM;
60884-
60885 stack_shift = vma->vm_end - stack_top;
60886
60887 bprm->p -= stack_shift;
60888@@ -686,8 +728,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
60889 bprm->exec -= stack_shift;
60890
60891 down_write(&mm->mmap_sem);
60892+
60893+ /* Move stack pages down in memory. */
60894+ if (stack_shift) {
60895+ ret = shift_arg_pages(vma, stack_shift);
60896+ if (ret)
60897+ goto out_unlock;
60898+ }
60899+
60900 vm_flags = VM_STACK_FLAGS;
60901
60902+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
60903+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
60904+ vm_flags &= ~VM_EXEC;
60905+
60906+#ifdef CONFIG_PAX_MPROTECT
60907+ if (mm->pax_flags & MF_PAX_MPROTECT)
60908+ vm_flags &= ~VM_MAYEXEC;
60909+#endif
60910+
60911+ }
60912+#endif
60913+
60914 /*
60915 * Adjust stack execute permissions; explicitly enable for
60916 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
60917@@ -706,13 +768,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
60918 goto out_unlock;
60919 BUG_ON(prev != vma);
60920
60921- /* Move stack pages down in memory. */
60922- if (stack_shift) {
60923- ret = shift_arg_pages(vma, stack_shift);
60924- if (ret)
60925- goto out_unlock;
60926- }
60927-
60928 /* mprotect_fixup is overkill to remove the temporary stack flags */
60929 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
60930
60931@@ -736,6 +791,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
60932 #endif
60933 current->mm->start_stack = bprm->p;
60934 ret = expand_stack(vma, stack_base);
60935+
60936+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
60937+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
60938+ unsigned long size;
60939+ vm_flags_t vm_flags;
60940+
60941+ size = STACK_TOP - vma->vm_end;
60942+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
60943+
60944+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
60945+
60946+#ifdef CONFIG_X86
60947+ if (!ret) {
60948+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
60949+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
60950+ }
60951+#endif
60952+
60953+ }
60954+#endif
60955+
60956 if (ret)
60957 ret = -EFAULT;
60958
60959@@ -771,6 +847,8 @@ static struct file *do_open_exec(struct filename *name)
60960
60961 fsnotify_open(file);
60962
60963+ trace_open_exec(name->name);
60964+
60965 err = deny_write_access(file);
60966 if (err)
60967 goto exit;
60968@@ -800,7 +878,7 @@ int kernel_read(struct file *file, loff_t offset,
60969 old_fs = get_fs();
60970 set_fs(get_ds());
60971 /* The cast to a user pointer is valid due to the set_fs() */
60972- result = vfs_read(file, (void __user *)addr, count, &pos);
60973+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
60974 set_fs(old_fs);
60975 return result;
60976 }
60977@@ -845,6 +923,7 @@ static int exec_mmap(struct mm_struct *mm)
60978 tsk->mm = mm;
60979 tsk->active_mm = mm;
60980 activate_mm(active_mm, mm);
60981+ populate_stack();
60982 tsk->mm->vmacache_seqnum = 0;
60983 vmacache_flush(tsk);
60984 task_unlock(tsk);
60985@@ -1243,7 +1322,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
60986 }
60987 rcu_read_unlock();
60988
60989- if (p->fs->users > n_fs)
60990+ if (atomic_read(&p->fs->users) > n_fs)
60991 bprm->unsafe |= LSM_UNSAFE_SHARE;
60992 else
60993 p->fs->in_exec = 1;
60994@@ -1424,6 +1503,31 @@ static int exec_binprm(struct linux_binprm *bprm)
60995 return ret;
60996 }
60997
60998+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60999+static DEFINE_PER_CPU(u64, exec_counter);
61000+static int __init init_exec_counters(void)
61001+{
61002+ unsigned int cpu;
61003+
61004+ for_each_possible_cpu(cpu) {
61005+ per_cpu(exec_counter, cpu) = (u64)cpu;
61006+ }
61007+
61008+ return 0;
61009+}
61010+early_initcall(init_exec_counters);
61011+static inline void increment_exec_counter(void)
61012+{
61013+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
61014+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
61015+}
61016+#else
61017+static inline void increment_exec_counter(void) {}
61018+#endif
61019+
61020+extern void gr_handle_exec_args(struct linux_binprm *bprm,
61021+ struct user_arg_ptr argv);
61022+
61023 /*
61024 * sys_execve() executes a new program.
61025 */
61026@@ -1431,6 +1535,11 @@ static int do_execve_common(struct filename *filename,
61027 struct user_arg_ptr argv,
61028 struct user_arg_ptr envp)
61029 {
61030+#ifdef CONFIG_GRKERNSEC
61031+ struct file *old_exec_file;
61032+ struct acl_subject_label *old_acl;
61033+ struct rlimit old_rlim[RLIM_NLIMITS];
61034+#endif
61035 struct linux_binprm *bprm;
61036 struct file *file;
61037 struct files_struct *displaced;
61038@@ -1439,6 +1548,8 @@ static int do_execve_common(struct filename *filename,
61039 if (IS_ERR(filename))
61040 return PTR_ERR(filename);
61041
61042+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
61043+
61044 /*
61045 * We move the actual failure in case of RLIMIT_NPROC excess from
61046 * set*uid() to execve() because too many poorly written programs
61047@@ -1476,11 +1587,21 @@ static int do_execve_common(struct filename *filename,
61048 if (IS_ERR(file))
61049 goto out_unmark;
61050
61051+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
61052+ retval = -EPERM;
61053+ goto out_unmark;
61054+ }
61055+
61056 sched_exec();
61057
61058 bprm->file = file;
61059 bprm->filename = bprm->interp = filename->name;
61060
61061+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
61062+ retval = -EACCES;
61063+ goto out_unmark;
61064+ }
61065+
61066 retval = bprm_mm_init(bprm);
61067 if (retval)
61068 goto out_unmark;
61069@@ -1497,24 +1618,70 @@ static int do_execve_common(struct filename *filename,
61070 if (retval < 0)
61071 goto out;
61072
61073+#ifdef CONFIG_GRKERNSEC
61074+ old_acl = current->acl;
61075+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
61076+ old_exec_file = current->exec_file;
61077+ get_file(file);
61078+ current->exec_file = file;
61079+#endif
61080+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61081+ /* limit suid stack to 8MB
61082+ * we saved the old limits above and will restore them if this exec fails
61083+ */
61084+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
61085+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
61086+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
61087+#endif
61088+
61089+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
61090+ retval = -EPERM;
61091+ goto out_fail;
61092+ }
61093+
61094+ if (!gr_tpe_allow(file)) {
61095+ retval = -EACCES;
61096+ goto out_fail;
61097+ }
61098+
61099+ if (gr_check_crash_exec(file)) {
61100+ retval = -EACCES;
61101+ goto out_fail;
61102+ }
61103+
61104+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
61105+ bprm->unsafe);
61106+ if (retval < 0)
61107+ goto out_fail;
61108+
61109 retval = copy_strings_kernel(1, &bprm->filename, bprm);
61110 if (retval < 0)
61111- goto out;
61112+ goto out_fail;
61113
61114 bprm->exec = bprm->p;
61115 retval = copy_strings(bprm->envc, envp, bprm);
61116 if (retval < 0)
61117- goto out;
61118+ goto out_fail;
61119
61120 retval = copy_strings(bprm->argc, argv, bprm);
61121 if (retval < 0)
61122- goto out;
61123+ goto out_fail;
61124+
61125+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
61126+
61127+ gr_handle_exec_args(bprm, argv);
61128
61129 retval = exec_binprm(bprm);
61130 if (retval < 0)
61131- goto out;
61132+ goto out_fail;
61133+#ifdef CONFIG_GRKERNSEC
61134+ if (old_exec_file)
61135+ fput(old_exec_file);
61136+#endif
61137
61138 /* execve succeeded */
61139+
61140+ increment_exec_counter();
61141 current->fs->in_exec = 0;
61142 current->in_execve = 0;
61143 acct_update_integrals(current);
61144@@ -1525,6 +1692,14 @@ static int do_execve_common(struct filename *filename,
61145 put_files_struct(displaced);
61146 return retval;
61147
61148+out_fail:
61149+#ifdef CONFIG_GRKERNSEC
61150+ current->acl = old_acl;
61151+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
61152+ fput(current->exec_file);
61153+ current->exec_file = old_exec_file;
61154+#endif
61155+
61156 out:
61157 if (bprm->mm) {
61158 acct_arg_size(bprm, 0);
61159@@ -1616,3 +1791,312 @@ COMPAT_SYSCALL_DEFINE3(execve, const char __user *, filename,
61160 return compat_do_execve(getname(filename), argv, envp);
61161 }
61162 #endif
61163+
61164+int pax_check_flags(unsigned long *flags)
61165+{
61166+ int retval = 0;
61167+
61168+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
61169+ if (*flags & MF_PAX_SEGMEXEC)
61170+ {
61171+ *flags &= ~MF_PAX_SEGMEXEC;
61172+ retval = -EINVAL;
61173+ }
61174+#endif
61175+
61176+ if ((*flags & MF_PAX_PAGEEXEC)
61177+
61178+#ifdef CONFIG_PAX_PAGEEXEC
61179+ && (*flags & MF_PAX_SEGMEXEC)
61180+#endif
61181+
61182+ )
61183+ {
61184+ *flags &= ~MF_PAX_PAGEEXEC;
61185+ retval = -EINVAL;
61186+ }
61187+
61188+ if ((*flags & MF_PAX_MPROTECT)
61189+
61190+#ifdef CONFIG_PAX_MPROTECT
61191+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61192+#endif
61193+
61194+ )
61195+ {
61196+ *flags &= ~MF_PAX_MPROTECT;
61197+ retval = -EINVAL;
61198+ }
61199+
61200+ if ((*flags & MF_PAX_EMUTRAMP)
61201+
61202+#ifdef CONFIG_PAX_EMUTRAMP
61203+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61204+#endif
61205+
61206+ )
61207+ {
61208+ *flags &= ~MF_PAX_EMUTRAMP;
61209+ retval = -EINVAL;
61210+ }
61211+
61212+ return retval;
61213+}
61214+
61215+EXPORT_SYMBOL(pax_check_flags);
61216+
61217+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
61218+char *pax_get_path(const struct path *path, char *buf, int buflen)
61219+{
61220+ char *pathname = d_path(path, buf, buflen);
61221+
61222+ if (IS_ERR(pathname))
61223+ goto toolong;
61224+
61225+ pathname = mangle_path(buf, pathname, "\t\n\\");
61226+ if (!pathname)
61227+ goto toolong;
61228+
61229+ *pathname = 0;
61230+ return buf;
61231+
61232+toolong:
61233+ return "<path too long>";
61234+}
61235+EXPORT_SYMBOL(pax_get_path);
61236+
61237+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
61238+{
61239+ struct task_struct *tsk = current;
61240+ struct mm_struct *mm = current->mm;
61241+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
61242+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
61243+ char *path_exec = NULL;
61244+ char *path_fault = NULL;
61245+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
61246+ siginfo_t info = { };
61247+
61248+ if (buffer_exec && buffer_fault) {
61249+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
61250+
61251+ down_read(&mm->mmap_sem);
61252+ vma = mm->mmap;
61253+ while (vma && (!vma_exec || !vma_fault)) {
61254+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
61255+ vma_exec = vma;
61256+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
61257+ vma_fault = vma;
61258+ vma = vma->vm_next;
61259+ }
61260+ if (vma_exec)
61261+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
61262+ if (vma_fault) {
61263+ start = vma_fault->vm_start;
61264+ end = vma_fault->vm_end;
61265+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
61266+ if (vma_fault->vm_file)
61267+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
61268+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
61269+ path_fault = "<heap>";
61270+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
61271+ path_fault = "<stack>";
61272+ else
61273+ path_fault = "<anonymous mapping>";
61274+ }
61275+ up_read(&mm->mmap_sem);
61276+ }
61277+ if (tsk->signal->curr_ip)
61278+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
61279+ else
61280+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
61281+ 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),
61282+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
61283+ free_page((unsigned long)buffer_exec);
61284+ free_page((unsigned long)buffer_fault);
61285+ pax_report_insns(regs, pc, sp);
61286+ info.si_signo = SIGKILL;
61287+ info.si_errno = 0;
61288+ info.si_code = SI_KERNEL;
61289+ info.si_pid = 0;
61290+ info.si_uid = 0;
61291+ do_coredump(&info);
61292+}
61293+#endif
61294+
61295+#ifdef CONFIG_PAX_REFCOUNT
61296+void pax_report_refcount_overflow(struct pt_regs *regs)
61297+{
61298+ if (current->signal->curr_ip)
61299+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
61300+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
61301+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61302+ else
61303+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
61304+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61305+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
61306+ preempt_disable();
61307+ show_regs(regs);
61308+ preempt_enable();
61309+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
61310+}
61311+#endif
61312+
61313+#ifdef CONFIG_PAX_USERCOPY
61314+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
61315+static noinline int check_stack_object(const void *obj, unsigned long len)
61316+{
61317+ const void * const stack = task_stack_page(current);
61318+ const void * const stackend = stack + THREAD_SIZE;
61319+
61320+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61321+ const void *frame = NULL;
61322+ const void *oldframe;
61323+#endif
61324+
61325+ if (obj + len < obj)
61326+ return -1;
61327+
61328+ if (obj + len <= stack || stackend <= obj)
61329+ return 0;
61330+
61331+ if (obj < stack || stackend < obj + len)
61332+ return -1;
61333+
61334+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61335+ oldframe = __builtin_frame_address(1);
61336+ if (oldframe)
61337+ frame = __builtin_frame_address(2);
61338+ /*
61339+ low ----------------------------------------------> high
61340+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
61341+ ^----------------^
61342+ allow copies only within here
61343+ */
61344+ while (stack <= frame && frame < stackend) {
61345+ /* if obj + len extends past the last frame, this
61346+ check won't pass and the next frame will be 0,
61347+ causing us to bail out and correctly report
61348+ the copy as invalid
61349+ */
61350+ if (obj + len <= frame)
61351+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
61352+ oldframe = frame;
61353+ frame = *(const void * const *)frame;
61354+ }
61355+ return -1;
61356+#else
61357+ return 1;
61358+#endif
61359+}
61360+
61361+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
61362+{
61363+ if (current->signal->curr_ip)
61364+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61365+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61366+ else
61367+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61368+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61369+ dump_stack();
61370+ gr_handle_kernel_exploit();
61371+ do_group_exit(SIGKILL);
61372+}
61373+#endif
61374+
61375+#ifdef CONFIG_PAX_USERCOPY
61376+
61377+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
61378+{
61379+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
61380+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
61381+#ifdef CONFIG_MODULES
61382+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
61383+#else
61384+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
61385+#endif
61386+
61387+#else
61388+ unsigned long textlow = (unsigned long)_stext;
61389+ unsigned long texthigh = (unsigned long)_etext;
61390+
61391+#ifdef CONFIG_X86_64
61392+ /* check against linear mapping as well */
61393+ if (high > (unsigned long)__va(__pa(textlow)) &&
61394+ low < (unsigned long)__va(__pa(texthigh)))
61395+ return true;
61396+#endif
61397+
61398+#endif
61399+
61400+ if (high <= textlow || low >= texthigh)
61401+ return false;
61402+ else
61403+ return true;
61404+}
61405+#endif
61406+
61407+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
61408+{
61409+#ifdef CONFIG_PAX_USERCOPY
61410+ const char *type;
61411+#endif
61412+
61413+#ifndef CONFIG_STACK_GROWSUP
61414+ unsigned long stackstart = (unsigned long)task_stack_page(current);
61415+ unsigned long currentsp = (unsigned long)&stackstart;
61416+ if (unlikely((currentsp < stackstart + 512 ||
61417+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
61418+ BUG();
61419+#endif
61420+
61421+#ifndef CONFIG_PAX_USERCOPY_DEBUG
61422+ if (const_size)
61423+ return;
61424+#endif
61425+
61426+#ifdef CONFIG_PAX_USERCOPY
61427+ if (!n)
61428+ return;
61429+
61430+ type = check_heap_object(ptr, n);
61431+ if (!type) {
61432+ int ret = check_stack_object(ptr, n);
61433+ if (ret == 1 || ret == 2)
61434+ return;
61435+ if (ret == 0) {
61436+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
61437+ type = "<kernel text>";
61438+ else
61439+ return;
61440+ } else
61441+ type = "<process stack>";
61442+ }
61443+
61444+ pax_report_usercopy(ptr, n, to_user, type);
61445+#endif
61446+
61447+}
61448+EXPORT_SYMBOL(__check_object_size);
61449+
61450+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
61451+void pax_track_stack(void)
61452+{
61453+ unsigned long sp = (unsigned long)&sp;
61454+ if (sp < current_thread_info()->lowest_stack &&
61455+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
61456+ current_thread_info()->lowest_stack = sp;
61457+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
61458+ BUG();
61459+}
61460+EXPORT_SYMBOL(pax_track_stack);
61461+#endif
61462+
61463+#ifdef CONFIG_PAX_SIZE_OVERFLOW
61464+void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
61465+{
61466+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
61467+ dump_stack();
61468+ do_group_exit(SIGKILL);
61469+}
61470+EXPORT_SYMBOL(report_size_overflow);
61471+#endif
61472diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
61473index 9f9992b..8b59411 100644
61474--- a/fs/ext2/balloc.c
61475+++ b/fs/ext2/balloc.c
61476@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
61477
61478 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61479 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61480- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61481+ if (free_blocks < root_blocks + 1 &&
61482 !uid_eq(sbi->s_resuid, current_fsuid()) &&
61483 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61484- !in_group_p (sbi->s_resgid))) {
61485+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61486 return 0;
61487 }
61488 return 1;
61489diff --git a/fs/ext2/super.c b/fs/ext2/super.c
61490index 170dc41..62f6b18 100644
61491--- a/fs/ext2/super.c
61492+++ b/fs/ext2/super.c
61493@@ -264,10 +264,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
61494 #ifdef CONFIG_EXT2_FS_XATTR
61495 if (test_opt(sb, XATTR_USER))
61496 seq_puts(seq, ",user_xattr");
61497- if (!test_opt(sb, XATTR_USER) &&
61498- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
61499+ if (!test_opt(sb, XATTR_USER))
61500 seq_puts(seq, ",nouser_xattr");
61501- }
61502 #endif
61503
61504 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61505@@ -841,8 +839,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
61506 if (def_mount_opts & EXT2_DEFM_UID16)
61507 set_opt(sbi->s_mount_opt, NO_UID32);
61508 #ifdef CONFIG_EXT2_FS_XATTR
61509- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
61510- set_opt(sbi->s_mount_opt, XATTR_USER);
61511+ /* always enable user xattrs */
61512+ set_opt(sbi->s_mount_opt, XATTR_USER);
61513 #endif
61514 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61515 if (def_mount_opts & EXT2_DEFM_ACL)
61516diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
61517index 9142614..97484fa 100644
61518--- a/fs/ext2/xattr.c
61519+++ b/fs/ext2/xattr.c
61520@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
61521 struct buffer_head *bh = NULL;
61522 struct ext2_xattr_entry *entry;
61523 char *end;
61524- size_t rest = buffer_size;
61525+ size_t rest = buffer_size, total_size = 0;
61526 int error;
61527
61528 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
61529@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
61530 buffer += size;
61531 }
61532 rest -= size;
61533+ total_size += size;
61534 }
61535 }
61536- error = buffer_size - rest; /* total size */
61537+ error = total_size;
61538
61539 cleanup:
61540 brelse(bh);
61541diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
61542index 158b5d4..2432610 100644
61543--- a/fs/ext3/balloc.c
61544+++ b/fs/ext3/balloc.c
61545@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
61546
61547 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61548 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61549- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61550+ if (free_blocks < root_blocks + 1 &&
61551 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
61552 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61553- !in_group_p (sbi->s_resgid))) {
61554+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61555 return 0;
61556 }
61557 return 1;
61558diff --git a/fs/ext3/super.c b/fs/ext3/super.c
61559index eb742d0..c19f705 100644
61560--- a/fs/ext3/super.c
61561+++ b/fs/ext3/super.c
61562@@ -649,10 +649,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
61563 #ifdef CONFIG_EXT3_FS_XATTR
61564 if (test_opt(sb, XATTR_USER))
61565 seq_puts(seq, ",user_xattr");
61566- if (!test_opt(sb, XATTR_USER) &&
61567- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
61568+ if (!test_opt(sb, XATTR_USER))
61569 seq_puts(seq, ",nouser_xattr");
61570- }
61571 #endif
61572 #ifdef CONFIG_EXT3_FS_POSIX_ACL
61573 if (test_opt(sb, POSIX_ACL))
61574@@ -1749,8 +1747,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
61575 if (def_mount_opts & EXT3_DEFM_UID16)
61576 set_opt(sbi->s_mount_opt, NO_UID32);
61577 #ifdef CONFIG_EXT3_FS_XATTR
61578- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
61579- set_opt(sbi->s_mount_opt, XATTR_USER);
61580+ /* always enable user xattrs */
61581+ set_opt(sbi->s_mount_opt, XATTR_USER);
61582 #endif
61583 #ifdef CONFIG_EXT3_FS_POSIX_ACL
61584 if (def_mount_opts & EXT3_DEFM_ACL)
61585diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
61586index c6874be..f8a6ae8 100644
61587--- a/fs/ext3/xattr.c
61588+++ b/fs/ext3/xattr.c
61589@@ -330,7 +330,7 @@ static int
61590 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
61591 char *buffer, size_t buffer_size)
61592 {
61593- size_t rest = buffer_size;
61594+ size_t rest = buffer_size, total_size = 0;
61595
61596 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
61597 const struct xattr_handler *handler =
61598@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
61599 buffer += size;
61600 }
61601 rest -= size;
61602+ total_size += size;
61603 }
61604 }
61605- return buffer_size - rest;
61606+ return total_size;
61607 }
61608
61609 static int
61610diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
61611index 83a6f49..d4e4d03 100644
61612--- a/fs/ext4/balloc.c
61613+++ b/fs/ext4/balloc.c
61614@@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
61615 /* Hm, nope. Are (enough) root reserved clusters available? */
61616 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
61617 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
61618- capable(CAP_SYS_RESOURCE) ||
61619- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
61620+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
61621+ capable_nolog(CAP_SYS_RESOURCE)) {
61622
61623 if (free_clusters >= (nclusters + dirty_clusters +
61624 resv_clusters))
61625diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
61626index c55a1fa..9904ebb 100644
61627--- a/fs/ext4/ext4.h
61628+++ b/fs/ext4/ext4.h
61629@@ -1279,19 +1279,19 @@ struct ext4_sb_info {
61630 unsigned long s_mb_last_start;
61631
61632 /* stats for buddy allocator */
61633- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
61634- atomic_t s_bal_success; /* we found long enough chunks */
61635- atomic_t s_bal_allocated; /* in blocks */
61636- atomic_t s_bal_ex_scanned; /* total extents scanned */
61637- atomic_t s_bal_goals; /* goal hits */
61638- atomic_t s_bal_breaks; /* too long searches */
61639- atomic_t s_bal_2orders; /* 2^order hits */
61640+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
61641+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
61642+ atomic_unchecked_t s_bal_allocated; /* in blocks */
61643+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
61644+ atomic_unchecked_t s_bal_goals; /* goal hits */
61645+ atomic_unchecked_t s_bal_breaks; /* too long searches */
61646+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
61647 spinlock_t s_bal_lock;
61648 unsigned long s_mb_buddies_generated;
61649 unsigned long long s_mb_generation_time;
61650- atomic_t s_mb_lost_chunks;
61651- atomic_t s_mb_preallocated;
61652- atomic_t s_mb_discarded;
61653+ atomic_unchecked_t s_mb_lost_chunks;
61654+ atomic_unchecked_t s_mb_preallocated;
61655+ atomic_unchecked_t s_mb_discarded;
61656 atomic_t s_lock_busy;
61657
61658 /* locality groups */
61659diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
61660index dbfe15c..9a6ee8d 100644
61661--- a/fs/ext4/mballoc.c
61662+++ b/fs/ext4/mballoc.c
61663@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
61664 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
61665
61666 if (EXT4_SB(sb)->s_mb_stats)
61667- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
61668+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
61669
61670 break;
61671 }
61672@@ -2211,7 +2211,7 @@ repeat:
61673 ac->ac_status = AC_STATUS_CONTINUE;
61674 ac->ac_flags |= EXT4_MB_HINT_FIRST;
61675 cr = 3;
61676- atomic_inc(&sbi->s_mb_lost_chunks);
61677+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
61678 goto repeat;
61679 }
61680 }
61681@@ -2717,25 +2717,25 @@ int ext4_mb_release(struct super_block *sb)
61682 if (sbi->s_mb_stats) {
61683 ext4_msg(sb, KERN_INFO,
61684 "mballoc: %u blocks %u reqs (%u success)",
61685- atomic_read(&sbi->s_bal_allocated),
61686- atomic_read(&sbi->s_bal_reqs),
61687- atomic_read(&sbi->s_bal_success));
61688+ atomic_read_unchecked(&sbi->s_bal_allocated),
61689+ atomic_read_unchecked(&sbi->s_bal_reqs),
61690+ atomic_read_unchecked(&sbi->s_bal_success));
61691 ext4_msg(sb, KERN_INFO,
61692 "mballoc: %u extents scanned, %u goal hits, "
61693 "%u 2^N hits, %u breaks, %u lost",
61694- atomic_read(&sbi->s_bal_ex_scanned),
61695- atomic_read(&sbi->s_bal_goals),
61696- atomic_read(&sbi->s_bal_2orders),
61697- atomic_read(&sbi->s_bal_breaks),
61698- atomic_read(&sbi->s_mb_lost_chunks));
61699+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
61700+ atomic_read_unchecked(&sbi->s_bal_goals),
61701+ atomic_read_unchecked(&sbi->s_bal_2orders),
61702+ atomic_read_unchecked(&sbi->s_bal_breaks),
61703+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
61704 ext4_msg(sb, KERN_INFO,
61705 "mballoc: %lu generated and it took %Lu",
61706 sbi->s_mb_buddies_generated,
61707 sbi->s_mb_generation_time);
61708 ext4_msg(sb, KERN_INFO,
61709 "mballoc: %u preallocated, %u discarded",
61710- atomic_read(&sbi->s_mb_preallocated),
61711- atomic_read(&sbi->s_mb_discarded));
61712+ atomic_read_unchecked(&sbi->s_mb_preallocated),
61713+ atomic_read_unchecked(&sbi->s_mb_discarded));
61714 }
61715
61716 free_percpu(sbi->s_locality_groups);
61717@@ -3191,16 +3191,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
61718 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
61719
61720 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
61721- atomic_inc(&sbi->s_bal_reqs);
61722- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
61723+ atomic_inc_unchecked(&sbi->s_bal_reqs);
61724+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
61725 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
61726- atomic_inc(&sbi->s_bal_success);
61727- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
61728+ atomic_inc_unchecked(&sbi->s_bal_success);
61729+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
61730 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
61731 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
61732- atomic_inc(&sbi->s_bal_goals);
61733+ atomic_inc_unchecked(&sbi->s_bal_goals);
61734 if (ac->ac_found > sbi->s_mb_max_to_scan)
61735- atomic_inc(&sbi->s_bal_breaks);
61736+ atomic_inc_unchecked(&sbi->s_bal_breaks);
61737 }
61738
61739 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
61740@@ -3627,7 +3627,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
61741 trace_ext4_mb_new_inode_pa(ac, pa);
61742
61743 ext4_mb_use_inode_pa(ac, pa);
61744- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
61745+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
61746
61747 ei = EXT4_I(ac->ac_inode);
61748 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
61749@@ -3687,7 +3687,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
61750 trace_ext4_mb_new_group_pa(ac, pa);
61751
61752 ext4_mb_use_group_pa(ac, pa);
61753- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
61754+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
61755
61756 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
61757 lg = ac->ac_lg;
61758@@ -3776,7 +3776,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
61759 * from the bitmap and continue.
61760 */
61761 }
61762- atomic_add(free, &sbi->s_mb_discarded);
61763+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
61764
61765 return err;
61766 }
61767@@ -3794,7 +3794,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
61768 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
61769 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
61770 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
61771- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
61772+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
61773 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
61774
61775 return 0;
61776diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
61777index 8313ca3..8a37d08 100644
61778--- a/fs/ext4/mmp.c
61779+++ b/fs/ext4/mmp.c
61780@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
61781 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
61782 const char *function, unsigned int line, const char *msg)
61783 {
61784- __ext4_warning(sb, function, line, msg);
61785+ __ext4_warning(sb, function, line, "%s", msg);
61786 __ext4_warning(sb, function, line,
61787 "MMP failure info: last update time: %llu, last update "
61788 "node: %s, last update device: %s\n",
61789diff --git a/fs/ext4/super.c b/fs/ext4/super.c
61790index 2c9e686..6a40edc 100644
61791--- a/fs/ext4/super.c
61792+++ b/fs/ext4/super.c
61793@@ -1254,7 +1254,7 @@ static ext4_fsblk_t get_sb_block(void **data)
61794 }
61795
61796 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
61797-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
61798+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
61799 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
61800
61801 #ifdef CONFIG_QUOTA
61802@@ -2434,7 +2434,7 @@ struct ext4_attr {
61803 int offset;
61804 int deprecated_val;
61805 } u;
61806-};
61807+} __do_const;
61808
61809 static int parse_strtoull(const char *buf,
61810 unsigned long long max, unsigned long long *value)
61811diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
61812index 1e09fc7..0400dd4 100644
61813--- a/fs/ext4/xattr.c
61814+++ b/fs/ext4/xattr.c
61815@@ -399,7 +399,7 @@ static int
61816 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
61817 char *buffer, size_t buffer_size)
61818 {
61819- size_t rest = buffer_size;
61820+ size_t rest = buffer_size, total_size = 0;
61821
61822 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
61823 const struct xattr_handler *handler =
61824@@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
61825 buffer += size;
61826 }
61827 rest -= size;
61828+ total_size += size;
61829 }
61830 }
61831- return buffer_size - rest;
61832+ return total_size;
61833 }
61834
61835 static int
61836diff --git a/fs/fcntl.c b/fs/fcntl.c
61837index 99d440a..eb979d1 100644
61838--- a/fs/fcntl.c
61839+++ b/fs/fcntl.c
61840@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
61841 int force)
61842 {
61843 security_file_set_fowner(filp);
61844+ if (gr_handle_chroot_fowner(pid, type))
61845+ return;
61846+ if (gr_check_protected_task_fowner(pid, type))
61847+ return;
61848 f_modown(filp, pid, type, force);
61849 }
61850 EXPORT_SYMBOL(__f_setown);
61851diff --git a/fs/fhandle.c b/fs/fhandle.c
61852index 999ff5c..ac037c9 100644
61853--- a/fs/fhandle.c
61854+++ b/fs/fhandle.c
61855@@ -8,6 +8,7 @@
61856 #include <linux/fs_struct.h>
61857 #include <linux/fsnotify.h>
61858 #include <linux/personality.h>
61859+#include <linux/grsecurity.h>
61860 #include <asm/uaccess.h>
61861 #include "internal.h"
61862 #include "mount.h"
61863@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
61864 } else
61865 retval = 0;
61866 /* copy the mount id */
61867- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
61868- sizeof(*mnt_id)) ||
61869+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
61870 copy_to_user(ufh, handle,
61871 sizeof(struct file_handle) + handle_bytes))
61872 retval = -EFAULT;
61873@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
61874 * the directory. Ideally we would like CAP_DAC_SEARCH.
61875 * But we don't have that
61876 */
61877- if (!capable(CAP_DAC_READ_SEARCH)) {
61878+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
61879 retval = -EPERM;
61880 goto out_err;
61881 }
61882diff --git a/fs/file.c b/fs/file.c
61883index ab3eb6a..8de2392 100644
61884--- a/fs/file.c
61885+++ b/fs/file.c
61886@@ -16,6 +16,7 @@
61887 #include <linux/slab.h>
61888 #include <linux/vmalloc.h>
61889 #include <linux/file.h>
61890+#include <linux/security.h>
61891 #include <linux/fdtable.h>
61892 #include <linux/bitops.h>
61893 #include <linux/interrupt.h>
61894@@ -139,7 +140,7 @@ out:
61895 * Return <0 error code on error; 1 on successful completion.
61896 * The files->file_lock should be held on entry, and will be held on exit.
61897 */
61898-static int expand_fdtable(struct files_struct *files, int nr)
61899+static int expand_fdtable(struct files_struct *files, unsigned int nr)
61900 __releases(files->file_lock)
61901 __acquires(files->file_lock)
61902 {
61903@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
61904 * expanded and execution may have blocked.
61905 * The files->file_lock should be held on entry, and will be held on exit.
61906 */
61907-static int expand_files(struct files_struct *files, int nr)
61908+static int expand_files(struct files_struct *files, unsigned int nr)
61909 {
61910 struct fdtable *fdt;
61911
61912@@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
61913 if (!file)
61914 return __close_fd(files, fd);
61915
61916+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
61917 if (fd >= rlimit(RLIMIT_NOFILE))
61918 return -EBADF;
61919
61920@@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
61921 if (unlikely(oldfd == newfd))
61922 return -EINVAL;
61923
61924+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
61925 if (newfd >= rlimit(RLIMIT_NOFILE))
61926 return -EBADF;
61927
61928@@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
61929 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
61930 {
61931 int err;
61932+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
61933 if (from >= rlimit(RLIMIT_NOFILE))
61934 return -EINVAL;
61935 err = alloc_fd(from, flags);
61936diff --git a/fs/filesystems.c b/fs/filesystems.c
61937index 5797d45..7d7d79a 100644
61938--- a/fs/filesystems.c
61939+++ b/fs/filesystems.c
61940@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
61941 int len = dot ? dot - name : strlen(name);
61942
61943 fs = __get_fs_type(name, len);
61944+#ifdef CONFIG_GRKERNSEC_MODHARDEN
61945+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
61946+#else
61947 if (!fs && (request_module("fs-%.*s", len, name) == 0))
61948+#endif
61949 fs = __get_fs_type(name, len);
61950
61951 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
61952diff --git a/fs/fs_struct.c b/fs/fs_struct.c
61953index 7dca743..543d620 100644
61954--- a/fs/fs_struct.c
61955+++ b/fs/fs_struct.c
61956@@ -4,6 +4,7 @@
61957 #include <linux/path.h>
61958 #include <linux/slab.h>
61959 #include <linux/fs_struct.h>
61960+#include <linux/grsecurity.h>
61961 #include "internal.h"
61962
61963 /*
61964@@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
61965 write_seqcount_begin(&fs->seq);
61966 old_root = fs->root;
61967 fs->root = *path;
61968+ gr_set_chroot_entries(current, path);
61969 write_seqcount_end(&fs->seq);
61970 spin_unlock(&fs->lock);
61971 if (old_root.dentry)
61972@@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
61973 int hits = 0;
61974 spin_lock(&fs->lock);
61975 write_seqcount_begin(&fs->seq);
61976+ /* this root replacement is only done by pivot_root,
61977+ leave grsec's chroot tagging alone for this task
61978+ so that a pivoted root isn't treated as a chroot
61979+ */
61980 hits += replace_path(&fs->root, old_root, new_root);
61981 hits += replace_path(&fs->pwd, old_root, new_root);
61982 write_seqcount_end(&fs->seq);
61983@@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
61984 task_lock(tsk);
61985 spin_lock(&fs->lock);
61986 tsk->fs = NULL;
61987- kill = !--fs->users;
61988+ gr_clear_chroot_entries(tsk);
61989+ kill = !atomic_dec_return(&fs->users);
61990 spin_unlock(&fs->lock);
61991 task_unlock(tsk);
61992 if (kill)
61993@@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
61994 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
61995 /* We don't need to lock fs - think why ;-) */
61996 if (fs) {
61997- fs->users = 1;
61998+ atomic_set(&fs->users, 1);
61999 fs->in_exec = 0;
62000 spin_lock_init(&fs->lock);
62001 seqcount_init(&fs->seq);
62002@@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
62003 spin_lock(&old->lock);
62004 fs->root = old->root;
62005 path_get(&fs->root);
62006+ /* instead of calling gr_set_chroot_entries here,
62007+ we call it from every caller of this function
62008+ */
62009 fs->pwd = old->pwd;
62010 path_get(&fs->pwd);
62011 spin_unlock(&old->lock);
62012@@ -139,8 +149,9 @@ int unshare_fs_struct(void)
62013
62014 task_lock(current);
62015 spin_lock(&fs->lock);
62016- kill = !--fs->users;
62017+ kill = !atomic_dec_return(&fs->users);
62018 current->fs = new_fs;
62019+ gr_set_chroot_entries(current, &new_fs->root);
62020 spin_unlock(&fs->lock);
62021 task_unlock(current);
62022
62023@@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
62024
62025 int current_umask(void)
62026 {
62027- return current->fs->umask;
62028+ return current->fs->umask | gr_acl_umask();
62029 }
62030 EXPORT_SYMBOL(current_umask);
62031
62032 /* to be mentioned only in INIT_TASK */
62033 struct fs_struct init_fs = {
62034- .users = 1,
62035+ .users = ATOMIC_INIT(1),
62036 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
62037 .seq = SEQCNT_ZERO(init_fs.seq),
62038 .umask = 0022,
62039diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
62040index 89acec7..a575262 100644
62041--- a/fs/fscache/cookie.c
62042+++ b/fs/fscache/cookie.c
62043@@ -19,7 +19,7 @@
62044
62045 struct kmem_cache *fscache_cookie_jar;
62046
62047-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
62048+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
62049
62050 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
62051 static int fscache_alloc_object(struct fscache_cache *cache,
62052@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
62053 parent ? (char *) parent->def->name : "<no-parent>",
62054 def->name, netfs_data, enable);
62055
62056- fscache_stat(&fscache_n_acquires);
62057+ fscache_stat_unchecked(&fscache_n_acquires);
62058
62059 /* if there's no parent cookie, then we don't create one here either */
62060 if (!parent) {
62061- fscache_stat(&fscache_n_acquires_null);
62062+ fscache_stat_unchecked(&fscache_n_acquires_null);
62063 _leave(" [no parent]");
62064 return NULL;
62065 }
62066@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62067 /* allocate and initialise a cookie */
62068 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
62069 if (!cookie) {
62070- fscache_stat(&fscache_n_acquires_oom);
62071+ fscache_stat_unchecked(&fscache_n_acquires_oom);
62072 _leave(" [ENOMEM]");
62073 return NULL;
62074 }
62075@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
62076
62077 switch (cookie->def->type) {
62078 case FSCACHE_COOKIE_TYPE_INDEX:
62079- fscache_stat(&fscache_n_cookie_index);
62080+ fscache_stat_unchecked(&fscache_n_cookie_index);
62081 break;
62082 case FSCACHE_COOKIE_TYPE_DATAFILE:
62083- fscache_stat(&fscache_n_cookie_data);
62084+ fscache_stat_unchecked(&fscache_n_cookie_data);
62085 break;
62086 default:
62087- fscache_stat(&fscache_n_cookie_special);
62088+ fscache_stat_unchecked(&fscache_n_cookie_special);
62089 break;
62090 }
62091
62092@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62093 } else {
62094 atomic_dec(&parent->n_children);
62095 __fscache_cookie_put(cookie);
62096- fscache_stat(&fscache_n_acquires_nobufs);
62097+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
62098 _leave(" = NULL");
62099 return NULL;
62100 }
62101@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62102 }
62103 }
62104
62105- fscache_stat(&fscache_n_acquires_ok);
62106+ fscache_stat_unchecked(&fscache_n_acquires_ok);
62107 _leave(" = %p", cookie);
62108 return cookie;
62109 }
62110@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
62111 cache = fscache_select_cache_for_object(cookie->parent);
62112 if (!cache) {
62113 up_read(&fscache_addremove_sem);
62114- fscache_stat(&fscache_n_acquires_no_cache);
62115+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
62116 _leave(" = -ENOMEDIUM [no cache]");
62117 return -ENOMEDIUM;
62118 }
62119@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
62120 object = cache->ops->alloc_object(cache, cookie);
62121 fscache_stat_d(&fscache_n_cop_alloc_object);
62122 if (IS_ERR(object)) {
62123- fscache_stat(&fscache_n_object_no_alloc);
62124+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
62125 ret = PTR_ERR(object);
62126 goto error;
62127 }
62128
62129- fscache_stat(&fscache_n_object_alloc);
62130+ fscache_stat_unchecked(&fscache_n_object_alloc);
62131
62132- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
62133+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
62134
62135 _debug("ALLOC OBJ%x: %s {%lx}",
62136 object->debug_id, cookie->def->name, object->events);
62137@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
62138
62139 _enter("{%s}", cookie->def->name);
62140
62141- fscache_stat(&fscache_n_invalidates);
62142+ fscache_stat_unchecked(&fscache_n_invalidates);
62143
62144 /* Only permit invalidation of data files. Invalidating an index will
62145 * require the caller to release all its attachments to the tree rooted
62146@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
62147 {
62148 struct fscache_object *object;
62149
62150- fscache_stat(&fscache_n_updates);
62151+ fscache_stat_unchecked(&fscache_n_updates);
62152
62153 if (!cookie) {
62154- fscache_stat(&fscache_n_updates_null);
62155+ fscache_stat_unchecked(&fscache_n_updates_null);
62156 _leave(" [no cookie]");
62157 return;
62158 }
62159@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
62160 */
62161 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
62162 {
62163- fscache_stat(&fscache_n_relinquishes);
62164+ fscache_stat_unchecked(&fscache_n_relinquishes);
62165 if (retire)
62166- fscache_stat(&fscache_n_relinquishes_retire);
62167+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
62168
62169 if (!cookie) {
62170- fscache_stat(&fscache_n_relinquishes_null);
62171+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
62172 _leave(" [no cookie]");
62173 return;
62174 }
62175@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
62176 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
62177 goto inconsistent;
62178
62179- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
62180+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
62181
62182 __fscache_use_cookie(cookie);
62183 if (fscache_submit_op(object, op) < 0)
62184diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
62185index 7872a62..d91b19f 100644
62186--- a/fs/fscache/internal.h
62187+++ b/fs/fscache/internal.h
62188@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
62189 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
62190 extern int fscache_wait_for_operation_activation(struct fscache_object *,
62191 struct fscache_operation *,
62192- atomic_t *,
62193- atomic_t *,
62194+ atomic_unchecked_t *,
62195+ atomic_unchecked_t *,
62196 void (*)(struct fscache_operation *));
62197 extern void fscache_invalidate_writes(struct fscache_cookie *);
62198
62199@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
62200 * stats.c
62201 */
62202 #ifdef CONFIG_FSCACHE_STATS
62203-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62204-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62205+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62206+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62207
62208-extern atomic_t fscache_n_op_pend;
62209-extern atomic_t fscache_n_op_run;
62210-extern atomic_t fscache_n_op_enqueue;
62211-extern atomic_t fscache_n_op_deferred_release;
62212-extern atomic_t fscache_n_op_release;
62213-extern atomic_t fscache_n_op_gc;
62214-extern atomic_t fscache_n_op_cancelled;
62215-extern atomic_t fscache_n_op_rejected;
62216+extern atomic_unchecked_t fscache_n_op_pend;
62217+extern atomic_unchecked_t fscache_n_op_run;
62218+extern atomic_unchecked_t fscache_n_op_enqueue;
62219+extern atomic_unchecked_t fscache_n_op_deferred_release;
62220+extern atomic_unchecked_t fscache_n_op_release;
62221+extern atomic_unchecked_t fscache_n_op_gc;
62222+extern atomic_unchecked_t fscache_n_op_cancelled;
62223+extern atomic_unchecked_t fscache_n_op_rejected;
62224
62225-extern atomic_t fscache_n_attr_changed;
62226-extern atomic_t fscache_n_attr_changed_ok;
62227-extern atomic_t fscache_n_attr_changed_nobufs;
62228-extern atomic_t fscache_n_attr_changed_nomem;
62229-extern atomic_t fscache_n_attr_changed_calls;
62230+extern atomic_unchecked_t fscache_n_attr_changed;
62231+extern atomic_unchecked_t fscache_n_attr_changed_ok;
62232+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
62233+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
62234+extern atomic_unchecked_t fscache_n_attr_changed_calls;
62235
62236-extern atomic_t fscache_n_allocs;
62237-extern atomic_t fscache_n_allocs_ok;
62238-extern atomic_t fscache_n_allocs_wait;
62239-extern atomic_t fscache_n_allocs_nobufs;
62240-extern atomic_t fscache_n_allocs_intr;
62241-extern atomic_t fscache_n_allocs_object_dead;
62242-extern atomic_t fscache_n_alloc_ops;
62243-extern atomic_t fscache_n_alloc_op_waits;
62244+extern atomic_unchecked_t fscache_n_allocs;
62245+extern atomic_unchecked_t fscache_n_allocs_ok;
62246+extern atomic_unchecked_t fscache_n_allocs_wait;
62247+extern atomic_unchecked_t fscache_n_allocs_nobufs;
62248+extern atomic_unchecked_t fscache_n_allocs_intr;
62249+extern atomic_unchecked_t fscache_n_allocs_object_dead;
62250+extern atomic_unchecked_t fscache_n_alloc_ops;
62251+extern atomic_unchecked_t fscache_n_alloc_op_waits;
62252
62253-extern atomic_t fscache_n_retrievals;
62254-extern atomic_t fscache_n_retrievals_ok;
62255-extern atomic_t fscache_n_retrievals_wait;
62256-extern atomic_t fscache_n_retrievals_nodata;
62257-extern atomic_t fscache_n_retrievals_nobufs;
62258-extern atomic_t fscache_n_retrievals_intr;
62259-extern atomic_t fscache_n_retrievals_nomem;
62260-extern atomic_t fscache_n_retrievals_object_dead;
62261-extern atomic_t fscache_n_retrieval_ops;
62262-extern atomic_t fscache_n_retrieval_op_waits;
62263+extern atomic_unchecked_t fscache_n_retrievals;
62264+extern atomic_unchecked_t fscache_n_retrievals_ok;
62265+extern atomic_unchecked_t fscache_n_retrievals_wait;
62266+extern atomic_unchecked_t fscache_n_retrievals_nodata;
62267+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
62268+extern atomic_unchecked_t fscache_n_retrievals_intr;
62269+extern atomic_unchecked_t fscache_n_retrievals_nomem;
62270+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
62271+extern atomic_unchecked_t fscache_n_retrieval_ops;
62272+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
62273
62274-extern atomic_t fscache_n_stores;
62275-extern atomic_t fscache_n_stores_ok;
62276-extern atomic_t fscache_n_stores_again;
62277-extern atomic_t fscache_n_stores_nobufs;
62278-extern atomic_t fscache_n_stores_oom;
62279-extern atomic_t fscache_n_store_ops;
62280-extern atomic_t fscache_n_store_calls;
62281-extern atomic_t fscache_n_store_pages;
62282-extern atomic_t fscache_n_store_radix_deletes;
62283-extern atomic_t fscache_n_store_pages_over_limit;
62284+extern atomic_unchecked_t fscache_n_stores;
62285+extern atomic_unchecked_t fscache_n_stores_ok;
62286+extern atomic_unchecked_t fscache_n_stores_again;
62287+extern atomic_unchecked_t fscache_n_stores_nobufs;
62288+extern atomic_unchecked_t fscache_n_stores_oom;
62289+extern atomic_unchecked_t fscache_n_store_ops;
62290+extern atomic_unchecked_t fscache_n_store_calls;
62291+extern atomic_unchecked_t fscache_n_store_pages;
62292+extern atomic_unchecked_t fscache_n_store_radix_deletes;
62293+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
62294
62295-extern atomic_t fscache_n_store_vmscan_not_storing;
62296-extern atomic_t fscache_n_store_vmscan_gone;
62297-extern atomic_t fscache_n_store_vmscan_busy;
62298-extern atomic_t fscache_n_store_vmscan_cancelled;
62299-extern atomic_t fscache_n_store_vmscan_wait;
62300+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
62301+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
62302+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
62303+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
62304+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
62305
62306-extern atomic_t fscache_n_marks;
62307-extern atomic_t fscache_n_uncaches;
62308+extern atomic_unchecked_t fscache_n_marks;
62309+extern atomic_unchecked_t fscache_n_uncaches;
62310
62311-extern atomic_t fscache_n_acquires;
62312-extern atomic_t fscache_n_acquires_null;
62313-extern atomic_t fscache_n_acquires_no_cache;
62314-extern atomic_t fscache_n_acquires_ok;
62315-extern atomic_t fscache_n_acquires_nobufs;
62316-extern atomic_t fscache_n_acquires_oom;
62317+extern atomic_unchecked_t fscache_n_acquires;
62318+extern atomic_unchecked_t fscache_n_acquires_null;
62319+extern atomic_unchecked_t fscache_n_acquires_no_cache;
62320+extern atomic_unchecked_t fscache_n_acquires_ok;
62321+extern atomic_unchecked_t fscache_n_acquires_nobufs;
62322+extern atomic_unchecked_t fscache_n_acquires_oom;
62323
62324-extern atomic_t fscache_n_invalidates;
62325-extern atomic_t fscache_n_invalidates_run;
62326+extern atomic_unchecked_t fscache_n_invalidates;
62327+extern atomic_unchecked_t fscache_n_invalidates_run;
62328
62329-extern atomic_t fscache_n_updates;
62330-extern atomic_t fscache_n_updates_null;
62331-extern atomic_t fscache_n_updates_run;
62332+extern atomic_unchecked_t fscache_n_updates;
62333+extern atomic_unchecked_t fscache_n_updates_null;
62334+extern atomic_unchecked_t fscache_n_updates_run;
62335
62336-extern atomic_t fscache_n_relinquishes;
62337-extern atomic_t fscache_n_relinquishes_null;
62338-extern atomic_t fscache_n_relinquishes_waitcrt;
62339-extern atomic_t fscache_n_relinquishes_retire;
62340+extern atomic_unchecked_t fscache_n_relinquishes;
62341+extern atomic_unchecked_t fscache_n_relinquishes_null;
62342+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
62343+extern atomic_unchecked_t fscache_n_relinquishes_retire;
62344
62345-extern atomic_t fscache_n_cookie_index;
62346-extern atomic_t fscache_n_cookie_data;
62347-extern atomic_t fscache_n_cookie_special;
62348+extern atomic_unchecked_t fscache_n_cookie_index;
62349+extern atomic_unchecked_t fscache_n_cookie_data;
62350+extern atomic_unchecked_t fscache_n_cookie_special;
62351
62352-extern atomic_t fscache_n_object_alloc;
62353-extern atomic_t fscache_n_object_no_alloc;
62354-extern atomic_t fscache_n_object_lookups;
62355-extern atomic_t fscache_n_object_lookups_negative;
62356-extern atomic_t fscache_n_object_lookups_positive;
62357-extern atomic_t fscache_n_object_lookups_timed_out;
62358-extern atomic_t fscache_n_object_created;
62359-extern atomic_t fscache_n_object_avail;
62360-extern atomic_t fscache_n_object_dead;
62361+extern atomic_unchecked_t fscache_n_object_alloc;
62362+extern atomic_unchecked_t fscache_n_object_no_alloc;
62363+extern atomic_unchecked_t fscache_n_object_lookups;
62364+extern atomic_unchecked_t fscache_n_object_lookups_negative;
62365+extern atomic_unchecked_t fscache_n_object_lookups_positive;
62366+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
62367+extern atomic_unchecked_t fscache_n_object_created;
62368+extern atomic_unchecked_t fscache_n_object_avail;
62369+extern atomic_unchecked_t fscache_n_object_dead;
62370
62371-extern atomic_t fscache_n_checkaux_none;
62372-extern atomic_t fscache_n_checkaux_okay;
62373-extern atomic_t fscache_n_checkaux_update;
62374-extern atomic_t fscache_n_checkaux_obsolete;
62375+extern atomic_unchecked_t fscache_n_checkaux_none;
62376+extern atomic_unchecked_t fscache_n_checkaux_okay;
62377+extern atomic_unchecked_t fscache_n_checkaux_update;
62378+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
62379
62380 extern atomic_t fscache_n_cop_alloc_object;
62381 extern atomic_t fscache_n_cop_lookup_object;
62382@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
62383 atomic_inc(stat);
62384 }
62385
62386+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
62387+{
62388+ atomic_inc_unchecked(stat);
62389+}
62390+
62391 static inline void fscache_stat_d(atomic_t *stat)
62392 {
62393 atomic_dec(stat);
62394@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
62395
62396 #define __fscache_stat(stat) (NULL)
62397 #define fscache_stat(stat) do {} while (0)
62398+#define fscache_stat_unchecked(stat) do {} while (0)
62399 #define fscache_stat_d(stat) do {} while (0)
62400 #endif
62401
62402diff --git a/fs/fscache/object.c b/fs/fscache/object.c
62403index da032da..0076ce7 100644
62404--- a/fs/fscache/object.c
62405+++ b/fs/fscache/object.c
62406@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62407 _debug("LOOKUP \"%s\" in \"%s\"",
62408 cookie->def->name, object->cache->tag->name);
62409
62410- fscache_stat(&fscache_n_object_lookups);
62411+ fscache_stat_unchecked(&fscache_n_object_lookups);
62412 fscache_stat(&fscache_n_cop_lookup_object);
62413 ret = object->cache->ops->lookup_object(object);
62414 fscache_stat_d(&fscache_n_cop_lookup_object);
62415@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62416 if (ret == -ETIMEDOUT) {
62417 /* probably stuck behind another object, so move this one to
62418 * the back of the queue */
62419- fscache_stat(&fscache_n_object_lookups_timed_out);
62420+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
62421 _leave(" [timeout]");
62422 return NO_TRANSIT;
62423 }
62424@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
62425 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
62426
62427 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62428- fscache_stat(&fscache_n_object_lookups_negative);
62429+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
62430
62431 /* Allow write requests to begin stacking up and read requests to begin
62432 * returning ENODATA.
62433@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
62434 /* if we were still looking up, then we must have a positive lookup
62435 * result, in which case there may be data available */
62436 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62437- fscache_stat(&fscache_n_object_lookups_positive);
62438+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
62439
62440 /* We do (presumably) have data */
62441 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
62442@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
62443 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
62444 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
62445 } else {
62446- fscache_stat(&fscache_n_object_created);
62447+ fscache_stat_unchecked(&fscache_n_object_created);
62448 }
62449
62450 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
62451@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
62452 fscache_stat_d(&fscache_n_cop_lookup_complete);
62453
62454 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
62455- fscache_stat(&fscache_n_object_avail);
62456+ fscache_stat_unchecked(&fscache_n_object_avail);
62457
62458 _leave("");
62459 return transit_to(JUMPSTART_DEPS);
62460@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
62461
62462 /* this just shifts the object release to the work processor */
62463 fscache_put_object(object);
62464- fscache_stat(&fscache_n_object_dead);
62465+ fscache_stat_unchecked(&fscache_n_object_dead);
62466
62467 _leave("");
62468 return transit_to(OBJECT_DEAD);
62469@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
62470 enum fscache_checkaux result;
62471
62472 if (!object->cookie->def->check_aux) {
62473- fscache_stat(&fscache_n_checkaux_none);
62474+ fscache_stat_unchecked(&fscache_n_checkaux_none);
62475 return FSCACHE_CHECKAUX_OKAY;
62476 }
62477
62478@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
62479 switch (result) {
62480 /* entry okay as is */
62481 case FSCACHE_CHECKAUX_OKAY:
62482- fscache_stat(&fscache_n_checkaux_okay);
62483+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
62484 break;
62485
62486 /* entry requires update */
62487 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
62488- fscache_stat(&fscache_n_checkaux_update);
62489+ fscache_stat_unchecked(&fscache_n_checkaux_update);
62490 break;
62491
62492 /* entry requires deletion */
62493 case FSCACHE_CHECKAUX_OBSOLETE:
62494- fscache_stat(&fscache_n_checkaux_obsolete);
62495+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
62496 break;
62497
62498 default:
62499@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
62500 {
62501 const struct fscache_state *s;
62502
62503- fscache_stat(&fscache_n_invalidates_run);
62504+ fscache_stat_unchecked(&fscache_n_invalidates_run);
62505 fscache_stat(&fscache_n_cop_invalidate_object);
62506 s = _fscache_invalidate_object(object, event);
62507 fscache_stat_d(&fscache_n_cop_invalidate_object);
62508@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
62509 {
62510 _enter("{OBJ%x},%d", object->debug_id, event);
62511
62512- fscache_stat(&fscache_n_updates_run);
62513+ fscache_stat_unchecked(&fscache_n_updates_run);
62514 fscache_stat(&fscache_n_cop_update_object);
62515 object->cache->ops->update_object(object);
62516 fscache_stat_d(&fscache_n_cop_update_object);
62517diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
62518index e7b87a0..a85d47a 100644
62519--- a/fs/fscache/operation.c
62520+++ b/fs/fscache/operation.c
62521@@ -17,7 +17,7 @@
62522 #include <linux/slab.h>
62523 #include "internal.h"
62524
62525-atomic_t fscache_op_debug_id;
62526+atomic_unchecked_t fscache_op_debug_id;
62527 EXPORT_SYMBOL(fscache_op_debug_id);
62528
62529 /**
62530@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
62531 ASSERTCMP(atomic_read(&op->usage), >, 0);
62532 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
62533
62534- fscache_stat(&fscache_n_op_enqueue);
62535+ fscache_stat_unchecked(&fscache_n_op_enqueue);
62536 switch (op->flags & FSCACHE_OP_TYPE) {
62537 case FSCACHE_OP_ASYNC:
62538 _debug("queue async");
62539@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
62540 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
62541 if (op->processor)
62542 fscache_enqueue_operation(op);
62543- fscache_stat(&fscache_n_op_run);
62544+ fscache_stat_unchecked(&fscache_n_op_run);
62545 }
62546
62547 /*
62548@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
62549 if (object->n_in_progress > 0) {
62550 atomic_inc(&op->usage);
62551 list_add_tail(&op->pend_link, &object->pending_ops);
62552- fscache_stat(&fscache_n_op_pend);
62553+ fscache_stat_unchecked(&fscache_n_op_pend);
62554 } else if (!list_empty(&object->pending_ops)) {
62555 atomic_inc(&op->usage);
62556 list_add_tail(&op->pend_link, &object->pending_ops);
62557- fscache_stat(&fscache_n_op_pend);
62558+ fscache_stat_unchecked(&fscache_n_op_pend);
62559 fscache_start_operations(object);
62560 } else {
62561 ASSERTCMP(object->n_in_progress, ==, 0);
62562@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
62563 object->n_exclusive++; /* reads and writes must wait */
62564 atomic_inc(&op->usage);
62565 list_add_tail(&op->pend_link, &object->pending_ops);
62566- fscache_stat(&fscache_n_op_pend);
62567+ fscache_stat_unchecked(&fscache_n_op_pend);
62568 ret = 0;
62569 } else {
62570 /* If we're in any other state, there must have been an I/O
62571@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
62572 if (object->n_exclusive > 0) {
62573 atomic_inc(&op->usage);
62574 list_add_tail(&op->pend_link, &object->pending_ops);
62575- fscache_stat(&fscache_n_op_pend);
62576+ fscache_stat_unchecked(&fscache_n_op_pend);
62577 } else if (!list_empty(&object->pending_ops)) {
62578 atomic_inc(&op->usage);
62579 list_add_tail(&op->pend_link, &object->pending_ops);
62580- fscache_stat(&fscache_n_op_pend);
62581+ fscache_stat_unchecked(&fscache_n_op_pend);
62582 fscache_start_operations(object);
62583 } else {
62584 ASSERTCMP(object->n_exclusive, ==, 0);
62585@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
62586 object->n_ops++;
62587 atomic_inc(&op->usage);
62588 list_add_tail(&op->pend_link, &object->pending_ops);
62589- fscache_stat(&fscache_n_op_pend);
62590+ fscache_stat_unchecked(&fscache_n_op_pend);
62591 ret = 0;
62592 } else if (fscache_object_is_dying(object)) {
62593- fscache_stat(&fscache_n_op_rejected);
62594+ fscache_stat_unchecked(&fscache_n_op_rejected);
62595 op->state = FSCACHE_OP_ST_CANCELLED;
62596 ret = -ENOBUFS;
62597 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
62598@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
62599 ret = -EBUSY;
62600 if (op->state == FSCACHE_OP_ST_PENDING) {
62601 ASSERT(!list_empty(&op->pend_link));
62602- fscache_stat(&fscache_n_op_cancelled);
62603+ fscache_stat_unchecked(&fscache_n_op_cancelled);
62604 list_del_init(&op->pend_link);
62605 if (do_cancel)
62606 do_cancel(op);
62607@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
62608 while (!list_empty(&object->pending_ops)) {
62609 op = list_entry(object->pending_ops.next,
62610 struct fscache_operation, pend_link);
62611- fscache_stat(&fscache_n_op_cancelled);
62612+ fscache_stat_unchecked(&fscache_n_op_cancelled);
62613 list_del_init(&op->pend_link);
62614
62615 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
62616@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
62617 op->state, ==, FSCACHE_OP_ST_CANCELLED);
62618 op->state = FSCACHE_OP_ST_DEAD;
62619
62620- fscache_stat(&fscache_n_op_release);
62621+ fscache_stat_unchecked(&fscache_n_op_release);
62622
62623 if (op->release) {
62624 op->release(op);
62625@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
62626 * lock, and defer it otherwise */
62627 if (!spin_trylock(&object->lock)) {
62628 _debug("defer put");
62629- fscache_stat(&fscache_n_op_deferred_release);
62630+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
62631
62632 cache = object->cache;
62633 spin_lock(&cache->op_gc_list_lock);
62634@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
62635
62636 _debug("GC DEFERRED REL OBJ%x OP%x",
62637 object->debug_id, op->debug_id);
62638- fscache_stat(&fscache_n_op_gc);
62639+ fscache_stat_unchecked(&fscache_n_op_gc);
62640
62641 ASSERTCMP(atomic_read(&op->usage), ==, 0);
62642 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
62643diff --git a/fs/fscache/page.c b/fs/fscache/page.c
62644index de33b3f..8be4d29 100644
62645--- a/fs/fscache/page.c
62646+++ b/fs/fscache/page.c
62647@@ -74,7 +74,7 @@ try_again:
62648 val = radix_tree_lookup(&cookie->stores, page->index);
62649 if (!val) {
62650 rcu_read_unlock();
62651- fscache_stat(&fscache_n_store_vmscan_not_storing);
62652+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
62653 __fscache_uncache_page(cookie, page);
62654 return true;
62655 }
62656@@ -104,11 +104,11 @@ try_again:
62657 spin_unlock(&cookie->stores_lock);
62658
62659 if (xpage) {
62660- fscache_stat(&fscache_n_store_vmscan_cancelled);
62661- fscache_stat(&fscache_n_store_radix_deletes);
62662+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
62663+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
62664 ASSERTCMP(xpage, ==, page);
62665 } else {
62666- fscache_stat(&fscache_n_store_vmscan_gone);
62667+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
62668 }
62669
62670 wake_up_bit(&cookie->flags, 0);
62671@@ -123,11 +123,11 @@ page_busy:
62672 * sleeping on memory allocation, so we may need to impose a timeout
62673 * too. */
62674 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
62675- fscache_stat(&fscache_n_store_vmscan_busy);
62676+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
62677 return false;
62678 }
62679
62680- fscache_stat(&fscache_n_store_vmscan_wait);
62681+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
62682 if (!release_page_wait_timeout(cookie, page))
62683 _debug("fscache writeout timeout page: %p{%lx}",
62684 page, page->index);
62685@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
62686 FSCACHE_COOKIE_STORING_TAG);
62687 if (!radix_tree_tag_get(&cookie->stores, page->index,
62688 FSCACHE_COOKIE_PENDING_TAG)) {
62689- fscache_stat(&fscache_n_store_radix_deletes);
62690+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
62691 xpage = radix_tree_delete(&cookie->stores, page->index);
62692 }
62693 spin_unlock(&cookie->stores_lock);
62694@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
62695
62696 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
62697
62698- fscache_stat(&fscache_n_attr_changed_calls);
62699+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
62700
62701 if (fscache_object_is_active(object)) {
62702 fscache_stat(&fscache_n_cop_attr_changed);
62703@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
62704
62705 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
62706
62707- fscache_stat(&fscache_n_attr_changed);
62708+ fscache_stat_unchecked(&fscache_n_attr_changed);
62709
62710 op = kzalloc(sizeof(*op), GFP_KERNEL);
62711 if (!op) {
62712- fscache_stat(&fscache_n_attr_changed_nomem);
62713+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
62714 _leave(" = -ENOMEM");
62715 return -ENOMEM;
62716 }
62717@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
62718 if (fscache_submit_exclusive_op(object, op) < 0)
62719 goto nobufs_dec;
62720 spin_unlock(&cookie->lock);
62721- fscache_stat(&fscache_n_attr_changed_ok);
62722+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
62723 fscache_put_operation(op);
62724 _leave(" = 0");
62725 return 0;
62726@@ -242,7 +242,7 @@ nobufs:
62727 kfree(op);
62728 if (wake_cookie)
62729 __fscache_wake_unused_cookie(cookie);
62730- fscache_stat(&fscache_n_attr_changed_nobufs);
62731+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
62732 _leave(" = %d", -ENOBUFS);
62733 return -ENOBUFS;
62734 }
62735@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
62736 /* allocate a retrieval operation and attempt to submit it */
62737 op = kzalloc(sizeof(*op), GFP_NOIO);
62738 if (!op) {
62739- fscache_stat(&fscache_n_retrievals_nomem);
62740+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62741 return NULL;
62742 }
62743
62744@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
62745 return 0;
62746 }
62747
62748- fscache_stat(&fscache_n_retrievals_wait);
62749+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
62750
62751 jif = jiffies;
62752 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
62753 TASK_INTERRUPTIBLE) != 0) {
62754- fscache_stat(&fscache_n_retrievals_intr);
62755+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
62756 _leave(" = -ERESTARTSYS");
62757 return -ERESTARTSYS;
62758 }
62759@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
62760 */
62761 int fscache_wait_for_operation_activation(struct fscache_object *object,
62762 struct fscache_operation *op,
62763- atomic_t *stat_op_waits,
62764- atomic_t *stat_object_dead,
62765+ atomic_unchecked_t *stat_op_waits,
62766+ atomic_unchecked_t *stat_object_dead,
62767 void (*do_cancel)(struct fscache_operation *))
62768 {
62769 int ret;
62770@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
62771
62772 _debug(">>> WT");
62773 if (stat_op_waits)
62774- fscache_stat(stat_op_waits);
62775+ fscache_stat_unchecked(stat_op_waits);
62776 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
62777 TASK_INTERRUPTIBLE) != 0) {
62778 ret = fscache_cancel_op(op, do_cancel);
62779@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
62780 check_if_dead:
62781 if (op->state == FSCACHE_OP_ST_CANCELLED) {
62782 if (stat_object_dead)
62783- fscache_stat(stat_object_dead);
62784+ fscache_stat_unchecked(stat_object_dead);
62785 _leave(" = -ENOBUFS [cancelled]");
62786 return -ENOBUFS;
62787 }
62788@@ -381,7 +381,7 @@ check_if_dead:
62789 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
62790 fscache_cancel_op(op, do_cancel);
62791 if (stat_object_dead)
62792- fscache_stat(stat_object_dead);
62793+ fscache_stat_unchecked(stat_object_dead);
62794 return -ENOBUFS;
62795 }
62796 return 0;
62797@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62798
62799 _enter("%p,%p,,,", cookie, page);
62800
62801- fscache_stat(&fscache_n_retrievals);
62802+ fscache_stat_unchecked(&fscache_n_retrievals);
62803
62804 if (hlist_empty(&cookie->backing_objects))
62805 goto nobufs;
62806@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62807 goto nobufs_unlock_dec;
62808 spin_unlock(&cookie->lock);
62809
62810- fscache_stat(&fscache_n_retrieval_ops);
62811+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
62812
62813 /* pin the netfs read context in case we need to do the actual netfs
62814 * read because we've encountered a cache read failure */
62815@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62816
62817 error:
62818 if (ret == -ENOMEM)
62819- fscache_stat(&fscache_n_retrievals_nomem);
62820+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62821 else if (ret == -ERESTARTSYS)
62822- fscache_stat(&fscache_n_retrievals_intr);
62823+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
62824 else if (ret == -ENODATA)
62825- fscache_stat(&fscache_n_retrievals_nodata);
62826+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
62827 else if (ret < 0)
62828- fscache_stat(&fscache_n_retrievals_nobufs);
62829+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62830 else
62831- fscache_stat(&fscache_n_retrievals_ok);
62832+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
62833
62834 fscache_put_retrieval(op);
62835 _leave(" = %d", ret);
62836@@ -505,7 +505,7 @@ nobufs_unlock:
62837 __fscache_wake_unused_cookie(cookie);
62838 kfree(op);
62839 nobufs:
62840- fscache_stat(&fscache_n_retrievals_nobufs);
62841+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62842 _leave(" = -ENOBUFS");
62843 return -ENOBUFS;
62844 }
62845@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62846
62847 _enter("%p,,%d,,,", cookie, *nr_pages);
62848
62849- fscache_stat(&fscache_n_retrievals);
62850+ fscache_stat_unchecked(&fscache_n_retrievals);
62851
62852 if (hlist_empty(&cookie->backing_objects))
62853 goto nobufs;
62854@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62855 goto nobufs_unlock_dec;
62856 spin_unlock(&cookie->lock);
62857
62858- fscache_stat(&fscache_n_retrieval_ops);
62859+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
62860
62861 /* pin the netfs read context in case we need to do the actual netfs
62862 * read because we've encountered a cache read failure */
62863@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62864
62865 error:
62866 if (ret == -ENOMEM)
62867- fscache_stat(&fscache_n_retrievals_nomem);
62868+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62869 else if (ret == -ERESTARTSYS)
62870- fscache_stat(&fscache_n_retrievals_intr);
62871+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
62872 else if (ret == -ENODATA)
62873- fscache_stat(&fscache_n_retrievals_nodata);
62874+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
62875 else if (ret < 0)
62876- fscache_stat(&fscache_n_retrievals_nobufs);
62877+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62878 else
62879- fscache_stat(&fscache_n_retrievals_ok);
62880+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
62881
62882 fscache_put_retrieval(op);
62883 _leave(" = %d", ret);
62884@@ -636,7 +636,7 @@ nobufs_unlock:
62885 if (wake_cookie)
62886 __fscache_wake_unused_cookie(cookie);
62887 nobufs:
62888- fscache_stat(&fscache_n_retrievals_nobufs);
62889+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62890 _leave(" = -ENOBUFS");
62891 return -ENOBUFS;
62892 }
62893@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62894
62895 _enter("%p,%p,,,", cookie, page);
62896
62897- fscache_stat(&fscache_n_allocs);
62898+ fscache_stat_unchecked(&fscache_n_allocs);
62899
62900 if (hlist_empty(&cookie->backing_objects))
62901 goto nobufs;
62902@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62903 goto nobufs_unlock_dec;
62904 spin_unlock(&cookie->lock);
62905
62906- fscache_stat(&fscache_n_alloc_ops);
62907+ fscache_stat_unchecked(&fscache_n_alloc_ops);
62908
62909 ret = fscache_wait_for_operation_activation(
62910 object, &op->op,
62911@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62912
62913 error:
62914 if (ret == -ERESTARTSYS)
62915- fscache_stat(&fscache_n_allocs_intr);
62916+ fscache_stat_unchecked(&fscache_n_allocs_intr);
62917 else if (ret < 0)
62918- fscache_stat(&fscache_n_allocs_nobufs);
62919+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
62920 else
62921- fscache_stat(&fscache_n_allocs_ok);
62922+ fscache_stat_unchecked(&fscache_n_allocs_ok);
62923
62924 fscache_put_retrieval(op);
62925 _leave(" = %d", ret);
62926@@ -730,7 +730,7 @@ nobufs_unlock:
62927 if (wake_cookie)
62928 __fscache_wake_unused_cookie(cookie);
62929 nobufs:
62930- fscache_stat(&fscache_n_allocs_nobufs);
62931+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
62932 _leave(" = -ENOBUFS");
62933 return -ENOBUFS;
62934 }
62935@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
62936
62937 spin_lock(&cookie->stores_lock);
62938
62939- fscache_stat(&fscache_n_store_calls);
62940+ fscache_stat_unchecked(&fscache_n_store_calls);
62941
62942 /* find a page to store */
62943 page = NULL;
62944@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
62945 page = results[0];
62946 _debug("gang %d [%lx]", n, page->index);
62947 if (page->index > op->store_limit) {
62948- fscache_stat(&fscache_n_store_pages_over_limit);
62949+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
62950 goto superseded;
62951 }
62952
62953@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
62954 spin_unlock(&cookie->stores_lock);
62955 spin_unlock(&object->lock);
62956
62957- fscache_stat(&fscache_n_store_pages);
62958+ fscache_stat_unchecked(&fscache_n_store_pages);
62959 fscache_stat(&fscache_n_cop_write_page);
62960 ret = object->cache->ops->write_page(op, page);
62961 fscache_stat_d(&fscache_n_cop_write_page);
62962@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62963 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
62964 ASSERT(PageFsCache(page));
62965
62966- fscache_stat(&fscache_n_stores);
62967+ fscache_stat_unchecked(&fscache_n_stores);
62968
62969 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
62970 _leave(" = -ENOBUFS [invalidating]");
62971@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62972 spin_unlock(&cookie->stores_lock);
62973 spin_unlock(&object->lock);
62974
62975- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
62976+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
62977 op->store_limit = object->store_limit;
62978
62979 __fscache_use_cookie(cookie);
62980@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62981
62982 spin_unlock(&cookie->lock);
62983 radix_tree_preload_end();
62984- fscache_stat(&fscache_n_store_ops);
62985- fscache_stat(&fscache_n_stores_ok);
62986+ fscache_stat_unchecked(&fscache_n_store_ops);
62987+ fscache_stat_unchecked(&fscache_n_stores_ok);
62988
62989 /* the work queue now carries its own ref on the object */
62990 fscache_put_operation(&op->op);
62991@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62992 return 0;
62993
62994 already_queued:
62995- fscache_stat(&fscache_n_stores_again);
62996+ fscache_stat_unchecked(&fscache_n_stores_again);
62997 already_pending:
62998 spin_unlock(&cookie->stores_lock);
62999 spin_unlock(&object->lock);
63000 spin_unlock(&cookie->lock);
63001 radix_tree_preload_end();
63002 kfree(op);
63003- fscache_stat(&fscache_n_stores_ok);
63004+ fscache_stat_unchecked(&fscache_n_stores_ok);
63005 _leave(" = 0");
63006 return 0;
63007
63008@@ -1039,14 +1039,14 @@ nobufs:
63009 kfree(op);
63010 if (wake_cookie)
63011 __fscache_wake_unused_cookie(cookie);
63012- fscache_stat(&fscache_n_stores_nobufs);
63013+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
63014 _leave(" = -ENOBUFS");
63015 return -ENOBUFS;
63016
63017 nomem_free:
63018 kfree(op);
63019 nomem:
63020- fscache_stat(&fscache_n_stores_oom);
63021+ fscache_stat_unchecked(&fscache_n_stores_oom);
63022 _leave(" = -ENOMEM");
63023 return -ENOMEM;
63024 }
63025@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
63026 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
63027 ASSERTCMP(page, !=, NULL);
63028
63029- fscache_stat(&fscache_n_uncaches);
63030+ fscache_stat_unchecked(&fscache_n_uncaches);
63031
63032 /* cache withdrawal may beat us to it */
63033 if (!PageFsCache(page))
63034@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
63035 struct fscache_cookie *cookie = op->op.object->cookie;
63036
63037 #ifdef CONFIG_FSCACHE_STATS
63038- atomic_inc(&fscache_n_marks);
63039+ atomic_inc_unchecked(&fscache_n_marks);
63040 #endif
63041
63042 _debug("- mark %p{%lx}", page, page->index);
63043diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
63044index 40d13c7..ddf52b9 100644
63045--- a/fs/fscache/stats.c
63046+++ b/fs/fscache/stats.c
63047@@ -18,99 +18,99 @@
63048 /*
63049 * operation counters
63050 */
63051-atomic_t fscache_n_op_pend;
63052-atomic_t fscache_n_op_run;
63053-atomic_t fscache_n_op_enqueue;
63054-atomic_t fscache_n_op_requeue;
63055-atomic_t fscache_n_op_deferred_release;
63056-atomic_t fscache_n_op_release;
63057-atomic_t fscache_n_op_gc;
63058-atomic_t fscache_n_op_cancelled;
63059-atomic_t fscache_n_op_rejected;
63060+atomic_unchecked_t fscache_n_op_pend;
63061+atomic_unchecked_t fscache_n_op_run;
63062+atomic_unchecked_t fscache_n_op_enqueue;
63063+atomic_unchecked_t fscache_n_op_requeue;
63064+atomic_unchecked_t fscache_n_op_deferred_release;
63065+atomic_unchecked_t fscache_n_op_release;
63066+atomic_unchecked_t fscache_n_op_gc;
63067+atomic_unchecked_t fscache_n_op_cancelled;
63068+atomic_unchecked_t fscache_n_op_rejected;
63069
63070-atomic_t fscache_n_attr_changed;
63071-atomic_t fscache_n_attr_changed_ok;
63072-atomic_t fscache_n_attr_changed_nobufs;
63073-atomic_t fscache_n_attr_changed_nomem;
63074-atomic_t fscache_n_attr_changed_calls;
63075+atomic_unchecked_t fscache_n_attr_changed;
63076+atomic_unchecked_t fscache_n_attr_changed_ok;
63077+atomic_unchecked_t fscache_n_attr_changed_nobufs;
63078+atomic_unchecked_t fscache_n_attr_changed_nomem;
63079+atomic_unchecked_t fscache_n_attr_changed_calls;
63080
63081-atomic_t fscache_n_allocs;
63082-atomic_t fscache_n_allocs_ok;
63083-atomic_t fscache_n_allocs_wait;
63084-atomic_t fscache_n_allocs_nobufs;
63085-atomic_t fscache_n_allocs_intr;
63086-atomic_t fscache_n_allocs_object_dead;
63087-atomic_t fscache_n_alloc_ops;
63088-atomic_t fscache_n_alloc_op_waits;
63089+atomic_unchecked_t fscache_n_allocs;
63090+atomic_unchecked_t fscache_n_allocs_ok;
63091+atomic_unchecked_t fscache_n_allocs_wait;
63092+atomic_unchecked_t fscache_n_allocs_nobufs;
63093+atomic_unchecked_t fscache_n_allocs_intr;
63094+atomic_unchecked_t fscache_n_allocs_object_dead;
63095+atomic_unchecked_t fscache_n_alloc_ops;
63096+atomic_unchecked_t fscache_n_alloc_op_waits;
63097
63098-atomic_t fscache_n_retrievals;
63099-atomic_t fscache_n_retrievals_ok;
63100-atomic_t fscache_n_retrievals_wait;
63101-atomic_t fscache_n_retrievals_nodata;
63102-atomic_t fscache_n_retrievals_nobufs;
63103-atomic_t fscache_n_retrievals_intr;
63104-atomic_t fscache_n_retrievals_nomem;
63105-atomic_t fscache_n_retrievals_object_dead;
63106-atomic_t fscache_n_retrieval_ops;
63107-atomic_t fscache_n_retrieval_op_waits;
63108+atomic_unchecked_t fscache_n_retrievals;
63109+atomic_unchecked_t fscache_n_retrievals_ok;
63110+atomic_unchecked_t fscache_n_retrievals_wait;
63111+atomic_unchecked_t fscache_n_retrievals_nodata;
63112+atomic_unchecked_t fscache_n_retrievals_nobufs;
63113+atomic_unchecked_t fscache_n_retrievals_intr;
63114+atomic_unchecked_t fscache_n_retrievals_nomem;
63115+atomic_unchecked_t fscache_n_retrievals_object_dead;
63116+atomic_unchecked_t fscache_n_retrieval_ops;
63117+atomic_unchecked_t fscache_n_retrieval_op_waits;
63118
63119-atomic_t fscache_n_stores;
63120-atomic_t fscache_n_stores_ok;
63121-atomic_t fscache_n_stores_again;
63122-atomic_t fscache_n_stores_nobufs;
63123-atomic_t fscache_n_stores_oom;
63124-atomic_t fscache_n_store_ops;
63125-atomic_t fscache_n_store_calls;
63126-atomic_t fscache_n_store_pages;
63127-atomic_t fscache_n_store_radix_deletes;
63128-atomic_t fscache_n_store_pages_over_limit;
63129+atomic_unchecked_t fscache_n_stores;
63130+atomic_unchecked_t fscache_n_stores_ok;
63131+atomic_unchecked_t fscache_n_stores_again;
63132+atomic_unchecked_t fscache_n_stores_nobufs;
63133+atomic_unchecked_t fscache_n_stores_oom;
63134+atomic_unchecked_t fscache_n_store_ops;
63135+atomic_unchecked_t fscache_n_store_calls;
63136+atomic_unchecked_t fscache_n_store_pages;
63137+atomic_unchecked_t fscache_n_store_radix_deletes;
63138+atomic_unchecked_t fscache_n_store_pages_over_limit;
63139
63140-atomic_t fscache_n_store_vmscan_not_storing;
63141-atomic_t fscache_n_store_vmscan_gone;
63142-atomic_t fscache_n_store_vmscan_busy;
63143-atomic_t fscache_n_store_vmscan_cancelled;
63144-atomic_t fscache_n_store_vmscan_wait;
63145+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
63146+atomic_unchecked_t fscache_n_store_vmscan_gone;
63147+atomic_unchecked_t fscache_n_store_vmscan_busy;
63148+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
63149+atomic_unchecked_t fscache_n_store_vmscan_wait;
63150
63151-atomic_t fscache_n_marks;
63152-atomic_t fscache_n_uncaches;
63153+atomic_unchecked_t fscache_n_marks;
63154+atomic_unchecked_t fscache_n_uncaches;
63155
63156-atomic_t fscache_n_acquires;
63157-atomic_t fscache_n_acquires_null;
63158-atomic_t fscache_n_acquires_no_cache;
63159-atomic_t fscache_n_acquires_ok;
63160-atomic_t fscache_n_acquires_nobufs;
63161-atomic_t fscache_n_acquires_oom;
63162+atomic_unchecked_t fscache_n_acquires;
63163+atomic_unchecked_t fscache_n_acquires_null;
63164+atomic_unchecked_t fscache_n_acquires_no_cache;
63165+atomic_unchecked_t fscache_n_acquires_ok;
63166+atomic_unchecked_t fscache_n_acquires_nobufs;
63167+atomic_unchecked_t fscache_n_acquires_oom;
63168
63169-atomic_t fscache_n_invalidates;
63170-atomic_t fscache_n_invalidates_run;
63171+atomic_unchecked_t fscache_n_invalidates;
63172+atomic_unchecked_t fscache_n_invalidates_run;
63173
63174-atomic_t fscache_n_updates;
63175-atomic_t fscache_n_updates_null;
63176-atomic_t fscache_n_updates_run;
63177+atomic_unchecked_t fscache_n_updates;
63178+atomic_unchecked_t fscache_n_updates_null;
63179+atomic_unchecked_t fscache_n_updates_run;
63180
63181-atomic_t fscache_n_relinquishes;
63182-atomic_t fscache_n_relinquishes_null;
63183-atomic_t fscache_n_relinquishes_waitcrt;
63184-atomic_t fscache_n_relinquishes_retire;
63185+atomic_unchecked_t fscache_n_relinquishes;
63186+atomic_unchecked_t fscache_n_relinquishes_null;
63187+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
63188+atomic_unchecked_t fscache_n_relinquishes_retire;
63189
63190-atomic_t fscache_n_cookie_index;
63191-atomic_t fscache_n_cookie_data;
63192-atomic_t fscache_n_cookie_special;
63193+atomic_unchecked_t fscache_n_cookie_index;
63194+atomic_unchecked_t fscache_n_cookie_data;
63195+atomic_unchecked_t fscache_n_cookie_special;
63196
63197-atomic_t fscache_n_object_alloc;
63198-atomic_t fscache_n_object_no_alloc;
63199-atomic_t fscache_n_object_lookups;
63200-atomic_t fscache_n_object_lookups_negative;
63201-atomic_t fscache_n_object_lookups_positive;
63202-atomic_t fscache_n_object_lookups_timed_out;
63203-atomic_t fscache_n_object_created;
63204-atomic_t fscache_n_object_avail;
63205-atomic_t fscache_n_object_dead;
63206+atomic_unchecked_t fscache_n_object_alloc;
63207+atomic_unchecked_t fscache_n_object_no_alloc;
63208+atomic_unchecked_t fscache_n_object_lookups;
63209+atomic_unchecked_t fscache_n_object_lookups_negative;
63210+atomic_unchecked_t fscache_n_object_lookups_positive;
63211+atomic_unchecked_t fscache_n_object_lookups_timed_out;
63212+atomic_unchecked_t fscache_n_object_created;
63213+atomic_unchecked_t fscache_n_object_avail;
63214+atomic_unchecked_t fscache_n_object_dead;
63215
63216-atomic_t fscache_n_checkaux_none;
63217-atomic_t fscache_n_checkaux_okay;
63218-atomic_t fscache_n_checkaux_update;
63219-atomic_t fscache_n_checkaux_obsolete;
63220+atomic_unchecked_t fscache_n_checkaux_none;
63221+atomic_unchecked_t fscache_n_checkaux_okay;
63222+atomic_unchecked_t fscache_n_checkaux_update;
63223+atomic_unchecked_t fscache_n_checkaux_obsolete;
63224
63225 atomic_t fscache_n_cop_alloc_object;
63226 atomic_t fscache_n_cop_lookup_object;
63227@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
63228 seq_puts(m, "FS-Cache statistics\n");
63229
63230 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
63231- atomic_read(&fscache_n_cookie_index),
63232- atomic_read(&fscache_n_cookie_data),
63233- atomic_read(&fscache_n_cookie_special));
63234+ atomic_read_unchecked(&fscache_n_cookie_index),
63235+ atomic_read_unchecked(&fscache_n_cookie_data),
63236+ atomic_read_unchecked(&fscache_n_cookie_special));
63237
63238 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
63239- atomic_read(&fscache_n_object_alloc),
63240- atomic_read(&fscache_n_object_no_alloc),
63241- atomic_read(&fscache_n_object_avail),
63242- atomic_read(&fscache_n_object_dead));
63243+ atomic_read_unchecked(&fscache_n_object_alloc),
63244+ atomic_read_unchecked(&fscache_n_object_no_alloc),
63245+ atomic_read_unchecked(&fscache_n_object_avail),
63246+ atomic_read_unchecked(&fscache_n_object_dead));
63247 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
63248- atomic_read(&fscache_n_checkaux_none),
63249- atomic_read(&fscache_n_checkaux_okay),
63250- atomic_read(&fscache_n_checkaux_update),
63251- atomic_read(&fscache_n_checkaux_obsolete));
63252+ atomic_read_unchecked(&fscache_n_checkaux_none),
63253+ atomic_read_unchecked(&fscache_n_checkaux_okay),
63254+ atomic_read_unchecked(&fscache_n_checkaux_update),
63255+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
63256
63257 seq_printf(m, "Pages : mrk=%u unc=%u\n",
63258- atomic_read(&fscache_n_marks),
63259- atomic_read(&fscache_n_uncaches));
63260+ atomic_read_unchecked(&fscache_n_marks),
63261+ atomic_read_unchecked(&fscache_n_uncaches));
63262
63263 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
63264 " oom=%u\n",
63265- atomic_read(&fscache_n_acquires),
63266- atomic_read(&fscache_n_acquires_null),
63267- atomic_read(&fscache_n_acquires_no_cache),
63268- atomic_read(&fscache_n_acquires_ok),
63269- atomic_read(&fscache_n_acquires_nobufs),
63270- atomic_read(&fscache_n_acquires_oom));
63271+ atomic_read_unchecked(&fscache_n_acquires),
63272+ atomic_read_unchecked(&fscache_n_acquires_null),
63273+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
63274+ atomic_read_unchecked(&fscache_n_acquires_ok),
63275+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
63276+ atomic_read_unchecked(&fscache_n_acquires_oom));
63277
63278 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
63279- atomic_read(&fscache_n_object_lookups),
63280- atomic_read(&fscache_n_object_lookups_negative),
63281- atomic_read(&fscache_n_object_lookups_positive),
63282- atomic_read(&fscache_n_object_created),
63283- atomic_read(&fscache_n_object_lookups_timed_out));
63284+ atomic_read_unchecked(&fscache_n_object_lookups),
63285+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
63286+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
63287+ atomic_read_unchecked(&fscache_n_object_created),
63288+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
63289
63290 seq_printf(m, "Invals : n=%u run=%u\n",
63291- atomic_read(&fscache_n_invalidates),
63292- atomic_read(&fscache_n_invalidates_run));
63293+ atomic_read_unchecked(&fscache_n_invalidates),
63294+ atomic_read_unchecked(&fscache_n_invalidates_run));
63295
63296 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
63297- atomic_read(&fscache_n_updates),
63298- atomic_read(&fscache_n_updates_null),
63299- atomic_read(&fscache_n_updates_run));
63300+ atomic_read_unchecked(&fscache_n_updates),
63301+ atomic_read_unchecked(&fscache_n_updates_null),
63302+ atomic_read_unchecked(&fscache_n_updates_run));
63303
63304 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
63305- atomic_read(&fscache_n_relinquishes),
63306- atomic_read(&fscache_n_relinquishes_null),
63307- atomic_read(&fscache_n_relinquishes_waitcrt),
63308- atomic_read(&fscache_n_relinquishes_retire));
63309+ atomic_read_unchecked(&fscache_n_relinquishes),
63310+ atomic_read_unchecked(&fscache_n_relinquishes_null),
63311+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
63312+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
63313
63314 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
63315- atomic_read(&fscache_n_attr_changed),
63316- atomic_read(&fscache_n_attr_changed_ok),
63317- atomic_read(&fscache_n_attr_changed_nobufs),
63318- atomic_read(&fscache_n_attr_changed_nomem),
63319- atomic_read(&fscache_n_attr_changed_calls));
63320+ atomic_read_unchecked(&fscache_n_attr_changed),
63321+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
63322+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
63323+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
63324+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
63325
63326 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
63327- atomic_read(&fscache_n_allocs),
63328- atomic_read(&fscache_n_allocs_ok),
63329- atomic_read(&fscache_n_allocs_wait),
63330- atomic_read(&fscache_n_allocs_nobufs),
63331- atomic_read(&fscache_n_allocs_intr));
63332+ atomic_read_unchecked(&fscache_n_allocs),
63333+ atomic_read_unchecked(&fscache_n_allocs_ok),
63334+ atomic_read_unchecked(&fscache_n_allocs_wait),
63335+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
63336+ atomic_read_unchecked(&fscache_n_allocs_intr));
63337 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
63338- atomic_read(&fscache_n_alloc_ops),
63339- atomic_read(&fscache_n_alloc_op_waits),
63340- atomic_read(&fscache_n_allocs_object_dead));
63341+ atomic_read_unchecked(&fscache_n_alloc_ops),
63342+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
63343+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
63344
63345 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
63346 " int=%u oom=%u\n",
63347- atomic_read(&fscache_n_retrievals),
63348- atomic_read(&fscache_n_retrievals_ok),
63349- atomic_read(&fscache_n_retrievals_wait),
63350- atomic_read(&fscache_n_retrievals_nodata),
63351- atomic_read(&fscache_n_retrievals_nobufs),
63352- atomic_read(&fscache_n_retrievals_intr),
63353- atomic_read(&fscache_n_retrievals_nomem));
63354+ atomic_read_unchecked(&fscache_n_retrievals),
63355+ atomic_read_unchecked(&fscache_n_retrievals_ok),
63356+ atomic_read_unchecked(&fscache_n_retrievals_wait),
63357+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
63358+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
63359+ atomic_read_unchecked(&fscache_n_retrievals_intr),
63360+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
63361 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
63362- atomic_read(&fscache_n_retrieval_ops),
63363- atomic_read(&fscache_n_retrieval_op_waits),
63364- atomic_read(&fscache_n_retrievals_object_dead));
63365+ atomic_read_unchecked(&fscache_n_retrieval_ops),
63366+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
63367+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
63368
63369 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
63370- atomic_read(&fscache_n_stores),
63371- atomic_read(&fscache_n_stores_ok),
63372- atomic_read(&fscache_n_stores_again),
63373- atomic_read(&fscache_n_stores_nobufs),
63374- atomic_read(&fscache_n_stores_oom));
63375+ atomic_read_unchecked(&fscache_n_stores),
63376+ atomic_read_unchecked(&fscache_n_stores_ok),
63377+ atomic_read_unchecked(&fscache_n_stores_again),
63378+ atomic_read_unchecked(&fscache_n_stores_nobufs),
63379+ atomic_read_unchecked(&fscache_n_stores_oom));
63380 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
63381- atomic_read(&fscache_n_store_ops),
63382- atomic_read(&fscache_n_store_calls),
63383- atomic_read(&fscache_n_store_pages),
63384- atomic_read(&fscache_n_store_radix_deletes),
63385- atomic_read(&fscache_n_store_pages_over_limit));
63386+ atomic_read_unchecked(&fscache_n_store_ops),
63387+ atomic_read_unchecked(&fscache_n_store_calls),
63388+ atomic_read_unchecked(&fscache_n_store_pages),
63389+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
63390+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
63391
63392 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
63393- atomic_read(&fscache_n_store_vmscan_not_storing),
63394- atomic_read(&fscache_n_store_vmscan_gone),
63395- atomic_read(&fscache_n_store_vmscan_busy),
63396- atomic_read(&fscache_n_store_vmscan_cancelled),
63397- atomic_read(&fscache_n_store_vmscan_wait));
63398+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
63399+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
63400+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
63401+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
63402+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
63403
63404 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
63405- atomic_read(&fscache_n_op_pend),
63406- atomic_read(&fscache_n_op_run),
63407- atomic_read(&fscache_n_op_enqueue),
63408- atomic_read(&fscache_n_op_cancelled),
63409- atomic_read(&fscache_n_op_rejected));
63410+ atomic_read_unchecked(&fscache_n_op_pend),
63411+ atomic_read_unchecked(&fscache_n_op_run),
63412+ atomic_read_unchecked(&fscache_n_op_enqueue),
63413+ atomic_read_unchecked(&fscache_n_op_cancelled),
63414+ atomic_read_unchecked(&fscache_n_op_rejected));
63415 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
63416- atomic_read(&fscache_n_op_deferred_release),
63417- atomic_read(&fscache_n_op_release),
63418- atomic_read(&fscache_n_op_gc));
63419+ atomic_read_unchecked(&fscache_n_op_deferred_release),
63420+ atomic_read_unchecked(&fscache_n_op_release),
63421+ atomic_read_unchecked(&fscache_n_op_gc));
63422
63423 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
63424 atomic_read(&fscache_n_cop_alloc_object),
63425diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
63426index 966ace8..030a03a 100644
63427--- a/fs/fuse/cuse.c
63428+++ b/fs/fuse/cuse.c
63429@@ -611,10 +611,12 @@ static int __init cuse_init(void)
63430 INIT_LIST_HEAD(&cuse_conntbl[i]);
63431
63432 /* inherit and extend fuse_dev_operations */
63433- cuse_channel_fops = fuse_dev_operations;
63434- cuse_channel_fops.owner = THIS_MODULE;
63435- cuse_channel_fops.open = cuse_channel_open;
63436- cuse_channel_fops.release = cuse_channel_release;
63437+ pax_open_kernel();
63438+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
63439+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
63440+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
63441+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
63442+ pax_close_kernel();
63443
63444 cuse_class = class_create(THIS_MODULE, "cuse");
63445 if (IS_ERR(cuse_class))
63446diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
63447index ca88731..8e9c55d 100644
63448--- a/fs/fuse/dev.c
63449+++ b/fs/fuse/dev.c
63450@@ -1318,7 +1318,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
63451 ret = 0;
63452 pipe_lock(pipe);
63453
63454- if (!pipe->readers) {
63455+ if (!atomic_read(&pipe->readers)) {
63456 send_sig(SIGPIPE, current, 0);
63457 if (!ret)
63458 ret = -EPIPE;
63459@@ -1347,7 +1347,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
63460 page_nr++;
63461 ret += buf->len;
63462
63463- if (pipe->files)
63464+ if (atomic_read(&pipe->files))
63465 do_wakeup = 1;
63466 }
63467
63468diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
63469index dbab798..fefa22b 100644
63470--- a/fs/fuse/dir.c
63471+++ b/fs/fuse/dir.c
63472@@ -1474,7 +1474,7 @@ static char *read_link(struct dentry *dentry)
63473 return link;
63474 }
63475
63476-static void free_link(char *link)
63477+static void free_link(const char *link)
63478 {
63479 if (!IS_ERR(link))
63480 free_page((unsigned long) link);
63481diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
63482index fd62cae..3494dfa 100644
63483--- a/fs/hostfs/hostfs_kern.c
63484+++ b/fs/hostfs/hostfs_kern.c
63485@@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
63486
63487 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
63488 {
63489- char *s = nd_get_link(nd);
63490+ const char *s = nd_get_link(nd);
63491 if (!IS_ERR(s))
63492 __putname(s);
63493 }
63494diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
63495index 1e2872b..7aea000 100644
63496--- a/fs/hugetlbfs/inode.c
63497+++ b/fs/hugetlbfs/inode.c
63498@@ -154,6 +154,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
63499 struct mm_struct *mm = current->mm;
63500 struct vm_area_struct *vma;
63501 struct hstate *h = hstate_file(file);
63502+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
63503 struct vm_unmapped_area_info info;
63504
63505 if (len & ~huge_page_mask(h))
63506@@ -167,17 +168,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
63507 return addr;
63508 }
63509
63510+#ifdef CONFIG_PAX_RANDMMAP
63511+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
63512+#endif
63513+
63514 if (addr) {
63515 addr = ALIGN(addr, huge_page_size(h));
63516 vma = find_vma(mm, addr);
63517- if (TASK_SIZE - len >= addr &&
63518- (!vma || addr + len <= vma->vm_start))
63519+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
63520 return addr;
63521 }
63522
63523 info.flags = 0;
63524 info.length = len;
63525 info.low_limit = TASK_UNMAPPED_BASE;
63526+
63527+#ifdef CONFIG_PAX_RANDMMAP
63528+ if (mm->pax_flags & MF_PAX_RANDMMAP)
63529+ info.low_limit += mm->delta_mmap;
63530+#endif
63531+
63532 info.high_limit = TASK_SIZE;
63533 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
63534 info.align_offset = 0;
63535@@ -919,7 +929,7 @@ static struct file_system_type hugetlbfs_fs_type = {
63536 };
63537 MODULE_ALIAS_FS("hugetlbfs");
63538
63539-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63540+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63541
63542 static int can_do_hugetlb_shm(void)
63543 {
63544diff --git a/fs/inode.c b/fs/inode.c
63545index 26753ba..d19eb34 100644
63546--- a/fs/inode.c
63547+++ b/fs/inode.c
63548@@ -840,16 +840,20 @@ unsigned int get_next_ino(void)
63549 unsigned int *p = &get_cpu_var(last_ino);
63550 unsigned int res = *p;
63551
63552+start:
63553+
63554 #ifdef CONFIG_SMP
63555 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
63556- static atomic_t shared_last_ino;
63557- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
63558+ static atomic_unchecked_t shared_last_ino;
63559+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
63560
63561 res = next - LAST_INO_BATCH;
63562 }
63563 #endif
63564
63565- *p = ++res;
63566+ if (unlikely(!++res))
63567+ goto start; /* never zero */
63568+ *p = res;
63569 put_cpu_var(last_ino);
63570 return res;
63571 }
63572diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
63573index 4a6cf28..d3a29d3 100644
63574--- a/fs/jffs2/erase.c
63575+++ b/fs/jffs2/erase.c
63576@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
63577 struct jffs2_unknown_node marker = {
63578 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
63579 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
63580- .totlen = cpu_to_je32(c->cleanmarker_size)
63581+ .totlen = cpu_to_je32(c->cleanmarker_size),
63582+ .hdr_crc = cpu_to_je32(0)
63583 };
63584
63585 jffs2_prealloc_raw_node_refs(c, jeb, 1);
63586diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
63587index 09ed551..45684f8 100644
63588--- a/fs/jffs2/wbuf.c
63589+++ b/fs/jffs2/wbuf.c
63590@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
63591 {
63592 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
63593 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
63594- .totlen = constant_cpu_to_je32(8)
63595+ .totlen = constant_cpu_to_je32(8),
63596+ .hdr_crc = constant_cpu_to_je32(0)
63597 };
63598
63599 /*
63600diff --git a/fs/jfs/super.c b/fs/jfs/super.c
63601index 93e897e..a863de4 100644
63602--- a/fs/jfs/super.c
63603+++ b/fs/jfs/super.c
63604@@ -893,7 +893,7 @@ static int __init init_jfs_fs(void)
63605
63606 jfs_inode_cachep =
63607 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
63608- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
63609+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
63610 init_once);
63611 if (jfs_inode_cachep == NULL)
63612 return -ENOMEM;
63613diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
63614index 1c77193..ba73e66 100644
63615--- a/fs/kernfs/dir.c
63616+++ b/fs/kernfs/dir.c
63617@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
63618 *
63619 * Returns 31 bit hash of ns + name (so it fits in an off_t )
63620 */
63621-static unsigned int kernfs_name_hash(const char *name, const void *ns)
63622+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
63623 {
63624 unsigned long hash = init_name_hash();
63625 unsigned int len = strlen(name);
63626@@ -829,6 +829,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
63627 ret = scops->mkdir(parent, dentry->d_name.name, mode);
63628
63629 kernfs_put_active(parent);
63630+
63631+ if (!ret) {
63632+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
63633+ ret = PTR_ERR_OR_ZERO(dentry_ret);
63634+ }
63635+
63636 return ret;
63637 }
63638
63639diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
63640index 4429d6d..9831f52 100644
63641--- a/fs/kernfs/file.c
63642+++ b/fs/kernfs/file.c
63643@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
63644
63645 struct kernfs_open_node {
63646 atomic_t refcnt;
63647- atomic_t event;
63648+ atomic_unchecked_t event;
63649 wait_queue_head_t poll;
63650 struct list_head files; /* goes through kernfs_open_file.list */
63651 };
63652@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
63653 {
63654 struct kernfs_open_file *of = sf->private;
63655
63656- of->event = atomic_read(&of->kn->attr.open->event);
63657+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
63658
63659 return of->kn->attr.ops->seq_show(sf, v);
63660 }
63661@@ -375,12 +375,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
63662 return ret;
63663 }
63664
63665-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
63666- void *buf, int len, int write)
63667+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
63668+ void *buf, size_t len, int write)
63669 {
63670 struct file *file = vma->vm_file;
63671 struct kernfs_open_file *of = kernfs_of(file);
63672- int ret;
63673+ ssize_t ret;
63674
63675 if (!of->vm_ops)
63676 return -EINVAL;
63677@@ -581,7 +581,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
63678 return -ENOMEM;
63679
63680 atomic_set(&new_on->refcnt, 0);
63681- atomic_set(&new_on->event, 1);
63682+ atomic_set_unchecked(&new_on->event, 1);
63683 init_waitqueue_head(&new_on->poll);
63684 INIT_LIST_HEAD(&new_on->files);
63685 goto retry;
63686@@ -787,7 +787,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
63687
63688 kernfs_put_active(kn);
63689
63690- if (of->event != atomic_read(&on->event))
63691+ if (of->event != atomic_read_unchecked(&on->event))
63692 goto trigger;
63693
63694 return DEFAULT_POLLMASK;
63695@@ -818,7 +818,7 @@ repeat:
63696
63697 on = kn->attr.open;
63698 if (on) {
63699- atomic_inc(&on->event);
63700+ atomic_inc_unchecked(&on->event);
63701 wake_up_interruptible(&on->poll);
63702 }
63703
63704diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
63705index 8a19889..4c3069a 100644
63706--- a/fs/kernfs/symlink.c
63707+++ b/fs/kernfs/symlink.c
63708@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
63709 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
63710 void *cookie)
63711 {
63712- char *page = nd_get_link(nd);
63713+ const char *page = nd_get_link(nd);
63714 if (!IS_ERR(page))
63715 free_page((unsigned long)page);
63716 }
63717diff --git a/fs/libfs.c b/fs/libfs.c
63718index 005843c..06c4191 100644
63719--- a/fs/libfs.c
63720+++ b/fs/libfs.c
63721@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
63722
63723 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
63724 struct dentry *next = list_entry(p, struct dentry, d_child);
63725+ char d_name[sizeof(next->d_iname)];
63726+ const unsigned char *name;
63727+
63728 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
63729 if (!simple_positive(next)) {
63730 spin_unlock(&next->d_lock);
63731@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
63732
63733 spin_unlock(&next->d_lock);
63734 spin_unlock(&dentry->d_lock);
63735- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
63736+ name = next->d_name.name;
63737+ if (name == next->d_iname) {
63738+ memcpy(d_name, name, next->d_name.len);
63739+ name = d_name;
63740+ }
63741+ if (!dir_emit(ctx, name, next->d_name.len,
63742 next->d_inode->i_ino, dt_type(next->d_inode)))
63743 return 0;
63744 spin_lock(&dentry->d_lock);
63745@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
63746 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
63747 void *cookie)
63748 {
63749- char *s = nd_get_link(nd);
63750+ const char *s = nd_get_link(nd);
63751 if (!IS_ERR(s))
63752 kfree(s);
63753 }
63754diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
63755index acd3947..1f896e2 100644
63756--- a/fs/lockd/clntproc.c
63757+++ b/fs/lockd/clntproc.c
63758@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
63759 /*
63760 * Cookie counter for NLM requests
63761 */
63762-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
63763+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
63764
63765 void nlmclnt_next_cookie(struct nlm_cookie *c)
63766 {
63767- u32 cookie = atomic_inc_return(&nlm_cookie);
63768+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
63769
63770 memcpy(c->data, &cookie, 4);
63771 c->len=4;
63772diff --git a/fs/locks.c b/fs/locks.c
63773index 735b8d3..dfc44a2 100644
63774--- a/fs/locks.c
63775+++ b/fs/locks.c
63776@@ -2374,7 +2374,7 @@ void locks_remove_file(struct file *filp)
63777 locks_remove_posix(filp, filp);
63778
63779 if (filp->f_op->flock) {
63780- struct file_lock fl = {
63781+ struct file_lock flock = {
63782 .fl_owner = filp,
63783 .fl_pid = current->tgid,
63784 .fl_file = filp,
63785@@ -2382,9 +2382,9 @@ void locks_remove_file(struct file *filp)
63786 .fl_type = F_UNLCK,
63787 .fl_end = OFFSET_MAX,
63788 };
63789- filp->f_op->flock(filp, F_SETLKW, &fl);
63790- if (fl.fl_ops && fl.fl_ops->fl_release_private)
63791- fl.fl_ops->fl_release_private(&fl);
63792+ filp->f_op->flock(filp, F_SETLKW, &flock);
63793+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
63794+ flock.fl_ops->fl_release_private(&flock);
63795 }
63796
63797 spin_lock(&inode->i_lock);
63798diff --git a/fs/mount.h b/fs/mount.h
63799index f82c628..9492b99 100644
63800--- a/fs/mount.h
63801+++ b/fs/mount.h
63802@@ -11,7 +11,7 @@ struct mnt_namespace {
63803 u64 seq; /* Sequence number to prevent loops */
63804 wait_queue_head_t poll;
63805 u64 event;
63806-};
63807+} __randomize_layout;
63808
63809 struct mnt_pcp {
63810 int mnt_count;
63811@@ -62,7 +62,7 @@ struct mount {
63812 int mnt_expiry_mark; /* true if marked for expiry */
63813 struct hlist_head mnt_pins;
63814 struct path mnt_ex_mountpoint;
63815-};
63816+} __randomize_layout;
63817
63818 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
63819
63820diff --git a/fs/namei.c b/fs/namei.c
63821index db5fe86..d3dcc14 100644
63822--- a/fs/namei.c
63823+++ b/fs/namei.c
63824@@ -331,17 +331,32 @@ int generic_permission(struct inode *inode, int mask)
63825 if (ret != -EACCES)
63826 return ret;
63827
63828+#ifdef CONFIG_GRKERNSEC
63829+ /* we'll block if we have to log due to a denied capability use */
63830+ if (mask & MAY_NOT_BLOCK)
63831+ return -ECHILD;
63832+#endif
63833+
63834 if (S_ISDIR(inode->i_mode)) {
63835 /* DACs are overridable for directories */
63836- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63837- return 0;
63838 if (!(mask & MAY_WRITE))
63839- if (capable_wrt_inode_uidgid(inode,
63840- CAP_DAC_READ_SEARCH))
63841+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
63842+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63843 return 0;
63844+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63845+ return 0;
63846 return -EACCES;
63847 }
63848 /*
63849+ * Searching includes executable on directories, else just read.
63850+ */
63851+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
63852+ if (mask == MAY_READ)
63853+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
63854+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63855+ return 0;
63856+
63857+ /*
63858 * Read/write DACs are always overridable.
63859 * Executable DACs are overridable when there is
63860 * at least one exec bit set.
63861@@ -350,14 +365,6 @@ int generic_permission(struct inode *inode, int mask)
63862 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63863 return 0;
63864
63865- /*
63866- * Searching includes executable on directories, else just read.
63867- */
63868- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
63869- if (mask == MAY_READ)
63870- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63871- return 0;
63872-
63873 return -EACCES;
63874 }
63875 EXPORT_SYMBOL(generic_permission);
63876@@ -824,7 +831,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
63877 {
63878 struct dentry *dentry = link->dentry;
63879 int error;
63880- char *s;
63881+ const char *s;
63882
63883 BUG_ON(nd->flags & LOOKUP_RCU);
63884
63885@@ -845,6 +852,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
63886 if (error)
63887 goto out_put_nd_path;
63888
63889+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
63890+ dentry->d_inode, dentry, nd->path.mnt)) {
63891+ error = -EACCES;
63892+ goto out_put_nd_path;
63893+ }
63894+
63895 nd->last_type = LAST_BIND;
63896 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
63897 error = PTR_ERR(*p);
63898@@ -1608,6 +1621,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
63899 if (res)
63900 break;
63901 res = walk_component(nd, path, LOOKUP_FOLLOW);
63902+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
63903+ res = -EACCES;
63904 put_link(nd, &link, cookie);
63905 } while (res > 0);
63906
63907@@ -1680,7 +1695,7 @@ EXPORT_SYMBOL(full_name_hash);
63908 static inline u64 hash_name(const char *name)
63909 {
63910 unsigned long a, b, adata, bdata, mask, hash, len;
63911- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
63912+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
63913
63914 hash = a = 0;
63915 len = -sizeof(unsigned long);
63916@@ -1969,6 +1984,8 @@ static int path_lookupat(int dfd, const char *name,
63917 if (err)
63918 break;
63919 err = lookup_last(nd, &path);
63920+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
63921+ err = -EACCES;
63922 put_link(nd, &link, cookie);
63923 }
63924 }
63925@@ -1976,6 +1993,13 @@ static int path_lookupat(int dfd, const char *name,
63926 if (!err)
63927 err = complete_walk(nd);
63928
63929+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
63930+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
63931+ path_put(&nd->path);
63932+ err = -ENOENT;
63933+ }
63934+ }
63935+
63936 if (!err && nd->flags & LOOKUP_DIRECTORY) {
63937 if (!d_can_lookup(nd->path.dentry)) {
63938 path_put(&nd->path);
63939@@ -2004,8 +2028,15 @@ static int filename_lookup(int dfd, struct filename *name,
63940 retval = path_lookupat(dfd, name->name,
63941 flags | LOOKUP_REVAL, nd);
63942
63943- if (likely(!retval))
63944+ if (likely(!retval)) {
63945 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
63946+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
63947+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
63948+ path_put(&nd->path);
63949+ return -ENOENT;
63950+ }
63951+ }
63952+ }
63953 return retval;
63954 }
63955
63956@@ -2582,6 +2613,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
63957 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
63958 return -EPERM;
63959
63960+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
63961+ return -EPERM;
63962+ if (gr_handle_rawio(inode))
63963+ return -EPERM;
63964+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
63965+ return -EACCES;
63966+
63967 return 0;
63968 }
63969
63970@@ -2813,7 +2851,7 @@ looked_up:
63971 * cleared otherwise prior to returning.
63972 */
63973 static int lookup_open(struct nameidata *nd, struct path *path,
63974- struct file *file,
63975+ struct path *link, struct file *file,
63976 const struct open_flags *op,
63977 bool got_write, int *opened)
63978 {
63979@@ -2848,6 +2886,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
63980 /* Negative dentry, just create the file */
63981 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
63982 umode_t mode = op->mode;
63983+
63984+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
63985+ error = -EACCES;
63986+ goto out_dput;
63987+ }
63988+
63989+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
63990+ error = -EACCES;
63991+ goto out_dput;
63992+ }
63993+
63994 if (!IS_POSIXACL(dir->d_inode))
63995 mode &= ~current_umask();
63996 /*
63997@@ -2869,6 +2918,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
63998 nd->flags & LOOKUP_EXCL);
63999 if (error)
64000 goto out_dput;
64001+ else
64002+ gr_handle_create(dentry, nd->path.mnt);
64003 }
64004 out_no_open:
64005 path->dentry = dentry;
64006@@ -2883,7 +2934,7 @@ out_dput:
64007 /*
64008 * Handle the last step of open()
64009 */
64010-static int do_last(struct nameidata *nd, struct path *path,
64011+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
64012 struct file *file, const struct open_flags *op,
64013 int *opened, struct filename *name)
64014 {
64015@@ -2933,6 +2984,15 @@ static int do_last(struct nameidata *nd, struct path *path,
64016 if (error)
64017 return error;
64018
64019+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
64020+ error = -ENOENT;
64021+ goto out;
64022+ }
64023+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
64024+ error = -EACCES;
64025+ goto out;
64026+ }
64027+
64028 audit_inode(name, dir, LOOKUP_PARENT);
64029 error = -EISDIR;
64030 /* trailing slashes? */
64031@@ -2952,7 +3012,7 @@ retry_lookup:
64032 */
64033 }
64034 mutex_lock(&dir->d_inode->i_mutex);
64035- error = lookup_open(nd, path, file, op, got_write, opened);
64036+ error = lookup_open(nd, path, link, file, op, got_write, opened);
64037 mutex_unlock(&dir->d_inode->i_mutex);
64038
64039 if (error <= 0) {
64040@@ -2976,11 +3036,28 @@ retry_lookup:
64041 goto finish_open_created;
64042 }
64043
64044+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
64045+ error = -ENOENT;
64046+ goto exit_dput;
64047+ }
64048+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
64049+ error = -EACCES;
64050+ goto exit_dput;
64051+ }
64052+
64053 /*
64054 * create/update audit record if it already exists.
64055 */
64056- if (d_is_positive(path->dentry))
64057+ if (d_is_positive(path->dentry)) {
64058+ /* only check if O_CREAT is specified, all other checks need to go
64059+ into may_open */
64060+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
64061+ error = -EACCES;
64062+ goto exit_dput;
64063+ }
64064+
64065 audit_inode(name, path->dentry, 0);
64066+ }
64067
64068 /*
64069 * If atomic_open() acquired write access it is dropped now due to
64070@@ -3021,6 +3098,11 @@ finish_lookup:
64071 }
64072 }
64073 BUG_ON(inode != path->dentry->d_inode);
64074+ /* if we're resolving a symlink to another symlink */
64075+ if (link && gr_handle_symlink_owner(link, inode)) {
64076+ error = -EACCES;
64077+ goto out;
64078+ }
64079 return 1;
64080 }
64081
64082@@ -3040,7 +3122,18 @@ finish_open:
64083 path_put(&save_parent);
64084 return error;
64085 }
64086+
64087+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
64088+ error = -ENOENT;
64089+ goto out;
64090+ }
64091+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
64092+ error = -EACCES;
64093+ goto out;
64094+ }
64095+
64096 audit_inode(name, nd->path.dentry, 0);
64097+
64098 error = -EISDIR;
64099 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
64100 goto out;
64101@@ -3207,7 +3300,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64102 if (unlikely(error))
64103 goto out;
64104
64105- error = do_last(nd, &path, file, op, &opened, pathname);
64106+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
64107 while (unlikely(error > 0)) { /* trailing symlink */
64108 struct path link = path;
64109 void *cookie;
64110@@ -3225,7 +3318,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64111 error = follow_link(&link, nd, &cookie);
64112 if (unlikely(error))
64113 break;
64114- error = do_last(nd, &path, file, op, &opened, pathname);
64115+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
64116 put_link(nd, &link, cookie);
64117 }
64118 out:
64119@@ -3325,9 +3418,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
64120 goto unlock;
64121
64122 error = -EEXIST;
64123- if (d_is_positive(dentry))
64124+ if (d_is_positive(dentry)) {
64125+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
64126+ error = -ENOENT;
64127 goto fail;
64128-
64129+ }
64130 /*
64131 * Special case - lookup gave negative, but... we had foo/bar/
64132 * From the vfs_mknod() POV we just have a negative dentry -
64133@@ -3379,6 +3474,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
64134 }
64135 EXPORT_SYMBOL(user_path_create);
64136
64137+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
64138+{
64139+ struct filename *tmp = getname(pathname);
64140+ struct dentry *res;
64141+ if (IS_ERR(tmp))
64142+ return ERR_CAST(tmp);
64143+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
64144+ if (IS_ERR(res))
64145+ putname(tmp);
64146+ else
64147+ *to = tmp;
64148+ return res;
64149+}
64150+
64151 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
64152 {
64153 int error = may_create(dir, dentry);
64154@@ -3442,6 +3551,17 @@ retry:
64155
64156 if (!IS_POSIXACL(path.dentry->d_inode))
64157 mode &= ~current_umask();
64158+
64159+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
64160+ error = -EPERM;
64161+ goto out;
64162+ }
64163+
64164+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
64165+ error = -EACCES;
64166+ goto out;
64167+ }
64168+
64169 error = security_path_mknod(&path, dentry, mode, dev);
64170 if (error)
64171 goto out;
64172@@ -3457,6 +3577,8 @@ retry:
64173 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
64174 break;
64175 }
64176+ if (!error)
64177+ gr_handle_create(dentry, path.mnt);
64178 out:
64179 done_path_create(&path, dentry);
64180 if (retry_estale(error, lookup_flags)) {
64181@@ -3511,9 +3633,16 @@ retry:
64182
64183 if (!IS_POSIXACL(path.dentry->d_inode))
64184 mode &= ~current_umask();
64185+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
64186+ error = -EACCES;
64187+ goto out;
64188+ }
64189 error = security_path_mkdir(&path, dentry, mode);
64190 if (!error)
64191 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
64192+ if (!error)
64193+ gr_handle_create(dentry, path.mnt);
64194+out:
64195 done_path_create(&path, dentry);
64196 if (retry_estale(error, lookup_flags)) {
64197 lookup_flags |= LOOKUP_REVAL;
64198@@ -3597,6 +3726,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
64199 struct filename *name;
64200 struct dentry *dentry;
64201 struct nameidata nd;
64202+ ino_t saved_ino = 0;
64203+ dev_t saved_dev = 0;
64204 unsigned int lookup_flags = 0;
64205 retry:
64206 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64207@@ -3629,10 +3760,21 @@ retry:
64208 error = -ENOENT;
64209 goto exit3;
64210 }
64211+
64212+ saved_ino = dentry->d_inode->i_ino;
64213+ saved_dev = gr_get_dev_from_dentry(dentry);
64214+
64215+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
64216+ error = -EACCES;
64217+ goto exit3;
64218+ }
64219+
64220 error = security_path_rmdir(&nd.path, dentry);
64221 if (error)
64222 goto exit3;
64223 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
64224+ if (!error && (saved_dev || saved_ino))
64225+ gr_handle_delete(saved_ino, saved_dev);
64226 exit3:
64227 dput(dentry);
64228 exit2:
64229@@ -3725,6 +3867,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
64230 struct nameidata nd;
64231 struct inode *inode = NULL;
64232 struct inode *delegated_inode = NULL;
64233+ ino_t saved_ino = 0;
64234+ dev_t saved_dev = 0;
64235 unsigned int lookup_flags = 0;
64236 retry:
64237 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64238@@ -3751,10 +3895,22 @@ retry_deleg:
64239 if (d_is_negative(dentry))
64240 goto slashes;
64241 ihold(inode);
64242+
64243+ if (inode->i_nlink <= 1) {
64244+ saved_ino = inode->i_ino;
64245+ saved_dev = gr_get_dev_from_dentry(dentry);
64246+ }
64247+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
64248+ error = -EACCES;
64249+ goto exit2;
64250+ }
64251+
64252 error = security_path_unlink(&nd.path, dentry);
64253 if (error)
64254 goto exit2;
64255 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
64256+ if (!error && (saved_ino || saved_dev))
64257+ gr_handle_delete(saved_ino, saved_dev);
64258 exit2:
64259 dput(dentry);
64260 }
64261@@ -3843,9 +3999,17 @@ retry:
64262 if (IS_ERR(dentry))
64263 goto out_putname;
64264
64265+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
64266+ error = -EACCES;
64267+ goto out;
64268+ }
64269+
64270 error = security_path_symlink(&path, dentry, from->name);
64271 if (!error)
64272 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
64273+ if (!error)
64274+ gr_handle_create(dentry, path.mnt);
64275+out:
64276 done_path_create(&path, dentry);
64277 if (retry_estale(error, lookup_flags)) {
64278 lookup_flags |= LOOKUP_REVAL;
64279@@ -3949,6 +4113,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
64280 struct dentry *new_dentry;
64281 struct path old_path, new_path;
64282 struct inode *delegated_inode = NULL;
64283+ struct filename *to = NULL;
64284 int how = 0;
64285 int error;
64286
64287@@ -3972,7 +4137,7 @@ retry:
64288 if (error)
64289 return error;
64290
64291- new_dentry = user_path_create(newdfd, newname, &new_path,
64292+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
64293 (how & LOOKUP_REVAL));
64294 error = PTR_ERR(new_dentry);
64295 if (IS_ERR(new_dentry))
64296@@ -3984,11 +4149,28 @@ retry:
64297 error = may_linkat(&old_path);
64298 if (unlikely(error))
64299 goto out_dput;
64300+
64301+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
64302+ old_path.dentry->d_inode,
64303+ old_path.dentry->d_inode->i_mode, to)) {
64304+ error = -EACCES;
64305+ goto out_dput;
64306+ }
64307+
64308+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
64309+ old_path.dentry, old_path.mnt, to)) {
64310+ error = -EACCES;
64311+ goto out_dput;
64312+ }
64313+
64314 error = security_path_link(old_path.dentry, &new_path, new_dentry);
64315 if (error)
64316 goto out_dput;
64317 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
64318+ if (!error)
64319+ gr_handle_create(new_dentry, new_path.mnt);
64320 out_dput:
64321+ putname(to);
64322 done_path_create(&new_path, new_dentry);
64323 if (delegated_inode) {
64324 error = break_deleg_wait(&delegated_inode);
64325@@ -4304,6 +4486,12 @@ retry_deleg:
64326 if (new_dentry == trap)
64327 goto exit5;
64328
64329+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
64330+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
64331+ to, flags);
64332+ if (error)
64333+ goto exit5;
64334+
64335 error = security_path_rename(&oldnd.path, old_dentry,
64336 &newnd.path, new_dentry, flags);
64337 if (error)
64338@@ -4311,6 +4499,9 @@ retry_deleg:
64339 error = vfs_rename(old_dir->d_inode, old_dentry,
64340 new_dir->d_inode, new_dentry,
64341 &delegated_inode, flags);
64342+ if (!error)
64343+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
64344+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
64345 exit5:
64346 dput(new_dentry);
64347 exit4:
64348@@ -4367,14 +4558,24 @@ EXPORT_SYMBOL(vfs_whiteout);
64349
64350 int readlink_copy(char __user *buffer, int buflen, const char *link)
64351 {
64352+ char tmpbuf[64];
64353+ const char *newlink;
64354 int len = PTR_ERR(link);
64355+
64356 if (IS_ERR(link))
64357 goto out;
64358
64359 len = strlen(link);
64360 if (len > (unsigned) buflen)
64361 len = buflen;
64362- if (copy_to_user(buffer, link, len))
64363+
64364+ if (len < sizeof(tmpbuf)) {
64365+ memcpy(tmpbuf, link, len);
64366+ newlink = tmpbuf;
64367+ } else
64368+ newlink = link;
64369+
64370+ if (copy_to_user(buffer, newlink, len))
64371 len = -EFAULT;
64372 out:
64373 return len;
64374diff --git a/fs/namespace.c b/fs/namespace.c
64375index bbde147..f4deeba 100644
64376--- a/fs/namespace.c
64377+++ b/fs/namespace.c
64378@@ -1447,6 +1447,9 @@ static int do_umount(struct mount *mnt, int flags)
64379 if (!(sb->s_flags & MS_RDONLY))
64380 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
64381 up_write(&sb->s_umount);
64382+
64383+ gr_log_remount(mnt->mnt_devname, retval);
64384+
64385 return retval;
64386 }
64387
64388@@ -1469,6 +1472,9 @@ static int do_umount(struct mount *mnt, int flags)
64389 }
64390 unlock_mount_hash();
64391 namespace_unlock();
64392+
64393+ gr_log_unmount(mnt->mnt_devname, retval);
64394+
64395 return retval;
64396 }
64397
64398@@ -1519,7 +1525,7 @@ static inline bool may_mount(void)
64399 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
64400 */
64401
64402-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
64403+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
64404 {
64405 struct path path;
64406 struct mount *mnt;
64407@@ -1564,7 +1570,7 @@ out:
64408 /*
64409 * The 2.0 compatible umount. No flags.
64410 */
64411-SYSCALL_DEFINE1(oldumount, char __user *, name)
64412+SYSCALL_DEFINE1(oldumount, const char __user *, name)
64413 {
64414 return sys_umount(name, 0);
64415 }
64416@@ -2632,6 +2638,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
64417 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
64418 MS_STRICTATIME);
64419
64420+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
64421+ retval = -EPERM;
64422+ goto dput_out;
64423+ }
64424+
64425+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
64426+ retval = -EPERM;
64427+ goto dput_out;
64428+ }
64429+
64430 if (flags & MS_REMOUNT)
64431 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
64432 data_page);
64433@@ -2645,7 +2661,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
64434 retval = do_new_mount(&path, type_page, flags, mnt_flags,
64435 dev_name, data_page);
64436 dput_out:
64437+ gr_log_mount(dev_name, &path, retval);
64438+
64439 path_put(&path);
64440+
64441 return retval;
64442 }
64443
64444@@ -2663,7 +2682,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
64445 * number incrementing at 10Ghz will take 12,427 years to wrap which
64446 * is effectively never, so we can ignore the possibility.
64447 */
64448-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
64449+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
64450
64451 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64452 {
64453@@ -2678,7 +2697,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64454 kfree(new_ns);
64455 return ERR_PTR(ret);
64456 }
64457- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
64458+ new_ns->seq = atomic64_inc_return_unchecked(&mnt_ns_seq);
64459 atomic_set(&new_ns->count, 1);
64460 new_ns->root = NULL;
64461 INIT_LIST_HEAD(&new_ns->list);
64462@@ -2688,7 +2707,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64463 return new_ns;
64464 }
64465
64466-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
64467+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
64468 struct user_namespace *user_ns, struct fs_struct *new_fs)
64469 {
64470 struct mnt_namespace *new_ns;
64471@@ -2809,8 +2828,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
64472 }
64473 EXPORT_SYMBOL(mount_subtree);
64474
64475-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
64476- char __user *, type, unsigned long, flags, void __user *, data)
64477+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
64478+ const char __user *, type, unsigned long, flags, void __user *, data)
64479 {
64480 int ret;
64481 char *kernel_type;
64482@@ -2916,6 +2935,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
64483 if (error)
64484 goto out2;
64485
64486+ if (gr_handle_chroot_pivot()) {
64487+ error = -EPERM;
64488+ goto out2;
64489+ }
64490+
64491 get_fs_root(current->fs, &root);
64492 old_mp = lock_mount(&old);
64493 error = PTR_ERR(old_mp);
64494@@ -3187,7 +3211,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
64495 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
64496 return -EPERM;
64497
64498- if (fs->users != 1)
64499+ if (atomic_read(&fs->users) != 1)
64500 return -EINVAL;
64501
64502 get_mnt_ns(mnt_ns);
64503diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
64504index f4ccfe6..a5cf064 100644
64505--- a/fs/nfs/callback_xdr.c
64506+++ b/fs/nfs/callback_xdr.c
64507@@ -51,7 +51,7 @@ struct callback_op {
64508 callback_decode_arg_t decode_args;
64509 callback_encode_res_t encode_res;
64510 long res_maxsize;
64511-};
64512+} __do_const;
64513
64514 static struct callback_op callback_ops[];
64515
64516diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
64517index 00689a8..b162632 100644
64518--- a/fs/nfs/inode.c
64519+++ b/fs/nfs/inode.c
64520@@ -1232,16 +1232,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
64521 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
64522 }
64523
64524-static atomic_long_t nfs_attr_generation_counter;
64525+static atomic_long_unchecked_t nfs_attr_generation_counter;
64526
64527 static unsigned long nfs_read_attr_generation_counter(void)
64528 {
64529- return atomic_long_read(&nfs_attr_generation_counter);
64530+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
64531 }
64532
64533 unsigned long nfs_inc_attr_generation_counter(void)
64534 {
64535- return atomic_long_inc_return(&nfs_attr_generation_counter);
64536+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
64537 }
64538
64539 void nfs_fattr_init(struct nfs_fattr *fattr)
64540diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
64541index 0beb023..3f685ec 100644
64542--- a/fs/nfsd/nfs4proc.c
64543+++ b/fs/nfsd/nfs4proc.c
64544@@ -1198,7 +1198,7 @@ struct nfsd4_operation {
64545 nfsd4op_rsize op_rsize_bop;
64546 stateid_getter op_get_currentstateid;
64547 stateid_setter op_set_currentstateid;
64548-};
64549+} __do_const;
64550
64551 static struct nfsd4_operation nfsd4_ops[];
64552
64553diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
64554index eeea7a9..f3ba422 100644
64555--- a/fs/nfsd/nfs4xdr.c
64556+++ b/fs/nfsd/nfs4xdr.c
64557@@ -1543,7 +1543,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
64558
64559 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
64560
64561-static nfsd4_dec nfsd4_dec_ops[] = {
64562+static const nfsd4_dec nfsd4_dec_ops[] = {
64563 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
64564 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
64565 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
64566diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
64567index 122f691..a00e2e0 100644
64568--- a/fs/nfsd/nfscache.c
64569+++ b/fs/nfsd/nfscache.c
64570@@ -537,7 +537,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64571 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
64572 u32 hash;
64573 struct nfsd_drc_bucket *b;
64574- int len;
64575+ long len;
64576 size_t bufsize = 0;
64577
64578 if (!rp)
64579@@ -546,11 +546,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64580 hash = nfsd_cache_hash(rp->c_xid);
64581 b = &drc_hashtbl[hash];
64582
64583- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
64584- len >>= 2;
64585+ if (statp) {
64586+ len = (char*)statp - (char*)resv->iov_base;
64587+ len = resv->iov_len - len;
64588+ len >>= 2;
64589+ }
64590
64591 /* Don't cache excessive amounts of data and XDR failures */
64592- if (!statp || len > (256 >> 2)) {
64593+ if (!statp || len > (256 >> 2) || len < 0) {
64594 nfsd_reply_cache_free(b, rp);
64595 return;
64596 }
64597@@ -558,7 +561,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64598 switch (cachetype) {
64599 case RC_REPLSTAT:
64600 if (len != 1)
64601- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
64602+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
64603 rp->c_replstat = *statp;
64604 break;
64605 case RC_REPLBUFF:
64606diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
64607index 989129e..42e019e 100644
64608--- a/fs/nfsd/vfs.c
64609+++ b/fs/nfsd/vfs.c
64610@@ -872,7 +872,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
64611
64612 oldfs = get_fs();
64613 set_fs(KERNEL_DS);
64614- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
64615+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
64616 set_fs(oldfs);
64617 return nfsd_finish_read(file, count, host_err);
64618 }
64619@@ -960,7 +960,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
64620
64621 /* Write the data. */
64622 oldfs = get_fs(); set_fs(KERNEL_DS);
64623- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
64624+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
64625 set_fs(oldfs);
64626 if (host_err < 0)
64627 goto out_nfserr;
64628@@ -1502,7 +1502,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
64629 */
64630
64631 oldfs = get_fs(); set_fs(KERNEL_DS);
64632- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
64633+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
64634 set_fs(oldfs);
64635
64636 if (host_err < 0)
64637diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
64638index 52ccd34..7a6b202 100644
64639--- a/fs/nls/nls_base.c
64640+++ b/fs/nls/nls_base.c
64641@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
64642
64643 int __register_nls(struct nls_table *nls, struct module *owner)
64644 {
64645- struct nls_table ** tmp = &tables;
64646+ struct nls_table *tmp = tables;
64647
64648 if (nls->next)
64649 return -EBUSY;
64650
64651- nls->owner = owner;
64652+ pax_open_kernel();
64653+ *(void **)&nls->owner = owner;
64654+ pax_close_kernel();
64655 spin_lock(&nls_lock);
64656- while (*tmp) {
64657- if (nls == *tmp) {
64658+ while (tmp) {
64659+ if (nls == tmp) {
64660 spin_unlock(&nls_lock);
64661 return -EBUSY;
64662 }
64663- tmp = &(*tmp)->next;
64664+ tmp = tmp->next;
64665 }
64666- nls->next = tables;
64667+ pax_open_kernel();
64668+ *(struct nls_table **)&nls->next = tables;
64669+ pax_close_kernel();
64670 tables = nls;
64671 spin_unlock(&nls_lock);
64672 return 0;
64673@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
64674
64675 int unregister_nls(struct nls_table * nls)
64676 {
64677- struct nls_table ** tmp = &tables;
64678+ struct nls_table * const * tmp = &tables;
64679
64680 spin_lock(&nls_lock);
64681 while (*tmp) {
64682 if (nls == *tmp) {
64683- *tmp = nls->next;
64684+ pax_open_kernel();
64685+ *(struct nls_table **)tmp = nls->next;
64686+ pax_close_kernel();
64687 spin_unlock(&nls_lock);
64688 return 0;
64689 }
64690@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
64691 return -EINVAL;
64692 }
64693
64694-static struct nls_table *find_nls(char *charset)
64695+static struct nls_table *find_nls(const char *charset)
64696 {
64697 struct nls_table *nls;
64698 spin_lock(&nls_lock);
64699@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
64700 return nls;
64701 }
64702
64703-struct nls_table *load_nls(char *charset)
64704+struct nls_table *load_nls(const char *charset)
64705 {
64706 return try_then_request_module(find_nls(charset), "nls_%s", charset);
64707 }
64708diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
64709index 162b3f1..6076a7c 100644
64710--- a/fs/nls/nls_euc-jp.c
64711+++ b/fs/nls/nls_euc-jp.c
64712@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
64713 p_nls = load_nls("cp932");
64714
64715 if (p_nls) {
64716- table.charset2upper = p_nls->charset2upper;
64717- table.charset2lower = p_nls->charset2lower;
64718+ pax_open_kernel();
64719+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
64720+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
64721+ pax_close_kernel();
64722 return register_nls(&table);
64723 }
64724
64725diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
64726index a80a741..7b96e1b 100644
64727--- a/fs/nls/nls_koi8-ru.c
64728+++ b/fs/nls/nls_koi8-ru.c
64729@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
64730 p_nls = load_nls("koi8-u");
64731
64732 if (p_nls) {
64733- table.charset2upper = p_nls->charset2upper;
64734- table.charset2lower = p_nls->charset2lower;
64735+ pax_open_kernel();
64736+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
64737+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
64738+ pax_close_kernel();
64739 return register_nls(&table);
64740 }
64741
64742diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
64743index c991616..5ae51af 100644
64744--- a/fs/notify/fanotify/fanotify_user.c
64745+++ b/fs/notify/fanotify/fanotify_user.c
64746@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
64747
64748 fd = fanotify_event_metadata.fd;
64749 ret = -EFAULT;
64750- if (copy_to_user(buf, &fanotify_event_metadata,
64751- fanotify_event_metadata.event_len))
64752+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
64753+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
64754 goto out_close_fd;
64755
64756 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
64757diff --git a/fs/notify/notification.c b/fs/notify/notification.c
64758index a95d8e0..a91a5fd 100644
64759--- a/fs/notify/notification.c
64760+++ b/fs/notify/notification.c
64761@@ -48,7 +48,7 @@
64762 #include <linux/fsnotify_backend.h>
64763 #include "fsnotify.h"
64764
64765-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64766+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64767
64768 /**
64769 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
64770@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64771 */
64772 u32 fsnotify_get_cookie(void)
64773 {
64774- return atomic_inc_return(&fsnotify_sync_cookie);
64775+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
64776 }
64777 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
64778
64779diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
64780index 9e38daf..5727cae 100644
64781--- a/fs/ntfs/dir.c
64782+++ b/fs/ntfs/dir.c
64783@@ -1310,7 +1310,7 @@ find_next_index_buffer:
64784 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
64785 ~(s64)(ndir->itype.index.block_size - 1)));
64786 /* Bounds checks. */
64787- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
64788+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
64789 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
64790 "inode 0x%lx or driver bug.", vdir->i_ino);
64791 goto err_out;
64792diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
64793index 643faa4..ef9027e 100644
64794--- a/fs/ntfs/file.c
64795+++ b/fs/ntfs/file.c
64796@@ -1280,7 +1280,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
64797 char *addr;
64798 size_t total = 0;
64799 unsigned len;
64800- int left;
64801+ unsigned left;
64802
64803 do {
64804 len = PAGE_CACHE_SIZE - ofs;
64805diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
64806index 9e1e112..241a52a 100644
64807--- a/fs/ntfs/super.c
64808+++ b/fs/ntfs/super.c
64809@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64810 if (!silent)
64811 ntfs_error(sb, "Primary boot sector is invalid.");
64812 } else if (!silent)
64813- ntfs_error(sb, read_err_str, "primary");
64814+ ntfs_error(sb, read_err_str, "%s", "primary");
64815 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
64816 if (bh_primary)
64817 brelse(bh_primary);
64818@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64819 goto hotfix_primary_boot_sector;
64820 brelse(bh_backup);
64821 } else if (!silent)
64822- ntfs_error(sb, read_err_str, "backup");
64823+ ntfs_error(sb, read_err_str, "%s", "backup");
64824 /* Try to read NT3.51- backup boot sector. */
64825 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
64826 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
64827@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64828 "sector.");
64829 brelse(bh_backup);
64830 } else if (!silent)
64831- ntfs_error(sb, read_err_str, "backup");
64832+ ntfs_error(sb, read_err_str, "%s", "backup");
64833 /* We failed. Cleanup and return. */
64834 if (bh_primary)
64835 brelse(bh_primary);
64836diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
64837index 0440134..d52c93a 100644
64838--- a/fs/ocfs2/localalloc.c
64839+++ b/fs/ocfs2/localalloc.c
64840@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
64841 goto bail;
64842 }
64843
64844- atomic_inc(&osb->alloc_stats.moves);
64845+ atomic_inc_unchecked(&osb->alloc_stats.moves);
64846
64847 bail:
64848 if (handle)
64849diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
64850index bbec539..7b266d5 100644
64851--- a/fs/ocfs2/ocfs2.h
64852+++ b/fs/ocfs2/ocfs2.h
64853@@ -236,11 +236,11 @@ enum ocfs2_vol_state
64854
64855 struct ocfs2_alloc_stats
64856 {
64857- atomic_t moves;
64858- atomic_t local_data;
64859- atomic_t bitmap_data;
64860- atomic_t bg_allocs;
64861- atomic_t bg_extends;
64862+ atomic_unchecked_t moves;
64863+ atomic_unchecked_t local_data;
64864+ atomic_unchecked_t bitmap_data;
64865+ atomic_unchecked_t bg_allocs;
64866+ atomic_unchecked_t bg_extends;
64867 };
64868
64869 enum ocfs2_local_alloc_state
64870diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
64871index 0cb889a..6a26b24 100644
64872--- a/fs/ocfs2/suballoc.c
64873+++ b/fs/ocfs2/suballoc.c
64874@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
64875 mlog_errno(status);
64876 goto bail;
64877 }
64878- atomic_inc(&osb->alloc_stats.bg_extends);
64879+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
64880
64881 /* You should never ask for this much metadata */
64882 BUG_ON(bits_wanted >
64883@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
64884 mlog_errno(status);
64885 goto bail;
64886 }
64887- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64888+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64889
64890 *suballoc_loc = res.sr_bg_blkno;
64891 *suballoc_bit_start = res.sr_bit_offset;
64892@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
64893 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
64894 res->sr_bits);
64895
64896- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64897+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64898
64899 BUG_ON(res->sr_bits != 1);
64900
64901@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
64902 mlog_errno(status);
64903 goto bail;
64904 }
64905- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64906+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64907
64908 BUG_ON(res.sr_bits != 1);
64909
64910@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
64911 cluster_start,
64912 num_clusters);
64913 if (!status)
64914- atomic_inc(&osb->alloc_stats.local_data);
64915+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
64916 } else {
64917 if (min_clusters > (osb->bitmap_cpg - 1)) {
64918 /* The only paths asking for contiguousness
64919@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
64920 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
64921 res.sr_bg_blkno,
64922 res.sr_bit_offset);
64923- atomic_inc(&osb->alloc_stats.bitmap_data);
64924+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
64925 *num_clusters = res.sr_bits;
64926 }
64927 }
64928diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
64929index 93c85bc..02f68a4 100644
64930--- a/fs/ocfs2/super.c
64931+++ b/fs/ocfs2/super.c
64932@@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
64933 "%10s => GlobalAllocs: %d LocalAllocs: %d "
64934 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
64935 "Stats",
64936- atomic_read(&osb->alloc_stats.bitmap_data),
64937- atomic_read(&osb->alloc_stats.local_data),
64938- atomic_read(&osb->alloc_stats.bg_allocs),
64939- atomic_read(&osb->alloc_stats.moves),
64940- atomic_read(&osb->alloc_stats.bg_extends));
64941+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
64942+ atomic_read_unchecked(&osb->alloc_stats.local_data),
64943+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
64944+ atomic_read_unchecked(&osb->alloc_stats.moves),
64945+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
64946
64947 out += snprintf(buf + out, len - out,
64948 "%10s => State: %u Descriptor: %llu Size: %u bits "
64949@@ -2104,11 +2104,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
64950
64951 mutex_init(&osb->system_file_mutex);
64952
64953- atomic_set(&osb->alloc_stats.moves, 0);
64954- atomic_set(&osb->alloc_stats.local_data, 0);
64955- atomic_set(&osb->alloc_stats.bitmap_data, 0);
64956- atomic_set(&osb->alloc_stats.bg_allocs, 0);
64957- atomic_set(&osb->alloc_stats.bg_extends, 0);
64958+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
64959+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
64960+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
64961+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
64962+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
64963
64964 /* Copy the blockcheck stats from the superblock probe */
64965 osb->osb_ecc_stats = *stats;
64966diff --git a/fs/open.c b/fs/open.c
64967index de92c13..52d2a6c 100644
64968--- a/fs/open.c
64969+++ b/fs/open.c
64970@@ -32,6 +32,8 @@
64971 #include <linux/dnotify.h>
64972 #include <linux/compat.h>
64973
64974+#define CREATE_TRACE_POINTS
64975+#include <trace/events/fs.h>
64976 #include "internal.h"
64977
64978 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
64979@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
64980 error = locks_verify_truncate(inode, NULL, length);
64981 if (!error)
64982 error = security_path_truncate(path);
64983+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
64984+ error = -EACCES;
64985 if (!error)
64986 error = do_truncate(path->dentry, length, 0, NULL);
64987
64988@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
64989 error = locks_verify_truncate(inode, f.file, length);
64990 if (!error)
64991 error = security_path_truncate(&f.file->f_path);
64992+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
64993+ error = -EACCES;
64994 if (!error)
64995 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
64996 sb_end_write(inode->i_sb);
64997@@ -380,6 +386,9 @@ retry:
64998 if (__mnt_is_readonly(path.mnt))
64999 res = -EROFS;
65000
65001+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
65002+ res = -EACCES;
65003+
65004 out_path_release:
65005 path_put(&path);
65006 if (retry_estale(res, lookup_flags)) {
65007@@ -411,6 +420,8 @@ retry:
65008 if (error)
65009 goto dput_and_out;
65010
65011+ gr_log_chdir(path.dentry, path.mnt);
65012+
65013 set_fs_pwd(current->fs, &path);
65014
65015 dput_and_out:
65016@@ -440,6 +451,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
65017 goto out_putf;
65018
65019 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
65020+
65021+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
65022+ error = -EPERM;
65023+
65024+ if (!error)
65025+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
65026+
65027 if (!error)
65028 set_fs_pwd(current->fs, &f.file->f_path);
65029 out_putf:
65030@@ -469,7 +487,13 @@ retry:
65031 if (error)
65032 goto dput_and_out;
65033
65034+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
65035+ goto dput_and_out;
65036+
65037 set_fs_root(current->fs, &path);
65038+
65039+ gr_handle_chroot_chdir(&path);
65040+
65041 error = 0;
65042 dput_and_out:
65043 path_put(&path);
65044@@ -493,6 +517,16 @@ static int chmod_common(struct path *path, umode_t mode)
65045 return error;
65046 retry_deleg:
65047 mutex_lock(&inode->i_mutex);
65048+
65049+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
65050+ error = -EACCES;
65051+ goto out_unlock;
65052+ }
65053+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
65054+ error = -EACCES;
65055+ goto out_unlock;
65056+ }
65057+
65058 error = security_path_chmod(path, mode);
65059 if (error)
65060 goto out_unlock;
65061@@ -558,6 +592,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
65062 uid = make_kuid(current_user_ns(), user);
65063 gid = make_kgid(current_user_ns(), group);
65064
65065+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
65066+ return -EACCES;
65067+
65068 newattrs.ia_valid = ATTR_CTIME;
65069 if (user != (uid_t) -1) {
65070 if (!uid_valid(uid))
65071@@ -1002,6 +1039,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
65072 } else {
65073 fsnotify_open(f);
65074 fd_install(fd, f);
65075+ trace_do_sys_open(tmp->name, flags, mode);
65076 }
65077 }
65078 putname(tmp);
65079diff --git a/fs/pipe.c b/fs/pipe.c
65080index 21981e5..3d5f55c 100644
65081--- a/fs/pipe.c
65082+++ b/fs/pipe.c
65083@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
65084
65085 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
65086 {
65087- if (pipe->files)
65088+ if (atomic_read(&pipe->files))
65089 mutex_lock_nested(&pipe->mutex, subclass);
65090 }
65091
65092@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
65093
65094 void pipe_unlock(struct pipe_inode_info *pipe)
65095 {
65096- if (pipe->files)
65097+ if (atomic_read(&pipe->files))
65098 mutex_unlock(&pipe->mutex);
65099 }
65100 EXPORT_SYMBOL(pipe_unlock);
65101@@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
65102 }
65103 if (bufs) /* More to do? */
65104 continue;
65105- if (!pipe->writers)
65106+ if (!atomic_read(&pipe->writers))
65107 break;
65108- if (!pipe->waiting_writers) {
65109+ if (!atomic_read(&pipe->waiting_writers)) {
65110 /* syscall merging: Usually we must not sleep
65111 * if O_NONBLOCK is set, or if we got some data.
65112 * But if a writer sleeps in kernel space, then
65113@@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65114
65115 __pipe_lock(pipe);
65116
65117- if (!pipe->readers) {
65118+ if (!atomic_read(&pipe->readers)) {
65119 send_sig(SIGPIPE, current, 0);
65120 ret = -EPIPE;
65121 goto out;
65122@@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65123 for (;;) {
65124 int bufs;
65125
65126- if (!pipe->readers) {
65127+ if (!atomic_read(&pipe->readers)) {
65128 send_sig(SIGPIPE, current, 0);
65129 if (!ret)
65130 ret = -EPIPE;
65131@@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65132 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65133 do_wakeup = 0;
65134 }
65135- pipe->waiting_writers++;
65136+ atomic_inc(&pipe->waiting_writers);
65137 pipe_wait(pipe);
65138- pipe->waiting_writers--;
65139+ atomic_dec(&pipe->waiting_writers);
65140 }
65141 out:
65142 __pipe_unlock(pipe);
65143@@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65144 mask = 0;
65145 if (filp->f_mode & FMODE_READ) {
65146 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
65147- if (!pipe->writers && filp->f_version != pipe->w_counter)
65148+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
65149 mask |= POLLHUP;
65150 }
65151
65152@@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65153 * Most Unices do not set POLLERR for FIFOs but on Linux they
65154 * behave exactly like pipes for poll().
65155 */
65156- if (!pipe->readers)
65157+ if (!atomic_read(&pipe->readers))
65158 mask |= POLLERR;
65159 }
65160
65161@@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
65162 int kill = 0;
65163
65164 spin_lock(&inode->i_lock);
65165- if (!--pipe->files) {
65166+ if (atomic_dec_and_test(&pipe->files)) {
65167 inode->i_pipe = NULL;
65168 kill = 1;
65169 }
65170@@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
65171
65172 __pipe_lock(pipe);
65173 if (file->f_mode & FMODE_READ)
65174- pipe->readers--;
65175+ atomic_dec(&pipe->readers);
65176 if (file->f_mode & FMODE_WRITE)
65177- pipe->writers--;
65178+ atomic_dec(&pipe->writers);
65179
65180- if (pipe->readers || pipe->writers) {
65181+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
65182 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
65183 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65184 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
65185@@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
65186 kfree(pipe);
65187 }
65188
65189-static struct vfsmount *pipe_mnt __read_mostly;
65190+struct vfsmount *pipe_mnt __read_mostly;
65191
65192 /*
65193 * pipefs_dname() is called from d_path().
65194@@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
65195 goto fail_iput;
65196
65197 inode->i_pipe = pipe;
65198- pipe->files = 2;
65199- pipe->readers = pipe->writers = 1;
65200+ atomic_set(&pipe->files, 2);
65201+ atomic_set(&pipe->readers, 1);
65202+ atomic_set(&pipe->writers, 1);
65203 inode->i_fop = &pipefifo_fops;
65204
65205 /*
65206@@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
65207 spin_lock(&inode->i_lock);
65208 if (inode->i_pipe) {
65209 pipe = inode->i_pipe;
65210- pipe->files++;
65211+ atomic_inc(&pipe->files);
65212 spin_unlock(&inode->i_lock);
65213 } else {
65214 spin_unlock(&inode->i_lock);
65215 pipe = alloc_pipe_info();
65216 if (!pipe)
65217 return -ENOMEM;
65218- pipe->files = 1;
65219+ atomic_set(&pipe->files, 1);
65220 spin_lock(&inode->i_lock);
65221 if (unlikely(inode->i_pipe)) {
65222- inode->i_pipe->files++;
65223+ atomic_inc(&inode->i_pipe->files);
65224 spin_unlock(&inode->i_lock);
65225 free_pipe_info(pipe);
65226 pipe = inode->i_pipe;
65227@@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
65228 * opened, even when there is no process writing the FIFO.
65229 */
65230 pipe->r_counter++;
65231- if (pipe->readers++ == 0)
65232+ if (atomic_inc_return(&pipe->readers) == 1)
65233 wake_up_partner(pipe);
65234
65235- if (!is_pipe && !pipe->writers) {
65236+ if (!is_pipe && !atomic_read(&pipe->writers)) {
65237 if ((filp->f_flags & O_NONBLOCK)) {
65238 /* suppress POLLHUP until we have
65239 * seen a writer */
65240@@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
65241 * errno=ENXIO when there is no process reading the FIFO.
65242 */
65243 ret = -ENXIO;
65244- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
65245+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
65246 goto err;
65247
65248 pipe->w_counter++;
65249- if (!pipe->writers++)
65250+ if (atomic_inc_return(&pipe->writers) == 1)
65251 wake_up_partner(pipe);
65252
65253- if (!is_pipe && !pipe->readers) {
65254+ if (!is_pipe && !atomic_read(&pipe->readers)) {
65255 if (wait_for_partner(pipe, &pipe->r_counter))
65256 goto err_wr;
65257 }
65258@@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
65259 * the process can at least talk to itself.
65260 */
65261
65262- pipe->readers++;
65263- pipe->writers++;
65264+ atomic_inc(&pipe->readers);
65265+ atomic_inc(&pipe->writers);
65266 pipe->r_counter++;
65267 pipe->w_counter++;
65268- if (pipe->readers == 1 || pipe->writers == 1)
65269+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
65270 wake_up_partner(pipe);
65271 break;
65272
65273@@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
65274 return 0;
65275
65276 err_rd:
65277- if (!--pipe->readers)
65278+ if (atomic_dec_and_test(&pipe->readers))
65279 wake_up_interruptible(&pipe->wait);
65280 ret = -ERESTARTSYS;
65281 goto err;
65282
65283 err_wr:
65284- if (!--pipe->writers)
65285+ if (atomic_dec_and_test(&pipe->writers))
65286 wake_up_interruptible(&pipe->wait);
65287 ret = -ERESTARTSYS;
65288 goto err;
65289diff --git a/fs/posix_acl.c b/fs/posix_acl.c
65290index 0855f77..6787d50 100644
65291--- a/fs/posix_acl.c
65292+++ b/fs/posix_acl.c
65293@@ -20,6 +20,7 @@
65294 #include <linux/xattr.h>
65295 #include <linux/export.h>
65296 #include <linux/user_namespace.h>
65297+#include <linux/grsecurity.h>
65298
65299 struct posix_acl **acl_by_type(struct inode *inode, int type)
65300 {
65301@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
65302 }
65303 }
65304 if (mode_p)
65305- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65306+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65307 return not_equiv;
65308 }
65309 EXPORT_SYMBOL(posix_acl_equiv_mode);
65310@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
65311 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
65312 }
65313
65314- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65315+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65316 return not_equiv;
65317 }
65318
65319@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
65320 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
65321 int err = -ENOMEM;
65322 if (clone) {
65323+ *mode_p &= ~gr_acl_umask();
65324+
65325 err = posix_acl_create_masq(clone, mode_p);
65326 if (err < 0) {
65327 posix_acl_release(clone);
65328@@ -659,11 +662,12 @@ struct posix_acl *
65329 posix_acl_from_xattr(struct user_namespace *user_ns,
65330 const void *value, size_t size)
65331 {
65332- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
65333- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
65334+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
65335+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
65336 int count;
65337 struct posix_acl *acl;
65338 struct posix_acl_entry *acl_e;
65339+ umode_t umask = gr_acl_umask();
65340
65341 if (!value)
65342 return NULL;
65343@@ -689,12 +693,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65344
65345 switch(acl_e->e_tag) {
65346 case ACL_USER_OBJ:
65347+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65348+ break;
65349 case ACL_GROUP_OBJ:
65350 case ACL_MASK:
65351+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65352+ break;
65353 case ACL_OTHER:
65354+ acl_e->e_perm &= ~(umask & S_IRWXO);
65355 break;
65356
65357 case ACL_USER:
65358+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65359 acl_e->e_uid =
65360 make_kuid(user_ns,
65361 le32_to_cpu(entry->e_id));
65362@@ -702,6 +712,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65363 goto fail;
65364 break;
65365 case ACL_GROUP:
65366+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65367 acl_e->e_gid =
65368 make_kgid(user_ns,
65369 le32_to_cpu(entry->e_id));
65370diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
65371index 2183fcf..3c32a98 100644
65372--- a/fs/proc/Kconfig
65373+++ b/fs/proc/Kconfig
65374@@ -30,7 +30,7 @@ config PROC_FS
65375
65376 config PROC_KCORE
65377 bool "/proc/kcore support" if !ARM
65378- depends on PROC_FS && MMU
65379+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
65380 help
65381 Provides a virtual ELF core file of the live kernel. This can
65382 be read with gdb and other ELF tools. No modifications can be
65383@@ -38,8 +38,8 @@ config PROC_KCORE
65384
65385 config PROC_VMCORE
65386 bool "/proc/vmcore support"
65387- depends on PROC_FS && CRASH_DUMP
65388- default y
65389+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
65390+ default n
65391 help
65392 Exports the dump image of crashed kernel in ELF format.
65393
65394@@ -63,8 +63,8 @@ config PROC_SYSCTL
65395 limited in memory.
65396
65397 config PROC_PAGE_MONITOR
65398- default y
65399- depends on PROC_FS && MMU
65400+ default n
65401+ depends on PROC_FS && MMU && !GRKERNSEC
65402 bool "Enable /proc page monitoring" if EXPERT
65403 help
65404 Various /proc files exist to monitor process memory utilization:
65405diff --git a/fs/proc/array.c b/fs/proc/array.c
65406index cd3653e..9b9b79a 100644
65407--- a/fs/proc/array.c
65408+++ b/fs/proc/array.c
65409@@ -60,6 +60,7 @@
65410 #include <linux/tty.h>
65411 #include <linux/string.h>
65412 #include <linux/mman.h>
65413+#include <linux/grsecurity.h>
65414 #include <linux/proc_fs.h>
65415 #include <linux/ioport.h>
65416 #include <linux/uaccess.h>
65417@@ -347,6 +348,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
65418 seq_putc(m, '\n');
65419 }
65420
65421+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
65422+static inline void task_pax(struct seq_file *m, struct task_struct *p)
65423+{
65424+ if (p->mm)
65425+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
65426+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
65427+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
65428+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
65429+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
65430+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
65431+ else
65432+ seq_printf(m, "PaX:\t-----\n");
65433+}
65434+#endif
65435+
65436 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
65437 struct pid *pid, struct task_struct *task)
65438 {
65439@@ -365,9 +381,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
65440 task_cpus_allowed(m, task);
65441 cpuset_task_status_allowed(m, task);
65442 task_context_switch_counts(m, task);
65443+
65444+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
65445+ task_pax(m, task);
65446+#endif
65447+
65448+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
65449+ task_grsec_rbac(m, task);
65450+#endif
65451+
65452 return 0;
65453 }
65454
65455+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65456+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
65457+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
65458+ _mm->pax_flags & MF_PAX_SEGMEXEC))
65459+#endif
65460+
65461 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65462 struct pid *pid, struct task_struct *task, int whole)
65463 {
65464@@ -389,6 +420,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65465 char tcomm[sizeof(task->comm)];
65466 unsigned long flags;
65467
65468+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65469+ if (current->exec_id != m->exec_id) {
65470+ gr_log_badprocpid("stat");
65471+ return 0;
65472+ }
65473+#endif
65474+
65475 state = *get_task_state(task);
65476 vsize = eip = esp = 0;
65477 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
65478@@ -459,6 +497,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65479 gtime = task_gtime(task);
65480 }
65481
65482+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65483+ if (PAX_RAND_FLAGS(mm)) {
65484+ eip = 0;
65485+ esp = 0;
65486+ wchan = 0;
65487+ }
65488+#endif
65489+#ifdef CONFIG_GRKERNSEC_HIDESYM
65490+ wchan = 0;
65491+ eip =0;
65492+ esp =0;
65493+#endif
65494+
65495 /* scale priority and nice values from timeslices to -20..20 */
65496 /* to make it look like a "normal" Unix priority/nice value */
65497 priority = task_prio(task);
65498@@ -490,9 +541,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65499 seq_put_decimal_ull(m, ' ', vsize);
65500 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
65501 seq_put_decimal_ull(m, ' ', rsslim);
65502+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65503+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
65504+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
65505+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
65506+#else
65507 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
65508 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
65509 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
65510+#endif
65511 seq_put_decimal_ull(m, ' ', esp);
65512 seq_put_decimal_ull(m, ' ', eip);
65513 /* The signal information here is obsolete.
65514@@ -514,7 +571,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65515 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
65516 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
65517
65518- if (mm && permitted) {
65519+ if (mm && permitted
65520+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65521+ && !PAX_RAND_FLAGS(mm)
65522+#endif
65523+ ) {
65524 seq_put_decimal_ull(m, ' ', mm->start_data);
65525 seq_put_decimal_ull(m, ' ', mm->end_data);
65526 seq_put_decimal_ull(m, ' ', mm->start_brk);
65527@@ -552,8 +613,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
65528 struct pid *pid, struct task_struct *task)
65529 {
65530 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
65531- struct mm_struct *mm = get_task_mm(task);
65532+ struct mm_struct *mm;
65533
65534+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65535+ if (current->exec_id != m->exec_id) {
65536+ gr_log_badprocpid("statm");
65537+ return 0;
65538+ }
65539+#endif
65540+ mm = get_task_mm(task);
65541 if (mm) {
65542 size = task_statm(mm, &shared, &text, &data, &resident);
65543 mmput(mm);
65544@@ -576,6 +644,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
65545 return 0;
65546 }
65547
65548+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
65549+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
65550+{
65551+ unsigned long flags;
65552+ u32 curr_ip = 0;
65553+
65554+ if (lock_task_sighand(task, &flags)) {
65555+ curr_ip = task->signal->curr_ip;
65556+ unlock_task_sighand(task, &flags);
65557+ }
65558+ return seq_printf(m, "%pI4\n", &curr_ip);
65559+}
65560+#endif
65561+
65562 #ifdef CONFIG_CHECKPOINT_RESTORE
65563 static struct pid *
65564 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
65565diff --git a/fs/proc/base.c b/fs/proc/base.c
65566index 7dc3ea8..4cfe92f 100644
65567--- a/fs/proc/base.c
65568+++ b/fs/proc/base.c
65569@@ -113,6 +113,14 @@ struct pid_entry {
65570 union proc_op op;
65571 };
65572
65573+struct getdents_callback {
65574+ struct linux_dirent __user * current_dir;
65575+ struct linux_dirent __user * previous;
65576+ struct file * file;
65577+ int count;
65578+ int error;
65579+};
65580+
65581 #define NOD(NAME, MODE, IOP, FOP, OP) { \
65582 .name = (NAME), \
65583 .len = sizeof(NAME) - 1, \
65584@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
65585 return 0;
65586 }
65587
65588+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65589+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
65590+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
65591+ _mm->pax_flags & MF_PAX_SEGMEXEC))
65592+#endif
65593+
65594 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
65595 struct pid *pid, struct task_struct *task)
65596 {
65597 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
65598 if (mm && !IS_ERR(mm)) {
65599 unsigned int nwords = 0;
65600+
65601+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65602+ /* allow if we're currently ptracing this task */
65603+ if (PAX_RAND_FLAGS(mm) &&
65604+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
65605+ mmput(mm);
65606+ return 0;
65607+ }
65608+#endif
65609+
65610 do {
65611 nwords += 2;
65612 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
65613@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
65614 }
65615
65616
65617-#ifdef CONFIG_KALLSYMS
65618+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65619 /*
65620 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
65621 * Returns the resolved symbol. If that fails, simply return the address.
65622@@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
65623 mutex_unlock(&task->signal->cred_guard_mutex);
65624 }
65625
65626-#ifdef CONFIG_STACKTRACE
65627+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65628
65629 #define MAX_STACK_TRACE_DEPTH 64
65630
65631@@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
65632 return 0;
65633 }
65634
65635-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65636+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65637 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
65638 struct pid *pid, struct task_struct *task)
65639 {
65640@@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
65641 /************************************************************************/
65642
65643 /* permission checks */
65644-static int proc_fd_access_allowed(struct inode *inode)
65645+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
65646 {
65647 struct task_struct *task;
65648 int allowed = 0;
65649@@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
65650 */
65651 task = get_proc_task(inode);
65652 if (task) {
65653- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
65654+ if (log)
65655+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
65656+ else
65657+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
65658 put_task_struct(task);
65659 }
65660 return allowed;
65661@@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
65662 struct task_struct *task,
65663 int hide_pid_min)
65664 {
65665+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65666+ return false;
65667+
65668+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65669+ rcu_read_lock();
65670+ {
65671+ const struct cred *tmpcred = current_cred();
65672+ const struct cred *cred = __task_cred(task);
65673+
65674+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
65675+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65676+ || in_group_p(grsec_proc_gid)
65677+#endif
65678+ ) {
65679+ rcu_read_unlock();
65680+ return true;
65681+ }
65682+ }
65683+ rcu_read_unlock();
65684+
65685+ if (!pid->hide_pid)
65686+ return false;
65687+#endif
65688+
65689 if (pid->hide_pid < hide_pid_min)
65690 return true;
65691 if (in_group_p(pid->pid_gid))
65692 return true;
65693+
65694 return ptrace_may_access(task, PTRACE_MODE_READ);
65695 }
65696
65697@@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
65698 put_task_struct(task);
65699
65700 if (!has_perms) {
65701+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65702+ {
65703+#else
65704 if (pid->hide_pid == 2) {
65705+#endif
65706 /*
65707 * Let's make getdents(), stat(), and open()
65708 * consistent with each other. If a process
65709@@ -609,6 +665,8 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
65710
65711 if (task) {
65712 mm = mm_access(task, mode);
65713+ if (gr_acl_handle_procpidmem(task))
65714+ mm = ERR_PTR(-EPERM);
65715 put_task_struct(task);
65716
65717 if (!IS_ERR_OR_NULL(mm)) {
65718@@ -630,6 +688,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
65719 return PTR_ERR(mm);
65720
65721 file->private_data = mm;
65722+
65723+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65724+ file->f_version = current->exec_id;
65725+#endif
65726+
65727 return 0;
65728 }
65729
65730@@ -651,6 +714,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
65731 ssize_t copied;
65732 char *page;
65733
65734+#ifdef CONFIG_GRKERNSEC
65735+ if (write)
65736+ return -EPERM;
65737+#endif
65738+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65739+ if (file->f_version != current->exec_id) {
65740+ gr_log_badprocpid("mem");
65741+ return 0;
65742+ }
65743+#endif
65744+
65745 if (!mm)
65746 return 0;
65747
65748@@ -663,7 +737,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
65749 goto free;
65750
65751 while (count > 0) {
65752- int this_len = min_t(int, count, PAGE_SIZE);
65753+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
65754
65755 if (write && copy_from_user(page, buf, this_len)) {
65756 copied = -EFAULT;
65757@@ -755,6 +829,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
65758 if (!mm)
65759 return 0;
65760
65761+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65762+ if (file->f_version != current->exec_id) {
65763+ gr_log_badprocpid("environ");
65764+ return 0;
65765+ }
65766+#endif
65767+
65768 page = (char *)__get_free_page(GFP_TEMPORARY);
65769 if (!page)
65770 return -ENOMEM;
65771@@ -764,7 +845,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
65772 goto free;
65773 while (count > 0) {
65774 size_t this_len, max_len;
65775- int retval;
65776+ ssize_t retval;
65777
65778 if (src >= (mm->env_end - mm->env_start))
65779 break;
65780@@ -1378,7 +1459,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
65781 int error = -EACCES;
65782
65783 /* Are we allowed to snoop on the tasks file descriptors? */
65784- if (!proc_fd_access_allowed(inode))
65785+ if (!proc_fd_access_allowed(inode, 0))
65786 goto out;
65787
65788 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
65789@@ -1422,8 +1503,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
65790 struct path path;
65791
65792 /* Are we allowed to snoop on the tasks file descriptors? */
65793- if (!proc_fd_access_allowed(inode))
65794- goto out;
65795+ /* logging this is needed for learning on chromium to work properly,
65796+ but we don't want to flood the logs from 'ps' which does a readlink
65797+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
65798+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
65799+ */
65800+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
65801+ if (!proc_fd_access_allowed(inode,0))
65802+ goto out;
65803+ } else {
65804+ if (!proc_fd_access_allowed(inode,1))
65805+ goto out;
65806+ }
65807
65808 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
65809 if (error)
65810@@ -1473,7 +1564,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
65811 rcu_read_lock();
65812 cred = __task_cred(task);
65813 inode->i_uid = cred->euid;
65814+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65815+ inode->i_gid = grsec_proc_gid;
65816+#else
65817 inode->i_gid = cred->egid;
65818+#endif
65819 rcu_read_unlock();
65820 }
65821 security_task_to_inode(task, inode);
65822@@ -1509,10 +1604,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
65823 return -ENOENT;
65824 }
65825 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
65826+#ifdef CONFIG_GRKERNSEC_PROC_USER
65827+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
65828+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65829+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
65830+#endif
65831 task_dumpable(task)) {
65832 cred = __task_cred(task);
65833 stat->uid = cred->euid;
65834+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65835+ stat->gid = grsec_proc_gid;
65836+#else
65837 stat->gid = cred->egid;
65838+#endif
65839 }
65840 }
65841 rcu_read_unlock();
65842@@ -1550,11 +1654,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
65843
65844 if (task) {
65845 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
65846+#ifdef CONFIG_GRKERNSEC_PROC_USER
65847+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
65848+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65849+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
65850+#endif
65851 task_dumpable(task)) {
65852 rcu_read_lock();
65853 cred = __task_cred(task);
65854 inode->i_uid = cred->euid;
65855+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65856+ inode->i_gid = grsec_proc_gid;
65857+#else
65858 inode->i_gid = cred->egid;
65859+#endif
65860 rcu_read_unlock();
65861 } else {
65862 inode->i_uid = GLOBAL_ROOT_UID;
65863@@ -2085,6 +2198,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
65864 if (!task)
65865 goto out_no_task;
65866
65867+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65868+ goto out;
65869+
65870 /*
65871 * Yes, it does not scale. And it should not. Don't add
65872 * new entries into /proc/<tgid>/ without very good reasons.
65873@@ -2115,6 +2231,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
65874 if (!task)
65875 return -ENOENT;
65876
65877+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65878+ goto out;
65879+
65880 if (!dir_emit_dots(file, ctx))
65881 goto out;
65882
65883@@ -2557,7 +2676,7 @@ static const struct pid_entry tgid_base_stuff[] = {
65884 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
65885 #endif
65886 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
65887-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65888+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65889 ONE("syscall", S_IRUSR, proc_pid_syscall),
65890 #endif
65891 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
65892@@ -2582,10 +2701,10 @@ static const struct pid_entry tgid_base_stuff[] = {
65893 #ifdef CONFIG_SECURITY
65894 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
65895 #endif
65896-#ifdef CONFIG_KALLSYMS
65897+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65898 ONE("wchan", S_IRUGO, proc_pid_wchan),
65899 #endif
65900-#ifdef CONFIG_STACKTRACE
65901+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65902 ONE("stack", S_IRUSR, proc_pid_stack),
65903 #endif
65904 #ifdef CONFIG_SCHEDSTATS
65905@@ -2619,6 +2738,9 @@ static const struct pid_entry tgid_base_stuff[] = {
65906 #ifdef CONFIG_HARDWALL
65907 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
65908 #endif
65909+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
65910+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
65911+#endif
65912 #ifdef CONFIG_USER_NS
65913 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
65914 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
65915@@ -2748,7 +2870,14 @@ static int proc_pid_instantiate(struct inode *dir,
65916 if (!inode)
65917 goto out;
65918
65919+#ifdef CONFIG_GRKERNSEC_PROC_USER
65920+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
65921+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65922+ inode->i_gid = grsec_proc_gid;
65923+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
65924+#else
65925 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
65926+#endif
65927 inode->i_op = &proc_tgid_base_inode_operations;
65928 inode->i_fop = &proc_tgid_base_operations;
65929 inode->i_flags|=S_IMMUTABLE;
65930@@ -2786,7 +2915,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
65931 if (!task)
65932 goto out;
65933
65934+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65935+ goto out_put_task;
65936+
65937 result = proc_pid_instantiate(dir, dentry, task, NULL);
65938+out_put_task:
65939 put_task_struct(task);
65940 out:
65941 return ERR_PTR(result);
65942@@ -2900,7 +3033,7 @@ static const struct pid_entry tid_base_stuff[] = {
65943 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
65944 #endif
65945 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
65946-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65947+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65948 ONE("syscall", S_IRUSR, proc_pid_syscall),
65949 #endif
65950 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
65951@@ -2927,10 +3060,10 @@ static const struct pid_entry tid_base_stuff[] = {
65952 #ifdef CONFIG_SECURITY
65953 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
65954 #endif
65955-#ifdef CONFIG_KALLSYMS
65956+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65957 ONE("wchan", S_IRUGO, proc_pid_wchan),
65958 #endif
65959-#ifdef CONFIG_STACKTRACE
65960+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65961 ONE("stack", S_IRUSR, proc_pid_stack),
65962 #endif
65963 #ifdef CONFIG_SCHEDSTATS
65964diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
65965index cbd82df..c0407d2 100644
65966--- a/fs/proc/cmdline.c
65967+++ b/fs/proc/cmdline.c
65968@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
65969
65970 static int __init proc_cmdline_init(void)
65971 {
65972+#ifdef CONFIG_GRKERNSEC_PROC_ADD
65973+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
65974+#else
65975 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
65976+#endif
65977 return 0;
65978 }
65979 fs_initcall(proc_cmdline_init);
65980diff --git a/fs/proc/devices.c b/fs/proc/devices.c
65981index 50493ed..248166b 100644
65982--- a/fs/proc/devices.c
65983+++ b/fs/proc/devices.c
65984@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
65985
65986 static int __init proc_devices_init(void)
65987 {
65988+#ifdef CONFIG_GRKERNSEC_PROC_ADD
65989+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
65990+#else
65991 proc_create("devices", 0, NULL, &proc_devinfo_operations);
65992+#endif
65993 return 0;
65994 }
65995 fs_initcall(proc_devices_init);
65996diff --git a/fs/proc/fd.c b/fs/proc/fd.c
65997index e11d7c5..9128ce06 100644
65998--- a/fs/proc/fd.c
65999+++ b/fs/proc/fd.c
66000@@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
66001 if (!task)
66002 return -ENOENT;
66003
66004- files = get_files_struct(task);
66005+ if (!gr_acl_handle_procpidmem(task))
66006+ files = get_files_struct(task);
66007 put_task_struct(task);
66008
66009 if (files) {
66010@@ -283,11 +284,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
66011 */
66012 int proc_fd_permission(struct inode *inode, int mask)
66013 {
66014+ struct task_struct *task;
66015 int rv = generic_permission(inode, mask);
66016- if (rv == 0)
66017- return 0;
66018+
66019 if (task_tgid(current) == proc_pid(inode))
66020 rv = 0;
66021+
66022+ task = get_proc_task(inode);
66023+ if (task == NULL)
66024+ return rv;
66025+
66026+ if (gr_acl_handle_procpidmem(task))
66027+ rv = -EACCES;
66028+
66029+ put_task_struct(task);
66030+
66031 return rv;
66032 }
66033
66034diff --git a/fs/proc/generic.c b/fs/proc/generic.c
66035index 317b726..e329aed 100644
66036--- a/fs/proc/generic.c
66037+++ b/fs/proc/generic.c
66038@@ -23,6 +23,7 @@
66039 #include <linux/bitops.h>
66040 #include <linux/spinlock.h>
66041 #include <linux/completion.h>
66042+#include <linux/grsecurity.h>
66043 #include <asm/uaccess.h>
66044
66045 #include "internal.h"
66046@@ -207,6 +208,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
66047 return proc_lookup_de(PDE(dir), dir, dentry);
66048 }
66049
66050+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
66051+ unsigned int flags)
66052+{
66053+ if (gr_proc_is_restricted())
66054+ return ERR_PTR(-EACCES);
66055+
66056+ return proc_lookup_de(PDE(dir), dir, dentry);
66057+}
66058+
66059 /*
66060 * This returns non-zero if at EOF, so that the /proc
66061 * root directory can use this and check if it should
66062@@ -264,6 +274,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
66063 return proc_readdir_de(PDE(inode), file, ctx);
66064 }
66065
66066+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
66067+{
66068+ struct inode *inode = file_inode(file);
66069+
66070+ if (gr_proc_is_restricted())
66071+ return -EACCES;
66072+
66073+ return proc_readdir_de(PDE(inode), file, ctx);
66074+}
66075+
66076 /*
66077 * These are the generic /proc directory operations. They
66078 * use the in-memory "struct proc_dir_entry" tree to parse
66079@@ -275,6 +295,12 @@ static const struct file_operations proc_dir_operations = {
66080 .iterate = proc_readdir,
66081 };
66082
66083+static const struct file_operations proc_dir_restricted_operations = {
66084+ .llseek = generic_file_llseek,
66085+ .read = generic_read_dir,
66086+ .iterate = proc_readdir_restrict,
66087+};
66088+
66089 /*
66090 * proc directories can do almost nothing..
66091 */
66092@@ -284,6 +310,12 @@ static const struct inode_operations proc_dir_inode_operations = {
66093 .setattr = proc_notify_change,
66094 };
66095
66096+static const struct inode_operations proc_dir_restricted_inode_operations = {
66097+ .lookup = proc_lookup_restrict,
66098+ .getattr = proc_getattr,
66099+ .setattr = proc_notify_change,
66100+};
66101+
66102 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
66103 {
66104 struct proc_dir_entry *tmp;
66105@@ -294,8 +326,13 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
66106 return ret;
66107
66108 if (S_ISDIR(dp->mode)) {
66109- dp->proc_fops = &proc_dir_operations;
66110- dp->proc_iops = &proc_dir_inode_operations;
66111+ if (dp->restricted) {
66112+ dp->proc_fops = &proc_dir_restricted_operations;
66113+ dp->proc_iops = &proc_dir_restricted_inode_operations;
66114+ } else {
66115+ dp->proc_fops = &proc_dir_operations;
66116+ dp->proc_iops = &proc_dir_inode_operations;
66117+ }
66118 dir->nlink++;
66119 } else if (S_ISLNK(dp->mode)) {
66120 dp->proc_iops = &proc_link_inode_operations;
66121@@ -407,6 +444,27 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
66122 }
66123 EXPORT_SYMBOL_GPL(proc_mkdir_data);
66124
66125+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
66126+ struct proc_dir_entry *parent, void *data)
66127+{
66128+ struct proc_dir_entry *ent;
66129+
66130+ if (mode == 0)
66131+ mode = S_IRUGO | S_IXUGO;
66132+
66133+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
66134+ if (ent) {
66135+ ent->data = data;
66136+ ent->restricted = 1;
66137+ if (proc_register(parent, ent) < 0) {
66138+ kfree(ent);
66139+ ent = NULL;
66140+ }
66141+ }
66142+ return ent;
66143+}
66144+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
66145+
66146 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
66147 struct proc_dir_entry *parent)
66148 {
66149@@ -421,6 +479,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
66150 }
66151 EXPORT_SYMBOL(proc_mkdir);
66152
66153+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
66154+ struct proc_dir_entry *parent)
66155+{
66156+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
66157+}
66158+EXPORT_SYMBOL(proc_mkdir_restrict);
66159+
66160 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
66161 struct proc_dir_entry *parent,
66162 const struct file_operations *proc_fops,
66163diff --git a/fs/proc/inode.c b/fs/proc/inode.c
66164index 333080d..0a35ec4 100644
66165--- a/fs/proc/inode.c
66166+++ b/fs/proc/inode.c
66167@@ -23,11 +23,17 @@
66168 #include <linux/slab.h>
66169 #include <linux/mount.h>
66170 #include <linux/magic.h>
66171+#include <linux/grsecurity.h>
66172
66173 #include <asm/uaccess.h>
66174
66175 #include "internal.h"
66176
66177+#ifdef CONFIG_PROC_SYSCTL
66178+extern const struct inode_operations proc_sys_inode_operations;
66179+extern const struct inode_operations proc_sys_dir_operations;
66180+#endif
66181+
66182 static void proc_evict_inode(struct inode *inode)
66183 {
66184 struct proc_dir_entry *de;
66185@@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
66186 ns = PROC_I(inode)->ns.ns;
66187 if (ns_ops && ns)
66188 ns_ops->put(ns);
66189+
66190+#ifdef CONFIG_PROC_SYSCTL
66191+ if (inode->i_op == &proc_sys_inode_operations ||
66192+ inode->i_op == &proc_sys_dir_operations)
66193+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
66194+#endif
66195+
66196 }
66197
66198 static struct kmem_cache * proc_inode_cachep;
66199@@ -413,7 +426,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
66200 if (de->mode) {
66201 inode->i_mode = de->mode;
66202 inode->i_uid = de->uid;
66203+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66204+ inode->i_gid = grsec_proc_gid;
66205+#else
66206 inode->i_gid = de->gid;
66207+#endif
66208 }
66209 if (de->size)
66210 inode->i_size = de->size;
66211diff --git a/fs/proc/internal.h b/fs/proc/internal.h
66212index aa7a0ee..f2318df 100644
66213--- a/fs/proc/internal.h
66214+++ b/fs/proc/internal.h
66215@@ -46,9 +46,10 @@ struct proc_dir_entry {
66216 struct completion *pde_unload_completion;
66217 struct list_head pde_openers; /* who did ->open, but not ->release */
66218 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
66219+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
66220 u8 namelen;
66221 char name[];
66222-};
66223+} __randomize_layout;
66224
66225 union proc_op {
66226 int (*proc_get_link)(struct dentry *, struct path *);
66227@@ -66,7 +67,7 @@ struct proc_inode {
66228 struct ctl_table *sysctl_entry;
66229 struct proc_ns ns;
66230 struct inode vfs_inode;
66231-};
66232+} __randomize_layout;
66233
66234 /*
66235 * General functions
66236@@ -154,6 +155,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
66237 struct pid *, struct task_struct *);
66238 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
66239 struct pid *, struct task_struct *);
66240+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66241+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
66242+ struct pid *, struct task_struct *);
66243+#endif
66244
66245 /*
66246 * base.c
66247@@ -178,9 +183,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
66248 * generic.c
66249 */
66250 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
66251+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
66252 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
66253 struct dentry *);
66254 extern int proc_readdir(struct file *, struct dir_context *);
66255+extern int proc_readdir_restrict(struct file *, struct dir_context *);
66256 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
66257
66258 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
66259diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
66260index a352d57..cb94a5c 100644
66261--- a/fs/proc/interrupts.c
66262+++ b/fs/proc/interrupts.c
66263@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
66264
66265 static int __init proc_interrupts_init(void)
66266 {
66267+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66268+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
66269+#else
66270 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
66271+#endif
66272 return 0;
66273 }
66274 fs_initcall(proc_interrupts_init);
66275diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
66276index 91a4e64..cb007c0 100644
66277--- a/fs/proc/kcore.c
66278+++ b/fs/proc/kcore.c
66279@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66280 * the addresses in the elf_phdr on our list.
66281 */
66282 start = kc_offset_to_vaddr(*fpos - elf_buflen);
66283- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
66284+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
66285+ if (tsz > buflen)
66286 tsz = buflen;
66287-
66288+
66289 while (buflen) {
66290 struct kcore_list *m;
66291
66292@@ -514,20 +515,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66293 kfree(elf_buf);
66294 } else {
66295 if (kern_addr_valid(start)) {
66296- unsigned long n;
66297+ char *elf_buf;
66298+ mm_segment_t oldfs;
66299
66300- n = copy_to_user(buffer, (char *)start, tsz);
66301- /*
66302- * We cannot distinguish between fault on source
66303- * and fault on destination. When this happens
66304- * we clear too and hope it will trigger the
66305- * EFAULT again.
66306- */
66307- if (n) {
66308- if (clear_user(buffer + tsz - n,
66309- n))
66310+ elf_buf = kmalloc(tsz, GFP_KERNEL);
66311+ if (!elf_buf)
66312+ return -ENOMEM;
66313+ oldfs = get_fs();
66314+ set_fs(KERNEL_DS);
66315+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
66316+ set_fs(oldfs);
66317+ if (copy_to_user(buffer, elf_buf, tsz)) {
66318+ kfree(elf_buf);
66319 return -EFAULT;
66320+ }
66321 }
66322+ set_fs(oldfs);
66323+ kfree(elf_buf);
66324 } else {
66325 if (clear_user(buffer, tsz))
66326 return -EFAULT;
66327@@ -547,6 +551,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66328
66329 static int open_kcore(struct inode *inode, struct file *filp)
66330 {
66331+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
66332+ return -EPERM;
66333+#endif
66334 if (!capable(CAP_SYS_RAWIO))
66335 return -EPERM;
66336 if (kcore_need_update)
66337diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
66338index aa1eee0..03dda72 100644
66339--- a/fs/proc/meminfo.c
66340+++ b/fs/proc/meminfo.c
66341@@ -187,7 +187,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
66342 vmi.used >> 10,
66343 vmi.largest_chunk >> 10
66344 #ifdef CONFIG_MEMORY_FAILURE
66345- ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66346+ ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66347 #endif
66348 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
66349 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
66350diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
66351index d4a3574..b421ce9 100644
66352--- a/fs/proc/nommu.c
66353+++ b/fs/proc/nommu.c
66354@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
66355
66356 if (file) {
66357 seq_pad(m, ' ');
66358- seq_path(m, &file->f_path, "");
66359+ seq_path(m, &file->f_path, "\n\\");
66360 }
66361
66362 seq_putc(m, '\n');
66363diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
66364index a63af3e..b4f262a 100644
66365--- a/fs/proc/proc_net.c
66366+++ b/fs/proc/proc_net.c
66367@@ -23,9 +23,27 @@
66368 #include <linux/nsproxy.h>
66369 #include <net/net_namespace.h>
66370 #include <linux/seq_file.h>
66371+#include <linux/grsecurity.h>
66372
66373 #include "internal.h"
66374
66375+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
66376+static struct seq_operations *ipv6_seq_ops_addr;
66377+
66378+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
66379+{
66380+ ipv6_seq_ops_addr = addr;
66381+}
66382+
66383+void unregister_ipv6_seq_ops_addr(void)
66384+{
66385+ ipv6_seq_ops_addr = NULL;
66386+}
66387+
66388+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
66389+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
66390+#endif
66391+
66392 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
66393 {
66394 return pde->parent->data;
66395@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
66396 return maybe_get_net(PDE_NET(PDE(inode)));
66397 }
66398
66399+extern const struct seq_operations dev_seq_ops;
66400+
66401 int seq_open_net(struct inode *ino, struct file *f,
66402 const struct seq_operations *ops, int size)
66403 {
66404@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
66405
66406 BUG_ON(size < sizeof(*p));
66407
66408+ /* only permit access to /proc/net/dev */
66409+ if (
66410+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
66411+ ops != ipv6_seq_ops_addr &&
66412+#endif
66413+ ops != &dev_seq_ops && gr_proc_is_restricted())
66414+ return -EACCES;
66415+
66416 net = get_proc_net(ino);
66417 if (net == NULL)
66418 return -ENXIO;
66419@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
66420 int err;
66421 struct net *net;
66422
66423+ if (gr_proc_is_restricted())
66424+ return -EACCES;
66425+
66426 err = -ENXIO;
66427 net = get_proc_net(inode);
66428 if (net == NULL)
66429diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
66430index f92d5dd..26398ac 100644
66431--- a/fs/proc/proc_sysctl.c
66432+++ b/fs/proc/proc_sysctl.c
66433@@ -11,13 +11,21 @@
66434 #include <linux/namei.h>
66435 #include <linux/mm.h>
66436 #include <linux/module.h>
66437+#include <linux/nsproxy.h>
66438+#ifdef CONFIG_GRKERNSEC
66439+#include <net/net_namespace.h>
66440+#endif
66441 #include "internal.h"
66442
66443+extern int gr_handle_chroot_sysctl(const int op);
66444+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
66445+ const int op);
66446+
66447 static const struct dentry_operations proc_sys_dentry_operations;
66448 static const struct file_operations proc_sys_file_operations;
66449-static const struct inode_operations proc_sys_inode_operations;
66450+const struct inode_operations proc_sys_inode_operations;
66451 static const struct file_operations proc_sys_dir_file_operations;
66452-static const struct inode_operations proc_sys_dir_operations;
66453+const struct inode_operations proc_sys_dir_operations;
66454
66455 void proc_sys_poll_notify(struct ctl_table_poll *poll)
66456 {
66457@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
66458
66459 err = NULL;
66460 d_set_d_op(dentry, &proc_sys_dentry_operations);
66461+
66462+ gr_handle_proc_create(dentry, inode);
66463+
66464 d_add(dentry, inode);
66465
66466 out:
66467@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66468 struct inode *inode = file_inode(filp);
66469 struct ctl_table_header *head = grab_header(inode);
66470 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
66471+ int op = write ? MAY_WRITE : MAY_READ;
66472 ssize_t error;
66473 size_t res;
66474
66475@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66476 * and won't be until we finish.
66477 */
66478 error = -EPERM;
66479- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
66480+ if (sysctl_perm(head, table, op))
66481 goto out;
66482
66483 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
66484@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66485 if (!table->proc_handler)
66486 goto out;
66487
66488+#ifdef CONFIG_GRKERNSEC
66489+ error = -EPERM;
66490+ if (gr_handle_chroot_sysctl(op))
66491+ goto out;
66492+ dget(filp->f_path.dentry);
66493+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
66494+ dput(filp->f_path.dentry);
66495+ goto out;
66496+ }
66497+ dput(filp->f_path.dentry);
66498+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
66499+ goto out;
66500+ if (write) {
66501+ if (current->nsproxy->net_ns != table->extra2) {
66502+ if (!capable(CAP_SYS_ADMIN))
66503+ goto out;
66504+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
66505+ goto out;
66506+ }
66507+#endif
66508+
66509 /* careful: calling conventions are nasty here */
66510 res = count;
66511 error = table->proc_handler(table, write, buf, &res, ppos);
66512@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
66513 return false;
66514 } else {
66515 d_set_d_op(child, &proc_sys_dentry_operations);
66516+
66517+ gr_handle_proc_create(child, inode);
66518+
66519 d_add(child, inode);
66520 }
66521 } else {
66522@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
66523 if ((*pos)++ < ctx->pos)
66524 return true;
66525
66526+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
66527+ return 0;
66528+
66529 if (unlikely(S_ISLNK(table->mode)))
66530 res = proc_sys_link_fill_cache(file, ctx, head, table);
66531 else
66532@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
66533 if (IS_ERR(head))
66534 return PTR_ERR(head);
66535
66536+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
66537+ return -ENOENT;
66538+
66539 generic_fillattr(inode, stat);
66540 if (table)
66541 stat->mode = (stat->mode & S_IFMT) | table->mode;
66542@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
66543 .llseek = generic_file_llseek,
66544 };
66545
66546-static const struct inode_operations proc_sys_inode_operations = {
66547+const struct inode_operations proc_sys_inode_operations = {
66548 .permission = proc_sys_permission,
66549 .setattr = proc_sys_setattr,
66550 .getattr = proc_sys_getattr,
66551 };
66552
66553-static const struct inode_operations proc_sys_dir_operations = {
66554+const struct inode_operations proc_sys_dir_operations = {
66555 .lookup = proc_sys_lookup,
66556 .permission = proc_sys_permission,
66557 .setattr = proc_sys_setattr,
66558@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
66559 static struct ctl_dir *new_dir(struct ctl_table_set *set,
66560 const char *name, int namelen)
66561 {
66562- struct ctl_table *table;
66563+ ctl_table_no_const *table;
66564 struct ctl_dir *new;
66565 struct ctl_node *node;
66566 char *new_name;
66567@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
66568 return NULL;
66569
66570 node = (struct ctl_node *)(new + 1);
66571- table = (struct ctl_table *)(node + 1);
66572+ table = (ctl_table_no_const *)(node + 1);
66573 new_name = (char *)(table + 2);
66574 memcpy(new_name, name, namelen);
66575 new_name[namelen] = '\0';
66576@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
66577 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
66578 struct ctl_table_root *link_root)
66579 {
66580- struct ctl_table *link_table, *entry, *link;
66581+ ctl_table_no_const *link_table, *link;
66582+ struct ctl_table *entry;
66583 struct ctl_table_header *links;
66584 struct ctl_node *node;
66585 char *link_name;
66586@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
66587 return NULL;
66588
66589 node = (struct ctl_node *)(links + 1);
66590- link_table = (struct ctl_table *)(node + nr_entries);
66591+ link_table = (ctl_table_no_const *)(node + nr_entries);
66592 link_name = (char *)&link_table[nr_entries + 1];
66593
66594 for (link = link_table, entry = table; entry->procname; link++, entry++) {
66595@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66596 struct ctl_table_header ***subheader, struct ctl_table_set *set,
66597 struct ctl_table *table)
66598 {
66599- struct ctl_table *ctl_table_arg = NULL;
66600- struct ctl_table *entry, *files;
66601+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
66602+ struct ctl_table *entry;
66603 int nr_files = 0;
66604 int nr_dirs = 0;
66605 int err = -ENOMEM;
66606@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66607 nr_files++;
66608 }
66609
66610- files = table;
66611 /* If there are mixed files and directories we need a new table */
66612 if (nr_dirs && nr_files) {
66613- struct ctl_table *new;
66614+ ctl_table_no_const *new;
66615 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
66616 GFP_KERNEL);
66617 if (!files)
66618@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66619 /* Register everything except a directory full of subdirectories */
66620 if (nr_files || !nr_dirs) {
66621 struct ctl_table_header *header;
66622- header = __register_sysctl_table(set, path, files);
66623+ header = __register_sysctl_table(set, path, files ? files : table);
66624 if (!header) {
66625 kfree(ctl_table_arg);
66626 goto out;
66627diff --git a/fs/proc/root.c b/fs/proc/root.c
66628index 094e44d..085a877 100644
66629--- a/fs/proc/root.c
66630+++ b/fs/proc/root.c
66631@@ -188,7 +188,15 @@ void __init proc_root_init(void)
66632 proc_mkdir("openprom", NULL);
66633 #endif
66634 proc_tty_init();
66635+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66636+#ifdef CONFIG_GRKERNSEC_PROC_USER
66637+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
66638+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66639+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
66640+#endif
66641+#else
66642 proc_mkdir("bus", NULL);
66643+#endif
66644 proc_sys_init();
66645 }
66646
66647diff --git a/fs/proc/stat.c b/fs/proc/stat.c
66648index bf2d03f..f058f9c 100644
66649--- a/fs/proc/stat.c
66650+++ b/fs/proc/stat.c
66651@@ -11,6 +11,7 @@
66652 #include <linux/irqnr.h>
66653 #include <linux/cputime.h>
66654 #include <linux/tick.h>
66655+#include <linux/grsecurity.h>
66656
66657 #ifndef arch_irq_stat_cpu
66658 #define arch_irq_stat_cpu(cpu) 0
66659@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
66660 u64 sum_softirq = 0;
66661 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
66662 struct timespec boottime;
66663+ int unrestricted = 1;
66664+
66665+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66666+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66667+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
66668+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66669+ && !in_group_p(grsec_proc_gid)
66670+#endif
66671+ )
66672+ unrestricted = 0;
66673+#endif
66674+#endif
66675
66676 user = nice = system = idle = iowait =
66677 irq = softirq = steal = 0;
66678@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
66679 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
66680 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
66681 idle += get_idle_time(i);
66682- iowait += get_iowait_time(i);
66683- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66684- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66685- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66686- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66687- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66688- sum += kstat_cpu_irqs_sum(i);
66689- sum += arch_irq_stat_cpu(i);
66690+ if (unrestricted) {
66691+ iowait += get_iowait_time(i);
66692+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66693+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66694+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66695+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66696+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66697+ sum += kstat_cpu_irqs_sum(i);
66698+ sum += arch_irq_stat_cpu(i);
66699+ for (j = 0; j < NR_SOFTIRQS; j++) {
66700+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
66701
66702- for (j = 0; j < NR_SOFTIRQS; j++) {
66703- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
66704-
66705- per_softirq_sums[j] += softirq_stat;
66706- sum_softirq += softirq_stat;
66707+ per_softirq_sums[j] += softirq_stat;
66708+ sum_softirq += softirq_stat;
66709+ }
66710 }
66711 }
66712- sum += arch_irq_stat();
66713+ if (unrestricted)
66714+ sum += arch_irq_stat();
66715
66716 seq_puts(p, "cpu ");
66717 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
66718@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
66719 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
66720 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
66721 idle = get_idle_time(i);
66722- iowait = get_iowait_time(i);
66723- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66724- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66725- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66726- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66727- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66728+ if (unrestricted) {
66729+ iowait = get_iowait_time(i);
66730+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66731+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66732+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66733+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66734+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66735+ }
66736 seq_printf(p, "cpu%d", i);
66737 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
66738 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
66739@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
66740
66741 /* sum again ? it could be updated? */
66742 for_each_irq_nr(j)
66743- seq_put_decimal_ull(p, ' ', kstat_irqs(j));
66744+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs(j) : 0ULL);
66745
66746 seq_printf(p,
66747 "\nctxt %llu\n"
66748@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
66749 "processes %lu\n"
66750 "procs_running %lu\n"
66751 "procs_blocked %lu\n",
66752- nr_context_switches(),
66753+ unrestricted ? nr_context_switches() : 0ULL,
66754 (unsigned long)jif,
66755- total_forks,
66756- nr_running(),
66757- nr_iowait());
66758+ unrestricted ? total_forks : 0UL,
66759+ unrestricted ? nr_running() : 0UL,
66760+ unrestricted ? nr_iowait() : 0UL);
66761
66762 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
66763
66764diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
66765index 4e0388c..fc6a0e1 100644
66766--- a/fs/proc/task_mmu.c
66767+++ b/fs/proc/task_mmu.c
66768@@ -13,12 +13,19 @@
66769 #include <linux/swap.h>
66770 #include <linux/swapops.h>
66771 #include <linux/mmu_notifier.h>
66772+#include <linux/grsecurity.h>
66773
66774 #include <asm/elf.h>
66775 #include <asm/uaccess.h>
66776 #include <asm/tlbflush.h>
66777 #include "internal.h"
66778
66779+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66780+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
66781+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
66782+ _mm->pax_flags & MF_PAX_SEGMEXEC))
66783+#endif
66784+
66785 void task_mem(struct seq_file *m, struct mm_struct *mm)
66786 {
66787 unsigned long data, text, lib, swap;
66788@@ -54,8 +61,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66789 "VmExe:\t%8lu kB\n"
66790 "VmLib:\t%8lu kB\n"
66791 "VmPTE:\t%8lu kB\n"
66792- "VmSwap:\t%8lu kB\n",
66793- hiwater_vm << (PAGE_SHIFT-10),
66794+ "VmSwap:\t%8lu kB\n"
66795+
66796+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66797+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
66798+#endif
66799+
66800+ ,hiwater_vm << (PAGE_SHIFT-10),
66801 total_vm << (PAGE_SHIFT-10),
66802 mm->locked_vm << (PAGE_SHIFT-10),
66803 mm->pinned_vm << (PAGE_SHIFT-10),
66804@@ -65,7 +77,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66805 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
66806 (PTRS_PER_PTE * sizeof(pte_t) *
66807 atomic_long_read(&mm->nr_ptes)) >> 10,
66808- swap << (PAGE_SHIFT-10));
66809+ swap << (PAGE_SHIFT-10)
66810+
66811+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66812+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66813+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
66814+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
66815+#else
66816+ , mm->context.user_cs_base
66817+ , mm->context.user_cs_limit
66818+#endif
66819+#endif
66820+
66821+ );
66822 }
66823
66824 unsigned long task_vsize(struct mm_struct *mm)
66825@@ -282,13 +306,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66826 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
66827 }
66828
66829- /* We don't show the stack guard page in /proc/maps */
66830+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66831+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
66832+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
66833+#else
66834 start = vma->vm_start;
66835- if (stack_guard_page_start(vma, start))
66836- start += PAGE_SIZE;
66837 end = vma->vm_end;
66838- if (stack_guard_page_end(vma, end))
66839- end -= PAGE_SIZE;
66840+#endif
66841
66842 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
66843 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
66844@@ -298,7 +322,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66845 flags & VM_WRITE ? 'w' : '-',
66846 flags & VM_EXEC ? 'x' : '-',
66847 flags & VM_MAYSHARE ? 's' : 'p',
66848+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66849+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
66850+#else
66851 pgoff,
66852+#endif
66853 MAJOR(dev), MINOR(dev), ino);
66854
66855 /*
66856@@ -307,7 +335,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66857 */
66858 if (file) {
66859 seq_pad(m, ' ');
66860- seq_path(m, &file->f_path, "\n");
66861+ seq_path(m, &file->f_path, "\n\\");
66862 goto done;
66863 }
66864
66865@@ -338,8 +366,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66866 * Thread stack in /proc/PID/task/TID/maps or
66867 * the main process stack.
66868 */
66869- if (!is_pid || (vma->vm_start <= mm->start_stack &&
66870- vma->vm_end >= mm->start_stack)) {
66871+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
66872+ (vma->vm_start <= mm->start_stack &&
66873+ vma->vm_end >= mm->start_stack)) {
66874 name = "[stack]";
66875 } else {
66876 /* Thread stack in /proc/PID/maps */
66877@@ -359,6 +388,12 @@ done:
66878
66879 static int show_map(struct seq_file *m, void *v, int is_pid)
66880 {
66881+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66882+ if (current->exec_id != m->exec_id) {
66883+ gr_log_badprocpid("maps");
66884+ return 0;
66885+ }
66886+#endif
66887 show_map_vma(m, v, is_pid);
66888 m_cache_vma(m, v);
66889 return 0;
66890@@ -594,12 +629,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
66891 .private = &mss,
66892 };
66893
66894+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66895+ if (current->exec_id != m->exec_id) {
66896+ gr_log_badprocpid("smaps");
66897+ return 0;
66898+ }
66899+#endif
66900 memset(&mss, 0, sizeof mss);
66901- mss.vma = vma;
66902- /* mmap_sem is held in m_start */
66903- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
66904- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
66905-
66906+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66907+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
66908+#endif
66909+ mss.vma = vma;
66910+ /* mmap_sem is held in m_start */
66911+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
66912+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
66913+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66914+ }
66915+#endif
66916 show_map_vma(m, vma, is_pid);
66917
66918 seq_printf(m,
66919@@ -617,7 +663,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
66920 "KernelPageSize: %8lu kB\n"
66921 "MMUPageSize: %8lu kB\n"
66922 "Locked: %8lu kB\n",
66923+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66924+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
66925+#else
66926 (vma->vm_end - vma->vm_start) >> 10,
66927+#endif
66928 mss.resident >> 10,
66929 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
66930 mss.shared_clean >> 10,
66931@@ -1447,6 +1497,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
66932 char buffer[64];
66933 int nid;
66934
66935+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66936+ if (current->exec_id != m->exec_id) {
66937+ gr_log_badprocpid("numa_maps");
66938+ return 0;
66939+ }
66940+#endif
66941+
66942 if (!mm)
66943 return 0;
66944
66945@@ -1468,11 +1525,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
66946 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
66947 }
66948
66949+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66950+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
66951+#else
66952 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
66953+#endif
66954
66955 if (file) {
66956 seq_puts(m, " file=");
66957- seq_path(m, &file->f_path, "\n\t= ");
66958+ seq_path(m, &file->f_path, "\n\t\\= ");
66959 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
66960 seq_puts(m, " heap");
66961 } else {
66962diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
66963index 599ec2e..f1413ae 100644
66964--- a/fs/proc/task_nommu.c
66965+++ b/fs/proc/task_nommu.c
66966@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66967 else
66968 bytes += kobjsize(mm);
66969
66970- if (current->fs && current->fs->users > 1)
66971+ if (current->fs && atomic_read(&current->fs->users) > 1)
66972 sbytes += kobjsize(current->fs);
66973 else
66974 bytes += kobjsize(current->fs);
66975@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
66976
66977 if (file) {
66978 seq_pad(m, ' ');
66979- seq_path(m, &file->f_path, "");
66980+ seq_path(m, &file->f_path, "\n\\");
66981 } else if (mm) {
66982 pid_t tid = pid_of_stack(priv, vma, is_pid);
66983
66984diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
66985index a90d6d35..d08047c 100644
66986--- a/fs/proc/vmcore.c
66987+++ b/fs/proc/vmcore.c
66988@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
66989 nr_bytes = count;
66990
66991 /* If pfn is not ram, return zeros for sparse dump files */
66992- if (pfn_is_ram(pfn) == 0)
66993- memset(buf, 0, nr_bytes);
66994- else {
66995+ if (pfn_is_ram(pfn) == 0) {
66996+ if (userbuf) {
66997+ if (clear_user((char __force_user *)buf, nr_bytes))
66998+ return -EFAULT;
66999+ } else
67000+ memset(buf, 0, nr_bytes);
67001+ } else {
67002 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
67003 offset, userbuf);
67004 if (tmp < 0)
67005@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
67006 static int copy_to(void *target, void *src, size_t size, int userbuf)
67007 {
67008 if (userbuf) {
67009- if (copy_to_user((char __user *) target, src, size))
67010+ if (copy_to_user((char __force_user *) target, src, size))
67011 return -EFAULT;
67012 } else {
67013 memcpy(target, src, size);
67014@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
67015 if (*fpos < m->offset + m->size) {
67016 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
67017 start = m->paddr + *fpos - m->offset;
67018- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
67019+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
67020 if (tmp < 0)
67021 return tmp;
67022 buflen -= tsz;
67023@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
67024 static ssize_t read_vmcore(struct file *file, char __user *buffer,
67025 size_t buflen, loff_t *fpos)
67026 {
67027- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
67028+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
67029 }
67030
67031 /*
67032diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
67033index d3fb2b6..43a8140 100644
67034--- a/fs/qnx6/qnx6.h
67035+++ b/fs/qnx6/qnx6.h
67036@@ -74,7 +74,7 @@ enum {
67037 BYTESEX_BE,
67038 };
67039
67040-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
67041+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
67042 {
67043 if (sbi->s_bytesex == BYTESEX_LE)
67044 return le64_to_cpu((__force __le64)n);
67045@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
67046 return (__force __fs64)cpu_to_be64(n);
67047 }
67048
67049-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
67050+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
67051 {
67052 if (sbi->s_bytesex == BYTESEX_LE)
67053 return le32_to_cpu((__force __le32)n);
67054diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
67055index bb2869f..d34ada8 100644
67056--- a/fs/quota/netlink.c
67057+++ b/fs/quota/netlink.c
67058@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
67059 void quota_send_warning(struct kqid qid, dev_t dev,
67060 const char warntype)
67061 {
67062- static atomic_t seq;
67063+ static atomic_unchecked_t seq;
67064 struct sk_buff *skb;
67065 void *msg_head;
67066 int ret;
67067@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
67068 "VFS: Not enough memory to send quota warning.\n");
67069 return;
67070 }
67071- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
67072+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
67073 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
67074 if (!msg_head) {
67075 printk(KERN_ERR
67076diff --git a/fs/read_write.c b/fs/read_write.c
67077index 7d9318c..51b336f 100644
67078--- a/fs/read_write.c
67079+++ b/fs/read_write.c
67080@@ -495,7 +495,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
67081
67082 old_fs = get_fs();
67083 set_fs(get_ds());
67084- p = (__force const char __user *)buf;
67085+ p = (const char __force_user *)buf;
67086 if (count > MAX_RW_COUNT)
67087 count = MAX_RW_COUNT;
67088 if (file->f_op->write)
67089diff --git a/fs/readdir.c b/fs/readdir.c
67090index 33fd922..e0d6094 100644
67091--- a/fs/readdir.c
67092+++ b/fs/readdir.c
67093@@ -18,6 +18,7 @@
67094 #include <linux/security.h>
67095 #include <linux/syscalls.h>
67096 #include <linux/unistd.h>
67097+#include <linux/namei.h>
67098
67099 #include <asm/uaccess.h>
67100
67101@@ -71,6 +72,7 @@ struct old_linux_dirent {
67102 struct readdir_callback {
67103 struct dir_context ctx;
67104 struct old_linux_dirent __user * dirent;
67105+ struct file * file;
67106 int result;
67107 };
67108
67109@@ -88,6 +90,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
67110 buf->result = -EOVERFLOW;
67111 return -EOVERFLOW;
67112 }
67113+
67114+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67115+ return 0;
67116+
67117 buf->result++;
67118 dirent = buf->dirent;
67119 if (!access_ok(VERIFY_WRITE, dirent,
67120@@ -119,6 +125,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
67121 if (!f.file)
67122 return -EBADF;
67123
67124+ buf.file = f.file;
67125 error = iterate_dir(f.file, &buf.ctx);
67126 if (buf.result)
67127 error = buf.result;
67128@@ -144,6 +151,7 @@ struct getdents_callback {
67129 struct dir_context ctx;
67130 struct linux_dirent __user * current_dir;
67131 struct linux_dirent __user * previous;
67132+ struct file * file;
67133 int count;
67134 int error;
67135 };
67136@@ -165,6 +173,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
67137 buf->error = -EOVERFLOW;
67138 return -EOVERFLOW;
67139 }
67140+
67141+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67142+ return 0;
67143+
67144 dirent = buf->previous;
67145 if (dirent) {
67146 if (__put_user(offset, &dirent->d_off))
67147@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
67148 if (!f.file)
67149 return -EBADF;
67150
67151+ buf.file = f.file;
67152 error = iterate_dir(f.file, &buf.ctx);
67153 if (error >= 0)
67154 error = buf.error;
67155@@ -228,6 +241,7 @@ struct getdents_callback64 {
67156 struct dir_context ctx;
67157 struct linux_dirent64 __user * current_dir;
67158 struct linux_dirent64 __user * previous;
67159+ struct file *file;
67160 int count;
67161 int error;
67162 };
67163@@ -243,6 +257,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
67164 buf->error = -EINVAL; /* only used if we fail.. */
67165 if (reclen > buf->count)
67166 return -EINVAL;
67167+
67168+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67169+ return 0;
67170+
67171 dirent = buf->previous;
67172 if (dirent) {
67173 if (__put_user(offset, &dirent->d_off))
67174@@ -290,6 +308,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
67175 if (!f.file)
67176 return -EBADF;
67177
67178+ buf.file = f.file;
67179 error = iterate_dir(f.file, &buf.ctx);
67180 if (error >= 0)
67181 error = buf.error;
67182diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
67183index 9c02d96..6562c10 100644
67184--- a/fs/reiserfs/do_balan.c
67185+++ b/fs/reiserfs/do_balan.c
67186@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
67187 return;
67188 }
67189
67190- atomic_inc(&fs_generation(tb->tb_sb));
67191+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
67192 do_balance_starts(tb);
67193
67194 /*
67195diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
67196index aca73dd..e3c558d 100644
67197--- a/fs/reiserfs/item_ops.c
67198+++ b/fs/reiserfs/item_ops.c
67199@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
67200 }
67201
67202 static struct item_operations errcatch_ops = {
67203- errcatch_bytes_number,
67204- errcatch_decrement_key,
67205- errcatch_is_left_mergeable,
67206- errcatch_print_item,
67207- errcatch_check_item,
67208+ .bytes_number = errcatch_bytes_number,
67209+ .decrement_key = errcatch_decrement_key,
67210+ .is_left_mergeable = errcatch_is_left_mergeable,
67211+ .print_item = errcatch_print_item,
67212+ .check_item = errcatch_check_item,
67213
67214- errcatch_create_vi,
67215- errcatch_check_left,
67216- errcatch_check_right,
67217- errcatch_part_size,
67218- errcatch_unit_num,
67219- errcatch_print_vi
67220+ .create_vi = errcatch_create_vi,
67221+ .check_left = errcatch_check_left,
67222+ .check_right = errcatch_check_right,
67223+ .part_size = errcatch_part_size,
67224+ .unit_num = errcatch_unit_num,
67225+ .print_vi = errcatch_print_vi
67226 };
67227
67228 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
67229diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
67230index 621b9f3..af527fd 100644
67231--- a/fs/reiserfs/procfs.c
67232+++ b/fs/reiserfs/procfs.c
67233@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
67234 "SMALL_TAILS " : "NO_TAILS ",
67235 replay_only(sb) ? "REPLAY_ONLY " : "",
67236 convert_reiserfs(sb) ? "CONV " : "",
67237- atomic_read(&r->s_generation_counter),
67238+ atomic_read_unchecked(&r->s_generation_counter),
67239 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
67240 SF(s_do_balance), SF(s_unneeded_left_neighbor),
67241 SF(s_good_search_by_key_reada), SF(s_bmaps),
67242diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
67243index 1894d96..1dfd1c2 100644
67244--- a/fs/reiserfs/reiserfs.h
67245+++ b/fs/reiserfs/reiserfs.h
67246@@ -576,7 +576,7 @@ struct reiserfs_sb_info {
67247 /* Comment? -Hans */
67248 wait_queue_head_t s_wait;
67249 /* increased by one every time the tree gets re-balanced */
67250- atomic_t s_generation_counter;
67251+ atomic_unchecked_t s_generation_counter;
67252
67253 /* File system properties. Currently holds on-disk FS format */
67254 unsigned long s_properties;
67255@@ -2297,7 +2297,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
67256 #define REISERFS_USER_MEM 1 /* user memory mode */
67257
67258 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
67259-#define get_generation(s) atomic_read (&fs_generation(s))
67260+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
67261 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
67262 #define __fs_changed(gen,s) (gen != get_generation (s))
67263 #define fs_changed(gen,s) \
67264diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
67265index f1376c9..f9378e9 100644
67266--- a/fs/reiserfs/super.c
67267+++ b/fs/reiserfs/super.c
67268@@ -1857,6 +1857,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
67269 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
67270 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
67271 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
67272+#ifdef CONFIG_REISERFS_FS_XATTR
67273+ /* turn on user xattrs by default */
67274+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
67275+#endif
67276 /* no preallocation minimum, be smart in reiserfs_file_write instead */
67277 sbi->s_alloc_options.preallocmin = 0;
67278 /* Preallocate by 16 blocks (17-1) at once */
67279diff --git a/fs/select.c b/fs/select.c
67280index 467bb1c..cf9d65a 100644
67281--- a/fs/select.c
67282+++ b/fs/select.c
67283@@ -20,6 +20,7 @@
67284 #include <linux/export.h>
67285 #include <linux/slab.h>
67286 #include <linux/poll.h>
67287+#include <linux/security.h>
67288 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
67289 #include <linux/file.h>
67290 #include <linux/fdtable.h>
67291@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
67292 struct poll_list *walk = head;
67293 unsigned long todo = nfds;
67294
67295+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
67296 if (nfds > rlimit(RLIMIT_NOFILE))
67297 return -EINVAL;
67298
67299diff --git a/fs/seq_file.c b/fs/seq_file.c
67300index 3857b72..0b7281e 100644
67301--- a/fs/seq_file.c
67302+++ b/fs/seq_file.c
67303@@ -12,6 +12,8 @@
67304 #include <linux/slab.h>
67305 #include <linux/cred.h>
67306 #include <linux/mm.h>
67307+#include <linux/sched.h>
67308+#include <linux/grsecurity.h>
67309
67310 #include <asm/uaccess.h>
67311 #include <asm/page.h>
67312@@ -34,12 +36,7 @@ static void seq_set_overflow(struct seq_file *m)
67313
67314 static void *seq_buf_alloc(unsigned long size)
67315 {
67316- void *buf;
67317-
67318- buf = kmalloc(size, GFP_KERNEL | __GFP_NOWARN);
67319- if (!buf && size > PAGE_SIZE)
67320- buf = vmalloc(size);
67321- return buf;
67322+ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
67323 }
67324
67325 /**
67326@@ -72,6 +69,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
67327 #ifdef CONFIG_USER_NS
67328 p->user_ns = file->f_cred->user_ns;
67329 #endif
67330+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67331+ p->exec_id = current->exec_id;
67332+#endif
67333
67334 /*
67335 * Wrappers around seq_open(e.g. swaps_open) need to be
67336@@ -94,6 +94,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
67337 }
67338 EXPORT_SYMBOL(seq_open);
67339
67340+
67341+int seq_open_restrict(struct file *file, const struct seq_operations *op)
67342+{
67343+ if (gr_proc_is_restricted())
67344+ return -EACCES;
67345+
67346+ return seq_open(file, op);
67347+}
67348+EXPORT_SYMBOL(seq_open_restrict);
67349+
67350 static int traverse(struct seq_file *m, loff_t offset)
67351 {
67352 loff_t pos = 0, index;
67353@@ -165,7 +175,7 @@ Eoverflow:
67354 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
67355 {
67356 struct seq_file *m = file->private_data;
67357- size_t copied = 0;
67358+ ssize_t copied = 0;
67359 loff_t pos;
67360 size_t n;
67361 void *p;
67362@@ -596,7 +606,7 @@ static void single_stop(struct seq_file *p, void *v)
67363 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
67364 void *data)
67365 {
67366- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
67367+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
67368 int res = -ENOMEM;
67369
67370 if (op) {
67371@@ -632,6 +642,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
67372 }
67373 EXPORT_SYMBOL(single_open_size);
67374
67375+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
67376+ void *data)
67377+{
67378+ if (gr_proc_is_restricted())
67379+ return -EACCES;
67380+
67381+ return single_open(file, show, data);
67382+}
67383+EXPORT_SYMBOL(single_open_restrict);
67384+
67385+
67386 int single_release(struct inode *inode, struct file *file)
67387 {
67388 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
67389diff --git a/fs/splice.c b/fs/splice.c
67390index 75c6058..770d40c 100644
67391--- a/fs/splice.c
67392+++ b/fs/splice.c
67393@@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67394 pipe_lock(pipe);
67395
67396 for (;;) {
67397- if (!pipe->readers) {
67398+ if (!atomic_read(&pipe->readers)) {
67399 send_sig(SIGPIPE, current, 0);
67400 if (!ret)
67401 ret = -EPIPE;
67402@@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67403 page_nr++;
67404 ret += buf->len;
67405
67406- if (pipe->files)
67407+ if (atomic_read(&pipe->files))
67408 do_wakeup = 1;
67409
67410 if (!--spd->nr_pages)
67411@@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67412 do_wakeup = 0;
67413 }
67414
67415- pipe->waiting_writers++;
67416+ atomic_inc(&pipe->waiting_writers);
67417 pipe_wait(pipe);
67418- pipe->waiting_writers--;
67419+ atomic_dec(&pipe->waiting_writers);
67420 }
67421
67422 pipe_unlock(pipe);
67423@@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
67424 old_fs = get_fs();
67425 set_fs(get_ds());
67426 /* The cast to a user pointer is valid due to the set_fs() */
67427- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
67428+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
67429 set_fs(old_fs);
67430
67431 return res;
67432@@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
67433 old_fs = get_fs();
67434 set_fs(get_ds());
67435 /* The cast to a user pointer is valid due to the set_fs() */
67436- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
67437+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
67438 set_fs(old_fs);
67439
67440 return res;
67441@@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
67442 goto err;
67443
67444 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
67445- vec[i].iov_base = (void __user *) page_address(page);
67446+ vec[i].iov_base = (void __force_user *) page_address(page);
67447 vec[i].iov_len = this_len;
67448 spd.pages[i] = page;
67449 spd.nr_pages++;
67450@@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
67451 ops->release(pipe, buf);
67452 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
67453 pipe->nrbufs--;
67454- if (pipe->files)
67455+ if (atomic_read(&pipe->files))
67456 sd->need_wakeup = true;
67457 }
67458
67459@@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
67460 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
67461 {
67462 while (!pipe->nrbufs) {
67463- if (!pipe->writers)
67464+ if (!atomic_read(&pipe->writers))
67465 return 0;
67466
67467- if (!pipe->waiting_writers && sd->num_spliced)
67468+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
67469 return 0;
67470
67471 if (sd->flags & SPLICE_F_NONBLOCK)
67472@@ -1040,7 +1040,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
67473 ops->release(pipe, buf);
67474 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
67475 pipe->nrbufs--;
67476- if (pipe->files)
67477+ if (atomic_read(&pipe->files))
67478 sd.need_wakeup = true;
67479 } else {
67480 buf->offset += ret;
67481@@ -1200,7 +1200,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
67482 * out of the pipe right after the splice_to_pipe(). So set
67483 * PIPE_READERS appropriately.
67484 */
67485- pipe->readers = 1;
67486+ atomic_set(&pipe->readers, 1);
67487
67488 current->splice_pipe = pipe;
67489 }
67490@@ -1497,6 +1497,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
67491
67492 partial[buffers].offset = off;
67493 partial[buffers].len = plen;
67494+ partial[buffers].private = 0;
67495
67496 off = 0;
67497 len -= plen;
67498@@ -1733,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67499 ret = -ERESTARTSYS;
67500 break;
67501 }
67502- if (!pipe->writers)
67503+ if (!atomic_read(&pipe->writers))
67504 break;
67505- if (!pipe->waiting_writers) {
67506+ if (!atomic_read(&pipe->waiting_writers)) {
67507 if (flags & SPLICE_F_NONBLOCK) {
67508 ret = -EAGAIN;
67509 break;
67510@@ -1767,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67511 pipe_lock(pipe);
67512
67513 while (pipe->nrbufs >= pipe->buffers) {
67514- if (!pipe->readers) {
67515+ if (!atomic_read(&pipe->readers)) {
67516 send_sig(SIGPIPE, current, 0);
67517 ret = -EPIPE;
67518 break;
67519@@ -1780,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67520 ret = -ERESTARTSYS;
67521 break;
67522 }
67523- pipe->waiting_writers++;
67524+ atomic_inc(&pipe->waiting_writers);
67525 pipe_wait(pipe);
67526- pipe->waiting_writers--;
67527+ atomic_dec(&pipe->waiting_writers);
67528 }
67529
67530 pipe_unlock(pipe);
67531@@ -1818,14 +1819,14 @@ retry:
67532 pipe_double_lock(ipipe, opipe);
67533
67534 do {
67535- if (!opipe->readers) {
67536+ if (!atomic_read(&opipe->readers)) {
67537 send_sig(SIGPIPE, current, 0);
67538 if (!ret)
67539 ret = -EPIPE;
67540 break;
67541 }
67542
67543- if (!ipipe->nrbufs && !ipipe->writers)
67544+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
67545 break;
67546
67547 /*
67548@@ -1922,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
67549 pipe_double_lock(ipipe, opipe);
67550
67551 do {
67552- if (!opipe->readers) {
67553+ if (!atomic_read(&opipe->readers)) {
67554 send_sig(SIGPIPE, current, 0);
67555 if (!ret)
67556 ret = -EPIPE;
67557@@ -1967,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
67558 * return EAGAIN if we have the potential of some data in the
67559 * future, otherwise just return 0
67560 */
67561- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
67562+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
67563 ret = -EAGAIN;
67564
67565 pipe_unlock(ipipe);
67566diff --git a/fs/stat.c b/fs/stat.c
67567index ae0c3ce..9ee641c 100644
67568--- a/fs/stat.c
67569+++ b/fs/stat.c
67570@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
67571 stat->gid = inode->i_gid;
67572 stat->rdev = inode->i_rdev;
67573 stat->size = i_size_read(inode);
67574- stat->atime = inode->i_atime;
67575- stat->mtime = inode->i_mtime;
67576+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
67577+ stat->atime = inode->i_ctime;
67578+ stat->mtime = inode->i_ctime;
67579+ } else {
67580+ stat->atime = inode->i_atime;
67581+ stat->mtime = inode->i_mtime;
67582+ }
67583 stat->ctime = inode->i_ctime;
67584 stat->blksize = (1 << inode->i_blkbits);
67585 stat->blocks = inode->i_blocks;
67586@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
67587 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
67588 {
67589 struct inode *inode = path->dentry->d_inode;
67590+ int retval;
67591
67592- if (inode->i_op->getattr)
67593- return inode->i_op->getattr(path->mnt, path->dentry, stat);
67594+ if (inode->i_op->getattr) {
67595+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
67596+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
67597+ stat->atime = stat->ctime;
67598+ stat->mtime = stat->ctime;
67599+ }
67600+ return retval;
67601+ }
67602
67603 generic_fillattr(inode, stat);
67604 return 0;
67605diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
67606index 0b45ff4..847de5b 100644
67607--- a/fs/sysfs/dir.c
67608+++ b/fs/sysfs/dir.c
67609@@ -41,9 +41,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
67610 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
67611 {
67612 struct kernfs_node *parent, *kn;
67613+ const char *name;
67614+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
67615+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
67616+ const char *parent_name;
67617+#endif
67618
67619 BUG_ON(!kobj);
67620
67621+ name = kobject_name(kobj);
67622+
67623 if (kobj->parent)
67624 parent = kobj->parent->sd;
67625 else
67626@@ -52,11 +59,22 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
67627 if (!parent)
67628 return -ENOENT;
67629
67630- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
67631- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
67632+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
67633+ parent_name = parent->name;
67634+ mode = S_IRWXU;
67635+
67636+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
67637+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
67638+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
67639+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
67640+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
67641+#endif
67642+
67643+ kn = kernfs_create_dir_ns(parent, name,
67644+ mode, kobj, ns);
67645 if (IS_ERR(kn)) {
67646 if (PTR_ERR(kn) == -EEXIST)
67647- sysfs_warn_dup(parent, kobject_name(kobj));
67648+ sysfs_warn_dup(parent, name);
67649 return PTR_ERR(kn);
67650 }
67651
67652diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
67653index 69d4889..a810bd4 100644
67654--- a/fs/sysv/sysv.h
67655+++ b/fs/sysv/sysv.h
67656@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
67657 #endif
67658 }
67659
67660-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
67661+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
67662 {
67663 if (sbi->s_bytesex == BYTESEX_PDP)
67664 return PDP_swab((__force __u32)n);
67665diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
67666index fb08b0c..65fcc7e 100644
67667--- a/fs/ubifs/io.c
67668+++ b/fs/ubifs/io.c
67669@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
67670 return err;
67671 }
67672
67673-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
67674+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
67675 {
67676 int err;
67677
67678diff --git a/fs/udf/misc.c b/fs/udf/misc.c
67679index c175b4d..8f36a16 100644
67680--- a/fs/udf/misc.c
67681+++ b/fs/udf/misc.c
67682@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
67683
67684 u8 udf_tag_checksum(const struct tag *t)
67685 {
67686- u8 *data = (u8 *)t;
67687+ const u8 *data = (const u8 *)t;
67688 u8 checksum = 0;
67689 int i;
67690 for (i = 0; i < sizeof(struct tag); ++i)
67691diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
67692index 8d974c4..b82f6ec 100644
67693--- a/fs/ufs/swab.h
67694+++ b/fs/ufs/swab.h
67695@@ -22,7 +22,7 @@ enum {
67696 BYTESEX_BE
67697 };
67698
67699-static inline u64
67700+static inline u64 __intentional_overflow(-1)
67701 fs64_to_cpu(struct super_block *sbp, __fs64 n)
67702 {
67703 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
67704@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
67705 return (__force __fs64)cpu_to_be64(n);
67706 }
67707
67708-static inline u32
67709+static inline u32 __intentional_overflow(-1)
67710 fs32_to_cpu(struct super_block *sbp, __fs32 n)
67711 {
67712 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
67713diff --git a/fs/utimes.c b/fs/utimes.c
67714index aa138d6..5f3a811 100644
67715--- a/fs/utimes.c
67716+++ b/fs/utimes.c
67717@@ -1,6 +1,7 @@
67718 #include <linux/compiler.h>
67719 #include <linux/file.h>
67720 #include <linux/fs.h>
67721+#include <linux/security.h>
67722 #include <linux/linkage.h>
67723 #include <linux/mount.h>
67724 #include <linux/namei.h>
67725@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
67726 }
67727 }
67728 retry_deleg:
67729+
67730+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
67731+ error = -EACCES;
67732+ goto mnt_drop_write_and_out;
67733+ }
67734+
67735 mutex_lock(&inode->i_mutex);
67736 error = notify_change(path->dentry, &newattrs, &delegated_inode);
67737 mutex_unlock(&inode->i_mutex);
67738diff --git a/fs/xattr.c b/fs/xattr.c
67739index 64e83ef..b6be154 100644
67740--- a/fs/xattr.c
67741+++ b/fs/xattr.c
67742@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
67743 return rc;
67744 }
67745
67746+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
67747+ssize_t
67748+pax_getxattr(struct dentry *dentry, void *value, size_t size)
67749+{
67750+ struct inode *inode = dentry->d_inode;
67751+ ssize_t error;
67752+
67753+ error = inode_permission(inode, MAY_EXEC);
67754+ if (error)
67755+ return error;
67756+
67757+ if (inode->i_op->getxattr)
67758+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
67759+ else
67760+ error = -EOPNOTSUPP;
67761+
67762+ return error;
67763+}
67764+EXPORT_SYMBOL(pax_getxattr);
67765+#endif
67766+
67767 ssize_t
67768 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
67769 {
67770@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
67771 * Extended attribute SET operations
67772 */
67773 static long
67774-setxattr(struct dentry *d, const char __user *name, const void __user *value,
67775+setxattr(struct path *path, const char __user *name, const void __user *value,
67776 size_t size, int flags)
67777 {
67778 int error;
67779@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
67780 posix_acl_fix_xattr_from_user(kvalue, size);
67781 }
67782
67783- error = vfs_setxattr(d, kname, kvalue, size, flags);
67784+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
67785+ error = -EACCES;
67786+ goto out;
67787+ }
67788+
67789+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
67790 out:
67791 if (vvalue)
67792 vfree(vvalue);
67793@@ -376,7 +402,7 @@ retry:
67794 return error;
67795 error = mnt_want_write(path.mnt);
67796 if (!error) {
67797- error = setxattr(path.dentry, name, value, size, flags);
67798+ error = setxattr(&path, name, value, size, flags);
67799 mnt_drop_write(path.mnt);
67800 }
67801 path_put(&path);
67802@@ -405,16 +431,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
67803 const void __user *,value, size_t, size, int, flags)
67804 {
67805 struct fd f = fdget(fd);
67806- struct dentry *dentry;
67807 int error = -EBADF;
67808
67809 if (!f.file)
67810 return error;
67811- dentry = f.file->f_path.dentry;
67812- audit_inode(NULL, dentry, 0);
67813+ audit_inode(NULL, f.file->f_path.dentry, 0);
67814 error = mnt_want_write_file(f.file);
67815 if (!error) {
67816- error = setxattr(dentry, name, value, size, flags);
67817+ error = setxattr(&f.file->f_path, name, value, size, flags);
67818 mnt_drop_write_file(f.file);
67819 }
67820 fdput(f);
67821@@ -600,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
67822 * Extended attribute REMOVE operations
67823 */
67824 static long
67825-removexattr(struct dentry *d, const char __user *name)
67826+removexattr(struct path *path, const char __user *name)
67827 {
67828 int error;
67829 char kname[XATTR_NAME_MAX + 1];
67830@@ -611,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
67831 if (error < 0)
67832 return error;
67833
67834- return vfs_removexattr(d, kname);
67835+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
67836+ return -EACCES;
67837+
67838+ return vfs_removexattr(path->dentry, kname);
67839 }
67840
67841 static int path_removexattr(const char __user *pathname,
67842@@ -625,7 +652,7 @@ retry:
67843 return error;
67844 error = mnt_want_write(path.mnt);
67845 if (!error) {
67846- error = removexattr(path.dentry, name);
67847+ error = removexattr(&path, name);
67848 mnt_drop_write(path.mnt);
67849 }
67850 path_put(&path);
67851@@ -651,16 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
67852 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
67853 {
67854 struct fd f = fdget(fd);
67855- struct dentry *dentry;
67856+ struct path *path;
67857 int error = -EBADF;
67858
67859 if (!f.file)
67860 return error;
67861- dentry = f.file->f_path.dentry;
67862- audit_inode(NULL, dentry, 0);
67863+ path = &f.file->f_path;
67864+ audit_inode(NULL, path->dentry, 0);
67865 error = mnt_want_write_file(f.file);
67866 if (!error) {
67867- error = removexattr(dentry, name);
67868+ error = removexattr(path, name);
67869 mnt_drop_write_file(f.file);
67870 }
67871 fdput(f);
67872diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
67873index 79c9819..22226b4 100644
67874--- a/fs/xfs/libxfs/xfs_bmap.c
67875+++ b/fs/xfs/libxfs/xfs_bmap.c
67876@@ -583,7 +583,7 @@ xfs_bmap_validate_ret(
67877
67878 #else
67879 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
67880-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
67881+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
67882 #endif /* DEBUG */
67883
67884 /*
67885diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
67886index f1b69ed..3d0222f 100644
67887--- a/fs/xfs/xfs_dir2_readdir.c
67888+++ b/fs/xfs/xfs_dir2_readdir.c
67889@@ -159,7 +159,12 @@ xfs_dir2_sf_getdents(
67890 ino = dp->d_ops->sf_get_ino(sfp, sfep);
67891 filetype = dp->d_ops->sf_get_ftype(sfep);
67892 ctx->pos = off & 0x7fffffff;
67893- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
67894+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
67895+ char name[sfep->namelen];
67896+ memcpy(name, sfep->name, sfep->namelen);
67897+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
67898+ return 0;
67899+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
67900 xfs_dir3_get_dtype(dp->i_mount, filetype)))
67901 return 0;
67902 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
67903diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
67904index 24c926b6..8726af88 100644
67905--- a/fs/xfs/xfs_ioctl.c
67906+++ b/fs/xfs/xfs_ioctl.c
67907@@ -122,7 +122,7 @@ xfs_find_handle(
67908 }
67909
67910 error = -EFAULT;
67911- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
67912+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
67913 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
67914 goto out_put;
67915
67916diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
67917index 6a51619..9592e1b 100644
67918--- a/fs/xfs/xfs_linux.h
67919+++ b/fs/xfs/xfs_linux.h
67920@@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
67921 * of the compiler which do not like us using do_div in the middle
67922 * of large functions.
67923 */
67924-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
67925+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
67926 {
67927 __u32 mod;
67928
67929@@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
67930 return 0;
67931 }
67932 #else
67933-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
67934+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
67935 {
67936 __u32 mod;
67937
67938diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
67939new file mode 100644
67940index 0000000..f27264e
67941--- /dev/null
67942+++ b/grsecurity/Kconfig
67943@@ -0,0 +1,1166 @@
67944+#
67945+# grecurity configuration
67946+#
67947+menu "Memory Protections"
67948+depends on GRKERNSEC
67949+
67950+config GRKERNSEC_KMEM
67951+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
67952+ default y if GRKERNSEC_CONFIG_AUTO
67953+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
67954+ help
67955+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
67956+ be written to or read from to modify or leak the contents of the running
67957+ kernel. /dev/port will also not be allowed to be opened, writing to
67958+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
67959+ If you have module support disabled, enabling this will close up several
67960+ ways that are currently used to insert malicious code into the running
67961+ kernel.
67962+
67963+ Even with this feature enabled, we still highly recommend that
67964+ you use the RBAC system, as it is still possible for an attacker to
67965+ modify the running kernel through other more obscure methods.
67966+
67967+ It is highly recommended that you say Y here if you meet all the
67968+ conditions above.
67969+
67970+config GRKERNSEC_VM86
67971+ bool "Restrict VM86 mode"
67972+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
67973+ depends on X86_32
67974+
67975+ help
67976+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
67977+ make use of a special execution mode on 32bit x86 processors called
67978+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
67979+ video cards and will still work with this option enabled. The purpose
67980+ of the option is to prevent exploitation of emulation errors in
67981+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
67982+ Nearly all users should be able to enable this option.
67983+
67984+config GRKERNSEC_IO
67985+ bool "Disable privileged I/O"
67986+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
67987+ depends on X86
67988+ select RTC_CLASS
67989+ select RTC_INTF_DEV
67990+ select RTC_DRV_CMOS
67991+
67992+ help
67993+ If you say Y here, all ioperm and iopl calls will return an error.
67994+ Ioperm and iopl can be used to modify the running kernel.
67995+ Unfortunately, some programs need this access to operate properly,
67996+ the most notable of which are XFree86 and hwclock. hwclock can be
67997+ remedied by having RTC support in the kernel, so real-time
67998+ clock support is enabled if this option is enabled, to ensure
67999+ that hwclock operates correctly. If hwclock still does not work,
68000+ either update udev or symlink /dev/rtc to /dev/rtc0.
68001+
68002+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
68003+ you may not be able to boot into a graphical environment with this
68004+ option enabled. In this case, you should use the RBAC system instead.
68005+
68006+config GRKERNSEC_BPF_HARDEN
68007+ bool "Harden BPF interpreter"
68008+ default y if GRKERNSEC_CONFIG_AUTO
68009+ help
68010+ Unlike previous versions of grsecurity that hardened both the BPF
68011+ interpreted code against corruption at rest as well as the JIT code
68012+ against JIT-spray attacks and attacker-controlled immediate values
68013+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
68014+ and will ensure the interpreted code is read-only at rest. This feature
68015+ may be removed at a later time when eBPF stabilizes to entirely revert
68016+ back to the more secure pre-3.16 BPF interpreter/JIT.
68017+
68018+ If you're using KERNEXEC, it's recommended that you enable this option
68019+ to supplement the hardening of the kernel.
68020+
68021+config GRKERNSEC_PERF_HARDEN
68022+ bool "Disable unprivileged PERF_EVENTS usage by default"
68023+ default y if GRKERNSEC_CONFIG_AUTO
68024+ depends on PERF_EVENTS
68025+ help
68026+ If you say Y here, the range of acceptable values for the
68027+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
68028+ default to a new value: 3. When the sysctl is set to this value, no
68029+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
68030+
68031+ Though PERF_EVENTS can be used legitimately for performance monitoring
68032+ and low-level application profiling, it is forced on regardless of
68033+ configuration, has been at fault for several vulnerabilities, and
68034+ creates new opportunities for side channels and other information leaks.
68035+
68036+ This feature puts PERF_EVENTS into a secure default state and permits
68037+ the administrator to change out of it temporarily if unprivileged
68038+ application profiling is needed.
68039+
68040+config GRKERNSEC_RAND_THREADSTACK
68041+ bool "Insert random gaps between thread stacks"
68042+ default y if GRKERNSEC_CONFIG_AUTO
68043+ depends on PAX_RANDMMAP && !PPC
68044+ help
68045+ If you say Y here, a random-sized gap will be enforced between allocated
68046+ thread stacks. Glibc's NPTL and other threading libraries that
68047+ pass MAP_STACK to the kernel for thread stack allocation are supported.
68048+ The implementation currently provides 8 bits of entropy for the gap.
68049+
68050+ Many distributions do not compile threaded remote services with the
68051+ -fstack-check argument to GCC, causing the variable-sized stack-based
68052+ allocator, alloca(), to not probe the stack on allocation. This
68053+ permits an unbounded alloca() to skip over any guard page and potentially
68054+ modify another thread's stack reliably. An enforced random gap
68055+ reduces the reliability of such an attack and increases the chance
68056+ that such a read/write to another thread's stack instead lands in
68057+ an unmapped area, causing a crash and triggering grsecurity's
68058+ anti-bruteforcing logic.
68059+
68060+config GRKERNSEC_PROC_MEMMAP
68061+ bool "Harden ASLR against information leaks and entropy reduction"
68062+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
68063+ depends on PAX_NOEXEC || PAX_ASLR
68064+ help
68065+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
68066+ give no information about the addresses of its mappings if
68067+ PaX features that rely on random addresses are enabled on the task.
68068+ In addition to sanitizing this information and disabling other
68069+ dangerous sources of information, this option causes reads of sensitive
68070+ /proc/<pid> entries where the file descriptor was opened in a different
68071+ task than the one performing the read. Such attempts are logged.
68072+ This option also limits argv/env strings for suid/sgid binaries
68073+ to 512KB to prevent a complete exhaustion of the stack entropy provided
68074+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
68075+ binaries to prevent alternative mmap layouts from being abused.
68076+
68077+ If you use PaX it is essential that you say Y here as it closes up
68078+ several holes that make full ASLR useless locally.
68079+
68080+
68081+config GRKERNSEC_KSTACKOVERFLOW
68082+ bool "Prevent kernel stack overflows"
68083+ default y if GRKERNSEC_CONFIG_AUTO
68084+ depends on !IA64 && 64BIT
68085+ help
68086+ If you say Y here, the kernel's process stacks will be allocated
68087+ with vmalloc instead of the kernel's default allocator. This
68088+ introduces guard pages that in combination with the alloca checking
68089+ of the STACKLEAK feature prevents all forms of kernel process stack
68090+ overflow abuse. Note that this is different from kernel stack
68091+ buffer overflows.
68092+
68093+config GRKERNSEC_BRUTE
68094+ bool "Deter exploit bruteforcing"
68095+ default y if GRKERNSEC_CONFIG_AUTO
68096+ help
68097+ If you say Y here, attempts to bruteforce exploits against forking
68098+ daemons such as apache or sshd, as well as against suid/sgid binaries
68099+ will be deterred. When a child of a forking daemon is killed by PaX
68100+ or crashes due to an illegal instruction or other suspicious signal,
68101+ the parent process will be delayed 30 seconds upon every subsequent
68102+ fork until the administrator is able to assess the situation and
68103+ restart the daemon.
68104+ In the suid/sgid case, the attempt is logged, the user has all their
68105+ existing instances of the suid/sgid binary terminated and will
68106+ be unable to execute any suid/sgid binaries for 15 minutes.
68107+
68108+ It is recommended that you also enable signal logging in the auditing
68109+ section so that logs are generated when a process triggers a suspicious
68110+ signal.
68111+ If the sysctl option is enabled, a sysctl option with name
68112+ "deter_bruteforce" is created.
68113+
68114+config GRKERNSEC_MODHARDEN
68115+ bool "Harden module auto-loading"
68116+ default y if GRKERNSEC_CONFIG_AUTO
68117+ depends on MODULES
68118+ help
68119+ If you say Y here, module auto-loading in response to use of some
68120+ feature implemented by an unloaded module will be restricted to
68121+ root users. Enabling this option helps defend against attacks
68122+ by unprivileged users who abuse the auto-loading behavior to
68123+ cause a vulnerable module to load that is then exploited.
68124+
68125+ If this option prevents a legitimate use of auto-loading for a
68126+ non-root user, the administrator can execute modprobe manually
68127+ with the exact name of the module mentioned in the alert log.
68128+ Alternatively, the administrator can add the module to the list
68129+ of modules loaded at boot by modifying init scripts.
68130+
68131+ Modification of init scripts will most likely be needed on
68132+ Ubuntu servers with encrypted home directory support enabled,
68133+ as the first non-root user logging in will cause the ecb(aes),
68134+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
68135+
68136+config GRKERNSEC_HIDESYM
68137+ bool "Hide kernel symbols"
68138+ default y if GRKERNSEC_CONFIG_AUTO
68139+ select PAX_USERCOPY_SLABS
68140+ help
68141+ If you say Y here, getting information on loaded modules, and
68142+ displaying all kernel symbols through a syscall will be restricted
68143+ to users with CAP_SYS_MODULE. For software compatibility reasons,
68144+ /proc/kallsyms will be restricted to the root user. The RBAC
68145+ system can hide that entry even from root.
68146+
68147+ This option also prevents leaking of kernel addresses through
68148+ several /proc entries.
68149+
68150+ Note that this option is only effective provided the following
68151+ conditions are met:
68152+ 1) The kernel using grsecurity is not precompiled by some distribution
68153+ 2) You have also enabled GRKERNSEC_DMESG
68154+ 3) You are using the RBAC system and hiding other files such as your
68155+ kernel image and System.map. Alternatively, enabling this option
68156+ causes the permissions on /boot, /lib/modules, and the kernel
68157+ source directory to change at compile time to prevent
68158+ reading by non-root users.
68159+ If the above conditions are met, this option will aid in providing a
68160+ useful protection against local kernel exploitation of overflows
68161+ and arbitrary read/write vulnerabilities.
68162+
68163+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
68164+ in addition to this feature.
68165+
68166+config GRKERNSEC_RANDSTRUCT
68167+ bool "Randomize layout of sensitive kernel structures"
68168+ default y if GRKERNSEC_CONFIG_AUTO
68169+ select GRKERNSEC_HIDESYM
68170+ select MODVERSIONS if MODULES
68171+ help
68172+ If you say Y here, the layouts of a number of sensitive kernel
68173+ structures (task, fs, cred, etc) and all structures composed entirely
68174+ of function pointers (aka "ops" structs) will be randomized at compile-time.
68175+ This can introduce the requirement of an additional infoleak
68176+ vulnerability for exploits targeting these structure types.
68177+
68178+ Enabling this feature will introduce some performance impact, slightly
68179+ increase memory usage, and prevent the use of forensic tools like
68180+ Volatility against the system (unless the kernel source tree isn't
68181+ cleaned after kernel installation).
68182+
68183+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
68184+ It remains after a make clean to allow for external modules to be compiled
68185+ with the existing seed and will be removed by a make mrproper or
68186+ make distclean.
68187+
68188+ Note that the implementation requires gcc 4.6.4. or newer. You may need
68189+ to install the supporting headers explicitly in addition to the normal
68190+ gcc package.
68191+
68192+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
68193+ bool "Use cacheline-aware structure randomization"
68194+ depends on GRKERNSEC_RANDSTRUCT
68195+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
68196+ help
68197+ If you say Y here, the RANDSTRUCT randomization will make a best effort
68198+ at restricting randomization to cacheline-sized groups of elements. It
68199+ will further not randomize bitfields in structures. This reduces the
68200+ performance hit of RANDSTRUCT at the cost of weakened randomization.
68201+
68202+config GRKERNSEC_KERN_LOCKOUT
68203+ bool "Active kernel exploit response"
68204+ default y if GRKERNSEC_CONFIG_AUTO
68205+ depends on X86 || ARM || PPC || SPARC
68206+ help
68207+ If you say Y here, when a PaX alert is triggered due to suspicious
68208+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
68209+ or an OOPS occurs due to bad memory accesses, instead of just
68210+ terminating the offending process (and potentially allowing
68211+ a subsequent exploit from the same user), we will take one of two
68212+ actions:
68213+ If the user was root, we will panic the system
68214+ If the user was non-root, we will log the attempt, terminate
68215+ all processes owned by the user, then prevent them from creating
68216+ any new processes until the system is restarted
68217+ This deters repeated kernel exploitation/bruteforcing attempts
68218+ and is useful for later forensics.
68219+
68220+config GRKERNSEC_OLD_ARM_USERLAND
68221+ bool "Old ARM userland compatibility"
68222+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
68223+ help
68224+ If you say Y here, stubs of executable code to perform such operations
68225+ as "compare-exchange" will be placed at fixed locations in the ARM vector
68226+ table. This is unfortunately needed for old ARM userland meant to run
68227+ across a wide range of processors. Without this option enabled,
68228+ the get_tls and data memory barrier stubs will be emulated by the kernel,
68229+ which is enough for Linaro userlands or other userlands designed for v6
68230+ and newer ARM CPUs. It's recommended that you try without this option enabled
68231+ first, and only enable it if your userland does not boot (it will likely fail
68232+ at init time).
68233+
68234+endmenu
68235+menu "Role Based Access Control Options"
68236+depends on GRKERNSEC
68237+
68238+config GRKERNSEC_RBAC_DEBUG
68239+ bool
68240+
68241+config GRKERNSEC_NO_RBAC
68242+ bool "Disable RBAC system"
68243+ help
68244+ If you say Y here, the /dev/grsec device will be removed from the kernel,
68245+ preventing the RBAC system from being enabled. You should only say Y
68246+ here if you have no intention of using the RBAC system, so as to prevent
68247+ an attacker with root access from misusing the RBAC system to hide files
68248+ and processes when loadable module support and /dev/[k]mem have been
68249+ locked down.
68250+
68251+config GRKERNSEC_ACL_HIDEKERN
68252+ bool "Hide kernel processes"
68253+ help
68254+ If you say Y here, all kernel threads will be hidden to all
68255+ processes but those whose subject has the "view hidden processes"
68256+ flag.
68257+
68258+config GRKERNSEC_ACL_MAXTRIES
68259+ int "Maximum tries before password lockout"
68260+ default 3
68261+ help
68262+ This option enforces the maximum number of times a user can attempt
68263+ to authorize themselves with the grsecurity RBAC system before being
68264+ denied the ability to attempt authorization again for a specified time.
68265+ The lower the number, the harder it will be to brute-force a password.
68266+
68267+config GRKERNSEC_ACL_TIMEOUT
68268+ int "Time to wait after max password tries, in seconds"
68269+ default 30
68270+ help
68271+ This option specifies the time the user must wait after attempting to
68272+ authorize to the RBAC system with the maximum number of invalid
68273+ passwords. The higher the number, the harder it will be to brute-force
68274+ a password.
68275+
68276+endmenu
68277+menu "Filesystem Protections"
68278+depends on GRKERNSEC
68279+
68280+config GRKERNSEC_PROC
68281+ bool "Proc restrictions"
68282+ default y if GRKERNSEC_CONFIG_AUTO
68283+ help
68284+ If you say Y here, the permissions of the /proc filesystem
68285+ will be altered to enhance system security and privacy. You MUST
68286+ choose either a user only restriction or a user and group restriction.
68287+ Depending upon the option you choose, you can either restrict users to
68288+ see only the processes they themselves run, or choose a group that can
68289+ view all processes and files normally restricted to root if you choose
68290+ the "restrict to user only" option. NOTE: If you're running identd or
68291+ ntpd as a non-root user, you will have to run it as the group you
68292+ specify here.
68293+
68294+config GRKERNSEC_PROC_USER
68295+ bool "Restrict /proc to user only"
68296+ depends on GRKERNSEC_PROC
68297+ help
68298+ If you say Y here, non-root users will only be able to view their own
68299+ processes, and restricts them from viewing network-related information,
68300+ and viewing kernel symbol and module information.
68301+
68302+config GRKERNSEC_PROC_USERGROUP
68303+ bool "Allow special group"
68304+ default y if GRKERNSEC_CONFIG_AUTO
68305+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
68306+ help
68307+ If you say Y here, you will be able to select a group that will be
68308+ able to view all processes and network-related information. If you've
68309+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
68310+ remain hidden. This option is useful if you want to run identd as
68311+ a non-root user. The group you select may also be chosen at boot time
68312+ via "grsec_proc_gid=" on the kernel commandline.
68313+
68314+config GRKERNSEC_PROC_GID
68315+ int "GID for special group"
68316+ depends on GRKERNSEC_PROC_USERGROUP
68317+ default 1001
68318+
68319+config GRKERNSEC_PROC_ADD
68320+ bool "Additional restrictions"
68321+ default y if GRKERNSEC_CONFIG_AUTO
68322+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
68323+ help
68324+ If you say Y here, additional restrictions will be placed on
68325+ /proc that keep normal users from viewing device information and
68326+ slabinfo information that could be useful for exploits.
68327+
68328+config GRKERNSEC_LINK
68329+ bool "Linking restrictions"
68330+ default y if GRKERNSEC_CONFIG_AUTO
68331+ help
68332+ If you say Y here, /tmp race exploits will be prevented, since users
68333+ will no longer be able to follow symlinks owned by other users in
68334+ world-writable +t directories (e.g. /tmp), unless the owner of the
68335+ symlink is the owner of the directory. users will also not be
68336+ able to hardlink to files they do not own. If the sysctl option is
68337+ enabled, a sysctl option with name "linking_restrictions" is created.
68338+
68339+config GRKERNSEC_SYMLINKOWN
68340+ bool "Kernel-enforced SymlinksIfOwnerMatch"
68341+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
68342+ help
68343+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
68344+ that prevents it from being used as a security feature. As Apache
68345+ verifies the symlink by performing a stat() against the target of
68346+ the symlink before it is followed, an attacker can setup a symlink
68347+ to point to a same-owned file, then replace the symlink with one
68348+ that targets another user's file just after Apache "validates" the
68349+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
68350+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
68351+ will be in place for the group you specify. If the sysctl option
68352+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
68353+ created.
68354+
68355+config GRKERNSEC_SYMLINKOWN_GID
68356+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
68357+ depends on GRKERNSEC_SYMLINKOWN
68358+ default 1006
68359+ help
68360+ Setting this GID determines what group kernel-enforced
68361+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
68362+ is enabled, a sysctl option with name "symlinkown_gid" is created.
68363+
68364+config GRKERNSEC_FIFO
68365+ bool "FIFO restrictions"
68366+ default y if GRKERNSEC_CONFIG_AUTO
68367+ help
68368+ If you say Y here, users will not be able to write to FIFOs they don't
68369+ own in world-writable +t directories (e.g. /tmp), unless the owner of
68370+ the FIFO is the same owner of the directory it's held in. If the sysctl
68371+ option is enabled, a sysctl option with name "fifo_restrictions" is
68372+ created.
68373+
68374+config GRKERNSEC_SYSFS_RESTRICT
68375+ bool "Sysfs/debugfs restriction"
68376+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68377+ depends on SYSFS
68378+ help
68379+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
68380+ any filesystem normally mounted under it (e.g. debugfs) will be
68381+ mostly accessible only by root. These filesystems generally provide access
68382+ to hardware and debug information that isn't appropriate for unprivileged
68383+ users of the system. Sysfs and debugfs have also become a large source
68384+ of new vulnerabilities, ranging from infoleaks to local compromise.
68385+ There has been very little oversight with an eye toward security involved
68386+ in adding new exporters of information to these filesystems, so their
68387+ use is discouraged.
68388+ For reasons of compatibility, a few directories have been whitelisted
68389+ for access by non-root users:
68390+ /sys/fs/selinux
68391+ /sys/fs/fuse
68392+ /sys/devices/system/cpu
68393+
68394+config GRKERNSEC_ROFS
68395+ bool "Runtime read-only mount protection"
68396+ depends on SYSCTL
68397+ help
68398+ If you say Y here, a sysctl option with name "romount_protect" will
68399+ be created. By setting this option to 1 at runtime, filesystems
68400+ will be protected in the following ways:
68401+ * No new writable mounts will be allowed
68402+ * Existing read-only mounts won't be able to be remounted read/write
68403+ * Write operations will be denied on all block devices
68404+ This option acts independently of grsec_lock: once it is set to 1,
68405+ it cannot be turned off. Therefore, please be mindful of the resulting
68406+ behavior if this option is enabled in an init script on a read-only
68407+ filesystem.
68408+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
68409+ and GRKERNSEC_IO should be enabled and module loading disabled via
68410+ config or at runtime.
68411+ This feature is mainly intended for secure embedded systems.
68412+
68413+
68414+config GRKERNSEC_DEVICE_SIDECHANNEL
68415+ bool "Eliminate stat/notify-based device sidechannels"
68416+ default y if GRKERNSEC_CONFIG_AUTO
68417+ help
68418+ If you say Y here, timing analyses on block or character
68419+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
68420+ will be thwarted for unprivileged users. If a process without
68421+ CAP_MKNOD stats such a device, the last access and last modify times
68422+ will match the device's create time. No access or modify events
68423+ will be triggered through inotify/dnotify/fanotify for such devices.
68424+ This feature will prevent attacks that may at a minimum
68425+ allow an attacker to determine the administrator's password length.
68426+
68427+config GRKERNSEC_CHROOT
68428+ bool "Chroot jail restrictions"
68429+ default y if GRKERNSEC_CONFIG_AUTO
68430+ help
68431+ If you say Y here, you will be able to choose several options that will
68432+ make breaking out of a chrooted jail much more difficult. If you
68433+ encounter no software incompatibilities with the following options, it
68434+ is recommended that you enable each one.
68435+
68436+ Note that the chroot restrictions are not intended to apply to "chroots"
68437+ to directories that are simple bind mounts of the global root filesystem.
68438+ For several other reasons, a user shouldn't expect any significant
68439+ security by performing such a chroot.
68440+
68441+config GRKERNSEC_CHROOT_MOUNT
68442+ bool "Deny mounts"
68443+ default y if GRKERNSEC_CONFIG_AUTO
68444+ depends on GRKERNSEC_CHROOT
68445+ help
68446+ If you say Y here, processes inside a chroot will not be able to
68447+ mount or remount filesystems. If the sysctl option is enabled, a
68448+ sysctl option with name "chroot_deny_mount" is created.
68449+
68450+config GRKERNSEC_CHROOT_DOUBLE
68451+ bool "Deny double-chroots"
68452+ default y if GRKERNSEC_CONFIG_AUTO
68453+ depends on GRKERNSEC_CHROOT
68454+ help
68455+ If you say Y here, processes inside a chroot will not be able to chroot
68456+ again outside the chroot. This is a widely used method of breaking
68457+ out of a chroot jail and should not be allowed. If the sysctl
68458+ option is enabled, a sysctl option with name
68459+ "chroot_deny_chroot" is created.
68460+
68461+config GRKERNSEC_CHROOT_PIVOT
68462+ bool "Deny pivot_root in chroot"
68463+ default y if GRKERNSEC_CONFIG_AUTO
68464+ depends on GRKERNSEC_CHROOT
68465+ help
68466+ If you say Y here, processes inside a chroot will not be able to use
68467+ a function called pivot_root() that was introduced in Linux 2.3.41. It
68468+ works similar to chroot in that it changes the root filesystem. This
68469+ function could be misused in a chrooted process to attempt to break out
68470+ of the chroot, and therefore should not be allowed. If the sysctl
68471+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
68472+ created.
68473+
68474+config GRKERNSEC_CHROOT_CHDIR
68475+ bool "Enforce chdir(\"/\") on all chroots"
68476+ default y if GRKERNSEC_CONFIG_AUTO
68477+ depends on GRKERNSEC_CHROOT
68478+ help
68479+ If you say Y here, the current working directory of all newly-chrooted
68480+ applications will be set to the the root directory of the chroot.
68481+ The man page on chroot(2) states:
68482+ Note that this call does not change the current working
68483+ directory, so that `.' can be outside the tree rooted at
68484+ `/'. In particular, the super-user can escape from a
68485+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
68486+
68487+ It is recommended that you say Y here, since it's not known to break
68488+ any software. If the sysctl option is enabled, a sysctl option with
68489+ name "chroot_enforce_chdir" is created.
68490+
68491+config GRKERNSEC_CHROOT_CHMOD
68492+ bool "Deny (f)chmod +s"
68493+ default y if GRKERNSEC_CONFIG_AUTO
68494+ depends on GRKERNSEC_CHROOT
68495+ help
68496+ If you say Y here, processes inside a chroot will not be able to chmod
68497+ or fchmod files to make them have suid or sgid bits. This protects
68498+ against another published method of breaking a chroot. If the sysctl
68499+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
68500+ created.
68501+
68502+config GRKERNSEC_CHROOT_FCHDIR
68503+ bool "Deny fchdir and fhandle out of chroot"
68504+ default y if GRKERNSEC_CONFIG_AUTO
68505+ depends on GRKERNSEC_CHROOT
68506+ help
68507+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
68508+ to a file descriptor of the chrooting process that points to a directory
68509+ outside the filesystem will be stopped. Additionally, this option prevents
68510+ use of the recently-created syscall for opening files by a guessable "file
68511+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
68512+ with name "chroot_deny_fchdir" is created.
68513+
68514+config GRKERNSEC_CHROOT_MKNOD
68515+ bool "Deny mknod"
68516+ default y if GRKERNSEC_CONFIG_AUTO
68517+ depends on GRKERNSEC_CHROOT
68518+ help
68519+ If you say Y here, processes inside a chroot will not be allowed to
68520+ mknod. The problem with using mknod inside a chroot is that it
68521+ would allow an attacker to create a device entry that is the same
68522+ as one on the physical root of your system, which could range from
68523+ anything from the console device to a device for your harddrive (which
68524+ they could then use to wipe the drive or steal data). It is recommended
68525+ that you say Y here, unless you run into software incompatibilities.
68526+ If the sysctl option is enabled, a sysctl option with name
68527+ "chroot_deny_mknod" is created.
68528+
68529+config GRKERNSEC_CHROOT_SHMAT
68530+ bool "Deny shmat() out of chroot"
68531+ default y if GRKERNSEC_CONFIG_AUTO
68532+ depends on GRKERNSEC_CHROOT
68533+ help
68534+ If you say Y here, processes inside a chroot will not be able to attach
68535+ to shared memory segments that were created outside of the chroot jail.
68536+ It is recommended that you say Y here. If the sysctl option is enabled,
68537+ a sysctl option with name "chroot_deny_shmat" is created.
68538+
68539+config GRKERNSEC_CHROOT_UNIX
68540+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
68541+ default y if GRKERNSEC_CONFIG_AUTO
68542+ depends on GRKERNSEC_CHROOT
68543+ help
68544+ If you say Y here, processes inside a chroot will not be able to
68545+ connect to abstract (meaning not belonging to a filesystem) Unix
68546+ domain sockets that were bound outside of a chroot. It is recommended
68547+ that you say Y here. If the sysctl option is enabled, a sysctl option
68548+ with name "chroot_deny_unix" is created.
68549+
68550+config GRKERNSEC_CHROOT_FINDTASK
68551+ bool "Protect outside processes"
68552+ default y if GRKERNSEC_CONFIG_AUTO
68553+ depends on GRKERNSEC_CHROOT
68554+ help
68555+ If you say Y here, processes inside a chroot will not be able to
68556+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
68557+ getsid, or view any process outside of the chroot. If the sysctl
68558+ option is enabled, a sysctl option with name "chroot_findtask" is
68559+ created.
68560+
68561+config GRKERNSEC_CHROOT_NICE
68562+ bool "Restrict priority changes"
68563+ default y if GRKERNSEC_CONFIG_AUTO
68564+ depends on GRKERNSEC_CHROOT
68565+ help
68566+ If you say Y here, processes inside a chroot will not be able to raise
68567+ the priority of processes in the chroot, or alter the priority of
68568+ processes outside the chroot. This provides more security than simply
68569+ removing CAP_SYS_NICE from the process' capability set. If the
68570+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
68571+ is created.
68572+
68573+config GRKERNSEC_CHROOT_SYSCTL
68574+ bool "Deny sysctl writes"
68575+ default y if GRKERNSEC_CONFIG_AUTO
68576+ depends on GRKERNSEC_CHROOT
68577+ help
68578+ If you say Y here, an attacker in a chroot will not be able to
68579+ write to sysctl entries, either by sysctl(2) or through a /proc
68580+ interface. It is strongly recommended that you say Y here. If the
68581+ sysctl option is enabled, a sysctl option with name
68582+ "chroot_deny_sysctl" is created.
68583+
68584+config GRKERNSEC_CHROOT_CAPS
68585+ bool "Capability restrictions"
68586+ default y if GRKERNSEC_CONFIG_AUTO
68587+ depends on GRKERNSEC_CHROOT
68588+ help
68589+ If you say Y here, the capabilities on all processes within a
68590+ chroot jail will be lowered to stop module insertion, raw i/o,
68591+ system and net admin tasks, rebooting the system, modifying immutable
68592+ files, modifying IPC owned by another, and changing the system time.
68593+ This is left an option because it can break some apps. Disable this
68594+ if your chrooted apps are having problems performing those kinds of
68595+ tasks. If the sysctl option is enabled, a sysctl option with
68596+ name "chroot_caps" is created.
68597+
68598+config GRKERNSEC_CHROOT_INITRD
68599+ bool "Exempt initrd tasks from restrictions"
68600+ default y if GRKERNSEC_CONFIG_AUTO
68601+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
68602+ help
68603+ If you say Y here, tasks started prior to init will be exempted from
68604+ grsecurity's chroot restrictions. This option is mainly meant to
68605+ resolve Plymouth's performing privileged operations unnecessarily
68606+ in a chroot.
68607+
68608+endmenu
68609+menu "Kernel Auditing"
68610+depends on GRKERNSEC
68611+
68612+config GRKERNSEC_AUDIT_GROUP
68613+ bool "Single group for auditing"
68614+ help
68615+ If you say Y here, the exec and chdir logging features will only operate
68616+ on a group you specify. This option is recommended if you only want to
68617+ watch certain users instead of having a large amount of logs from the
68618+ entire system. If the sysctl option is enabled, a sysctl option with
68619+ name "audit_group" is created.
68620+
68621+config GRKERNSEC_AUDIT_GID
68622+ int "GID for auditing"
68623+ depends on GRKERNSEC_AUDIT_GROUP
68624+ default 1007
68625+
68626+config GRKERNSEC_EXECLOG
68627+ bool "Exec logging"
68628+ help
68629+ If you say Y here, all execve() calls will be logged (since the
68630+ other exec*() calls are frontends to execve(), all execution
68631+ will be logged). Useful for shell-servers that like to keep track
68632+ of their users. If the sysctl option is enabled, a sysctl option with
68633+ name "exec_logging" is created.
68634+ WARNING: This option when enabled will produce a LOT of logs, especially
68635+ on an active system.
68636+
68637+config GRKERNSEC_RESLOG
68638+ bool "Resource logging"
68639+ default y if GRKERNSEC_CONFIG_AUTO
68640+ help
68641+ If you say Y here, all attempts to overstep resource limits will
68642+ be logged with the resource name, the requested size, and the current
68643+ limit. It is highly recommended that you say Y here. If the sysctl
68644+ option is enabled, a sysctl option with name "resource_logging" is
68645+ created. If the RBAC system is enabled, the sysctl value is ignored.
68646+
68647+config GRKERNSEC_CHROOT_EXECLOG
68648+ bool "Log execs within chroot"
68649+ help
68650+ If you say Y here, all executions inside a chroot jail will be logged
68651+ to syslog. This can cause a large amount of logs if certain
68652+ applications (eg. djb's daemontools) are installed on the system, and
68653+ is therefore left as an option. If the sysctl option is enabled, a
68654+ sysctl option with name "chroot_execlog" is created.
68655+
68656+config GRKERNSEC_AUDIT_PTRACE
68657+ bool "Ptrace logging"
68658+ help
68659+ If you say Y here, all attempts to attach to a process via ptrace
68660+ will be logged. If the sysctl option is enabled, a sysctl option
68661+ with name "audit_ptrace" is created.
68662+
68663+config GRKERNSEC_AUDIT_CHDIR
68664+ bool "Chdir logging"
68665+ help
68666+ If you say Y here, all chdir() calls will be logged. If the sysctl
68667+ option is enabled, a sysctl option with name "audit_chdir" is created.
68668+
68669+config GRKERNSEC_AUDIT_MOUNT
68670+ bool "(Un)Mount logging"
68671+ help
68672+ If you say Y here, all mounts and unmounts will be logged. If the
68673+ sysctl option is enabled, a sysctl option with name "audit_mount" is
68674+ created.
68675+
68676+config GRKERNSEC_SIGNAL
68677+ bool "Signal logging"
68678+ default y if GRKERNSEC_CONFIG_AUTO
68679+ help
68680+ If you say Y here, certain important signals will be logged, such as
68681+ SIGSEGV, which will as a result inform you of when a error in a program
68682+ occurred, which in some cases could mean a possible exploit attempt.
68683+ If the sysctl option is enabled, a sysctl option with name
68684+ "signal_logging" is created.
68685+
68686+config GRKERNSEC_FORKFAIL
68687+ bool "Fork failure logging"
68688+ help
68689+ If you say Y here, all failed fork() attempts will be logged.
68690+ This could suggest a fork bomb, or someone attempting to overstep
68691+ their process limit. If the sysctl option is enabled, a sysctl option
68692+ with name "forkfail_logging" is created.
68693+
68694+config GRKERNSEC_TIME
68695+ bool "Time change logging"
68696+ default y if GRKERNSEC_CONFIG_AUTO
68697+ help
68698+ If you say Y here, any changes of the system clock will be logged.
68699+ If the sysctl option is enabled, a sysctl option with name
68700+ "timechange_logging" is created.
68701+
68702+config GRKERNSEC_PROC_IPADDR
68703+ bool "/proc/<pid>/ipaddr support"
68704+ default y if GRKERNSEC_CONFIG_AUTO
68705+ help
68706+ If you say Y here, a new entry will be added to each /proc/<pid>
68707+ directory that contains the IP address of the person using the task.
68708+ The IP is carried across local TCP and AF_UNIX stream sockets.
68709+ This information can be useful for IDS/IPSes to perform remote response
68710+ to a local attack. The entry is readable by only the owner of the
68711+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
68712+ the RBAC system), and thus does not create privacy concerns.
68713+
68714+config GRKERNSEC_RWXMAP_LOG
68715+ bool 'Denied RWX mmap/mprotect logging'
68716+ default y if GRKERNSEC_CONFIG_AUTO
68717+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
68718+ help
68719+ If you say Y here, calls to mmap() and mprotect() with explicit
68720+ usage of PROT_WRITE and PROT_EXEC together will be logged when
68721+ denied by the PAX_MPROTECT feature. This feature will also
68722+ log other problematic scenarios that can occur when PAX_MPROTECT
68723+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
68724+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
68725+ is created.
68726+
68727+endmenu
68728+
68729+menu "Executable Protections"
68730+depends on GRKERNSEC
68731+
68732+config GRKERNSEC_DMESG
68733+ bool "Dmesg(8) restriction"
68734+ default y if GRKERNSEC_CONFIG_AUTO
68735+ help
68736+ If you say Y here, non-root users will not be able to use dmesg(8)
68737+ to view the contents of the kernel's circular log buffer.
68738+ The kernel's log buffer often contains kernel addresses and other
68739+ identifying information useful to an attacker in fingerprinting a
68740+ system for a targeted exploit.
68741+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
68742+ created.
68743+
68744+config GRKERNSEC_HARDEN_PTRACE
68745+ bool "Deter ptrace-based process snooping"
68746+ default y if GRKERNSEC_CONFIG_AUTO
68747+ help
68748+ If you say Y here, TTY sniffers and other malicious monitoring
68749+ programs implemented through ptrace will be defeated. If you
68750+ have been using the RBAC system, this option has already been
68751+ enabled for several years for all users, with the ability to make
68752+ fine-grained exceptions.
68753+
68754+ This option only affects the ability of non-root users to ptrace
68755+ processes that are not a descendent of the ptracing process.
68756+ This means that strace ./binary and gdb ./binary will still work,
68757+ but attaching to arbitrary processes will not. If the sysctl
68758+ option is enabled, a sysctl option with name "harden_ptrace" is
68759+ created.
68760+
68761+config GRKERNSEC_PTRACE_READEXEC
68762+ bool "Require read access to ptrace sensitive binaries"
68763+ default y if GRKERNSEC_CONFIG_AUTO
68764+ help
68765+ If you say Y here, unprivileged users will not be able to ptrace unreadable
68766+ binaries. This option is useful in environments that
68767+ remove the read bits (e.g. file mode 4711) from suid binaries to
68768+ prevent infoleaking of their contents. This option adds
68769+ consistency to the use of that file mode, as the binary could normally
68770+ be read out when run without privileges while ptracing.
68771+
68772+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
68773+ is created.
68774+
68775+config GRKERNSEC_SETXID
68776+ bool "Enforce consistent multithreaded privileges"
68777+ default y if GRKERNSEC_CONFIG_AUTO
68778+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
68779+ help
68780+ If you say Y here, a change from a root uid to a non-root uid
68781+ in a multithreaded application will cause the resulting uids,
68782+ gids, supplementary groups, and capabilities in that thread
68783+ to be propagated to the other threads of the process. In most
68784+ cases this is unnecessary, as glibc will emulate this behavior
68785+ on behalf of the application. Other libcs do not act in the
68786+ same way, allowing the other threads of the process to continue
68787+ running with root privileges. If the sysctl option is enabled,
68788+ a sysctl option with name "consistent_setxid" is created.
68789+
68790+config GRKERNSEC_HARDEN_IPC
68791+ bool "Disallow access to overly-permissive IPC objects"
68792+ default y if GRKERNSEC_CONFIG_AUTO
68793+ depends on SYSVIPC
68794+ help
68795+ If you say Y here, access to overly-permissive IPC objects (shared
68796+ memory, message queues, and semaphores) will be denied for processes
68797+ given the following criteria beyond normal permission checks:
68798+ 1) If the IPC object is world-accessible and the euid doesn't match
68799+ that of the creator or current uid for the IPC object
68800+ 2) If the IPC object is group-accessible and the egid doesn't
68801+ match that of the creator or current gid for the IPC object
68802+ It's a common error to grant too much permission to these objects,
68803+ with impact ranging from denial of service and information leaking to
68804+ privilege escalation. This feature was developed in response to
68805+ research by Tim Brown:
68806+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
68807+ who found hundreds of such insecure usages. Processes with
68808+ CAP_IPC_OWNER are still permitted to access these IPC objects.
68809+ If the sysctl option is enabled, a sysctl option with name
68810+ "harden_ipc" is created.
68811+
68812+config GRKERNSEC_TPE
68813+ bool "Trusted Path Execution (TPE)"
68814+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
68815+ help
68816+ If you say Y here, you will be able to choose a gid to add to the
68817+ supplementary groups of users you want to mark as "untrusted."
68818+ These users will not be able to execute any files that are not in
68819+ root-owned directories writable only by root. If the sysctl option
68820+ is enabled, a sysctl option with name "tpe" is created.
68821+
68822+config GRKERNSEC_TPE_ALL
68823+ bool "Partially restrict all non-root users"
68824+ depends on GRKERNSEC_TPE
68825+ help
68826+ If you say Y here, all non-root users will be covered under
68827+ a weaker TPE restriction. This is separate from, and in addition to,
68828+ the main TPE options that you have selected elsewhere. Thus, if a
68829+ "trusted" GID is chosen, this restriction applies to even that GID.
68830+ Under this restriction, all non-root users will only be allowed to
68831+ execute files in directories they own that are not group or
68832+ world-writable, or in directories owned by root and writable only by
68833+ root. If the sysctl option is enabled, a sysctl option with name
68834+ "tpe_restrict_all" is created.
68835+
68836+config GRKERNSEC_TPE_INVERT
68837+ bool "Invert GID option"
68838+ depends on GRKERNSEC_TPE
68839+ help
68840+ If you say Y here, the group you specify in the TPE configuration will
68841+ decide what group TPE restrictions will be *disabled* for. This
68842+ option is useful if you want TPE restrictions to be applied to most
68843+ users on the system. If the sysctl option is enabled, a sysctl option
68844+ with name "tpe_invert" is created. Unlike other sysctl options, this
68845+ entry will default to on for backward-compatibility.
68846+
68847+config GRKERNSEC_TPE_GID
68848+ int
68849+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
68850+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
68851+
68852+config GRKERNSEC_TPE_UNTRUSTED_GID
68853+ int "GID for TPE-untrusted users"
68854+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
68855+ default 1005
68856+ help
68857+ Setting this GID determines what group TPE restrictions will be
68858+ *enabled* for. If the sysctl option is enabled, a sysctl option
68859+ with name "tpe_gid" is created.
68860+
68861+config GRKERNSEC_TPE_TRUSTED_GID
68862+ int "GID for TPE-trusted users"
68863+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
68864+ default 1005
68865+ help
68866+ Setting this GID determines what group TPE restrictions will be
68867+ *disabled* for. If the sysctl option is enabled, a sysctl option
68868+ with name "tpe_gid" is created.
68869+
68870+endmenu
68871+menu "Network Protections"
68872+depends on GRKERNSEC
68873+
68874+config GRKERNSEC_BLACKHOLE
68875+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
68876+ default y if GRKERNSEC_CONFIG_AUTO
68877+ depends on NET
68878+ help
68879+ If you say Y here, neither TCP resets nor ICMP
68880+ destination-unreachable packets will be sent in response to packets
68881+ sent to ports for which no associated listening process exists.
68882+ It will also prevent the sending of ICMP protocol unreachable packets
68883+ in response to packets with unknown protocols.
68884+ This feature supports both IPV4 and IPV6 and exempts the
68885+ loopback interface from blackholing. Enabling this feature
68886+ makes a host more resilient to DoS attacks and reduces network
68887+ visibility against scanners.
68888+
68889+ The blackhole feature as-implemented is equivalent to the FreeBSD
68890+ blackhole feature, as it prevents RST responses to all packets, not
68891+ just SYNs. Under most application behavior this causes no
68892+ problems, but applications (like haproxy) may not close certain
68893+ connections in a way that cleanly terminates them on the remote
68894+ end, leaving the remote host in LAST_ACK state. Because of this
68895+ side-effect and to prevent intentional LAST_ACK DoSes, this
68896+ feature also adds automatic mitigation against such attacks.
68897+ The mitigation drastically reduces the amount of time a socket
68898+ can spend in LAST_ACK state. If you're using haproxy and not
68899+ all servers it connects to have this option enabled, consider
68900+ disabling this feature on the haproxy host.
68901+
68902+ If the sysctl option is enabled, two sysctl options with names
68903+ "ip_blackhole" and "lastack_retries" will be created.
68904+ While "ip_blackhole" takes the standard zero/non-zero on/off
68905+ toggle, "lastack_retries" uses the same kinds of values as
68906+ "tcp_retries1" and "tcp_retries2". The default value of 4
68907+ prevents a socket from lasting more than 45 seconds in LAST_ACK
68908+ state.
68909+
68910+config GRKERNSEC_NO_SIMULT_CONNECT
68911+ bool "Disable TCP Simultaneous Connect"
68912+ default y if GRKERNSEC_CONFIG_AUTO
68913+ depends on NET
68914+ help
68915+ If you say Y here, a feature by Willy Tarreau will be enabled that
68916+ removes a weakness in Linux's strict implementation of TCP that
68917+ allows two clients to connect to each other without either entering
68918+ a listening state. The weakness allows an attacker to easily prevent
68919+ a client from connecting to a known server provided the source port
68920+ for the connection is guessed correctly.
68921+
68922+ As the weakness could be used to prevent an antivirus or IPS from
68923+ fetching updates, or prevent an SSL gateway from fetching a CRL,
68924+ it should be eliminated by enabling this option. Though Linux is
68925+ one of few operating systems supporting simultaneous connect, it
68926+ has no legitimate use in practice and is rarely supported by firewalls.
68927+
68928+config GRKERNSEC_SOCKET
68929+ bool "Socket restrictions"
68930+ depends on NET
68931+ help
68932+ If you say Y here, you will be able to choose from several options.
68933+ If you assign a GID on your system and add it to the supplementary
68934+ groups of users you want to restrict socket access to, this patch
68935+ will perform up to three things, based on the option(s) you choose.
68936+
68937+config GRKERNSEC_SOCKET_ALL
68938+ bool "Deny any sockets to group"
68939+ depends on GRKERNSEC_SOCKET
68940+ help
68941+ If you say Y here, you will be able to choose a GID of whose users will
68942+ be unable to connect to other hosts from your machine or run server
68943+ applications from your machine. If the sysctl option is enabled, a
68944+ sysctl option with name "socket_all" is created.
68945+
68946+config GRKERNSEC_SOCKET_ALL_GID
68947+ int "GID to deny all sockets for"
68948+ depends on GRKERNSEC_SOCKET_ALL
68949+ default 1004
68950+ help
68951+ Here you can choose the GID to disable socket access for. Remember to
68952+ add the users you want socket access disabled for to the GID
68953+ specified here. If the sysctl option is enabled, a sysctl option
68954+ with name "socket_all_gid" is created.
68955+
68956+config GRKERNSEC_SOCKET_CLIENT
68957+ bool "Deny client sockets to group"
68958+ depends on GRKERNSEC_SOCKET
68959+ help
68960+ If you say Y here, you will be able to choose a GID of whose users will
68961+ be unable to connect to other hosts from your machine, but will be
68962+ able to run servers. If this option is enabled, all users in the group
68963+ you specify will have to use passive mode when initiating ftp transfers
68964+ from the shell on your machine. If the sysctl option is enabled, a
68965+ sysctl option with name "socket_client" is created.
68966+
68967+config GRKERNSEC_SOCKET_CLIENT_GID
68968+ int "GID to deny client sockets for"
68969+ depends on GRKERNSEC_SOCKET_CLIENT
68970+ default 1003
68971+ help
68972+ Here you can choose the GID to disable client socket access for.
68973+ Remember to add the users you want client socket access disabled for to
68974+ the GID specified here. If the sysctl option is enabled, a sysctl
68975+ option with name "socket_client_gid" is created.
68976+
68977+config GRKERNSEC_SOCKET_SERVER
68978+ bool "Deny server sockets to group"
68979+ depends on GRKERNSEC_SOCKET
68980+ help
68981+ If you say Y here, you will be able to choose a GID of whose users will
68982+ be unable to run server applications from your machine. If the sysctl
68983+ option is enabled, a sysctl option with name "socket_server" is created.
68984+
68985+config GRKERNSEC_SOCKET_SERVER_GID
68986+ int "GID to deny server sockets for"
68987+ depends on GRKERNSEC_SOCKET_SERVER
68988+ default 1002
68989+ help
68990+ Here you can choose the GID to disable server socket access for.
68991+ Remember to add the users you want server socket access disabled for to
68992+ the GID specified here. If the sysctl option is enabled, a sysctl
68993+ option with name "socket_server_gid" is created.
68994+
68995+endmenu
68996+
68997+menu "Physical Protections"
68998+depends on GRKERNSEC
68999+
69000+config GRKERNSEC_DENYUSB
69001+ bool "Deny new USB connections after toggle"
69002+ default y if GRKERNSEC_CONFIG_AUTO
69003+ depends on SYSCTL && USB_SUPPORT
69004+ help
69005+ If you say Y here, a new sysctl option with name "deny_new_usb"
69006+ will be created. Setting its value to 1 will prevent any new
69007+ USB devices from being recognized by the OS. Any attempted USB
69008+ device insertion will be logged. This option is intended to be
69009+ used against custom USB devices designed to exploit vulnerabilities
69010+ in various USB device drivers.
69011+
69012+ For greatest effectiveness, this sysctl should be set after any
69013+ relevant init scripts. This option is safe to enable in distros
69014+ as each user can choose whether or not to toggle the sysctl.
69015+
69016+config GRKERNSEC_DENYUSB_FORCE
69017+ bool "Reject all USB devices not connected at boot"
69018+ select USB
69019+ depends on GRKERNSEC_DENYUSB
69020+ help
69021+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
69022+ that doesn't involve a sysctl entry. This option should only be
69023+ enabled if you're sure you want to deny all new USB connections
69024+ at runtime and don't want to modify init scripts. This should not
69025+ be enabled by distros. It forces the core USB code to be built
69026+ into the kernel image so that all devices connected at boot time
69027+ can be recognized and new USB device connections can be prevented
69028+ prior to init running.
69029+
69030+endmenu
69031+
69032+menu "Sysctl Support"
69033+depends on GRKERNSEC && SYSCTL
69034+
69035+config GRKERNSEC_SYSCTL
69036+ bool "Sysctl support"
69037+ default y if GRKERNSEC_CONFIG_AUTO
69038+ help
69039+ If you say Y here, you will be able to change the options that
69040+ grsecurity runs with at bootup, without having to recompile your
69041+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
69042+ to enable (1) or disable (0) various features. All the sysctl entries
69043+ are mutable until the "grsec_lock" entry is set to a non-zero value.
69044+ All features enabled in the kernel configuration are disabled at boot
69045+ if you do not say Y to the "Turn on features by default" option.
69046+ All options should be set at startup, and the grsec_lock entry should
69047+ be set to a non-zero value after all the options are set.
69048+ *THIS IS EXTREMELY IMPORTANT*
69049+
69050+config GRKERNSEC_SYSCTL_DISTRO
69051+ bool "Extra sysctl support for distro makers (READ HELP)"
69052+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
69053+ help
69054+ If you say Y here, additional sysctl options will be created
69055+ for features that affect processes running as root. Therefore,
69056+ it is critical when using this option that the grsec_lock entry be
69057+ enabled after boot. Only distros with prebuilt kernel packages
69058+ with this option enabled that can ensure grsec_lock is enabled
69059+ after boot should use this option.
69060+ *Failure to set grsec_lock after boot makes all grsec features
69061+ this option covers useless*
69062+
69063+ Currently this option creates the following sysctl entries:
69064+ "Disable Privileged I/O": "disable_priv_io"
69065+
69066+config GRKERNSEC_SYSCTL_ON
69067+ bool "Turn on features by default"
69068+ default y if GRKERNSEC_CONFIG_AUTO
69069+ depends on GRKERNSEC_SYSCTL
69070+ help
69071+ If you say Y here, instead of having all features enabled in the
69072+ kernel configuration disabled at boot time, the features will be
69073+ enabled at boot time. It is recommended you say Y here unless
69074+ there is some reason you would want all sysctl-tunable features to
69075+ be disabled by default. As mentioned elsewhere, it is important
69076+ to enable the grsec_lock entry once you have finished modifying
69077+ the sysctl entries.
69078+
69079+endmenu
69080+menu "Logging Options"
69081+depends on GRKERNSEC
69082+
69083+config GRKERNSEC_FLOODTIME
69084+ int "Seconds in between log messages (minimum)"
69085+ default 10
69086+ help
69087+ This option allows you to enforce the number of seconds between
69088+ grsecurity log messages. The default should be suitable for most
69089+ people, however, if you choose to change it, choose a value small enough
69090+ to allow informative logs to be produced, but large enough to
69091+ prevent flooding.
69092+
69093+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
69094+ any rate limiting on grsecurity log messages.
69095+
69096+config GRKERNSEC_FLOODBURST
69097+ int "Number of messages in a burst (maximum)"
69098+ default 6
69099+ help
69100+ This option allows you to choose the maximum number of messages allowed
69101+ within the flood time interval you chose in a separate option. The
69102+ default should be suitable for most people, however if you find that
69103+ many of your logs are being interpreted as flooding, you may want to
69104+ raise this value.
69105+
69106+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
69107+ any rate limiting on grsecurity log messages.
69108+
69109+endmenu
69110diff --git a/grsecurity/Makefile b/grsecurity/Makefile
69111new file mode 100644
69112index 0000000..30ababb
69113--- /dev/null
69114+++ b/grsecurity/Makefile
69115@@ -0,0 +1,54 @@
69116+# grsecurity – access control and security hardening for Linux
69117+# All code in this directory and various hooks located throughout the Linux kernel are
69118+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
69119+# http://www.grsecurity.net spender@grsecurity.net
69120+#
69121+# This program is free software; you can redistribute it and/or
69122+# modify it under the terms of the GNU General Public License version 2
69123+# as published by the Free Software Foundation.
69124+#
69125+# This program is distributed in the hope that it will be useful,
69126+# but WITHOUT ANY WARRANTY; without even the implied warranty of
69127+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69128+# GNU General Public License for more details.
69129+#
69130+# You should have received a copy of the GNU General Public License
69131+# along with this program; if not, write to the Free Software
69132+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
69133+
69134+KBUILD_CFLAGS += -Werror
69135+
69136+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
69137+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
69138+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
69139+ grsec_usb.o grsec_ipc.o grsec_proc.o
69140+
69141+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
69142+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
69143+ gracl_learn.o grsec_log.o gracl_policy.o
69144+ifdef CONFIG_COMPAT
69145+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
69146+endif
69147+
69148+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
69149+
69150+ifdef CONFIG_NET
69151+obj-y += grsec_sock.o
69152+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
69153+endif
69154+
69155+ifndef CONFIG_GRKERNSEC
69156+obj-y += grsec_disabled.o
69157+endif
69158+
69159+ifdef CONFIG_GRKERNSEC_HIDESYM
69160+extra-y := grsec_hidesym.o
69161+$(obj)/grsec_hidesym.o:
69162+ @-chmod -f 500 /boot
69163+ @-chmod -f 500 /lib/modules
69164+ @-chmod -f 500 /lib64/modules
69165+ @-chmod -f 500 /lib32/modules
69166+ @-chmod -f 700 .
69167+ @-chmod -f 700 $(objtree)
69168+ @echo ' grsec: protected kernel image paths'
69169+endif
69170diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
69171new file mode 100644
69172index 0000000..6ae3aa0
69173--- /dev/null
69174+++ b/grsecurity/gracl.c
69175@@ -0,0 +1,2703 @@
69176+#include <linux/kernel.h>
69177+#include <linux/module.h>
69178+#include <linux/sched.h>
69179+#include <linux/mm.h>
69180+#include <linux/file.h>
69181+#include <linux/fs.h>
69182+#include <linux/namei.h>
69183+#include <linux/mount.h>
69184+#include <linux/tty.h>
69185+#include <linux/proc_fs.h>
69186+#include <linux/lglock.h>
69187+#include <linux/slab.h>
69188+#include <linux/vmalloc.h>
69189+#include <linux/types.h>
69190+#include <linux/sysctl.h>
69191+#include <linux/netdevice.h>
69192+#include <linux/ptrace.h>
69193+#include <linux/gracl.h>
69194+#include <linux/gralloc.h>
69195+#include <linux/security.h>
69196+#include <linux/grinternal.h>
69197+#include <linux/pid_namespace.h>
69198+#include <linux/stop_machine.h>
69199+#include <linux/fdtable.h>
69200+#include <linux/percpu.h>
69201+#include <linux/lglock.h>
69202+#include <linux/hugetlb.h>
69203+#include <linux/posix-timers.h>
69204+#include <linux/prefetch.h>
69205+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69206+#include <linux/magic.h>
69207+#include <linux/pagemap.h>
69208+#include "../fs/btrfs/async-thread.h"
69209+#include "../fs/btrfs/ctree.h"
69210+#include "../fs/btrfs/btrfs_inode.h"
69211+#endif
69212+#include "../fs/mount.h"
69213+
69214+#include <asm/uaccess.h>
69215+#include <asm/errno.h>
69216+#include <asm/mman.h>
69217+
69218+#define FOR_EACH_ROLE_START(role) \
69219+ role = running_polstate.role_list; \
69220+ while (role) {
69221+
69222+#define FOR_EACH_ROLE_END(role) \
69223+ role = role->prev; \
69224+ }
69225+
69226+extern struct path gr_real_root;
69227+
69228+static struct gr_policy_state running_polstate;
69229+struct gr_policy_state *polstate = &running_polstate;
69230+extern struct gr_alloc_state *current_alloc_state;
69231+
69232+extern char *gr_shared_page[4];
69233+DEFINE_RWLOCK(gr_inode_lock);
69234+
69235+static unsigned int gr_status __read_only = GR_STATUS_INIT;
69236+
69237+#ifdef CONFIG_NET
69238+extern struct vfsmount *sock_mnt;
69239+#endif
69240+
69241+extern struct vfsmount *pipe_mnt;
69242+extern struct vfsmount *shm_mnt;
69243+
69244+#ifdef CONFIG_HUGETLBFS
69245+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
69246+#endif
69247+
69248+extern u16 acl_sp_role_value;
69249+extern struct acl_object_label *fakefs_obj_rw;
69250+extern struct acl_object_label *fakefs_obj_rwx;
69251+
69252+int gr_acl_is_enabled(void)
69253+{
69254+ return (gr_status & GR_READY);
69255+}
69256+
69257+void gr_enable_rbac_system(void)
69258+{
69259+ pax_open_kernel();
69260+ gr_status |= GR_READY;
69261+ pax_close_kernel();
69262+}
69263+
69264+int gr_rbac_disable(void *unused)
69265+{
69266+ pax_open_kernel();
69267+ gr_status &= ~GR_READY;
69268+ pax_close_kernel();
69269+
69270+ return 0;
69271+}
69272+
69273+static inline dev_t __get_dev(const struct dentry *dentry)
69274+{
69275+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69276+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
69277+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
69278+ else
69279+#endif
69280+ return dentry->d_sb->s_dev;
69281+}
69282+
69283+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
69284+{
69285+ return __get_dev(dentry);
69286+}
69287+
69288+static char gr_task_roletype_to_char(struct task_struct *task)
69289+{
69290+ switch (task->role->roletype &
69291+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
69292+ GR_ROLE_SPECIAL)) {
69293+ case GR_ROLE_DEFAULT:
69294+ return 'D';
69295+ case GR_ROLE_USER:
69296+ return 'U';
69297+ case GR_ROLE_GROUP:
69298+ return 'G';
69299+ case GR_ROLE_SPECIAL:
69300+ return 'S';
69301+ }
69302+
69303+ return 'X';
69304+}
69305+
69306+char gr_roletype_to_char(void)
69307+{
69308+ return gr_task_roletype_to_char(current);
69309+}
69310+
69311+__inline__ int
69312+gr_acl_tpe_check(void)
69313+{
69314+ if (unlikely(!(gr_status & GR_READY)))
69315+ return 0;
69316+ if (current->role->roletype & GR_ROLE_TPE)
69317+ return 1;
69318+ else
69319+ return 0;
69320+}
69321+
69322+int
69323+gr_handle_rawio(const struct inode *inode)
69324+{
69325+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
69326+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
69327+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
69328+ !capable(CAP_SYS_RAWIO))
69329+ return 1;
69330+#endif
69331+ return 0;
69332+}
69333+
69334+int
69335+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
69336+{
69337+ if (likely(lena != lenb))
69338+ return 0;
69339+
69340+ return !memcmp(a, b, lena);
69341+}
69342+
69343+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
69344+{
69345+ *buflen -= namelen;
69346+ if (*buflen < 0)
69347+ return -ENAMETOOLONG;
69348+ *buffer -= namelen;
69349+ memcpy(*buffer, str, namelen);
69350+ return 0;
69351+}
69352+
69353+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
69354+{
69355+ return prepend(buffer, buflen, name->name, name->len);
69356+}
69357+
69358+static int prepend_path(const struct path *path, struct path *root,
69359+ char **buffer, int *buflen)
69360+{
69361+ struct dentry *dentry = path->dentry;
69362+ struct vfsmount *vfsmnt = path->mnt;
69363+ struct mount *mnt = real_mount(vfsmnt);
69364+ bool slash = false;
69365+ int error = 0;
69366+
69367+ while (dentry != root->dentry || vfsmnt != root->mnt) {
69368+ struct dentry * parent;
69369+
69370+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
69371+ /* Global root? */
69372+ if (!mnt_has_parent(mnt)) {
69373+ goto out;
69374+ }
69375+ dentry = mnt->mnt_mountpoint;
69376+ mnt = mnt->mnt_parent;
69377+ vfsmnt = &mnt->mnt;
69378+ continue;
69379+ }
69380+ parent = dentry->d_parent;
69381+ prefetch(parent);
69382+ spin_lock(&dentry->d_lock);
69383+ error = prepend_name(buffer, buflen, &dentry->d_name);
69384+ spin_unlock(&dentry->d_lock);
69385+ if (!error)
69386+ error = prepend(buffer, buflen, "/", 1);
69387+ if (error)
69388+ break;
69389+
69390+ slash = true;
69391+ dentry = parent;
69392+ }
69393+
69394+out:
69395+ if (!error && !slash)
69396+ error = prepend(buffer, buflen, "/", 1);
69397+
69398+ return error;
69399+}
69400+
69401+/* this must be called with mount_lock and rename_lock held */
69402+
69403+static char *__our_d_path(const struct path *path, struct path *root,
69404+ char *buf, int buflen)
69405+{
69406+ char *res = buf + buflen;
69407+ int error;
69408+
69409+ prepend(&res, &buflen, "\0", 1);
69410+ error = prepend_path(path, root, &res, &buflen);
69411+ if (error)
69412+ return ERR_PTR(error);
69413+
69414+ return res;
69415+}
69416+
69417+static char *
69418+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
69419+{
69420+ char *retval;
69421+
69422+ retval = __our_d_path(path, root, buf, buflen);
69423+ if (unlikely(IS_ERR(retval)))
69424+ retval = strcpy(buf, "<path too long>");
69425+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
69426+ retval[1] = '\0';
69427+
69428+ return retval;
69429+}
69430+
69431+static char *
69432+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
69433+ char *buf, int buflen)
69434+{
69435+ struct path path;
69436+ char *res;
69437+
69438+ path.dentry = (struct dentry *)dentry;
69439+ path.mnt = (struct vfsmount *)vfsmnt;
69440+
69441+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
69442+ by the RBAC system */
69443+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
69444+
69445+ return res;
69446+}
69447+
69448+static char *
69449+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
69450+ char *buf, int buflen)
69451+{
69452+ char *res;
69453+ struct path path;
69454+ struct path root;
69455+ struct task_struct *reaper = init_pid_ns.child_reaper;
69456+
69457+ path.dentry = (struct dentry *)dentry;
69458+ path.mnt = (struct vfsmount *)vfsmnt;
69459+
69460+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
69461+ get_fs_root(reaper->fs, &root);
69462+
69463+ read_seqlock_excl(&mount_lock);
69464+ write_seqlock(&rename_lock);
69465+ res = gen_full_path(&path, &root, buf, buflen);
69466+ write_sequnlock(&rename_lock);
69467+ read_sequnlock_excl(&mount_lock);
69468+
69469+ path_put(&root);
69470+ return res;
69471+}
69472+
69473+char *
69474+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
69475+{
69476+ char *ret;
69477+ read_seqlock_excl(&mount_lock);
69478+ write_seqlock(&rename_lock);
69479+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
69480+ PAGE_SIZE);
69481+ write_sequnlock(&rename_lock);
69482+ read_sequnlock_excl(&mount_lock);
69483+ return ret;
69484+}
69485+
69486+static char *
69487+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
69488+{
69489+ char *ret;
69490+ char *buf;
69491+ int buflen;
69492+
69493+ read_seqlock_excl(&mount_lock);
69494+ write_seqlock(&rename_lock);
69495+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
69496+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
69497+ buflen = (int)(ret - buf);
69498+ if (buflen >= 5)
69499+ prepend(&ret, &buflen, "/proc", 5);
69500+ else
69501+ ret = strcpy(buf, "<path too long>");
69502+ write_sequnlock(&rename_lock);
69503+ read_sequnlock_excl(&mount_lock);
69504+ return ret;
69505+}
69506+
69507+char *
69508+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
69509+{
69510+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
69511+ PAGE_SIZE);
69512+}
69513+
69514+char *
69515+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
69516+{
69517+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
69518+ PAGE_SIZE);
69519+}
69520+
69521+char *
69522+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
69523+{
69524+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
69525+ PAGE_SIZE);
69526+}
69527+
69528+char *
69529+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
69530+{
69531+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
69532+ PAGE_SIZE);
69533+}
69534+
69535+char *
69536+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
69537+{
69538+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
69539+ PAGE_SIZE);
69540+}
69541+
69542+__inline__ __u32
69543+to_gr_audit(const __u32 reqmode)
69544+{
69545+ /* masks off auditable permission flags, then shifts them to create
69546+ auditing flags, and adds the special case of append auditing if
69547+ we're requesting write */
69548+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
69549+}
69550+
69551+struct acl_role_label *
69552+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
69553+ const gid_t gid)
69554+{
69555+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
69556+ struct acl_role_label *match;
69557+ struct role_allowed_ip *ipp;
69558+ unsigned int x;
69559+ u32 curr_ip = task->signal->saved_ip;
69560+
69561+ match = state->acl_role_set.r_hash[index];
69562+
69563+ while (match) {
69564+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
69565+ for (x = 0; x < match->domain_child_num; x++) {
69566+ if (match->domain_children[x] == uid)
69567+ goto found;
69568+ }
69569+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
69570+ break;
69571+ match = match->next;
69572+ }
69573+found:
69574+ if (match == NULL) {
69575+ try_group:
69576+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
69577+ match = state->acl_role_set.r_hash[index];
69578+
69579+ while (match) {
69580+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
69581+ for (x = 0; x < match->domain_child_num; x++) {
69582+ if (match->domain_children[x] == gid)
69583+ goto found2;
69584+ }
69585+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
69586+ break;
69587+ match = match->next;
69588+ }
69589+found2:
69590+ if (match == NULL)
69591+ match = state->default_role;
69592+ if (match->allowed_ips == NULL)
69593+ return match;
69594+ else {
69595+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
69596+ if (likely
69597+ ((ntohl(curr_ip) & ipp->netmask) ==
69598+ (ntohl(ipp->addr) & ipp->netmask)))
69599+ return match;
69600+ }
69601+ match = state->default_role;
69602+ }
69603+ } else if (match->allowed_ips == NULL) {
69604+ return match;
69605+ } else {
69606+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
69607+ if (likely
69608+ ((ntohl(curr_ip) & ipp->netmask) ==
69609+ (ntohl(ipp->addr) & ipp->netmask)))
69610+ return match;
69611+ }
69612+ goto try_group;
69613+ }
69614+
69615+ return match;
69616+}
69617+
69618+static struct acl_role_label *
69619+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
69620+ const gid_t gid)
69621+{
69622+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
69623+}
69624+
69625+struct acl_subject_label *
69626+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
69627+ const struct acl_role_label *role)
69628+{
69629+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
69630+ struct acl_subject_label *match;
69631+
69632+ match = role->subj_hash[index];
69633+
69634+ while (match && (match->inode != ino || match->device != dev ||
69635+ (match->mode & GR_DELETED))) {
69636+ match = match->next;
69637+ }
69638+
69639+ if (match && !(match->mode & GR_DELETED))
69640+ return match;
69641+ else
69642+ return NULL;
69643+}
69644+
69645+struct acl_subject_label *
69646+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
69647+ const struct acl_role_label *role)
69648+{
69649+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
69650+ struct acl_subject_label *match;
69651+
69652+ match = role->subj_hash[index];
69653+
69654+ while (match && (match->inode != ino || match->device != dev ||
69655+ !(match->mode & GR_DELETED))) {
69656+ match = match->next;
69657+ }
69658+
69659+ if (match && (match->mode & GR_DELETED))
69660+ return match;
69661+ else
69662+ return NULL;
69663+}
69664+
69665+static struct acl_object_label *
69666+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
69667+ const struct acl_subject_label *subj)
69668+{
69669+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
69670+ struct acl_object_label *match;
69671+
69672+ match = subj->obj_hash[index];
69673+
69674+ while (match && (match->inode != ino || match->device != dev ||
69675+ (match->mode & GR_DELETED))) {
69676+ match = match->next;
69677+ }
69678+
69679+ if (match && !(match->mode & GR_DELETED))
69680+ return match;
69681+ else
69682+ return NULL;
69683+}
69684+
69685+static struct acl_object_label *
69686+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
69687+ const struct acl_subject_label *subj)
69688+{
69689+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
69690+ struct acl_object_label *match;
69691+
69692+ match = subj->obj_hash[index];
69693+
69694+ while (match && (match->inode != ino || match->device != dev ||
69695+ !(match->mode & GR_DELETED))) {
69696+ match = match->next;
69697+ }
69698+
69699+ if (match && (match->mode & GR_DELETED))
69700+ return match;
69701+
69702+ match = subj->obj_hash[index];
69703+
69704+ while (match && (match->inode != ino || match->device != dev ||
69705+ (match->mode & GR_DELETED))) {
69706+ match = match->next;
69707+ }
69708+
69709+ if (match && !(match->mode & GR_DELETED))
69710+ return match;
69711+ else
69712+ return NULL;
69713+}
69714+
69715+struct name_entry *
69716+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
69717+{
69718+ unsigned int len = strlen(name);
69719+ unsigned int key = full_name_hash(name, len);
69720+ unsigned int index = key % state->name_set.n_size;
69721+ struct name_entry *match;
69722+
69723+ match = state->name_set.n_hash[index];
69724+
69725+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
69726+ match = match->next;
69727+
69728+ return match;
69729+}
69730+
69731+static struct name_entry *
69732+lookup_name_entry(const char *name)
69733+{
69734+ return __lookup_name_entry(&running_polstate, name);
69735+}
69736+
69737+static struct name_entry *
69738+lookup_name_entry_create(const char *name)
69739+{
69740+ unsigned int len = strlen(name);
69741+ unsigned int key = full_name_hash(name, len);
69742+ unsigned int index = key % running_polstate.name_set.n_size;
69743+ struct name_entry *match;
69744+
69745+ match = running_polstate.name_set.n_hash[index];
69746+
69747+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
69748+ !match->deleted))
69749+ match = match->next;
69750+
69751+ if (match && match->deleted)
69752+ return match;
69753+
69754+ match = running_polstate.name_set.n_hash[index];
69755+
69756+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
69757+ match->deleted))
69758+ match = match->next;
69759+
69760+ if (match && !match->deleted)
69761+ return match;
69762+ else
69763+ return NULL;
69764+}
69765+
69766+static struct inodev_entry *
69767+lookup_inodev_entry(const ino_t ino, const dev_t dev)
69768+{
69769+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
69770+ struct inodev_entry *match;
69771+
69772+ match = running_polstate.inodev_set.i_hash[index];
69773+
69774+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
69775+ match = match->next;
69776+
69777+ return match;
69778+}
69779+
69780+void
69781+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
69782+{
69783+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
69784+ state->inodev_set.i_size);
69785+ struct inodev_entry **curr;
69786+
69787+ entry->prev = NULL;
69788+
69789+ curr = &state->inodev_set.i_hash[index];
69790+ if (*curr != NULL)
69791+ (*curr)->prev = entry;
69792+
69793+ entry->next = *curr;
69794+ *curr = entry;
69795+
69796+ return;
69797+}
69798+
69799+static void
69800+insert_inodev_entry(struct inodev_entry *entry)
69801+{
69802+ __insert_inodev_entry(&running_polstate, entry);
69803+}
69804+
69805+void
69806+insert_acl_obj_label(struct acl_object_label *obj,
69807+ struct acl_subject_label *subj)
69808+{
69809+ unsigned int index =
69810+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
69811+ struct acl_object_label **curr;
69812+
69813+ obj->prev = NULL;
69814+
69815+ curr = &subj->obj_hash[index];
69816+ if (*curr != NULL)
69817+ (*curr)->prev = obj;
69818+
69819+ obj->next = *curr;
69820+ *curr = obj;
69821+
69822+ return;
69823+}
69824+
69825+void
69826+insert_acl_subj_label(struct acl_subject_label *obj,
69827+ struct acl_role_label *role)
69828+{
69829+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
69830+ struct acl_subject_label **curr;
69831+
69832+ obj->prev = NULL;
69833+
69834+ curr = &role->subj_hash[index];
69835+ if (*curr != NULL)
69836+ (*curr)->prev = obj;
69837+
69838+ obj->next = *curr;
69839+ *curr = obj;
69840+
69841+ return;
69842+}
69843+
69844+/* derived from glibc fnmatch() 0: match, 1: no match*/
69845+
69846+static int
69847+glob_match(const char *p, const char *n)
69848+{
69849+ char c;
69850+
69851+ while ((c = *p++) != '\0') {
69852+ switch (c) {
69853+ case '?':
69854+ if (*n == '\0')
69855+ return 1;
69856+ else if (*n == '/')
69857+ return 1;
69858+ break;
69859+ case '\\':
69860+ if (*n != c)
69861+ return 1;
69862+ break;
69863+ case '*':
69864+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
69865+ if (*n == '/')
69866+ return 1;
69867+ else if (c == '?') {
69868+ if (*n == '\0')
69869+ return 1;
69870+ else
69871+ ++n;
69872+ }
69873+ }
69874+ if (c == '\0') {
69875+ return 0;
69876+ } else {
69877+ const char *endp;
69878+
69879+ if ((endp = strchr(n, '/')) == NULL)
69880+ endp = n + strlen(n);
69881+
69882+ if (c == '[') {
69883+ for (--p; n < endp; ++n)
69884+ if (!glob_match(p, n))
69885+ return 0;
69886+ } else if (c == '/') {
69887+ while (*n != '\0' && *n != '/')
69888+ ++n;
69889+ if (*n == '/' && !glob_match(p, n + 1))
69890+ return 0;
69891+ } else {
69892+ for (--p; n < endp; ++n)
69893+ if (*n == c && !glob_match(p, n))
69894+ return 0;
69895+ }
69896+
69897+ return 1;
69898+ }
69899+ case '[':
69900+ {
69901+ int not;
69902+ char cold;
69903+
69904+ if (*n == '\0' || *n == '/')
69905+ return 1;
69906+
69907+ not = (*p == '!' || *p == '^');
69908+ if (not)
69909+ ++p;
69910+
69911+ c = *p++;
69912+ for (;;) {
69913+ unsigned char fn = (unsigned char)*n;
69914+
69915+ if (c == '\0')
69916+ return 1;
69917+ else {
69918+ if (c == fn)
69919+ goto matched;
69920+ cold = c;
69921+ c = *p++;
69922+
69923+ if (c == '-' && *p != ']') {
69924+ unsigned char cend = *p++;
69925+
69926+ if (cend == '\0')
69927+ return 1;
69928+
69929+ if (cold <= fn && fn <= cend)
69930+ goto matched;
69931+
69932+ c = *p++;
69933+ }
69934+ }
69935+
69936+ if (c == ']')
69937+ break;
69938+ }
69939+ if (!not)
69940+ return 1;
69941+ break;
69942+ matched:
69943+ while (c != ']') {
69944+ if (c == '\0')
69945+ return 1;
69946+
69947+ c = *p++;
69948+ }
69949+ if (not)
69950+ return 1;
69951+ }
69952+ break;
69953+ default:
69954+ if (c != *n)
69955+ return 1;
69956+ }
69957+
69958+ ++n;
69959+ }
69960+
69961+ if (*n == '\0')
69962+ return 0;
69963+
69964+ if (*n == '/')
69965+ return 0;
69966+
69967+ return 1;
69968+}
69969+
69970+static struct acl_object_label *
69971+chk_glob_label(struct acl_object_label *globbed,
69972+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
69973+{
69974+ struct acl_object_label *tmp;
69975+
69976+ if (*path == NULL)
69977+ *path = gr_to_filename_nolock(dentry, mnt);
69978+
69979+ tmp = globbed;
69980+
69981+ while (tmp) {
69982+ if (!glob_match(tmp->filename, *path))
69983+ return tmp;
69984+ tmp = tmp->next;
69985+ }
69986+
69987+ return NULL;
69988+}
69989+
69990+static struct acl_object_label *
69991+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
69992+ const ino_t curr_ino, const dev_t curr_dev,
69993+ const struct acl_subject_label *subj, char **path, const int checkglob)
69994+{
69995+ struct acl_subject_label *tmpsubj;
69996+ struct acl_object_label *retval;
69997+ struct acl_object_label *retval2;
69998+
69999+ tmpsubj = (struct acl_subject_label *) subj;
70000+ read_lock(&gr_inode_lock);
70001+ do {
70002+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
70003+ if (retval) {
70004+ if (checkglob && retval->globbed) {
70005+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
70006+ if (retval2)
70007+ retval = retval2;
70008+ }
70009+ break;
70010+ }
70011+ } while ((tmpsubj = tmpsubj->parent_subject));
70012+ read_unlock(&gr_inode_lock);
70013+
70014+ return retval;
70015+}
70016+
70017+static __inline__ struct acl_object_label *
70018+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
70019+ struct dentry *curr_dentry,
70020+ const struct acl_subject_label *subj, char **path, const int checkglob)
70021+{
70022+ int newglob = checkglob;
70023+ ino_t inode;
70024+ dev_t device;
70025+
70026+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
70027+ as we don't want a / * rule to match instead of the / object
70028+ don't do this for create lookups that call this function though, since they're looking up
70029+ on the parent and thus need globbing checks on all paths
70030+ */
70031+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
70032+ newglob = GR_NO_GLOB;
70033+
70034+ spin_lock(&curr_dentry->d_lock);
70035+ inode = curr_dentry->d_inode->i_ino;
70036+ device = __get_dev(curr_dentry);
70037+ spin_unlock(&curr_dentry->d_lock);
70038+
70039+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
70040+}
70041+
70042+#ifdef CONFIG_HUGETLBFS
70043+static inline bool
70044+is_hugetlbfs_mnt(const struct vfsmount *mnt)
70045+{
70046+ int i;
70047+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
70048+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
70049+ return true;
70050+ }
70051+
70052+ return false;
70053+}
70054+#endif
70055+
70056+static struct acl_object_label *
70057+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70058+ const struct acl_subject_label *subj, char *path, const int checkglob)
70059+{
70060+ struct dentry *dentry = (struct dentry *) l_dentry;
70061+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70062+ struct mount *real_mnt = real_mount(mnt);
70063+ struct acl_object_label *retval;
70064+ struct dentry *parent;
70065+
70066+ read_seqlock_excl(&mount_lock);
70067+ write_seqlock(&rename_lock);
70068+
70069+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
70070+#ifdef CONFIG_NET
70071+ mnt == sock_mnt ||
70072+#endif
70073+#ifdef CONFIG_HUGETLBFS
70074+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
70075+#endif
70076+ /* ignore Eric Biederman */
70077+ IS_PRIVATE(l_dentry->d_inode))) {
70078+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
70079+ goto out;
70080+ }
70081+
70082+ for (;;) {
70083+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70084+ break;
70085+
70086+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70087+ if (!mnt_has_parent(real_mnt))
70088+ break;
70089+
70090+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70091+ if (retval != NULL)
70092+ goto out;
70093+
70094+ dentry = real_mnt->mnt_mountpoint;
70095+ real_mnt = real_mnt->mnt_parent;
70096+ mnt = &real_mnt->mnt;
70097+ continue;
70098+ }
70099+
70100+ parent = dentry->d_parent;
70101+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70102+ if (retval != NULL)
70103+ goto out;
70104+
70105+ dentry = parent;
70106+ }
70107+
70108+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70109+
70110+ /* gr_real_root is pinned so we don't have to hold a reference */
70111+ if (retval == NULL)
70112+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
70113+out:
70114+ write_sequnlock(&rename_lock);
70115+ read_sequnlock_excl(&mount_lock);
70116+
70117+ BUG_ON(retval == NULL);
70118+
70119+ return retval;
70120+}
70121+
70122+static __inline__ struct acl_object_label *
70123+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70124+ const struct acl_subject_label *subj)
70125+{
70126+ char *path = NULL;
70127+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
70128+}
70129+
70130+static __inline__ struct acl_object_label *
70131+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70132+ const struct acl_subject_label *subj)
70133+{
70134+ char *path = NULL;
70135+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
70136+}
70137+
70138+static __inline__ struct acl_object_label *
70139+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70140+ const struct acl_subject_label *subj, char *path)
70141+{
70142+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
70143+}
70144+
70145+struct acl_subject_label *
70146+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70147+ const struct acl_role_label *role)
70148+{
70149+ struct dentry *dentry = (struct dentry *) l_dentry;
70150+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70151+ struct mount *real_mnt = real_mount(mnt);
70152+ struct acl_subject_label *retval;
70153+ struct dentry *parent;
70154+
70155+ read_seqlock_excl(&mount_lock);
70156+ write_seqlock(&rename_lock);
70157+
70158+ for (;;) {
70159+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70160+ break;
70161+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70162+ if (!mnt_has_parent(real_mnt))
70163+ break;
70164+
70165+ spin_lock(&dentry->d_lock);
70166+ read_lock(&gr_inode_lock);
70167+ retval =
70168+ lookup_acl_subj_label(dentry->d_inode->i_ino,
70169+ __get_dev(dentry), role);
70170+ read_unlock(&gr_inode_lock);
70171+ spin_unlock(&dentry->d_lock);
70172+ if (retval != NULL)
70173+ goto out;
70174+
70175+ dentry = real_mnt->mnt_mountpoint;
70176+ real_mnt = real_mnt->mnt_parent;
70177+ mnt = &real_mnt->mnt;
70178+ continue;
70179+ }
70180+
70181+ spin_lock(&dentry->d_lock);
70182+ read_lock(&gr_inode_lock);
70183+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
70184+ __get_dev(dentry), role);
70185+ read_unlock(&gr_inode_lock);
70186+ parent = dentry->d_parent;
70187+ spin_unlock(&dentry->d_lock);
70188+
70189+ if (retval != NULL)
70190+ goto out;
70191+
70192+ dentry = parent;
70193+ }
70194+
70195+ spin_lock(&dentry->d_lock);
70196+ read_lock(&gr_inode_lock);
70197+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
70198+ __get_dev(dentry), role);
70199+ read_unlock(&gr_inode_lock);
70200+ spin_unlock(&dentry->d_lock);
70201+
70202+ if (unlikely(retval == NULL)) {
70203+ /* gr_real_root is pinned, we don't need to hold a reference */
70204+ read_lock(&gr_inode_lock);
70205+ retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino,
70206+ __get_dev(gr_real_root.dentry), role);
70207+ read_unlock(&gr_inode_lock);
70208+ }
70209+out:
70210+ write_sequnlock(&rename_lock);
70211+ read_sequnlock_excl(&mount_lock);
70212+
70213+ BUG_ON(retval == NULL);
70214+
70215+ return retval;
70216+}
70217+
70218+void
70219+assign_special_role(const char *rolename)
70220+{
70221+ struct acl_object_label *obj;
70222+ struct acl_role_label *r;
70223+ struct acl_role_label *assigned = NULL;
70224+ struct task_struct *tsk;
70225+ struct file *filp;
70226+
70227+ FOR_EACH_ROLE_START(r)
70228+ if (!strcmp(rolename, r->rolename) &&
70229+ (r->roletype & GR_ROLE_SPECIAL)) {
70230+ assigned = r;
70231+ break;
70232+ }
70233+ FOR_EACH_ROLE_END(r)
70234+
70235+ if (!assigned)
70236+ return;
70237+
70238+ read_lock(&tasklist_lock);
70239+ read_lock(&grsec_exec_file_lock);
70240+
70241+ tsk = current->real_parent;
70242+ if (tsk == NULL)
70243+ goto out_unlock;
70244+
70245+ filp = tsk->exec_file;
70246+ if (filp == NULL)
70247+ goto out_unlock;
70248+
70249+ tsk->is_writable = 0;
70250+ tsk->inherited = 0;
70251+
70252+ tsk->acl_sp_role = 1;
70253+ tsk->acl_role_id = ++acl_sp_role_value;
70254+ tsk->role = assigned;
70255+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
70256+
70257+ /* ignore additional mmap checks for processes that are writable
70258+ by the default ACL */
70259+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
70260+ if (unlikely(obj->mode & GR_WRITE))
70261+ tsk->is_writable = 1;
70262+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
70263+ if (unlikely(obj->mode & GR_WRITE))
70264+ tsk->is_writable = 1;
70265+
70266+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70267+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
70268+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
70269+#endif
70270+
70271+out_unlock:
70272+ read_unlock(&grsec_exec_file_lock);
70273+ read_unlock(&tasklist_lock);
70274+ return;
70275+}
70276+
70277+
70278+static void
70279+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
70280+{
70281+ struct task_struct *task = current;
70282+ const struct cred *cred = current_cred();
70283+
70284+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
70285+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70286+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70287+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
70288+
70289+ return;
70290+}
70291+
70292+static void
70293+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
70294+{
70295+ struct task_struct *task = current;
70296+ const struct cred *cred = current_cred();
70297+
70298+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70299+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70300+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70301+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
70302+
70303+ return;
70304+}
70305+
70306+static void
70307+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
70308+{
70309+ struct task_struct *task = current;
70310+ const struct cred *cred = current_cred();
70311+
70312+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70313+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70314+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70315+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
70316+
70317+ return;
70318+}
70319+
70320+static void
70321+gr_set_proc_res(struct task_struct *task)
70322+{
70323+ struct acl_subject_label *proc;
70324+ unsigned short i;
70325+
70326+ proc = task->acl;
70327+
70328+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
70329+ return;
70330+
70331+ for (i = 0; i < RLIM_NLIMITS; i++) {
70332+ if (!(proc->resmask & (1U << i)))
70333+ continue;
70334+
70335+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
70336+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
70337+
70338+ if (i == RLIMIT_CPU)
70339+ update_rlimit_cpu(task, proc->res[i].rlim_cur);
70340+ }
70341+
70342+ return;
70343+}
70344+
70345+/* both of the below must be called with
70346+ rcu_read_lock();
70347+ read_lock(&tasklist_lock);
70348+ read_lock(&grsec_exec_file_lock);
70349+*/
70350+
70351+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
70352+{
70353+ char *tmpname;
70354+ struct acl_subject_label *tmpsubj;
70355+ struct file *filp;
70356+ struct name_entry *nmatch;
70357+
70358+ filp = task->exec_file;
70359+ if (filp == NULL)
70360+ return NULL;
70361+
70362+ /* the following is to apply the correct subject
70363+ on binaries running when the RBAC system
70364+ is enabled, when the binaries have been
70365+ replaced or deleted since their execution
70366+ -----
70367+ when the RBAC system starts, the inode/dev
70368+ from exec_file will be one the RBAC system
70369+ is unaware of. It only knows the inode/dev
70370+ of the present file on disk, or the absence
70371+ of it.
70372+ */
70373+
70374+ if (filename)
70375+ nmatch = __lookup_name_entry(state, filename);
70376+ else {
70377+ preempt_disable();
70378+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
70379+
70380+ nmatch = __lookup_name_entry(state, tmpname);
70381+ preempt_enable();
70382+ }
70383+ tmpsubj = NULL;
70384+ if (nmatch) {
70385+ if (nmatch->deleted)
70386+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
70387+ else
70388+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
70389+ }
70390+ /* this also works for the reload case -- if we don't match a potentially inherited subject
70391+ then we fall back to a normal lookup based on the binary's ino/dev
70392+ */
70393+ if (tmpsubj == NULL)
70394+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
70395+
70396+ return tmpsubj;
70397+}
70398+
70399+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
70400+{
70401+ return __gr_get_subject_for_task(&running_polstate, task, filename);
70402+}
70403+
70404+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
70405+{
70406+ struct acl_object_label *obj;
70407+ struct file *filp;
70408+
70409+ filp = task->exec_file;
70410+
70411+ task->acl = subj;
70412+ task->is_writable = 0;
70413+ /* ignore additional mmap checks for processes that are writable
70414+ by the default ACL */
70415+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
70416+ if (unlikely(obj->mode & GR_WRITE))
70417+ task->is_writable = 1;
70418+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
70419+ if (unlikely(obj->mode & GR_WRITE))
70420+ task->is_writable = 1;
70421+
70422+ gr_set_proc_res(task);
70423+
70424+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70425+ 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);
70426+#endif
70427+}
70428+
70429+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
70430+{
70431+ __gr_apply_subject_to_task(&running_polstate, task, subj);
70432+}
70433+
70434+__u32
70435+gr_search_file(const struct dentry * dentry, const __u32 mode,
70436+ const struct vfsmount * mnt)
70437+{
70438+ __u32 retval = mode;
70439+ struct acl_subject_label *curracl;
70440+ struct acl_object_label *currobj;
70441+
70442+ if (unlikely(!(gr_status & GR_READY)))
70443+ return (mode & ~GR_AUDITS);
70444+
70445+ curracl = current->acl;
70446+
70447+ currobj = chk_obj_label(dentry, mnt, curracl);
70448+ retval = currobj->mode & mode;
70449+
70450+ /* if we're opening a specified transfer file for writing
70451+ (e.g. /dev/initctl), then transfer our role to init
70452+ */
70453+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
70454+ current->role->roletype & GR_ROLE_PERSIST)) {
70455+ struct task_struct *task = init_pid_ns.child_reaper;
70456+
70457+ if (task->role != current->role) {
70458+ struct acl_subject_label *subj;
70459+
70460+ task->acl_sp_role = 0;
70461+ task->acl_role_id = current->acl_role_id;
70462+ task->role = current->role;
70463+ rcu_read_lock();
70464+ read_lock(&grsec_exec_file_lock);
70465+ subj = gr_get_subject_for_task(task, NULL);
70466+ gr_apply_subject_to_task(task, subj);
70467+ read_unlock(&grsec_exec_file_lock);
70468+ rcu_read_unlock();
70469+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
70470+ }
70471+ }
70472+
70473+ if (unlikely
70474+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
70475+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
70476+ __u32 new_mode = mode;
70477+
70478+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
70479+
70480+ retval = new_mode;
70481+
70482+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
70483+ new_mode |= GR_INHERIT;
70484+
70485+ if (!(mode & GR_NOLEARN))
70486+ gr_log_learn(dentry, mnt, new_mode);
70487+ }
70488+
70489+ return retval;
70490+}
70491+
70492+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
70493+ const struct dentry *parent,
70494+ const struct vfsmount *mnt)
70495+{
70496+ struct name_entry *match;
70497+ struct acl_object_label *matchpo;
70498+ struct acl_subject_label *curracl;
70499+ char *path;
70500+
70501+ if (unlikely(!(gr_status & GR_READY)))
70502+ return NULL;
70503+
70504+ preempt_disable();
70505+ path = gr_to_filename_rbac(new_dentry, mnt);
70506+ match = lookup_name_entry_create(path);
70507+
70508+ curracl = current->acl;
70509+
70510+ if (match) {
70511+ read_lock(&gr_inode_lock);
70512+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
70513+ read_unlock(&gr_inode_lock);
70514+
70515+ if (matchpo) {
70516+ preempt_enable();
70517+ return matchpo;
70518+ }
70519+ }
70520+
70521+ // lookup parent
70522+
70523+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
70524+
70525+ preempt_enable();
70526+ return matchpo;
70527+}
70528+
70529+__u32
70530+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
70531+ const struct vfsmount * mnt, const __u32 mode)
70532+{
70533+ struct acl_object_label *matchpo;
70534+ __u32 retval;
70535+
70536+ if (unlikely(!(gr_status & GR_READY)))
70537+ return (mode & ~GR_AUDITS);
70538+
70539+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
70540+
70541+ retval = matchpo->mode & mode;
70542+
70543+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
70544+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
70545+ __u32 new_mode = mode;
70546+
70547+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
70548+
70549+ gr_log_learn(new_dentry, mnt, new_mode);
70550+ return new_mode;
70551+ }
70552+
70553+ return retval;
70554+}
70555+
70556+__u32
70557+gr_check_link(const struct dentry * new_dentry,
70558+ const struct dentry * parent_dentry,
70559+ const struct vfsmount * parent_mnt,
70560+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
70561+{
70562+ struct acl_object_label *obj;
70563+ __u32 oldmode, newmode;
70564+ __u32 needmode;
70565+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
70566+ GR_DELETE | GR_INHERIT;
70567+
70568+ if (unlikely(!(gr_status & GR_READY)))
70569+ return (GR_CREATE | GR_LINK);
70570+
70571+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
70572+ oldmode = obj->mode;
70573+
70574+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
70575+ newmode = obj->mode;
70576+
70577+ needmode = newmode & checkmodes;
70578+
70579+ // old name for hardlink must have at least the permissions of the new name
70580+ if ((oldmode & needmode) != needmode)
70581+ goto bad;
70582+
70583+ // if old name had restrictions/auditing, make sure the new name does as well
70584+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
70585+
70586+ // don't allow hardlinking of suid/sgid/fcapped files without permission
70587+ if (is_privileged_binary(old_dentry))
70588+ needmode |= GR_SETID;
70589+
70590+ if ((newmode & needmode) != needmode)
70591+ goto bad;
70592+
70593+ // enforce minimum permissions
70594+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
70595+ return newmode;
70596+bad:
70597+ needmode = oldmode;
70598+ if (is_privileged_binary(old_dentry))
70599+ needmode |= GR_SETID;
70600+
70601+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
70602+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
70603+ return (GR_CREATE | GR_LINK);
70604+ } else if (newmode & GR_SUPPRESS)
70605+ return GR_SUPPRESS;
70606+ else
70607+ return 0;
70608+}
70609+
70610+int
70611+gr_check_hidden_task(const struct task_struct *task)
70612+{
70613+ if (unlikely(!(gr_status & GR_READY)))
70614+ return 0;
70615+
70616+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
70617+ return 1;
70618+
70619+ return 0;
70620+}
70621+
70622+int
70623+gr_check_protected_task(const struct task_struct *task)
70624+{
70625+ if (unlikely(!(gr_status & GR_READY) || !task))
70626+ return 0;
70627+
70628+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
70629+ task->acl != current->acl)
70630+ return 1;
70631+
70632+ return 0;
70633+}
70634+
70635+int
70636+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
70637+{
70638+ struct task_struct *p;
70639+ int ret = 0;
70640+
70641+ if (unlikely(!(gr_status & GR_READY) || !pid))
70642+ return ret;
70643+
70644+ read_lock(&tasklist_lock);
70645+ do_each_pid_task(pid, type, p) {
70646+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
70647+ p->acl != current->acl) {
70648+ ret = 1;
70649+ goto out;
70650+ }
70651+ } while_each_pid_task(pid, type, p);
70652+out:
70653+ read_unlock(&tasklist_lock);
70654+
70655+ return ret;
70656+}
70657+
70658+void
70659+gr_copy_label(struct task_struct *tsk)
70660+{
70661+ struct task_struct *p = current;
70662+
70663+ tsk->inherited = p->inherited;
70664+ tsk->acl_sp_role = 0;
70665+ tsk->acl_role_id = p->acl_role_id;
70666+ tsk->acl = p->acl;
70667+ tsk->role = p->role;
70668+ tsk->signal->used_accept = 0;
70669+ tsk->signal->curr_ip = p->signal->curr_ip;
70670+ tsk->signal->saved_ip = p->signal->saved_ip;
70671+ if (p->exec_file)
70672+ get_file(p->exec_file);
70673+ tsk->exec_file = p->exec_file;
70674+ tsk->is_writable = p->is_writable;
70675+ if (unlikely(p->signal->used_accept)) {
70676+ p->signal->curr_ip = 0;
70677+ p->signal->saved_ip = 0;
70678+ }
70679+
70680+ return;
70681+}
70682+
70683+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
70684+
70685+int
70686+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
70687+{
70688+ unsigned int i;
70689+ __u16 num;
70690+ uid_t *uidlist;
70691+ uid_t curuid;
70692+ int realok = 0;
70693+ int effectiveok = 0;
70694+ int fsok = 0;
70695+ uid_t globalreal, globaleffective, globalfs;
70696+
70697+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
70698+ struct user_struct *user;
70699+
70700+ if (!uid_valid(real))
70701+ goto skipit;
70702+
70703+ /* find user based on global namespace */
70704+
70705+ globalreal = GR_GLOBAL_UID(real);
70706+
70707+ user = find_user(make_kuid(&init_user_ns, globalreal));
70708+ if (user == NULL)
70709+ goto skipit;
70710+
70711+ if (gr_process_kernel_setuid_ban(user)) {
70712+ /* for find_user */
70713+ free_uid(user);
70714+ return 1;
70715+ }
70716+
70717+ /* for find_user */
70718+ free_uid(user);
70719+
70720+skipit:
70721+#endif
70722+
70723+ if (unlikely(!(gr_status & GR_READY)))
70724+ return 0;
70725+
70726+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
70727+ gr_log_learn_uid_change(real, effective, fs);
70728+
70729+ num = current->acl->user_trans_num;
70730+ uidlist = current->acl->user_transitions;
70731+
70732+ if (uidlist == NULL)
70733+ return 0;
70734+
70735+ if (!uid_valid(real)) {
70736+ realok = 1;
70737+ globalreal = (uid_t)-1;
70738+ } else {
70739+ globalreal = GR_GLOBAL_UID(real);
70740+ }
70741+ if (!uid_valid(effective)) {
70742+ effectiveok = 1;
70743+ globaleffective = (uid_t)-1;
70744+ } else {
70745+ globaleffective = GR_GLOBAL_UID(effective);
70746+ }
70747+ if (!uid_valid(fs)) {
70748+ fsok = 1;
70749+ globalfs = (uid_t)-1;
70750+ } else {
70751+ globalfs = GR_GLOBAL_UID(fs);
70752+ }
70753+
70754+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
70755+ for (i = 0; i < num; i++) {
70756+ curuid = uidlist[i];
70757+ if (globalreal == curuid)
70758+ realok = 1;
70759+ if (globaleffective == curuid)
70760+ effectiveok = 1;
70761+ if (globalfs == curuid)
70762+ fsok = 1;
70763+ }
70764+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
70765+ for (i = 0; i < num; i++) {
70766+ curuid = uidlist[i];
70767+ if (globalreal == curuid)
70768+ break;
70769+ if (globaleffective == curuid)
70770+ break;
70771+ if (globalfs == curuid)
70772+ break;
70773+ }
70774+ /* not in deny list */
70775+ if (i == num) {
70776+ realok = 1;
70777+ effectiveok = 1;
70778+ fsok = 1;
70779+ }
70780+ }
70781+
70782+ if (realok && effectiveok && fsok)
70783+ return 0;
70784+ else {
70785+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
70786+ return 1;
70787+ }
70788+}
70789+
70790+int
70791+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
70792+{
70793+ unsigned int i;
70794+ __u16 num;
70795+ gid_t *gidlist;
70796+ gid_t curgid;
70797+ int realok = 0;
70798+ int effectiveok = 0;
70799+ int fsok = 0;
70800+ gid_t globalreal, globaleffective, globalfs;
70801+
70802+ if (unlikely(!(gr_status & GR_READY)))
70803+ return 0;
70804+
70805+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
70806+ gr_log_learn_gid_change(real, effective, fs);
70807+
70808+ num = current->acl->group_trans_num;
70809+ gidlist = current->acl->group_transitions;
70810+
70811+ if (gidlist == NULL)
70812+ return 0;
70813+
70814+ if (!gid_valid(real)) {
70815+ realok = 1;
70816+ globalreal = (gid_t)-1;
70817+ } else {
70818+ globalreal = GR_GLOBAL_GID(real);
70819+ }
70820+ if (!gid_valid(effective)) {
70821+ effectiveok = 1;
70822+ globaleffective = (gid_t)-1;
70823+ } else {
70824+ globaleffective = GR_GLOBAL_GID(effective);
70825+ }
70826+ if (!gid_valid(fs)) {
70827+ fsok = 1;
70828+ globalfs = (gid_t)-1;
70829+ } else {
70830+ globalfs = GR_GLOBAL_GID(fs);
70831+ }
70832+
70833+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
70834+ for (i = 0; i < num; i++) {
70835+ curgid = gidlist[i];
70836+ if (globalreal == curgid)
70837+ realok = 1;
70838+ if (globaleffective == curgid)
70839+ effectiveok = 1;
70840+ if (globalfs == curgid)
70841+ fsok = 1;
70842+ }
70843+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
70844+ for (i = 0; i < num; i++) {
70845+ curgid = gidlist[i];
70846+ if (globalreal == curgid)
70847+ break;
70848+ if (globaleffective == curgid)
70849+ break;
70850+ if (globalfs == curgid)
70851+ break;
70852+ }
70853+ /* not in deny list */
70854+ if (i == num) {
70855+ realok = 1;
70856+ effectiveok = 1;
70857+ fsok = 1;
70858+ }
70859+ }
70860+
70861+ if (realok && effectiveok && fsok)
70862+ return 0;
70863+ else {
70864+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
70865+ return 1;
70866+ }
70867+}
70868+
70869+extern int gr_acl_is_capable(const int cap);
70870+
70871+void
70872+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
70873+{
70874+ struct acl_role_label *role = task->role;
70875+ struct acl_subject_label *subj = NULL;
70876+ struct acl_object_label *obj;
70877+ struct file *filp;
70878+ uid_t uid;
70879+ gid_t gid;
70880+
70881+ if (unlikely(!(gr_status & GR_READY)))
70882+ return;
70883+
70884+ uid = GR_GLOBAL_UID(kuid);
70885+ gid = GR_GLOBAL_GID(kgid);
70886+
70887+ filp = task->exec_file;
70888+
70889+ /* kernel process, we'll give them the kernel role */
70890+ if (unlikely(!filp)) {
70891+ task->role = running_polstate.kernel_role;
70892+ task->acl = running_polstate.kernel_role->root_label;
70893+ return;
70894+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
70895+ /* save the current ip at time of role lookup so that the proper
70896+ IP will be learned for role_allowed_ip */
70897+ task->signal->saved_ip = task->signal->curr_ip;
70898+ role = lookup_acl_role_label(task, uid, gid);
70899+ }
70900+
70901+ /* don't change the role if we're not a privileged process */
70902+ if (role && task->role != role &&
70903+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
70904+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
70905+ return;
70906+
70907+ /* perform subject lookup in possibly new role
70908+ we can use this result below in the case where role == task->role
70909+ */
70910+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
70911+
70912+ /* if we changed uid/gid, but result in the same role
70913+ and are using inheritance, don't lose the inherited subject
70914+ if current subject is other than what normal lookup
70915+ would result in, we arrived via inheritance, don't
70916+ lose subject
70917+ */
70918+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
70919+ (subj == task->acl)))
70920+ task->acl = subj;
70921+
70922+ /* leave task->inherited unaffected */
70923+
70924+ task->role = role;
70925+
70926+ task->is_writable = 0;
70927+
70928+ /* ignore additional mmap checks for processes that are writable
70929+ by the default ACL */
70930+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
70931+ if (unlikely(obj->mode & GR_WRITE))
70932+ task->is_writable = 1;
70933+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
70934+ if (unlikely(obj->mode & GR_WRITE))
70935+ task->is_writable = 1;
70936+
70937+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70938+ 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);
70939+#endif
70940+
70941+ gr_set_proc_res(task);
70942+
70943+ return;
70944+}
70945+
70946+int
70947+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
70948+ const int unsafe_flags)
70949+{
70950+ struct task_struct *task = current;
70951+ struct acl_subject_label *newacl;
70952+ struct acl_object_label *obj;
70953+ __u32 retmode;
70954+
70955+ if (unlikely(!(gr_status & GR_READY)))
70956+ return 0;
70957+
70958+ newacl = chk_subj_label(dentry, mnt, task->role);
70959+
70960+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
70961+ did an exec
70962+ */
70963+ rcu_read_lock();
70964+ read_lock(&tasklist_lock);
70965+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
70966+ (task->parent->acl->mode & GR_POVERRIDE))) {
70967+ read_unlock(&tasklist_lock);
70968+ rcu_read_unlock();
70969+ goto skip_check;
70970+ }
70971+ read_unlock(&tasklist_lock);
70972+ rcu_read_unlock();
70973+
70974+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
70975+ !(task->role->roletype & GR_ROLE_GOD) &&
70976+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
70977+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
70978+ if (unsafe_flags & LSM_UNSAFE_SHARE)
70979+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
70980+ else
70981+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
70982+ return -EACCES;
70983+ }
70984+
70985+skip_check:
70986+
70987+ obj = chk_obj_label(dentry, mnt, task->acl);
70988+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
70989+
70990+ if (!(task->acl->mode & GR_INHERITLEARN) &&
70991+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
70992+ if (obj->nested)
70993+ task->acl = obj->nested;
70994+ else
70995+ task->acl = newacl;
70996+ task->inherited = 0;
70997+ } else {
70998+ task->inherited = 1;
70999+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
71000+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
71001+ }
71002+
71003+ task->is_writable = 0;
71004+
71005+ /* ignore additional mmap checks for processes that are writable
71006+ by the default ACL */
71007+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
71008+ if (unlikely(obj->mode & GR_WRITE))
71009+ task->is_writable = 1;
71010+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
71011+ if (unlikely(obj->mode & GR_WRITE))
71012+ task->is_writable = 1;
71013+
71014+ gr_set_proc_res(task);
71015+
71016+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71017+ 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);
71018+#endif
71019+ return 0;
71020+}
71021+
71022+/* always called with valid inodev ptr */
71023+static void
71024+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
71025+{
71026+ struct acl_object_label *matchpo;
71027+ struct acl_subject_label *matchps;
71028+ struct acl_subject_label *subj;
71029+ struct acl_role_label *role;
71030+ unsigned int x;
71031+
71032+ FOR_EACH_ROLE_START(role)
71033+ FOR_EACH_SUBJECT_START(role, subj, x)
71034+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
71035+ matchpo->mode |= GR_DELETED;
71036+ FOR_EACH_SUBJECT_END(subj,x)
71037+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
71038+ /* nested subjects aren't in the role's subj_hash table */
71039+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
71040+ matchpo->mode |= GR_DELETED;
71041+ FOR_EACH_NESTED_SUBJECT_END(subj)
71042+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
71043+ matchps->mode |= GR_DELETED;
71044+ FOR_EACH_ROLE_END(role)
71045+
71046+ inodev->nentry->deleted = 1;
71047+
71048+ return;
71049+}
71050+
71051+void
71052+gr_handle_delete(const ino_t ino, const dev_t dev)
71053+{
71054+ struct inodev_entry *inodev;
71055+
71056+ if (unlikely(!(gr_status & GR_READY)))
71057+ return;
71058+
71059+ write_lock(&gr_inode_lock);
71060+ inodev = lookup_inodev_entry(ino, dev);
71061+ if (inodev != NULL)
71062+ do_handle_delete(inodev, ino, dev);
71063+ write_unlock(&gr_inode_lock);
71064+
71065+ return;
71066+}
71067+
71068+static void
71069+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
71070+ const ino_t newinode, const dev_t newdevice,
71071+ struct acl_subject_label *subj)
71072+{
71073+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
71074+ struct acl_object_label *match;
71075+
71076+ match = subj->obj_hash[index];
71077+
71078+ while (match && (match->inode != oldinode ||
71079+ match->device != olddevice ||
71080+ !(match->mode & GR_DELETED)))
71081+ match = match->next;
71082+
71083+ if (match && (match->inode == oldinode)
71084+ && (match->device == olddevice)
71085+ && (match->mode & GR_DELETED)) {
71086+ if (match->prev == NULL) {
71087+ subj->obj_hash[index] = match->next;
71088+ if (match->next != NULL)
71089+ match->next->prev = NULL;
71090+ } else {
71091+ match->prev->next = match->next;
71092+ if (match->next != NULL)
71093+ match->next->prev = match->prev;
71094+ }
71095+ match->prev = NULL;
71096+ match->next = NULL;
71097+ match->inode = newinode;
71098+ match->device = newdevice;
71099+ match->mode &= ~GR_DELETED;
71100+
71101+ insert_acl_obj_label(match, subj);
71102+ }
71103+
71104+ return;
71105+}
71106+
71107+static void
71108+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
71109+ const ino_t newinode, const dev_t newdevice,
71110+ struct acl_role_label *role)
71111+{
71112+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
71113+ struct acl_subject_label *match;
71114+
71115+ match = role->subj_hash[index];
71116+
71117+ while (match && (match->inode != oldinode ||
71118+ match->device != olddevice ||
71119+ !(match->mode & GR_DELETED)))
71120+ match = match->next;
71121+
71122+ if (match && (match->inode == oldinode)
71123+ && (match->device == olddevice)
71124+ && (match->mode & GR_DELETED)) {
71125+ if (match->prev == NULL) {
71126+ role->subj_hash[index] = match->next;
71127+ if (match->next != NULL)
71128+ match->next->prev = NULL;
71129+ } else {
71130+ match->prev->next = match->next;
71131+ if (match->next != NULL)
71132+ match->next->prev = match->prev;
71133+ }
71134+ match->prev = NULL;
71135+ match->next = NULL;
71136+ match->inode = newinode;
71137+ match->device = newdevice;
71138+ match->mode &= ~GR_DELETED;
71139+
71140+ insert_acl_subj_label(match, role);
71141+ }
71142+
71143+ return;
71144+}
71145+
71146+static void
71147+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
71148+ const ino_t newinode, const dev_t newdevice)
71149+{
71150+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
71151+ struct inodev_entry *match;
71152+
71153+ match = running_polstate.inodev_set.i_hash[index];
71154+
71155+ while (match && (match->nentry->inode != oldinode ||
71156+ match->nentry->device != olddevice || !match->nentry->deleted))
71157+ match = match->next;
71158+
71159+ if (match && (match->nentry->inode == oldinode)
71160+ && (match->nentry->device == olddevice) &&
71161+ match->nentry->deleted) {
71162+ if (match->prev == NULL) {
71163+ running_polstate.inodev_set.i_hash[index] = match->next;
71164+ if (match->next != NULL)
71165+ match->next->prev = NULL;
71166+ } else {
71167+ match->prev->next = match->next;
71168+ if (match->next != NULL)
71169+ match->next->prev = match->prev;
71170+ }
71171+ match->prev = NULL;
71172+ match->next = NULL;
71173+ match->nentry->inode = newinode;
71174+ match->nentry->device = newdevice;
71175+ match->nentry->deleted = 0;
71176+
71177+ insert_inodev_entry(match);
71178+ }
71179+
71180+ return;
71181+}
71182+
71183+static void
71184+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
71185+{
71186+ struct acl_subject_label *subj;
71187+ struct acl_role_label *role;
71188+ unsigned int x;
71189+
71190+ FOR_EACH_ROLE_START(role)
71191+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
71192+
71193+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
71194+ if ((subj->inode == ino) && (subj->device == dev)) {
71195+ subj->inode = ino;
71196+ subj->device = dev;
71197+ }
71198+ /* nested subjects aren't in the role's subj_hash table */
71199+ update_acl_obj_label(matchn->inode, matchn->device,
71200+ ino, dev, subj);
71201+ FOR_EACH_NESTED_SUBJECT_END(subj)
71202+ FOR_EACH_SUBJECT_START(role, subj, x)
71203+ update_acl_obj_label(matchn->inode, matchn->device,
71204+ ino, dev, subj);
71205+ FOR_EACH_SUBJECT_END(subj,x)
71206+ FOR_EACH_ROLE_END(role)
71207+
71208+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
71209+
71210+ return;
71211+}
71212+
71213+static void
71214+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
71215+ const struct vfsmount *mnt)
71216+{
71217+ ino_t ino = dentry->d_inode->i_ino;
71218+ dev_t dev = __get_dev(dentry);
71219+
71220+ __do_handle_create(matchn, ino, dev);
71221+
71222+ return;
71223+}
71224+
71225+void
71226+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
71227+{
71228+ struct name_entry *matchn;
71229+
71230+ if (unlikely(!(gr_status & GR_READY)))
71231+ return;
71232+
71233+ preempt_disable();
71234+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
71235+
71236+ if (unlikely((unsigned long)matchn)) {
71237+ write_lock(&gr_inode_lock);
71238+ do_handle_create(matchn, dentry, mnt);
71239+ write_unlock(&gr_inode_lock);
71240+ }
71241+ preempt_enable();
71242+
71243+ return;
71244+}
71245+
71246+void
71247+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
71248+{
71249+ struct name_entry *matchn;
71250+
71251+ if (unlikely(!(gr_status & GR_READY)))
71252+ return;
71253+
71254+ preempt_disable();
71255+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
71256+
71257+ if (unlikely((unsigned long)matchn)) {
71258+ write_lock(&gr_inode_lock);
71259+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
71260+ write_unlock(&gr_inode_lock);
71261+ }
71262+ preempt_enable();
71263+
71264+ return;
71265+}
71266+
71267+void
71268+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
71269+ struct dentry *old_dentry,
71270+ struct dentry *new_dentry,
71271+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
71272+{
71273+ struct name_entry *matchn;
71274+ struct name_entry *matchn2 = NULL;
71275+ struct inodev_entry *inodev;
71276+ struct inode *inode = new_dentry->d_inode;
71277+ ino_t old_ino = old_dentry->d_inode->i_ino;
71278+ dev_t old_dev = __get_dev(old_dentry);
71279+ unsigned int exchange = flags & RENAME_EXCHANGE;
71280+
71281+ /* vfs_rename swaps the name and parent link for old_dentry and
71282+ new_dentry
71283+ at this point, old_dentry has the new name, parent link, and inode
71284+ for the renamed file
71285+ if a file is being replaced by a rename, new_dentry has the inode
71286+ and name for the replaced file
71287+ */
71288+
71289+ if (unlikely(!(gr_status & GR_READY)))
71290+ return;
71291+
71292+ preempt_disable();
71293+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
71294+
71295+ /* exchange cases:
71296+ a filename exists for the source, but not dest
71297+ do a recreate on source
71298+ a filename exists for the dest, but not source
71299+ do a recreate on dest
71300+ a filename exists for both source and dest
71301+ delete source and dest, then create source and dest
71302+ a filename exists for neither source nor dest
71303+ no updates needed
71304+
71305+ the name entry lookups get us the old inode/dev associated with
71306+ each name, so do the deletes first (if possible) so that when
71307+ we do the create, we pick up on the right entries
71308+ */
71309+
71310+ if (exchange)
71311+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
71312+
71313+ /* we wouldn't have to check d_inode if it weren't for
71314+ NFS silly-renaming
71315+ */
71316+
71317+ write_lock(&gr_inode_lock);
71318+ if (unlikely((replace || exchange) && inode)) {
71319+ ino_t new_ino = inode->i_ino;
71320+ dev_t new_dev = __get_dev(new_dentry);
71321+
71322+ inodev = lookup_inodev_entry(new_ino, new_dev);
71323+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
71324+ do_handle_delete(inodev, new_ino, new_dev);
71325+ }
71326+
71327+ inodev = lookup_inodev_entry(old_ino, old_dev);
71328+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
71329+ do_handle_delete(inodev, old_ino, old_dev);
71330+
71331+ if (unlikely(matchn != NULL))
71332+ do_handle_create(matchn, old_dentry, mnt);
71333+
71334+ if (unlikely(matchn2 != NULL))
71335+ do_handle_create(matchn2, new_dentry, mnt);
71336+
71337+ write_unlock(&gr_inode_lock);
71338+ preempt_enable();
71339+
71340+ return;
71341+}
71342+
71343+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
71344+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
71345+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
71346+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
71347+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
71348+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
71349+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
71350+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
71351+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
71352+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
71353+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
71354+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
71355+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
71356+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
71357+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
71358+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
71359+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
71360+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
71361+};
71362+
71363+void
71364+gr_learn_resource(const struct task_struct *task,
71365+ const int res, const unsigned long wanted, const int gt)
71366+{
71367+ struct acl_subject_label *acl;
71368+ const struct cred *cred;
71369+
71370+ if (unlikely((gr_status & GR_READY) &&
71371+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
71372+ goto skip_reslog;
71373+
71374+ gr_log_resource(task, res, wanted, gt);
71375+skip_reslog:
71376+
71377+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
71378+ return;
71379+
71380+ acl = task->acl;
71381+
71382+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
71383+ !(acl->resmask & (1U << (unsigned short) res))))
71384+ return;
71385+
71386+ if (wanted >= acl->res[res].rlim_cur) {
71387+ unsigned long res_add;
71388+
71389+ res_add = wanted + res_learn_bumps[res];
71390+
71391+ acl->res[res].rlim_cur = res_add;
71392+
71393+ if (wanted > acl->res[res].rlim_max)
71394+ acl->res[res].rlim_max = res_add;
71395+
71396+ /* only log the subject filename, since resource logging is supported for
71397+ single-subject learning only */
71398+ rcu_read_lock();
71399+ cred = __task_cred(task);
71400+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
71401+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
71402+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
71403+ "", (unsigned long) res, &task->signal->saved_ip);
71404+ rcu_read_unlock();
71405+ }
71406+
71407+ return;
71408+}
71409+EXPORT_SYMBOL_GPL(gr_learn_resource);
71410+#endif
71411+
71412+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
71413+void
71414+pax_set_initial_flags(struct linux_binprm *bprm)
71415+{
71416+ struct task_struct *task = current;
71417+ struct acl_subject_label *proc;
71418+ unsigned long flags;
71419+
71420+ if (unlikely(!(gr_status & GR_READY)))
71421+ return;
71422+
71423+ flags = pax_get_flags(task);
71424+
71425+ proc = task->acl;
71426+
71427+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
71428+ flags &= ~MF_PAX_PAGEEXEC;
71429+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
71430+ flags &= ~MF_PAX_SEGMEXEC;
71431+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
71432+ flags &= ~MF_PAX_RANDMMAP;
71433+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
71434+ flags &= ~MF_PAX_EMUTRAMP;
71435+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
71436+ flags &= ~MF_PAX_MPROTECT;
71437+
71438+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
71439+ flags |= MF_PAX_PAGEEXEC;
71440+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
71441+ flags |= MF_PAX_SEGMEXEC;
71442+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
71443+ flags |= MF_PAX_RANDMMAP;
71444+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
71445+ flags |= MF_PAX_EMUTRAMP;
71446+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
71447+ flags |= MF_PAX_MPROTECT;
71448+
71449+ pax_set_flags(task, flags);
71450+
71451+ return;
71452+}
71453+#endif
71454+
71455+int
71456+gr_handle_proc_ptrace(struct task_struct *task)
71457+{
71458+ struct file *filp;
71459+ struct task_struct *tmp = task;
71460+ struct task_struct *curtemp = current;
71461+ __u32 retmode;
71462+
71463+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
71464+ if (unlikely(!(gr_status & GR_READY)))
71465+ return 0;
71466+#endif
71467+
71468+ read_lock(&tasklist_lock);
71469+ read_lock(&grsec_exec_file_lock);
71470+ filp = task->exec_file;
71471+
71472+ while (task_pid_nr(tmp) > 0) {
71473+ if (tmp == curtemp)
71474+ break;
71475+ tmp = tmp->real_parent;
71476+ }
71477+
71478+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
71479+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
71480+ read_unlock(&grsec_exec_file_lock);
71481+ read_unlock(&tasklist_lock);
71482+ return 1;
71483+ }
71484+
71485+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71486+ if (!(gr_status & GR_READY)) {
71487+ read_unlock(&grsec_exec_file_lock);
71488+ read_unlock(&tasklist_lock);
71489+ return 0;
71490+ }
71491+#endif
71492+
71493+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
71494+ read_unlock(&grsec_exec_file_lock);
71495+ read_unlock(&tasklist_lock);
71496+
71497+ if (retmode & GR_NOPTRACE)
71498+ return 1;
71499+
71500+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
71501+ && (current->acl != task->acl || (current->acl != current->role->root_label
71502+ && task_pid_nr(current) != task_pid_nr(task))))
71503+ return 1;
71504+
71505+ return 0;
71506+}
71507+
71508+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
71509+{
71510+ if (unlikely(!(gr_status & GR_READY)))
71511+ return;
71512+
71513+ if (!(current->role->roletype & GR_ROLE_GOD))
71514+ return;
71515+
71516+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
71517+ p->role->rolename, gr_task_roletype_to_char(p),
71518+ p->acl->filename);
71519+}
71520+
71521+int
71522+gr_handle_ptrace(struct task_struct *task, const long request)
71523+{
71524+ struct task_struct *tmp = task;
71525+ struct task_struct *curtemp = current;
71526+ __u32 retmode;
71527+
71528+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
71529+ if (unlikely(!(gr_status & GR_READY)))
71530+ return 0;
71531+#endif
71532+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
71533+ read_lock(&tasklist_lock);
71534+ while (task_pid_nr(tmp) > 0) {
71535+ if (tmp == curtemp)
71536+ break;
71537+ tmp = tmp->real_parent;
71538+ }
71539+
71540+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
71541+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
71542+ read_unlock(&tasklist_lock);
71543+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71544+ return 1;
71545+ }
71546+ read_unlock(&tasklist_lock);
71547+ }
71548+
71549+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71550+ if (!(gr_status & GR_READY))
71551+ return 0;
71552+#endif
71553+
71554+ read_lock(&grsec_exec_file_lock);
71555+ if (unlikely(!task->exec_file)) {
71556+ read_unlock(&grsec_exec_file_lock);
71557+ return 0;
71558+ }
71559+
71560+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
71561+ read_unlock(&grsec_exec_file_lock);
71562+
71563+ if (retmode & GR_NOPTRACE) {
71564+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71565+ return 1;
71566+ }
71567+
71568+ if (retmode & GR_PTRACERD) {
71569+ switch (request) {
71570+ case PTRACE_SEIZE:
71571+ case PTRACE_POKETEXT:
71572+ case PTRACE_POKEDATA:
71573+ case PTRACE_POKEUSR:
71574+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
71575+ case PTRACE_SETREGS:
71576+ case PTRACE_SETFPREGS:
71577+#endif
71578+#ifdef CONFIG_X86
71579+ case PTRACE_SETFPXREGS:
71580+#endif
71581+#ifdef CONFIG_ALTIVEC
71582+ case PTRACE_SETVRREGS:
71583+#endif
71584+ return 1;
71585+ default:
71586+ return 0;
71587+ }
71588+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
71589+ !(current->role->roletype & GR_ROLE_GOD) &&
71590+ (current->acl != task->acl)) {
71591+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71592+ return 1;
71593+ }
71594+
71595+ return 0;
71596+}
71597+
71598+static int is_writable_mmap(const struct file *filp)
71599+{
71600+ struct task_struct *task = current;
71601+ struct acl_object_label *obj, *obj2;
71602+
71603+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
71604+ !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))) {
71605+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
71606+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
71607+ task->role->root_label);
71608+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
71609+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
71610+ return 1;
71611+ }
71612+ }
71613+ return 0;
71614+}
71615+
71616+int
71617+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
71618+{
71619+ __u32 mode;
71620+
71621+ if (unlikely(!file || !(prot & PROT_EXEC)))
71622+ return 1;
71623+
71624+ if (is_writable_mmap(file))
71625+ return 0;
71626+
71627+ mode =
71628+ gr_search_file(file->f_path.dentry,
71629+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
71630+ file->f_path.mnt);
71631+
71632+ if (!gr_tpe_allow(file))
71633+ return 0;
71634+
71635+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
71636+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71637+ return 0;
71638+ } else if (unlikely(!(mode & GR_EXEC))) {
71639+ return 0;
71640+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
71641+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71642+ return 1;
71643+ }
71644+
71645+ return 1;
71646+}
71647+
71648+int
71649+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
71650+{
71651+ __u32 mode;
71652+
71653+ if (unlikely(!file || !(prot & PROT_EXEC)))
71654+ return 1;
71655+
71656+ if (is_writable_mmap(file))
71657+ return 0;
71658+
71659+ mode =
71660+ gr_search_file(file->f_path.dentry,
71661+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
71662+ file->f_path.mnt);
71663+
71664+ if (!gr_tpe_allow(file))
71665+ return 0;
71666+
71667+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
71668+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71669+ return 0;
71670+ } else if (unlikely(!(mode & GR_EXEC))) {
71671+ return 0;
71672+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
71673+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71674+ return 1;
71675+ }
71676+
71677+ return 1;
71678+}
71679+
71680+void
71681+gr_acl_handle_psacct(struct task_struct *task, const long code)
71682+{
71683+ unsigned long runtime, cputime;
71684+ cputime_t utime, stime;
71685+ unsigned int wday, cday;
71686+ __u8 whr, chr;
71687+ __u8 wmin, cmin;
71688+ __u8 wsec, csec;
71689+ struct timespec curtime, starttime;
71690+
71691+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
71692+ !(task->acl->mode & GR_PROCACCT)))
71693+ return;
71694+
71695+ curtime = ns_to_timespec(ktime_get_ns());
71696+ starttime = ns_to_timespec(task->start_time);
71697+ runtime = curtime.tv_sec - starttime.tv_sec;
71698+ wday = runtime / (60 * 60 * 24);
71699+ runtime -= wday * (60 * 60 * 24);
71700+ whr = runtime / (60 * 60);
71701+ runtime -= whr * (60 * 60);
71702+ wmin = runtime / 60;
71703+ runtime -= wmin * 60;
71704+ wsec = runtime;
71705+
71706+ task_cputime(task, &utime, &stime);
71707+ cputime = cputime_to_secs(utime + stime);
71708+ cday = cputime / (60 * 60 * 24);
71709+ cputime -= cday * (60 * 60 * 24);
71710+ chr = cputime / (60 * 60);
71711+ cputime -= chr * (60 * 60);
71712+ cmin = cputime / 60;
71713+ cputime -= cmin * 60;
71714+ csec = cputime;
71715+
71716+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
71717+
71718+ return;
71719+}
71720+
71721+#ifdef CONFIG_TASKSTATS
71722+int gr_is_taskstats_denied(int pid)
71723+{
71724+ struct task_struct *task;
71725+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71726+ const struct cred *cred;
71727+#endif
71728+ int ret = 0;
71729+
71730+ /* restrict taskstats viewing to un-chrooted root users
71731+ who have the 'view' subject flag if the RBAC system is enabled
71732+ */
71733+
71734+ rcu_read_lock();
71735+ read_lock(&tasklist_lock);
71736+ task = find_task_by_vpid(pid);
71737+ if (task) {
71738+#ifdef CONFIG_GRKERNSEC_CHROOT
71739+ if (proc_is_chrooted(task))
71740+ ret = -EACCES;
71741+#endif
71742+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71743+ cred = __task_cred(task);
71744+#ifdef CONFIG_GRKERNSEC_PROC_USER
71745+ if (gr_is_global_nonroot(cred->uid))
71746+ ret = -EACCES;
71747+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71748+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
71749+ ret = -EACCES;
71750+#endif
71751+#endif
71752+ if (gr_status & GR_READY) {
71753+ if (!(task->acl->mode & GR_VIEW))
71754+ ret = -EACCES;
71755+ }
71756+ } else
71757+ ret = -ENOENT;
71758+
71759+ read_unlock(&tasklist_lock);
71760+ rcu_read_unlock();
71761+
71762+ return ret;
71763+}
71764+#endif
71765+
71766+/* AUXV entries are filled via a descendant of search_binary_handler
71767+ after we've already applied the subject for the target
71768+*/
71769+int gr_acl_enable_at_secure(void)
71770+{
71771+ if (unlikely(!(gr_status & GR_READY)))
71772+ return 0;
71773+
71774+ if (current->acl->mode & GR_ATSECURE)
71775+ return 1;
71776+
71777+ return 0;
71778+}
71779+
71780+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
71781+{
71782+ struct task_struct *task = current;
71783+ struct dentry *dentry = file->f_path.dentry;
71784+ struct vfsmount *mnt = file->f_path.mnt;
71785+ struct acl_object_label *obj, *tmp;
71786+ struct acl_subject_label *subj;
71787+ unsigned int bufsize;
71788+ int is_not_root;
71789+ char *path;
71790+ dev_t dev = __get_dev(dentry);
71791+
71792+ if (unlikely(!(gr_status & GR_READY)))
71793+ return 1;
71794+
71795+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
71796+ return 1;
71797+
71798+ /* ignore Eric Biederman */
71799+ if (IS_PRIVATE(dentry->d_inode))
71800+ return 1;
71801+
71802+ subj = task->acl;
71803+ read_lock(&gr_inode_lock);
71804+ do {
71805+ obj = lookup_acl_obj_label(ino, dev, subj);
71806+ if (obj != NULL) {
71807+ read_unlock(&gr_inode_lock);
71808+ return (obj->mode & GR_FIND) ? 1 : 0;
71809+ }
71810+ } while ((subj = subj->parent_subject));
71811+ read_unlock(&gr_inode_lock);
71812+
71813+ /* this is purely an optimization since we're looking for an object
71814+ for the directory we're doing a readdir on
71815+ if it's possible for any globbed object to match the entry we're
71816+ filling into the directory, then the object we find here will be
71817+ an anchor point with attached globbed objects
71818+ */
71819+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
71820+ if (obj->globbed == NULL)
71821+ return (obj->mode & GR_FIND) ? 1 : 0;
71822+
71823+ is_not_root = ((obj->filename[0] == '/') &&
71824+ (obj->filename[1] == '\0')) ? 0 : 1;
71825+ bufsize = PAGE_SIZE - namelen - is_not_root;
71826+
71827+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
71828+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
71829+ return 1;
71830+
71831+ preempt_disable();
71832+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
71833+ bufsize);
71834+
71835+ bufsize = strlen(path);
71836+
71837+ /* if base is "/", don't append an additional slash */
71838+ if (is_not_root)
71839+ *(path + bufsize) = '/';
71840+ memcpy(path + bufsize + is_not_root, name, namelen);
71841+ *(path + bufsize + namelen + is_not_root) = '\0';
71842+
71843+ tmp = obj->globbed;
71844+ while (tmp) {
71845+ if (!glob_match(tmp->filename, path)) {
71846+ preempt_enable();
71847+ return (tmp->mode & GR_FIND) ? 1 : 0;
71848+ }
71849+ tmp = tmp->next;
71850+ }
71851+ preempt_enable();
71852+ return (obj->mode & GR_FIND) ? 1 : 0;
71853+}
71854+
71855+void gr_put_exec_file(struct task_struct *task)
71856+{
71857+ struct file *filp;
71858+
71859+ write_lock(&grsec_exec_file_lock);
71860+ filp = task->exec_file;
71861+ task->exec_file = NULL;
71862+ write_unlock(&grsec_exec_file_lock);
71863+
71864+ if (filp)
71865+ fput(filp);
71866+
71867+ return;
71868+}
71869+
71870+
71871+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
71872+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
71873+#endif
71874+#ifdef CONFIG_SECURITY
71875+EXPORT_SYMBOL_GPL(gr_check_user_change);
71876+EXPORT_SYMBOL_GPL(gr_check_group_change);
71877+#endif
71878+
71879diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
71880new file mode 100644
71881index 0000000..18ffbbd
71882--- /dev/null
71883+++ b/grsecurity/gracl_alloc.c
71884@@ -0,0 +1,105 @@
71885+#include <linux/kernel.h>
71886+#include <linux/mm.h>
71887+#include <linux/slab.h>
71888+#include <linux/vmalloc.h>
71889+#include <linux/gracl.h>
71890+#include <linux/grsecurity.h>
71891+
71892+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
71893+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
71894+
71895+static __inline__ int
71896+alloc_pop(void)
71897+{
71898+ if (current_alloc_state->alloc_stack_next == 1)
71899+ return 0;
71900+
71901+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
71902+
71903+ current_alloc_state->alloc_stack_next--;
71904+
71905+ return 1;
71906+}
71907+
71908+static __inline__ int
71909+alloc_push(void *buf)
71910+{
71911+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
71912+ return 1;
71913+
71914+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
71915+
71916+ current_alloc_state->alloc_stack_next++;
71917+
71918+ return 0;
71919+}
71920+
71921+void *
71922+acl_alloc(unsigned long len)
71923+{
71924+ void *ret = NULL;
71925+
71926+ if (!len || len > PAGE_SIZE)
71927+ goto out;
71928+
71929+ ret = kmalloc(len, GFP_KERNEL);
71930+
71931+ if (ret) {
71932+ if (alloc_push(ret)) {
71933+ kfree(ret);
71934+ ret = NULL;
71935+ }
71936+ }
71937+
71938+out:
71939+ return ret;
71940+}
71941+
71942+void *
71943+acl_alloc_num(unsigned long num, unsigned long len)
71944+{
71945+ if (!len || (num > (PAGE_SIZE / len)))
71946+ return NULL;
71947+
71948+ return acl_alloc(num * len);
71949+}
71950+
71951+void
71952+acl_free_all(void)
71953+{
71954+ if (!current_alloc_state->alloc_stack)
71955+ return;
71956+
71957+ while (alloc_pop()) ;
71958+
71959+ if (current_alloc_state->alloc_stack) {
71960+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
71961+ kfree(current_alloc_state->alloc_stack);
71962+ else
71963+ vfree(current_alloc_state->alloc_stack);
71964+ }
71965+
71966+ current_alloc_state->alloc_stack = NULL;
71967+ current_alloc_state->alloc_stack_size = 1;
71968+ current_alloc_state->alloc_stack_next = 1;
71969+
71970+ return;
71971+}
71972+
71973+int
71974+acl_alloc_stack_init(unsigned long size)
71975+{
71976+ if ((size * sizeof (void *)) <= PAGE_SIZE)
71977+ current_alloc_state->alloc_stack =
71978+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
71979+ else
71980+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
71981+
71982+ current_alloc_state->alloc_stack_size = size;
71983+ current_alloc_state->alloc_stack_next = 1;
71984+
71985+ if (!current_alloc_state->alloc_stack)
71986+ return 0;
71987+ else
71988+ return 1;
71989+}
71990diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
71991new file mode 100644
71992index 0000000..1a94c11
71993--- /dev/null
71994+++ b/grsecurity/gracl_cap.c
71995@@ -0,0 +1,127 @@
71996+#include <linux/kernel.h>
71997+#include <linux/module.h>
71998+#include <linux/sched.h>
71999+#include <linux/gracl.h>
72000+#include <linux/grsecurity.h>
72001+#include <linux/grinternal.h>
72002+
72003+extern const char *captab_log[];
72004+extern int captab_log_entries;
72005+
72006+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
72007+{
72008+ struct acl_subject_label *curracl;
72009+
72010+ if (!gr_acl_is_enabled())
72011+ return 1;
72012+
72013+ curracl = task->acl;
72014+
72015+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
72016+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
72017+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
72018+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
72019+ gr_to_filename(task->exec_file->f_path.dentry,
72020+ task->exec_file->f_path.mnt) : curracl->filename,
72021+ curracl->filename, 0UL,
72022+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
72023+ return 1;
72024+ }
72025+
72026+ return 0;
72027+}
72028+
72029+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
72030+{
72031+ struct acl_subject_label *curracl;
72032+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
72033+ kernel_cap_t cap_audit = __cap_empty_set;
72034+
72035+ if (!gr_acl_is_enabled())
72036+ return 1;
72037+
72038+ curracl = task->acl;
72039+
72040+ cap_drop = curracl->cap_lower;
72041+ cap_mask = curracl->cap_mask;
72042+ cap_audit = curracl->cap_invert_audit;
72043+
72044+ while ((curracl = curracl->parent_subject)) {
72045+ /* if the cap isn't specified in the current computed mask but is specified in the
72046+ current level subject, and is lowered in the current level subject, then add
72047+ it to the set of dropped capabilities
72048+ otherwise, add the current level subject's mask to the current computed mask
72049+ */
72050+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
72051+ cap_raise(cap_mask, cap);
72052+ if (cap_raised(curracl->cap_lower, cap))
72053+ cap_raise(cap_drop, cap);
72054+ if (cap_raised(curracl->cap_invert_audit, cap))
72055+ cap_raise(cap_audit, cap);
72056+ }
72057+ }
72058+
72059+ if (!cap_raised(cap_drop, cap)) {
72060+ if (cap_raised(cap_audit, cap))
72061+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
72062+ return 1;
72063+ }
72064+
72065+ /* only learn the capability use if the process has the capability in the
72066+ general case, the two uses in sys.c of gr_learn_cap are an exception
72067+ to this rule to ensure any role transition involves what the full-learned
72068+ policy believes in a privileged process
72069+ */
72070+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
72071+ return 1;
72072+
72073+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
72074+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
72075+
72076+ return 0;
72077+}
72078+
72079+int
72080+gr_acl_is_capable(const int cap)
72081+{
72082+ return gr_task_acl_is_capable(current, current_cred(), cap);
72083+}
72084+
72085+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
72086+{
72087+ struct acl_subject_label *curracl;
72088+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
72089+
72090+ if (!gr_acl_is_enabled())
72091+ return 1;
72092+
72093+ curracl = task->acl;
72094+
72095+ cap_drop = curracl->cap_lower;
72096+ cap_mask = curracl->cap_mask;
72097+
72098+ while ((curracl = curracl->parent_subject)) {
72099+ /* if the cap isn't specified in the current computed mask but is specified in the
72100+ current level subject, and is lowered in the current level subject, then add
72101+ it to the set of dropped capabilities
72102+ otherwise, add the current level subject's mask to the current computed mask
72103+ */
72104+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
72105+ cap_raise(cap_mask, cap);
72106+ if (cap_raised(curracl->cap_lower, cap))
72107+ cap_raise(cap_drop, cap);
72108+ }
72109+ }
72110+
72111+ if (!cap_raised(cap_drop, cap))
72112+ return 1;
72113+
72114+ return 0;
72115+}
72116+
72117+int
72118+gr_acl_is_capable_nolog(const int cap)
72119+{
72120+ return gr_task_acl_is_capable_nolog(current, cap);
72121+}
72122+
72123diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
72124new file mode 100644
72125index 0000000..ca25605
72126--- /dev/null
72127+++ b/grsecurity/gracl_compat.c
72128@@ -0,0 +1,270 @@
72129+#include <linux/kernel.h>
72130+#include <linux/gracl.h>
72131+#include <linux/compat.h>
72132+#include <linux/gracl_compat.h>
72133+
72134+#include <asm/uaccess.h>
72135+
72136+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
72137+{
72138+ struct gr_arg_wrapper_compat uwrapcompat;
72139+
72140+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
72141+ return -EFAULT;
72142+
72143+ if (((uwrapcompat.version != GRSECURITY_VERSION) &&
72144+ (uwrapcompat.version != 0x2901)) ||
72145+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
72146+ return -EINVAL;
72147+
72148+ uwrap->arg = compat_ptr(uwrapcompat.arg);
72149+ uwrap->version = uwrapcompat.version;
72150+ uwrap->size = sizeof(struct gr_arg);
72151+
72152+ return 0;
72153+}
72154+
72155+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
72156+{
72157+ struct gr_arg_compat argcompat;
72158+
72159+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
72160+ return -EFAULT;
72161+
72162+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
72163+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
72164+ arg->role_db.num_roles = argcompat.role_db.num_roles;
72165+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
72166+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
72167+ arg->role_db.num_objects = argcompat.role_db.num_objects;
72168+
72169+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
72170+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
72171+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
72172+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
72173+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
72174+ arg->segv_device = argcompat.segv_device;
72175+ arg->segv_inode = argcompat.segv_inode;
72176+ arg->segv_uid = argcompat.segv_uid;
72177+ arg->num_sprole_pws = argcompat.num_sprole_pws;
72178+ arg->mode = argcompat.mode;
72179+
72180+ return 0;
72181+}
72182+
72183+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
72184+{
72185+ struct acl_object_label_compat objcompat;
72186+
72187+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
72188+ return -EFAULT;
72189+
72190+ obj->filename = compat_ptr(objcompat.filename);
72191+ obj->inode = objcompat.inode;
72192+ obj->device = objcompat.device;
72193+ obj->mode = objcompat.mode;
72194+
72195+ obj->nested = compat_ptr(objcompat.nested);
72196+ obj->globbed = compat_ptr(objcompat.globbed);
72197+
72198+ obj->prev = compat_ptr(objcompat.prev);
72199+ obj->next = compat_ptr(objcompat.next);
72200+
72201+ return 0;
72202+}
72203+
72204+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
72205+{
72206+ unsigned int i;
72207+ struct acl_subject_label_compat subjcompat;
72208+
72209+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
72210+ return -EFAULT;
72211+
72212+ subj->filename = compat_ptr(subjcompat.filename);
72213+ subj->inode = subjcompat.inode;
72214+ subj->device = subjcompat.device;
72215+ subj->mode = subjcompat.mode;
72216+ subj->cap_mask = subjcompat.cap_mask;
72217+ subj->cap_lower = subjcompat.cap_lower;
72218+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
72219+
72220+ for (i = 0; i < GR_NLIMITS; i++) {
72221+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
72222+ subj->res[i].rlim_cur = RLIM_INFINITY;
72223+ else
72224+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
72225+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
72226+ subj->res[i].rlim_max = RLIM_INFINITY;
72227+ else
72228+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
72229+ }
72230+ subj->resmask = subjcompat.resmask;
72231+
72232+ subj->user_trans_type = subjcompat.user_trans_type;
72233+ subj->group_trans_type = subjcompat.group_trans_type;
72234+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
72235+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
72236+ subj->user_trans_num = subjcompat.user_trans_num;
72237+ subj->group_trans_num = subjcompat.group_trans_num;
72238+
72239+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
72240+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
72241+ subj->ip_type = subjcompat.ip_type;
72242+ subj->ips = compat_ptr(subjcompat.ips);
72243+ subj->ip_num = subjcompat.ip_num;
72244+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
72245+
72246+ subj->crashes = subjcompat.crashes;
72247+ subj->expires = subjcompat.expires;
72248+
72249+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
72250+ subj->hash = compat_ptr(subjcompat.hash);
72251+ subj->prev = compat_ptr(subjcompat.prev);
72252+ subj->next = compat_ptr(subjcompat.next);
72253+
72254+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
72255+ subj->obj_hash_size = subjcompat.obj_hash_size;
72256+ subj->pax_flags = subjcompat.pax_flags;
72257+
72258+ return 0;
72259+}
72260+
72261+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
72262+{
72263+ struct acl_role_label_compat rolecompat;
72264+
72265+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
72266+ return -EFAULT;
72267+
72268+ role->rolename = compat_ptr(rolecompat.rolename);
72269+ role->uidgid = rolecompat.uidgid;
72270+ role->roletype = rolecompat.roletype;
72271+
72272+ role->auth_attempts = rolecompat.auth_attempts;
72273+ role->expires = rolecompat.expires;
72274+
72275+ role->root_label = compat_ptr(rolecompat.root_label);
72276+ role->hash = compat_ptr(rolecompat.hash);
72277+
72278+ role->prev = compat_ptr(rolecompat.prev);
72279+ role->next = compat_ptr(rolecompat.next);
72280+
72281+ role->transitions = compat_ptr(rolecompat.transitions);
72282+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
72283+ role->domain_children = compat_ptr(rolecompat.domain_children);
72284+ role->domain_child_num = rolecompat.domain_child_num;
72285+
72286+ role->umask = rolecompat.umask;
72287+
72288+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
72289+ role->subj_hash_size = rolecompat.subj_hash_size;
72290+
72291+ return 0;
72292+}
72293+
72294+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
72295+{
72296+ struct role_allowed_ip_compat roleip_compat;
72297+
72298+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
72299+ return -EFAULT;
72300+
72301+ roleip->addr = roleip_compat.addr;
72302+ roleip->netmask = roleip_compat.netmask;
72303+
72304+ roleip->prev = compat_ptr(roleip_compat.prev);
72305+ roleip->next = compat_ptr(roleip_compat.next);
72306+
72307+ return 0;
72308+}
72309+
72310+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
72311+{
72312+ struct role_transition_compat trans_compat;
72313+
72314+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
72315+ return -EFAULT;
72316+
72317+ trans->rolename = compat_ptr(trans_compat.rolename);
72318+
72319+ trans->prev = compat_ptr(trans_compat.prev);
72320+ trans->next = compat_ptr(trans_compat.next);
72321+
72322+ return 0;
72323+
72324+}
72325+
72326+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
72327+{
72328+ struct gr_hash_struct_compat hash_compat;
72329+
72330+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
72331+ return -EFAULT;
72332+
72333+ hash->table = compat_ptr(hash_compat.table);
72334+ hash->nametable = compat_ptr(hash_compat.nametable);
72335+ hash->first = compat_ptr(hash_compat.first);
72336+
72337+ hash->table_size = hash_compat.table_size;
72338+ hash->used_size = hash_compat.used_size;
72339+
72340+ hash->type = hash_compat.type;
72341+
72342+ return 0;
72343+}
72344+
72345+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
72346+{
72347+ compat_uptr_t ptrcompat;
72348+
72349+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
72350+ return -EFAULT;
72351+
72352+ *(void **)ptr = compat_ptr(ptrcompat);
72353+
72354+ return 0;
72355+}
72356+
72357+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
72358+{
72359+ struct acl_ip_label_compat ip_compat;
72360+
72361+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
72362+ return -EFAULT;
72363+
72364+ ip->iface = compat_ptr(ip_compat.iface);
72365+ ip->addr = ip_compat.addr;
72366+ ip->netmask = ip_compat.netmask;
72367+ ip->low = ip_compat.low;
72368+ ip->high = ip_compat.high;
72369+ ip->mode = ip_compat.mode;
72370+ ip->type = ip_compat.type;
72371+
72372+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
72373+
72374+ ip->prev = compat_ptr(ip_compat.prev);
72375+ ip->next = compat_ptr(ip_compat.next);
72376+
72377+ return 0;
72378+}
72379+
72380+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
72381+{
72382+ struct sprole_pw_compat pw_compat;
72383+
72384+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
72385+ return -EFAULT;
72386+
72387+ pw->rolename = compat_ptr(pw_compat.rolename);
72388+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
72389+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
72390+
72391+ return 0;
72392+}
72393+
72394+size_t get_gr_arg_wrapper_size_compat(void)
72395+{
72396+ return sizeof(struct gr_arg_wrapper_compat);
72397+}
72398+
72399diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
72400new file mode 100644
72401index 0000000..8ee8e4f
72402--- /dev/null
72403+++ b/grsecurity/gracl_fs.c
72404@@ -0,0 +1,447 @@
72405+#include <linux/kernel.h>
72406+#include <linux/sched.h>
72407+#include <linux/types.h>
72408+#include <linux/fs.h>
72409+#include <linux/file.h>
72410+#include <linux/stat.h>
72411+#include <linux/grsecurity.h>
72412+#include <linux/grinternal.h>
72413+#include <linux/gracl.h>
72414+
72415+umode_t
72416+gr_acl_umask(void)
72417+{
72418+ if (unlikely(!gr_acl_is_enabled()))
72419+ return 0;
72420+
72421+ return current->role->umask;
72422+}
72423+
72424+__u32
72425+gr_acl_handle_hidden_file(const struct dentry * dentry,
72426+ const struct vfsmount * mnt)
72427+{
72428+ __u32 mode;
72429+
72430+ if (unlikely(d_is_negative(dentry)))
72431+ return GR_FIND;
72432+
72433+ mode =
72434+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
72435+
72436+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
72437+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
72438+ return mode;
72439+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
72440+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
72441+ return 0;
72442+ } else if (unlikely(!(mode & GR_FIND)))
72443+ return 0;
72444+
72445+ return GR_FIND;
72446+}
72447+
72448+__u32
72449+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
72450+ int acc_mode)
72451+{
72452+ __u32 reqmode = GR_FIND;
72453+ __u32 mode;
72454+
72455+ if (unlikely(d_is_negative(dentry)))
72456+ return reqmode;
72457+
72458+ if (acc_mode & MAY_APPEND)
72459+ reqmode |= GR_APPEND;
72460+ else if (acc_mode & MAY_WRITE)
72461+ reqmode |= GR_WRITE;
72462+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
72463+ reqmode |= GR_READ;
72464+
72465+ mode =
72466+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
72467+ mnt);
72468+
72469+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72470+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
72471+ reqmode & GR_READ ? " reading" : "",
72472+ reqmode & GR_WRITE ? " writing" : reqmode &
72473+ GR_APPEND ? " appending" : "");
72474+ return reqmode;
72475+ } else
72476+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72477+ {
72478+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
72479+ reqmode & GR_READ ? " reading" : "",
72480+ reqmode & GR_WRITE ? " writing" : reqmode &
72481+ GR_APPEND ? " appending" : "");
72482+ return 0;
72483+ } else if (unlikely((mode & reqmode) != reqmode))
72484+ return 0;
72485+
72486+ return reqmode;
72487+}
72488+
72489+__u32
72490+gr_acl_handle_creat(const struct dentry * dentry,
72491+ const struct dentry * p_dentry,
72492+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
72493+ const int imode)
72494+{
72495+ __u32 reqmode = GR_WRITE | GR_CREATE;
72496+ __u32 mode;
72497+
72498+ if (acc_mode & MAY_APPEND)
72499+ reqmode |= GR_APPEND;
72500+ // if a directory was required or the directory already exists, then
72501+ // don't count this open as a read
72502+ if ((acc_mode & MAY_READ) &&
72503+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
72504+ reqmode |= GR_READ;
72505+ if ((open_flags & O_CREAT) &&
72506+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
72507+ reqmode |= GR_SETID;
72508+
72509+ mode =
72510+ gr_check_create(dentry, p_dentry, p_mnt,
72511+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
72512+
72513+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72514+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
72515+ reqmode & GR_READ ? " reading" : "",
72516+ reqmode & GR_WRITE ? " writing" : reqmode &
72517+ GR_APPEND ? " appending" : "");
72518+ return reqmode;
72519+ } else
72520+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72521+ {
72522+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
72523+ reqmode & GR_READ ? " reading" : "",
72524+ reqmode & GR_WRITE ? " writing" : reqmode &
72525+ GR_APPEND ? " appending" : "");
72526+ return 0;
72527+ } else if (unlikely((mode & reqmode) != reqmode))
72528+ return 0;
72529+
72530+ return reqmode;
72531+}
72532+
72533+__u32
72534+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
72535+ const int fmode)
72536+{
72537+ __u32 mode, reqmode = GR_FIND;
72538+
72539+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
72540+ reqmode |= GR_EXEC;
72541+ if (fmode & S_IWOTH)
72542+ reqmode |= GR_WRITE;
72543+ if (fmode & S_IROTH)
72544+ reqmode |= GR_READ;
72545+
72546+ mode =
72547+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
72548+ mnt);
72549+
72550+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72551+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
72552+ reqmode & GR_READ ? " reading" : "",
72553+ reqmode & GR_WRITE ? " writing" : "",
72554+ reqmode & GR_EXEC ? " executing" : "");
72555+ return reqmode;
72556+ } else
72557+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72558+ {
72559+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
72560+ reqmode & GR_READ ? " reading" : "",
72561+ reqmode & GR_WRITE ? " writing" : "",
72562+ reqmode & GR_EXEC ? " executing" : "");
72563+ return 0;
72564+ } else if (unlikely((mode & reqmode) != reqmode))
72565+ return 0;
72566+
72567+ return reqmode;
72568+}
72569+
72570+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
72571+{
72572+ __u32 mode;
72573+
72574+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
72575+
72576+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
72577+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
72578+ return mode;
72579+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
72580+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
72581+ return 0;
72582+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
72583+ return 0;
72584+
72585+ return (reqmode);
72586+}
72587+
72588+__u32
72589+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
72590+{
72591+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
72592+}
72593+
72594+__u32
72595+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
72596+{
72597+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
72598+}
72599+
72600+__u32
72601+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
72602+{
72603+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
72604+}
72605+
72606+__u32
72607+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
72608+{
72609+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
72610+}
72611+
72612+__u32
72613+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
72614+ umode_t *modeptr)
72615+{
72616+ umode_t mode;
72617+
72618+ *modeptr &= ~gr_acl_umask();
72619+ mode = *modeptr;
72620+
72621+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
72622+ return 1;
72623+
72624+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
72625+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
72626+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
72627+ GR_CHMOD_ACL_MSG);
72628+ } else {
72629+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
72630+ }
72631+}
72632+
72633+__u32
72634+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
72635+{
72636+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
72637+}
72638+
72639+__u32
72640+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
72641+{
72642+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
72643+}
72644+
72645+__u32
72646+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
72647+{
72648+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
72649+}
72650+
72651+__u32
72652+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
72653+{
72654+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
72655+}
72656+
72657+__u32
72658+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
72659+{
72660+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
72661+ GR_UNIXCONNECT_ACL_MSG);
72662+}
72663+
72664+/* hardlinks require at minimum create and link permission,
72665+ any additional privilege required is based on the
72666+ privilege of the file being linked to
72667+*/
72668+__u32
72669+gr_acl_handle_link(const struct dentry * new_dentry,
72670+ const struct dentry * parent_dentry,
72671+ const struct vfsmount * parent_mnt,
72672+ const struct dentry * old_dentry,
72673+ const struct vfsmount * old_mnt, const struct filename *to)
72674+{
72675+ __u32 mode;
72676+ __u32 needmode = GR_CREATE | GR_LINK;
72677+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
72678+
72679+ mode =
72680+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
72681+ old_mnt);
72682+
72683+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
72684+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
72685+ return mode;
72686+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
72687+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
72688+ return 0;
72689+ } else if (unlikely((mode & needmode) != needmode))
72690+ return 0;
72691+
72692+ return 1;
72693+}
72694+
72695+__u32
72696+gr_acl_handle_symlink(const struct dentry * new_dentry,
72697+ const struct dentry * parent_dentry,
72698+ const struct vfsmount * parent_mnt, const struct filename *from)
72699+{
72700+ __u32 needmode = GR_WRITE | GR_CREATE;
72701+ __u32 mode;
72702+
72703+ mode =
72704+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
72705+ GR_CREATE | GR_AUDIT_CREATE |
72706+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
72707+
72708+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
72709+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
72710+ return mode;
72711+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
72712+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
72713+ return 0;
72714+ } else if (unlikely((mode & needmode) != needmode))
72715+ return 0;
72716+
72717+ return (GR_WRITE | GR_CREATE);
72718+}
72719+
72720+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)
72721+{
72722+ __u32 mode;
72723+
72724+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
72725+
72726+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
72727+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
72728+ return mode;
72729+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
72730+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
72731+ return 0;
72732+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
72733+ return 0;
72734+
72735+ return (reqmode);
72736+}
72737+
72738+__u32
72739+gr_acl_handle_mknod(const struct dentry * new_dentry,
72740+ const struct dentry * parent_dentry,
72741+ const struct vfsmount * parent_mnt,
72742+ const int mode)
72743+{
72744+ __u32 reqmode = GR_WRITE | GR_CREATE;
72745+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
72746+ reqmode |= GR_SETID;
72747+
72748+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
72749+ reqmode, GR_MKNOD_ACL_MSG);
72750+}
72751+
72752+__u32
72753+gr_acl_handle_mkdir(const struct dentry *new_dentry,
72754+ const struct dentry *parent_dentry,
72755+ const struct vfsmount *parent_mnt)
72756+{
72757+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
72758+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
72759+}
72760+
72761+#define RENAME_CHECK_SUCCESS(old, new) \
72762+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
72763+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
72764+
72765+int
72766+gr_acl_handle_rename(struct dentry *new_dentry,
72767+ struct dentry *parent_dentry,
72768+ const struct vfsmount *parent_mnt,
72769+ struct dentry *old_dentry,
72770+ struct inode *old_parent_inode,
72771+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
72772+{
72773+ __u32 comp1, comp2;
72774+ int error = 0;
72775+
72776+ if (unlikely(!gr_acl_is_enabled()))
72777+ return 0;
72778+
72779+ if (flags & RENAME_EXCHANGE) {
72780+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
72781+ GR_AUDIT_READ | GR_AUDIT_WRITE |
72782+ GR_SUPPRESS, parent_mnt);
72783+ comp2 =
72784+ gr_search_file(old_dentry,
72785+ GR_READ | GR_WRITE | GR_AUDIT_READ |
72786+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
72787+ } else if (d_is_negative(new_dentry)) {
72788+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
72789+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
72790+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
72791+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
72792+ GR_DELETE | GR_AUDIT_DELETE |
72793+ GR_AUDIT_READ | GR_AUDIT_WRITE |
72794+ GR_SUPPRESS, old_mnt);
72795+ } else {
72796+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
72797+ GR_CREATE | GR_DELETE |
72798+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
72799+ GR_AUDIT_READ | GR_AUDIT_WRITE |
72800+ GR_SUPPRESS, parent_mnt);
72801+ comp2 =
72802+ gr_search_file(old_dentry,
72803+ GR_READ | GR_WRITE | GR_AUDIT_READ |
72804+ GR_DELETE | GR_AUDIT_DELETE |
72805+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
72806+ }
72807+
72808+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
72809+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
72810+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
72811+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
72812+ && !(comp2 & GR_SUPPRESS)) {
72813+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
72814+ error = -EACCES;
72815+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
72816+ error = -EACCES;
72817+
72818+ return error;
72819+}
72820+
72821+void
72822+gr_acl_handle_exit(void)
72823+{
72824+ u16 id;
72825+ char *rolename;
72826+
72827+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
72828+ !(current->role->roletype & GR_ROLE_PERSIST))) {
72829+ id = current->acl_role_id;
72830+ rolename = current->role->rolename;
72831+ gr_set_acls(1);
72832+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
72833+ }
72834+
72835+ gr_put_exec_file(current);
72836+ return;
72837+}
72838+
72839+int
72840+gr_acl_handle_procpidmem(const struct task_struct *task)
72841+{
72842+ if (unlikely(!gr_acl_is_enabled()))
72843+ return 0;
72844+
72845+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
72846+ !(current->acl->mode & GR_POVERRIDE) &&
72847+ !(current->role->roletype & GR_ROLE_GOD))
72848+ return -EACCES;
72849+
72850+ return 0;
72851+}
72852diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
72853new file mode 100644
72854index 0000000..f056b81
72855--- /dev/null
72856+++ b/grsecurity/gracl_ip.c
72857@@ -0,0 +1,386 @@
72858+#include <linux/kernel.h>
72859+#include <asm/uaccess.h>
72860+#include <asm/errno.h>
72861+#include <net/sock.h>
72862+#include <linux/file.h>
72863+#include <linux/fs.h>
72864+#include <linux/net.h>
72865+#include <linux/in.h>
72866+#include <linux/skbuff.h>
72867+#include <linux/ip.h>
72868+#include <linux/udp.h>
72869+#include <linux/types.h>
72870+#include <linux/sched.h>
72871+#include <linux/netdevice.h>
72872+#include <linux/inetdevice.h>
72873+#include <linux/gracl.h>
72874+#include <linux/grsecurity.h>
72875+#include <linux/grinternal.h>
72876+
72877+#define GR_BIND 0x01
72878+#define GR_CONNECT 0x02
72879+#define GR_INVERT 0x04
72880+#define GR_BINDOVERRIDE 0x08
72881+#define GR_CONNECTOVERRIDE 0x10
72882+#define GR_SOCK_FAMILY 0x20
72883+
72884+static const char * gr_protocols[IPPROTO_MAX] = {
72885+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
72886+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
72887+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
72888+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
72889+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
72890+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
72891+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
72892+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
72893+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
72894+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
72895+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
72896+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
72897+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
72898+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
72899+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
72900+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
72901+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
72902+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
72903+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
72904+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
72905+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
72906+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
72907+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
72908+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
72909+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
72910+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
72911+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
72912+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
72913+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
72914+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
72915+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
72916+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
72917+ };
72918+
72919+static const char * gr_socktypes[SOCK_MAX] = {
72920+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
72921+ "unknown:7", "unknown:8", "unknown:9", "packet"
72922+ };
72923+
72924+static const char * gr_sockfamilies[AF_MAX+1] = {
72925+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
72926+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
72927+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
72928+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
72929+ };
72930+
72931+const char *
72932+gr_proto_to_name(unsigned char proto)
72933+{
72934+ return gr_protocols[proto];
72935+}
72936+
72937+const char *
72938+gr_socktype_to_name(unsigned char type)
72939+{
72940+ return gr_socktypes[type];
72941+}
72942+
72943+const char *
72944+gr_sockfamily_to_name(unsigned char family)
72945+{
72946+ return gr_sockfamilies[family];
72947+}
72948+
72949+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
72950+
72951+int
72952+gr_search_socket(const int domain, const int type, const int protocol)
72953+{
72954+ struct acl_subject_label *curr;
72955+ const struct cred *cred = current_cred();
72956+
72957+ if (unlikely(!gr_acl_is_enabled()))
72958+ goto exit;
72959+
72960+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
72961+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
72962+ goto exit; // let the kernel handle it
72963+
72964+ curr = current->acl;
72965+
72966+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
72967+ /* the family is allowed, if this is PF_INET allow it only if
72968+ the extra sock type/protocol checks pass */
72969+ if (domain == PF_INET)
72970+ goto inet_check;
72971+ goto exit;
72972+ } else {
72973+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
72974+ __u32 fakeip = 0;
72975+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
72976+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
72977+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
72978+ gr_to_filename(current->exec_file->f_path.dentry,
72979+ current->exec_file->f_path.mnt) :
72980+ curr->filename, curr->filename,
72981+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
72982+ &current->signal->saved_ip);
72983+ goto exit;
72984+ }
72985+ goto exit_fail;
72986+ }
72987+
72988+inet_check:
72989+ /* the rest of this checking is for IPv4 only */
72990+ if (!curr->ips)
72991+ goto exit;
72992+
72993+ if ((curr->ip_type & (1U << type)) &&
72994+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
72995+ goto exit;
72996+
72997+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
72998+ /* we don't place acls on raw sockets , and sometimes
72999+ dgram/ip sockets are opened for ioctl and not
73000+ bind/connect, so we'll fake a bind learn log */
73001+ if (type == SOCK_RAW || type == SOCK_PACKET) {
73002+ __u32 fakeip = 0;
73003+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73004+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73005+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73006+ gr_to_filename(current->exec_file->f_path.dentry,
73007+ current->exec_file->f_path.mnt) :
73008+ curr->filename, curr->filename,
73009+ &fakeip, 0, type,
73010+ protocol, GR_CONNECT, &current->signal->saved_ip);
73011+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
73012+ __u32 fakeip = 0;
73013+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73014+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73015+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73016+ gr_to_filename(current->exec_file->f_path.dentry,
73017+ current->exec_file->f_path.mnt) :
73018+ curr->filename, curr->filename,
73019+ &fakeip, 0, type,
73020+ protocol, GR_BIND, &current->signal->saved_ip);
73021+ }
73022+ /* we'll log when they use connect or bind */
73023+ goto exit;
73024+ }
73025+
73026+exit_fail:
73027+ if (domain == PF_INET)
73028+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
73029+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
73030+ else if (rcu_access_pointer(net_families[domain]) != NULL)
73031+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
73032+ gr_socktype_to_name(type), protocol);
73033+
73034+ return 0;
73035+exit:
73036+ return 1;
73037+}
73038+
73039+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)
73040+{
73041+ if ((ip->mode & mode) &&
73042+ (ip_port >= ip->low) &&
73043+ (ip_port <= ip->high) &&
73044+ ((ntohl(ip_addr) & our_netmask) ==
73045+ (ntohl(our_addr) & our_netmask))
73046+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
73047+ && (ip->type & (1U << type))) {
73048+ if (ip->mode & GR_INVERT)
73049+ return 2; // specifically denied
73050+ else
73051+ return 1; // allowed
73052+ }
73053+
73054+ return 0; // not specifically allowed, may continue parsing
73055+}
73056+
73057+static int
73058+gr_search_connectbind(const int full_mode, struct sock *sk,
73059+ struct sockaddr_in *addr, const int type)
73060+{
73061+ char iface[IFNAMSIZ] = {0};
73062+ struct acl_subject_label *curr;
73063+ struct acl_ip_label *ip;
73064+ struct inet_sock *isk;
73065+ struct net_device *dev;
73066+ struct in_device *idev;
73067+ unsigned long i;
73068+ int ret;
73069+ int mode = full_mode & (GR_BIND | GR_CONNECT);
73070+ __u32 ip_addr = 0;
73071+ __u32 our_addr;
73072+ __u32 our_netmask;
73073+ char *p;
73074+ __u16 ip_port = 0;
73075+ const struct cred *cred = current_cred();
73076+
73077+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
73078+ return 0;
73079+
73080+ curr = current->acl;
73081+ isk = inet_sk(sk);
73082+
73083+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
73084+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
73085+ addr->sin_addr.s_addr = curr->inaddr_any_override;
73086+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
73087+ struct sockaddr_in saddr;
73088+ int err;
73089+
73090+ saddr.sin_family = AF_INET;
73091+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
73092+ saddr.sin_port = isk->inet_sport;
73093+
73094+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73095+ if (err)
73096+ return err;
73097+
73098+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73099+ if (err)
73100+ return err;
73101+ }
73102+
73103+ if (!curr->ips)
73104+ return 0;
73105+
73106+ ip_addr = addr->sin_addr.s_addr;
73107+ ip_port = ntohs(addr->sin_port);
73108+
73109+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73110+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73111+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73112+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73113+ gr_to_filename(current->exec_file->f_path.dentry,
73114+ current->exec_file->f_path.mnt) :
73115+ curr->filename, curr->filename,
73116+ &ip_addr, ip_port, type,
73117+ sk->sk_protocol, mode, &current->signal->saved_ip);
73118+ return 0;
73119+ }
73120+
73121+ for (i = 0; i < curr->ip_num; i++) {
73122+ ip = *(curr->ips + i);
73123+ if (ip->iface != NULL) {
73124+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
73125+ p = strchr(iface, ':');
73126+ if (p != NULL)
73127+ *p = '\0';
73128+ dev = dev_get_by_name(sock_net(sk), iface);
73129+ if (dev == NULL)
73130+ continue;
73131+ idev = in_dev_get(dev);
73132+ if (idev == NULL) {
73133+ dev_put(dev);
73134+ continue;
73135+ }
73136+ rcu_read_lock();
73137+ for_ifa(idev) {
73138+ if (!strcmp(ip->iface, ifa->ifa_label)) {
73139+ our_addr = ifa->ifa_address;
73140+ our_netmask = 0xffffffff;
73141+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73142+ if (ret == 1) {
73143+ rcu_read_unlock();
73144+ in_dev_put(idev);
73145+ dev_put(dev);
73146+ return 0;
73147+ } else if (ret == 2) {
73148+ rcu_read_unlock();
73149+ in_dev_put(idev);
73150+ dev_put(dev);
73151+ goto denied;
73152+ }
73153+ }
73154+ } endfor_ifa(idev);
73155+ rcu_read_unlock();
73156+ in_dev_put(idev);
73157+ dev_put(dev);
73158+ } else {
73159+ our_addr = ip->addr;
73160+ our_netmask = ip->netmask;
73161+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73162+ if (ret == 1)
73163+ return 0;
73164+ else if (ret == 2)
73165+ goto denied;
73166+ }
73167+ }
73168+
73169+denied:
73170+ if (mode == GR_BIND)
73171+ 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));
73172+ else if (mode == GR_CONNECT)
73173+ 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));
73174+
73175+ return -EACCES;
73176+}
73177+
73178+int
73179+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
73180+{
73181+ /* always allow disconnection of dgram sockets with connect */
73182+ if (addr->sin_family == AF_UNSPEC)
73183+ return 0;
73184+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
73185+}
73186+
73187+int
73188+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
73189+{
73190+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
73191+}
73192+
73193+int gr_search_listen(struct socket *sock)
73194+{
73195+ struct sock *sk = sock->sk;
73196+ struct sockaddr_in addr;
73197+
73198+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73199+ addr.sin_port = inet_sk(sk)->inet_sport;
73200+
73201+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73202+}
73203+
73204+int gr_search_accept(struct socket *sock)
73205+{
73206+ struct sock *sk = sock->sk;
73207+ struct sockaddr_in addr;
73208+
73209+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73210+ addr.sin_port = inet_sk(sk)->inet_sport;
73211+
73212+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73213+}
73214+
73215+int
73216+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
73217+{
73218+ if (addr)
73219+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
73220+ else {
73221+ struct sockaddr_in sin;
73222+ const struct inet_sock *inet = inet_sk(sk);
73223+
73224+ sin.sin_addr.s_addr = inet->inet_daddr;
73225+ sin.sin_port = inet->inet_dport;
73226+
73227+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73228+ }
73229+}
73230+
73231+int
73232+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
73233+{
73234+ struct sockaddr_in sin;
73235+
73236+ if (unlikely(skb->len < sizeof (struct udphdr)))
73237+ return 0; // skip this packet
73238+
73239+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
73240+ sin.sin_port = udp_hdr(skb)->source;
73241+
73242+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73243+}
73244diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
73245new file mode 100644
73246index 0000000..25f54ef
73247--- /dev/null
73248+++ b/grsecurity/gracl_learn.c
73249@@ -0,0 +1,207 @@
73250+#include <linux/kernel.h>
73251+#include <linux/mm.h>
73252+#include <linux/sched.h>
73253+#include <linux/poll.h>
73254+#include <linux/string.h>
73255+#include <linux/file.h>
73256+#include <linux/types.h>
73257+#include <linux/vmalloc.h>
73258+#include <linux/grinternal.h>
73259+
73260+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
73261+ size_t count, loff_t *ppos);
73262+extern int gr_acl_is_enabled(void);
73263+
73264+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
73265+static int gr_learn_attached;
73266+
73267+/* use a 512k buffer */
73268+#define LEARN_BUFFER_SIZE (512 * 1024)
73269+
73270+static DEFINE_SPINLOCK(gr_learn_lock);
73271+static DEFINE_MUTEX(gr_learn_user_mutex);
73272+
73273+/* we need to maintain two buffers, so that the kernel context of grlearn
73274+ uses a semaphore around the userspace copying, and the other kernel contexts
73275+ use a spinlock when copying into the buffer, since they cannot sleep
73276+*/
73277+static char *learn_buffer;
73278+static char *learn_buffer_user;
73279+static int learn_buffer_len;
73280+static int learn_buffer_user_len;
73281+
73282+static ssize_t
73283+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
73284+{
73285+ DECLARE_WAITQUEUE(wait, current);
73286+ ssize_t retval = 0;
73287+
73288+ add_wait_queue(&learn_wait, &wait);
73289+ set_current_state(TASK_INTERRUPTIBLE);
73290+ do {
73291+ mutex_lock(&gr_learn_user_mutex);
73292+ spin_lock(&gr_learn_lock);
73293+ if (learn_buffer_len)
73294+ break;
73295+ spin_unlock(&gr_learn_lock);
73296+ mutex_unlock(&gr_learn_user_mutex);
73297+ if (file->f_flags & O_NONBLOCK) {
73298+ retval = -EAGAIN;
73299+ goto out;
73300+ }
73301+ if (signal_pending(current)) {
73302+ retval = -ERESTARTSYS;
73303+ goto out;
73304+ }
73305+
73306+ schedule();
73307+ } while (1);
73308+
73309+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
73310+ learn_buffer_user_len = learn_buffer_len;
73311+ retval = learn_buffer_len;
73312+ learn_buffer_len = 0;
73313+
73314+ spin_unlock(&gr_learn_lock);
73315+
73316+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
73317+ retval = -EFAULT;
73318+
73319+ mutex_unlock(&gr_learn_user_mutex);
73320+out:
73321+ set_current_state(TASK_RUNNING);
73322+ remove_wait_queue(&learn_wait, &wait);
73323+ return retval;
73324+}
73325+
73326+static unsigned int
73327+poll_learn(struct file * file, poll_table * wait)
73328+{
73329+ poll_wait(file, &learn_wait, wait);
73330+
73331+ if (learn_buffer_len)
73332+ return (POLLIN | POLLRDNORM);
73333+
73334+ return 0;
73335+}
73336+
73337+void
73338+gr_clear_learn_entries(void)
73339+{
73340+ char *tmp;
73341+
73342+ mutex_lock(&gr_learn_user_mutex);
73343+ spin_lock(&gr_learn_lock);
73344+ tmp = learn_buffer;
73345+ learn_buffer = NULL;
73346+ spin_unlock(&gr_learn_lock);
73347+ if (tmp)
73348+ vfree(tmp);
73349+ if (learn_buffer_user != NULL) {
73350+ vfree(learn_buffer_user);
73351+ learn_buffer_user = NULL;
73352+ }
73353+ learn_buffer_len = 0;
73354+ mutex_unlock(&gr_learn_user_mutex);
73355+
73356+ return;
73357+}
73358+
73359+void
73360+gr_add_learn_entry(const char *fmt, ...)
73361+{
73362+ va_list args;
73363+ unsigned int len;
73364+
73365+ if (!gr_learn_attached)
73366+ return;
73367+
73368+ spin_lock(&gr_learn_lock);
73369+
73370+ /* leave a gap at the end so we know when it's "full" but don't have to
73371+ compute the exact length of the string we're trying to append
73372+ */
73373+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
73374+ spin_unlock(&gr_learn_lock);
73375+ wake_up_interruptible(&learn_wait);
73376+ return;
73377+ }
73378+ if (learn_buffer == NULL) {
73379+ spin_unlock(&gr_learn_lock);
73380+ return;
73381+ }
73382+
73383+ va_start(args, fmt);
73384+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
73385+ va_end(args);
73386+
73387+ learn_buffer_len += len + 1;
73388+
73389+ spin_unlock(&gr_learn_lock);
73390+ wake_up_interruptible(&learn_wait);
73391+
73392+ return;
73393+}
73394+
73395+static int
73396+open_learn(struct inode *inode, struct file *file)
73397+{
73398+ if (file->f_mode & FMODE_READ && gr_learn_attached)
73399+ return -EBUSY;
73400+ if (file->f_mode & FMODE_READ) {
73401+ int retval = 0;
73402+ mutex_lock(&gr_learn_user_mutex);
73403+ if (learn_buffer == NULL)
73404+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
73405+ if (learn_buffer_user == NULL)
73406+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
73407+ if (learn_buffer == NULL) {
73408+ retval = -ENOMEM;
73409+ goto out_error;
73410+ }
73411+ if (learn_buffer_user == NULL) {
73412+ retval = -ENOMEM;
73413+ goto out_error;
73414+ }
73415+ learn_buffer_len = 0;
73416+ learn_buffer_user_len = 0;
73417+ gr_learn_attached = 1;
73418+out_error:
73419+ mutex_unlock(&gr_learn_user_mutex);
73420+ return retval;
73421+ }
73422+ return 0;
73423+}
73424+
73425+static int
73426+close_learn(struct inode *inode, struct file *file)
73427+{
73428+ if (file->f_mode & FMODE_READ) {
73429+ char *tmp = NULL;
73430+ mutex_lock(&gr_learn_user_mutex);
73431+ spin_lock(&gr_learn_lock);
73432+ tmp = learn_buffer;
73433+ learn_buffer = NULL;
73434+ spin_unlock(&gr_learn_lock);
73435+ if (tmp)
73436+ vfree(tmp);
73437+ if (learn_buffer_user != NULL) {
73438+ vfree(learn_buffer_user);
73439+ learn_buffer_user = NULL;
73440+ }
73441+ learn_buffer_len = 0;
73442+ learn_buffer_user_len = 0;
73443+ gr_learn_attached = 0;
73444+ mutex_unlock(&gr_learn_user_mutex);
73445+ }
73446+
73447+ return 0;
73448+}
73449+
73450+const struct file_operations grsec_fops = {
73451+ .read = read_learn,
73452+ .write = write_grsec_handler,
73453+ .open = open_learn,
73454+ .release = close_learn,
73455+ .poll = poll_learn,
73456+};
73457diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
73458new file mode 100644
73459index 0000000..3f8ade0
73460--- /dev/null
73461+++ b/grsecurity/gracl_policy.c
73462@@ -0,0 +1,1782 @@
73463+#include <linux/kernel.h>
73464+#include <linux/module.h>
73465+#include <linux/sched.h>
73466+#include <linux/mm.h>
73467+#include <linux/file.h>
73468+#include <linux/fs.h>
73469+#include <linux/namei.h>
73470+#include <linux/mount.h>
73471+#include <linux/tty.h>
73472+#include <linux/proc_fs.h>
73473+#include <linux/lglock.h>
73474+#include <linux/slab.h>
73475+#include <linux/vmalloc.h>
73476+#include <linux/types.h>
73477+#include <linux/sysctl.h>
73478+#include <linux/netdevice.h>
73479+#include <linux/ptrace.h>
73480+#include <linux/gracl.h>
73481+#include <linux/gralloc.h>
73482+#include <linux/security.h>
73483+#include <linux/grinternal.h>
73484+#include <linux/pid_namespace.h>
73485+#include <linux/stop_machine.h>
73486+#include <linux/fdtable.h>
73487+#include <linux/percpu.h>
73488+#include <linux/lglock.h>
73489+#include <linux/hugetlb.h>
73490+#include <linux/posix-timers.h>
73491+#include "../fs/mount.h"
73492+
73493+#include <asm/uaccess.h>
73494+#include <asm/errno.h>
73495+#include <asm/mman.h>
73496+
73497+extern struct gr_policy_state *polstate;
73498+
73499+#define FOR_EACH_ROLE_START(role) \
73500+ role = polstate->role_list; \
73501+ while (role) {
73502+
73503+#define FOR_EACH_ROLE_END(role) \
73504+ role = role->prev; \
73505+ }
73506+
73507+struct path gr_real_root;
73508+
73509+extern struct gr_alloc_state *current_alloc_state;
73510+
73511+u16 acl_sp_role_value;
73512+
73513+static DEFINE_MUTEX(gr_dev_mutex);
73514+
73515+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
73516+extern void gr_clear_learn_entries(void);
73517+
73518+struct gr_arg *gr_usermode __read_only;
73519+unsigned char *gr_system_salt __read_only;
73520+unsigned char *gr_system_sum __read_only;
73521+
73522+static unsigned int gr_auth_attempts = 0;
73523+static unsigned long gr_auth_expires = 0UL;
73524+
73525+struct acl_object_label *fakefs_obj_rw;
73526+struct acl_object_label *fakefs_obj_rwx;
73527+
73528+extern int gr_init_uidset(void);
73529+extern void gr_free_uidset(void);
73530+extern void gr_remove_uid(uid_t uid);
73531+extern int gr_find_uid(uid_t uid);
73532+
73533+extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
73534+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
73535+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
73536+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
73537+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);
73538+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
73539+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
73540+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
73541+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
73542+extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
73543+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
73544+extern void assign_special_role(const char *rolename);
73545+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
73546+extern int gr_rbac_disable(void *unused);
73547+extern void gr_enable_rbac_system(void);
73548+
73549+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
73550+{
73551+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
73552+ return -EFAULT;
73553+
73554+ return 0;
73555+}
73556+
73557+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
73558+{
73559+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
73560+ return -EFAULT;
73561+
73562+ return 0;
73563+}
73564+
73565+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
73566+{
73567+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
73568+ return -EFAULT;
73569+
73570+ return 0;
73571+}
73572+
73573+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
73574+{
73575+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
73576+ return -EFAULT;
73577+
73578+ return 0;
73579+}
73580+
73581+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
73582+{
73583+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
73584+ return -EFAULT;
73585+
73586+ return 0;
73587+}
73588+
73589+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
73590+{
73591+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
73592+ return -EFAULT;
73593+
73594+ return 0;
73595+}
73596+
73597+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
73598+{
73599+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
73600+ return -EFAULT;
73601+
73602+ return 0;
73603+}
73604+
73605+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
73606+{
73607+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
73608+ return -EFAULT;
73609+
73610+ return 0;
73611+}
73612+
73613+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
73614+{
73615+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
73616+ return -EFAULT;
73617+
73618+ return 0;
73619+}
73620+
73621+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
73622+{
73623+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
73624+ return -EFAULT;
73625+
73626+ if (((uwrap->version != GRSECURITY_VERSION) &&
73627+ (uwrap->version != 0x2901)) ||
73628+ (uwrap->size != sizeof(struct gr_arg)))
73629+ return -EINVAL;
73630+
73631+ return 0;
73632+}
73633+
73634+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
73635+{
73636+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
73637+ return -EFAULT;
73638+
73639+ return 0;
73640+}
73641+
73642+static size_t get_gr_arg_wrapper_size_normal(void)
73643+{
73644+ return sizeof(struct gr_arg_wrapper);
73645+}
73646+
73647+#ifdef CONFIG_COMPAT
73648+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
73649+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
73650+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
73651+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
73652+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
73653+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
73654+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
73655+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
73656+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
73657+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
73658+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
73659+extern size_t get_gr_arg_wrapper_size_compat(void);
73660+
73661+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
73662+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
73663+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
73664+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
73665+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
73666+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
73667+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
73668+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
73669+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
73670+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
73671+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
73672+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
73673+
73674+#else
73675+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
73676+#define copy_gr_arg copy_gr_arg_normal
73677+#define copy_gr_hash_struct copy_gr_hash_struct_normal
73678+#define copy_acl_object_label copy_acl_object_label_normal
73679+#define copy_acl_subject_label copy_acl_subject_label_normal
73680+#define copy_acl_role_label copy_acl_role_label_normal
73681+#define copy_acl_ip_label copy_acl_ip_label_normal
73682+#define copy_pointer_from_array copy_pointer_from_array_normal
73683+#define copy_sprole_pw copy_sprole_pw_normal
73684+#define copy_role_transition copy_role_transition_normal
73685+#define copy_role_allowed_ip copy_role_allowed_ip_normal
73686+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
73687+#endif
73688+
73689+static struct acl_subject_label *
73690+lookup_subject_map(const struct acl_subject_label *userp)
73691+{
73692+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
73693+ struct subject_map *match;
73694+
73695+ match = polstate->subj_map_set.s_hash[index];
73696+
73697+ while (match && match->user != userp)
73698+ match = match->next;
73699+
73700+ if (match != NULL)
73701+ return match->kernel;
73702+ else
73703+ return NULL;
73704+}
73705+
73706+static void
73707+insert_subj_map_entry(struct subject_map *subjmap)
73708+{
73709+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
73710+ struct subject_map **curr;
73711+
73712+ subjmap->prev = NULL;
73713+
73714+ curr = &polstate->subj_map_set.s_hash[index];
73715+ if (*curr != NULL)
73716+ (*curr)->prev = subjmap;
73717+
73718+ subjmap->next = *curr;
73719+ *curr = subjmap;
73720+
73721+ return;
73722+}
73723+
73724+static void
73725+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
73726+{
73727+ unsigned int index =
73728+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
73729+ struct acl_role_label **curr;
73730+ struct acl_role_label *tmp, *tmp2;
73731+
73732+ curr = &polstate->acl_role_set.r_hash[index];
73733+
73734+ /* simple case, slot is empty, just set it to our role */
73735+ if (*curr == NULL) {
73736+ *curr = role;
73737+ } else {
73738+ /* example:
73739+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
73740+ 2 -> 3
73741+ */
73742+ /* first check to see if we can already be reached via this slot */
73743+ tmp = *curr;
73744+ while (tmp && tmp != role)
73745+ tmp = tmp->next;
73746+ if (tmp == role) {
73747+ /* we don't need to add ourselves to this slot's chain */
73748+ return;
73749+ }
73750+ /* we need to add ourselves to this chain, two cases */
73751+ if (role->next == NULL) {
73752+ /* simple case, append the current chain to our role */
73753+ role->next = *curr;
73754+ *curr = role;
73755+ } else {
73756+ /* 1 -> 2 -> 3 -> 4
73757+ 2 -> 3 -> 4
73758+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
73759+ */
73760+ /* trickier case: walk our role's chain until we find
73761+ the role for the start of the current slot's chain */
73762+ tmp = role;
73763+ tmp2 = *curr;
73764+ while (tmp->next && tmp->next != tmp2)
73765+ tmp = tmp->next;
73766+ if (tmp->next == tmp2) {
73767+ /* from example above, we found 3, so just
73768+ replace this slot's chain with ours */
73769+ *curr = role;
73770+ } else {
73771+ /* we didn't find a subset of our role's chain
73772+ in the current slot's chain, so append their
73773+ chain to ours, and set us as the first role in
73774+ the slot's chain
73775+
73776+ we could fold this case with the case above,
73777+ but making it explicit for clarity
73778+ */
73779+ tmp->next = tmp2;
73780+ *curr = role;
73781+ }
73782+ }
73783+ }
73784+
73785+ return;
73786+}
73787+
73788+static void
73789+insert_acl_role_label(struct acl_role_label *role)
73790+{
73791+ int i;
73792+
73793+ if (polstate->role_list == NULL) {
73794+ polstate->role_list = role;
73795+ role->prev = NULL;
73796+ } else {
73797+ role->prev = polstate->role_list;
73798+ polstate->role_list = role;
73799+ }
73800+
73801+ /* used for hash chains */
73802+ role->next = NULL;
73803+
73804+ if (role->roletype & GR_ROLE_DOMAIN) {
73805+ for (i = 0; i < role->domain_child_num; i++)
73806+ __insert_acl_role_label(role, role->domain_children[i]);
73807+ } else
73808+ __insert_acl_role_label(role, role->uidgid);
73809+}
73810+
73811+static int
73812+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
73813+{
73814+ struct name_entry **curr, *nentry;
73815+ struct inodev_entry *ientry;
73816+ unsigned int len = strlen(name);
73817+ unsigned int key = full_name_hash(name, len);
73818+ unsigned int index = key % polstate->name_set.n_size;
73819+
73820+ curr = &polstate->name_set.n_hash[index];
73821+
73822+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
73823+ curr = &((*curr)->next);
73824+
73825+ if (*curr != NULL)
73826+ return 1;
73827+
73828+ nentry = acl_alloc(sizeof (struct name_entry));
73829+ if (nentry == NULL)
73830+ return 0;
73831+ ientry = acl_alloc(sizeof (struct inodev_entry));
73832+ if (ientry == NULL)
73833+ return 0;
73834+ ientry->nentry = nentry;
73835+
73836+ nentry->key = key;
73837+ nentry->name = name;
73838+ nentry->inode = inode;
73839+ nentry->device = device;
73840+ nentry->len = len;
73841+ nentry->deleted = deleted;
73842+
73843+ nentry->prev = NULL;
73844+ curr = &polstate->name_set.n_hash[index];
73845+ if (*curr != NULL)
73846+ (*curr)->prev = nentry;
73847+ nentry->next = *curr;
73848+ *curr = nentry;
73849+
73850+ /* insert us into the table searchable by inode/dev */
73851+ __insert_inodev_entry(polstate, ientry);
73852+
73853+ return 1;
73854+}
73855+
73856+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
73857+
73858+static void *
73859+create_table(__u32 * len, int elementsize)
73860+{
73861+ unsigned int table_sizes[] = {
73862+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
73863+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
73864+ 4194301, 8388593, 16777213, 33554393, 67108859
73865+ };
73866+ void *newtable = NULL;
73867+ unsigned int pwr = 0;
73868+
73869+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
73870+ table_sizes[pwr] <= *len)
73871+ pwr++;
73872+
73873+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
73874+ return newtable;
73875+
73876+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
73877+ newtable =
73878+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
73879+ else
73880+ newtable = vmalloc(table_sizes[pwr] * elementsize);
73881+
73882+ *len = table_sizes[pwr];
73883+
73884+ return newtable;
73885+}
73886+
73887+static int
73888+init_variables(const struct gr_arg *arg, bool reload)
73889+{
73890+ struct task_struct *reaper = init_pid_ns.child_reaper;
73891+ unsigned int stacksize;
73892+
73893+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
73894+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
73895+ polstate->name_set.n_size = arg->role_db.num_objects;
73896+ polstate->inodev_set.i_size = arg->role_db.num_objects;
73897+
73898+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
73899+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
73900+ return 1;
73901+
73902+ if (!reload) {
73903+ if (!gr_init_uidset())
73904+ return 1;
73905+ }
73906+
73907+ /* set up the stack that holds allocation info */
73908+
73909+ stacksize = arg->role_db.num_pointers + 5;
73910+
73911+ if (!acl_alloc_stack_init(stacksize))
73912+ return 1;
73913+
73914+ if (!reload) {
73915+ /* grab reference for the real root dentry and vfsmount */
73916+ get_fs_root(reaper->fs, &gr_real_root);
73917+
73918+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
73919+ 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);
73920+#endif
73921+
73922+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
73923+ if (fakefs_obj_rw == NULL)
73924+ return 1;
73925+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
73926+
73927+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
73928+ if (fakefs_obj_rwx == NULL)
73929+ return 1;
73930+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
73931+ }
73932+
73933+ polstate->subj_map_set.s_hash =
73934+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
73935+ polstate->acl_role_set.r_hash =
73936+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
73937+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
73938+ polstate->inodev_set.i_hash =
73939+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
73940+
73941+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
73942+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
73943+ return 1;
73944+
73945+ memset(polstate->subj_map_set.s_hash, 0,
73946+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
73947+ memset(polstate->acl_role_set.r_hash, 0,
73948+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
73949+ memset(polstate->name_set.n_hash, 0,
73950+ sizeof (struct name_entry *) * polstate->name_set.n_size);
73951+ memset(polstate->inodev_set.i_hash, 0,
73952+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
73953+
73954+ return 0;
73955+}
73956+
73957+/* free information not needed after startup
73958+ currently contains user->kernel pointer mappings for subjects
73959+*/
73960+
73961+static void
73962+free_init_variables(void)
73963+{
73964+ __u32 i;
73965+
73966+ if (polstate->subj_map_set.s_hash) {
73967+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
73968+ if (polstate->subj_map_set.s_hash[i]) {
73969+ kfree(polstate->subj_map_set.s_hash[i]);
73970+ polstate->subj_map_set.s_hash[i] = NULL;
73971+ }
73972+ }
73973+
73974+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
73975+ PAGE_SIZE)
73976+ kfree(polstate->subj_map_set.s_hash);
73977+ else
73978+ vfree(polstate->subj_map_set.s_hash);
73979+ }
73980+
73981+ return;
73982+}
73983+
73984+static void
73985+free_variables(bool reload)
73986+{
73987+ struct acl_subject_label *s;
73988+ struct acl_role_label *r;
73989+ struct task_struct *task, *task2;
73990+ unsigned int x;
73991+
73992+ if (!reload) {
73993+ gr_clear_learn_entries();
73994+
73995+ read_lock(&tasklist_lock);
73996+ do_each_thread(task2, task) {
73997+ task->acl_sp_role = 0;
73998+ task->acl_role_id = 0;
73999+ task->inherited = 0;
74000+ task->acl = NULL;
74001+ task->role = NULL;
74002+ } while_each_thread(task2, task);
74003+ read_unlock(&tasklist_lock);
74004+
74005+ kfree(fakefs_obj_rw);
74006+ fakefs_obj_rw = NULL;
74007+ kfree(fakefs_obj_rwx);
74008+ fakefs_obj_rwx = NULL;
74009+
74010+ /* release the reference to the real root dentry and vfsmount */
74011+ path_put(&gr_real_root);
74012+ memset(&gr_real_root, 0, sizeof(gr_real_root));
74013+ }
74014+
74015+ /* free all object hash tables */
74016+
74017+ FOR_EACH_ROLE_START(r)
74018+ if (r->subj_hash == NULL)
74019+ goto next_role;
74020+ FOR_EACH_SUBJECT_START(r, s, x)
74021+ if (s->obj_hash == NULL)
74022+ break;
74023+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
74024+ kfree(s->obj_hash);
74025+ else
74026+ vfree(s->obj_hash);
74027+ FOR_EACH_SUBJECT_END(s, x)
74028+ FOR_EACH_NESTED_SUBJECT_START(r, s)
74029+ if (s->obj_hash == NULL)
74030+ break;
74031+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
74032+ kfree(s->obj_hash);
74033+ else
74034+ vfree(s->obj_hash);
74035+ FOR_EACH_NESTED_SUBJECT_END(s)
74036+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
74037+ kfree(r->subj_hash);
74038+ else
74039+ vfree(r->subj_hash);
74040+ r->subj_hash = NULL;
74041+next_role:
74042+ FOR_EACH_ROLE_END(r)
74043+
74044+ acl_free_all();
74045+
74046+ if (polstate->acl_role_set.r_hash) {
74047+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
74048+ PAGE_SIZE)
74049+ kfree(polstate->acl_role_set.r_hash);
74050+ else
74051+ vfree(polstate->acl_role_set.r_hash);
74052+ }
74053+ if (polstate->name_set.n_hash) {
74054+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
74055+ PAGE_SIZE)
74056+ kfree(polstate->name_set.n_hash);
74057+ else
74058+ vfree(polstate->name_set.n_hash);
74059+ }
74060+
74061+ if (polstate->inodev_set.i_hash) {
74062+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
74063+ PAGE_SIZE)
74064+ kfree(polstate->inodev_set.i_hash);
74065+ else
74066+ vfree(polstate->inodev_set.i_hash);
74067+ }
74068+
74069+ if (!reload)
74070+ gr_free_uidset();
74071+
74072+ memset(&polstate->name_set, 0, sizeof (struct name_db));
74073+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
74074+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
74075+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
74076+
74077+ polstate->default_role = NULL;
74078+ polstate->kernel_role = NULL;
74079+ polstate->role_list = NULL;
74080+
74081+ return;
74082+}
74083+
74084+static struct acl_subject_label *
74085+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
74086+
74087+static int alloc_and_copy_string(char **name, unsigned int maxlen)
74088+{
74089+ unsigned int len = strnlen_user(*name, maxlen);
74090+ char *tmp;
74091+
74092+ if (!len || len >= maxlen)
74093+ return -EINVAL;
74094+
74095+ if ((tmp = (char *) acl_alloc(len)) == NULL)
74096+ return -ENOMEM;
74097+
74098+ if (copy_from_user(tmp, *name, len))
74099+ return -EFAULT;
74100+
74101+ tmp[len-1] = '\0';
74102+ *name = tmp;
74103+
74104+ return 0;
74105+}
74106+
74107+static int
74108+copy_user_glob(struct acl_object_label *obj)
74109+{
74110+ struct acl_object_label *g_tmp, **guser;
74111+ int error;
74112+
74113+ if (obj->globbed == NULL)
74114+ return 0;
74115+
74116+ guser = &obj->globbed;
74117+ while (*guser) {
74118+ g_tmp = (struct acl_object_label *)
74119+ acl_alloc(sizeof (struct acl_object_label));
74120+ if (g_tmp == NULL)
74121+ return -ENOMEM;
74122+
74123+ if (copy_acl_object_label(g_tmp, *guser))
74124+ return -EFAULT;
74125+
74126+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
74127+ if (error)
74128+ return error;
74129+
74130+ *guser = g_tmp;
74131+ guser = &(g_tmp->next);
74132+ }
74133+
74134+ return 0;
74135+}
74136+
74137+static int
74138+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
74139+ struct acl_role_label *role)
74140+{
74141+ struct acl_object_label *o_tmp;
74142+ int ret;
74143+
74144+ while (userp) {
74145+ if ((o_tmp = (struct acl_object_label *)
74146+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
74147+ return -ENOMEM;
74148+
74149+ if (copy_acl_object_label(o_tmp, userp))
74150+ return -EFAULT;
74151+
74152+ userp = o_tmp->prev;
74153+
74154+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
74155+ if (ret)
74156+ return ret;
74157+
74158+ insert_acl_obj_label(o_tmp, subj);
74159+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
74160+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
74161+ return -ENOMEM;
74162+
74163+ ret = copy_user_glob(o_tmp);
74164+ if (ret)
74165+ return ret;
74166+
74167+ if (o_tmp->nested) {
74168+ int already_copied;
74169+
74170+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
74171+ if (IS_ERR(o_tmp->nested))
74172+ return PTR_ERR(o_tmp->nested);
74173+
74174+ /* insert into nested subject list if we haven't copied this one yet
74175+ to prevent duplicate entries */
74176+ if (!already_copied) {
74177+ o_tmp->nested->next = role->hash->first;
74178+ role->hash->first = o_tmp->nested;
74179+ }
74180+ }
74181+ }
74182+
74183+ return 0;
74184+}
74185+
74186+static __u32
74187+count_user_subjs(struct acl_subject_label *userp)
74188+{
74189+ struct acl_subject_label s_tmp;
74190+ __u32 num = 0;
74191+
74192+ while (userp) {
74193+ if (copy_acl_subject_label(&s_tmp, userp))
74194+ break;
74195+
74196+ userp = s_tmp.prev;
74197+ }
74198+
74199+ return num;
74200+}
74201+
74202+static int
74203+copy_user_allowedips(struct acl_role_label *rolep)
74204+{
74205+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
74206+
74207+ ruserip = rolep->allowed_ips;
74208+
74209+ while (ruserip) {
74210+ rlast = rtmp;
74211+
74212+ if ((rtmp = (struct role_allowed_ip *)
74213+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
74214+ return -ENOMEM;
74215+
74216+ if (copy_role_allowed_ip(rtmp, ruserip))
74217+ return -EFAULT;
74218+
74219+ ruserip = rtmp->prev;
74220+
74221+ if (!rlast) {
74222+ rtmp->prev = NULL;
74223+ rolep->allowed_ips = rtmp;
74224+ } else {
74225+ rlast->next = rtmp;
74226+ rtmp->prev = rlast;
74227+ }
74228+
74229+ if (!ruserip)
74230+ rtmp->next = NULL;
74231+ }
74232+
74233+ return 0;
74234+}
74235+
74236+static int
74237+copy_user_transitions(struct acl_role_label *rolep)
74238+{
74239+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
74240+ int error;
74241+
74242+ rusertp = rolep->transitions;
74243+
74244+ while (rusertp) {
74245+ rlast = rtmp;
74246+
74247+ if ((rtmp = (struct role_transition *)
74248+ acl_alloc(sizeof (struct role_transition))) == NULL)
74249+ return -ENOMEM;
74250+
74251+ if (copy_role_transition(rtmp, rusertp))
74252+ return -EFAULT;
74253+
74254+ rusertp = rtmp->prev;
74255+
74256+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
74257+ if (error)
74258+ return error;
74259+
74260+ if (!rlast) {
74261+ rtmp->prev = NULL;
74262+ rolep->transitions = rtmp;
74263+ } else {
74264+ rlast->next = rtmp;
74265+ rtmp->prev = rlast;
74266+ }
74267+
74268+ if (!rusertp)
74269+ rtmp->next = NULL;
74270+ }
74271+
74272+ return 0;
74273+}
74274+
74275+static __u32 count_user_objs(const struct acl_object_label __user *userp)
74276+{
74277+ struct acl_object_label o_tmp;
74278+ __u32 num = 0;
74279+
74280+ while (userp) {
74281+ if (copy_acl_object_label(&o_tmp, userp))
74282+ break;
74283+
74284+ userp = o_tmp.prev;
74285+ num++;
74286+ }
74287+
74288+ return num;
74289+}
74290+
74291+static struct acl_subject_label *
74292+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
74293+{
74294+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
74295+ __u32 num_objs;
74296+ struct acl_ip_label **i_tmp, *i_utmp2;
74297+ struct gr_hash_struct ghash;
74298+ struct subject_map *subjmap;
74299+ unsigned int i_num;
74300+ int err;
74301+
74302+ if (already_copied != NULL)
74303+ *already_copied = 0;
74304+
74305+ s_tmp = lookup_subject_map(userp);
74306+
74307+ /* we've already copied this subject into the kernel, just return
74308+ the reference to it, and don't copy it over again
74309+ */
74310+ if (s_tmp) {
74311+ if (already_copied != NULL)
74312+ *already_copied = 1;
74313+ return(s_tmp);
74314+ }
74315+
74316+ if ((s_tmp = (struct acl_subject_label *)
74317+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
74318+ return ERR_PTR(-ENOMEM);
74319+
74320+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
74321+ if (subjmap == NULL)
74322+ return ERR_PTR(-ENOMEM);
74323+
74324+ subjmap->user = userp;
74325+ subjmap->kernel = s_tmp;
74326+ insert_subj_map_entry(subjmap);
74327+
74328+ if (copy_acl_subject_label(s_tmp, userp))
74329+ return ERR_PTR(-EFAULT);
74330+
74331+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
74332+ if (err)
74333+ return ERR_PTR(err);
74334+
74335+ if (!strcmp(s_tmp->filename, "/"))
74336+ role->root_label = s_tmp;
74337+
74338+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
74339+ return ERR_PTR(-EFAULT);
74340+
74341+ /* copy user and group transition tables */
74342+
74343+ if (s_tmp->user_trans_num) {
74344+ uid_t *uidlist;
74345+
74346+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
74347+ if (uidlist == NULL)
74348+ return ERR_PTR(-ENOMEM);
74349+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
74350+ return ERR_PTR(-EFAULT);
74351+
74352+ s_tmp->user_transitions = uidlist;
74353+ }
74354+
74355+ if (s_tmp->group_trans_num) {
74356+ gid_t *gidlist;
74357+
74358+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
74359+ if (gidlist == NULL)
74360+ return ERR_PTR(-ENOMEM);
74361+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
74362+ return ERR_PTR(-EFAULT);
74363+
74364+ s_tmp->group_transitions = gidlist;
74365+ }
74366+
74367+ /* set up object hash table */
74368+ num_objs = count_user_objs(ghash.first);
74369+
74370+ s_tmp->obj_hash_size = num_objs;
74371+ s_tmp->obj_hash =
74372+ (struct acl_object_label **)
74373+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
74374+
74375+ if (!s_tmp->obj_hash)
74376+ return ERR_PTR(-ENOMEM);
74377+
74378+ memset(s_tmp->obj_hash, 0,
74379+ s_tmp->obj_hash_size *
74380+ sizeof (struct acl_object_label *));
74381+
74382+ /* add in objects */
74383+ err = copy_user_objs(ghash.first, s_tmp, role);
74384+
74385+ if (err)
74386+ return ERR_PTR(err);
74387+
74388+ /* set pointer for parent subject */
74389+ if (s_tmp->parent_subject) {
74390+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
74391+
74392+ if (IS_ERR(s_tmp2))
74393+ return s_tmp2;
74394+
74395+ s_tmp->parent_subject = s_tmp2;
74396+ }
74397+
74398+ /* add in ip acls */
74399+
74400+ if (!s_tmp->ip_num) {
74401+ s_tmp->ips = NULL;
74402+ goto insert;
74403+ }
74404+
74405+ i_tmp =
74406+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
74407+ sizeof (struct acl_ip_label *));
74408+
74409+ if (!i_tmp)
74410+ return ERR_PTR(-ENOMEM);
74411+
74412+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
74413+ *(i_tmp + i_num) =
74414+ (struct acl_ip_label *)
74415+ acl_alloc(sizeof (struct acl_ip_label));
74416+ if (!*(i_tmp + i_num))
74417+ return ERR_PTR(-ENOMEM);
74418+
74419+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
74420+ return ERR_PTR(-EFAULT);
74421+
74422+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
74423+ return ERR_PTR(-EFAULT);
74424+
74425+ if ((*(i_tmp + i_num))->iface == NULL)
74426+ continue;
74427+
74428+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
74429+ if (err)
74430+ return ERR_PTR(err);
74431+ }
74432+
74433+ s_tmp->ips = i_tmp;
74434+
74435+insert:
74436+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
74437+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
74438+ return ERR_PTR(-ENOMEM);
74439+
74440+ return s_tmp;
74441+}
74442+
74443+static int
74444+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
74445+{
74446+ struct acl_subject_label s_pre;
74447+ struct acl_subject_label * ret;
74448+ int err;
74449+
74450+ while (userp) {
74451+ if (copy_acl_subject_label(&s_pre, userp))
74452+ return -EFAULT;
74453+
74454+ ret = do_copy_user_subj(userp, role, NULL);
74455+
74456+ err = PTR_ERR(ret);
74457+ if (IS_ERR(ret))
74458+ return err;
74459+
74460+ insert_acl_subj_label(ret, role);
74461+
74462+ userp = s_pre.prev;
74463+ }
74464+
74465+ return 0;
74466+}
74467+
74468+static int
74469+copy_user_acl(struct gr_arg *arg)
74470+{
74471+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
74472+ struct acl_subject_label *subj_list;
74473+ struct sprole_pw *sptmp;
74474+ struct gr_hash_struct *ghash;
74475+ uid_t *domainlist;
74476+ unsigned int r_num;
74477+ int err = 0;
74478+ __u16 i;
74479+ __u32 num_subjs;
74480+
74481+ /* we need a default and kernel role */
74482+ if (arg->role_db.num_roles < 2)
74483+ return -EINVAL;
74484+
74485+ /* copy special role authentication info from userspace */
74486+
74487+ polstate->num_sprole_pws = arg->num_sprole_pws;
74488+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
74489+
74490+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
74491+ return -ENOMEM;
74492+
74493+ for (i = 0; i < polstate->num_sprole_pws; i++) {
74494+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
74495+ if (!sptmp)
74496+ return -ENOMEM;
74497+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
74498+ return -EFAULT;
74499+
74500+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
74501+ if (err)
74502+ return err;
74503+
74504+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
74505+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
74506+#endif
74507+
74508+ polstate->acl_special_roles[i] = sptmp;
74509+ }
74510+
74511+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
74512+
74513+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
74514+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
74515+
74516+ if (!r_tmp)
74517+ return -ENOMEM;
74518+
74519+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
74520+ return -EFAULT;
74521+
74522+ if (copy_acl_role_label(r_tmp, r_utmp2))
74523+ return -EFAULT;
74524+
74525+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
74526+ if (err)
74527+ return err;
74528+
74529+ if (!strcmp(r_tmp->rolename, "default")
74530+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
74531+ polstate->default_role = r_tmp;
74532+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
74533+ polstate->kernel_role = r_tmp;
74534+ }
74535+
74536+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
74537+ return -ENOMEM;
74538+
74539+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
74540+ return -EFAULT;
74541+
74542+ r_tmp->hash = ghash;
74543+
74544+ num_subjs = count_user_subjs(r_tmp->hash->first);
74545+
74546+ r_tmp->subj_hash_size = num_subjs;
74547+ r_tmp->subj_hash =
74548+ (struct acl_subject_label **)
74549+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
74550+
74551+ if (!r_tmp->subj_hash)
74552+ return -ENOMEM;
74553+
74554+ err = copy_user_allowedips(r_tmp);
74555+ if (err)
74556+ return err;
74557+
74558+ /* copy domain info */
74559+ if (r_tmp->domain_children != NULL) {
74560+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
74561+ if (domainlist == NULL)
74562+ return -ENOMEM;
74563+
74564+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
74565+ return -EFAULT;
74566+
74567+ r_tmp->domain_children = domainlist;
74568+ }
74569+
74570+ err = copy_user_transitions(r_tmp);
74571+ if (err)
74572+ return err;
74573+
74574+ memset(r_tmp->subj_hash, 0,
74575+ r_tmp->subj_hash_size *
74576+ sizeof (struct acl_subject_label *));
74577+
74578+ /* acquire the list of subjects, then NULL out
74579+ the list prior to parsing the subjects for this role,
74580+ as during this parsing the list is replaced with a list
74581+ of *nested* subjects for the role
74582+ */
74583+ subj_list = r_tmp->hash->first;
74584+
74585+ /* set nested subject list to null */
74586+ r_tmp->hash->first = NULL;
74587+
74588+ err = copy_user_subjs(subj_list, r_tmp);
74589+
74590+ if (err)
74591+ return err;
74592+
74593+ insert_acl_role_label(r_tmp);
74594+ }
74595+
74596+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
74597+ return -EINVAL;
74598+
74599+ return err;
74600+}
74601+
74602+static int gracl_reload_apply_policies(void *reload)
74603+{
74604+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
74605+ struct task_struct *task, *task2;
74606+ struct acl_role_label *role, *rtmp;
74607+ struct acl_subject_label *subj;
74608+ const struct cred *cred;
74609+ int role_applied;
74610+ int ret = 0;
74611+
74612+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
74613+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
74614+
74615+ /* first make sure we'll be able to apply the new policy cleanly */
74616+ do_each_thread(task2, task) {
74617+ if (task->exec_file == NULL)
74618+ continue;
74619+ role_applied = 0;
74620+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
74621+ /* preserve special roles */
74622+ FOR_EACH_ROLE_START(role)
74623+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
74624+ rtmp = task->role;
74625+ task->role = role;
74626+ role_applied = 1;
74627+ break;
74628+ }
74629+ FOR_EACH_ROLE_END(role)
74630+ }
74631+ if (!role_applied) {
74632+ cred = __task_cred(task);
74633+ rtmp = task->role;
74634+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
74635+ }
74636+ /* this handles non-nested inherited subjects, nested subjects will still
74637+ be dropped currently */
74638+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
74639+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
74640+ /* change the role back so that we've made no modifications to the policy */
74641+ task->role = rtmp;
74642+
74643+ if (subj == NULL || task->tmpacl == NULL) {
74644+ ret = -EINVAL;
74645+ goto out;
74646+ }
74647+ } while_each_thread(task2, task);
74648+
74649+ /* now actually apply the policy */
74650+
74651+ do_each_thread(task2, task) {
74652+ if (task->exec_file) {
74653+ role_applied = 0;
74654+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
74655+ /* preserve special roles */
74656+ FOR_EACH_ROLE_START(role)
74657+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
74658+ task->role = role;
74659+ role_applied = 1;
74660+ break;
74661+ }
74662+ FOR_EACH_ROLE_END(role)
74663+ }
74664+ if (!role_applied) {
74665+ cred = __task_cred(task);
74666+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
74667+ }
74668+ /* this handles non-nested inherited subjects, nested subjects will still
74669+ be dropped currently */
74670+ if (!reload_state->oldmode && task->inherited)
74671+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
74672+ else {
74673+ /* looked up and tagged to the task previously */
74674+ subj = task->tmpacl;
74675+ }
74676+ /* subj will be non-null */
74677+ __gr_apply_subject_to_task(polstate, task, subj);
74678+ if (reload_state->oldmode) {
74679+ task->acl_role_id = 0;
74680+ task->acl_sp_role = 0;
74681+ task->inherited = 0;
74682+ }
74683+ } else {
74684+ // it's a kernel process
74685+ task->role = polstate->kernel_role;
74686+ task->acl = polstate->kernel_role->root_label;
74687+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
74688+ task->acl->mode &= ~GR_PROCFIND;
74689+#endif
74690+ }
74691+ } while_each_thread(task2, task);
74692+
74693+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
74694+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
74695+
74696+out:
74697+
74698+ return ret;
74699+}
74700+
74701+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
74702+{
74703+ struct gr_reload_state new_reload_state = { };
74704+ int err;
74705+
74706+ new_reload_state.oldpolicy_ptr = polstate;
74707+ new_reload_state.oldalloc_ptr = current_alloc_state;
74708+ new_reload_state.oldmode = oldmode;
74709+
74710+ current_alloc_state = &new_reload_state.newalloc;
74711+ polstate = &new_reload_state.newpolicy;
74712+
74713+ /* everything relevant is now saved off, copy in the new policy */
74714+ if (init_variables(args, true)) {
74715+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
74716+ err = -ENOMEM;
74717+ goto error;
74718+ }
74719+
74720+ err = copy_user_acl(args);
74721+ free_init_variables();
74722+ if (err)
74723+ goto error;
74724+ /* the new policy is copied in, with the old policy available via saved_state
74725+ first go through applying roles, making sure to preserve special roles
74726+ then apply new subjects, making sure to preserve inherited and nested subjects,
74727+ though currently only inherited subjects will be preserved
74728+ */
74729+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
74730+ if (err)
74731+ goto error;
74732+
74733+ /* we've now applied the new policy, so restore the old policy state to free it */
74734+ polstate = &new_reload_state.oldpolicy;
74735+ current_alloc_state = &new_reload_state.oldalloc;
74736+ free_variables(true);
74737+
74738+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
74739+ to running_polstate/current_alloc_state inside stop_machine
74740+ */
74741+ err = 0;
74742+ goto out;
74743+error:
74744+ /* on error of loading the new policy, we'll just keep the previous
74745+ policy set around
74746+ */
74747+ free_variables(true);
74748+
74749+ /* doesn't affect runtime, but maintains consistent state */
74750+out:
74751+ polstate = new_reload_state.oldpolicy_ptr;
74752+ current_alloc_state = new_reload_state.oldalloc_ptr;
74753+
74754+ return err;
74755+}
74756+
74757+static int
74758+gracl_init(struct gr_arg *args)
74759+{
74760+ int error = 0;
74761+
74762+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
74763+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
74764+
74765+ if (init_variables(args, false)) {
74766+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
74767+ error = -ENOMEM;
74768+ goto out;
74769+ }
74770+
74771+ error = copy_user_acl(args);
74772+ free_init_variables();
74773+ if (error)
74774+ goto out;
74775+
74776+ error = gr_set_acls(0);
74777+ if (error)
74778+ goto out;
74779+
74780+ gr_enable_rbac_system();
74781+
74782+ return 0;
74783+
74784+out:
74785+ free_variables(false);
74786+ return error;
74787+}
74788+
74789+static int
74790+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
74791+ unsigned char **sum)
74792+{
74793+ struct acl_role_label *r;
74794+ struct role_allowed_ip *ipp;
74795+ struct role_transition *trans;
74796+ unsigned int i;
74797+ int found = 0;
74798+ u32 curr_ip = current->signal->curr_ip;
74799+
74800+ current->signal->saved_ip = curr_ip;
74801+
74802+ /* check transition table */
74803+
74804+ for (trans = current->role->transitions; trans; trans = trans->next) {
74805+ if (!strcmp(rolename, trans->rolename)) {
74806+ found = 1;
74807+ break;
74808+ }
74809+ }
74810+
74811+ if (!found)
74812+ return 0;
74813+
74814+ /* handle special roles that do not require authentication
74815+ and check ip */
74816+
74817+ FOR_EACH_ROLE_START(r)
74818+ if (!strcmp(rolename, r->rolename) &&
74819+ (r->roletype & GR_ROLE_SPECIAL)) {
74820+ found = 0;
74821+ if (r->allowed_ips != NULL) {
74822+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
74823+ if ((ntohl(curr_ip) & ipp->netmask) ==
74824+ (ntohl(ipp->addr) & ipp->netmask))
74825+ found = 1;
74826+ }
74827+ } else
74828+ found = 2;
74829+ if (!found)
74830+ return 0;
74831+
74832+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
74833+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
74834+ *salt = NULL;
74835+ *sum = NULL;
74836+ return 1;
74837+ }
74838+ }
74839+ FOR_EACH_ROLE_END(r)
74840+
74841+ for (i = 0; i < polstate->num_sprole_pws; i++) {
74842+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
74843+ *salt = polstate->acl_special_roles[i]->salt;
74844+ *sum = polstate->acl_special_roles[i]->sum;
74845+ return 1;
74846+ }
74847+ }
74848+
74849+ return 0;
74850+}
74851+
74852+int gr_check_secure_terminal(struct task_struct *task)
74853+{
74854+ struct task_struct *p, *p2, *p3;
74855+ struct files_struct *files;
74856+ struct fdtable *fdt;
74857+ struct file *our_file = NULL, *file;
74858+ int i;
74859+
74860+ if (task->signal->tty == NULL)
74861+ return 1;
74862+
74863+ files = get_files_struct(task);
74864+ if (files != NULL) {
74865+ rcu_read_lock();
74866+ fdt = files_fdtable(files);
74867+ for (i=0; i < fdt->max_fds; i++) {
74868+ file = fcheck_files(files, i);
74869+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
74870+ get_file(file);
74871+ our_file = file;
74872+ }
74873+ }
74874+ rcu_read_unlock();
74875+ put_files_struct(files);
74876+ }
74877+
74878+ if (our_file == NULL)
74879+ return 1;
74880+
74881+ read_lock(&tasklist_lock);
74882+ do_each_thread(p2, p) {
74883+ files = get_files_struct(p);
74884+ if (files == NULL ||
74885+ (p->signal && p->signal->tty == task->signal->tty)) {
74886+ if (files != NULL)
74887+ put_files_struct(files);
74888+ continue;
74889+ }
74890+ rcu_read_lock();
74891+ fdt = files_fdtable(files);
74892+ for (i=0; i < fdt->max_fds; i++) {
74893+ file = fcheck_files(files, i);
74894+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
74895+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
74896+ p3 = task;
74897+ while (task_pid_nr(p3) > 0) {
74898+ if (p3 == p)
74899+ break;
74900+ p3 = p3->real_parent;
74901+ }
74902+ if (p3 == p)
74903+ break;
74904+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
74905+ gr_handle_alertkill(p);
74906+ rcu_read_unlock();
74907+ put_files_struct(files);
74908+ read_unlock(&tasklist_lock);
74909+ fput(our_file);
74910+ return 0;
74911+ }
74912+ }
74913+ rcu_read_unlock();
74914+ put_files_struct(files);
74915+ } while_each_thread(p2, p);
74916+ read_unlock(&tasklist_lock);
74917+
74918+ fput(our_file);
74919+ return 1;
74920+}
74921+
74922+ssize_t
74923+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
74924+{
74925+ struct gr_arg_wrapper uwrap;
74926+ unsigned char *sprole_salt = NULL;
74927+ unsigned char *sprole_sum = NULL;
74928+ int error = 0;
74929+ int error2 = 0;
74930+ size_t req_count = 0;
74931+ unsigned char oldmode = 0;
74932+
74933+ mutex_lock(&gr_dev_mutex);
74934+
74935+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
74936+ error = -EPERM;
74937+ goto out;
74938+ }
74939+
74940+#ifdef CONFIG_COMPAT
74941+ pax_open_kernel();
74942+ if (is_compat_task()) {
74943+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
74944+ copy_gr_arg = &copy_gr_arg_compat;
74945+ copy_acl_object_label = &copy_acl_object_label_compat;
74946+ copy_acl_subject_label = &copy_acl_subject_label_compat;
74947+ copy_acl_role_label = &copy_acl_role_label_compat;
74948+ copy_acl_ip_label = &copy_acl_ip_label_compat;
74949+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
74950+ copy_role_transition = &copy_role_transition_compat;
74951+ copy_sprole_pw = &copy_sprole_pw_compat;
74952+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
74953+ copy_pointer_from_array = &copy_pointer_from_array_compat;
74954+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
74955+ } else {
74956+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
74957+ copy_gr_arg = &copy_gr_arg_normal;
74958+ copy_acl_object_label = &copy_acl_object_label_normal;
74959+ copy_acl_subject_label = &copy_acl_subject_label_normal;
74960+ copy_acl_role_label = &copy_acl_role_label_normal;
74961+ copy_acl_ip_label = &copy_acl_ip_label_normal;
74962+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
74963+ copy_role_transition = &copy_role_transition_normal;
74964+ copy_sprole_pw = &copy_sprole_pw_normal;
74965+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
74966+ copy_pointer_from_array = &copy_pointer_from_array_normal;
74967+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
74968+ }
74969+ pax_close_kernel();
74970+#endif
74971+
74972+ req_count = get_gr_arg_wrapper_size();
74973+
74974+ if (count != req_count) {
74975+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
74976+ error = -EINVAL;
74977+ goto out;
74978+ }
74979+
74980+
74981+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
74982+ gr_auth_expires = 0;
74983+ gr_auth_attempts = 0;
74984+ }
74985+
74986+ error = copy_gr_arg_wrapper(buf, &uwrap);
74987+ if (error)
74988+ goto out;
74989+
74990+ error = copy_gr_arg(uwrap.arg, gr_usermode);
74991+ if (error)
74992+ goto out;
74993+
74994+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
74995+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
74996+ time_after(gr_auth_expires, get_seconds())) {
74997+ error = -EBUSY;
74998+ goto out;
74999+ }
75000+
75001+ /* if non-root trying to do anything other than use a special role,
75002+ do not attempt authentication, do not count towards authentication
75003+ locking
75004+ */
75005+
75006+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
75007+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
75008+ gr_is_global_nonroot(current_uid())) {
75009+ error = -EPERM;
75010+ goto out;
75011+ }
75012+
75013+ /* ensure pw and special role name are null terminated */
75014+
75015+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
75016+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
75017+
75018+ /* Okay.
75019+ * We have our enough of the argument structure..(we have yet
75020+ * to copy_from_user the tables themselves) . Copy the tables
75021+ * only if we need them, i.e. for loading operations. */
75022+
75023+ switch (gr_usermode->mode) {
75024+ case GR_STATUS:
75025+ if (gr_acl_is_enabled()) {
75026+ error = 1;
75027+ if (!gr_check_secure_terminal(current))
75028+ error = 3;
75029+ } else
75030+ error = 2;
75031+ goto out;
75032+ case GR_SHUTDOWN:
75033+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75034+ stop_machine(gr_rbac_disable, NULL, NULL);
75035+ free_variables(false);
75036+ memset(gr_usermode, 0, sizeof(struct gr_arg));
75037+ memset(gr_system_salt, 0, GR_SALT_LEN);
75038+ memset(gr_system_sum, 0, GR_SHA_LEN);
75039+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
75040+ } else if (gr_acl_is_enabled()) {
75041+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
75042+ error = -EPERM;
75043+ } else {
75044+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
75045+ error = -EAGAIN;
75046+ }
75047+ break;
75048+ case GR_ENABLE:
75049+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
75050+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
75051+ else {
75052+ if (gr_acl_is_enabled())
75053+ error = -EAGAIN;
75054+ else
75055+ error = error2;
75056+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
75057+ }
75058+ break;
75059+ case GR_OLDRELOAD:
75060+ oldmode = 1;
75061+ case GR_RELOAD:
75062+ if (!gr_acl_is_enabled()) {
75063+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
75064+ error = -EAGAIN;
75065+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75066+ error2 = gracl_reload(gr_usermode, oldmode);
75067+ if (!error2)
75068+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
75069+ else {
75070+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
75071+ error = error2;
75072+ }
75073+ } else {
75074+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
75075+ error = -EPERM;
75076+ }
75077+ break;
75078+ case GR_SEGVMOD:
75079+ if (unlikely(!gr_acl_is_enabled())) {
75080+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
75081+ error = -EAGAIN;
75082+ break;
75083+ }
75084+
75085+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75086+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
75087+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
75088+ struct acl_subject_label *segvacl;
75089+ segvacl =
75090+ lookup_acl_subj_label(gr_usermode->segv_inode,
75091+ gr_usermode->segv_device,
75092+ current->role);
75093+ if (segvacl) {
75094+ segvacl->crashes = 0;
75095+ segvacl->expires = 0;
75096+ }
75097+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
75098+ gr_remove_uid(gr_usermode->segv_uid);
75099+ }
75100+ } else {
75101+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
75102+ error = -EPERM;
75103+ }
75104+ break;
75105+ case GR_SPROLE:
75106+ case GR_SPROLEPAM:
75107+ if (unlikely(!gr_acl_is_enabled())) {
75108+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
75109+ error = -EAGAIN;
75110+ break;
75111+ }
75112+
75113+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
75114+ current->role->expires = 0;
75115+ current->role->auth_attempts = 0;
75116+ }
75117+
75118+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
75119+ time_after(current->role->expires, get_seconds())) {
75120+ error = -EBUSY;
75121+ goto out;
75122+ }
75123+
75124+ if (lookup_special_role_auth
75125+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
75126+ && ((!sprole_salt && !sprole_sum)
75127+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
75128+ char *p = "";
75129+ assign_special_role(gr_usermode->sp_role);
75130+ read_lock(&tasklist_lock);
75131+ if (current->real_parent)
75132+ p = current->real_parent->role->rolename;
75133+ read_unlock(&tasklist_lock);
75134+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
75135+ p, acl_sp_role_value);
75136+ } else {
75137+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
75138+ error = -EPERM;
75139+ if(!(current->role->auth_attempts++))
75140+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75141+
75142+ goto out;
75143+ }
75144+ break;
75145+ case GR_UNSPROLE:
75146+ if (unlikely(!gr_acl_is_enabled())) {
75147+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
75148+ error = -EAGAIN;
75149+ break;
75150+ }
75151+
75152+ if (current->role->roletype & GR_ROLE_SPECIAL) {
75153+ char *p = "";
75154+ int i = 0;
75155+
75156+ read_lock(&tasklist_lock);
75157+ if (current->real_parent) {
75158+ p = current->real_parent->role->rolename;
75159+ i = current->real_parent->acl_role_id;
75160+ }
75161+ read_unlock(&tasklist_lock);
75162+
75163+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
75164+ gr_set_acls(1);
75165+ } else {
75166+ error = -EPERM;
75167+ goto out;
75168+ }
75169+ break;
75170+ default:
75171+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
75172+ error = -EINVAL;
75173+ break;
75174+ }
75175+
75176+ if (error != -EPERM)
75177+ goto out;
75178+
75179+ if(!(gr_auth_attempts++))
75180+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75181+
75182+ out:
75183+ mutex_unlock(&gr_dev_mutex);
75184+
75185+ if (!error)
75186+ error = req_count;
75187+
75188+ return error;
75189+}
75190+
75191+int
75192+gr_set_acls(const int type)
75193+{
75194+ struct task_struct *task, *task2;
75195+ struct acl_role_label *role = current->role;
75196+ struct acl_subject_label *subj;
75197+ __u16 acl_role_id = current->acl_role_id;
75198+ const struct cred *cred;
75199+ int ret;
75200+
75201+ rcu_read_lock();
75202+ read_lock(&tasklist_lock);
75203+ read_lock(&grsec_exec_file_lock);
75204+ do_each_thread(task2, task) {
75205+ /* check to see if we're called from the exit handler,
75206+ if so, only replace ACLs that have inherited the admin
75207+ ACL */
75208+
75209+ if (type && (task->role != role ||
75210+ task->acl_role_id != acl_role_id))
75211+ continue;
75212+
75213+ task->acl_role_id = 0;
75214+ task->acl_sp_role = 0;
75215+ task->inherited = 0;
75216+
75217+ if (task->exec_file) {
75218+ cred = __task_cred(task);
75219+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75220+ subj = __gr_get_subject_for_task(polstate, task, NULL);
75221+ if (subj == NULL) {
75222+ ret = -EINVAL;
75223+ read_unlock(&grsec_exec_file_lock);
75224+ read_unlock(&tasklist_lock);
75225+ rcu_read_unlock();
75226+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
75227+ return ret;
75228+ }
75229+ __gr_apply_subject_to_task(polstate, task, subj);
75230+ } else {
75231+ // it's a kernel process
75232+ task->role = polstate->kernel_role;
75233+ task->acl = polstate->kernel_role->root_label;
75234+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
75235+ task->acl->mode &= ~GR_PROCFIND;
75236+#endif
75237+ }
75238+ } while_each_thread(task2, task);
75239+ read_unlock(&grsec_exec_file_lock);
75240+ read_unlock(&tasklist_lock);
75241+ rcu_read_unlock();
75242+
75243+ return 0;
75244+}
75245diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
75246new file mode 100644
75247index 0000000..39645c9
75248--- /dev/null
75249+++ b/grsecurity/gracl_res.c
75250@@ -0,0 +1,68 @@
75251+#include <linux/kernel.h>
75252+#include <linux/sched.h>
75253+#include <linux/gracl.h>
75254+#include <linux/grinternal.h>
75255+
75256+static const char *restab_log[] = {
75257+ [RLIMIT_CPU] = "RLIMIT_CPU",
75258+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
75259+ [RLIMIT_DATA] = "RLIMIT_DATA",
75260+ [RLIMIT_STACK] = "RLIMIT_STACK",
75261+ [RLIMIT_CORE] = "RLIMIT_CORE",
75262+ [RLIMIT_RSS] = "RLIMIT_RSS",
75263+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
75264+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
75265+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
75266+ [RLIMIT_AS] = "RLIMIT_AS",
75267+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
75268+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
75269+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
75270+ [RLIMIT_NICE] = "RLIMIT_NICE",
75271+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
75272+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
75273+ [GR_CRASH_RES] = "RLIMIT_CRASH"
75274+};
75275+
75276+void
75277+gr_log_resource(const struct task_struct *task,
75278+ const int res, const unsigned long wanted, const int gt)
75279+{
75280+ const struct cred *cred;
75281+ unsigned long rlim;
75282+
75283+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
75284+ return;
75285+
75286+ // not yet supported resource
75287+ if (unlikely(!restab_log[res]))
75288+ return;
75289+
75290+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
75291+ rlim = task_rlimit_max(task, res);
75292+ else
75293+ rlim = task_rlimit(task, res);
75294+
75295+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
75296+ return;
75297+
75298+ rcu_read_lock();
75299+ cred = __task_cred(task);
75300+
75301+ if (res == RLIMIT_NPROC &&
75302+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
75303+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
75304+ goto out_rcu_unlock;
75305+ else if (res == RLIMIT_MEMLOCK &&
75306+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
75307+ goto out_rcu_unlock;
75308+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
75309+ goto out_rcu_unlock;
75310+ rcu_read_unlock();
75311+
75312+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
75313+
75314+ return;
75315+out_rcu_unlock:
75316+ rcu_read_unlock();
75317+ return;
75318+}
75319diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
75320new file mode 100644
75321index 0000000..2040e61
75322--- /dev/null
75323+++ b/grsecurity/gracl_segv.c
75324@@ -0,0 +1,313 @@
75325+#include <linux/kernel.h>
75326+#include <linux/mm.h>
75327+#include <asm/uaccess.h>
75328+#include <asm/errno.h>
75329+#include <asm/mman.h>
75330+#include <net/sock.h>
75331+#include <linux/file.h>
75332+#include <linux/fs.h>
75333+#include <linux/net.h>
75334+#include <linux/in.h>
75335+#include <linux/slab.h>
75336+#include <linux/types.h>
75337+#include <linux/sched.h>
75338+#include <linux/timer.h>
75339+#include <linux/gracl.h>
75340+#include <linux/grsecurity.h>
75341+#include <linux/grinternal.h>
75342+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
75343+#include <linux/magic.h>
75344+#include <linux/pagemap.h>
75345+#include "../fs/btrfs/async-thread.h"
75346+#include "../fs/btrfs/ctree.h"
75347+#include "../fs/btrfs/btrfs_inode.h"
75348+#endif
75349+
75350+static struct crash_uid *uid_set;
75351+static unsigned short uid_used;
75352+static DEFINE_SPINLOCK(gr_uid_lock);
75353+extern rwlock_t gr_inode_lock;
75354+extern struct acl_subject_label *
75355+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
75356+ struct acl_role_label *role);
75357+
75358+static inline dev_t __get_dev(const struct dentry *dentry)
75359+{
75360+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
75361+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
75362+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
75363+ else
75364+#endif
75365+ return dentry->d_sb->s_dev;
75366+}
75367+
75368+int
75369+gr_init_uidset(void)
75370+{
75371+ uid_set =
75372+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
75373+ uid_used = 0;
75374+
75375+ return uid_set ? 1 : 0;
75376+}
75377+
75378+void
75379+gr_free_uidset(void)
75380+{
75381+ if (uid_set) {
75382+ struct crash_uid *tmpset;
75383+ spin_lock(&gr_uid_lock);
75384+ tmpset = uid_set;
75385+ uid_set = NULL;
75386+ uid_used = 0;
75387+ spin_unlock(&gr_uid_lock);
75388+ if (tmpset)
75389+ kfree(tmpset);
75390+ }
75391+
75392+ return;
75393+}
75394+
75395+int
75396+gr_find_uid(const uid_t uid)
75397+{
75398+ struct crash_uid *tmp = uid_set;
75399+ uid_t buid;
75400+ int low = 0, high = uid_used - 1, mid;
75401+
75402+ while (high >= low) {
75403+ mid = (low + high) >> 1;
75404+ buid = tmp[mid].uid;
75405+ if (buid == uid)
75406+ return mid;
75407+ if (buid > uid)
75408+ high = mid - 1;
75409+ if (buid < uid)
75410+ low = mid + 1;
75411+ }
75412+
75413+ return -1;
75414+}
75415+
75416+static __inline__ void
75417+gr_insertsort(void)
75418+{
75419+ unsigned short i, j;
75420+ struct crash_uid index;
75421+
75422+ for (i = 1; i < uid_used; i++) {
75423+ index = uid_set[i];
75424+ j = i;
75425+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
75426+ uid_set[j] = uid_set[j - 1];
75427+ j--;
75428+ }
75429+ uid_set[j] = index;
75430+ }
75431+
75432+ return;
75433+}
75434+
75435+static __inline__ void
75436+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
75437+{
75438+ int loc;
75439+ uid_t uid = GR_GLOBAL_UID(kuid);
75440+
75441+ if (uid_used == GR_UIDTABLE_MAX)
75442+ return;
75443+
75444+ loc = gr_find_uid(uid);
75445+
75446+ if (loc >= 0) {
75447+ uid_set[loc].expires = expires;
75448+ return;
75449+ }
75450+
75451+ uid_set[uid_used].uid = uid;
75452+ uid_set[uid_used].expires = expires;
75453+ uid_used++;
75454+
75455+ gr_insertsort();
75456+
75457+ return;
75458+}
75459+
75460+void
75461+gr_remove_uid(const unsigned short loc)
75462+{
75463+ unsigned short i;
75464+
75465+ for (i = loc + 1; i < uid_used; i++)
75466+ uid_set[i - 1] = uid_set[i];
75467+
75468+ uid_used--;
75469+
75470+ return;
75471+}
75472+
75473+int
75474+gr_check_crash_uid(const kuid_t kuid)
75475+{
75476+ int loc;
75477+ int ret = 0;
75478+ uid_t uid;
75479+
75480+ if (unlikely(!gr_acl_is_enabled()))
75481+ return 0;
75482+
75483+ uid = GR_GLOBAL_UID(kuid);
75484+
75485+ spin_lock(&gr_uid_lock);
75486+ loc = gr_find_uid(uid);
75487+
75488+ if (loc < 0)
75489+ goto out_unlock;
75490+
75491+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
75492+ gr_remove_uid(loc);
75493+ else
75494+ ret = 1;
75495+
75496+out_unlock:
75497+ spin_unlock(&gr_uid_lock);
75498+ return ret;
75499+}
75500+
75501+static __inline__ int
75502+proc_is_setxid(const struct cred *cred)
75503+{
75504+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
75505+ !uid_eq(cred->uid, cred->fsuid))
75506+ return 1;
75507+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
75508+ !gid_eq(cred->gid, cred->fsgid))
75509+ return 1;
75510+
75511+ return 0;
75512+}
75513+
75514+extern int gr_fake_force_sig(int sig, struct task_struct *t);
75515+
75516+void
75517+gr_handle_crash(struct task_struct *task, const int sig)
75518+{
75519+ struct acl_subject_label *curr;
75520+ struct task_struct *tsk, *tsk2;
75521+ const struct cred *cred;
75522+ const struct cred *cred2;
75523+
75524+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
75525+ return;
75526+
75527+ if (unlikely(!gr_acl_is_enabled()))
75528+ return;
75529+
75530+ curr = task->acl;
75531+
75532+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
75533+ return;
75534+
75535+ if (time_before_eq(curr->expires, get_seconds())) {
75536+ curr->expires = 0;
75537+ curr->crashes = 0;
75538+ }
75539+
75540+ curr->crashes++;
75541+
75542+ if (!curr->expires)
75543+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
75544+
75545+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
75546+ time_after(curr->expires, get_seconds())) {
75547+ rcu_read_lock();
75548+ cred = __task_cred(task);
75549+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
75550+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
75551+ spin_lock(&gr_uid_lock);
75552+ gr_insert_uid(cred->uid, curr->expires);
75553+ spin_unlock(&gr_uid_lock);
75554+ curr->expires = 0;
75555+ curr->crashes = 0;
75556+ read_lock(&tasklist_lock);
75557+ do_each_thread(tsk2, tsk) {
75558+ cred2 = __task_cred(tsk);
75559+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
75560+ gr_fake_force_sig(SIGKILL, tsk);
75561+ } while_each_thread(tsk2, tsk);
75562+ read_unlock(&tasklist_lock);
75563+ } else {
75564+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
75565+ read_lock(&tasklist_lock);
75566+ read_lock(&grsec_exec_file_lock);
75567+ do_each_thread(tsk2, tsk) {
75568+ if (likely(tsk != task)) {
75569+ // if this thread has the same subject as the one that triggered
75570+ // RES_CRASH and it's the same binary, kill it
75571+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
75572+ gr_fake_force_sig(SIGKILL, tsk);
75573+ }
75574+ } while_each_thread(tsk2, tsk);
75575+ read_unlock(&grsec_exec_file_lock);
75576+ read_unlock(&tasklist_lock);
75577+ }
75578+ rcu_read_unlock();
75579+ }
75580+
75581+ return;
75582+}
75583+
75584+int
75585+gr_check_crash_exec(const struct file *filp)
75586+{
75587+ struct acl_subject_label *curr;
75588+
75589+ if (unlikely(!gr_acl_is_enabled()))
75590+ return 0;
75591+
75592+ read_lock(&gr_inode_lock);
75593+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
75594+ __get_dev(filp->f_path.dentry),
75595+ current->role);
75596+ read_unlock(&gr_inode_lock);
75597+
75598+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
75599+ (!curr->crashes && !curr->expires))
75600+ return 0;
75601+
75602+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
75603+ time_after(curr->expires, get_seconds()))
75604+ return 1;
75605+ else if (time_before_eq(curr->expires, get_seconds())) {
75606+ curr->crashes = 0;
75607+ curr->expires = 0;
75608+ }
75609+
75610+ return 0;
75611+}
75612+
75613+void
75614+gr_handle_alertkill(struct task_struct *task)
75615+{
75616+ struct acl_subject_label *curracl;
75617+ __u32 curr_ip;
75618+ struct task_struct *p, *p2;
75619+
75620+ if (unlikely(!gr_acl_is_enabled()))
75621+ return;
75622+
75623+ curracl = task->acl;
75624+ curr_ip = task->signal->curr_ip;
75625+
75626+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
75627+ read_lock(&tasklist_lock);
75628+ do_each_thread(p2, p) {
75629+ if (p->signal->curr_ip == curr_ip)
75630+ gr_fake_force_sig(SIGKILL, p);
75631+ } while_each_thread(p2, p);
75632+ read_unlock(&tasklist_lock);
75633+ } else if (curracl->mode & GR_KILLPROC)
75634+ gr_fake_force_sig(SIGKILL, task);
75635+
75636+ return;
75637+}
75638diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
75639new file mode 100644
75640index 0000000..6b0c9cc
75641--- /dev/null
75642+++ b/grsecurity/gracl_shm.c
75643@@ -0,0 +1,40 @@
75644+#include <linux/kernel.h>
75645+#include <linux/mm.h>
75646+#include <linux/sched.h>
75647+#include <linux/file.h>
75648+#include <linux/ipc.h>
75649+#include <linux/gracl.h>
75650+#include <linux/grsecurity.h>
75651+#include <linux/grinternal.h>
75652+
75653+int
75654+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
75655+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
75656+{
75657+ struct task_struct *task;
75658+
75659+ if (!gr_acl_is_enabled())
75660+ return 1;
75661+
75662+ rcu_read_lock();
75663+ read_lock(&tasklist_lock);
75664+
75665+ task = find_task_by_vpid(shm_cprid);
75666+
75667+ if (unlikely(!task))
75668+ task = find_task_by_vpid(shm_lapid);
75669+
75670+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
75671+ (task_pid_nr(task) == shm_lapid)) &&
75672+ (task->acl->mode & GR_PROTSHM) &&
75673+ (task->acl != current->acl))) {
75674+ read_unlock(&tasklist_lock);
75675+ rcu_read_unlock();
75676+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
75677+ return 0;
75678+ }
75679+ read_unlock(&tasklist_lock);
75680+ rcu_read_unlock();
75681+
75682+ return 1;
75683+}
75684diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
75685new file mode 100644
75686index 0000000..bc0be01
75687--- /dev/null
75688+++ b/grsecurity/grsec_chdir.c
75689@@ -0,0 +1,19 @@
75690+#include <linux/kernel.h>
75691+#include <linux/sched.h>
75692+#include <linux/fs.h>
75693+#include <linux/file.h>
75694+#include <linux/grsecurity.h>
75695+#include <linux/grinternal.h>
75696+
75697+void
75698+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
75699+{
75700+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
75701+ if ((grsec_enable_chdir && grsec_enable_group &&
75702+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
75703+ !grsec_enable_group)) {
75704+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
75705+ }
75706+#endif
75707+ return;
75708+}
75709diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
75710new file mode 100644
75711index 0000000..6d99cec
75712--- /dev/null
75713+++ b/grsecurity/grsec_chroot.c
75714@@ -0,0 +1,385 @@
75715+#include <linux/kernel.h>
75716+#include <linux/module.h>
75717+#include <linux/sched.h>
75718+#include <linux/file.h>
75719+#include <linux/fs.h>
75720+#include <linux/mount.h>
75721+#include <linux/types.h>
75722+#include "../fs/mount.h"
75723+#include <linux/grsecurity.h>
75724+#include <linux/grinternal.h>
75725+
75726+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75727+int gr_init_ran;
75728+#endif
75729+
75730+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
75731+{
75732+#ifdef CONFIG_GRKERNSEC
75733+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
75734+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
75735+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75736+ && gr_init_ran
75737+#endif
75738+ )
75739+ task->gr_is_chrooted = 1;
75740+ else {
75741+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75742+ if (task_pid_nr(task) == 1 && !gr_init_ran)
75743+ gr_init_ran = 1;
75744+#endif
75745+ task->gr_is_chrooted = 0;
75746+ }
75747+
75748+ task->gr_chroot_dentry = path->dentry;
75749+#endif
75750+ return;
75751+}
75752+
75753+void gr_clear_chroot_entries(struct task_struct *task)
75754+{
75755+#ifdef CONFIG_GRKERNSEC
75756+ task->gr_is_chrooted = 0;
75757+ task->gr_chroot_dentry = NULL;
75758+#endif
75759+ return;
75760+}
75761+
75762+int
75763+gr_handle_chroot_unix(const pid_t pid)
75764+{
75765+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
75766+ struct task_struct *p;
75767+
75768+ if (unlikely(!grsec_enable_chroot_unix))
75769+ return 1;
75770+
75771+ if (likely(!proc_is_chrooted(current)))
75772+ return 1;
75773+
75774+ rcu_read_lock();
75775+ read_lock(&tasklist_lock);
75776+ p = find_task_by_vpid_unrestricted(pid);
75777+ if (unlikely(p && !have_same_root(current, p))) {
75778+ read_unlock(&tasklist_lock);
75779+ rcu_read_unlock();
75780+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
75781+ return 0;
75782+ }
75783+ read_unlock(&tasklist_lock);
75784+ rcu_read_unlock();
75785+#endif
75786+ return 1;
75787+}
75788+
75789+int
75790+gr_handle_chroot_nice(void)
75791+{
75792+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
75793+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
75794+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
75795+ return -EPERM;
75796+ }
75797+#endif
75798+ return 0;
75799+}
75800+
75801+int
75802+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
75803+{
75804+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
75805+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
75806+ && proc_is_chrooted(current)) {
75807+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
75808+ return -EACCES;
75809+ }
75810+#endif
75811+ return 0;
75812+}
75813+
75814+int
75815+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
75816+{
75817+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
75818+ struct task_struct *p;
75819+ int ret = 0;
75820+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
75821+ return ret;
75822+
75823+ read_lock(&tasklist_lock);
75824+ do_each_pid_task(pid, type, p) {
75825+ if (!have_same_root(current, p)) {
75826+ ret = 1;
75827+ goto out;
75828+ }
75829+ } while_each_pid_task(pid, type, p);
75830+out:
75831+ read_unlock(&tasklist_lock);
75832+ return ret;
75833+#endif
75834+ return 0;
75835+}
75836+
75837+int
75838+gr_pid_is_chrooted(struct task_struct *p)
75839+{
75840+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
75841+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
75842+ return 0;
75843+
75844+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
75845+ !have_same_root(current, p)) {
75846+ return 1;
75847+ }
75848+#endif
75849+ return 0;
75850+}
75851+
75852+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
75853+
75854+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
75855+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
75856+{
75857+ struct path path, currentroot;
75858+ int ret = 0;
75859+
75860+ path.dentry = (struct dentry *)u_dentry;
75861+ path.mnt = (struct vfsmount *)u_mnt;
75862+ get_fs_root(current->fs, &currentroot);
75863+ if (path_is_under(&path, &currentroot))
75864+ ret = 1;
75865+ path_put(&currentroot);
75866+
75867+ return ret;
75868+}
75869+#endif
75870+
75871+int
75872+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
75873+{
75874+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
75875+ if (!grsec_enable_chroot_fchdir)
75876+ return 1;
75877+
75878+ if (!proc_is_chrooted(current))
75879+ return 1;
75880+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
75881+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
75882+ return 0;
75883+ }
75884+#endif
75885+ return 1;
75886+}
75887+
75888+int
75889+gr_chroot_fhandle(void)
75890+{
75891+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
75892+ if (!grsec_enable_chroot_fchdir)
75893+ return 1;
75894+
75895+ if (!proc_is_chrooted(current))
75896+ return 1;
75897+ else {
75898+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
75899+ return 0;
75900+ }
75901+#endif
75902+ return 1;
75903+}
75904+
75905+int
75906+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
75907+ const u64 shm_createtime)
75908+{
75909+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
75910+ struct task_struct *p;
75911+
75912+ if (unlikely(!grsec_enable_chroot_shmat))
75913+ return 1;
75914+
75915+ if (likely(!proc_is_chrooted(current)))
75916+ return 1;
75917+
75918+ rcu_read_lock();
75919+ read_lock(&tasklist_lock);
75920+
75921+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
75922+ if (time_before_eq64(p->start_time, shm_createtime)) {
75923+ if (have_same_root(current, p)) {
75924+ goto allow;
75925+ } else {
75926+ read_unlock(&tasklist_lock);
75927+ rcu_read_unlock();
75928+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
75929+ return 0;
75930+ }
75931+ }
75932+ /* creator exited, pid reuse, fall through to next check */
75933+ }
75934+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
75935+ if (unlikely(!have_same_root(current, p))) {
75936+ read_unlock(&tasklist_lock);
75937+ rcu_read_unlock();
75938+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
75939+ return 0;
75940+ }
75941+ }
75942+
75943+allow:
75944+ read_unlock(&tasklist_lock);
75945+ rcu_read_unlock();
75946+#endif
75947+ return 1;
75948+}
75949+
75950+void
75951+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
75952+{
75953+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
75954+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
75955+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
75956+#endif
75957+ return;
75958+}
75959+
75960+int
75961+gr_handle_chroot_mknod(const struct dentry *dentry,
75962+ const struct vfsmount *mnt, const int mode)
75963+{
75964+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
75965+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
75966+ proc_is_chrooted(current)) {
75967+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
75968+ return -EPERM;
75969+ }
75970+#endif
75971+ return 0;
75972+}
75973+
75974+int
75975+gr_handle_chroot_mount(const struct dentry *dentry,
75976+ const struct vfsmount *mnt, const char *dev_name)
75977+{
75978+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
75979+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
75980+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
75981+ return -EPERM;
75982+ }
75983+#endif
75984+ return 0;
75985+}
75986+
75987+int
75988+gr_handle_chroot_pivot(void)
75989+{
75990+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
75991+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
75992+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
75993+ return -EPERM;
75994+ }
75995+#endif
75996+ return 0;
75997+}
75998+
75999+int
76000+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
76001+{
76002+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
76003+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
76004+ !gr_is_outside_chroot(dentry, mnt)) {
76005+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
76006+ return -EPERM;
76007+ }
76008+#endif
76009+ return 0;
76010+}
76011+
76012+extern const char *captab_log[];
76013+extern int captab_log_entries;
76014+
76015+int
76016+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
76017+{
76018+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76019+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
76020+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
76021+ if (cap_raised(chroot_caps, cap)) {
76022+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
76023+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
76024+ }
76025+ return 0;
76026+ }
76027+ }
76028+#endif
76029+ return 1;
76030+}
76031+
76032+int
76033+gr_chroot_is_capable(const int cap)
76034+{
76035+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76036+ return gr_task_chroot_is_capable(current, current_cred(), cap);
76037+#endif
76038+ return 1;
76039+}
76040+
76041+int
76042+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
76043+{
76044+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76045+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
76046+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
76047+ if (cap_raised(chroot_caps, cap)) {
76048+ return 0;
76049+ }
76050+ }
76051+#endif
76052+ return 1;
76053+}
76054+
76055+int
76056+gr_chroot_is_capable_nolog(const int cap)
76057+{
76058+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76059+ return gr_task_chroot_is_capable_nolog(current, cap);
76060+#endif
76061+ return 1;
76062+}
76063+
76064+int
76065+gr_handle_chroot_sysctl(const int op)
76066+{
76067+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
76068+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
76069+ proc_is_chrooted(current))
76070+ return -EACCES;
76071+#endif
76072+ return 0;
76073+}
76074+
76075+void
76076+gr_handle_chroot_chdir(const struct path *path)
76077+{
76078+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
76079+ if (grsec_enable_chroot_chdir)
76080+ set_fs_pwd(current->fs, path);
76081+#endif
76082+ return;
76083+}
76084+
76085+int
76086+gr_handle_chroot_chmod(const struct dentry *dentry,
76087+ const struct vfsmount *mnt, const int mode)
76088+{
76089+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
76090+ /* allow chmod +s on directories, but not files */
76091+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
76092+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
76093+ proc_is_chrooted(current)) {
76094+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
76095+ return -EPERM;
76096+ }
76097+#endif
76098+ return 0;
76099+}
76100diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
76101new file mode 100644
76102index 0000000..0f9ac91
76103--- /dev/null
76104+++ b/grsecurity/grsec_disabled.c
76105@@ -0,0 +1,440 @@
76106+#include <linux/kernel.h>
76107+#include <linux/module.h>
76108+#include <linux/sched.h>
76109+#include <linux/file.h>
76110+#include <linux/fs.h>
76111+#include <linux/kdev_t.h>
76112+#include <linux/net.h>
76113+#include <linux/in.h>
76114+#include <linux/ip.h>
76115+#include <linux/skbuff.h>
76116+#include <linux/sysctl.h>
76117+
76118+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
76119+void
76120+pax_set_initial_flags(struct linux_binprm *bprm)
76121+{
76122+ return;
76123+}
76124+#endif
76125+
76126+#ifdef CONFIG_SYSCTL
76127+__u32
76128+gr_handle_sysctl(const struct ctl_table * table, const int op)
76129+{
76130+ return 0;
76131+}
76132+#endif
76133+
76134+#ifdef CONFIG_TASKSTATS
76135+int gr_is_taskstats_denied(int pid)
76136+{
76137+ return 0;
76138+}
76139+#endif
76140+
76141+int
76142+gr_acl_is_enabled(void)
76143+{
76144+ return 0;
76145+}
76146+
76147+int
76148+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
76149+{
76150+ return 0;
76151+}
76152+
76153+void
76154+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
76155+{
76156+ return;
76157+}
76158+
76159+int
76160+gr_handle_rawio(const struct inode *inode)
76161+{
76162+ return 0;
76163+}
76164+
76165+void
76166+gr_acl_handle_psacct(struct task_struct *task, const long code)
76167+{
76168+ return;
76169+}
76170+
76171+int
76172+gr_handle_ptrace(struct task_struct *task, const long request)
76173+{
76174+ return 0;
76175+}
76176+
76177+int
76178+gr_handle_proc_ptrace(struct task_struct *task)
76179+{
76180+ return 0;
76181+}
76182+
76183+int
76184+gr_set_acls(const int type)
76185+{
76186+ return 0;
76187+}
76188+
76189+int
76190+gr_check_hidden_task(const struct task_struct *tsk)
76191+{
76192+ return 0;
76193+}
76194+
76195+int
76196+gr_check_protected_task(const struct task_struct *task)
76197+{
76198+ return 0;
76199+}
76200+
76201+int
76202+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
76203+{
76204+ return 0;
76205+}
76206+
76207+void
76208+gr_copy_label(struct task_struct *tsk)
76209+{
76210+ return;
76211+}
76212+
76213+void
76214+gr_set_pax_flags(struct task_struct *task)
76215+{
76216+ return;
76217+}
76218+
76219+int
76220+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
76221+ const int unsafe_share)
76222+{
76223+ return 0;
76224+}
76225+
76226+void
76227+gr_handle_delete(const ino_t ino, const dev_t dev)
76228+{
76229+ return;
76230+}
76231+
76232+void
76233+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
76234+{
76235+ return;
76236+}
76237+
76238+void
76239+gr_handle_crash(struct task_struct *task, const int sig)
76240+{
76241+ return;
76242+}
76243+
76244+int
76245+gr_check_crash_exec(const struct file *filp)
76246+{
76247+ return 0;
76248+}
76249+
76250+int
76251+gr_check_crash_uid(const kuid_t uid)
76252+{
76253+ return 0;
76254+}
76255+
76256+void
76257+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
76258+ struct dentry *old_dentry,
76259+ struct dentry *new_dentry,
76260+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
76261+{
76262+ return;
76263+}
76264+
76265+int
76266+gr_search_socket(const int family, const int type, const int protocol)
76267+{
76268+ return 1;
76269+}
76270+
76271+int
76272+gr_search_connectbind(const int mode, const struct socket *sock,
76273+ const struct sockaddr_in *addr)
76274+{
76275+ return 0;
76276+}
76277+
76278+void
76279+gr_handle_alertkill(struct task_struct *task)
76280+{
76281+ return;
76282+}
76283+
76284+__u32
76285+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
76286+{
76287+ return 1;
76288+}
76289+
76290+__u32
76291+gr_acl_handle_hidden_file(const struct dentry * dentry,
76292+ const struct vfsmount * mnt)
76293+{
76294+ return 1;
76295+}
76296+
76297+__u32
76298+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
76299+ int acc_mode)
76300+{
76301+ return 1;
76302+}
76303+
76304+__u32
76305+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
76306+{
76307+ return 1;
76308+}
76309+
76310+__u32
76311+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
76312+{
76313+ return 1;
76314+}
76315+
76316+int
76317+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
76318+ unsigned int *vm_flags)
76319+{
76320+ return 1;
76321+}
76322+
76323+__u32
76324+gr_acl_handle_truncate(const struct dentry * dentry,
76325+ const struct vfsmount * mnt)
76326+{
76327+ return 1;
76328+}
76329+
76330+__u32
76331+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
76332+{
76333+ return 1;
76334+}
76335+
76336+__u32
76337+gr_acl_handle_access(const struct dentry * dentry,
76338+ const struct vfsmount * mnt, const int fmode)
76339+{
76340+ return 1;
76341+}
76342+
76343+__u32
76344+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
76345+ umode_t *mode)
76346+{
76347+ return 1;
76348+}
76349+
76350+__u32
76351+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
76352+{
76353+ return 1;
76354+}
76355+
76356+__u32
76357+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
76358+{
76359+ return 1;
76360+}
76361+
76362+__u32
76363+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
76364+{
76365+ return 1;
76366+}
76367+
76368+void
76369+grsecurity_init(void)
76370+{
76371+ return;
76372+}
76373+
76374+umode_t gr_acl_umask(void)
76375+{
76376+ return 0;
76377+}
76378+
76379+__u32
76380+gr_acl_handle_mknod(const struct dentry * new_dentry,
76381+ const struct dentry * parent_dentry,
76382+ const struct vfsmount * parent_mnt,
76383+ const int mode)
76384+{
76385+ return 1;
76386+}
76387+
76388+__u32
76389+gr_acl_handle_mkdir(const struct dentry * new_dentry,
76390+ const struct dentry * parent_dentry,
76391+ const struct vfsmount * parent_mnt)
76392+{
76393+ return 1;
76394+}
76395+
76396+__u32
76397+gr_acl_handle_symlink(const struct dentry * new_dentry,
76398+ const struct dentry * parent_dentry,
76399+ const struct vfsmount * parent_mnt, const struct filename *from)
76400+{
76401+ return 1;
76402+}
76403+
76404+__u32
76405+gr_acl_handle_link(const struct dentry * new_dentry,
76406+ const struct dentry * parent_dentry,
76407+ const struct vfsmount * parent_mnt,
76408+ const struct dentry * old_dentry,
76409+ const struct vfsmount * old_mnt, const struct filename *to)
76410+{
76411+ return 1;
76412+}
76413+
76414+int
76415+gr_acl_handle_rename(const struct dentry *new_dentry,
76416+ const struct dentry *parent_dentry,
76417+ const struct vfsmount *parent_mnt,
76418+ const struct dentry *old_dentry,
76419+ const struct inode *old_parent_inode,
76420+ const struct vfsmount *old_mnt, const struct filename *newname,
76421+ unsigned int flags)
76422+{
76423+ return 0;
76424+}
76425+
76426+int
76427+gr_acl_handle_filldir(const struct file *file, const char *name,
76428+ const int namelen, const ino_t ino)
76429+{
76430+ return 1;
76431+}
76432+
76433+int
76434+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
76435+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
76436+{
76437+ return 1;
76438+}
76439+
76440+int
76441+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
76442+{
76443+ return 0;
76444+}
76445+
76446+int
76447+gr_search_accept(const struct socket *sock)
76448+{
76449+ return 0;
76450+}
76451+
76452+int
76453+gr_search_listen(const struct socket *sock)
76454+{
76455+ return 0;
76456+}
76457+
76458+int
76459+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
76460+{
76461+ return 0;
76462+}
76463+
76464+__u32
76465+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
76466+{
76467+ return 1;
76468+}
76469+
76470+__u32
76471+gr_acl_handle_creat(const struct dentry * dentry,
76472+ const struct dentry * p_dentry,
76473+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
76474+ const int imode)
76475+{
76476+ return 1;
76477+}
76478+
76479+void
76480+gr_acl_handle_exit(void)
76481+{
76482+ return;
76483+}
76484+
76485+int
76486+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
76487+{
76488+ return 1;
76489+}
76490+
76491+void
76492+gr_set_role_label(const kuid_t uid, const kgid_t gid)
76493+{
76494+ return;
76495+}
76496+
76497+int
76498+gr_acl_handle_procpidmem(const struct task_struct *task)
76499+{
76500+ return 0;
76501+}
76502+
76503+int
76504+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
76505+{
76506+ return 0;
76507+}
76508+
76509+int
76510+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
76511+{
76512+ return 0;
76513+}
76514+
76515+int
76516+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
76517+{
76518+ return 0;
76519+}
76520+
76521+int
76522+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
76523+{
76524+ return 0;
76525+}
76526+
76527+int gr_acl_enable_at_secure(void)
76528+{
76529+ return 0;
76530+}
76531+
76532+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
76533+{
76534+ return dentry->d_sb->s_dev;
76535+}
76536+
76537+void gr_put_exec_file(struct task_struct *task)
76538+{
76539+ return;
76540+}
76541+
76542+#ifdef CONFIG_SECURITY
76543+EXPORT_SYMBOL_GPL(gr_check_user_change);
76544+EXPORT_SYMBOL_GPL(gr_check_group_change);
76545+#endif
76546diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
76547new file mode 100644
76548index 0000000..14638ff
76549--- /dev/null
76550+++ b/grsecurity/grsec_exec.c
76551@@ -0,0 +1,188 @@
76552+#include <linux/kernel.h>
76553+#include <linux/sched.h>
76554+#include <linux/file.h>
76555+#include <linux/binfmts.h>
76556+#include <linux/fs.h>
76557+#include <linux/types.h>
76558+#include <linux/grdefs.h>
76559+#include <linux/grsecurity.h>
76560+#include <linux/grinternal.h>
76561+#include <linux/capability.h>
76562+#include <linux/module.h>
76563+#include <linux/compat.h>
76564+
76565+#include <asm/uaccess.h>
76566+
76567+#ifdef CONFIG_GRKERNSEC_EXECLOG
76568+static char gr_exec_arg_buf[132];
76569+static DEFINE_MUTEX(gr_exec_arg_mutex);
76570+#endif
76571+
76572+struct user_arg_ptr {
76573+#ifdef CONFIG_COMPAT
76574+ bool is_compat;
76575+#endif
76576+ union {
76577+ const char __user *const __user *native;
76578+#ifdef CONFIG_COMPAT
76579+ const compat_uptr_t __user *compat;
76580+#endif
76581+ } ptr;
76582+};
76583+
76584+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
76585+
76586+void
76587+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
76588+{
76589+#ifdef CONFIG_GRKERNSEC_EXECLOG
76590+ char *grarg = gr_exec_arg_buf;
76591+ unsigned int i, x, execlen = 0;
76592+ char c;
76593+
76594+ if (!((grsec_enable_execlog && grsec_enable_group &&
76595+ in_group_p(grsec_audit_gid))
76596+ || (grsec_enable_execlog && !grsec_enable_group)))
76597+ return;
76598+
76599+ mutex_lock(&gr_exec_arg_mutex);
76600+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
76601+
76602+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
76603+ const char __user *p;
76604+ unsigned int len;
76605+
76606+ p = get_user_arg_ptr(argv, i);
76607+ if (IS_ERR(p))
76608+ goto log;
76609+
76610+ len = strnlen_user(p, 128 - execlen);
76611+ if (len > 128 - execlen)
76612+ len = 128 - execlen;
76613+ else if (len > 0)
76614+ len--;
76615+ if (copy_from_user(grarg + execlen, p, len))
76616+ goto log;
76617+
76618+ /* rewrite unprintable characters */
76619+ for (x = 0; x < len; x++) {
76620+ c = *(grarg + execlen + x);
76621+ if (c < 32 || c > 126)
76622+ *(grarg + execlen + x) = ' ';
76623+ }
76624+
76625+ execlen += len;
76626+ *(grarg + execlen) = ' ';
76627+ *(grarg + execlen + 1) = '\0';
76628+ execlen++;
76629+ }
76630+
76631+ log:
76632+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
76633+ bprm->file->f_path.mnt, grarg);
76634+ mutex_unlock(&gr_exec_arg_mutex);
76635+#endif
76636+ return;
76637+}
76638+
76639+#ifdef CONFIG_GRKERNSEC
76640+extern int gr_acl_is_capable(const int cap);
76641+extern int gr_acl_is_capable_nolog(const int cap);
76642+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76643+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
76644+extern int gr_chroot_is_capable(const int cap);
76645+extern int gr_chroot_is_capable_nolog(const int cap);
76646+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76647+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
76648+#endif
76649+
76650+const char *captab_log[] = {
76651+ "CAP_CHOWN",
76652+ "CAP_DAC_OVERRIDE",
76653+ "CAP_DAC_READ_SEARCH",
76654+ "CAP_FOWNER",
76655+ "CAP_FSETID",
76656+ "CAP_KILL",
76657+ "CAP_SETGID",
76658+ "CAP_SETUID",
76659+ "CAP_SETPCAP",
76660+ "CAP_LINUX_IMMUTABLE",
76661+ "CAP_NET_BIND_SERVICE",
76662+ "CAP_NET_BROADCAST",
76663+ "CAP_NET_ADMIN",
76664+ "CAP_NET_RAW",
76665+ "CAP_IPC_LOCK",
76666+ "CAP_IPC_OWNER",
76667+ "CAP_SYS_MODULE",
76668+ "CAP_SYS_RAWIO",
76669+ "CAP_SYS_CHROOT",
76670+ "CAP_SYS_PTRACE",
76671+ "CAP_SYS_PACCT",
76672+ "CAP_SYS_ADMIN",
76673+ "CAP_SYS_BOOT",
76674+ "CAP_SYS_NICE",
76675+ "CAP_SYS_RESOURCE",
76676+ "CAP_SYS_TIME",
76677+ "CAP_SYS_TTY_CONFIG",
76678+ "CAP_MKNOD",
76679+ "CAP_LEASE",
76680+ "CAP_AUDIT_WRITE",
76681+ "CAP_AUDIT_CONTROL",
76682+ "CAP_SETFCAP",
76683+ "CAP_MAC_OVERRIDE",
76684+ "CAP_MAC_ADMIN",
76685+ "CAP_SYSLOG",
76686+ "CAP_WAKE_ALARM",
76687+ "CAP_BLOCK_SUSPEND"
76688+};
76689+
76690+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
76691+
76692+int gr_is_capable(const int cap)
76693+{
76694+#ifdef CONFIG_GRKERNSEC
76695+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
76696+ return 1;
76697+ return 0;
76698+#else
76699+ return 1;
76700+#endif
76701+}
76702+
76703+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
76704+{
76705+#ifdef CONFIG_GRKERNSEC
76706+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
76707+ return 1;
76708+ return 0;
76709+#else
76710+ return 1;
76711+#endif
76712+}
76713+
76714+int gr_is_capable_nolog(const int cap)
76715+{
76716+#ifdef CONFIG_GRKERNSEC
76717+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
76718+ return 1;
76719+ return 0;
76720+#else
76721+ return 1;
76722+#endif
76723+}
76724+
76725+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
76726+{
76727+#ifdef CONFIG_GRKERNSEC
76728+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
76729+ return 1;
76730+ return 0;
76731+#else
76732+ return 1;
76733+#endif
76734+}
76735+
76736+EXPORT_SYMBOL_GPL(gr_is_capable);
76737+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
76738+EXPORT_SYMBOL_GPL(gr_task_is_capable);
76739+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
76740diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
76741new file mode 100644
76742index 0000000..06cc6ea
76743--- /dev/null
76744+++ b/grsecurity/grsec_fifo.c
76745@@ -0,0 +1,24 @@
76746+#include <linux/kernel.h>
76747+#include <linux/sched.h>
76748+#include <linux/fs.h>
76749+#include <linux/file.h>
76750+#include <linux/grinternal.h>
76751+
76752+int
76753+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
76754+ const struct dentry *dir, const int flag, const int acc_mode)
76755+{
76756+#ifdef CONFIG_GRKERNSEC_FIFO
76757+ const struct cred *cred = current_cred();
76758+
76759+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
76760+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
76761+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
76762+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
76763+ if (!inode_permission(dentry->d_inode, acc_mode))
76764+ 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));
76765+ return -EACCES;
76766+ }
76767+#endif
76768+ return 0;
76769+}
76770diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
76771new file mode 100644
76772index 0000000..8ca18bf
76773--- /dev/null
76774+++ b/grsecurity/grsec_fork.c
76775@@ -0,0 +1,23 @@
76776+#include <linux/kernel.h>
76777+#include <linux/sched.h>
76778+#include <linux/grsecurity.h>
76779+#include <linux/grinternal.h>
76780+#include <linux/errno.h>
76781+
76782+void
76783+gr_log_forkfail(const int retval)
76784+{
76785+#ifdef CONFIG_GRKERNSEC_FORKFAIL
76786+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
76787+ switch (retval) {
76788+ case -EAGAIN:
76789+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
76790+ break;
76791+ case -ENOMEM:
76792+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
76793+ break;
76794+ }
76795+ }
76796+#endif
76797+ return;
76798+}
76799diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
76800new file mode 100644
76801index 0000000..b7cb191
76802--- /dev/null
76803+++ b/grsecurity/grsec_init.c
76804@@ -0,0 +1,286 @@
76805+#include <linux/kernel.h>
76806+#include <linux/sched.h>
76807+#include <linux/mm.h>
76808+#include <linux/gracl.h>
76809+#include <linux/slab.h>
76810+#include <linux/vmalloc.h>
76811+#include <linux/percpu.h>
76812+#include <linux/module.h>
76813+
76814+int grsec_enable_ptrace_readexec;
76815+int grsec_enable_setxid;
76816+int grsec_enable_symlinkown;
76817+kgid_t grsec_symlinkown_gid;
76818+int grsec_enable_brute;
76819+int grsec_enable_link;
76820+int grsec_enable_dmesg;
76821+int grsec_enable_harden_ptrace;
76822+int grsec_enable_harden_ipc;
76823+int grsec_enable_fifo;
76824+int grsec_enable_execlog;
76825+int grsec_enable_signal;
76826+int grsec_enable_forkfail;
76827+int grsec_enable_audit_ptrace;
76828+int grsec_enable_time;
76829+int grsec_enable_group;
76830+kgid_t grsec_audit_gid;
76831+int grsec_enable_chdir;
76832+int grsec_enable_mount;
76833+int grsec_enable_rofs;
76834+int grsec_deny_new_usb;
76835+int grsec_enable_chroot_findtask;
76836+int grsec_enable_chroot_mount;
76837+int grsec_enable_chroot_shmat;
76838+int grsec_enable_chroot_fchdir;
76839+int grsec_enable_chroot_double;
76840+int grsec_enable_chroot_pivot;
76841+int grsec_enable_chroot_chdir;
76842+int grsec_enable_chroot_chmod;
76843+int grsec_enable_chroot_mknod;
76844+int grsec_enable_chroot_nice;
76845+int grsec_enable_chroot_execlog;
76846+int grsec_enable_chroot_caps;
76847+int grsec_enable_chroot_sysctl;
76848+int grsec_enable_chroot_unix;
76849+int grsec_enable_tpe;
76850+kgid_t grsec_tpe_gid;
76851+int grsec_enable_blackhole;
76852+#ifdef CONFIG_IPV6_MODULE
76853+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
76854+#endif
76855+int grsec_lastack_retries;
76856+int grsec_enable_tpe_all;
76857+int grsec_enable_tpe_invert;
76858+int grsec_enable_socket_all;
76859+kgid_t grsec_socket_all_gid;
76860+int grsec_enable_socket_client;
76861+kgid_t grsec_socket_client_gid;
76862+int grsec_enable_socket_server;
76863+kgid_t grsec_socket_server_gid;
76864+int grsec_resource_logging;
76865+int grsec_disable_privio;
76866+int grsec_enable_log_rwxmaps;
76867+int grsec_lock;
76868+
76869+DEFINE_SPINLOCK(grsec_alert_lock);
76870+unsigned long grsec_alert_wtime = 0;
76871+unsigned long grsec_alert_fyet = 0;
76872+
76873+DEFINE_SPINLOCK(grsec_audit_lock);
76874+
76875+DEFINE_RWLOCK(grsec_exec_file_lock);
76876+
76877+char *gr_shared_page[4];
76878+
76879+char *gr_alert_log_fmt;
76880+char *gr_audit_log_fmt;
76881+char *gr_alert_log_buf;
76882+char *gr_audit_log_buf;
76883+
76884+extern struct gr_arg *gr_usermode;
76885+extern unsigned char *gr_system_salt;
76886+extern unsigned char *gr_system_sum;
76887+
76888+void __init
76889+grsecurity_init(void)
76890+{
76891+ int j;
76892+ /* create the per-cpu shared pages */
76893+
76894+#ifdef CONFIG_X86
76895+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
76896+#endif
76897+
76898+ for (j = 0; j < 4; j++) {
76899+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
76900+ if (gr_shared_page[j] == NULL) {
76901+ panic("Unable to allocate grsecurity shared page");
76902+ return;
76903+ }
76904+ }
76905+
76906+ /* allocate log buffers */
76907+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
76908+ if (!gr_alert_log_fmt) {
76909+ panic("Unable to allocate grsecurity alert log format buffer");
76910+ return;
76911+ }
76912+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
76913+ if (!gr_audit_log_fmt) {
76914+ panic("Unable to allocate grsecurity audit log format buffer");
76915+ return;
76916+ }
76917+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
76918+ if (!gr_alert_log_buf) {
76919+ panic("Unable to allocate grsecurity alert log buffer");
76920+ return;
76921+ }
76922+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
76923+ if (!gr_audit_log_buf) {
76924+ panic("Unable to allocate grsecurity audit log buffer");
76925+ return;
76926+ }
76927+
76928+ /* allocate memory for authentication structure */
76929+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
76930+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
76931+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
76932+
76933+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
76934+ panic("Unable to allocate grsecurity authentication structure");
76935+ return;
76936+ }
76937+
76938+#ifdef CONFIG_GRKERNSEC_IO
76939+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
76940+ grsec_disable_privio = 1;
76941+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
76942+ grsec_disable_privio = 1;
76943+#else
76944+ grsec_disable_privio = 0;
76945+#endif
76946+#endif
76947+
76948+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
76949+ /* for backward compatibility, tpe_invert always defaults to on if
76950+ enabled in the kernel
76951+ */
76952+ grsec_enable_tpe_invert = 1;
76953+#endif
76954+
76955+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
76956+#ifndef CONFIG_GRKERNSEC_SYSCTL
76957+ grsec_lock = 1;
76958+#endif
76959+
76960+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
76961+ grsec_enable_log_rwxmaps = 1;
76962+#endif
76963+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
76964+ grsec_enable_group = 1;
76965+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
76966+#endif
76967+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
76968+ grsec_enable_ptrace_readexec = 1;
76969+#endif
76970+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
76971+ grsec_enable_chdir = 1;
76972+#endif
76973+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
76974+ grsec_enable_harden_ptrace = 1;
76975+#endif
76976+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
76977+ grsec_enable_harden_ipc = 1;
76978+#endif
76979+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
76980+ grsec_enable_mount = 1;
76981+#endif
76982+#ifdef CONFIG_GRKERNSEC_LINK
76983+ grsec_enable_link = 1;
76984+#endif
76985+#ifdef CONFIG_GRKERNSEC_BRUTE
76986+ grsec_enable_brute = 1;
76987+#endif
76988+#ifdef CONFIG_GRKERNSEC_DMESG
76989+ grsec_enable_dmesg = 1;
76990+#endif
76991+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76992+ grsec_enable_blackhole = 1;
76993+ grsec_lastack_retries = 4;
76994+#endif
76995+#ifdef CONFIG_GRKERNSEC_FIFO
76996+ grsec_enable_fifo = 1;
76997+#endif
76998+#ifdef CONFIG_GRKERNSEC_EXECLOG
76999+ grsec_enable_execlog = 1;
77000+#endif
77001+#ifdef CONFIG_GRKERNSEC_SETXID
77002+ grsec_enable_setxid = 1;
77003+#endif
77004+#ifdef CONFIG_GRKERNSEC_SIGNAL
77005+ grsec_enable_signal = 1;
77006+#endif
77007+#ifdef CONFIG_GRKERNSEC_FORKFAIL
77008+ grsec_enable_forkfail = 1;
77009+#endif
77010+#ifdef CONFIG_GRKERNSEC_TIME
77011+ grsec_enable_time = 1;
77012+#endif
77013+#ifdef CONFIG_GRKERNSEC_RESLOG
77014+ grsec_resource_logging = 1;
77015+#endif
77016+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
77017+ grsec_enable_chroot_findtask = 1;
77018+#endif
77019+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
77020+ grsec_enable_chroot_unix = 1;
77021+#endif
77022+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
77023+ grsec_enable_chroot_mount = 1;
77024+#endif
77025+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
77026+ grsec_enable_chroot_fchdir = 1;
77027+#endif
77028+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
77029+ grsec_enable_chroot_shmat = 1;
77030+#endif
77031+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
77032+ grsec_enable_audit_ptrace = 1;
77033+#endif
77034+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
77035+ grsec_enable_chroot_double = 1;
77036+#endif
77037+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
77038+ grsec_enable_chroot_pivot = 1;
77039+#endif
77040+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
77041+ grsec_enable_chroot_chdir = 1;
77042+#endif
77043+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
77044+ grsec_enable_chroot_chmod = 1;
77045+#endif
77046+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
77047+ grsec_enable_chroot_mknod = 1;
77048+#endif
77049+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
77050+ grsec_enable_chroot_nice = 1;
77051+#endif
77052+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
77053+ grsec_enable_chroot_execlog = 1;
77054+#endif
77055+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77056+ grsec_enable_chroot_caps = 1;
77057+#endif
77058+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
77059+ grsec_enable_chroot_sysctl = 1;
77060+#endif
77061+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77062+ grsec_enable_symlinkown = 1;
77063+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
77064+#endif
77065+#ifdef CONFIG_GRKERNSEC_TPE
77066+ grsec_enable_tpe = 1;
77067+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
77068+#ifdef CONFIG_GRKERNSEC_TPE_ALL
77069+ grsec_enable_tpe_all = 1;
77070+#endif
77071+#endif
77072+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
77073+ grsec_enable_socket_all = 1;
77074+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
77075+#endif
77076+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
77077+ grsec_enable_socket_client = 1;
77078+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
77079+#endif
77080+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
77081+ grsec_enable_socket_server = 1;
77082+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
77083+#endif
77084+#endif
77085+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
77086+ grsec_deny_new_usb = 1;
77087+#endif
77088+
77089+ return;
77090+}
77091diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
77092new file mode 100644
77093index 0000000..1773300
77094--- /dev/null
77095+++ b/grsecurity/grsec_ipc.c
77096@@ -0,0 +1,48 @@
77097+#include <linux/kernel.h>
77098+#include <linux/mm.h>
77099+#include <linux/sched.h>
77100+#include <linux/file.h>
77101+#include <linux/ipc.h>
77102+#include <linux/ipc_namespace.h>
77103+#include <linux/grsecurity.h>
77104+#include <linux/grinternal.h>
77105+
77106+int
77107+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
77108+{
77109+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
77110+ int write;
77111+ int orig_granted_mode;
77112+ kuid_t euid;
77113+ kgid_t egid;
77114+
77115+ if (!grsec_enable_harden_ipc)
77116+ return 1;
77117+
77118+ euid = current_euid();
77119+ egid = current_egid();
77120+
77121+ write = requested_mode & 00002;
77122+ orig_granted_mode = ipcp->mode;
77123+
77124+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
77125+ orig_granted_mode >>= 6;
77126+ else {
77127+ /* if likely wrong permissions, lock to user */
77128+ if (orig_granted_mode & 0007)
77129+ orig_granted_mode = 0;
77130+ /* otherwise do a egid-only check */
77131+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
77132+ orig_granted_mode >>= 3;
77133+ /* otherwise, no access */
77134+ else
77135+ orig_granted_mode = 0;
77136+ }
77137+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
77138+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
77139+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
77140+ return 0;
77141+ }
77142+#endif
77143+ return 1;
77144+}
77145diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
77146new file mode 100644
77147index 0000000..5e05e20
77148--- /dev/null
77149+++ b/grsecurity/grsec_link.c
77150@@ -0,0 +1,58 @@
77151+#include <linux/kernel.h>
77152+#include <linux/sched.h>
77153+#include <linux/fs.h>
77154+#include <linux/file.h>
77155+#include <linux/grinternal.h>
77156+
77157+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
77158+{
77159+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77160+ const struct inode *link_inode = link->dentry->d_inode;
77161+
77162+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
77163+ /* ignore root-owned links, e.g. /proc/self */
77164+ gr_is_global_nonroot(link_inode->i_uid) && target &&
77165+ !uid_eq(link_inode->i_uid, target->i_uid)) {
77166+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
77167+ return 1;
77168+ }
77169+#endif
77170+ return 0;
77171+}
77172+
77173+int
77174+gr_handle_follow_link(const struct inode *parent,
77175+ const struct inode *inode,
77176+ const struct dentry *dentry, const struct vfsmount *mnt)
77177+{
77178+#ifdef CONFIG_GRKERNSEC_LINK
77179+ const struct cred *cred = current_cred();
77180+
77181+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
77182+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
77183+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
77184+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
77185+ return -EACCES;
77186+ }
77187+#endif
77188+ return 0;
77189+}
77190+
77191+int
77192+gr_handle_hardlink(const struct dentry *dentry,
77193+ const struct vfsmount *mnt,
77194+ struct inode *inode, const int mode, const struct filename *to)
77195+{
77196+#ifdef CONFIG_GRKERNSEC_LINK
77197+ const struct cred *cred = current_cred();
77198+
77199+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
77200+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
77201+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
77202+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
77203+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
77204+ return -EPERM;
77205+ }
77206+#endif
77207+ return 0;
77208+}
77209diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
77210new file mode 100644
77211index 0000000..dbe0a6b
77212--- /dev/null
77213+++ b/grsecurity/grsec_log.c
77214@@ -0,0 +1,341 @@
77215+#include <linux/kernel.h>
77216+#include <linux/sched.h>
77217+#include <linux/file.h>
77218+#include <linux/tty.h>
77219+#include <linux/fs.h>
77220+#include <linux/mm.h>
77221+#include <linux/grinternal.h>
77222+
77223+#ifdef CONFIG_TREE_PREEMPT_RCU
77224+#define DISABLE_PREEMPT() preempt_disable()
77225+#define ENABLE_PREEMPT() preempt_enable()
77226+#else
77227+#define DISABLE_PREEMPT()
77228+#define ENABLE_PREEMPT()
77229+#endif
77230+
77231+#define BEGIN_LOCKS(x) \
77232+ DISABLE_PREEMPT(); \
77233+ rcu_read_lock(); \
77234+ read_lock(&tasklist_lock); \
77235+ read_lock(&grsec_exec_file_lock); \
77236+ if (x != GR_DO_AUDIT) \
77237+ spin_lock(&grsec_alert_lock); \
77238+ else \
77239+ spin_lock(&grsec_audit_lock)
77240+
77241+#define END_LOCKS(x) \
77242+ if (x != GR_DO_AUDIT) \
77243+ spin_unlock(&grsec_alert_lock); \
77244+ else \
77245+ spin_unlock(&grsec_audit_lock); \
77246+ read_unlock(&grsec_exec_file_lock); \
77247+ read_unlock(&tasklist_lock); \
77248+ rcu_read_unlock(); \
77249+ ENABLE_PREEMPT(); \
77250+ if (x == GR_DONT_AUDIT) \
77251+ gr_handle_alertkill(current)
77252+
77253+enum {
77254+ FLOODING,
77255+ NO_FLOODING
77256+};
77257+
77258+extern char *gr_alert_log_fmt;
77259+extern char *gr_audit_log_fmt;
77260+extern char *gr_alert_log_buf;
77261+extern char *gr_audit_log_buf;
77262+
77263+static int gr_log_start(int audit)
77264+{
77265+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
77266+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
77267+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77268+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
77269+ unsigned long curr_secs = get_seconds();
77270+
77271+ if (audit == GR_DO_AUDIT)
77272+ goto set_fmt;
77273+
77274+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
77275+ grsec_alert_wtime = curr_secs;
77276+ grsec_alert_fyet = 0;
77277+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
77278+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
77279+ grsec_alert_fyet++;
77280+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
77281+ grsec_alert_wtime = curr_secs;
77282+ grsec_alert_fyet++;
77283+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
77284+ return FLOODING;
77285+ }
77286+ else return FLOODING;
77287+
77288+set_fmt:
77289+#endif
77290+ memset(buf, 0, PAGE_SIZE);
77291+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
77292+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
77293+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
77294+ } else if (current->signal->curr_ip) {
77295+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
77296+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
77297+ } else if (gr_acl_is_enabled()) {
77298+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
77299+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
77300+ } else {
77301+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
77302+ strcpy(buf, fmt);
77303+ }
77304+
77305+ return NO_FLOODING;
77306+}
77307+
77308+static void gr_log_middle(int audit, const char *msg, va_list ap)
77309+ __attribute__ ((format (printf, 2, 0)));
77310+
77311+static void gr_log_middle(int audit, const char *msg, va_list ap)
77312+{
77313+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77314+ unsigned int len = strlen(buf);
77315+
77316+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
77317+
77318+ return;
77319+}
77320+
77321+static void gr_log_middle_varargs(int audit, const char *msg, ...)
77322+ __attribute__ ((format (printf, 2, 3)));
77323+
77324+static void gr_log_middle_varargs(int audit, const char *msg, ...)
77325+{
77326+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77327+ unsigned int len = strlen(buf);
77328+ va_list ap;
77329+
77330+ va_start(ap, msg);
77331+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
77332+ va_end(ap);
77333+
77334+ return;
77335+}
77336+
77337+static void gr_log_end(int audit, int append_default)
77338+{
77339+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77340+ if (append_default) {
77341+ struct task_struct *task = current;
77342+ struct task_struct *parent = task->real_parent;
77343+ const struct cred *cred = __task_cred(task);
77344+ const struct cred *pcred = __task_cred(parent);
77345+ unsigned int len = strlen(buf);
77346+
77347+ 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));
77348+ }
77349+
77350+ printk("%s\n", buf);
77351+
77352+ return;
77353+}
77354+
77355+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
77356+{
77357+ int logtype;
77358+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
77359+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
77360+ void *voidptr = NULL;
77361+ int num1 = 0, num2 = 0;
77362+ unsigned long ulong1 = 0, ulong2 = 0;
77363+ struct dentry *dentry = NULL;
77364+ struct vfsmount *mnt = NULL;
77365+ struct file *file = NULL;
77366+ struct task_struct *task = NULL;
77367+ struct vm_area_struct *vma = NULL;
77368+ const struct cred *cred, *pcred;
77369+ va_list ap;
77370+
77371+ BEGIN_LOCKS(audit);
77372+ logtype = gr_log_start(audit);
77373+ if (logtype == FLOODING) {
77374+ END_LOCKS(audit);
77375+ return;
77376+ }
77377+ va_start(ap, argtypes);
77378+ switch (argtypes) {
77379+ case GR_TTYSNIFF:
77380+ task = va_arg(ap, struct task_struct *);
77381+ 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));
77382+ break;
77383+ case GR_SYSCTL_HIDDEN:
77384+ str1 = va_arg(ap, char *);
77385+ gr_log_middle_varargs(audit, msg, result, str1);
77386+ break;
77387+ case GR_RBAC:
77388+ dentry = va_arg(ap, struct dentry *);
77389+ mnt = va_arg(ap, struct vfsmount *);
77390+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
77391+ break;
77392+ case GR_RBAC_STR:
77393+ dentry = va_arg(ap, struct dentry *);
77394+ mnt = va_arg(ap, struct vfsmount *);
77395+ str1 = va_arg(ap, char *);
77396+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
77397+ break;
77398+ case GR_STR_RBAC:
77399+ str1 = va_arg(ap, char *);
77400+ dentry = va_arg(ap, struct dentry *);
77401+ mnt = va_arg(ap, struct vfsmount *);
77402+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
77403+ break;
77404+ case GR_RBAC_MODE2:
77405+ dentry = va_arg(ap, struct dentry *);
77406+ mnt = va_arg(ap, struct vfsmount *);
77407+ str1 = va_arg(ap, char *);
77408+ str2 = va_arg(ap, char *);
77409+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
77410+ break;
77411+ case GR_RBAC_MODE3:
77412+ dentry = va_arg(ap, struct dentry *);
77413+ mnt = va_arg(ap, struct vfsmount *);
77414+ str1 = va_arg(ap, char *);
77415+ str2 = va_arg(ap, char *);
77416+ str3 = va_arg(ap, char *);
77417+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
77418+ break;
77419+ case GR_FILENAME:
77420+ dentry = va_arg(ap, struct dentry *);
77421+ mnt = va_arg(ap, struct vfsmount *);
77422+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
77423+ break;
77424+ case GR_STR_FILENAME:
77425+ str1 = va_arg(ap, char *);
77426+ dentry = va_arg(ap, struct dentry *);
77427+ mnt = va_arg(ap, struct vfsmount *);
77428+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
77429+ break;
77430+ case GR_FILENAME_STR:
77431+ dentry = va_arg(ap, struct dentry *);
77432+ mnt = va_arg(ap, struct vfsmount *);
77433+ str1 = va_arg(ap, char *);
77434+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
77435+ break;
77436+ case GR_FILENAME_TWO_INT:
77437+ dentry = va_arg(ap, struct dentry *);
77438+ mnt = va_arg(ap, struct vfsmount *);
77439+ num1 = va_arg(ap, int);
77440+ num2 = va_arg(ap, int);
77441+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
77442+ break;
77443+ case GR_FILENAME_TWO_INT_STR:
77444+ dentry = va_arg(ap, struct dentry *);
77445+ mnt = va_arg(ap, struct vfsmount *);
77446+ num1 = va_arg(ap, int);
77447+ num2 = va_arg(ap, int);
77448+ str1 = va_arg(ap, char *);
77449+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
77450+ break;
77451+ case GR_TEXTREL:
77452+ file = va_arg(ap, struct file *);
77453+ ulong1 = va_arg(ap, unsigned long);
77454+ ulong2 = va_arg(ap, unsigned long);
77455+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
77456+ break;
77457+ case GR_PTRACE:
77458+ task = va_arg(ap, struct task_struct *);
77459+ 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));
77460+ break;
77461+ case GR_RESOURCE:
77462+ task = va_arg(ap, struct task_struct *);
77463+ cred = __task_cred(task);
77464+ pcred = __task_cred(task->real_parent);
77465+ ulong1 = va_arg(ap, unsigned long);
77466+ str1 = va_arg(ap, char *);
77467+ ulong2 = va_arg(ap, unsigned long);
77468+ 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));
77469+ break;
77470+ case GR_CAP:
77471+ task = va_arg(ap, struct task_struct *);
77472+ cred = __task_cred(task);
77473+ pcred = __task_cred(task->real_parent);
77474+ str1 = va_arg(ap, char *);
77475+ 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));
77476+ break;
77477+ case GR_SIG:
77478+ str1 = va_arg(ap, char *);
77479+ voidptr = va_arg(ap, void *);
77480+ gr_log_middle_varargs(audit, msg, str1, voidptr);
77481+ break;
77482+ case GR_SIG2:
77483+ task = va_arg(ap, struct task_struct *);
77484+ cred = __task_cred(task);
77485+ pcred = __task_cred(task->real_parent);
77486+ num1 = va_arg(ap, int);
77487+ 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));
77488+ break;
77489+ case GR_CRASH1:
77490+ task = va_arg(ap, struct task_struct *);
77491+ cred = __task_cred(task);
77492+ pcred = __task_cred(task->real_parent);
77493+ ulong1 = va_arg(ap, unsigned long);
77494+ 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);
77495+ break;
77496+ case GR_CRASH2:
77497+ task = va_arg(ap, struct task_struct *);
77498+ cred = __task_cred(task);
77499+ pcred = __task_cred(task->real_parent);
77500+ ulong1 = va_arg(ap, unsigned long);
77501+ 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);
77502+ break;
77503+ case GR_RWXMAP:
77504+ file = va_arg(ap, struct file *);
77505+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
77506+ break;
77507+ case GR_RWXMAPVMA:
77508+ vma = va_arg(ap, struct vm_area_struct *);
77509+ if (vma->vm_file)
77510+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
77511+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
77512+ str1 = "<stack>";
77513+ else if (vma->vm_start <= current->mm->brk &&
77514+ vma->vm_end >= current->mm->start_brk)
77515+ str1 = "<heap>";
77516+ else
77517+ str1 = "<anonymous mapping>";
77518+ gr_log_middle_varargs(audit, msg, str1);
77519+ break;
77520+ case GR_PSACCT:
77521+ {
77522+ unsigned int wday, cday;
77523+ __u8 whr, chr;
77524+ __u8 wmin, cmin;
77525+ __u8 wsec, csec;
77526+ char cur_tty[64] = { 0 };
77527+ char parent_tty[64] = { 0 };
77528+
77529+ task = va_arg(ap, struct task_struct *);
77530+ wday = va_arg(ap, unsigned int);
77531+ cday = va_arg(ap, unsigned int);
77532+ whr = va_arg(ap, int);
77533+ chr = va_arg(ap, int);
77534+ wmin = va_arg(ap, int);
77535+ cmin = va_arg(ap, int);
77536+ wsec = va_arg(ap, int);
77537+ csec = va_arg(ap, int);
77538+ ulong1 = va_arg(ap, unsigned long);
77539+ cred = __task_cred(task);
77540+ pcred = __task_cred(task->real_parent);
77541+
77542+ 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));
77543+ }
77544+ break;
77545+ default:
77546+ gr_log_middle(audit, msg, ap);
77547+ }
77548+ va_end(ap);
77549+ // these don't need DEFAULTSECARGS printed on the end
77550+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
77551+ gr_log_end(audit, 0);
77552+ else
77553+ gr_log_end(audit, 1);
77554+ END_LOCKS(audit);
77555+}
77556diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
77557new file mode 100644
77558index 0000000..0e39d8c
77559--- /dev/null
77560+++ b/grsecurity/grsec_mem.c
77561@@ -0,0 +1,48 @@
77562+#include <linux/kernel.h>
77563+#include <linux/sched.h>
77564+#include <linux/mm.h>
77565+#include <linux/mman.h>
77566+#include <linux/module.h>
77567+#include <linux/grinternal.h>
77568+
77569+void gr_handle_msr_write(void)
77570+{
77571+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
77572+ return;
77573+}
77574+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
77575+
77576+void
77577+gr_handle_ioperm(void)
77578+{
77579+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
77580+ return;
77581+}
77582+
77583+void
77584+gr_handle_iopl(void)
77585+{
77586+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
77587+ return;
77588+}
77589+
77590+void
77591+gr_handle_mem_readwrite(u64 from, u64 to)
77592+{
77593+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
77594+ return;
77595+}
77596+
77597+void
77598+gr_handle_vm86(void)
77599+{
77600+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
77601+ return;
77602+}
77603+
77604+void
77605+gr_log_badprocpid(const char *entry)
77606+{
77607+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
77608+ return;
77609+}
77610diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
77611new file mode 100644
77612index 0000000..6f9eb73
77613--- /dev/null
77614+++ b/grsecurity/grsec_mount.c
77615@@ -0,0 +1,65 @@
77616+#include <linux/kernel.h>
77617+#include <linux/sched.h>
77618+#include <linux/mount.h>
77619+#include <linux/major.h>
77620+#include <linux/grsecurity.h>
77621+#include <linux/grinternal.h>
77622+
77623+void
77624+gr_log_remount(const char *devname, const int retval)
77625+{
77626+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77627+ if (grsec_enable_mount && (retval >= 0))
77628+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
77629+#endif
77630+ return;
77631+}
77632+
77633+void
77634+gr_log_unmount(const char *devname, const int retval)
77635+{
77636+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77637+ if (grsec_enable_mount && (retval >= 0))
77638+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
77639+#endif
77640+ return;
77641+}
77642+
77643+void
77644+gr_log_mount(const char *from, struct path *to, const int retval)
77645+{
77646+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77647+ if (grsec_enable_mount && (retval >= 0))
77648+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
77649+#endif
77650+ return;
77651+}
77652+
77653+int
77654+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
77655+{
77656+#ifdef CONFIG_GRKERNSEC_ROFS
77657+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
77658+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
77659+ return -EPERM;
77660+ } else
77661+ return 0;
77662+#endif
77663+ return 0;
77664+}
77665+
77666+int
77667+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
77668+{
77669+#ifdef CONFIG_GRKERNSEC_ROFS
77670+ struct inode *inode = dentry->d_inode;
77671+
77672+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
77673+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
77674+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
77675+ return -EPERM;
77676+ } else
77677+ return 0;
77678+#endif
77679+ return 0;
77680+}
77681diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
77682new file mode 100644
77683index 0000000..6ee9d50
77684--- /dev/null
77685+++ b/grsecurity/grsec_pax.c
77686@@ -0,0 +1,45 @@
77687+#include <linux/kernel.h>
77688+#include <linux/sched.h>
77689+#include <linux/mm.h>
77690+#include <linux/file.h>
77691+#include <linux/grinternal.h>
77692+#include <linux/grsecurity.h>
77693+
77694+void
77695+gr_log_textrel(struct vm_area_struct * vma)
77696+{
77697+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77698+ if (grsec_enable_log_rwxmaps)
77699+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
77700+#endif
77701+ return;
77702+}
77703+
77704+void gr_log_ptgnustack(struct file *file)
77705+{
77706+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77707+ if (grsec_enable_log_rwxmaps)
77708+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
77709+#endif
77710+ return;
77711+}
77712+
77713+void
77714+gr_log_rwxmmap(struct file *file)
77715+{
77716+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77717+ if (grsec_enable_log_rwxmaps)
77718+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
77719+#endif
77720+ return;
77721+}
77722+
77723+void
77724+gr_log_rwxmprotect(struct vm_area_struct *vma)
77725+{
77726+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77727+ if (grsec_enable_log_rwxmaps)
77728+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
77729+#endif
77730+ return;
77731+}
77732diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
77733new file mode 100644
77734index 0000000..2005a3a
77735--- /dev/null
77736+++ b/grsecurity/grsec_proc.c
77737@@ -0,0 +1,20 @@
77738+#include <linux/kernel.h>
77739+#include <linux/sched.h>
77740+#include <linux/grsecurity.h>
77741+#include <linux/grinternal.h>
77742+
77743+int gr_proc_is_restricted(void)
77744+{
77745+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
77746+ const struct cred *cred = current_cred();
77747+#endif
77748+
77749+#ifdef CONFIG_GRKERNSEC_PROC_USER
77750+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
77751+ return -EACCES;
77752+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
77753+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
77754+ return -EACCES;
77755+#endif
77756+ return 0;
77757+}
77758diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
77759new file mode 100644
77760index 0000000..f7f29aa
77761--- /dev/null
77762+++ b/grsecurity/grsec_ptrace.c
77763@@ -0,0 +1,30 @@
77764+#include <linux/kernel.h>
77765+#include <linux/sched.h>
77766+#include <linux/grinternal.h>
77767+#include <linux/security.h>
77768+
77769+void
77770+gr_audit_ptrace(struct task_struct *task)
77771+{
77772+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
77773+ if (grsec_enable_audit_ptrace)
77774+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
77775+#endif
77776+ return;
77777+}
77778+
77779+int
77780+gr_ptrace_readexec(struct file *file, int unsafe_flags)
77781+{
77782+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
77783+ const struct dentry *dentry = file->f_path.dentry;
77784+ const struct vfsmount *mnt = file->f_path.mnt;
77785+
77786+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
77787+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
77788+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
77789+ return -EACCES;
77790+ }
77791+#endif
77792+ return 0;
77793+}
77794diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
77795new file mode 100644
77796index 0000000..3860c7e
77797--- /dev/null
77798+++ b/grsecurity/grsec_sig.c
77799@@ -0,0 +1,236 @@
77800+#include <linux/kernel.h>
77801+#include <linux/sched.h>
77802+#include <linux/fs.h>
77803+#include <linux/delay.h>
77804+#include <linux/grsecurity.h>
77805+#include <linux/grinternal.h>
77806+#include <linux/hardirq.h>
77807+
77808+char *signames[] = {
77809+ [SIGSEGV] = "Segmentation fault",
77810+ [SIGILL] = "Illegal instruction",
77811+ [SIGABRT] = "Abort",
77812+ [SIGBUS] = "Invalid alignment/Bus error"
77813+};
77814+
77815+void
77816+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
77817+{
77818+#ifdef CONFIG_GRKERNSEC_SIGNAL
77819+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
77820+ (sig == SIGABRT) || (sig == SIGBUS))) {
77821+ if (task_pid_nr(t) == task_pid_nr(current)) {
77822+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
77823+ } else {
77824+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
77825+ }
77826+ }
77827+#endif
77828+ return;
77829+}
77830+
77831+int
77832+gr_handle_signal(const struct task_struct *p, const int sig)
77833+{
77834+#ifdef CONFIG_GRKERNSEC
77835+ /* ignore the 0 signal for protected task checks */
77836+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
77837+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
77838+ return -EPERM;
77839+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
77840+ return -EPERM;
77841+ }
77842+#endif
77843+ return 0;
77844+}
77845+
77846+#ifdef CONFIG_GRKERNSEC
77847+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
77848+
77849+int gr_fake_force_sig(int sig, struct task_struct *t)
77850+{
77851+ unsigned long int flags;
77852+ int ret, blocked, ignored;
77853+ struct k_sigaction *action;
77854+
77855+ spin_lock_irqsave(&t->sighand->siglock, flags);
77856+ action = &t->sighand->action[sig-1];
77857+ ignored = action->sa.sa_handler == SIG_IGN;
77858+ blocked = sigismember(&t->blocked, sig);
77859+ if (blocked || ignored) {
77860+ action->sa.sa_handler = SIG_DFL;
77861+ if (blocked) {
77862+ sigdelset(&t->blocked, sig);
77863+ recalc_sigpending_and_wake(t);
77864+ }
77865+ }
77866+ if (action->sa.sa_handler == SIG_DFL)
77867+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
77868+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
77869+
77870+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
77871+
77872+ return ret;
77873+}
77874+#endif
77875+
77876+#define GR_USER_BAN_TIME (15 * 60)
77877+#define GR_DAEMON_BRUTE_TIME (30 * 60)
77878+
77879+void gr_handle_brute_attach(int dumpable)
77880+{
77881+#ifdef CONFIG_GRKERNSEC_BRUTE
77882+ struct task_struct *p = current;
77883+ kuid_t uid = GLOBAL_ROOT_UID;
77884+ int daemon = 0;
77885+
77886+ if (!grsec_enable_brute)
77887+ return;
77888+
77889+ rcu_read_lock();
77890+ read_lock(&tasklist_lock);
77891+ read_lock(&grsec_exec_file_lock);
77892+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
77893+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
77894+ p->real_parent->brute = 1;
77895+ daemon = 1;
77896+ } else {
77897+ const struct cred *cred = __task_cred(p), *cred2;
77898+ struct task_struct *tsk, *tsk2;
77899+
77900+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
77901+ struct user_struct *user;
77902+
77903+ uid = cred->uid;
77904+
77905+ /* this is put upon execution past expiration */
77906+ user = find_user(uid);
77907+ if (user == NULL)
77908+ goto unlock;
77909+ user->suid_banned = 1;
77910+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
77911+ if (user->suid_ban_expires == ~0UL)
77912+ user->suid_ban_expires--;
77913+
77914+ /* only kill other threads of the same binary, from the same user */
77915+ do_each_thread(tsk2, tsk) {
77916+ cred2 = __task_cred(tsk);
77917+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
77918+ gr_fake_force_sig(SIGKILL, tsk);
77919+ } while_each_thread(tsk2, tsk);
77920+ }
77921+ }
77922+unlock:
77923+ read_unlock(&grsec_exec_file_lock);
77924+ read_unlock(&tasklist_lock);
77925+ rcu_read_unlock();
77926+
77927+ if (gr_is_global_nonroot(uid))
77928+ 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);
77929+ else if (daemon)
77930+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
77931+
77932+#endif
77933+ return;
77934+}
77935+
77936+void gr_handle_brute_check(void)
77937+{
77938+#ifdef CONFIG_GRKERNSEC_BRUTE
77939+ struct task_struct *p = current;
77940+
77941+ if (unlikely(p->brute)) {
77942+ if (!grsec_enable_brute)
77943+ p->brute = 0;
77944+ else if (time_before(get_seconds(), p->brute_expires))
77945+ msleep(30 * 1000);
77946+ }
77947+#endif
77948+ return;
77949+}
77950+
77951+void gr_handle_kernel_exploit(void)
77952+{
77953+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
77954+ const struct cred *cred;
77955+ struct task_struct *tsk, *tsk2;
77956+ struct user_struct *user;
77957+ kuid_t uid;
77958+
77959+ if (in_irq() || in_serving_softirq() || in_nmi())
77960+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
77961+
77962+ uid = current_uid();
77963+
77964+ if (gr_is_global_root(uid))
77965+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
77966+ else {
77967+ /* kill all the processes of this user, hold a reference
77968+ to their creds struct, and prevent them from creating
77969+ another process until system reset
77970+ */
77971+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
77972+ GR_GLOBAL_UID(uid));
77973+ /* we intentionally leak this ref */
77974+ user = get_uid(current->cred->user);
77975+ if (user)
77976+ user->kernel_banned = 1;
77977+
77978+ /* kill all processes of this user */
77979+ read_lock(&tasklist_lock);
77980+ do_each_thread(tsk2, tsk) {
77981+ cred = __task_cred(tsk);
77982+ if (uid_eq(cred->uid, uid))
77983+ gr_fake_force_sig(SIGKILL, tsk);
77984+ } while_each_thread(tsk2, tsk);
77985+ read_unlock(&tasklist_lock);
77986+ }
77987+#endif
77988+}
77989+
77990+#ifdef CONFIG_GRKERNSEC_BRUTE
77991+static bool suid_ban_expired(struct user_struct *user)
77992+{
77993+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
77994+ user->suid_banned = 0;
77995+ user->suid_ban_expires = 0;
77996+ free_uid(user);
77997+ return true;
77998+ }
77999+
78000+ return false;
78001+}
78002+#endif
78003+
78004+int gr_process_kernel_exec_ban(void)
78005+{
78006+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78007+ if (unlikely(current->cred->user->kernel_banned))
78008+ return -EPERM;
78009+#endif
78010+ return 0;
78011+}
78012+
78013+int gr_process_kernel_setuid_ban(struct user_struct *user)
78014+{
78015+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
78016+ if (unlikely(user->kernel_banned))
78017+ gr_fake_force_sig(SIGKILL, current);
78018+#endif
78019+ return 0;
78020+}
78021+
78022+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
78023+{
78024+#ifdef CONFIG_GRKERNSEC_BRUTE
78025+ struct user_struct *user = current->cred->user;
78026+ if (unlikely(user->suid_banned)) {
78027+ if (suid_ban_expired(user))
78028+ return 0;
78029+ /* disallow execution of suid binaries only */
78030+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
78031+ return -EPERM;
78032+ }
78033+#endif
78034+ return 0;
78035+}
78036diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
78037new file mode 100644
78038index 0000000..e3650b6
78039--- /dev/null
78040+++ b/grsecurity/grsec_sock.c
78041@@ -0,0 +1,244 @@
78042+#include <linux/kernel.h>
78043+#include <linux/module.h>
78044+#include <linux/sched.h>
78045+#include <linux/file.h>
78046+#include <linux/net.h>
78047+#include <linux/in.h>
78048+#include <linux/ip.h>
78049+#include <net/sock.h>
78050+#include <net/inet_sock.h>
78051+#include <linux/grsecurity.h>
78052+#include <linux/grinternal.h>
78053+#include <linux/gracl.h>
78054+
78055+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
78056+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
78057+
78058+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
78059+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
78060+
78061+#ifdef CONFIG_UNIX_MODULE
78062+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
78063+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
78064+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
78065+EXPORT_SYMBOL_GPL(gr_handle_create);
78066+#endif
78067+
78068+#ifdef CONFIG_GRKERNSEC
78069+#define gr_conn_table_size 32749
78070+struct conn_table_entry {
78071+ struct conn_table_entry *next;
78072+ struct signal_struct *sig;
78073+};
78074+
78075+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
78076+DEFINE_SPINLOCK(gr_conn_table_lock);
78077+
78078+extern const char * gr_socktype_to_name(unsigned char type);
78079+extern const char * gr_proto_to_name(unsigned char proto);
78080+extern const char * gr_sockfamily_to_name(unsigned char family);
78081+
78082+static __inline__ int
78083+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
78084+{
78085+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
78086+}
78087+
78088+static __inline__ int
78089+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
78090+ __u16 sport, __u16 dport)
78091+{
78092+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
78093+ sig->gr_sport == sport && sig->gr_dport == dport))
78094+ return 1;
78095+ else
78096+ return 0;
78097+}
78098+
78099+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
78100+{
78101+ struct conn_table_entry **match;
78102+ unsigned int index;
78103+
78104+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78105+ sig->gr_sport, sig->gr_dport,
78106+ gr_conn_table_size);
78107+
78108+ newent->sig = sig;
78109+
78110+ match = &gr_conn_table[index];
78111+ newent->next = *match;
78112+ *match = newent;
78113+
78114+ return;
78115+}
78116+
78117+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
78118+{
78119+ struct conn_table_entry *match, *last = NULL;
78120+ unsigned int index;
78121+
78122+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78123+ sig->gr_sport, sig->gr_dport,
78124+ gr_conn_table_size);
78125+
78126+ match = gr_conn_table[index];
78127+ while (match && !conn_match(match->sig,
78128+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
78129+ sig->gr_dport)) {
78130+ last = match;
78131+ match = match->next;
78132+ }
78133+
78134+ if (match) {
78135+ if (last)
78136+ last->next = match->next;
78137+ else
78138+ gr_conn_table[index] = NULL;
78139+ kfree(match);
78140+ }
78141+
78142+ return;
78143+}
78144+
78145+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
78146+ __u16 sport, __u16 dport)
78147+{
78148+ struct conn_table_entry *match;
78149+ unsigned int index;
78150+
78151+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
78152+
78153+ match = gr_conn_table[index];
78154+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
78155+ match = match->next;
78156+
78157+ if (match)
78158+ return match->sig;
78159+ else
78160+ return NULL;
78161+}
78162+
78163+#endif
78164+
78165+void gr_update_task_in_ip_table(const struct inet_sock *inet)
78166+{
78167+#ifdef CONFIG_GRKERNSEC
78168+ struct signal_struct *sig = current->signal;
78169+ struct conn_table_entry *newent;
78170+
78171+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
78172+ if (newent == NULL)
78173+ return;
78174+ /* no bh lock needed since we are called with bh disabled */
78175+ spin_lock(&gr_conn_table_lock);
78176+ gr_del_task_from_ip_table_nolock(sig);
78177+ sig->gr_saddr = inet->inet_rcv_saddr;
78178+ sig->gr_daddr = inet->inet_daddr;
78179+ sig->gr_sport = inet->inet_sport;
78180+ sig->gr_dport = inet->inet_dport;
78181+ gr_add_to_task_ip_table_nolock(sig, newent);
78182+ spin_unlock(&gr_conn_table_lock);
78183+#endif
78184+ return;
78185+}
78186+
78187+void gr_del_task_from_ip_table(struct task_struct *task)
78188+{
78189+#ifdef CONFIG_GRKERNSEC
78190+ spin_lock_bh(&gr_conn_table_lock);
78191+ gr_del_task_from_ip_table_nolock(task->signal);
78192+ spin_unlock_bh(&gr_conn_table_lock);
78193+#endif
78194+ return;
78195+}
78196+
78197+void
78198+gr_attach_curr_ip(const struct sock *sk)
78199+{
78200+#ifdef CONFIG_GRKERNSEC
78201+ struct signal_struct *p, *set;
78202+ const struct inet_sock *inet = inet_sk(sk);
78203+
78204+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
78205+ return;
78206+
78207+ set = current->signal;
78208+
78209+ spin_lock_bh(&gr_conn_table_lock);
78210+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
78211+ inet->inet_dport, inet->inet_sport);
78212+ if (unlikely(p != NULL)) {
78213+ set->curr_ip = p->curr_ip;
78214+ set->used_accept = 1;
78215+ gr_del_task_from_ip_table_nolock(p);
78216+ spin_unlock_bh(&gr_conn_table_lock);
78217+ return;
78218+ }
78219+ spin_unlock_bh(&gr_conn_table_lock);
78220+
78221+ set->curr_ip = inet->inet_daddr;
78222+ set->used_accept = 1;
78223+#endif
78224+ return;
78225+}
78226+
78227+int
78228+gr_handle_sock_all(const int family, const int type, const int protocol)
78229+{
78230+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
78231+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
78232+ (family != AF_UNIX)) {
78233+ if (family == AF_INET)
78234+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
78235+ else
78236+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
78237+ return -EACCES;
78238+ }
78239+#endif
78240+ return 0;
78241+}
78242+
78243+int
78244+gr_handle_sock_server(const struct sockaddr *sck)
78245+{
78246+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78247+ if (grsec_enable_socket_server &&
78248+ in_group_p(grsec_socket_server_gid) &&
78249+ sck && (sck->sa_family != AF_UNIX) &&
78250+ (sck->sa_family != AF_LOCAL)) {
78251+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
78252+ return -EACCES;
78253+ }
78254+#endif
78255+ return 0;
78256+}
78257+
78258+int
78259+gr_handle_sock_server_other(const struct sock *sck)
78260+{
78261+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78262+ if (grsec_enable_socket_server &&
78263+ in_group_p(grsec_socket_server_gid) &&
78264+ sck && (sck->sk_family != AF_UNIX) &&
78265+ (sck->sk_family != AF_LOCAL)) {
78266+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
78267+ return -EACCES;
78268+ }
78269+#endif
78270+ return 0;
78271+}
78272+
78273+int
78274+gr_handle_sock_client(const struct sockaddr *sck)
78275+{
78276+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
78277+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
78278+ sck && (sck->sa_family != AF_UNIX) &&
78279+ (sck->sa_family != AF_LOCAL)) {
78280+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
78281+ return -EACCES;
78282+ }
78283+#endif
78284+ return 0;
78285+}
78286diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
78287new file mode 100644
78288index 0000000..8159888
78289--- /dev/null
78290+++ b/grsecurity/grsec_sysctl.c
78291@@ -0,0 +1,479 @@
78292+#include <linux/kernel.h>
78293+#include <linux/sched.h>
78294+#include <linux/sysctl.h>
78295+#include <linux/grsecurity.h>
78296+#include <linux/grinternal.h>
78297+
78298+int
78299+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
78300+{
78301+#ifdef CONFIG_GRKERNSEC_SYSCTL
78302+ if (dirname == NULL || name == NULL)
78303+ return 0;
78304+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
78305+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
78306+ return -EACCES;
78307+ }
78308+#endif
78309+ return 0;
78310+}
78311+
78312+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
78313+static int __maybe_unused __read_only one = 1;
78314+#endif
78315+
78316+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
78317+ defined(CONFIG_GRKERNSEC_DENYUSB)
78318+struct ctl_table grsecurity_table[] = {
78319+#ifdef CONFIG_GRKERNSEC_SYSCTL
78320+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
78321+#ifdef CONFIG_GRKERNSEC_IO
78322+ {
78323+ .procname = "disable_priv_io",
78324+ .data = &grsec_disable_privio,
78325+ .maxlen = sizeof(int),
78326+ .mode = 0600,
78327+ .proc_handler = &proc_dointvec,
78328+ },
78329+#endif
78330+#endif
78331+#ifdef CONFIG_GRKERNSEC_LINK
78332+ {
78333+ .procname = "linking_restrictions",
78334+ .data = &grsec_enable_link,
78335+ .maxlen = sizeof(int),
78336+ .mode = 0600,
78337+ .proc_handler = &proc_dointvec,
78338+ },
78339+#endif
78340+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
78341+ {
78342+ .procname = "enforce_symlinksifowner",
78343+ .data = &grsec_enable_symlinkown,
78344+ .maxlen = sizeof(int),
78345+ .mode = 0600,
78346+ .proc_handler = &proc_dointvec,
78347+ },
78348+ {
78349+ .procname = "symlinkown_gid",
78350+ .data = &grsec_symlinkown_gid,
78351+ .maxlen = sizeof(int),
78352+ .mode = 0600,
78353+ .proc_handler = &proc_dointvec,
78354+ },
78355+#endif
78356+#ifdef CONFIG_GRKERNSEC_BRUTE
78357+ {
78358+ .procname = "deter_bruteforce",
78359+ .data = &grsec_enable_brute,
78360+ .maxlen = sizeof(int),
78361+ .mode = 0600,
78362+ .proc_handler = &proc_dointvec,
78363+ },
78364+#endif
78365+#ifdef CONFIG_GRKERNSEC_FIFO
78366+ {
78367+ .procname = "fifo_restrictions",
78368+ .data = &grsec_enable_fifo,
78369+ .maxlen = sizeof(int),
78370+ .mode = 0600,
78371+ .proc_handler = &proc_dointvec,
78372+ },
78373+#endif
78374+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
78375+ {
78376+ .procname = "ptrace_readexec",
78377+ .data = &grsec_enable_ptrace_readexec,
78378+ .maxlen = sizeof(int),
78379+ .mode = 0600,
78380+ .proc_handler = &proc_dointvec,
78381+ },
78382+#endif
78383+#ifdef CONFIG_GRKERNSEC_SETXID
78384+ {
78385+ .procname = "consistent_setxid",
78386+ .data = &grsec_enable_setxid,
78387+ .maxlen = sizeof(int),
78388+ .mode = 0600,
78389+ .proc_handler = &proc_dointvec,
78390+ },
78391+#endif
78392+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78393+ {
78394+ .procname = "ip_blackhole",
78395+ .data = &grsec_enable_blackhole,
78396+ .maxlen = sizeof(int),
78397+ .mode = 0600,
78398+ .proc_handler = &proc_dointvec,
78399+ },
78400+ {
78401+ .procname = "lastack_retries",
78402+ .data = &grsec_lastack_retries,
78403+ .maxlen = sizeof(int),
78404+ .mode = 0600,
78405+ .proc_handler = &proc_dointvec,
78406+ },
78407+#endif
78408+#ifdef CONFIG_GRKERNSEC_EXECLOG
78409+ {
78410+ .procname = "exec_logging",
78411+ .data = &grsec_enable_execlog,
78412+ .maxlen = sizeof(int),
78413+ .mode = 0600,
78414+ .proc_handler = &proc_dointvec,
78415+ },
78416+#endif
78417+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78418+ {
78419+ .procname = "rwxmap_logging",
78420+ .data = &grsec_enable_log_rwxmaps,
78421+ .maxlen = sizeof(int),
78422+ .mode = 0600,
78423+ .proc_handler = &proc_dointvec,
78424+ },
78425+#endif
78426+#ifdef CONFIG_GRKERNSEC_SIGNAL
78427+ {
78428+ .procname = "signal_logging",
78429+ .data = &grsec_enable_signal,
78430+ .maxlen = sizeof(int),
78431+ .mode = 0600,
78432+ .proc_handler = &proc_dointvec,
78433+ },
78434+#endif
78435+#ifdef CONFIG_GRKERNSEC_FORKFAIL
78436+ {
78437+ .procname = "forkfail_logging",
78438+ .data = &grsec_enable_forkfail,
78439+ .maxlen = sizeof(int),
78440+ .mode = 0600,
78441+ .proc_handler = &proc_dointvec,
78442+ },
78443+#endif
78444+#ifdef CONFIG_GRKERNSEC_TIME
78445+ {
78446+ .procname = "timechange_logging",
78447+ .data = &grsec_enable_time,
78448+ .maxlen = sizeof(int),
78449+ .mode = 0600,
78450+ .proc_handler = &proc_dointvec,
78451+ },
78452+#endif
78453+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
78454+ {
78455+ .procname = "chroot_deny_shmat",
78456+ .data = &grsec_enable_chroot_shmat,
78457+ .maxlen = sizeof(int),
78458+ .mode = 0600,
78459+ .proc_handler = &proc_dointvec,
78460+ },
78461+#endif
78462+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
78463+ {
78464+ .procname = "chroot_deny_unix",
78465+ .data = &grsec_enable_chroot_unix,
78466+ .maxlen = sizeof(int),
78467+ .mode = 0600,
78468+ .proc_handler = &proc_dointvec,
78469+ },
78470+#endif
78471+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
78472+ {
78473+ .procname = "chroot_deny_mount",
78474+ .data = &grsec_enable_chroot_mount,
78475+ .maxlen = sizeof(int),
78476+ .mode = 0600,
78477+ .proc_handler = &proc_dointvec,
78478+ },
78479+#endif
78480+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
78481+ {
78482+ .procname = "chroot_deny_fchdir",
78483+ .data = &grsec_enable_chroot_fchdir,
78484+ .maxlen = sizeof(int),
78485+ .mode = 0600,
78486+ .proc_handler = &proc_dointvec,
78487+ },
78488+#endif
78489+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
78490+ {
78491+ .procname = "chroot_deny_chroot",
78492+ .data = &grsec_enable_chroot_double,
78493+ .maxlen = sizeof(int),
78494+ .mode = 0600,
78495+ .proc_handler = &proc_dointvec,
78496+ },
78497+#endif
78498+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
78499+ {
78500+ .procname = "chroot_deny_pivot",
78501+ .data = &grsec_enable_chroot_pivot,
78502+ .maxlen = sizeof(int),
78503+ .mode = 0600,
78504+ .proc_handler = &proc_dointvec,
78505+ },
78506+#endif
78507+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
78508+ {
78509+ .procname = "chroot_enforce_chdir",
78510+ .data = &grsec_enable_chroot_chdir,
78511+ .maxlen = sizeof(int),
78512+ .mode = 0600,
78513+ .proc_handler = &proc_dointvec,
78514+ },
78515+#endif
78516+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
78517+ {
78518+ .procname = "chroot_deny_chmod",
78519+ .data = &grsec_enable_chroot_chmod,
78520+ .maxlen = sizeof(int),
78521+ .mode = 0600,
78522+ .proc_handler = &proc_dointvec,
78523+ },
78524+#endif
78525+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
78526+ {
78527+ .procname = "chroot_deny_mknod",
78528+ .data = &grsec_enable_chroot_mknod,
78529+ .maxlen = sizeof(int),
78530+ .mode = 0600,
78531+ .proc_handler = &proc_dointvec,
78532+ },
78533+#endif
78534+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
78535+ {
78536+ .procname = "chroot_restrict_nice",
78537+ .data = &grsec_enable_chroot_nice,
78538+ .maxlen = sizeof(int),
78539+ .mode = 0600,
78540+ .proc_handler = &proc_dointvec,
78541+ },
78542+#endif
78543+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
78544+ {
78545+ .procname = "chroot_execlog",
78546+ .data = &grsec_enable_chroot_execlog,
78547+ .maxlen = sizeof(int),
78548+ .mode = 0600,
78549+ .proc_handler = &proc_dointvec,
78550+ },
78551+#endif
78552+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
78553+ {
78554+ .procname = "chroot_caps",
78555+ .data = &grsec_enable_chroot_caps,
78556+ .maxlen = sizeof(int),
78557+ .mode = 0600,
78558+ .proc_handler = &proc_dointvec,
78559+ },
78560+#endif
78561+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
78562+ {
78563+ .procname = "chroot_deny_sysctl",
78564+ .data = &grsec_enable_chroot_sysctl,
78565+ .maxlen = sizeof(int),
78566+ .mode = 0600,
78567+ .proc_handler = &proc_dointvec,
78568+ },
78569+#endif
78570+#ifdef CONFIG_GRKERNSEC_TPE
78571+ {
78572+ .procname = "tpe",
78573+ .data = &grsec_enable_tpe,
78574+ .maxlen = sizeof(int),
78575+ .mode = 0600,
78576+ .proc_handler = &proc_dointvec,
78577+ },
78578+ {
78579+ .procname = "tpe_gid",
78580+ .data = &grsec_tpe_gid,
78581+ .maxlen = sizeof(int),
78582+ .mode = 0600,
78583+ .proc_handler = &proc_dointvec,
78584+ },
78585+#endif
78586+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
78587+ {
78588+ .procname = "tpe_invert",
78589+ .data = &grsec_enable_tpe_invert,
78590+ .maxlen = sizeof(int),
78591+ .mode = 0600,
78592+ .proc_handler = &proc_dointvec,
78593+ },
78594+#endif
78595+#ifdef CONFIG_GRKERNSEC_TPE_ALL
78596+ {
78597+ .procname = "tpe_restrict_all",
78598+ .data = &grsec_enable_tpe_all,
78599+ .maxlen = sizeof(int),
78600+ .mode = 0600,
78601+ .proc_handler = &proc_dointvec,
78602+ },
78603+#endif
78604+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
78605+ {
78606+ .procname = "socket_all",
78607+ .data = &grsec_enable_socket_all,
78608+ .maxlen = sizeof(int),
78609+ .mode = 0600,
78610+ .proc_handler = &proc_dointvec,
78611+ },
78612+ {
78613+ .procname = "socket_all_gid",
78614+ .data = &grsec_socket_all_gid,
78615+ .maxlen = sizeof(int),
78616+ .mode = 0600,
78617+ .proc_handler = &proc_dointvec,
78618+ },
78619+#endif
78620+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
78621+ {
78622+ .procname = "socket_client",
78623+ .data = &grsec_enable_socket_client,
78624+ .maxlen = sizeof(int),
78625+ .mode = 0600,
78626+ .proc_handler = &proc_dointvec,
78627+ },
78628+ {
78629+ .procname = "socket_client_gid",
78630+ .data = &grsec_socket_client_gid,
78631+ .maxlen = sizeof(int),
78632+ .mode = 0600,
78633+ .proc_handler = &proc_dointvec,
78634+ },
78635+#endif
78636+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78637+ {
78638+ .procname = "socket_server",
78639+ .data = &grsec_enable_socket_server,
78640+ .maxlen = sizeof(int),
78641+ .mode = 0600,
78642+ .proc_handler = &proc_dointvec,
78643+ },
78644+ {
78645+ .procname = "socket_server_gid",
78646+ .data = &grsec_socket_server_gid,
78647+ .maxlen = sizeof(int),
78648+ .mode = 0600,
78649+ .proc_handler = &proc_dointvec,
78650+ },
78651+#endif
78652+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
78653+ {
78654+ .procname = "audit_group",
78655+ .data = &grsec_enable_group,
78656+ .maxlen = sizeof(int),
78657+ .mode = 0600,
78658+ .proc_handler = &proc_dointvec,
78659+ },
78660+ {
78661+ .procname = "audit_gid",
78662+ .data = &grsec_audit_gid,
78663+ .maxlen = sizeof(int),
78664+ .mode = 0600,
78665+ .proc_handler = &proc_dointvec,
78666+ },
78667+#endif
78668+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
78669+ {
78670+ .procname = "audit_chdir",
78671+ .data = &grsec_enable_chdir,
78672+ .maxlen = sizeof(int),
78673+ .mode = 0600,
78674+ .proc_handler = &proc_dointvec,
78675+ },
78676+#endif
78677+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
78678+ {
78679+ .procname = "audit_mount",
78680+ .data = &grsec_enable_mount,
78681+ .maxlen = sizeof(int),
78682+ .mode = 0600,
78683+ .proc_handler = &proc_dointvec,
78684+ },
78685+#endif
78686+#ifdef CONFIG_GRKERNSEC_DMESG
78687+ {
78688+ .procname = "dmesg",
78689+ .data = &grsec_enable_dmesg,
78690+ .maxlen = sizeof(int),
78691+ .mode = 0600,
78692+ .proc_handler = &proc_dointvec,
78693+ },
78694+#endif
78695+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
78696+ {
78697+ .procname = "chroot_findtask",
78698+ .data = &grsec_enable_chroot_findtask,
78699+ .maxlen = sizeof(int),
78700+ .mode = 0600,
78701+ .proc_handler = &proc_dointvec,
78702+ },
78703+#endif
78704+#ifdef CONFIG_GRKERNSEC_RESLOG
78705+ {
78706+ .procname = "resource_logging",
78707+ .data = &grsec_resource_logging,
78708+ .maxlen = sizeof(int),
78709+ .mode = 0600,
78710+ .proc_handler = &proc_dointvec,
78711+ },
78712+#endif
78713+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
78714+ {
78715+ .procname = "audit_ptrace",
78716+ .data = &grsec_enable_audit_ptrace,
78717+ .maxlen = sizeof(int),
78718+ .mode = 0600,
78719+ .proc_handler = &proc_dointvec,
78720+ },
78721+#endif
78722+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
78723+ {
78724+ .procname = "harden_ptrace",
78725+ .data = &grsec_enable_harden_ptrace,
78726+ .maxlen = sizeof(int),
78727+ .mode = 0600,
78728+ .proc_handler = &proc_dointvec,
78729+ },
78730+#endif
78731+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
78732+ {
78733+ .procname = "harden_ipc",
78734+ .data = &grsec_enable_harden_ipc,
78735+ .maxlen = sizeof(int),
78736+ .mode = 0600,
78737+ .proc_handler = &proc_dointvec,
78738+ },
78739+#endif
78740+ {
78741+ .procname = "grsec_lock",
78742+ .data = &grsec_lock,
78743+ .maxlen = sizeof(int),
78744+ .mode = 0600,
78745+ .proc_handler = &proc_dointvec,
78746+ },
78747+#endif
78748+#ifdef CONFIG_GRKERNSEC_ROFS
78749+ {
78750+ .procname = "romount_protect",
78751+ .data = &grsec_enable_rofs,
78752+ .maxlen = sizeof(int),
78753+ .mode = 0600,
78754+ .proc_handler = &proc_dointvec_minmax,
78755+ .extra1 = &one,
78756+ .extra2 = &one,
78757+ },
78758+#endif
78759+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
78760+ {
78761+ .procname = "deny_new_usb",
78762+ .data = &grsec_deny_new_usb,
78763+ .maxlen = sizeof(int),
78764+ .mode = 0600,
78765+ .proc_handler = &proc_dointvec,
78766+ },
78767+#endif
78768+ { }
78769+};
78770+#endif
78771diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
78772new file mode 100644
78773index 0000000..61b514e
78774--- /dev/null
78775+++ b/grsecurity/grsec_time.c
78776@@ -0,0 +1,16 @@
78777+#include <linux/kernel.h>
78778+#include <linux/sched.h>
78779+#include <linux/grinternal.h>
78780+#include <linux/module.h>
78781+
78782+void
78783+gr_log_timechange(void)
78784+{
78785+#ifdef CONFIG_GRKERNSEC_TIME
78786+ if (grsec_enable_time)
78787+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
78788+#endif
78789+ return;
78790+}
78791+
78792+EXPORT_SYMBOL_GPL(gr_log_timechange);
78793diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
78794new file mode 100644
78795index 0000000..d1953de
78796--- /dev/null
78797+++ b/grsecurity/grsec_tpe.c
78798@@ -0,0 +1,78 @@
78799+#include <linux/kernel.h>
78800+#include <linux/sched.h>
78801+#include <linux/file.h>
78802+#include <linux/fs.h>
78803+#include <linux/grinternal.h>
78804+
78805+extern int gr_acl_tpe_check(void);
78806+
78807+int
78808+gr_tpe_allow(const struct file *file)
78809+{
78810+#ifdef CONFIG_GRKERNSEC
78811+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
78812+ struct inode *file_inode = file->f_path.dentry->d_inode;
78813+ const struct cred *cred = current_cred();
78814+ char *msg = NULL;
78815+ char *msg2 = NULL;
78816+
78817+ // never restrict root
78818+ if (gr_is_global_root(cred->uid))
78819+ return 1;
78820+
78821+ if (grsec_enable_tpe) {
78822+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
78823+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
78824+ msg = "not being in trusted group";
78825+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
78826+ msg = "being in untrusted group";
78827+#else
78828+ if (in_group_p(grsec_tpe_gid))
78829+ msg = "being in untrusted group";
78830+#endif
78831+ }
78832+ if (!msg && gr_acl_tpe_check())
78833+ msg = "being in untrusted role";
78834+
78835+ // not in any affected group/role
78836+ if (!msg)
78837+ goto next_check;
78838+
78839+ if (gr_is_global_nonroot(inode->i_uid))
78840+ msg2 = "file in non-root-owned directory";
78841+ else if (inode->i_mode & S_IWOTH)
78842+ msg2 = "file in world-writable directory";
78843+ else if (inode->i_mode & S_IWGRP)
78844+ msg2 = "file in group-writable directory";
78845+ else if (file_inode->i_mode & S_IWOTH)
78846+ msg2 = "file is world-writable";
78847+
78848+ if (msg && msg2) {
78849+ char fullmsg[70] = {0};
78850+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
78851+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
78852+ return 0;
78853+ }
78854+ msg = NULL;
78855+next_check:
78856+#ifdef CONFIG_GRKERNSEC_TPE_ALL
78857+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
78858+ return 1;
78859+
78860+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
78861+ msg = "directory not owned by user";
78862+ else if (inode->i_mode & S_IWOTH)
78863+ msg = "file in world-writable directory";
78864+ else if (inode->i_mode & S_IWGRP)
78865+ msg = "file in group-writable directory";
78866+ else if (file_inode->i_mode & S_IWOTH)
78867+ msg = "file is world-writable";
78868+
78869+ if (msg) {
78870+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
78871+ return 0;
78872+ }
78873+#endif
78874+#endif
78875+ return 1;
78876+}
78877diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
78878new file mode 100644
78879index 0000000..ae02d8e
78880--- /dev/null
78881+++ b/grsecurity/grsec_usb.c
78882@@ -0,0 +1,15 @@
78883+#include <linux/kernel.h>
78884+#include <linux/grinternal.h>
78885+#include <linux/module.h>
78886+
78887+int gr_handle_new_usb(void)
78888+{
78889+#ifdef CONFIG_GRKERNSEC_DENYUSB
78890+ if (grsec_deny_new_usb) {
78891+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
78892+ return 1;
78893+ }
78894+#endif
78895+ return 0;
78896+}
78897+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
78898diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
78899new file mode 100644
78900index 0000000..158b330
78901--- /dev/null
78902+++ b/grsecurity/grsum.c
78903@@ -0,0 +1,64 @@
78904+#include <linux/err.h>
78905+#include <linux/kernel.h>
78906+#include <linux/sched.h>
78907+#include <linux/mm.h>
78908+#include <linux/scatterlist.h>
78909+#include <linux/crypto.h>
78910+#include <linux/gracl.h>
78911+
78912+
78913+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
78914+#error "crypto and sha256 must be built into the kernel"
78915+#endif
78916+
78917+int
78918+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
78919+{
78920+ struct crypto_hash *tfm;
78921+ struct hash_desc desc;
78922+ struct scatterlist sg[2];
78923+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
78924+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
78925+ unsigned long *sumptr = (unsigned long *)sum;
78926+ int cryptres;
78927+ int retval = 1;
78928+ volatile int mismatched = 0;
78929+ volatile int dummy = 0;
78930+ unsigned int i;
78931+
78932+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
78933+ if (IS_ERR(tfm)) {
78934+ /* should never happen, since sha256 should be built in */
78935+ memset(entry->pw, 0, GR_PW_LEN);
78936+ return 1;
78937+ }
78938+
78939+ sg_init_table(sg, 2);
78940+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
78941+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
78942+
78943+ desc.tfm = tfm;
78944+ desc.flags = 0;
78945+
78946+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
78947+ temp_sum);
78948+
78949+ memset(entry->pw, 0, GR_PW_LEN);
78950+
78951+ if (cryptres)
78952+ goto out;
78953+
78954+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
78955+ if (sumptr[i] != tmpsumptr[i])
78956+ mismatched = 1;
78957+ else
78958+ dummy = 1; // waste a cycle
78959+
78960+ if (!mismatched)
78961+ retval = dummy - 1;
78962+
78963+out:
78964+ crypto_free_hash(tfm);
78965+
78966+ return retval;
78967+}
78968diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
78969index 77ff547..181834f 100644
78970--- a/include/asm-generic/4level-fixup.h
78971+++ b/include/asm-generic/4level-fixup.h
78972@@ -13,8 +13,10 @@
78973 #define pmd_alloc(mm, pud, address) \
78974 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
78975 NULL: pmd_offset(pud, address))
78976+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
78977
78978 #define pud_alloc(mm, pgd, address) (pgd)
78979+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
78980 #define pud_offset(pgd, start) (pgd)
78981 #define pud_none(pud) 0
78982 #define pud_bad(pud) 0
78983diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
78984index b7babf0..1e4b4f1 100644
78985--- a/include/asm-generic/atomic-long.h
78986+++ b/include/asm-generic/atomic-long.h
78987@@ -22,6 +22,12 @@
78988
78989 typedef atomic64_t atomic_long_t;
78990
78991+#ifdef CONFIG_PAX_REFCOUNT
78992+typedef atomic64_unchecked_t atomic_long_unchecked_t;
78993+#else
78994+typedef atomic64_t atomic_long_unchecked_t;
78995+#endif
78996+
78997 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
78998
78999 static inline long atomic_long_read(atomic_long_t *l)
79000@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
79001 return (long)atomic64_read(v);
79002 }
79003
79004+#ifdef CONFIG_PAX_REFCOUNT
79005+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
79006+{
79007+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79008+
79009+ return (long)atomic64_read_unchecked(v);
79010+}
79011+#endif
79012+
79013 static inline void atomic_long_set(atomic_long_t *l, long i)
79014 {
79015 atomic64_t *v = (atomic64_t *)l;
79016@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79017 atomic64_set(v, i);
79018 }
79019
79020+#ifdef CONFIG_PAX_REFCOUNT
79021+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79022+{
79023+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79024+
79025+ atomic64_set_unchecked(v, i);
79026+}
79027+#endif
79028+
79029 static inline void atomic_long_inc(atomic_long_t *l)
79030 {
79031 atomic64_t *v = (atomic64_t *)l;
79032@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79033 atomic64_inc(v);
79034 }
79035
79036+#ifdef CONFIG_PAX_REFCOUNT
79037+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79038+{
79039+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79040+
79041+ atomic64_inc_unchecked(v);
79042+}
79043+#endif
79044+
79045 static inline void atomic_long_dec(atomic_long_t *l)
79046 {
79047 atomic64_t *v = (atomic64_t *)l;
79048@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
79049 atomic64_dec(v);
79050 }
79051
79052+#ifdef CONFIG_PAX_REFCOUNT
79053+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
79054+{
79055+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79056+
79057+ atomic64_dec_unchecked(v);
79058+}
79059+#endif
79060+
79061 static inline void atomic_long_add(long i, atomic_long_t *l)
79062 {
79063 atomic64_t *v = (atomic64_t *)l;
79064@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
79065 atomic64_add(i, v);
79066 }
79067
79068+#ifdef CONFIG_PAX_REFCOUNT
79069+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
79070+{
79071+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79072+
79073+ atomic64_add_unchecked(i, v);
79074+}
79075+#endif
79076+
79077 static inline void atomic_long_sub(long i, atomic_long_t *l)
79078 {
79079 atomic64_t *v = (atomic64_t *)l;
79080@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
79081 atomic64_sub(i, v);
79082 }
79083
79084+#ifdef CONFIG_PAX_REFCOUNT
79085+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
79086+{
79087+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79088+
79089+ atomic64_sub_unchecked(i, v);
79090+}
79091+#endif
79092+
79093 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
79094 {
79095 atomic64_t *v = (atomic64_t *)l;
79096@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
79097 return atomic64_add_negative(i, v);
79098 }
79099
79100-static inline long atomic_long_add_return(long i, atomic_long_t *l)
79101+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
79102 {
79103 atomic64_t *v = (atomic64_t *)l;
79104
79105 return (long)atomic64_add_return(i, v);
79106 }
79107
79108+#ifdef CONFIG_PAX_REFCOUNT
79109+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
79110+{
79111+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79112+
79113+ return (long)atomic64_add_return_unchecked(i, v);
79114+}
79115+#endif
79116+
79117 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
79118 {
79119 atomic64_t *v = (atomic64_t *)l;
79120@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
79121 return (long)atomic64_inc_return(v);
79122 }
79123
79124+#ifdef CONFIG_PAX_REFCOUNT
79125+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79126+{
79127+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79128+
79129+ return (long)atomic64_inc_return_unchecked(v);
79130+}
79131+#endif
79132+
79133 static inline long atomic_long_dec_return(atomic_long_t *l)
79134 {
79135 atomic64_t *v = (atomic64_t *)l;
79136@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79137
79138 typedef atomic_t atomic_long_t;
79139
79140+#ifdef CONFIG_PAX_REFCOUNT
79141+typedef atomic_unchecked_t atomic_long_unchecked_t;
79142+#else
79143+typedef atomic_t atomic_long_unchecked_t;
79144+#endif
79145+
79146 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
79147 static inline long atomic_long_read(atomic_long_t *l)
79148 {
79149@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
79150 return (long)atomic_read(v);
79151 }
79152
79153+#ifdef CONFIG_PAX_REFCOUNT
79154+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
79155+{
79156+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79157+
79158+ return (long)atomic_read_unchecked(v);
79159+}
79160+#endif
79161+
79162 static inline void atomic_long_set(atomic_long_t *l, long i)
79163 {
79164 atomic_t *v = (atomic_t *)l;
79165@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79166 atomic_set(v, i);
79167 }
79168
79169+#ifdef CONFIG_PAX_REFCOUNT
79170+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79171+{
79172+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79173+
79174+ atomic_set_unchecked(v, i);
79175+}
79176+#endif
79177+
79178 static inline void atomic_long_inc(atomic_long_t *l)
79179 {
79180 atomic_t *v = (atomic_t *)l;
79181@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79182 atomic_inc(v);
79183 }
79184
79185+#ifdef CONFIG_PAX_REFCOUNT
79186+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79187+{
79188+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79189+
79190+ atomic_inc_unchecked(v);
79191+}
79192+#endif
79193+
79194 static inline void atomic_long_dec(atomic_long_t *l)
79195 {
79196 atomic_t *v = (atomic_t *)l;
79197@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
79198 atomic_dec(v);
79199 }
79200
79201+#ifdef CONFIG_PAX_REFCOUNT
79202+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
79203+{
79204+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79205+
79206+ atomic_dec_unchecked(v);
79207+}
79208+#endif
79209+
79210 static inline void atomic_long_add(long i, atomic_long_t *l)
79211 {
79212 atomic_t *v = (atomic_t *)l;
79213@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
79214 atomic_add(i, v);
79215 }
79216
79217+#ifdef CONFIG_PAX_REFCOUNT
79218+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
79219+{
79220+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79221+
79222+ atomic_add_unchecked(i, v);
79223+}
79224+#endif
79225+
79226 static inline void atomic_long_sub(long i, atomic_long_t *l)
79227 {
79228 atomic_t *v = (atomic_t *)l;
79229@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
79230 atomic_sub(i, v);
79231 }
79232
79233+#ifdef CONFIG_PAX_REFCOUNT
79234+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
79235+{
79236+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79237+
79238+ atomic_sub_unchecked(i, v);
79239+}
79240+#endif
79241+
79242 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
79243 {
79244 atomic_t *v = (atomic_t *)l;
79245@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
79246 return atomic_add_negative(i, v);
79247 }
79248
79249-static inline long atomic_long_add_return(long i, atomic_long_t *l)
79250+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
79251 {
79252 atomic_t *v = (atomic_t *)l;
79253
79254 return (long)atomic_add_return(i, v);
79255 }
79256
79257+#ifdef CONFIG_PAX_REFCOUNT
79258+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
79259+{
79260+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79261+
79262+ return (long)atomic_add_return_unchecked(i, v);
79263+}
79264+
79265+#endif
79266+
79267 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
79268 {
79269 atomic_t *v = (atomic_t *)l;
79270@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
79271 return (long)atomic_inc_return(v);
79272 }
79273
79274+#ifdef CONFIG_PAX_REFCOUNT
79275+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79276+{
79277+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79278+
79279+ return (long)atomic_inc_return_unchecked(v);
79280+}
79281+#endif
79282+
79283 static inline long atomic_long_dec_return(atomic_long_t *l)
79284 {
79285 atomic_t *v = (atomic_t *)l;
79286@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79287
79288 #endif /* BITS_PER_LONG == 64 */
79289
79290+#ifdef CONFIG_PAX_REFCOUNT
79291+static inline void pax_refcount_needs_these_functions(void)
79292+{
79293+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
79294+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
79295+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
79296+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
79297+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
79298+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
79299+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
79300+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
79301+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
79302+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
79303+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
79304+#ifdef CONFIG_X86
79305+ atomic_clear_mask_unchecked(0, NULL);
79306+ atomic_set_mask_unchecked(0, NULL);
79307+#endif
79308+
79309+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
79310+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
79311+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
79312+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
79313+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
79314+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
79315+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
79316+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
79317+}
79318+#else
79319+#define atomic_read_unchecked(v) atomic_read(v)
79320+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
79321+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
79322+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
79323+#define atomic_inc_unchecked(v) atomic_inc(v)
79324+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
79325+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
79326+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
79327+#define atomic_dec_unchecked(v) atomic_dec(v)
79328+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
79329+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
79330+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
79331+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
79332+
79333+#define atomic_long_read_unchecked(v) atomic_long_read(v)
79334+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
79335+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
79336+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
79337+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
79338+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
79339+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
79340+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
79341+#endif
79342+
79343 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
79344diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
79345index 30ad9c8..c70c170 100644
79346--- a/include/asm-generic/atomic64.h
79347+++ b/include/asm-generic/atomic64.h
79348@@ -16,6 +16,8 @@ typedef struct {
79349 long long counter;
79350 } atomic64_t;
79351
79352+typedef atomic64_t atomic64_unchecked_t;
79353+
79354 #define ATOMIC64_INIT(i) { (i) }
79355
79356 extern long long atomic64_read(const atomic64_t *v);
79357@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
79358 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
79359 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
79360
79361+#define atomic64_read_unchecked(v) atomic64_read(v)
79362+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
79363+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
79364+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
79365+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
79366+#define atomic64_inc_unchecked(v) atomic64_inc(v)
79367+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
79368+#define atomic64_dec_unchecked(v) atomic64_dec(v)
79369+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
79370+
79371 #endif /* _ASM_GENERIC_ATOMIC64_H */
79372diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
79373index 1402fa8..025a736 100644
79374--- a/include/asm-generic/barrier.h
79375+++ b/include/asm-generic/barrier.h
79376@@ -74,7 +74,7 @@
79377 do { \
79378 compiletime_assert_atomic_type(*p); \
79379 smp_mb(); \
79380- ACCESS_ONCE(*p) = (v); \
79381+ ACCESS_ONCE_RW(*p) = (v); \
79382 } while (0)
79383
79384 #define smp_load_acquire(p) \
79385diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
79386index a60a7cc..0fe12f2 100644
79387--- a/include/asm-generic/bitops/__fls.h
79388+++ b/include/asm-generic/bitops/__fls.h
79389@@ -9,7 +9,7 @@
79390 *
79391 * Undefined if no set bit exists, so code should check against 0 first.
79392 */
79393-static __always_inline unsigned long __fls(unsigned long word)
79394+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
79395 {
79396 int num = BITS_PER_LONG - 1;
79397
79398diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
79399index 0576d1f..dad6c71 100644
79400--- a/include/asm-generic/bitops/fls.h
79401+++ b/include/asm-generic/bitops/fls.h
79402@@ -9,7 +9,7 @@
79403 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
79404 */
79405
79406-static __always_inline int fls(int x)
79407+static __always_inline int __intentional_overflow(-1) fls(int x)
79408 {
79409 int r = 32;
79410
79411diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
79412index b097cf8..3d40e14 100644
79413--- a/include/asm-generic/bitops/fls64.h
79414+++ b/include/asm-generic/bitops/fls64.h
79415@@ -15,7 +15,7 @@
79416 * at position 64.
79417 */
79418 #if BITS_PER_LONG == 32
79419-static __always_inline int fls64(__u64 x)
79420+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
79421 {
79422 __u32 h = x >> 32;
79423 if (h)
79424@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
79425 return fls(x);
79426 }
79427 #elif BITS_PER_LONG == 64
79428-static __always_inline int fls64(__u64 x)
79429+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
79430 {
79431 if (x == 0)
79432 return 0;
79433diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
79434index 1bfcfe5..e04c5c9 100644
79435--- a/include/asm-generic/cache.h
79436+++ b/include/asm-generic/cache.h
79437@@ -6,7 +6,7 @@
79438 * cache lines need to provide their own cache.h.
79439 */
79440
79441-#define L1_CACHE_SHIFT 5
79442-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
79443+#define L1_CACHE_SHIFT 5UL
79444+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
79445
79446 #endif /* __ASM_GENERIC_CACHE_H */
79447diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
79448index 0d68a1e..b74a761 100644
79449--- a/include/asm-generic/emergency-restart.h
79450+++ b/include/asm-generic/emergency-restart.h
79451@@ -1,7 +1,7 @@
79452 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
79453 #define _ASM_GENERIC_EMERGENCY_RESTART_H
79454
79455-static inline void machine_emergency_restart(void)
79456+static inline __noreturn void machine_emergency_restart(void)
79457 {
79458 machine_restart(NULL);
79459 }
79460diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
79461index b8fdc57..c6d5a5c 100644
79462--- a/include/asm-generic/io.h
79463+++ b/include/asm-generic/io.h
79464@@ -289,7 +289,7 @@ static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
79465 * These are pretty trivial
79466 */
79467 #ifndef virt_to_phys
79468-static inline unsigned long virt_to_phys(volatile void *address)
79469+static inline unsigned long __intentional_overflow(-1) virt_to_phys(volatile void *address)
79470 {
79471 return __pa((unsigned long)address);
79472 }
79473diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
79474index 90f99c7..00ce236 100644
79475--- a/include/asm-generic/kmap_types.h
79476+++ b/include/asm-generic/kmap_types.h
79477@@ -2,9 +2,9 @@
79478 #define _ASM_GENERIC_KMAP_TYPES_H
79479
79480 #ifdef __WITH_KM_FENCE
79481-# define KM_TYPE_NR 41
79482+# define KM_TYPE_NR 42
79483 #else
79484-# define KM_TYPE_NR 20
79485+# define KM_TYPE_NR 21
79486 #endif
79487
79488 #endif
79489diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
79490index 9ceb03b..62b0b8f 100644
79491--- a/include/asm-generic/local.h
79492+++ b/include/asm-generic/local.h
79493@@ -23,24 +23,37 @@ typedef struct
79494 atomic_long_t a;
79495 } local_t;
79496
79497+typedef struct {
79498+ atomic_long_unchecked_t a;
79499+} local_unchecked_t;
79500+
79501 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
79502
79503 #define local_read(l) atomic_long_read(&(l)->a)
79504+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
79505 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
79506+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
79507 #define local_inc(l) atomic_long_inc(&(l)->a)
79508+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
79509 #define local_dec(l) atomic_long_dec(&(l)->a)
79510+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
79511 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
79512+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
79513 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
79514+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
79515
79516 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
79517 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
79518 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
79519 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
79520 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
79521+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
79522 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
79523 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
79524+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
79525
79526 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
79527+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
79528 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
79529 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
79530 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
79531diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
79532index 725612b..9cc513a 100644
79533--- a/include/asm-generic/pgtable-nopmd.h
79534+++ b/include/asm-generic/pgtable-nopmd.h
79535@@ -1,14 +1,19 @@
79536 #ifndef _PGTABLE_NOPMD_H
79537 #define _PGTABLE_NOPMD_H
79538
79539-#ifndef __ASSEMBLY__
79540-
79541 #include <asm-generic/pgtable-nopud.h>
79542
79543-struct mm_struct;
79544-
79545 #define __PAGETABLE_PMD_FOLDED
79546
79547+#define PMD_SHIFT PUD_SHIFT
79548+#define PTRS_PER_PMD 1
79549+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
79550+#define PMD_MASK (~(PMD_SIZE-1))
79551+
79552+#ifndef __ASSEMBLY__
79553+
79554+struct mm_struct;
79555+
79556 /*
79557 * Having the pmd type consist of a pud gets the size right, and allows
79558 * us to conceptually access the pud entry that this pmd is folded into
79559@@ -16,11 +21,6 @@ struct mm_struct;
79560 */
79561 typedef struct { pud_t pud; } pmd_t;
79562
79563-#define PMD_SHIFT PUD_SHIFT
79564-#define PTRS_PER_PMD 1
79565-#define PMD_SIZE (1UL << PMD_SHIFT)
79566-#define PMD_MASK (~(PMD_SIZE-1))
79567-
79568 /*
79569 * The "pud_xxx()" functions here are trivial for a folded two-level
79570 * setup: the pmd is never bad, and a pmd always exists (as it's folded
79571diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
79572index 810431d..0ec4804f 100644
79573--- a/include/asm-generic/pgtable-nopud.h
79574+++ b/include/asm-generic/pgtable-nopud.h
79575@@ -1,10 +1,15 @@
79576 #ifndef _PGTABLE_NOPUD_H
79577 #define _PGTABLE_NOPUD_H
79578
79579-#ifndef __ASSEMBLY__
79580-
79581 #define __PAGETABLE_PUD_FOLDED
79582
79583+#define PUD_SHIFT PGDIR_SHIFT
79584+#define PTRS_PER_PUD 1
79585+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
79586+#define PUD_MASK (~(PUD_SIZE-1))
79587+
79588+#ifndef __ASSEMBLY__
79589+
79590 /*
79591 * Having the pud type consist of a pgd gets the size right, and allows
79592 * us to conceptually access the pgd entry that this pud is folded into
79593@@ -12,11 +17,6 @@
79594 */
79595 typedef struct { pgd_t pgd; } pud_t;
79596
79597-#define PUD_SHIFT PGDIR_SHIFT
79598-#define PTRS_PER_PUD 1
79599-#define PUD_SIZE (1UL << PUD_SHIFT)
79600-#define PUD_MASK (~(PUD_SIZE-1))
79601-
79602 /*
79603 * The "pgd_xxx()" functions here are trivial for a folded two-level
79604 * setup: the pud is never bad, and a pud always exists (as it's folded
79605@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
79606 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
79607
79608 #define pgd_populate(mm, pgd, pud) do { } while (0)
79609+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
79610 /*
79611 * (puds are folded into pgds so this doesn't get actually called,
79612 * but the define is needed for a generic inline function.)
79613diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
79614index 752e30d..87f172d 100644
79615--- a/include/asm-generic/pgtable.h
79616+++ b/include/asm-generic/pgtable.h
79617@@ -828,6 +828,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
79618 }
79619 #endif /* CONFIG_NUMA_BALANCING */
79620
79621+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
79622+#ifdef CONFIG_PAX_KERNEXEC
79623+#error KERNEXEC requires pax_open_kernel
79624+#else
79625+static inline unsigned long pax_open_kernel(void) { return 0; }
79626+#endif
79627+#endif
79628+
79629+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
79630+#ifdef CONFIG_PAX_KERNEXEC
79631+#error KERNEXEC requires pax_close_kernel
79632+#else
79633+static inline unsigned long pax_close_kernel(void) { return 0; }
79634+#endif
79635+#endif
79636+
79637 #endif /* CONFIG_MMU */
79638
79639 #endif /* !__ASSEMBLY__ */
79640diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
79641index 72d8803..cb9749c 100644
79642--- a/include/asm-generic/uaccess.h
79643+++ b/include/asm-generic/uaccess.h
79644@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
79645 return __clear_user(to, n);
79646 }
79647
79648+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
79649+#ifdef CONFIG_PAX_MEMORY_UDEREF
79650+#error UDEREF requires pax_open_userland
79651+#else
79652+static inline unsigned long pax_open_userland(void) { return 0; }
79653+#endif
79654+#endif
79655+
79656+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
79657+#ifdef CONFIG_PAX_MEMORY_UDEREF
79658+#error UDEREF requires pax_close_userland
79659+#else
79660+static inline unsigned long pax_close_userland(void) { return 0; }
79661+#endif
79662+#endif
79663+
79664 #endif /* __ASM_GENERIC_UACCESS_H */
79665diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
79666index aa70cbd..fd72c7a 100644
79667--- a/include/asm-generic/vmlinux.lds.h
79668+++ b/include/asm-generic/vmlinux.lds.h
79669@@ -233,6 +233,7 @@
79670 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
79671 VMLINUX_SYMBOL(__start_rodata) = .; \
79672 *(.rodata) *(.rodata.*) \
79673+ *(.data..read_only) \
79674 *(__vermagic) /* Kernel version magic */ \
79675 . = ALIGN(8); \
79676 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
79677@@ -724,17 +725,18 @@
79678 * section in the linker script will go there too. @phdr should have
79679 * a leading colon.
79680 *
79681- * Note that this macros defines __per_cpu_load as an absolute symbol.
79682+ * Note that this macros defines per_cpu_load as an absolute symbol.
79683 * If there is no need to put the percpu section at a predetermined
79684 * address, use PERCPU_SECTION.
79685 */
79686 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
79687- VMLINUX_SYMBOL(__per_cpu_load) = .; \
79688- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
79689+ per_cpu_load = .; \
79690+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
79691 - LOAD_OFFSET) { \
79692+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
79693 PERCPU_INPUT(cacheline) \
79694 } phdr \
79695- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
79696+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
79697
79698 /**
79699 * PERCPU_SECTION - define output section for percpu area, simple version
79700diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
79701index 623a59c..1e79ab9 100644
79702--- a/include/crypto/algapi.h
79703+++ b/include/crypto/algapi.h
79704@@ -34,7 +34,7 @@ struct crypto_type {
79705 unsigned int maskclear;
79706 unsigned int maskset;
79707 unsigned int tfmsize;
79708-};
79709+} __do_const;
79710
79711 struct crypto_instance {
79712 struct crypto_alg alg;
79713diff --git a/include/drm/drmP.h b/include/drm/drmP.h
79714index 53ed876..5bb09be 100644
79715--- a/include/drm/drmP.h
79716+++ b/include/drm/drmP.h
79717@@ -59,6 +59,7 @@
79718
79719 #include <asm/mman.h>
79720 #include <asm/pgalloc.h>
79721+#include <asm/local.h>
79722 #include <asm/uaccess.h>
79723
79724 #include <uapi/drm/drm.h>
79725@@ -223,10 +224,12 @@ void drm_err(const char *func, const char *format, ...);
79726 * \param cmd command.
79727 * \param arg argument.
79728 */
79729-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
79730+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
79731+ struct drm_file *file_priv);
79732+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
79733 struct drm_file *file_priv);
79734
79735-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
79736+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
79737 unsigned long arg);
79738
79739 #define DRM_IOCTL_NR(n) _IOC_NR(n)
79740@@ -242,10 +245,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
79741 struct drm_ioctl_desc {
79742 unsigned int cmd;
79743 int flags;
79744- drm_ioctl_t *func;
79745+ drm_ioctl_t func;
79746 unsigned int cmd_drv;
79747 const char *name;
79748-};
79749+} __do_const;
79750
79751 /**
79752 * Creates a driver or general drm_ioctl_desc array entry for the given
79753@@ -629,7 +632,8 @@ struct drm_info_list {
79754 int (*show)(struct seq_file*, void*); /** show callback */
79755 u32 driver_features; /**< Required driver features for this entry */
79756 void *data;
79757-};
79758+} __do_const;
79759+typedef struct drm_info_list __no_const drm_info_list_no_const;
79760
79761 /**
79762 * debugfs node structure. This structure represents a debugfs file.
79763@@ -713,7 +717,7 @@ struct drm_device {
79764
79765 /** \name Usage Counters */
79766 /*@{ */
79767- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
79768+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
79769 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
79770 int buf_use; /**< Buffers in use -- cannot alloc */
79771 atomic_t buf_alloc; /**< Buffer allocation in progress */
79772diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
79773index a3d75fe..6802f9c 100644
79774--- a/include/drm/drm_crtc_helper.h
79775+++ b/include/drm/drm_crtc_helper.h
79776@@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
79777 struct drm_connector *connector);
79778 /* disable encoder when not in use - more explicit than dpms off */
79779 void (*disable)(struct drm_encoder *encoder);
79780-};
79781+} __no_const;
79782
79783 /**
79784 * drm_connector_helper_funcs - helper operations for connectors
79785diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
79786index a70d456..6ea07cd 100644
79787--- a/include/drm/i915_pciids.h
79788+++ b/include/drm/i915_pciids.h
79789@@ -37,7 +37,7 @@
79790 */
79791 #define INTEL_VGA_DEVICE(id, info) { \
79792 0x8086, id, \
79793- ~0, ~0, \
79794+ PCI_ANY_ID, PCI_ANY_ID, \
79795 0x030000, 0xff0000, \
79796 (unsigned long) info }
79797
79798diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
79799index 72dcbe8..8db58d7 100644
79800--- a/include/drm/ttm/ttm_memory.h
79801+++ b/include/drm/ttm/ttm_memory.h
79802@@ -48,7 +48,7 @@
79803
79804 struct ttm_mem_shrink {
79805 int (*do_shrink) (struct ttm_mem_shrink *);
79806-};
79807+} __no_const;
79808
79809 /**
79810 * struct ttm_mem_global - Global memory accounting structure.
79811diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
79812index 49a8284..9643967 100644
79813--- a/include/drm/ttm/ttm_page_alloc.h
79814+++ b/include/drm/ttm/ttm_page_alloc.h
79815@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
79816 */
79817 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
79818
79819+struct device;
79820 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
79821 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
79822
79823diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
79824index 4b840e8..155d235 100644
79825--- a/include/keys/asymmetric-subtype.h
79826+++ b/include/keys/asymmetric-subtype.h
79827@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
79828 /* Verify the signature on a key of this subtype (optional) */
79829 int (*verify_signature)(const struct key *key,
79830 const struct public_key_signature *sig);
79831-};
79832+} __do_const;
79833
79834 /**
79835 * asymmetric_key_subtype - Get the subtype from an asymmetric key
79836diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
79837index c1da539..1dcec55 100644
79838--- a/include/linux/atmdev.h
79839+++ b/include/linux/atmdev.h
79840@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
79841 #endif
79842
79843 struct k_atm_aal_stats {
79844-#define __HANDLE_ITEM(i) atomic_t i
79845+#define __HANDLE_ITEM(i) atomic_unchecked_t i
79846 __AAL_STAT_ITEMS
79847 #undef __HANDLE_ITEM
79848 };
79849@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
79850 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
79851 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
79852 struct module *owner;
79853-};
79854+} __do_const ;
79855
79856 struct atmphy_ops {
79857 int (*start)(struct atm_dev *dev);
79858diff --git a/include/linux/audit.h b/include/linux/audit.h
79859index 10f155b..6c73ffe 100644
79860--- a/include/linux/audit.h
79861+++ b/include/linux/audit.h
79862@@ -219,7 +219,7 @@ static inline void audit_ptrace(struct task_struct *t)
79863 extern unsigned int audit_serial(void);
79864 extern int auditsc_get_stamp(struct audit_context *ctx,
79865 struct timespec *t, unsigned int *serial);
79866-extern int audit_set_loginuid(kuid_t loginuid);
79867+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
79868
79869 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
79870 {
79871diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
79872index 61f29e5..e67c658 100644
79873--- a/include/linux/binfmts.h
79874+++ b/include/linux/binfmts.h
79875@@ -44,7 +44,7 @@ struct linux_binprm {
79876 unsigned interp_flags;
79877 unsigned interp_data;
79878 unsigned long loader, exec;
79879-};
79880+} __randomize_layout;
79881
79882 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
79883 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
79884@@ -73,8 +73,10 @@ struct linux_binfmt {
79885 int (*load_binary)(struct linux_binprm *);
79886 int (*load_shlib)(struct file *);
79887 int (*core_dump)(struct coredump_params *cprm);
79888+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
79889+ void (*handle_mmap)(struct file *);
79890 unsigned long min_coredump; /* minimal dump size */
79891-};
79892+} __do_const __randomize_layout;
79893
79894 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
79895
79896diff --git a/include/linux/bitops.h b/include/linux/bitops.h
79897index 5d858e0..336c1d9 100644
79898--- a/include/linux/bitops.h
79899+++ b/include/linux/bitops.h
79900@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
79901 * @word: value to rotate
79902 * @shift: bits to roll
79903 */
79904-static inline __u32 rol32(__u32 word, unsigned int shift)
79905+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
79906 {
79907 return (word << shift) | (word >> (32 - shift));
79908 }
79909@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
79910 * @word: value to rotate
79911 * @shift: bits to roll
79912 */
79913-static inline __u32 ror32(__u32 word, unsigned int shift)
79914+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
79915 {
79916 return (word >> shift) | (word << (32 - shift));
79917 }
79918@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
79919 return (__s32)(value << shift) >> shift;
79920 }
79921
79922-static inline unsigned fls_long(unsigned long l)
79923+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
79924 {
79925 if (sizeof(l) == 4)
79926 return fls(l);
79927diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
79928index aac0f9e..73c9869 100644
79929--- a/include/linux/blkdev.h
79930+++ b/include/linux/blkdev.h
79931@@ -1615,7 +1615,7 @@ struct block_device_operations {
79932 /* this callback is with swap_lock and sometimes page table lock held */
79933 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
79934 struct module *owner;
79935-};
79936+} __do_const;
79937
79938 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
79939 unsigned long);
79940diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
79941index afc1343..9735539 100644
79942--- a/include/linux/blktrace_api.h
79943+++ b/include/linux/blktrace_api.h
79944@@ -25,7 +25,7 @@ struct blk_trace {
79945 struct dentry *dropped_file;
79946 struct dentry *msg_file;
79947 struct list_head running_list;
79948- atomic_t dropped;
79949+ atomic_unchecked_t dropped;
79950 };
79951
79952 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
79953diff --git a/include/linux/cache.h b/include/linux/cache.h
79954index 17e7e82..1d7da26 100644
79955--- a/include/linux/cache.h
79956+++ b/include/linux/cache.h
79957@@ -16,6 +16,14 @@
79958 #define __read_mostly
79959 #endif
79960
79961+#ifndef __read_only
79962+#ifdef CONFIG_PAX_KERNEXEC
79963+#error KERNEXEC requires __read_only
79964+#else
79965+#define __read_only __read_mostly
79966+#endif
79967+#endif
79968+
79969 #ifndef ____cacheline_aligned
79970 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
79971 #endif
79972diff --git a/include/linux/capability.h b/include/linux/capability.h
79973index aa93e5e..985a1b0 100644
79974--- a/include/linux/capability.h
79975+++ b/include/linux/capability.h
79976@@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
79977 extern bool capable(int cap);
79978 extern bool ns_capable(struct user_namespace *ns, int cap);
79979 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
79980+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
79981 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
79982+extern bool capable_nolog(int cap);
79983+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
79984
79985 /* audit system wants to get cap info from files as well */
79986 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
79987
79988+extern int is_privileged_binary(const struct dentry *dentry);
79989+
79990 #endif /* !_LINUX_CAPABILITY_H */
79991diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
79992index 8609d57..86e4d79 100644
79993--- a/include/linux/cdrom.h
79994+++ b/include/linux/cdrom.h
79995@@ -87,7 +87,6 @@ struct cdrom_device_ops {
79996
79997 /* driver specifications */
79998 const int capability; /* capability flags */
79999- int n_minors; /* number of active minor devices */
80000 /* handle uniform packets for scsi type devices (scsi,atapi) */
80001 int (*generic_packet) (struct cdrom_device_info *,
80002 struct packet_command *);
80003diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
80004index 4ce9056..86caac6 100644
80005--- a/include/linux/cleancache.h
80006+++ b/include/linux/cleancache.h
80007@@ -31,7 +31,7 @@ struct cleancache_ops {
80008 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
80009 void (*invalidate_inode)(int, struct cleancache_filekey);
80010 void (*invalidate_fs)(int);
80011-};
80012+} __no_const;
80013
80014 extern struct cleancache_ops *
80015 cleancache_register_ops(struct cleancache_ops *ops);
80016diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
80017index 2839c63..5b06b6b 100644
80018--- a/include/linux/clk-provider.h
80019+++ b/include/linux/clk-provider.h
80020@@ -191,6 +191,7 @@ struct clk_ops {
80021 void (*init)(struct clk_hw *hw);
80022 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
80023 };
80024+typedef struct clk_ops __no_const clk_ops_no_const;
80025
80026 /**
80027 * struct clk_init_data - holds init data that's common to all clocks and is
80028diff --git a/include/linux/compat.h b/include/linux/compat.h
80029index e649426..a74047b 100644
80030--- a/include/linux/compat.h
80031+++ b/include/linux/compat.h
80032@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
80033 compat_size_t __user *len_ptr);
80034
80035 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
80036-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
80037+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
80038 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
80039 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
80040 compat_ssize_t msgsz, int msgflg);
80041@@ -436,7 +436,7 @@ extern int compat_ptrace_request(struct task_struct *child,
80042 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
80043 compat_ulong_t addr, compat_ulong_t data);
80044 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
80045- compat_long_t addr, compat_long_t data);
80046+ compat_ulong_t addr, compat_ulong_t data);
80047
80048 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
80049 /*
80050diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
80051index d1a5582..4424efa 100644
80052--- a/include/linux/compiler-gcc4.h
80053+++ b/include/linux/compiler-gcc4.h
80054@@ -39,9 +39,34 @@
80055 # define __compiletime_warning(message) __attribute__((warning(message)))
80056 # define __compiletime_error(message) __attribute__((error(message)))
80057 #endif /* __CHECKER__ */
80058+
80059+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
80060+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
80061+#define __bos0(ptr) __bos((ptr), 0)
80062+#define __bos1(ptr) __bos((ptr), 1)
80063 #endif /* GCC_VERSION >= 40300 */
80064
80065 #if GCC_VERSION >= 40500
80066+
80067+#ifdef RANDSTRUCT_PLUGIN
80068+#define __randomize_layout __attribute__((randomize_layout))
80069+#define __no_randomize_layout __attribute__((no_randomize_layout))
80070+#endif
80071+
80072+#ifdef CONSTIFY_PLUGIN
80073+#define __no_const __attribute__((no_const))
80074+#define __do_const __attribute__((do_const))
80075+#endif
80076+
80077+#ifdef SIZE_OVERFLOW_PLUGIN
80078+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
80079+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
80080+#endif
80081+
80082+#ifdef LATENT_ENTROPY_PLUGIN
80083+#define __latent_entropy __attribute__((latent_entropy))
80084+#endif
80085+
80086 /*
80087 * Mark a position in code as unreachable. This can be used to
80088 * suppress control flow warnings after asm blocks that transfer
80089diff --git a/include/linux/compiler.h b/include/linux/compiler.h
80090index d5ad7b1..3b74638 100644
80091--- a/include/linux/compiler.h
80092+++ b/include/linux/compiler.h
80093@@ -5,11 +5,14 @@
80094
80095 #ifdef __CHECKER__
80096 # define __user __attribute__((noderef, address_space(1)))
80097+# define __force_user __force __user
80098 # define __kernel __attribute__((address_space(0)))
80099+# define __force_kernel __force __kernel
80100 # define __safe __attribute__((safe))
80101 # define __force __attribute__((force))
80102 # define __nocast __attribute__((nocast))
80103 # define __iomem __attribute__((noderef, address_space(2)))
80104+# define __force_iomem __force __iomem
80105 # define __must_hold(x) __attribute__((context(x,1,1)))
80106 # define __acquires(x) __attribute__((context(x,0,1)))
80107 # define __releases(x) __attribute__((context(x,1,0)))
80108@@ -17,20 +20,37 @@
80109 # define __release(x) __context__(x,-1)
80110 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
80111 # define __percpu __attribute__((noderef, address_space(3)))
80112+# define __force_percpu __force __percpu
80113 #ifdef CONFIG_SPARSE_RCU_POINTER
80114 # define __rcu __attribute__((noderef, address_space(4)))
80115+# define __force_rcu __force __rcu
80116 #else
80117 # define __rcu
80118+# define __force_rcu
80119 #endif
80120 extern void __chk_user_ptr(const volatile void __user *);
80121 extern void __chk_io_ptr(const volatile void __iomem *);
80122 #else
80123-# define __user
80124-# define __kernel
80125+# ifdef CHECKER_PLUGIN
80126+//# define __user
80127+//# define __force_user
80128+//# define __kernel
80129+//# define __force_kernel
80130+# else
80131+# ifdef STRUCTLEAK_PLUGIN
80132+# define __user __attribute__((user))
80133+# else
80134+# define __user
80135+# endif
80136+# define __force_user
80137+# define __kernel
80138+# define __force_kernel
80139+# endif
80140 # define __safe
80141 # define __force
80142 # define __nocast
80143 # define __iomem
80144+# define __force_iomem
80145 # define __chk_user_ptr(x) (void)0
80146 # define __chk_io_ptr(x) (void)0
80147 # define __builtin_warning(x, y...) (1)
80148@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
80149 # define __release(x) (void)0
80150 # define __cond_lock(x,c) (c)
80151 # define __percpu
80152+# define __force_percpu
80153 # define __rcu
80154+# define __force_rcu
80155 #endif
80156
80157 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
80158@@ -286,6 +308,34 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80159 # define __attribute_const__ /* unimplemented */
80160 #endif
80161
80162+#ifndef __randomize_layout
80163+# define __randomize_layout
80164+#endif
80165+
80166+#ifndef __no_randomize_layout
80167+# define __no_randomize_layout
80168+#endif
80169+
80170+#ifndef __no_const
80171+# define __no_const
80172+#endif
80173+
80174+#ifndef __do_const
80175+# define __do_const
80176+#endif
80177+
80178+#ifndef __size_overflow
80179+# define __size_overflow(...)
80180+#endif
80181+
80182+#ifndef __intentional_overflow
80183+# define __intentional_overflow(...)
80184+#endif
80185+
80186+#ifndef __latent_entropy
80187+# define __latent_entropy
80188+#endif
80189+
80190 /*
80191 * Tell gcc if a function is cold. The compiler will assume any path
80192 * directly leading to the call is unlikely.
80193@@ -295,6 +345,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80194 #define __cold
80195 #endif
80196
80197+#ifndef __alloc_size
80198+#define __alloc_size(...)
80199+#endif
80200+
80201+#ifndef __bos
80202+#define __bos(ptr, arg)
80203+#endif
80204+
80205+#ifndef __bos0
80206+#define __bos0(ptr)
80207+#endif
80208+
80209+#ifndef __bos1
80210+#define __bos1(ptr)
80211+#endif
80212+
80213 /* Simple shorthand for a section definition */
80214 #ifndef __section
80215 # define __section(S) __attribute__ ((__section__(#S)))
80216@@ -378,7 +444,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80217 * use is to mediate communication between process-level code and irq/NMI
80218 * handlers, all running on the same CPU.
80219 */
80220-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
80221+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
80222+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
80223
80224 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
80225 #ifdef CONFIG_KPROBES
80226diff --git a/include/linux/completion.h b/include/linux/completion.h
80227index 5d5aaae..0ea9b84 100644
80228--- a/include/linux/completion.h
80229+++ b/include/linux/completion.h
80230@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
80231
80232 extern void wait_for_completion(struct completion *);
80233 extern void wait_for_completion_io(struct completion *);
80234-extern int wait_for_completion_interruptible(struct completion *x);
80235-extern int wait_for_completion_killable(struct completion *x);
80236+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
80237+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
80238 extern unsigned long wait_for_completion_timeout(struct completion *x,
80239- unsigned long timeout);
80240+ unsigned long timeout) __intentional_overflow(-1);
80241 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
80242- unsigned long timeout);
80243+ unsigned long timeout) __intentional_overflow(-1);
80244 extern long wait_for_completion_interruptible_timeout(
80245- struct completion *x, unsigned long timeout);
80246+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
80247 extern long wait_for_completion_killable_timeout(
80248- struct completion *x, unsigned long timeout);
80249+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
80250 extern bool try_wait_for_completion(struct completion *x);
80251 extern bool completion_done(struct completion *x);
80252
80253diff --git a/include/linux/configfs.h b/include/linux/configfs.h
80254index 34025df..d94bbbc 100644
80255--- a/include/linux/configfs.h
80256+++ b/include/linux/configfs.h
80257@@ -125,7 +125,7 @@ struct configfs_attribute {
80258 const char *ca_name;
80259 struct module *ca_owner;
80260 umode_t ca_mode;
80261-};
80262+} __do_const;
80263
80264 /*
80265 * Users often need to create attribute structures for their configurable
80266diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
80267index 503b085b..1638c9e 100644
80268--- a/include/linux/cpufreq.h
80269+++ b/include/linux/cpufreq.h
80270@@ -206,6 +206,7 @@ struct global_attr {
80271 ssize_t (*store)(struct kobject *a, struct attribute *b,
80272 const char *c, size_t count);
80273 };
80274+typedef struct global_attr __no_const global_attr_no_const;
80275
80276 #define define_one_global_ro(_name) \
80277 static struct global_attr _name = \
80278@@ -273,7 +274,7 @@ struct cpufreq_driver {
80279 bool boost_supported;
80280 bool boost_enabled;
80281 int (*set_boost) (int state);
80282-};
80283+} __do_const;
80284
80285 /* flags */
80286 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
80287diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
80288index 25e0df6..952dffd 100644
80289--- a/include/linux/cpuidle.h
80290+++ b/include/linux/cpuidle.h
80291@@ -50,7 +50,8 @@ struct cpuidle_state {
80292 int index);
80293
80294 int (*enter_dead) (struct cpuidle_device *dev, int index);
80295-};
80296+} __do_const;
80297+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
80298
80299 /* Idle State Flags */
80300 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
80301@@ -209,7 +210,7 @@ struct cpuidle_governor {
80302 void (*reflect) (struct cpuidle_device *dev, int index);
80303
80304 struct module *owner;
80305-};
80306+} __do_const;
80307
80308 #ifdef CONFIG_CPU_IDLE
80309 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
80310diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
80311index 0a9a6da..ea597ca 100644
80312--- a/include/linux/cpumask.h
80313+++ b/include/linux/cpumask.h
80314@@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
80315 }
80316
80317 /* Valid inputs for n are -1 and 0. */
80318-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80319+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
80320 {
80321 return n+1;
80322 }
80323
80324-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80325+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
80326 {
80327 return n+1;
80328 }
80329
80330-static inline unsigned int cpumask_next_and(int n,
80331+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
80332 const struct cpumask *srcp,
80333 const struct cpumask *andp)
80334 {
80335@@ -174,7 +174,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
80336 *
80337 * Returns >= nr_cpu_ids if no further cpus set.
80338 */
80339-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80340+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
80341 {
80342 /* -1 is a legal arg here. */
80343 if (n != -1)
80344@@ -189,7 +189,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80345 *
80346 * Returns >= nr_cpu_ids if no further cpus unset.
80347 */
80348-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80349+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
80350 {
80351 /* -1 is a legal arg here. */
80352 if (n != -1)
80353@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80354 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
80355 }
80356
80357-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
80358+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
80359 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
80360 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
80361
80362diff --git a/include/linux/cred.h b/include/linux/cred.h
80363index 2fb2ca2..d6a3340 100644
80364--- a/include/linux/cred.h
80365+++ b/include/linux/cred.h
80366@@ -35,7 +35,7 @@ struct group_info {
80367 int nblocks;
80368 kgid_t small_block[NGROUPS_SMALL];
80369 kgid_t *blocks[0];
80370-};
80371+} __randomize_layout;
80372
80373 /**
80374 * get_group_info - Get a reference to a group info structure
80375@@ -137,7 +137,7 @@ struct cred {
80376 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
80377 struct group_info *group_info; /* supplementary groups for euid/fsgid */
80378 struct rcu_head rcu; /* RCU deletion hook */
80379-};
80380+} __randomize_layout;
80381
80382 extern void __put_cred(struct cred *);
80383 extern void exit_creds(struct task_struct *);
80384@@ -195,6 +195,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
80385 static inline void validate_process_creds(void)
80386 {
80387 }
80388+static inline void validate_task_creds(struct task_struct *task)
80389+{
80390+}
80391 #endif
80392
80393 /**
80394@@ -332,6 +335,7 @@ static inline void put_cred(const struct cred *_cred)
80395
80396 #define task_uid(task) (task_cred_xxx((task), uid))
80397 #define task_euid(task) (task_cred_xxx((task), euid))
80398+#define task_securebits(task) (task_cred_xxx((task), securebits))
80399
80400 #define current_cred_xxx(xxx) \
80401 ({ \
80402diff --git a/include/linux/crypto.h b/include/linux/crypto.h
80403index d45e949..51cf5ea 100644
80404--- a/include/linux/crypto.h
80405+++ b/include/linux/crypto.h
80406@@ -373,7 +373,7 @@ struct cipher_tfm {
80407 const u8 *key, unsigned int keylen);
80408 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
80409 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
80410-};
80411+} __no_const;
80412
80413 struct hash_tfm {
80414 int (*init)(struct hash_desc *desc);
80415@@ -394,13 +394,13 @@ struct compress_tfm {
80416 int (*cot_decompress)(struct crypto_tfm *tfm,
80417 const u8 *src, unsigned int slen,
80418 u8 *dst, unsigned int *dlen);
80419-};
80420+} __no_const;
80421
80422 struct rng_tfm {
80423 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
80424 unsigned int dlen);
80425 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
80426-};
80427+} __no_const;
80428
80429 #define crt_ablkcipher crt_u.ablkcipher
80430 #define crt_aead crt_u.aead
80431diff --git a/include/linux/ctype.h b/include/linux/ctype.h
80432index 653589e..4ef254a 100644
80433--- a/include/linux/ctype.h
80434+++ b/include/linux/ctype.h
80435@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
80436 * Fast implementation of tolower() for internal usage. Do not use in your
80437 * code.
80438 */
80439-static inline char _tolower(const char c)
80440+static inline unsigned char _tolower(const unsigned char c)
80441 {
80442 return c | 0x20;
80443 }
80444diff --git a/include/linux/dcache.h b/include/linux/dcache.h
80445index 1c2f1b8..c67151e 100644
80446--- a/include/linux/dcache.h
80447+++ b/include/linux/dcache.h
80448@@ -133,7 +133,7 @@ struct dentry {
80449 struct hlist_node d_alias; /* inode alias list */
80450 struct rcu_head d_rcu;
80451 } d_u;
80452-};
80453+} __randomize_layout;
80454
80455 /*
80456 * dentry->d_lock spinlock nesting subclasses:
80457diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
80458index 7925bf0..d5143d2 100644
80459--- a/include/linux/decompress/mm.h
80460+++ b/include/linux/decompress/mm.h
80461@@ -77,7 +77,7 @@ static void free(void *where)
80462 * warnings when not needed (indeed large_malloc / large_free are not
80463 * needed by inflate */
80464
80465-#define malloc(a) kmalloc(a, GFP_KERNEL)
80466+#define malloc(a) kmalloc((a), GFP_KERNEL)
80467 #define free(a) kfree(a)
80468
80469 #define large_malloc(a) vmalloc(a)
80470diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
80471index f1863dc..5c26074 100644
80472--- a/include/linux/devfreq.h
80473+++ b/include/linux/devfreq.h
80474@@ -114,7 +114,7 @@ struct devfreq_governor {
80475 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
80476 int (*event_handler)(struct devfreq *devfreq,
80477 unsigned int event, void *data);
80478-};
80479+} __do_const;
80480
80481 /**
80482 * struct devfreq - Device devfreq structure
80483diff --git a/include/linux/device.h b/include/linux/device.h
80484index ce1f2160..189bc33 100644
80485--- a/include/linux/device.h
80486+++ b/include/linux/device.h
80487@@ -311,7 +311,7 @@ struct subsys_interface {
80488 struct list_head node;
80489 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
80490 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
80491-};
80492+} __do_const;
80493
80494 int subsys_interface_register(struct subsys_interface *sif);
80495 void subsys_interface_unregister(struct subsys_interface *sif);
80496@@ -507,7 +507,7 @@ struct device_type {
80497 void (*release)(struct device *dev);
80498
80499 const struct dev_pm_ops *pm;
80500-};
80501+} __do_const;
80502
80503 /* interface for exporting device attributes */
80504 struct device_attribute {
80505@@ -517,11 +517,12 @@ struct device_attribute {
80506 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
80507 const char *buf, size_t count);
80508 };
80509+typedef struct device_attribute __no_const device_attribute_no_const;
80510
80511 struct dev_ext_attribute {
80512 struct device_attribute attr;
80513 void *var;
80514-};
80515+} __do_const;
80516
80517 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
80518 char *buf);
80519diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
80520index d5d3881..7ed54af 100644
80521--- a/include/linux/dma-mapping.h
80522+++ b/include/linux/dma-mapping.h
80523@@ -60,7 +60,7 @@ struct dma_map_ops {
80524 u64 (*get_required_mask)(struct device *dev);
80525 #endif
80526 int is_phys;
80527-};
80528+} __do_const;
80529
80530 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
80531
80532diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
80533index 653a1fd..9133cd1 100644
80534--- a/include/linux/dmaengine.h
80535+++ b/include/linux/dmaengine.h
80536@@ -1136,9 +1136,9 @@ struct dma_pinned_list {
80537 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
80538 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
80539
80540-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
80541+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
80542 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
80543-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
80544+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
80545 struct dma_pinned_list *pinned_list, struct page *page,
80546 unsigned int offset, size_t len);
80547
80548diff --git a/include/linux/efi.h b/include/linux/efi.h
80549index 0949f9c..04cb9a5 100644
80550--- a/include/linux/efi.h
80551+++ b/include/linux/efi.h
80552@@ -1050,6 +1050,7 @@ struct efivar_operations {
80553 efi_set_variable_nonblocking_t *set_variable_nonblocking;
80554 efi_query_variable_store_t *query_variable_store;
80555 };
80556+typedef struct efivar_operations __no_const efivar_operations_no_const;
80557
80558 struct efivars {
80559 /*
80560diff --git a/include/linux/elf.h b/include/linux/elf.h
80561index 67a5fa7..b817372 100644
80562--- a/include/linux/elf.h
80563+++ b/include/linux/elf.h
80564@@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
80565 #define elf_note elf32_note
80566 #define elf_addr_t Elf32_Off
80567 #define Elf_Half Elf32_Half
80568+#define elf_dyn Elf32_Dyn
80569
80570 #else
80571
80572@@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
80573 #define elf_note elf64_note
80574 #define elf_addr_t Elf64_Off
80575 #define Elf_Half Elf64_Half
80576+#define elf_dyn Elf64_Dyn
80577
80578 #endif
80579
80580diff --git a/include/linux/err.h b/include/linux/err.h
80581index a729120..6ede2c9 100644
80582--- a/include/linux/err.h
80583+++ b/include/linux/err.h
80584@@ -20,12 +20,12 @@
80585
80586 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
80587
80588-static inline void * __must_check ERR_PTR(long error)
80589+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
80590 {
80591 return (void *) error;
80592 }
80593
80594-static inline long __must_check PTR_ERR(__force const void *ptr)
80595+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
80596 {
80597 return (long) ptr;
80598 }
80599diff --git a/include/linux/extcon.h b/include/linux/extcon.h
80600index 36f49c4..a2a1f4c 100644
80601--- a/include/linux/extcon.h
80602+++ b/include/linux/extcon.h
80603@@ -135,7 +135,7 @@ struct extcon_dev {
80604 /* /sys/class/extcon/.../mutually_exclusive/... */
80605 struct attribute_group attr_g_muex;
80606 struct attribute **attrs_muex;
80607- struct device_attribute *d_attrs_muex;
80608+ device_attribute_no_const *d_attrs_muex;
80609 };
80610
80611 /**
80612diff --git a/include/linux/fb.h b/include/linux/fb.h
80613index 09bb7a1..d98870a 100644
80614--- a/include/linux/fb.h
80615+++ b/include/linux/fb.h
80616@@ -305,7 +305,7 @@ struct fb_ops {
80617 /* called at KDB enter and leave time to prepare the console */
80618 int (*fb_debug_enter)(struct fb_info *info);
80619 int (*fb_debug_leave)(struct fb_info *info);
80620-};
80621+} __do_const;
80622
80623 #ifdef CONFIG_FB_TILEBLITTING
80624 #define FB_TILE_CURSOR_NONE 0
80625diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
80626index 230f87b..1fd0485 100644
80627--- a/include/linux/fdtable.h
80628+++ b/include/linux/fdtable.h
80629@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
80630 void put_files_struct(struct files_struct *fs);
80631 void reset_files_struct(struct files_struct *);
80632 int unshare_files(struct files_struct **);
80633-struct files_struct *dup_fd(struct files_struct *, int *);
80634+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
80635 void do_close_on_exec(struct files_struct *);
80636 int iterate_fd(struct files_struct *, unsigned,
80637 int (*)(const void *, struct file *, unsigned),
80638diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
80639index 8293262..2b3b8bd 100644
80640--- a/include/linux/frontswap.h
80641+++ b/include/linux/frontswap.h
80642@@ -11,7 +11,7 @@ struct frontswap_ops {
80643 int (*load)(unsigned, pgoff_t, struct page *);
80644 void (*invalidate_page)(unsigned, pgoff_t);
80645 void (*invalidate_area)(unsigned);
80646-};
80647+} __no_const;
80648
80649 extern bool frontswap_enabled;
80650 extern struct frontswap_ops *
80651diff --git a/include/linux/fs.h b/include/linux/fs.h
80652index 9ab779e..0c636f2 100644
80653--- a/include/linux/fs.h
80654+++ b/include/linux/fs.h
80655@@ -412,7 +412,7 @@ struct address_space {
80656 spinlock_t private_lock; /* for use by the address_space */
80657 struct list_head private_list; /* ditto */
80658 void *private_data; /* ditto */
80659-} __attribute__((aligned(sizeof(long))));
80660+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
80661 /*
80662 * On most architectures that alignment is already the case; but
80663 * must be enforced here for CRIS, to let the least significant bit
80664@@ -455,7 +455,7 @@ struct block_device {
80665 int bd_fsfreeze_count;
80666 /* Mutex for freeze */
80667 struct mutex bd_fsfreeze_mutex;
80668-};
80669+} __randomize_layout;
80670
80671 /*
80672 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
80673@@ -624,7 +624,7 @@ struct inode {
80674 #endif
80675
80676 void *i_private; /* fs or device private pointer */
80677-};
80678+} __randomize_layout;
80679
80680 static inline int inode_unhashed(struct inode *inode)
80681 {
80682@@ -820,7 +820,7 @@ struct file {
80683 struct list_head f_tfile_llink;
80684 #endif /* #ifdef CONFIG_EPOLL */
80685 struct address_space *f_mapping;
80686-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
80687+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
80688
80689 struct file_handle {
80690 __u32 handle_bytes;
80691@@ -945,7 +945,7 @@ struct file_lock {
80692 int state; /* state of grant or error if -ve */
80693 } afs;
80694 } fl_u;
80695-};
80696+} __randomize_layout;
80697
80698 /* The following constant reflects the upper bound of the file/locking space */
80699 #ifndef OFFSET_MAX
80700@@ -1287,7 +1287,7 @@ struct super_block {
80701 * Indicates how deep in a filesystem stack this SB is
80702 */
80703 int s_stack_depth;
80704-};
80705+} __randomize_layout;
80706
80707 extern struct timespec current_fs_time(struct super_block *sb);
80708
80709@@ -1514,7 +1514,8 @@ struct file_operations {
80710 long (*fallocate)(struct file *file, int mode, loff_t offset,
80711 loff_t len);
80712 int (*show_fdinfo)(struct seq_file *m, struct file *f);
80713-};
80714+} __do_const __randomize_layout;
80715+typedef struct file_operations __no_const file_operations_no_const;
80716
80717 struct inode_operations {
80718 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
80719@@ -2823,4 +2824,14 @@ static inline bool dir_relax(struct inode *inode)
80720 return !IS_DEADDIR(inode);
80721 }
80722
80723+static inline bool is_sidechannel_device(const struct inode *inode)
80724+{
80725+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
80726+ umode_t mode = inode->i_mode;
80727+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
80728+#else
80729+ return false;
80730+#endif
80731+}
80732+
80733 #endif /* _LINUX_FS_H */
80734diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
80735index 0efc3e6..fd23610 100644
80736--- a/include/linux/fs_struct.h
80737+++ b/include/linux/fs_struct.h
80738@@ -6,13 +6,13 @@
80739 #include <linux/seqlock.h>
80740
80741 struct fs_struct {
80742- int users;
80743+ atomic_t users;
80744 spinlock_t lock;
80745 seqcount_t seq;
80746 int umask;
80747 int in_exec;
80748 struct path root, pwd;
80749-};
80750+} __randomize_layout;
80751
80752 extern struct kmem_cache *fs_cachep;
80753
80754diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
80755index 7714849..a4a5c7a 100644
80756--- a/include/linux/fscache-cache.h
80757+++ b/include/linux/fscache-cache.h
80758@@ -113,7 +113,7 @@ struct fscache_operation {
80759 fscache_operation_release_t release;
80760 };
80761
80762-extern atomic_t fscache_op_debug_id;
80763+extern atomic_unchecked_t fscache_op_debug_id;
80764 extern void fscache_op_work_func(struct work_struct *work);
80765
80766 extern void fscache_enqueue_operation(struct fscache_operation *);
80767@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
80768 INIT_WORK(&op->work, fscache_op_work_func);
80769 atomic_set(&op->usage, 1);
80770 op->state = FSCACHE_OP_ST_INITIALISED;
80771- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
80772+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
80773 op->processor = processor;
80774 op->release = release;
80775 INIT_LIST_HEAD(&op->pend_link);
80776diff --git a/include/linux/fscache.h b/include/linux/fscache.h
80777index 115bb81..e7b812b 100644
80778--- a/include/linux/fscache.h
80779+++ b/include/linux/fscache.h
80780@@ -152,7 +152,7 @@ struct fscache_cookie_def {
80781 * - this is mandatory for any object that may have data
80782 */
80783 void (*now_uncached)(void *cookie_netfs_data);
80784-};
80785+} __do_const;
80786
80787 /*
80788 * fscache cached network filesystem type
80789diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
80790index 1c804b0..1432c2b 100644
80791--- a/include/linux/fsnotify.h
80792+++ b/include/linux/fsnotify.h
80793@@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
80794 struct inode *inode = file_inode(file);
80795 __u32 mask = FS_ACCESS;
80796
80797+ if (is_sidechannel_device(inode))
80798+ return;
80799+
80800 if (S_ISDIR(inode->i_mode))
80801 mask |= FS_ISDIR;
80802
80803@@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
80804 struct inode *inode = file_inode(file);
80805 __u32 mask = FS_MODIFY;
80806
80807+ if (is_sidechannel_device(inode))
80808+ return;
80809+
80810 if (S_ISDIR(inode->i_mode))
80811 mask |= FS_ISDIR;
80812
80813@@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
80814 */
80815 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
80816 {
80817- return kstrdup(name, GFP_KERNEL);
80818+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
80819 }
80820
80821 /*
80822diff --git a/include/linux/genhd.h b/include/linux/genhd.h
80823index ec274e0..e678159 100644
80824--- a/include/linux/genhd.h
80825+++ b/include/linux/genhd.h
80826@@ -194,7 +194,7 @@ struct gendisk {
80827 struct kobject *slave_dir;
80828
80829 struct timer_rand_state *random;
80830- atomic_t sync_io; /* RAID */
80831+ atomic_unchecked_t sync_io; /* RAID */
80832 struct disk_events *ev;
80833 #ifdef CONFIG_BLK_DEV_INTEGRITY
80834 struct blk_integrity *integrity;
80835@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
80836 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
80837
80838 /* drivers/char/random.c */
80839-extern void add_disk_randomness(struct gendisk *disk);
80840+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
80841 extern void rand_initialize_disk(struct gendisk *disk);
80842
80843 static inline sector_t get_start_sect(struct block_device *bdev)
80844diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
80845index 667c311..abac2a7 100644
80846--- a/include/linux/genl_magic_func.h
80847+++ b/include/linux/genl_magic_func.h
80848@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
80849 },
80850
80851 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
80852-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
80853+static struct genl_ops ZZZ_genl_ops[] = {
80854 #include GENL_MAGIC_INCLUDE_FILE
80855 };
80856
80857diff --git a/include/linux/gfp.h b/include/linux/gfp.h
80858index 41b30fd..a3718cf 100644
80859--- a/include/linux/gfp.h
80860+++ b/include/linux/gfp.h
80861@@ -34,6 +34,13 @@ struct vm_area_struct;
80862 #define ___GFP_NO_KSWAPD 0x400000u
80863 #define ___GFP_OTHER_NODE 0x800000u
80864 #define ___GFP_WRITE 0x1000000u
80865+
80866+#ifdef CONFIG_PAX_USERCOPY_SLABS
80867+#define ___GFP_USERCOPY 0x2000000u
80868+#else
80869+#define ___GFP_USERCOPY 0
80870+#endif
80871+
80872 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
80873
80874 /*
80875@@ -90,6 +97,7 @@ struct vm_area_struct;
80876 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
80877 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
80878 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
80879+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
80880
80881 /*
80882 * This may seem redundant, but it's a way of annotating false positives vs.
80883@@ -97,7 +105,7 @@ struct vm_area_struct;
80884 */
80885 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
80886
80887-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
80888+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
80889 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
80890
80891 /* This equals 0, but use constants in case they ever change */
80892@@ -155,6 +163,8 @@ struct vm_area_struct;
80893 /* 4GB DMA on some platforms */
80894 #define GFP_DMA32 __GFP_DMA32
80895
80896+#define GFP_USERCOPY __GFP_USERCOPY
80897+
80898 /* Convert GFP flags to their corresponding migrate type */
80899 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
80900 {
80901diff --git a/include/linux/gracl.h b/include/linux/gracl.h
80902new file mode 100644
80903index 0000000..edb2cb6
80904--- /dev/null
80905+++ b/include/linux/gracl.h
80906@@ -0,0 +1,340 @@
80907+#ifndef GR_ACL_H
80908+#define GR_ACL_H
80909+
80910+#include <linux/grdefs.h>
80911+#include <linux/resource.h>
80912+#include <linux/capability.h>
80913+#include <linux/dcache.h>
80914+#include <asm/resource.h>
80915+
80916+/* Major status information */
80917+
80918+#define GR_VERSION "grsecurity 3.0"
80919+#define GRSECURITY_VERSION 0x3000
80920+
80921+enum {
80922+ GR_SHUTDOWN = 0,
80923+ GR_ENABLE = 1,
80924+ GR_SPROLE = 2,
80925+ GR_OLDRELOAD = 3,
80926+ GR_SEGVMOD = 4,
80927+ GR_STATUS = 5,
80928+ GR_UNSPROLE = 6,
80929+ GR_PASSSET = 7,
80930+ GR_SPROLEPAM = 8,
80931+ GR_RELOAD = 9,
80932+};
80933+
80934+/* Password setup definitions
80935+ * kernel/grhash.c */
80936+enum {
80937+ GR_PW_LEN = 128,
80938+ GR_SALT_LEN = 16,
80939+ GR_SHA_LEN = 32,
80940+};
80941+
80942+enum {
80943+ GR_SPROLE_LEN = 64,
80944+};
80945+
80946+enum {
80947+ GR_NO_GLOB = 0,
80948+ GR_REG_GLOB,
80949+ GR_CREATE_GLOB
80950+};
80951+
80952+#define GR_NLIMITS 32
80953+
80954+/* Begin Data Structures */
80955+
80956+struct sprole_pw {
80957+ unsigned char *rolename;
80958+ unsigned char salt[GR_SALT_LEN];
80959+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
80960+};
80961+
80962+struct name_entry {
80963+ __u32 key;
80964+ ino_t inode;
80965+ dev_t device;
80966+ char *name;
80967+ __u16 len;
80968+ __u8 deleted;
80969+ struct name_entry *prev;
80970+ struct name_entry *next;
80971+};
80972+
80973+struct inodev_entry {
80974+ struct name_entry *nentry;
80975+ struct inodev_entry *prev;
80976+ struct inodev_entry *next;
80977+};
80978+
80979+struct acl_role_db {
80980+ struct acl_role_label **r_hash;
80981+ __u32 r_size;
80982+};
80983+
80984+struct inodev_db {
80985+ struct inodev_entry **i_hash;
80986+ __u32 i_size;
80987+};
80988+
80989+struct name_db {
80990+ struct name_entry **n_hash;
80991+ __u32 n_size;
80992+};
80993+
80994+struct crash_uid {
80995+ uid_t uid;
80996+ unsigned long expires;
80997+};
80998+
80999+struct gr_hash_struct {
81000+ void **table;
81001+ void **nametable;
81002+ void *first;
81003+ __u32 table_size;
81004+ __u32 used_size;
81005+ int type;
81006+};
81007+
81008+/* Userspace Grsecurity ACL data structures */
81009+
81010+struct acl_subject_label {
81011+ char *filename;
81012+ ino_t inode;
81013+ dev_t device;
81014+ __u32 mode;
81015+ kernel_cap_t cap_mask;
81016+ kernel_cap_t cap_lower;
81017+ kernel_cap_t cap_invert_audit;
81018+
81019+ struct rlimit res[GR_NLIMITS];
81020+ __u32 resmask;
81021+
81022+ __u8 user_trans_type;
81023+ __u8 group_trans_type;
81024+ uid_t *user_transitions;
81025+ gid_t *group_transitions;
81026+ __u16 user_trans_num;
81027+ __u16 group_trans_num;
81028+
81029+ __u32 sock_families[2];
81030+ __u32 ip_proto[8];
81031+ __u32 ip_type;
81032+ struct acl_ip_label **ips;
81033+ __u32 ip_num;
81034+ __u32 inaddr_any_override;
81035+
81036+ __u32 crashes;
81037+ unsigned long expires;
81038+
81039+ struct acl_subject_label *parent_subject;
81040+ struct gr_hash_struct *hash;
81041+ struct acl_subject_label *prev;
81042+ struct acl_subject_label *next;
81043+
81044+ struct acl_object_label **obj_hash;
81045+ __u32 obj_hash_size;
81046+ __u16 pax_flags;
81047+};
81048+
81049+struct role_allowed_ip {
81050+ __u32 addr;
81051+ __u32 netmask;
81052+
81053+ struct role_allowed_ip *prev;
81054+ struct role_allowed_ip *next;
81055+};
81056+
81057+struct role_transition {
81058+ char *rolename;
81059+
81060+ struct role_transition *prev;
81061+ struct role_transition *next;
81062+};
81063+
81064+struct acl_role_label {
81065+ char *rolename;
81066+ uid_t uidgid;
81067+ __u16 roletype;
81068+
81069+ __u16 auth_attempts;
81070+ unsigned long expires;
81071+
81072+ struct acl_subject_label *root_label;
81073+ struct gr_hash_struct *hash;
81074+
81075+ struct acl_role_label *prev;
81076+ struct acl_role_label *next;
81077+
81078+ struct role_transition *transitions;
81079+ struct role_allowed_ip *allowed_ips;
81080+ uid_t *domain_children;
81081+ __u16 domain_child_num;
81082+
81083+ umode_t umask;
81084+
81085+ struct acl_subject_label **subj_hash;
81086+ __u32 subj_hash_size;
81087+};
81088+
81089+struct user_acl_role_db {
81090+ struct acl_role_label **r_table;
81091+ __u32 num_pointers; /* Number of allocations to track */
81092+ __u32 num_roles; /* Number of roles */
81093+ __u32 num_domain_children; /* Number of domain children */
81094+ __u32 num_subjects; /* Number of subjects */
81095+ __u32 num_objects; /* Number of objects */
81096+};
81097+
81098+struct acl_object_label {
81099+ char *filename;
81100+ ino_t inode;
81101+ dev_t device;
81102+ __u32 mode;
81103+
81104+ struct acl_subject_label *nested;
81105+ struct acl_object_label *globbed;
81106+
81107+ /* next two structures not used */
81108+
81109+ struct acl_object_label *prev;
81110+ struct acl_object_label *next;
81111+};
81112+
81113+struct acl_ip_label {
81114+ char *iface;
81115+ __u32 addr;
81116+ __u32 netmask;
81117+ __u16 low, high;
81118+ __u8 mode;
81119+ __u32 type;
81120+ __u32 proto[8];
81121+
81122+ /* next two structures not used */
81123+
81124+ struct acl_ip_label *prev;
81125+ struct acl_ip_label *next;
81126+};
81127+
81128+struct gr_arg {
81129+ struct user_acl_role_db role_db;
81130+ unsigned char pw[GR_PW_LEN];
81131+ unsigned char salt[GR_SALT_LEN];
81132+ unsigned char sum[GR_SHA_LEN];
81133+ unsigned char sp_role[GR_SPROLE_LEN];
81134+ struct sprole_pw *sprole_pws;
81135+ dev_t segv_device;
81136+ ino_t segv_inode;
81137+ uid_t segv_uid;
81138+ __u16 num_sprole_pws;
81139+ __u16 mode;
81140+};
81141+
81142+struct gr_arg_wrapper {
81143+ struct gr_arg *arg;
81144+ __u32 version;
81145+ __u32 size;
81146+};
81147+
81148+struct subject_map {
81149+ struct acl_subject_label *user;
81150+ struct acl_subject_label *kernel;
81151+ struct subject_map *prev;
81152+ struct subject_map *next;
81153+};
81154+
81155+struct acl_subj_map_db {
81156+ struct subject_map **s_hash;
81157+ __u32 s_size;
81158+};
81159+
81160+struct gr_policy_state {
81161+ struct sprole_pw **acl_special_roles;
81162+ __u16 num_sprole_pws;
81163+ struct acl_role_label *kernel_role;
81164+ struct acl_role_label *role_list;
81165+ struct acl_role_label *default_role;
81166+ struct acl_role_db acl_role_set;
81167+ struct acl_subj_map_db subj_map_set;
81168+ struct name_db name_set;
81169+ struct inodev_db inodev_set;
81170+};
81171+
81172+struct gr_alloc_state {
81173+ unsigned long alloc_stack_next;
81174+ unsigned long alloc_stack_size;
81175+ void **alloc_stack;
81176+};
81177+
81178+struct gr_reload_state {
81179+ struct gr_policy_state oldpolicy;
81180+ struct gr_alloc_state oldalloc;
81181+ struct gr_policy_state newpolicy;
81182+ struct gr_alloc_state newalloc;
81183+ struct gr_policy_state *oldpolicy_ptr;
81184+ struct gr_alloc_state *oldalloc_ptr;
81185+ unsigned char oldmode;
81186+};
81187+
81188+/* End Data Structures Section */
81189+
81190+/* Hash functions generated by empirical testing by Brad Spengler
81191+ Makes good use of the low bits of the inode. Generally 0-1 times
81192+ in loop for successful match. 0-3 for unsuccessful match.
81193+ Shift/add algorithm with modulus of table size and an XOR*/
81194+
81195+static __inline__ unsigned int
81196+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
81197+{
81198+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
81199+}
81200+
81201+ static __inline__ unsigned int
81202+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
81203+{
81204+ return ((const unsigned long)userp % sz);
81205+}
81206+
81207+static __inline__ unsigned int
81208+gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
81209+{
81210+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
81211+}
81212+
81213+static __inline__ unsigned int
81214+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
81215+{
81216+ return full_name_hash((const unsigned char *)name, len) % sz;
81217+}
81218+
81219+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
81220+ subj = NULL; \
81221+ iter = 0; \
81222+ while (iter < role->subj_hash_size) { \
81223+ if (subj == NULL) \
81224+ subj = role->subj_hash[iter]; \
81225+ if (subj == NULL) { \
81226+ iter++; \
81227+ continue; \
81228+ }
81229+
81230+#define FOR_EACH_SUBJECT_END(subj,iter) \
81231+ subj = subj->next; \
81232+ if (subj == NULL) \
81233+ iter++; \
81234+ }
81235+
81236+
81237+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
81238+ subj = role->hash->first; \
81239+ while (subj != NULL) {
81240+
81241+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
81242+ subj = subj->next; \
81243+ }
81244+
81245+#endif
81246+
81247diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
81248new file mode 100644
81249index 0000000..33ebd1f
81250--- /dev/null
81251+++ b/include/linux/gracl_compat.h
81252@@ -0,0 +1,156 @@
81253+#ifndef GR_ACL_COMPAT_H
81254+#define GR_ACL_COMPAT_H
81255+
81256+#include <linux/resource.h>
81257+#include <asm/resource.h>
81258+
81259+struct sprole_pw_compat {
81260+ compat_uptr_t rolename;
81261+ unsigned char salt[GR_SALT_LEN];
81262+ unsigned char sum[GR_SHA_LEN];
81263+};
81264+
81265+struct gr_hash_struct_compat {
81266+ compat_uptr_t table;
81267+ compat_uptr_t nametable;
81268+ compat_uptr_t first;
81269+ __u32 table_size;
81270+ __u32 used_size;
81271+ int type;
81272+};
81273+
81274+struct acl_subject_label_compat {
81275+ compat_uptr_t filename;
81276+ compat_ino_t inode;
81277+ __u32 device;
81278+ __u32 mode;
81279+ kernel_cap_t cap_mask;
81280+ kernel_cap_t cap_lower;
81281+ kernel_cap_t cap_invert_audit;
81282+
81283+ struct compat_rlimit res[GR_NLIMITS];
81284+ __u32 resmask;
81285+
81286+ __u8 user_trans_type;
81287+ __u8 group_trans_type;
81288+ compat_uptr_t user_transitions;
81289+ compat_uptr_t group_transitions;
81290+ __u16 user_trans_num;
81291+ __u16 group_trans_num;
81292+
81293+ __u32 sock_families[2];
81294+ __u32 ip_proto[8];
81295+ __u32 ip_type;
81296+ compat_uptr_t ips;
81297+ __u32 ip_num;
81298+ __u32 inaddr_any_override;
81299+
81300+ __u32 crashes;
81301+ compat_ulong_t expires;
81302+
81303+ compat_uptr_t parent_subject;
81304+ compat_uptr_t hash;
81305+ compat_uptr_t prev;
81306+ compat_uptr_t next;
81307+
81308+ compat_uptr_t obj_hash;
81309+ __u32 obj_hash_size;
81310+ __u16 pax_flags;
81311+};
81312+
81313+struct role_allowed_ip_compat {
81314+ __u32 addr;
81315+ __u32 netmask;
81316+
81317+ compat_uptr_t prev;
81318+ compat_uptr_t next;
81319+};
81320+
81321+struct role_transition_compat {
81322+ compat_uptr_t rolename;
81323+
81324+ compat_uptr_t prev;
81325+ compat_uptr_t next;
81326+};
81327+
81328+struct acl_role_label_compat {
81329+ compat_uptr_t rolename;
81330+ uid_t uidgid;
81331+ __u16 roletype;
81332+
81333+ __u16 auth_attempts;
81334+ compat_ulong_t expires;
81335+
81336+ compat_uptr_t root_label;
81337+ compat_uptr_t hash;
81338+
81339+ compat_uptr_t prev;
81340+ compat_uptr_t next;
81341+
81342+ compat_uptr_t transitions;
81343+ compat_uptr_t allowed_ips;
81344+ compat_uptr_t domain_children;
81345+ __u16 domain_child_num;
81346+
81347+ umode_t umask;
81348+
81349+ compat_uptr_t subj_hash;
81350+ __u32 subj_hash_size;
81351+};
81352+
81353+struct user_acl_role_db_compat {
81354+ compat_uptr_t r_table;
81355+ __u32 num_pointers;
81356+ __u32 num_roles;
81357+ __u32 num_domain_children;
81358+ __u32 num_subjects;
81359+ __u32 num_objects;
81360+};
81361+
81362+struct acl_object_label_compat {
81363+ compat_uptr_t filename;
81364+ compat_ino_t inode;
81365+ __u32 device;
81366+ __u32 mode;
81367+
81368+ compat_uptr_t nested;
81369+ compat_uptr_t globbed;
81370+
81371+ compat_uptr_t prev;
81372+ compat_uptr_t next;
81373+};
81374+
81375+struct acl_ip_label_compat {
81376+ compat_uptr_t iface;
81377+ __u32 addr;
81378+ __u32 netmask;
81379+ __u16 low, high;
81380+ __u8 mode;
81381+ __u32 type;
81382+ __u32 proto[8];
81383+
81384+ compat_uptr_t prev;
81385+ compat_uptr_t next;
81386+};
81387+
81388+struct gr_arg_compat {
81389+ struct user_acl_role_db_compat role_db;
81390+ unsigned char pw[GR_PW_LEN];
81391+ unsigned char salt[GR_SALT_LEN];
81392+ unsigned char sum[GR_SHA_LEN];
81393+ unsigned char sp_role[GR_SPROLE_LEN];
81394+ compat_uptr_t sprole_pws;
81395+ __u32 segv_device;
81396+ compat_ino_t segv_inode;
81397+ uid_t segv_uid;
81398+ __u16 num_sprole_pws;
81399+ __u16 mode;
81400+};
81401+
81402+struct gr_arg_wrapper_compat {
81403+ compat_uptr_t arg;
81404+ __u32 version;
81405+ __u32 size;
81406+};
81407+
81408+#endif
81409diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
81410new file mode 100644
81411index 0000000..323ecf2
81412--- /dev/null
81413+++ b/include/linux/gralloc.h
81414@@ -0,0 +1,9 @@
81415+#ifndef __GRALLOC_H
81416+#define __GRALLOC_H
81417+
81418+void acl_free_all(void);
81419+int acl_alloc_stack_init(unsigned long size);
81420+void *acl_alloc(unsigned long len);
81421+void *acl_alloc_num(unsigned long num, unsigned long len);
81422+
81423+#endif
81424diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
81425new file mode 100644
81426index 0000000..be66033
81427--- /dev/null
81428+++ b/include/linux/grdefs.h
81429@@ -0,0 +1,140 @@
81430+#ifndef GRDEFS_H
81431+#define GRDEFS_H
81432+
81433+/* Begin grsecurity status declarations */
81434+
81435+enum {
81436+ GR_READY = 0x01,
81437+ GR_STATUS_INIT = 0x00 // disabled state
81438+};
81439+
81440+/* Begin ACL declarations */
81441+
81442+/* Role flags */
81443+
81444+enum {
81445+ GR_ROLE_USER = 0x0001,
81446+ GR_ROLE_GROUP = 0x0002,
81447+ GR_ROLE_DEFAULT = 0x0004,
81448+ GR_ROLE_SPECIAL = 0x0008,
81449+ GR_ROLE_AUTH = 0x0010,
81450+ GR_ROLE_NOPW = 0x0020,
81451+ GR_ROLE_GOD = 0x0040,
81452+ GR_ROLE_LEARN = 0x0080,
81453+ GR_ROLE_TPE = 0x0100,
81454+ GR_ROLE_DOMAIN = 0x0200,
81455+ GR_ROLE_PAM = 0x0400,
81456+ GR_ROLE_PERSIST = 0x0800
81457+};
81458+
81459+/* ACL Subject and Object mode flags */
81460+enum {
81461+ GR_DELETED = 0x80000000
81462+};
81463+
81464+/* ACL Object-only mode flags */
81465+enum {
81466+ GR_READ = 0x00000001,
81467+ GR_APPEND = 0x00000002,
81468+ GR_WRITE = 0x00000004,
81469+ GR_EXEC = 0x00000008,
81470+ GR_FIND = 0x00000010,
81471+ GR_INHERIT = 0x00000020,
81472+ GR_SETID = 0x00000040,
81473+ GR_CREATE = 0x00000080,
81474+ GR_DELETE = 0x00000100,
81475+ GR_LINK = 0x00000200,
81476+ GR_AUDIT_READ = 0x00000400,
81477+ GR_AUDIT_APPEND = 0x00000800,
81478+ GR_AUDIT_WRITE = 0x00001000,
81479+ GR_AUDIT_EXEC = 0x00002000,
81480+ GR_AUDIT_FIND = 0x00004000,
81481+ GR_AUDIT_INHERIT= 0x00008000,
81482+ GR_AUDIT_SETID = 0x00010000,
81483+ GR_AUDIT_CREATE = 0x00020000,
81484+ GR_AUDIT_DELETE = 0x00040000,
81485+ GR_AUDIT_LINK = 0x00080000,
81486+ GR_PTRACERD = 0x00100000,
81487+ GR_NOPTRACE = 0x00200000,
81488+ GR_SUPPRESS = 0x00400000,
81489+ GR_NOLEARN = 0x00800000,
81490+ GR_INIT_TRANSFER= 0x01000000
81491+};
81492+
81493+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
81494+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
81495+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
81496+
81497+/* ACL subject-only mode flags */
81498+enum {
81499+ GR_KILL = 0x00000001,
81500+ GR_VIEW = 0x00000002,
81501+ GR_PROTECTED = 0x00000004,
81502+ GR_LEARN = 0x00000008,
81503+ GR_OVERRIDE = 0x00000010,
81504+ /* just a placeholder, this mode is only used in userspace */
81505+ GR_DUMMY = 0x00000020,
81506+ GR_PROTSHM = 0x00000040,
81507+ GR_KILLPROC = 0x00000080,
81508+ GR_KILLIPPROC = 0x00000100,
81509+ /* just a placeholder, this mode is only used in userspace */
81510+ GR_NOTROJAN = 0x00000200,
81511+ GR_PROTPROCFD = 0x00000400,
81512+ GR_PROCACCT = 0x00000800,
81513+ GR_RELAXPTRACE = 0x00001000,
81514+ //GR_NESTED = 0x00002000,
81515+ GR_INHERITLEARN = 0x00004000,
81516+ GR_PROCFIND = 0x00008000,
81517+ GR_POVERRIDE = 0x00010000,
81518+ GR_KERNELAUTH = 0x00020000,
81519+ GR_ATSECURE = 0x00040000,
81520+ GR_SHMEXEC = 0x00080000
81521+};
81522+
81523+enum {
81524+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
81525+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
81526+ GR_PAX_ENABLE_MPROTECT = 0x0004,
81527+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
81528+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
81529+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
81530+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
81531+ GR_PAX_DISABLE_MPROTECT = 0x0400,
81532+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
81533+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
81534+};
81535+
81536+enum {
81537+ GR_ID_USER = 0x01,
81538+ GR_ID_GROUP = 0x02,
81539+};
81540+
81541+enum {
81542+ GR_ID_ALLOW = 0x01,
81543+ GR_ID_DENY = 0x02,
81544+};
81545+
81546+#define GR_CRASH_RES 31
81547+#define GR_UIDTABLE_MAX 500
81548+
81549+/* begin resource learning section */
81550+enum {
81551+ GR_RLIM_CPU_BUMP = 60,
81552+ GR_RLIM_FSIZE_BUMP = 50000,
81553+ GR_RLIM_DATA_BUMP = 10000,
81554+ GR_RLIM_STACK_BUMP = 1000,
81555+ GR_RLIM_CORE_BUMP = 10000,
81556+ GR_RLIM_RSS_BUMP = 500000,
81557+ GR_RLIM_NPROC_BUMP = 1,
81558+ GR_RLIM_NOFILE_BUMP = 5,
81559+ GR_RLIM_MEMLOCK_BUMP = 50000,
81560+ GR_RLIM_AS_BUMP = 500000,
81561+ GR_RLIM_LOCKS_BUMP = 2,
81562+ GR_RLIM_SIGPENDING_BUMP = 5,
81563+ GR_RLIM_MSGQUEUE_BUMP = 10000,
81564+ GR_RLIM_NICE_BUMP = 1,
81565+ GR_RLIM_RTPRIO_BUMP = 1,
81566+ GR_RLIM_RTTIME_BUMP = 1000000
81567+};
81568+
81569+#endif
81570diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
81571new file mode 100644
81572index 0000000..d25522e
81573--- /dev/null
81574+++ b/include/linux/grinternal.h
81575@@ -0,0 +1,229 @@
81576+#ifndef __GRINTERNAL_H
81577+#define __GRINTERNAL_H
81578+
81579+#ifdef CONFIG_GRKERNSEC
81580+
81581+#include <linux/fs.h>
81582+#include <linux/mnt_namespace.h>
81583+#include <linux/nsproxy.h>
81584+#include <linux/gracl.h>
81585+#include <linux/grdefs.h>
81586+#include <linux/grmsg.h>
81587+
81588+void gr_add_learn_entry(const char *fmt, ...)
81589+ __attribute__ ((format (printf, 1, 2)));
81590+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
81591+ const struct vfsmount *mnt);
81592+__u32 gr_check_create(const struct dentry *new_dentry,
81593+ const struct dentry *parent,
81594+ const struct vfsmount *mnt, const __u32 mode);
81595+int gr_check_protected_task(const struct task_struct *task);
81596+__u32 to_gr_audit(const __u32 reqmode);
81597+int gr_set_acls(const int type);
81598+int gr_acl_is_enabled(void);
81599+char gr_roletype_to_char(void);
81600+
81601+void gr_handle_alertkill(struct task_struct *task);
81602+char *gr_to_filename(const struct dentry *dentry,
81603+ const struct vfsmount *mnt);
81604+char *gr_to_filename1(const struct dentry *dentry,
81605+ const struct vfsmount *mnt);
81606+char *gr_to_filename2(const struct dentry *dentry,
81607+ const struct vfsmount *mnt);
81608+char *gr_to_filename3(const struct dentry *dentry,
81609+ const struct vfsmount *mnt);
81610+
81611+extern int grsec_enable_ptrace_readexec;
81612+extern int grsec_enable_harden_ptrace;
81613+extern int grsec_enable_link;
81614+extern int grsec_enable_fifo;
81615+extern int grsec_enable_execve;
81616+extern int grsec_enable_shm;
81617+extern int grsec_enable_execlog;
81618+extern int grsec_enable_signal;
81619+extern int grsec_enable_audit_ptrace;
81620+extern int grsec_enable_forkfail;
81621+extern int grsec_enable_time;
81622+extern int grsec_enable_rofs;
81623+extern int grsec_deny_new_usb;
81624+extern int grsec_enable_chroot_shmat;
81625+extern int grsec_enable_chroot_mount;
81626+extern int grsec_enable_chroot_double;
81627+extern int grsec_enable_chroot_pivot;
81628+extern int grsec_enable_chroot_chdir;
81629+extern int grsec_enable_chroot_chmod;
81630+extern int grsec_enable_chroot_mknod;
81631+extern int grsec_enable_chroot_fchdir;
81632+extern int grsec_enable_chroot_nice;
81633+extern int grsec_enable_chroot_execlog;
81634+extern int grsec_enable_chroot_caps;
81635+extern int grsec_enable_chroot_sysctl;
81636+extern int grsec_enable_chroot_unix;
81637+extern int grsec_enable_symlinkown;
81638+extern kgid_t grsec_symlinkown_gid;
81639+extern int grsec_enable_tpe;
81640+extern kgid_t grsec_tpe_gid;
81641+extern int grsec_enable_tpe_all;
81642+extern int grsec_enable_tpe_invert;
81643+extern int grsec_enable_socket_all;
81644+extern kgid_t grsec_socket_all_gid;
81645+extern int grsec_enable_socket_client;
81646+extern kgid_t grsec_socket_client_gid;
81647+extern int grsec_enable_socket_server;
81648+extern kgid_t grsec_socket_server_gid;
81649+extern kgid_t grsec_audit_gid;
81650+extern int grsec_enable_group;
81651+extern int grsec_enable_log_rwxmaps;
81652+extern int grsec_enable_mount;
81653+extern int grsec_enable_chdir;
81654+extern int grsec_resource_logging;
81655+extern int grsec_enable_blackhole;
81656+extern int grsec_lastack_retries;
81657+extern int grsec_enable_brute;
81658+extern int grsec_enable_harden_ipc;
81659+extern int grsec_lock;
81660+
81661+extern spinlock_t grsec_alert_lock;
81662+extern unsigned long grsec_alert_wtime;
81663+extern unsigned long grsec_alert_fyet;
81664+
81665+extern spinlock_t grsec_audit_lock;
81666+
81667+extern rwlock_t grsec_exec_file_lock;
81668+
81669+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
81670+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
81671+ (tsk)->exec_file->f_path.mnt) : "/")
81672+
81673+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
81674+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
81675+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
81676+
81677+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
81678+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
81679+ (tsk)->exec_file->f_path.mnt) : "/")
81680+
81681+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
81682+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
81683+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
81684+
81685+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
81686+
81687+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
81688+
81689+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
81690+{
81691+ if (file1 && file2) {
81692+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
81693+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
81694+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
81695+ return true;
81696+ }
81697+
81698+ return false;
81699+}
81700+
81701+#define GR_CHROOT_CAPS {{ \
81702+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
81703+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
81704+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
81705+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
81706+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
81707+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
81708+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
81709+
81710+#define security_learn(normal_msg,args...) \
81711+({ \
81712+ read_lock(&grsec_exec_file_lock); \
81713+ gr_add_learn_entry(normal_msg "\n", ## args); \
81714+ read_unlock(&grsec_exec_file_lock); \
81715+})
81716+
81717+enum {
81718+ GR_DO_AUDIT,
81719+ GR_DONT_AUDIT,
81720+ /* used for non-audit messages that we shouldn't kill the task on */
81721+ GR_DONT_AUDIT_GOOD
81722+};
81723+
81724+enum {
81725+ GR_TTYSNIFF,
81726+ GR_RBAC,
81727+ GR_RBAC_STR,
81728+ GR_STR_RBAC,
81729+ GR_RBAC_MODE2,
81730+ GR_RBAC_MODE3,
81731+ GR_FILENAME,
81732+ GR_SYSCTL_HIDDEN,
81733+ GR_NOARGS,
81734+ GR_ONE_INT,
81735+ GR_ONE_INT_TWO_STR,
81736+ GR_ONE_STR,
81737+ GR_STR_INT,
81738+ GR_TWO_STR_INT,
81739+ GR_TWO_INT,
81740+ GR_TWO_U64,
81741+ GR_THREE_INT,
81742+ GR_FIVE_INT_TWO_STR,
81743+ GR_TWO_STR,
81744+ GR_THREE_STR,
81745+ GR_FOUR_STR,
81746+ GR_STR_FILENAME,
81747+ GR_FILENAME_STR,
81748+ GR_FILENAME_TWO_INT,
81749+ GR_FILENAME_TWO_INT_STR,
81750+ GR_TEXTREL,
81751+ GR_PTRACE,
81752+ GR_RESOURCE,
81753+ GR_CAP,
81754+ GR_SIG,
81755+ GR_SIG2,
81756+ GR_CRASH1,
81757+ GR_CRASH2,
81758+ GR_PSACCT,
81759+ GR_RWXMAP,
81760+ GR_RWXMAPVMA
81761+};
81762+
81763+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
81764+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
81765+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
81766+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
81767+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
81768+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
81769+#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)
81770+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
81771+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
81772+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
81773+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
81774+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
81775+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
81776+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
81777+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
81778+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
81779+#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)
81780+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
81781+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
81782+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
81783+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
81784+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
81785+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
81786+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
81787+#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)
81788+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
81789+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
81790+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
81791+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
81792+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
81793+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
81794+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
81795+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
81796+#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)
81797+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
81798+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
81799+
81800+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
81801+
81802+#endif
81803+
81804+#endif
81805diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
81806new file mode 100644
81807index 0000000..b02ba9d
81808--- /dev/null
81809+++ b/include/linux/grmsg.h
81810@@ -0,0 +1,117 @@
81811+#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"
81812+#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"
81813+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
81814+#define GR_STOPMOD_MSG "denied modification of module state by "
81815+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
81816+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
81817+#define GR_IOPERM_MSG "denied use of ioperm() by "
81818+#define GR_IOPL_MSG "denied use of iopl() by "
81819+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
81820+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
81821+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
81822+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
81823+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
81824+#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"
81825+#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"
81826+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
81827+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
81828+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
81829+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
81830+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
81831+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
81832+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
81833+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
81834+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
81835+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
81836+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
81837+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
81838+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
81839+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
81840+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
81841+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
81842+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
81843+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
81844+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
81845+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
81846+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
81847+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
81848+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
81849+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
81850+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
81851+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
81852+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
81853+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
81854+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
81855+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
81856+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
81857+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
81858+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
81859+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
81860+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
81861+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
81862+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
81863+#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"
81864+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
81865+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
81866+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
81867+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
81868+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
81869+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
81870+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
81871+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
81872+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
81873+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
81874+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
81875+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
81876+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
81877+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
81878+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
81879+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
81880+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
81881+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
81882+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
81883+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
81884+#define GR_FAILFORK_MSG "failed fork with errno %s by "
81885+#define GR_NICE_CHROOT_MSG "denied priority change by "
81886+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
81887+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
81888+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
81889+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
81890+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
81891+#define GR_TIME_MSG "time set by "
81892+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
81893+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
81894+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
81895+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
81896+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
81897+#define GR_BIND_MSG "denied bind() by "
81898+#define GR_CONNECT_MSG "denied connect() by "
81899+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
81900+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
81901+#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"
81902+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
81903+#define GR_CAP_ACL_MSG "use of %s denied for "
81904+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
81905+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
81906+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
81907+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
81908+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
81909+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
81910+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
81911+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
81912+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
81913+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
81914+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
81915+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
81916+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
81917+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
81918+#define GR_VM86_MSG "denied use of vm86 by "
81919+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
81920+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
81921+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
81922+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
81923+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
81924+#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 "
81925+#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 "
81926+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
81927+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
81928diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
81929new file mode 100644
81930index 0000000..c3b0738
81931--- /dev/null
81932+++ b/include/linux/grsecurity.h
81933@@ -0,0 +1,244 @@
81934+#ifndef GR_SECURITY_H
81935+#define GR_SECURITY_H
81936+#include <linux/fs.h>
81937+#include <linux/fs_struct.h>
81938+#include <linux/binfmts.h>
81939+#include <linux/gracl.h>
81940+
81941+/* notify of brain-dead configs */
81942+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81943+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
81944+#endif
81945+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81946+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
81947+#endif
81948+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
81949+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
81950+#endif
81951+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
81952+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
81953+#endif
81954+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
81955+#error "CONFIG_PAX enabled, but no PaX options are enabled."
81956+#endif
81957+
81958+int gr_handle_new_usb(void);
81959+
81960+void gr_handle_brute_attach(int dumpable);
81961+void gr_handle_brute_check(void);
81962+void gr_handle_kernel_exploit(void);
81963+
81964+char gr_roletype_to_char(void);
81965+
81966+int gr_proc_is_restricted(void);
81967+
81968+int gr_acl_enable_at_secure(void);
81969+
81970+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
81971+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
81972+
81973+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
81974+
81975+void gr_del_task_from_ip_table(struct task_struct *p);
81976+
81977+int gr_pid_is_chrooted(struct task_struct *p);
81978+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
81979+int gr_handle_chroot_nice(void);
81980+int gr_handle_chroot_sysctl(const int op);
81981+int gr_handle_chroot_setpriority(struct task_struct *p,
81982+ const int niceval);
81983+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
81984+int gr_chroot_fhandle(void);
81985+int gr_handle_chroot_chroot(const struct dentry *dentry,
81986+ const struct vfsmount *mnt);
81987+void gr_handle_chroot_chdir(const struct path *path);
81988+int gr_handle_chroot_chmod(const struct dentry *dentry,
81989+ const struct vfsmount *mnt, const int mode);
81990+int gr_handle_chroot_mknod(const struct dentry *dentry,
81991+ const struct vfsmount *mnt, const int mode);
81992+int gr_handle_chroot_mount(const struct dentry *dentry,
81993+ const struct vfsmount *mnt,
81994+ const char *dev_name);
81995+int gr_handle_chroot_pivot(void);
81996+int gr_handle_chroot_unix(const pid_t pid);
81997+
81998+int gr_handle_rawio(const struct inode *inode);
81999+
82000+void gr_handle_ioperm(void);
82001+void gr_handle_iopl(void);
82002+void gr_handle_msr_write(void);
82003+
82004+umode_t gr_acl_umask(void);
82005+
82006+int gr_tpe_allow(const struct file *file);
82007+
82008+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
82009+void gr_clear_chroot_entries(struct task_struct *task);
82010+
82011+void gr_log_forkfail(const int retval);
82012+void gr_log_timechange(void);
82013+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
82014+void gr_log_chdir(const struct dentry *dentry,
82015+ const struct vfsmount *mnt);
82016+void gr_log_chroot_exec(const struct dentry *dentry,
82017+ const struct vfsmount *mnt);
82018+void gr_log_remount(const char *devname, const int retval);
82019+void gr_log_unmount(const char *devname, const int retval);
82020+void gr_log_mount(const char *from, struct path *to, const int retval);
82021+void gr_log_textrel(struct vm_area_struct *vma);
82022+void gr_log_ptgnustack(struct file *file);
82023+void gr_log_rwxmmap(struct file *file);
82024+void gr_log_rwxmprotect(struct vm_area_struct *vma);
82025+
82026+int gr_handle_follow_link(const struct inode *parent,
82027+ const struct inode *inode,
82028+ const struct dentry *dentry,
82029+ const struct vfsmount *mnt);
82030+int gr_handle_fifo(const struct dentry *dentry,
82031+ const struct vfsmount *mnt,
82032+ const struct dentry *dir, const int flag,
82033+ const int acc_mode);
82034+int gr_handle_hardlink(const struct dentry *dentry,
82035+ const struct vfsmount *mnt,
82036+ struct inode *inode,
82037+ const int mode, const struct filename *to);
82038+
82039+int gr_is_capable(const int cap);
82040+int gr_is_capable_nolog(const int cap);
82041+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
82042+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
82043+
82044+void gr_copy_label(struct task_struct *tsk);
82045+void gr_handle_crash(struct task_struct *task, const int sig);
82046+int gr_handle_signal(const struct task_struct *p, const int sig);
82047+int gr_check_crash_uid(const kuid_t uid);
82048+int gr_check_protected_task(const struct task_struct *task);
82049+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
82050+int gr_acl_handle_mmap(const struct file *file,
82051+ const unsigned long prot);
82052+int gr_acl_handle_mprotect(const struct file *file,
82053+ const unsigned long prot);
82054+int gr_check_hidden_task(const struct task_struct *tsk);
82055+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
82056+ const struct vfsmount *mnt);
82057+__u32 gr_acl_handle_utime(const struct dentry *dentry,
82058+ const struct vfsmount *mnt);
82059+__u32 gr_acl_handle_access(const struct dentry *dentry,
82060+ const struct vfsmount *mnt, const int fmode);
82061+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
82062+ const struct vfsmount *mnt, umode_t *mode);
82063+__u32 gr_acl_handle_chown(const struct dentry *dentry,
82064+ const struct vfsmount *mnt);
82065+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
82066+ const struct vfsmount *mnt);
82067+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
82068+ const struct vfsmount *mnt);
82069+int gr_handle_ptrace(struct task_struct *task, const long request);
82070+int gr_handle_proc_ptrace(struct task_struct *task);
82071+__u32 gr_acl_handle_execve(const struct dentry *dentry,
82072+ const struct vfsmount *mnt);
82073+int gr_check_crash_exec(const struct file *filp);
82074+int gr_acl_is_enabled(void);
82075+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
82076+ const kgid_t gid);
82077+int gr_set_proc_label(const struct dentry *dentry,
82078+ const struct vfsmount *mnt,
82079+ const int unsafe_flags);
82080+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
82081+ const struct vfsmount *mnt);
82082+__u32 gr_acl_handle_open(const struct dentry *dentry,
82083+ const struct vfsmount *mnt, int acc_mode);
82084+__u32 gr_acl_handle_creat(const struct dentry *dentry,
82085+ const struct dentry *p_dentry,
82086+ const struct vfsmount *p_mnt,
82087+ int open_flags, int acc_mode, const int imode);
82088+void gr_handle_create(const struct dentry *dentry,
82089+ const struct vfsmount *mnt);
82090+void gr_handle_proc_create(const struct dentry *dentry,
82091+ const struct inode *inode);
82092+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
82093+ const struct dentry *parent_dentry,
82094+ const struct vfsmount *parent_mnt,
82095+ const int mode);
82096+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
82097+ const struct dentry *parent_dentry,
82098+ const struct vfsmount *parent_mnt);
82099+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
82100+ const struct vfsmount *mnt);
82101+void gr_handle_delete(const ino_t ino, const dev_t dev);
82102+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
82103+ const struct vfsmount *mnt);
82104+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
82105+ const struct dentry *parent_dentry,
82106+ const struct vfsmount *parent_mnt,
82107+ const struct filename *from);
82108+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
82109+ const struct dentry *parent_dentry,
82110+ const struct vfsmount *parent_mnt,
82111+ const struct dentry *old_dentry,
82112+ const struct vfsmount *old_mnt, const struct filename *to);
82113+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
82114+int gr_acl_handle_rename(struct dentry *new_dentry,
82115+ struct dentry *parent_dentry,
82116+ const struct vfsmount *parent_mnt,
82117+ struct dentry *old_dentry,
82118+ struct inode *old_parent_inode,
82119+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
82120+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
82121+ struct dentry *old_dentry,
82122+ struct dentry *new_dentry,
82123+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
82124+__u32 gr_check_link(const struct dentry *new_dentry,
82125+ const struct dentry *parent_dentry,
82126+ const struct vfsmount *parent_mnt,
82127+ const struct dentry *old_dentry,
82128+ const struct vfsmount *old_mnt);
82129+int gr_acl_handle_filldir(const struct file *file, const char *name,
82130+ const unsigned int namelen, const ino_t ino);
82131+
82132+__u32 gr_acl_handle_unix(const struct dentry *dentry,
82133+ const struct vfsmount *mnt);
82134+void gr_acl_handle_exit(void);
82135+void gr_acl_handle_psacct(struct task_struct *task, const long code);
82136+int gr_acl_handle_procpidmem(const struct task_struct *task);
82137+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
82138+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
82139+void gr_audit_ptrace(struct task_struct *task);
82140+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
82141+void gr_put_exec_file(struct task_struct *task);
82142+
82143+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
82144+
82145+#ifdef CONFIG_GRKERNSEC_RESLOG
82146+extern void gr_log_resource(const struct task_struct *task, const int res,
82147+ const unsigned long wanted, const int gt);
82148+#else
82149+static inline void gr_log_resource(const struct task_struct *task, const int res,
82150+ const unsigned long wanted, const int gt)
82151+{
82152+}
82153+#endif
82154+
82155+#ifdef CONFIG_GRKERNSEC
82156+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
82157+void gr_handle_vm86(void);
82158+void gr_handle_mem_readwrite(u64 from, u64 to);
82159+
82160+void gr_log_badprocpid(const char *entry);
82161+
82162+extern int grsec_enable_dmesg;
82163+extern int grsec_disable_privio;
82164+
82165+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
82166+extern kgid_t grsec_proc_gid;
82167+#endif
82168+
82169+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
82170+extern int grsec_enable_chroot_findtask;
82171+#endif
82172+#ifdef CONFIG_GRKERNSEC_SETXID
82173+extern int grsec_enable_setxid;
82174+#endif
82175+#endif
82176+
82177+#endif
82178diff --git a/include/linux/grsock.h b/include/linux/grsock.h
82179new file mode 100644
82180index 0000000..e7ffaaf
82181--- /dev/null
82182+++ b/include/linux/grsock.h
82183@@ -0,0 +1,19 @@
82184+#ifndef __GRSOCK_H
82185+#define __GRSOCK_H
82186+
82187+extern void gr_attach_curr_ip(const struct sock *sk);
82188+extern int gr_handle_sock_all(const int family, const int type,
82189+ const int protocol);
82190+extern int gr_handle_sock_server(const struct sockaddr *sck);
82191+extern int gr_handle_sock_server_other(const struct sock *sck);
82192+extern int gr_handle_sock_client(const struct sockaddr *sck);
82193+extern int gr_search_connect(struct socket * sock,
82194+ struct sockaddr_in * addr);
82195+extern int gr_search_bind(struct socket * sock,
82196+ struct sockaddr_in * addr);
82197+extern int gr_search_listen(struct socket * sock);
82198+extern int gr_search_accept(struct socket * sock);
82199+extern int gr_search_socket(const int domain, const int type,
82200+ const int protocol);
82201+
82202+#endif
82203diff --git a/include/linux/hash.h b/include/linux/hash.h
82204index d0494c3..69b7715 100644
82205--- a/include/linux/hash.h
82206+++ b/include/linux/hash.h
82207@@ -87,7 +87,7 @@ static inline u32 hash32_ptr(const void *ptr)
82208 struct fast_hash_ops {
82209 u32 (*hash)(const void *data, u32 len, u32 seed);
82210 u32 (*hash2)(const u32 *data, u32 len, u32 seed);
82211-};
82212+} __no_const;
82213
82214 /**
82215 * arch_fast_hash - Caclulates a hash over a given buffer that can have
82216diff --git a/include/linux/highmem.h b/include/linux/highmem.h
82217index 9286a46..373f27f 100644
82218--- a/include/linux/highmem.h
82219+++ b/include/linux/highmem.h
82220@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
82221 kunmap_atomic(kaddr);
82222 }
82223
82224+static inline void sanitize_highpage(struct page *page)
82225+{
82226+ void *kaddr;
82227+ unsigned long flags;
82228+
82229+ local_irq_save(flags);
82230+ kaddr = kmap_atomic(page);
82231+ clear_page(kaddr);
82232+ kunmap_atomic(kaddr);
82233+ local_irq_restore(flags);
82234+}
82235+
82236 static inline void zero_user_segments(struct page *page,
82237 unsigned start1, unsigned end1,
82238 unsigned start2, unsigned end2)
82239diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
82240index 1c7b89a..7dda400 100644
82241--- a/include/linux/hwmon-sysfs.h
82242+++ b/include/linux/hwmon-sysfs.h
82243@@ -25,7 +25,8 @@
82244 struct sensor_device_attribute{
82245 struct device_attribute dev_attr;
82246 int index;
82247-};
82248+} __do_const;
82249+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
82250 #define to_sensor_dev_attr(_dev_attr) \
82251 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
82252
82253@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
82254 struct device_attribute dev_attr;
82255 u8 index;
82256 u8 nr;
82257-};
82258+} __do_const;
82259+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
82260 #define to_sensor_dev_attr_2(_dev_attr) \
82261 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
82262
82263diff --git a/include/linux/i2c.h b/include/linux/i2c.h
82264index b556e0a..c10a515 100644
82265--- a/include/linux/i2c.h
82266+++ b/include/linux/i2c.h
82267@@ -378,6 +378,7 @@ struct i2c_algorithm {
82268 /* To determine what the adapter supports */
82269 u32 (*functionality) (struct i2c_adapter *);
82270 };
82271+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
82272
82273 /**
82274 * struct i2c_bus_recovery_info - I2C bus recovery information
82275diff --git a/include/linux/i2o.h b/include/linux/i2o.h
82276index d23c3c2..eb63c81 100644
82277--- a/include/linux/i2o.h
82278+++ b/include/linux/i2o.h
82279@@ -565,7 +565,7 @@ struct i2o_controller {
82280 struct i2o_device *exec; /* Executive */
82281 #if BITS_PER_LONG == 64
82282 spinlock_t context_list_lock; /* lock for context_list */
82283- atomic_t context_list_counter; /* needed for unique contexts */
82284+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
82285 struct list_head context_list; /* list of context id's
82286 and pointers */
82287 #endif
82288diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
82289index aff7ad8..3942bbd 100644
82290--- a/include/linux/if_pppox.h
82291+++ b/include/linux/if_pppox.h
82292@@ -76,7 +76,7 @@ struct pppox_proto {
82293 int (*ioctl)(struct socket *sock, unsigned int cmd,
82294 unsigned long arg);
82295 struct module *owner;
82296-};
82297+} __do_const;
82298
82299 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
82300 extern void unregister_pppox_proto(int proto_num);
82301diff --git a/include/linux/init.h b/include/linux/init.h
82302index 2df8e8d..3e1280d 100644
82303--- a/include/linux/init.h
82304+++ b/include/linux/init.h
82305@@ -37,9 +37,17 @@
82306 * section.
82307 */
82308
82309+#define add_init_latent_entropy __latent_entropy
82310+
82311+#ifdef CONFIG_MEMORY_HOTPLUG
82312+#define add_meminit_latent_entropy
82313+#else
82314+#define add_meminit_latent_entropy __latent_entropy
82315+#endif
82316+
82317 /* These are for everybody (although not all archs will actually
82318 discard it in modules) */
82319-#define __init __section(.init.text) __cold notrace
82320+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
82321 #define __initdata __section(.init.data)
82322 #define __initconst __constsection(.init.rodata)
82323 #define __exitdata __section(.exit.data)
82324@@ -100,7 +108,7 @@
82325 #define __cpuexitconst
82326
82327 /* Used for MEMORY_HOTPLUG */
82328-#define __meminit __section(.meminit.text) __cold notrace
82329+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
82330 #define __meminitdata __section(.meminit.data)
82331 #define __meminitconst __constsection(.meminit.rodata)
82332 #define __memexit __section(.memexit.text) __exitused __cold notrace
82333diff --git a/include/linux/init_task.h b/include/linux/init_task.h
82334index 77fc43f..73caf92 100644
82335--- a/include/linux/init_task.h
82336+++ b/include/linux/init_task.h
82337@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
82338
82339 #define INIT_TASK_COMM "swapper"
82340
82341+#ifdef CONFIG_X86
82342+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
82343+#else
82344+#define INIT_TASK_THREAD_INFO
82345+#endif
82346+
82347 #ifdef CONFIG_RT_MUTEXES
82348 # define INIT_RT_MUTEXES(tsk) \
82349 .pi_waiters = RB_ROOT, \
82350@@ -205,6 +211,7 @@ extern struct task_group root_task_group;
82351 RCU_POINTER_INITIALIZER(cred, &init_cred), \
82352 .comm = INIT_TASK_COMM, \
82353 .thread = INIT_THREAD, \
82354+ INIT_TASK_THREAD_INFO \
82355 .fs = &init_fs, \
82356 .files = &init_files, \
82357 .signal = &init_signals, \
82358diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
82359index 69517a2..6b12d37 100644
82360--- a/include/linux/interrupt.h
82361+++ b/include/linux/interrupt.h
82362@@ -413,8 +413,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
82363
82364 struct softirq_action
82365 {
82366- void (*action)(struct softirq_action *);
82367-};
82368+ void (*action)(void);
82369+} __no_const;
82370
82371 asmlinkage void do_softirq(void);
82372 asmlinkage void __do_softirq(void);
82373@@ -428,7 +428,7 @@ static inline void do_softirq_own_stack(void)
82374 }
82375 #endif
82376
82377-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
82378+extern void open_softirq(int nr, void (*action)(void));
82379 extern void softirq_init(void);
82380 extern void __raise_softirq_irqoff(unsigned int nr);
82381
82382diff --git a/include/linux/iommu.h b/include/linux/iommu.h
82383index e6a7c9f..5804745 100644
82384--- a/include/linux/iommu.h
82385+++ b/include/linux/iommu.h
82386@@ -133,7 +133,7 @@ struct iommu_ops {
82387 u32 (*domain_get_windows)(struct iommu_domain *domain);
82388
82389 unsigned long pgsize_bitmap;
82390-};
82391+} __do_const;
82392
82393 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
82394 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
82395diff --git a/include/linux/ioport.h b/include/linux/ioport.h
82396index 2c525022..345b106 100644
82397--- a/include/linux/ioport.h
82398+++ b/include/linux/ioport.h
82399@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
82400 int adjust_resource(struct resource *res, resource_size_t start,
82401 resource_size_t size);
82402 resource_size_t resource_alignment(struct resource *res);
82403-static inline resource_size_t resource_size(const struct resource *res)
82404+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
82405 {
82406 return res->end - res->start + 1;
82407 }
82408diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
82409index 35e7eca..6afb7ad 100644
82410--- a/include/linux/ipc_namespace.h
82411+++ b/include/linux/ipc_namespace.h
82412@@ -69,7 +69,7 @@ struct ipc_namespace {
82413 struct user_namespace *user_ns;
82414
82415 unsigned int proc_inum;
82416-};
82417+} __randomize_layout;
82418
82419 extern struct ipc_namespace init_ipc_ns;
82420 extern atomic_t nr_ipc_ns;
82421diff --git a/include/linux/irq.h b/include/linux/irq.h
82422index 03f48d9..e86af0c 100644
82423--- a/include/linux/irq.h
82424+++ b/include/linux/irq.h
82425@@ -352,7 +352,8 @@ struct irq_chip {
82426 void (*irq_release_resources)(struct irq_data *data);
82427
82428 unsigned long flags;
82429-};
82430+} __do_const;
82431+typedef struct irq_chip __no_const irq_chip_no_const;
82432
82433 /*
82434 * irq_chip specific flags
82435diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
82436index 13eed92..3261c86 100644
82437--- a/include/linux/irqchip/arm-gic.h
82438+++ b/include/linux/irqchip/arm-gic.h
82439@@ -91,9 +91,11 @@
82440
82441 #ifndef __ASSEMBLY__
82442
82443+#include <linux/irq.h>
82444+
82445 struct device_node;
82446
82447-extern struct irq_chip gic_arch_extn;
82448+extern irq_chip_no_const gic_arch_extn;
82449
82450 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
82451 u32 offset, struct device_node *);
82452diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
82453index c367cbd..c9b79e6 100644
82454--- a/include/linux/jiffies.h
82455+++ b/include/linux/jiffies.h
82456@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
82457 /*
82458 * Convert various time units to each other:
82459 */
82460-extern unsigned int jiffies_to_msecs(const unsigned long j);
82461-extern unsigned int jiffies_to_usecs(const unsigned long j);
82462+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
82463+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
82464
82465-static inline u64 jiffies_to_nsecs(const unsigned long j)
82466+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
82467 {
82468 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
82469 }
82470
82471-extern unsigned long msecs_to_jiffies(const unsigned int m);
82472-extern unsigned long usecs_to_jiffies(const unsigned int u);
82473+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
82474+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
82475 extern unsigned long timespec_to_jiffies(const struct timespec *value);
82476 extern void jiffies_to_timespec(const unsigned long jiffies,
82477- struct timespec *value);
82478-extern unsigned long timeval_to_jiffies(const struct timeval *value);
82479+ struct timespec *value) __intentional_overflow(-1);
82480+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
82481 extern void jiffies_to_timeval(const unsigned long jiffies,
82482 struct timeval *value);
82483
82484diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
82485index 6883e19..e854fcb 100644
82486--- a/include/linux/kallsyms.h
82487+++ b/include/linux/kallsyms.h
82488@@ -15,7 +15,8 @@
82489
82490 struct module;
82491
82492-#ifdef CONFIG_KALLSYMS
82493+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
82494+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
82495 /* Lookup the address for a symbol. Returns 0 if not found. */
82496 unsigned long kallsyms_lookup_name(const char *name);
82497
82498@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
82499 /* Stupid that this does nothing, but I didn't create this mess. */
82500 #define __print_symbol(fmt, addr)
82501 #endif /*CONFIG_KALLSYMS*/
82502+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
82503+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
82504+extern unsigned long kallsyms_lookup_name(const char *name);
82505+extern void __print_symbol(const char *fmt, unsigned long address);
82506+extern int sprint_backtrace(char *buffer, unsigned long address);
82507+extern int sprint_symbol(char *buffer, unsigned long address);
82508+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
82509+const char *kallsyms_lookup(unsigned long addr,
82510+ unsigned long *symbolsize,
82511+ unsigned long *offset,
82512+ char **modname, char *namebuf);
82513+extern int kallsyms_lookup_size_offset(unsigned long addr,
82514+ unsigned long *symbolsize,
82515+ unsigned long *offset);
82516+#endif
82517
82518 /* This macro allows us to keep printk typechecking */
82519 static __printf(1, 2)
82520diff --git a/include/linux/key-type.h b/include/linux/key-type.h
82521index ff9f1d3..6712be5 100644
82522--- a/include/linux/key-type.h
82523+++ b/include/linux/key-type.h
82524@@ -152,7 +152,7 @@ struct key_type {
82525 /* internal fields */
82526 struct list_head link; /* link in types list */
82527 struct lock_class_key lock_class; /* key->sem lock class */
82528-};
82529+} __do_const;
82530
82531 extern struct key_type key_type_keyring;
82532
82533diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
82534index e465bb1..19f605f 100644
82535--- a/include/linux/kgdb.h
82536+++ b/include/linux/kgdb.h
82537@@ -52,7 +52,7 @@ extern int kgdb_connected;
82538 extern int kgdb_io_module_registered;
82539
82540 extern atomic_t kgdb_setting_breakpoint;
82541-extern atomic_t kgdb_cpu_doing_single_step;
82542+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
82543
82544 extern struct task_struct *kgdb_usethread;
82545 extern struct task_struct *kgdb_contthread;
82546@@ -254,7 +254,7 @@ struct kgdb_arch {
82547 void (*correct_hw_break)(void);
82548
82549 void (*enable_nmi)(bool on);
82550-};
82551+} __do_const;
82552
82553 /**
82554 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
82555@@ -279,7 +279,7 @@ struct kgdb_io {
82556 void (*pre_exception) (void);
82557 void (*post_exception) (void);
82558 int is_console;
82559-};
82560+} __do_const;
82561
82562 extern struct kgdb_arch arch_kgdb_ops;
82563
82564diff --git a/include/linux/kmod.h b/include/linux/kmod.h
82565index 0555cc6..40116ce 100644
82566--- a/include/linux/kmod.h
82567+++ b/include/linux/kmod.h
82568@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
82569 * usually useless though. */
82570 extern __printf(2, 3)
82571 int __request_module(bool wait, const char *name, ...);
82572+extern __printf(3, 4)
82573+int ___request_module(bool wait, char *param_name, const char *name, ...);
82574 #define request_module(mod...) __request_module(true, mod)
82575 #define request_module_nowait(mod...) __request_module(false, mod)
82576 #define try_then_request_module(x, mod...) \
82577@@ -57,6 +59,9 @@ struct subprocess_info {
82578 struct work_struct work;
82579 struct completion *complete;
82580 char *path;
82581+#ifdef CONFIG_GRKERNSEC
82582+ char *origpath;
82583+#endif
82584 char **argv;
82585 char **envp;
82586 int wait;
82587diff --git a/include/linux/kobject.h b/include/linux/kobject.h
82588index 2d61b90..a1d0a13 100644
82589--- a/include/linux/kobject.h
82590+++ b/include/linux/kobject.h
82591@@ -118,7 +118,7 @@ struct kobj_type {
82592 struct attribute **default_attrs;
82593 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
82594 const void *(*namespace)(struct kobject *kobj);
82595-};
82596+} __do_const;
82597
82598 struct kobj_uevent_env {
82599 char *argv[3];
82600@@ -142,6 +142,7 @@ struct kobj_attribute {
82601 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
82602 const char *buf, size_t count);
82603 };
82604+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
82605
82606 extern const struct sysfs_ops kobj_sysfs_ops;
82607
82608@@ -169,7 +170,7 @@ struct kset {
82609 spinlock_t list_lock;
82610 struct kobject kobj;
82611 const struct kset_uevent_ops *uevent_ops;
82612-};
82613+} __randomize_layout;
82614
82615 extern void kset_init(struct kset *kset);
82616 extern int __must_check kset_register(struct kset *kset);
82617diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
82618index df32d25..fb52e27 100644
82619--- a/include/linux/kobject_ns.h
82620+++ b/include/linux/kobject_ns.h
82621@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
82622 const void *(*netlink_ns)(struct sock *sk);
82623 const void *(*initial_ns)(void);
82624 void (*drop_ns)(void *);
82625-};
82626+} __do_const;
82627
82628 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
82629 int kobj_ns_type_registered(enum kobj_ns_type type);
82630diff --git a/include/linux/kref.h b/include/linux/kref.h
82631index 484604d..0f6c5b6 100644
82632--- a/include/linux/kref.h
82633+++ b/include/linux/kref.h
82634@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
82635 static inline int kref_sub(struct kref *kref, unsigned int count,
82636 void (*release)(struct kref *kref))
82637 {
82638- WARN_ON(release == NULL);
82639+ BUG_ON(release == NULL);
82640
82641 if (atomic_sub_and_test((int) count, &kref->refcount)) {
82642 release(kref);
82643diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
82644index a6059bd..8126d5c 100644
82645--- a/include/linux/kvm_host.h
82646+++ b/include/linux/kvm_host.h
82647@@ -460,7 +460,7 @@ static inline void kvm_irqfd_exit(void)
82648 {
82649 }
82650 #endif
82651-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
82652+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
82653 struct module *module);
82654 void kvm_exit(void);
82655
82656@@ -629,7 +629,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
82657 struct kvm_guest_debug *dbg);
82658 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
82659
82660-int kvm_arch_init(void *opaque);
82661+int kvm_arch_init(const void *opaque);
82662 void kvm_arch_exit(void);
82663
82664 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
82665diff --git a/include/linux/libata.h b/include/linux/libata.h
82666index bd5fefe..2a8a8d2 100644
82667--- a/include/linux/libata.h
82668+++ b/include/linux/libata.h
82669@@ -976,7 +976,7 @@ struct ata_port_operations {
82670 * fields must be pointers.
82671 */
82672 const struct ata_port_operations *inherits;
82673-};
82674+} __do_const;
82675
82676 struct ata_port_info {
82677 unsigned long flags;
82678diff --git a/include/linux/linkage.h b/include/linux/linkage.h
82679index a6a42dd..6c5ebce 100644
82680--- a/include/linux/linkage.h
82681+++ b/include/linux/linkage.h
82682@@ -36,6 +36,7 @@
82683 #endif
82684
82685 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
82686+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
82687 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
82688
82689 /*
82690diff --git a/include/linux/list.h b/include/linux/list.h
82691index f33f831..1ffe5e2 100644
82692--- a/include/linux/list.h
82693+++ b/include/linux/list.h
82694@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
82695 extern void list_del(struct list_head *entry);
82696 #endif
82697
82698+extern void __pax_list_add(struct list_head *new,
82699+ struct list_head *prev,
82700+ struct list_head *next);
82701+static inline void pax_list_add(struct list_head *new, struct list_head *head)
82702+{
82703+ __pax_list_add(new, head, head->next);
82704+}
82705+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
82706+{
82707+ __pax_list_add(new, head->prev, head);
82708+}
82709+extern void pax_list_del(struct list_head *entry);
82710+
82711 /**
82712 * list_replace - replace old entry by new one
82713 * @old : the element to be replaced
82714@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
82715 INIT_LIST_HEAD(entry);
82716 }
82717
82718+extern void pax_list_del_init(struct list_head *entry);
82719+
82720 /**
82721 * list_move - delete from one list and add as another's head
82722 * @list: the entry to move
82723diff --git a/include/linux/lockref.h b/include/linux/lockref.h
82724index 4bfde0e..d6e2e09 100644
82725--- a/include/linux/lockref.h
82726+++ b/include/linux/lockref.h
82727@@ -47,4 +47,36 @@ static inline int __lockref_is_dead(const struct lockref *l)
82728 return ((int)l->count < 0);
82729 }
82730
82731+static inline unsigned int __lockref_read(struct lockref *lockref)
82732+{
82733+ return lockref->count;
82734+}
82735+
82736+static inline void __lockref_set(struct lockref *lockref, unsigned int count)
82737+{
82738+ lockref->count = count;
82739+}
82740+
82741+static inline void __lockref_inc(struct lockref *lockref)
82742+{
82743+
82744+#ifdef CONFIG_PAX_REFCOUNT
82745+ atomic_inc((atomic_t *)&lockref->count);
82746+#else
82747+ lockref->count++;
82748+#endif
82749+
82750+}
82751+
82752+static inline void __lockref_dec(struct lockref *lockref)
82753+{
82754+
82755+#ifdef CONFIG_PAX_REFCOUNT
82756+ atomic_dec((atomic_t *)&lockref->count);
82757+#else
82758+ lockref->count--;
82759+#endif
82760+
82761+}
82762+
82763 #endif /* __LINUX_LOCKREF_H */
82764diff --git a/include/linux/math64.h b/include/linux/math64.h
82765index c45c089..298841c 100644
82766--- a/include/linux/math64.h
82767+++ b/include/linux/math64.h
82768@@ -15,7 +15,7 @@
82769 * This is commonly provided by 32bit archs to provide an optimized 64bit
82770 * divide.
82771 */
82772-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82773+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82774 {
82775 *remainder = dividend % divisor;
82776 return dividend / divisor;
82777@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
82778 /**
82779 * div64_u64 - unsigned 64bit divide with 64bit divisor
82780 */
82781-static inline u64 div64_u64(u64 dividend, u64 divisor)
82782+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
82783 {
82784 return dividend / divisor;
82785 }
82786@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
82787 #define div64_ul(x, y) div_u64((x), (y))
82788
82789 #ifndef div_u64_rem
82790-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82791+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82792 {
82793 *remainder = do_div(dividend, divisor);
82794 return dividend;
82795@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
82796 #endif
82797
82798 #ifndef div64_u64
82799-extern u64 div64_u64(u64 dividend, u64 divisor);
82800+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
82801 #endif
82802
82803 #ifndef div64_s64
82804@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
82805 * divide.
82806 */
82807 #ifndef div_u64
82808-static inline u64 div_u64(u64 dividend, u32 divisor)
82809+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
82810 {
82811 u32 remainder;
82812 return div_u64_rem(dividend, divisor, &remainder);
82813diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
82814index 3d385c8..deacb6a 100644
82815--- a/include/linux/mempolicy.h
82816+++ b/include/linux/mempolicy.h
82817@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
82818 }
82819
82820 #define vma_policy(vma) ((vma)->vm_policy)
82821+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
82822+{
82823+ vma->vm_policy = pol;
82824+}
82825
82826 static inline void mpol_get(struct mempolicy *pol)
82827 {
82828@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
82829 }
82830
82831 #define vma_policy(vma) NULL
82832+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
82833+{
82834+}
82835
82836 static inline int
82837 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
82838diff --git a/include/linux/mm.h b/include/linux/mm.h
82839index b464611..77cbfc1 100644
82840--- a/include/linux/mm.h
82841+++ b/include/linux/mm.h
82842@@ -128,6 +128,11 @@ extern unsigned int kobjsize(const void *objp);
82843 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
82844 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
82845 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
82846+
82847+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
82848+#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
82849+#endif
82850+
82851 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
82852
82853 #ifdef CONFIG_MEM_SOFT_DIRTY
82854@@ -238,8 +243,8 @@ struct vm_operations_struct {
82855 /* called by access_process_vm when get_user_pages() fails, typically
82856 * for use by special VMAs that can switch between memory and hardware
82857 */
82858- int (*access)(struct vm_area_struct *vma, unsigned long addr,
82859- void *buf, int len, int write);
82860+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
82861+ void *buf, size_t len, int write);
82862
82863 /* Called by the /proc/PID/maps code to ask the vma whether it
82864 * has a special name. Returning non-NULL will also cause this
82865@@ -275,6 +280,7 @@ struct vm_operations_struct {
82866 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
82867 unsigned long size, pgoff_t pgoff);
82868 };
82869+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
82870
82871 struct mmu_gather;
82872 struct inode;
82873@@ -1165,8 +1171,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
82874 unsigned long *pfn);
82875 int follow_phys(struct vm_area_struct *vma, unsigned long address,
82876 unsigned int flags, unsigned long *prot, resource_size_t *phys);
82877-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
82878- void *buf, int len, int write);
82879+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
82880+ void *buf, size_t len, int write);
82881
82882 static inline void unmap_shared_mapping_range(struct address_space *mapping,
82883 loff_t const holebegin, loff_t const holelen)
82884@@ -1206,9 +1212,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
82885 }
82886 #endif
82887
82888-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
82889-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
82890- void *buf, int len, int write);
82891+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
82892+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
82893+ void *buf, size_t len, int write);
82894
82895 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
82896 unsigned long start, unsigned long nr_pages,
82897@@ -1240,34 +1246,6 @@ int set_page_dirty_lock(struct page *page);
82898 int clear_page_dirty_for_io(struct page *page);
82899 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
82900
82901-/* Is the vma a continuation of the stack vma above it? */
82902-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
82903-{
82904- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
82905-}
82906-
82907-static inline int stack_guard_page_start(struct vm_area_struct *vma,
82908- unsigned long addr)
82909-{
82910- return (vma->vm_flags & VM_GROWSDOWN) &&
82911- (vma->vm_start == addr) &&
82912- !vma_growsdown(vma->vm_prev, addr);
82913-}
82914-
82915-/* Is the vma a continuation of the stack vma below it? */
82916-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
82917-{
82918- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
82919-}
82920-
82921-static inline int stack_guard_page_end(struct vm_area_struct *vma,
82922- unsigned long addr)
82923-{
82924- return (vma->vm_flags & VM_GROWSUP) &&
82925- (vma->vm_end == addr) &&
82926- !vma_growsup(vma->vm_next, addr);
82927-}
82928-
82929 extern struct task_struct *task_of_stack(struct task_struct *task,
82930 struct vm_area_struct *vma, bool in_group);
82931
82932@@ -1385,8 +1363,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
82933 {
82934 return 0;
82935 }
82936+
82937+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
82938+ unsigned long address)
82939+{
82940+ return 0;
82941+}
82942 #else
82943 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
82944+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
82945 #endif
82946
82947 #ifdef __PAGETABLE_PMD_FOLDED
82948@@ -1395,8 +1380,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
82949 {
82950 return 0;
82951 }
82952+
82953+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
82954+ unsigned long address)
82955+{
82956+ return 0;
82957+}
82958 #else
82959 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
82960+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
82961 #endif
82962
82963 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
82964@@ -1414,11 +1406,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
82965 NULL: pud_offset(pgd, address);
82966 }
82967
82968+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
82969+{
82970+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
82971+ NULL: pud_offset(pgd, address);
82972+}
82973+
82974 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
82975 {
82976 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
82977 NULL: pmd_offset(pud, address);
82978 }
82979+
82980+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
82981+{
82982+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
82983+ NULL: pmd_offset(pud, address);
82984+}
82985 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
82986
82987 #if USE_SPLIT_PTE_PTLOCKS
82988@@ -1801,12 +1805,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
82989 bool *need_rmap_locks);
82990 extern void exit_mmap(struct mm_struct *);
82991
82992+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
82993+extern void gr_learn_resource(const struct task_struct *task, const int res,
82994+ const unsigned long wanted, const int gt);
82995+#else
82996+static inline void gr_learn_resource(const struct task_struct *task, const int res,
82997+ const unsigned long wanted, const int gt)
82998+{
82999+}
83000+#endif
83001+
83002 static inline int check_data_rlimit(unsigned long rlim,
83003 unsigned long new,
83004 unsigned long start,
83005 unsigned long end_data,
83006 unsigned long start_data)
83007 {
83008+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
83009 if (rlim < RLIM_INFINITY) {
83010 if (((new - start) + (end_data - start_data)) > rlim)
83011 return -ENOSPC;
83012@@ -1831,7 +1846,7 @@ extern int install_special_mapping(struct mm_struct *mm,
83013 unsigned long addr, unsigned long len,
83014 unsigned long flags, struct page **pages);
83015
83016-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
83017+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
83018
83019 extern unsigned long mmap_region(struct file *file, unsigned long addr,
83020 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
83021@@ -1839,6 +1854,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
83022 unsigned long len, unsigned long prot, unsigned long flags,
83023 unsigned long pgoff, unsigned long *populate);
83024 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
83025+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
83026
83027 #ifdef CONFIG_MMU
83028 extern int __mm_populate(unsigned long addr, unsigned long len,
83029@@ -1867,10 +1883,11 @@ struct vm_unmapped_area_info {
83030 unsigned long high_limit;
83031 unsigned long align_mask;
83032 unsigned long align_offset;
83033+ unsigned long threadstack_offset;
83034 };
83035
83036-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
83037-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
83038+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
83039+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
83040
83041 /*
83042 * Search for an unmapped address range.
83043@@ -1882,7 +1899,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
83044 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
83045 */
83046 static inline unsigned long
83047-vm_unmapped_area(struct vm_unmapped_area_info *info)
83048+vm_unmapped_area(const struct vm_unmapped_area_info *info)
83049 {
83050 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
83051 return unmapped_area(info);
83052@@ -1944,6 +1961,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
83053 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
83054 struct vm_area_struct **pprev);
83055
83056+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
83057+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
83058+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
83059+
83060 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
83061 NULL if none. Assume start_addr < end_addr. */
83062 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
83063@@ -1973,10 +1994,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
83064 }
83065
83066 #ifdef CONFIG_MMU
83067-pgprot_t vm_get_page_prot(unsigned long vm_flags);
83068+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
83069 void vma_set_page_prot(struct vm_area_struct *vma);
83070 #else
83071-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
83072+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
83073 {
83074 return __pgprot(0);
83075 }
83076@@ -2038,6 +2059,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
83077 static inline void vm_stat_account(struct mm_struct *mm,
83078 unsigned long flags, struct file *file, long pages)
83079 {
83080+
83081+#ifdef CONFIG_PAX_RANDMMAP
83082+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
83083+#endif
83084+
83085 mm->total_vm += pages;
83086 }
83087 #endif /* CONFIG_PROC_FS */
83088@@ -2126,7 +2152,7 @@ extern int unpoison_memory(unsigned long pfn);
83089 extern int sysctl_memory_failure_early_kill;
83090 extern int sysctl_memory_failure_recovery;
83091 extern void shake_page(struct page *p, int access);
83092-extern atomic_long_t num_poisoned_pages;
83093+extern atomic_long_unchecked_t num_poisoned_pages;
83094 extern int soft_offline_page(struct page *page, int flags);
83095
83096 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
83097@@ -2161,5 +2187,11 @@ void __init setup_nr_node_ids(void);
83098 static inline void setup_nr_node_ids(void) {}
83099 #endif
83100
83101+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
83102+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
83103+#else
83104+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
83105+#endif
83106+
83107 #endif /* __KERNEL__ */
83108 #endif /* _LINUX_MM_H */
83109diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
83110index 6e0b286..90d9c0d 100644
83111--- a/include/linux/mm_types.h
83112+++ b/include/linux/mm_types.h
83113@@ -308,7 +308,9 @@ struct vm_area_struct {
83114 #ifdef CONFIG_NUMA
83115 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
83116 #endif
83117-};
83118+
83119+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
83120+} __randomize_layout;
83121
83122 struct core_thread {
83123 struct task_struct *task;
83124@@ -454,7 +456,25 @@ struct mm_struct {
83125 bool tlb_flush_pending;
83126 #endif
83127 struct uprobes_state uprobes_state;
83128-};
83129+
83130+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
83131+ unsigned long pax_flags;
83132+#endif
83133+
83134+#ifdef CONFIG_PAX_DLRESOLVE
83135+ unsigned long call_dl_resolve;
83136+#endif
83137+
83138+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
83139+ unsigned long call_syscall;
83140+#endif
83141+
83142+#ifdef CONFIG_PAX_ASLR
83143+ unsigned long delta_mmap; /* randomized offset */
83144+ unsigned long delta_stack; /* randomized offset */
83145+#endif
83146+
83147+} __randomize_layout;
83148
83149 static inline void mm_init_cpumask(struct mm_struct *mm)
83150 {
83151diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
83152index c5d5278..f0b68c8 100644
83153--- a/include/linux/mmiotrace.h
83154+++ b/include/linux/mmiotrace.h
83155@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
83156 /* Called from ioremap.c */
83157 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
83158 void __iomem *addr);
83159-extern void mmiotrace_iounmap(volatile void __iomem *addr);
83160+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
83161
83162 /* For anyone to insert markers. Remember trailing newline. */
83163 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
83164@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
83165 {
83166 }
83167
83168-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
83169+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
83170 {
83171 }
83172
83173diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
83174index ffe66e3..b310722 100644
83175--- a/include/linux/mmzone.h
83176+++ b/include/linux/mmzone.h
83177@@ -527,7 +527,7 @@ struct zone {
83178
83179 ZONE_PADDING(_pad3_)
83180 /* Zone statistics */
83181- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83182+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83183 } ____cacheline_internodealigned_in_smp;
83184
83185 enum zone_flags {
83186diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
83187index 44eeef0..a92d3f9 100644
83188--- a/include/linux/mod_devicetable.h
83189+++ b/include/linux/mod_devicetable.h
83190@@ -139,7 +139,7 @@ struct usb_device_id {
83191 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
83192 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
83193
83194-#define HID_ANY_ID (~0)
83195+#define HID_ANY_ID (~0U)
83196 #define HID_BUS_ANY 0xffff
83197 #define HID_GROUP_ANY 0x0000
83198
83199@@ -475,7 +475,7 @@ struct dmi_system_id {
83200 const char *ident;
83201 struct dmi_strmatch matches[4];
83202 void *driver_data;
83203-};
83204+} __do_const;
83205 /*
83206 * struct dmi_device_id appears during expansion of
83207 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
83208diff --git a/include/linux/module.h b/include/linux/module.h
83209index 71f282a..b2387e2 100644
83210--- a/include/linux/module.h
83211+++ b/include/linux/module.h
83212@@ -17,9 +17,11 @@
83213 #include <linux/moduleparam.h>
83214 #include <linux/jump_label.h>
83215 #include <linux/export.h>
83216+#include <linux/fs.h>
83217
83218 #include <linux/percpu.h>
83219 #include <asm/module.h>
83220+#include <asm/pgtable.h>
83221
83222 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
83223 #define MODULE_SIG_STRING "~Module signature appended~\n"
83224@@ -42,7 +44,7 @@ struct module_kobject {
83225 struct kobject *drivers_dir;
83226 struct module_param_attrs *mp;
83227 struct completion *kobj_completion;
83228-};
83229+} __randomize_layout;
83230
83231 struct module_attribute {
83232 struct attribute attr;
83233@@ -54,12 +56,13 @@ struct module_attribute {
83234 int (*test)(struct module *);
83235 void (*free)(struct module *);
83236 };
83237+typedef struct module_attribute __no_const module_attribute_no_const;
83238
83239 struct module_version_attribute {
83240 struct module_attribute mattr;
83241 const char *module_name;
83242 const char *version;
83243-} __attribute__ ((__aligned__(sizeof(void *))));
83244+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
83245
83246 extern ssize_t __modver_version_show(struct module_attribute *,
83247 struct module_kobject *, char *);
83248@@ -235,7 +238,7 @@ struct module {
83249
83250 /* Sysfs stuff. */
83251 struct module_kobject mkobj;
83252- struct module_attribute *modinfo_attrs;
83253+ module_attribute_no_const *modinfo_attrs;
83254 const char *version;
83255 const char *srcversion;
83256 struct kobject *holders_dir;
83257@@ -284,19 +287,16 @@ struct module {
83258 int (*init)(void);
83259
83260 /* If this is non-NULL, vfree after init() returns */
83261- void *module_init;
83262+ void *module_init_rx, *module_init_rw;
83263
83264 /* Here is the actual code + data, vfree'd on unload. */
83265- void *module_core;
83266+ void *module_core_rx, *module_core_rw;
83267
83268 /* Here are the sizes of the init and core sections */
83269- unsigned int init_size, core_size;
83270+ unsigned int init_size_rw, core_size_rw;
83271
83272 /* The size of the executable code in each section. */
83273- unsigned int init_text_size, core_text_size;
83274-
83275- /* Size of RO sections of the module (text+rodata) */
83276- unsigned int init_ro_size, core_ro_size;
83277+ unsigned int init_size_rx, core_size_rx;
83278
83279 /* Arch-specific module values */
83280 struct mod_arch_specific arch;
83281@@ -352,6 +352,10 @@ struct module {
83282 #ifdef CONFIG_EVENT_TRACING
83283 struct ftrace_event_call **trace_events;
83284 unsigned int num_trace_events;
83285+ struct file_operations trace_id;
83286+ struct file_operations trace_enable;
83287+ struct file_operations trace_format;
83288+ struct file_operations trace_filter;
83289 #endif
83290 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
83291 unsigned int num_ftrace_callsites;
83292@@ -375,7 +379,7 @@ struct module {
83293 ctor_fn_t *ctors;
83294 unsigned int num_ctors;
83295 #endif
83296-};
83297+} __randomize_layout;
83298 #ifndef MODULE_ARCH_INIT
83299 #define MODULE_ARCH_INIT {}
83300 #endif
83301@@ -396,18 +400,48 @@ bool is_module_address(unsigned long addr);
83302 bool is_module_percpu_address(unsigned long addr);
83303 bool is_module_text_address(unsigned long addr);
83304
83305+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
83306+{
83307+
83308+#ifdef CONFIG_PAX_KERNEXEC
83309+ if (ktla_ktva(addr) >= (unsigned long)start &&
83310+ ktla_ktva(addr) < (unsigned long)start + size)
83311+ return 1;
83312+#endif
83313+
83314+ return ((void *)addr >= start && (void *)addr < start + size);
83315+}
83316+
83317+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
83318+{
83319+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
83320+}
83321+
83322+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
83323+{
83324+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
83325+}
83326+
83327+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
83328+{
83329+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
83330+}
83331+
83332+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
83333+{
83334+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
83335+}
83336+
83337 static inline bool within_module_core(unsigned long addr,
83338 const struct module *mod)
83339 {
83340- return (unsigned long)mod->module_core <= addr &&
83341- addr < (unsigned long)mod->module_core + mod->core_size;
83342+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
83343 }
83344
83345 static inline bool within_module_init(unsigned long addr,
83346 const struct module *mod)
83347 {
83348- return (unsigned long)mod->module_init <= addr &&
83349- addr < (unsigned long)mod->module_init + mod->init_size;
83350+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
83351 }
83352
83353 static inline bool within_module(unsigned long addr, const struct module *mod)
83354diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
83355index 7eeb9bb..68f37e0 100644
83356--- a/include/linux/moduleloader.h
83357+++ b/include/linux/moduleloader.h
83358@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
83359 sections. Returns NULL on failure. */
83360 void *module_alloc(unsigned long size);
83361
83362+#ifdef CONFIG_PAX_KERNEXEC
83363+void *module_alloc_exec(unsigned long size);
83364+#else
83365+#define module_alloc_exec(x) module_alloc(x)
83366+#endif
83367+
83368 /* Free memory returned from module_alloc. */
83369 void module_free(struct module *mod, void *module_region);
83370
83371+#ifdef CONFIG_PAX_KERNEXEC
83372+void module_free_exec(struct module *mod, void *module_region);
83373+#else
83374+#define module_free_exec(x, y) module_free((x), (y))
83375+#endif
83376+
83377 /*
83378 * Apply the given relocation to the (simplified) ELF. Return -error
83379 * or 0.
83380@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
83381 unsigned int relsec,
83382 struct module *me)
83383 {
83384+#ifdef CONFIG_MODULES
83385 printk(KERN_ERR "module %s: REL relocation unsupported\n",
83386 module_name(me));
83387+#endif
83388 return -ENOEXEC;
83389 }
83390 #endif
83391@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
83392 unsigned int relsec,
83393 struct module *me)
83394 {
83395+#ifdef CONFIG_MODULES
83396 printk(KERN_ERR "module %s: REL relocation unsupported\n",
83397 module_name(me));
83398+#endif
83399 return -ENOEXEC;
83400 }
83401 #endif
83402diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
83403index 1c9effa..1160bdd 100644
83404--- a/include/linux/moduleparam.h
83405+++ b/include/linux/moduleparam.h
83406@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
83407 * @len is usually just sizeof(string).
83408 */
83409 #define module_param_string(name, string, len, perm) \
83410- static const struct kparam_string __param_string_##name \
83411+ static const struct kparam_string __param_string_##name __used \
83412 = { len, string }; \
83413 __module_param_call(MODULE_PARAM_PREFIX, name, \
83414 &param_ops_string, \
83415@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
83416 */
83417 #define module_param_array_named(name, array, type, nump, perm) \
83418 param_check_##type(name, &(array)[0]); \
83419- static const struct kparam_array __param_arr_##name \
83420+ static const struct kparam_array __param_arr_##name __used \
83421 = { .max = ARRAY_SIZE(array), .num = nump, \
83422 .ops = &param_ops_##type, \
83423 .elemsize = sizeof(array[0]), .elem = array }; \
83424diff --git a/include/linux/mount.h b/include/linux/mount.h
83425index c2c561d..a5f2a8c 100644
83426--- a/include/linux/mount.h
83427+++ b/include/linux/mount.h
83428@@ -66,7 +66,7 @@ struct vfsmount {
83429 struct dentry *mnt_root; /* root of the mounted tree */
83430 struct super_block *mnt_sb; /* pointer to superblock */
83431 int mnt_flags;
83432-};
83433+} __randomize_layout;
83434
83435 struct file; /* forward dec */
83436 struct path;
83437diff --git a/include/linux/namei.h b/include/linux/namei.h
83438index 492de72..1bddcd4 100644
83439--- a/include/linux/namei.h
83440+++ b/include/linux/namei.h
83441@@ -19,7 +19,7 @@ struct nameidata {
83442 unsigned seq, m_seq;
83443 int last_type;
83444 unsigned depth;
83445- char *saved_names[MAX_NESTED_LINKS + 1];
83446+ const char *saved_names[MAX_NESTED_LINKS + 1];
83447 };
83448
83449 /*
83450@@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
83451
83452 extern void nd_jump_link(struct nameidata *nd, struct path *path);
83453
83454-static inline void nd_set_link(struct nameidata *nd, char *path)
83455+static inline void nd_set_link(struct nameidata *nd, const char *path)
83456 {
83457 nd->saved_names[nd->depth] = path;
83458 }
83459
83460-static inline char *nd_get_link(struct nameidata *nd)
83461+static inline const char *nd_get_link(const struct nameidata *nd)
83462 {
83463 return nd->saved_names[nd->depth];
83464 }
83465diff --git a/include/linux/net.h b/include/linux/net.h
83466index 17d8339..81656c0 100644
83467--- a/include/linux/net.h
83468+++ b/include/linux/net.h
83469@@ -192,7 +192,7 @@ struct net_proto_family {
83470 int (*create)(struct net *net, struct socket *sock,
83471 int protocol, int kern);
83472 struct module *owner;
83473-};
83474+} __do_const;
83475
83476 struct iovec;
83477 struct kvec;
83478diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
83479index 74fd5d3..86a1e4f 100644
83480--- a/include/linux/netdevice.h
83481+++ b/include/linux/netdevice.h
83482@@ -1156,6 +1156,7 @@ struct net_device_ops {
83483 bool (*ndo_gso_check) (struct sk_buff *skb,
83484 struct net_device *dev);
83485 };
83486+typedef struct net_device_ops __no_const net_device_ops_no_const;
83487
83488 /**
83489 * enum net_device_priv_flags - &struct net_device priv_flags
83490@@ -1498,10 +1499,10 @@ struct net_device {
83491
83492 struct net_device_stats stats;
83493
83494- atomic_long_t rx_dropped;
83495- atomic_long_t tx_dropped;
83496+ atomic_long_unchecked_t rx_dropped;
83497+ atomic_long_unchecked_t tx_dropped;
83498
83499- atomic_t carrier_changes;
83500+ atomic_unchecked_t carrier_changes;
83501
83502 #ifdef CONFIG_WIRELESS_EXT
83503 const struct iw_handler_def * wireless_handlers;
83504diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
83505index 2517ece..0bbfcfb 100644
83506--- a/include/linux/netfilter.h
83507+++ b/include/linux/netfilter.h
83508@@ -85,7 +85,7 @@ struct nf_sockopt_ops {
83509 #endif
83510 /* Use the module struct to lock set/get code in place */
83511 struct module *owner;
83512-};
83513+} __do_const;
83514
83515 /* Function to register/unregister hook points. */
83516 int nf_register_hook(struct nf_hook_ops *reg);
83517diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
83518index e955d47..04a5338 100644
83519--- a/include/linux/netfilter/nfnetlink.h
83520+++ b/include/linux/netfilter/nfnetlink.h
83521@@ -19,7 +19,7 @@ struct nfnl_callback {
83522 const struct nlattr * const cda[]);
83523 const struct nla_policy *policy; /* netlink attribute policy */
83524 const u_int16_t attr_count; /* number of nlattr's */
83525-};
83526+} __do_const;
83527
83528 struct nfnetlink_subsystem {
83529 const char *name;
83530diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
83531new file mode 100644
83532index 0000000..33f4af8
83533--- /dev/null
83534+++ b/include/linux/netfilter/xt_gradm.h
83535@@ -0,0 +1,9 @@
83536+#ifndef _LINUX_NETFILTER_XT_GRADM_H
83537+#define _LINUX_NETFILTER_XT_GRADM_H 1
83538+
83539+struct xt_gradm_mtinfo {
83540+ __u16 flags;
83541+ __u16 invflags;
83542+};
83543+
83544+#endif
83545diff --git a/include/linux/nls.h b/include/linux/nls.h
83546index 520681b..2b7fabb 100644
83547--- a/include/linux/nls.h
83548+++ b/include/linux/nls.h
83549@@ -31,7 +31,7 @@ struct nls_table {
83550 const unsigned char *charset2upper;
83551 struct module *owner;
83552 struct nls_table *next;
83553-};
83554+} __do_const;
83555
83556 /* this value hold the maximum octet of charset */
83557 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
83558@@ -46,7 +46,7 @@ enum utf16_endian {
83559 /* nls_base.c */
83560 extern int __register_nls(struct nls_table *, struct module *);
83561 extern int unregister_nls(struct nls_table *);
83562-extern struct nls_table *load_nls(char *);
83563+extern struct nls_table *load_nls(const char *);
83564 extern void unload_nls(struct nls_table *);
83565 extern struct nls_table *load_nls_default(void);
83566 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
83567diff --git a/include/linux/notifier.h b/include/linux/notifier.h
83568index d14a4c3..a078786 100644
83569--- a/include/linux/notifier.h
83570+++ b/include/linux/notifier.h
83571@@ -54,7 +54,8 @@ struct notifier_block {
83572 notifier_fn_t notifier_call;
83573 struct notifier_block __rcu *next;
83574 int priority;
83575-};
83576+} __do_const;
83577+typedef struct notifier_block __no_const notifier_block_no_const;
83578
83579 struct atomic_notifier_head {
83580 spinlock_t lock;
83581diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
83582index b2a0f15..4d7da32 100644
83583--- a/include/linux/oprofile.h
83584+++ b/include/linux/oprofile.h
83585@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
83586 int oprofilefs_create_ro_ulong(struct dentry * root,
83587 char const * name, ulong * val);
83588
83589-/** Create a file for read-only access to an atomic_t. */
83590+/** Create a file for read-only access to an atomic_unchecked_t. */
83591 int oprofilefs_create_ro_atomic(struct dentry * root,
83592- char const * name, atomic_t * val);
83593+ char const * name, atomic_unchecked_t * val);
83594
83595 /** create a directory */
83596 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
83597diff --git a/include/linux/padata.h b/include/linux/padata.h
83598index 4386946..f50c615 100644
83599--- a/include/linux/padata.h
83600+++ b/include/linux/padata.h
83601@@ -129,7 +129,7 @@ struct parallel_data {
83602 struct padata_serial_queue __percpu *squeue;
83603 atomic_t reorder_objects;
83604 atomic_t refcnt;
83605- atomic_t seq_nr;
83606+ atomic_unchecked_t seq_nr;
83607 struct padata_cpumask cpumask;
83608 spinlock_t lock ____cacheline_aligned;
83609 unsigned int processed;
83610diff --git a/include/linux/path.h b/include/linux/path.h
83611index d137218..be0c176 100644
83612--- a/include/linux/path.h
83613+++ b/include/linux/path.h
83614@@ -1,13 +1,15 @@
83615 #ifndef _LINUX_PATH_H
83616 #define _LINUX_PATH_H
83617
83618+#include <linux/compiler.h>
83619+
83620 struct dentry;
83621 struct vfsmount;
83622
83623 struct path {
83624 struct vfsmount *mnt;
83625 struct dentry *dentry;
83626-};
83627+} __randomize_layout;
83628
83629 extern void path_get(const struct path *);
83630 extern void path_put(const struct path *);
83631diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
83632index 2706ee9..e691f7c 100644
83633--- a/include/linux/pci_hotplug.h
83634+++ b/include/linux/pci_hotplug.h
83635@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
83636 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
83637 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
83638 int (*reset_slot) (struct hotplug_slot *slot, int probe);
83639-};
83640+} __do_const;
83641+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
83642
83643 /**
83644 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
83645diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
83646index 893a0d0..d5f996e 100644
83647--- a/include/linux/perf_event.h
83648+++ b/include/linux/perf_event.h
83649@@ -341,8 +341,8 @@ struct perf_event {
83650
83651 enum perf_event_active_state state;
83652 unsigned int attach_state;
83653- local64_t count;
83654- atomic64_t child_count;
83655+ local64_t count; /* PaX: fix it one day */
83656+ atomic64_unchecked_t child_count;
83657
83658 /*
83659 * These are the total time in nanoseconds that the event
83660@@ -393,8 +393,8 @@ struct perf_event {
83661 * These accumulate total time (in nanoseconds) that children
83662 * events have been enabled and running, respectively.
83663 */
83664- atomic64_t child_total_time_enabled;
83665- atomic64_t child_total_time_running;
83666+ atomic64_unchecked_t child_total_time_enabled;
83667+ atomic64_unchecked_t child_total_time_running;
83668
83669 /*
83670 * Protect attach/detach and child_list:
83671@@ -734,7 +734,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
83672 entry->ip[entry->nr++] = ip;
83673 }
83674
83675-extern int sysctl_perf_event_paranoid;
83676+extern int sysctl_perf_event_legitimately_concerned;
83677 extern int sysctl_perf_event_mlock;
83678 extern int sysctl_perf_event_sample_rate;
83679 extern int sysctl_perf_cpu_time_max_percent;
83680@@ -749,19 +749,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
83681 loff_t *ppos);
83682
83683
83684+static inline bool perf_paranoid_any(void)
83685+{
83686+ return sysctl_perf_event_legitimately_concerned > 2;
83687+}
83688+
83689 static inline bool perf_paranoid_tracepoint_raw(void)
83690 {
83691- return sysctl_perf_event_paranoid > -1;
83692+ return sysctl_perf_event_legitimately_concerned > -1;
83693 }
83694
83695 static inline bool perf_paranoid_cpu(void)
83696 {
83697- return sysctl_perf_event_paranoid > 0;
83698+ return sysctl_perf_event_legitimately_concerned > 0;
83699 }
83700
83701 static inline bool perf_paranoid_kernel(void)
83702 {
83703- return sysctl_perf_event_paranoid > 1;
83704+ return sysctl_perf_event_legitimately_concerned > 1;
83705 }
83706
83707 extern void perf_event_init(void);
83708@@ -892,7 +897,7 @@ struct perf_pmu_events_attr {
83709 struct device_attribute attr;
83710 u64 id;
83711 const char *event_str;
83712-};
83713+} __do_const;
83714
83715 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
83716 static struct perf_pmu_events_attr _var = { \
83717diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
83718index 1997ffc..4f1f44d 100644
83719--- a/include/linux/pid_namespace.h
83720+++ b/include/linux/pid_namespace.h
83721@@ -44,7 +44,7 @@ struct pid_namespace {
83722 int hide_pid;
83723 int reboot; /* group exit code if this pidns was rebooted */
83724 unsigned int proc_inum;
83725-};
83726+} __randomize_layout;
83727
83728 extern struct pid_namespace init_pid_ns;
83729
83730diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
83731index eb8b8ac..62649e1 100644
83732--- a/include/linux/pipe_fs_i.h
83733+++ b/include/linux/pipe_fs_i.h
83734@@ -47,10 +47,10 @@ struct pipe_inode_info {
83735 struct mutex mutex;
83736 wait_queue_head_t wait;
83737 unsigned int nrbufs, curbuf, buffers;
83738- unsigned int readers;
83739- unsigned int writers;
83740- unsigned int files;
83741- unsigned int waiting_writers;
83742+ atomic_t readers;
83743+ atomic_t writers;
83744+ atomic_t files;
83745+ atomic_t waiting_writers;
83746 unsigned int r_counter;
83747 unsigned int w_counter;
83748 struct page *tmp_page;
83749diff --git a/include/linux/pm.h b/include/linux/pm.h
83750index 383fd68..7a11504 100644
83751--- a/include/linux/pm.h
83752+++ b/include/linux/pm.h
83753@@ -621,6 +621,7 @@ struct dev_pm_domain {
83754 struct dev_pm_ops ops;
83755 void (*detach)(struct device *dev, bool power_off);
83756 };
83757+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
83758
83759 /*
83760 * The PM_EVENT_ messages are also used by drivers implementing the legacy
83761diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
83762index 2e0e06d..824cc9b 100644
83763--- a/include/linux/pm_domain.h
83764+++ b/include/linux/pm_domain.h
83765@@ -36,11 +36,11 @@ struct gpd_dev_ops {
83766 int (*save_state)(struct device *dev);
83767 int (*restore_state)(struct device *dev);
83768 bool (*active_wakeup)(struct device *dev);
83769-};
83770+} __no_const;
83771
83772 struct gpd_cpuidle_data {
83773 unsigned int saved_exit_latency;
83774- struct cpuidle_state *idle_state;
83775+ cpuidle_state_no_const *idle_state;
83776 };
83777
83778 struct generic_pm_domain {
83779diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
83780index 367f49b..d2f5a14 100644
83781--- a/include/linux/pm_runtime.h
83782+++ b/include/linux/pm_runtime.h
83783@@ -125,7 +125,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
83784
83785 static inline void pm_runtime_mark_last_busy(struct device *dev)
83786 {
83787- ACCESS_ONCE(dev->power.last_busy) = jiffies;
83788+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
83789 }
83790
83791 #else /* !CONFIG_PM_RUNTIME */
83792diff --git a/include/linux/pnp.h b/include/linux/pnp.h
83793index 195aafc..49a7bc2 100644
83794--- a/include/linux/pnp.h
83795+++ b/include/linux/pnp.h
83796@@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
83797 struct pnp_fixup {
83798 char id[7];
83799 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
83800-};
83801+} __do_const;
83802
83803 /* config parameters */
83804 #define PNP_CONFIG_NORMAL 0x0001
83805diff --git a/include/linux/poison.h b/include/linux/poison.h
83806index 2110a81..13a11bb 100644
83807--- a/include/linux/poison.h
83808+++ b/include/linux/poison.h
83809@@ -19,8 +19,8 @@
83810 * under normal circumstances, used to verify that nobody uses
83811 * non-initialized list entries.
83812 */
83813-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
83814-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
83815+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
83816+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
83817
83818 /********** include/linux/timer.h **********/
83819 /*
83820diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
83821index d8b187c3..9a9257a 100644
83822--- a/include/linux/power/smartreflex.h
83823+++ b/include/linux/power/smartreflex.h
83824@@ -238,7 +238,7 @@ struct omap_sr_class_data {
83825 int (*notify)(struct omap_sr *sr, u32 status);
83826 u8 notify_flags;
83827 u8 class_type;
83828-};
83829+} __do_const;
83830
83831 /**
83832 * struct omap_sr_nvalue_table - Smartreflex n-target value info
83833diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
83834index 4ea1d37..80f4b33 100644
83835--- a/include/linux/ppp-comp.h
83836+++ b/include/linux/ppp-comp.h
83837@@ -84,7 +84,7 @@ struct compressor {
83838 struct module *owner;
83839 /* Extra skb space needed by the compressor algorithm */
83840 unsigned int comp_extra;
83841-};
83842+} __do_const;
83843
83844 /*
83845 * The return value from decompress routine is the length of the
83846diff --git a/include/linux/preempt.h b/include/linux/preempt.h
83847index de83b4e..c4b997d 100644
83848--- a/include/linux/preempt.h
83849+++ b/include/linux/preempt.h
83850@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
83851 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
83852 #endif
83853
83854+#define raw_preempt_count_add(val) __preempt_count_add(val)
83855+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
83856+
83857 #define __preempt_count_inc() __preempt_count_add(1)
83858 #define __preempt_count_dec() __preempt_count_sub(1)
83859
83860 #define preempt_count_inc() preempt_count_add(1)
83861+#define raw_preempt_count_inc() raw_preempt_count_add(1)
83862 #define preempt_count_dec() preempt_count_sub(1)
83863+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
83864
83865 #ifdef CONFIG_PREEMPT_COUNT
83866
83867@@ -41,6 +46,12 @@ do { \
83868 barrier(); \
83869 } while (0)
83870
83871+#define raw_preempt_disable() \
83872+do { \
83873+ raw_preempt_count_inc(); \
83874+ barrier(); \
83875+} while (0)
83876+
83877 #define sched_preempt_enable_no_resched() \
83878 do { \
83879 barrier(); \
83880@@ -49,6 +60,12 @@ do { \
83881
83882 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
83883
83884+#define raw_preempt_enable_no_resched() \
83885+do { \
83886+ barrier(); \
83887+ raw_preempt_count_dec(); \
83888+} while (0)
83889+
83890 #ifdef CONFIG_PREEMPT
83891 #define preempt_enable() \
83892 do { \
83893@@ -113,8 +130,10 @@ do { \
83894 * region.
83895 */
83896 #define preempt_disable() barrier()
83897+#define raw_preempt_disable() barrier()
83898 #define sched_preempt_enable_no_resched() barrier()
83899 #define preempt_enable_no_resched() barrier()
83900+#define raw_preempt_enable_no_resched() barrier()
83901 #define preempt_enable() barrier()
83902 #define preempt_check_resched() do { } while (0)
83903
83904@@ -128,11 +147,13 @@ do { \
83905 /*
83906 * Modules have no business playing preemption tricks.
83907 */
83908+#ifndef CONFIG_PAX_KERNEXEC
83909 #undef sched_preempt_enable_no_resched
83910 #undef preempt_enable_no_resched
83911 #undef preempt_enable_no_resched_notrace
83912 #undef preempt_check_resched
83913 #endif
83914+#endif
83915
83916 #define preempt_set_need_resched() \
83917 do { \
83918diff --git a/include/linux/printk.h b/include/linux/printk.h
83919index d78125f..7f36596 100644
83920--- a/include/linux/printk.h
83921+++ b/include/linux/printk.h
83922@@ -124,6 +124,8 @@ static inline __printf(1, 2) __cold
83923 void early_printk(const char *s, ...) { }
83924 #endif
83925
83926+extern int kptr_restrict;
83927+
83928 #ifdef CONFIG_PRINTK
83929 asmlinkage __printf(5, 0)
83930 int vprintk_emit(int facility, int level,
83931@@ -158,7 +160,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
83932
83933 extern int printk_delay_msec;
83934 extern int dmesg_restrict;
83935-extern int kptr_restrict;
83936
83937 extern void wake_up_klogd(void);
83938
83939diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
83940index b97bf2e..f14c92d4 100644
83941--- a/include/linux/proc_fs.h
83942+++ b/include/linux/proc_fs.h
83943@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
83944 extern struct proc_dir_entry *proc_symlink(const char *,
83945 struct proc_dir_entry *, const char *);
83946 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
83947+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
83948 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
83949 struct proc_dir_entry *, void *);
83950+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
83951+ struct proc_dir_entry *, void *);
83952 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
83953 struct proc_dir_entry *);
83954
83955@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
83956 return proc_create_data(name, mode, parent, proc_fops, NULL);
83957 }
83958
83959+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
83960+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
83961+{
83962+#ifdef CONFIG_GRKERNSEC_PROC_USER
83963+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
83964+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
83965+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
83966+#else
83967+ return proc_create_data(name, mode, parent, proc_fops, NULL);
83968+#endif
83969+}
83970+
83971+
83972 extern void proc_set_size(struct proc_dir_entry *, loff_t);
83973 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
83974 extern void *PDE_DATA(const struct inode *);
83975@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
83976 struct proc_dir_entry *parent,const char *dest) { return NULL;}
83977 static inline struct proc_dir_entry *proc_mkdir(const char *name,
83978 struct proc_dir_entry *parent) {return NULL;}
83979+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
83980+ struct proc_dir_entry *parent) { return NULL; }
83981 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
83982 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
83983+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
83984+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
83985 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
83986 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
83987 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
83988@@ -79,7 +99,7 @@ struct net;
83989 static inline struct proc_dir_entry *proc_net_mkdir(
83990 struct net *net, const char *name, struct proc_dir_entry *parent)
83991 {
83992- return proc_mkdir_data(name, 0, parent, net);
83993+ return proc_mkdir_data_restrict(name, 0, parent, net);
83994 }
83995
83996 #endif /* _LINUX_PROC_FS_H */
83997diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
83998index 34a1e10..70f6bde 100644
83999--- a/include/linux/proc_ns.h
84000+++ b/include/linux/proc_ns.h
84001@@ -14,7 +14,7 @@ struct proc_ns_operations {
84002 void (*put)(void *ns);
84003 int (*install)(struct nsproxy *nsproxy, void *ns);
84004 unsigned int (*inum)(void *ns);
84005-};
84006+} __do_const __randomize_layout;
84007
84008 struct proc_ns {
84009 void *ns;
84010diff --git a/include/linux/quota.h b/include/linux/quota.h
84011index 80d345a..9e89a9a 100644
84012--- a/include/linux/quota.h
84013+++ b/include/linux/quota.h
84014@@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
84015
84016 extern bool qid_eq(struct kqid left, struct kqid right);
84017 extern bool qid_lt(struct kqid left, struct kqid right);
84018-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
84019+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
84020 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
84021 extern bool qid_valid(struct kqid qid);
84022
84023diff --git a/include/linux/random.h b/include/linux/random.h
84024index b05856e..0a9f14e 100644
84025--- a/include/linux/random.h
84026+++ b/include/linux/random.h
84027@@ -9,9 +9,19 @@
84028 #include <uapi/linux/random.h>
84029
84030 extern void add_device_randomness(const void *, unsigned int);
84031+
84032+static inline void add_latent_entropy(void)
84033+{
84034+
84035+#ifdef LATENT_ENTROPY_PLUGIN
84036+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
84037+#endif
84038+
84039+}
84040+
84041 extern void add_input_randomness(unsigned int type, unsigned int code,
84042- unsigned int value);
84043-extern void add_interrupt_randomness(int irq, int irq_flags);
84044+ unsigned int value) __latent_entropy;
84045+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
84046
84047 extern void get_random_bytes(void *buf, int nbytes);
84048 extern void get_random_bytes_arch(void *buf, int nbytes);
84049@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
84050 extern const struct file_operations random_fops, urandom_fops;
84051 #endif
84052
84053-unsigned int get_random_int(void);
84054+unsigned int __intentional_overflow(-1) get_random_int(void);
84055 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
84056
84057-u32 prandom_u32(void);
84058+u32 prandom_u32(void) __intentional_overflow(-1);
84059 void prandom_bytes(void *buf, size_t nbytes);
84060 void prandom_seed(u32 seed);
84061 void prandom_reseed_late(void);
84062@@ -37,6 +47,11 @@ struct rnd_state {
84063 u32 prandom_u32_state(struct rnd_state *state);
84064 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
84065
84066+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
84067+{
84068+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
84069+}
84070+
84071 /**
84072 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
84073 * @ep_ro: right open interval endpoint
84074@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
84075 *
84076 * Returns: pseudo-random number in interval [0, ep_ro)
84077 */
84078-static inline u32 prandom_u32_max(u32 ep_ro)
84079+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
84080 {
84081 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
84082 }
84083diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
84084index 378c5ee..aa84a47 100644
84085--- a/include/linux/rbtree_augmented.h
84086+++ b/include/linux/rbtree_augmented.h
84087@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
84088 old->rbaugmented = rbcompute(old); \
84089 } \
84090 rbstatic const struct rb_augment_callbacks rbname = { \
84091- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
84092+ .propagate = rbname ## _propagate, \
84093+ .copy = rbname ## _copy, \
84094+ .rotate = rbname ## _rotate \
84095 };
84096
84097
84098diff --git a/include/linux/rculist.h b/include/linux/rculist.h
84099index 372ad5e..d4373f8 100644
84100--- a/include/linux/rculist.h
84101+++ b/include/linux/rculist.h
84102@@ -29,8 +29,8 @@
84103 */
84104 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
84105 {
84106- ACCESS_ONCE(list->next) = list;
84107- ACCESS_ONCE(list->prev) = list;
84108+ ACCESS_ONCE_RW(list->next) = list;
84109+ ACCESS_ONCE_RW(list->prev) = list;
84110 }
84111
84112 /*
84113@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
84114 struct list_head *prev, struct list_head *next);
84115 #endif
84116
84117+void __pax_list_add_rcu(struct list_head *new,
84118+ struct list_head *prev, struct list_head *next);
84119+
84120 /**
84121 * list_add_rcu - add a new entry to rcu-protected list
84122 * @new: new entry to be added
84123@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
84124 __list_add_rcu(new, head, head->next);
84125 }
84126
84127+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
84128+{
84129+ __pax_list_add_rcu(new, head, head->next);
84130+}
84131+
84132 /**
84133 * list_add_tail_rcu - add a new entry to rcu-protected list
84134 * @new: new entry to be added
84135@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
84136 __list_add_rcu(new, head->prev, head);
84137 }
84138
84139+static inline void pax_list_add_tail_rcu(struct list_head *new,
84140+ struct list_head *head)
84141+{
84142+ __pax_list_add_rcu(new, head->prev, head);
84143+}
84144+
84145 /**
84146 * list_del_rcu - deletes entry from list without re-initialization
84147 * @entry: the element to delete from the list.
84148@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
84149 entry->prev = LIST_POISON2;
84150 }
84151
84152+extern void pax_list_del_rcu(struct list_head *entry);
84153+
84154 /**
84155 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
84156 * @n: the element to delete from the hash list.
84157diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
84158index 53ff1a7..c40f0ab 100644
84159--- a/include/linux/rcupdate.h
84160+++ b/include/linux/rcupdate.h
84161@@ -332,7 +332,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
84162 #define rcu_note_voluntary_context_switch(t) \
84163 do { \
84164 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
84165- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
84166+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
84167 } while (0)
84168 #else /* #ifdef CONFIG_TASKS_RCU */
84169 #define TASKS_RCU(x) do { } while (0)
84170diff --git a/include/linux/reboot.h b/include/linux/reboot.h
84171index 67fc8fc..a90f7d8 100644
84172--- a/include/linux/reboot.h
84173+++ b/include/linux/reboot.h
84174@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
84175 */
84176
84177 extern void migrate_to_reboot_cpu(void);
84178-extern void machine_restart(char *cmd);
84179-extern void machine_halt(void);
84180-extern void machine_power_off(void);
84181+extern void machine_restart(char *cmd) __noreturn;
84182+extern void machine_halt(void) __noreturn;
84183+extern void machine_power_off(void) __noreturn;
84184
84185 extern void machine_shutdown(void);
84186 struct pt_regs;
84187@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
84188 */
84189
84190 extern void kernel_restart_prepare(char *cmd);
84191-extern void kernel_restart(char *cmd);
84192-extern void kernel_halt(void);
84193-extern void kernel_power_off(void);
84194+extern void kernel_restart(char *cmd) __noreturn;
84195+extern void kernel_halt(void) __noreturn;
84196+extern void kernel_power_off(void) __noreturn;
84197
84198 extern int C_A_D; /* for sysctl */
84199 void ctrl_alt_del(void);
84200@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
84201 * Emergency restart, callable from an interrupt handler.
84202 */
84203
84204-extern void emergency_restart(void);
84205+extern void emergency_restart(void) __noreturn;
84206 #include <asm/emergency-restart.h>
84207
84208 #endif /* _LINUX_REBOOT_H */
84209diff --git a/include/linux/regset.h b/include/linux/regset.h
84210index 8e0c9fe..ac4d221 100644
84211--- a/include/linux/regset.h
84212+++ b/include/linux/regset.h
84213@@ -161,7 +161,8 @@ struct user_regset {
84214 unsigned int align;
84215 unsigned int bias;
84216 unsigned int core_note_type;
84217-};
84218+} __do_const;
84219+typedef struct user_regset __no_const user_regset_no_const;
84220
84221 /**
84222 * struct user_regset_view - available regsets
84223diff --git a/include/linux/relay.h b/include/linux/relay.h
84224index d7c8359..818daf5 100644
84225--- a/include/linux/relay.h
84226+++ b/include/linux/relay.h
84227@@ -157,7 +157,7 @@ struct rchan_callbacks
84228 * The callback should return 0 if successful, negative if not.
84229 */
84230 int (*remove_buf_file)(struct dentry *dentry);
84231-};
84232+} __no_const;
84233
84234 /*
84235 * CONFIG_RELAY kernel API, kernel/relay.c
84236diff --git a/include/linux/rio.h b/include/linux/rio.h
84237index 6bda06f..bf39a9b 100644
84238--- a/include/linux/rio.h
84239+++ b/include/linux/rio.h
84240@@ -358,7 +358,7 @@ struct rio_ops {
84241 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
84242 u64 rstart, u32 size, u32 flags);
84243 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
84244-};
84245+} __no_const;
84246
84247 #define RIO_RESOURCE_MEM 0x00000100
84248 #define RIO_RESOURCE_DOORBELL 0x00000200
84249diff --git a/include/linux/rmap.h b/include/linux/rmap.h
84250index c0c2bce..4813524 100644
84251--- a/include/linux/rmap.h
84252+++ b/include/linux/rmap.h
84253@@ -144,8 +144,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
84254 void anon_vma_init(void); /* create anon_vma_cachep */
84255 int anon_vma_prepare(struct vm_area_struct *);
84256 void unlink_anon_vmas(struct vm_area_struct *);
84257-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
84258-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
84259+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
84260+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
84261
84262 static inline void anon_vma_merge(struct vm_area_struct *vma,
84263 struct vm_area_struct *next)
84264diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
84265index ed8f9e7..999bc96 100644
84266--- a/include/linux/scatterlist.h
84267+++ b/include/linux/scatterlist.h
84268@@ -1,6 +1,7 @@
84269 #ifndef _LINUX_SCATTERLIST_H
84270 #define _LINUX_SCATTERLIST_H
84271
84272+#include <linux/sched.h>
84273 #include <linux/string.h>
84274 #include <linux/bug.h>
84275 #include <linux/mm.h>
84276@@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
84277 #ifdef CONFIG_DEBUG_SG
84278 BUG_ON(!virt_addr_valid(buf));
84279 #endif
84280+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84281+ if (object_starts_on_stack(buf)) {
84282+ void *adjbuf = buf - current->stack + current->lowmem_stack;
84283+ sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
84284+ } else
84285+#endif
84286 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
84287 }
84288
84289diff --git a/include/linux/sched.h b/include/linux/sched.h
84290index 5e344bb..0743255 100644
84291--- a/include/linux/sched.h
84292+++ b/include/linux/sched.h
84293@@ -133,6 +133,7 @@ struct fs_struct;
84294 struct perf_event_context;
84295 struct blk_plug;
84296 struct filename;
84297+struct linux_binprm;
84298
84299 #define VMACACHE_BITS 2
84300 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
84301@@ -376,7 +377,7 @@ extern char __sched_text_start[], __sched_text_end[];
84302 extern int in_sched_functions(unsigned long addr);
84303
84304 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
84305-extern signed long schedule_timeout(signed long timeout);
84306+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
84307 extern signed long schedule_timeout_interruptible(signed long timeout);
84308 extern signed long schedule_timeout_killable(signed long timeout);
84309 extern signed long schedule_timeout_uninterruptible(signed long timeout);
84310@@ -387,6 +388,19 @@ struct nsproxy;
84311 struct user_namespace;
84312
84313 #ifdef CONFIG_MMU
84314+
84315+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
84316+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
84317+#else
84318+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
84319+{
84320+ return 0;
84321+}
84322+#endif
84323+
84324+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
84325+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
84326+
84327 extern void arch_pick_mmap_layout(struct mm_struct *mm);
84328 extern unsigned long
84329 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
84330@@ -685,6 +699,17 @@ struct signal_struct {
84331 #ifdef CONFIG_TASKSTATS
84332 struct taskstats *stats;
84333 #endif
84334+
84335+#ifdef CONFIG_GRKERNSEC
84336+ u32 curr_ip;
84337+ u32 saved_ip;
84338+ u32 gr_saddr;
84339+ u32 gr_daddr;
84340+ u16 gr_sport;
84341+ u16 gr_dport;
84342+ u8 used_accept:1;
84343+#endif
84344+
84345 #ifdef CONFIG_AUDIT
84346 unsigned audit_tty;
84347 unsigned audit_tty_log_passwd;
84348@@ -711,7 +736,7 @@ struct signal_struct {
84349 struct mutex cred_guard_mutex; /* guard against foreign influences on
84350 * credential calculations
84351 * (notably. ptrace) */
84352-};
84353+} __randomize_layout;
84354
84355 /*
84356 * Bits in flags field of signal_struct.
84357@@ -764,6 +789,14 @@ struct user_struct {
84358 struct key *session_keyring; /* UID's default session keyring */
84359 #endif
84360
84361+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
84362+ unsigned char kernel_banned;
84363+#endif
84364+#ifdef CONFIG_GRKERNSEC_BRUTE
84365+ unsigned char suid_banned;
84366+ unsigned long suid_ban_expires;
84367+#endif
84368+
84369 /* Hash table maintenance information */
84370 struct hlist_node uidhash_node;
84371 kuid_t uid;
84372@@ -771,7 +804,7 @@ struct user_struct {
84373 #ifdef CONFIG_PERF_EVENTS
84374 atomic_long_t locked_vm;
84375 #endif
84376-};
84377+} __randomize_layout;
84378
84379 extern int uids_sysfs_init(void);
84380
84381@@ -1235,6 +1268,9 @@ enum perf_event_task_context {
84382 struct task_struct {
84383 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
84384 void *stack;
84385+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84386+ void *lowmem_stack;
84387+#endif
84388 atomic_t usage;
84389 unsigned int flags; /* per process flags, defined below */
84390 unsigned int ptrace;
84391@@ -1362,8 +1398,8 @@ struct task_struct {
84392 struct list_head thread_node;
84393
84394 struct completion *vfork_done; /* for vfork() */
84395- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
84396- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
84397+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
84398+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
84399
84400 cputime_t utime, stime, utimescaled, stimescaled;
84401 cputime_t gtime;
84402@@ -1388,11 +1424,6 @@ struct task_struct {
84403 struct task_cputime cputime_expires;
84404 struct list_head cpu_timers[3];
84405
84406-/* process credentials */
84407- const struct cred __rcu *real_cred; /* objective and real subjective task
84408- * credentials (COW) */
84409- const struct cred __rcu *cred; /* effective (overridable) subjective task
84410- * credentials (COW) */
84411 char comm[TASK_COMM_LEN]; /* executable name excluding path
84412 - access with [gs]et_task_comm (which lock
84413 it with task_lock())
84414@@ -1410,6 +1441,10 @@ struct task_struct {
84415 #endif
84416 /* CPU-specific state of this task */
84417 struct thread_struct thread;
84418+/* thread_info moved to task_struct */
84419+#ifdef CONFIG_X86
84420+ struct thread_info tinfo;
84421+#endif
84422 /* filesystem information */
84423 struct fs_struct *fs;
84424 /* open file information */
84425@@ -1484,6 +1519,10 @@ struct task_struct {
84426 gfp_t lockdep_reclaim_gfp;
84427 #endif
84428
84429+/* process credentials */
84430+ const struct cred __rcu *real_cred; /* objective and real subjective task
84431+ * credentials (COW) */
84432+
84433 /* journalling filesystem info */
84434 void *journal_info;
84435
84436@@ -1522,6 +1561,10 @@ struct task_struct {
84437 /* cg_list protected by css_set_lock and tsk->alloc_lock */
84438 struct list_head cg_list;
84439 #endif
84440+
84441+ const struct cred __rcu *cred; /* effective (overridable) subjective task
84442+ * credentials (COW) */
84443+
84444 #ifdef CONFIG_FUTEX
84445 struct robust_list_head __user *robust_list;
84446 #ifdef CONFIG_COMPAT
84447@@ -1635,7 +1678,7 @@ struct task_struct {
84448 * Number of functions that haven't been traced
84449 * because of depth overrun.
84450 */
84451- atomic_t trace_overrun;
84452+ atomic_unchecked_t trace_overrun;
84453 /* Pause for the tracing */
84454 atomic_t tracing_graph_pause;
84455 #endif
84456@@ -1661,7 +1704,78 @@ struct task_struct {
84457 unsigned int sequential_io;
84458 unsigned int sequential_io_avg;
84459 #endif
84460-};
84461+
84462+#ifdef CONFIG_GRKERNSEC
84463+ /* grsecurity */
84464+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
84465+ u64 exec_id;
84466+#endif
84467+#ifdef CONFIG_GRKERNSEC_SETXID
84468+ const struct cred *delayed_cred;
84469+#endif
84470+ struct dentry *gr_chroot_dentry;
84471+ struct acl_subject_label *acl;
84472+ struct acl_subject_label *tmpacl;
84473+ struct acl_role_label *role;
84474+ struct file *exec_file;
84475+ unsigned long brute_expires;
84476+ u16 acl_role_id;
84477+ u8 inherited;
84478+ /* is this the task that authenticated to the special role */
84479+ u8 acl_sp_role;
84480+ u8 is_writable;
84481+ u8 brute;
84482+ u8 gr_is_chrooted;
84483+#endif
84484+
84485+} __randomize_layout;
84486+
84487+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
84488+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
84489+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
84490+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
84491+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
84492+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
84493+
84494+#ifdef CONFIG_PAX_SOFTMODE
84495+extern int pax_softmode;
84496+#endif
84497+
84498+extern int pax_check_flags(unsigned long *);
84499+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
84500+
84501+/* if tsk != current then task_lock must be held on it */
84502+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
84503+static inline unsigned long pax_get_flags(struct task_struct *tsk)
84504+{
84505+ if (likely(tsk->mm))
84506+ return tsk->mm->pax_flags;
84507+ else
84508+ return 0UL;
84509+}
84510+
84511+/* if tsk != current then task_lock must be held on it */
84512+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
84513+{
84514+ if (likely(tsk->mm)) {
84515+ tsk->mm->pax_flags = flags;
84516+ return 0;
84517+ }
84518+ return -EINVAL;
84519+}
84520+#endif
84521+
84522+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
84523+extern void pax_set_initial_flags(struct linux_binprm *bprm);
84524+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
84525+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
84526+#endif
84527+
84528+struct path;
84529+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
84530+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
84531+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
84532+extern void pax_report_refcount_overflow(struct pt_regs *regs);
84533
84534 /* Future-safe accessor for struct task_struct's cpus_allowed. */
84535 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
84536@@ -1743,7 +1857,7 @@ struct pid_namespace;
84537 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
84538 struct pid_namespace *ns);
84539
84540-static inline pid_t task_pid_nr(struct task_struct *tsk)
84541+static inline pid_t task_pid_nr(const struct task_struct *tsk)
84542 {
84543 return tsk->pid;
84544 }
84545@@ -2106,6 +2220,25 @@ extern u64 sched_clock_cpu(int cpu);
84546
84547 extern void sched_clock_init(void);
84548
84549+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84550+static inline void populate_stack(void)
84551+{
84552+ struct task_struct *curtask = current;
84553+ int c;
84554+ int *ptr = curtask->stack;
84555+ int *end = curtask->stack + THREAD_SIZE;
84556+
84557+ while (ptr < end) {
84558+ c = *(volatile int *)ptr;
84559+ ptr += PAGE_SIZE/sizeof(int);
84560+ }
84561+}
84562+#else
84563+static inline void populate_stack(void)
84564+{
84565+}
84566+#endif
84567+
84568 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
84569 static inline void sched_clock_tick(void)
84570 {
84571@@ -2239,7 +2372,9 @@ void yield(void);
84572 extern struct exec_domain default_exec_domain;
84573
84574 union thread_union {
84575+#ifndef CONFIG_X86
84576 struct thread_info thread_info;
84577+#endif
84578 unsigned long stack[THREAD_SIZE/sizeof(long)];
84579 };
84580
84581@@ -2272,6 +2407,7 @@ extern struct pid_namespace init_pid_ns;
84582 */
84583
84584 extern struct task_struct *find_task_by_vpid(pid_t nr);
84585+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
84586 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
84587 struct pid_namespace *ns);
84588
84589@@ -2436,7 +2572,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
84590 extern void exit_itimers(struct signal_struct *);
84591 extern void flush_itimer_signals(void);
84592
84593-extern void do_group_exit(int);
84594+extern __noreturn void do_group_exit(int);
84595
84596 extern int do_execve(struct filename *,
84597 const char __user * const __user *,
84598@@ -2653,9 +2789,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
84599 #define task_stack_end_corrupted(task) \
84600 (*(end_of_stack(task)) != STACK_END_MAGIC)
84601
84602-static inline int object_is_on_stack(void *obj)
84603+static inline int object_starts_on_stack(const void *obj)
84604 {
84605- void *stack = task_stack_page(current);
84606+ const void *stack = task_stack_page(current);
84607
84608 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
84609 }
84610diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
84611index 596a0e0..bea77ec 100644
84612--- a/include/linux/sched/sysctl.h
84613+++ b/include/linux/sched/sysctl.h
84614@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
84615 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
84616
84617 extern int sysctl_max_map_count;
84618+extern unsigned long sysctl_heap_stack_gap;
84619
84620 extern unsigned int sysctl_sched_latency;
84621 extern unsigned int sysctl_sched_min_granularity;
84622diff --git a/include/linux/security.h b/include/linux/security.h
84623index ba96471..74fb3f6 100644
84624--- a/include/linux/security.h
84625+++ b/include/linux/security.h
84626@@ -27,6 +27,7 @@
84627 #include <linux/slab.h>
84628 #include <linux/err.h>
84629 #include <linux/string.h>
84630+#include <linux/grsecurity.h>
84631
84632 struct linux_binprm;
84633 struct cred;
84634@@ -116,8 +117,6 @@ struct seq_file;
84635
84636 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
84637
84638-void reset_security_ops(void);
84639-
84640 #ifdef CONFIG_MMU
84641 extern unsigned long mmap_min_addr;
84642 extern unsigned long dac_mmap_min_addr;
84643@@ -1729,7 +1728,7 @@ struct security_operations {
84644 struct audit_context *actx);
84645 void (*audit_rule_free) (void *lsmrule);
84646 #endif /* CONFIG_AUDIT */
84647-};
84648+} __randomize_layout;
84649
84650 /* prototypes */
84651 extern int security_init(void);
84652diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
84653index dc368b8..e895209 100644
84654--- a/include/linux/semaphore.h
84655+++ b/include/linux/semaphore.h
84656@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
84657 }
84658
84659 extern void down(struct semaphore *sem);
84660-extern int __must_check down_interruptible(struct semaphore *sem);
84661+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
84662 extern int __must_check down_killable(struct semaphore *sem);
84663 extern int __must_check down_trylock(struct semaphore *sem);
84664 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
84665diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
84666index 52e0097..383f21d 100644
84667--- a/include/linux/seq_file.h
84668+++ b/include/linux/seq_file.h
84669@@ -27,6 +27,9 @@ struct seq_file {
84670 struct mutex lock;
84671 const struct seq_operations *op;
84672 int poll_event;
84673+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
84674+ u64 exec_id;
84675+#endif
84676 #ifdef CONFIG_USER_NS
84677 struct user_namespace *user_ns;
84678 #endif
84679@@ -39,6 +42,7 @@ struct seq_operations {
84680 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
84681 int (*show) (struct seq_file *m, void *v);
84682 };
84683+typedef struct seq_operations __no_const seq_operations_no_const;
84684
84685 #define SEQ_SKIP 1
84686
84687@@ -96,6 +100,7 @@ void seq_pad(struct seq_file *m, char c);
84688
84689 char *mangle_path(char *s, const char *p, const char *esc);
84690 int seq_open(struct file *, const struct seq_operations *);
84691+int seq_open_restrict(struct file *, const struct seq_operations *);
84692 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
84693 loff_t seq_lseek(struct file *, loff_t, int);
84694 int seq_release(struct inode *, struct file *);
84695@@ -138,6 +143,7 @@ static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
84696 }
84697
84698 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
84699+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
84700 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
84701 int single_release(struct inode *, struct file *);
84702 void *__seq_open_private(struct file *, const struct seq_operations *, int);
84703diff --git a/include/linux/shm.h b/include/linux/shm.h
84704index 6fb8016..ab4465e 100644
84705--- a/include/linux/shm.h
84706+++ b/include/linux/shm.h
84707@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
84708 /* The task created the shm object. NULL if the task is dead. */
84709 struct task_struct *shm_creator;
84710 struct list_head shm_clist; /* list by creator */
84711+#ifdef CONFIG_GRKERNSEC
84712+ u64 shm_createtime;
84713+ pid_t shm_lapid;
84714+#endif
84715 };
84716
84717 /* shm_mode upper byte flags */
84718diff --git a/include/linux/signal.h b/include/linux/signal.h
84719index ab1e039..ad4229e 100644
84720--- a/include/linux/signal.h
84721+++ b/include/linux/signal.h
84722@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
84723 * know it'll be handled, so that they don't get converted to
84724 * SIGKILL or just silently dropped.
84725 */
84726- kernel_sigaction(sig, (__force __sighandler_t)2);
84727+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
84728 }
84729
84730 static inline void disallow_signal(int sig)
84731diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
84732index 6c8b6f6..5a0f4bd 100644
84733--- a/include/linux/skbuff.h
84734+++ b/include/linux/skbuff.h
84735@@ -773,7 +773,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
84736 struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
84737 int node);
84738 struct sk_buff *build_skb(void *data, unsigned int frag_size);
84739-static inline struct sk_buff *alloc_skb(unsigned int size,
84740+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
84741 gfp_t priority)
84742 {
84743 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
84744@@ -1962,7 +1962,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
84745 return skb->inner_transport_header - skb->inner_network_header;
84746 }
84747
84748-static inline int skb_network_offset(const struct sk_buff *skb)
84749+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
84750 {
84751 return skb_network_header(skb) - skb->data;
84752 }
84753@@ -2022,7 +2022,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
84754 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
84755 */
84756 #ifndef NET_SKB_PAD
84757-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
84758+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
84759 #endif
84760
84761 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
84762@@ -2629,7 +2629,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
84763 int *err);
84764 unsigned int datagram_poll(struct file *file, struct socket *sock,
84765 struct poll_table_struct *wait);
84766-int skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
84767+int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
84768 struct iovec *to, int size);
84769 int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen,
84770 struct iovec *iov);
84771@@ -3091,6 +3091,9 @@ static inline void nf_reset(struct sk_buff *skb)
84772 nf_bridge_put(skb->nf_bridge);
84773 skb->nf_bridge = NULL;
84774 #endif
84775+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
84776+ skb->nf_trace = 0;
84777+#endif
84778 }
84779
84780 static inline void nf_reset_trace(struct sk_buff *skb)
84781diff --git a/include/linux/slab.h b/include/linux/slab.h
84782index c265bec..4867d28 100644
84783--- a/include/linux/slab.h
84784+++ b/include/linux/slab.h
84785@@ -14,15 +14,29 @@
84786 #include <linux/gfp.h>
84787 #include <linux/types.h>
84788 #include <linux/workqueue.h>
84789-
84790+#include <linux/err.h>
84791
84792 /*
84793 * Flags to pass to kmem_cache_create().
84794 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
84795 */
84796 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
84797+
84798+#ifdef CONFIG_PAX_USERCOPY_SLABS
84799+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
84800+#else
84801+#define SLAB_USERCOPY 0x00000000UL
84802+#endif
84803+
84804 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
84805 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
84806+
84807+#ifdef CONFIG_PAX_MEMORY_SANITIZE
84808+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
84809+#else
84810+#define SLAB_NO_SANITIZE 0x00000000UL
84811+#endif
84812+
84813 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
84814 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
84815 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
84816@@ -98,10 +112,13 @@
84817 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
84818 * Both make kfree a no-op.
84819 */
84820-#define ZERO_SIZE_PTR ((void *)16)
84821+#define ZERO_SIZE_PTR \
84822+({ \
84823+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
84824+ (void *)(-MAX_ERRNO-1L); \
84825+})
84826
84827-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
84828- (unsigned long)ZERO_SIZE_PTR)
84829+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
84830
84831 #include <linux/kmemleak.h>
84832
84833@@ -144,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
84834 void kfree(const void *);
84835 void kzfree(const void *);
84836 size_t ksize(const void *);
84837+const char *check_heap_object(const void *ptr, unsigned long n);
84838+bool is_usercopy_object(const void *ptr);
84839
84840 /*
84841 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
84842@@ -236,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
84843 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
84844 #endif
84845
84846+#ifdef CONFIG_PAX_USERCOPY_SLABS
84847+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
84848+#endif
84849+
84850 /*
84851 * Figure out which kmalloc slab an allocation of a certain size
84852 * belongs to.
84853@@ -244,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
84854 * 2 = 120 .. 192 bytes
84855 * n = 2^(n-1) .. 2^n -1
84856 */
84857-static __always_inline int kmalloc_index(size_t size)
84858+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
84859 {
84860 if (!size)
84861 return 0;
84862@@ -287,11 +310,11 @@ static __always_inline int kmalloc_index(size_t size)
84863 }
84864 #endif /* !CONFIG_SLOB */
84865
84866-void *__kmalloc(size_t size, gfp_t flags);
84867+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
84868 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
84869
84870 #ifdef CONFIG_NUMA
84871-void *__kmalloc_node(size_t size, gfp_t flags, int node);
84872+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
84873 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
84874 #else
84875 static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
84876diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
84877index b869d16..1453c73 100644
84878--- a/include/linux/slab_def.h
84879+++ b/include/linux/slab_def.h
84880@@ -40,7 +40,7 @@ struct kmem_cache {
84881 /* 4) cache creation/removal */
84882 const char *name;
84883 struct list_head list;
84884- int refcount;
84885+ atomic_t refcount;
84886 int object_size;
84887 int align;
84888
84889@@ -56,10 +56,14 @@ struct kmem_cache {
84890 unsigned long node_allocs;
84891 unsigned long node_frees;
84892 unsigned long node_overflow;
84893- atomic_t allochit;
84894- atomic_t allocmiss;
84895- atomic_t freehit;
84896- atomic_t freemiss;
84897+ atomic_unchecked_t allochit;
84898+ atomic_unchecked_t allocmiss;
84899+ atomic_unchecked_t freehit;
84900+ atomic_unchecked_t freemiss;
84901+#ifdef CONFIG_PAX_MEMORY_SANITIZE
84902+ atomic_unchecked_t sanitized;
84903+ atomic_unchecked_t not_sanitized;
84904+#endif
84905
84906 /*
84907 * If debugging is enabled, then the allocator can add additional
84908diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
84909index d82abd4..408c3a0 100644
84910--- a/include/linux/slub_def.h
84911+++ b/include/linux/slub_def.h
84912@@ -74,7 +74,7 @@ struct kmem_cache {
84913 struct kmem_cache_order_objects max;
84914 struct kmem_cache_order_objects min;
84915 gfp_t allocflags; /* gfp flags to use on each alloc */
84916- int refcount; /* Refcount for slab cache destroy */
84917+ atomic_t refcount; /* Refcount for slab cache destroy */
84918 void (*ctor)(void *);
84919 int inuse; /* Offset to metadata */
84920 int align; /* Alignment */
84921diff --git a/include/linux/smp.h b/include/linux/smp.h
84922index 93dff5f..933c561 100644
84923--- a/include/linux/smp.h
84924+++ b/include/linux/smp.h
84925@@ -176,7 +176,9 @@ static inline void wake_up_all_idle_cpus(void) { }
84926 #endif
84927
84928 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
84929+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
84930 #define put_cpu() preempt_enable()
84931+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
84932
84933 /*
84934 * Callback to arch code if there's nosmp or maxcpus=0 on the
84935diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
84936index 46cca4c..3323536 100644
84937--- a/include/linux/sock_diag.h
84938+++ b/include/linux/sock_diag.h
84939@@ -11,7 +11,7 @@ struct sock;
84940 struct sock_diag_handler {
84941 __u8 family;
84942 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
84943-};
84944+} __do_const;
84945
84946 int sock_diag_register(const struct sock_diag_handler *h);
84947 void sock_diag_unregister(const struct sock_diag_handler *h);
84948diff --git a/include/linux/sonet.h b/include/linux/sonet.h
84949index 680f9a3..f13aeb0 100644
84950--- a/include/linux/sonet.h
84951+++ b/include/linux/sonet.h
84952@@ -7,7 +7,7 @@
84953 #include <uapi/linux/sonet.h>
84954
84955 struct k_sonet_stats {
84956-#define __HANDLE_ITEM(i) atomic_t i
84957+#define __HANDLE_ITEM(i) atomic_unchecked_t i
84958 __SONET_ITEMS
84959 #undef __HANDLE_ITEM
84960 };
84961diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
84962index 07d8e53..dc934c9 100644
84963--- a/include/linux/sunrpc/addr.h
84964+++ b/include/linux/sunrpc/addr.h
84965@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
84966 {
84967 switch (sap->sa_family) {
84968 case AF_INET:
84969- return ntohs(((struct sockaddr_in *)sap)->sin_port);
84970+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
84971 case AF_INET6:
84972- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
84973+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
84974 }
84975 return 0;
84976 }
84977@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
84978 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
84979 const struct sockaddr *src)
84980 {
84981- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
84982+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
84983 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
84984
84985 dsin->sin_family = ssin->sin_family;
84986@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
84987 if (sa->sa_family != AF_INET6)
84988 return 0;
84989
84990- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
84991+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
84992 }
84993
84994 #endif /* _LINUX_SUNRPC_ADDR_H */
84995diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
84996index 70736b9..37f33db 100644
84997--- a/include/linux/sunrpc/clnt.h
84998+++ b/include/linux/sunrpc/clnt.h
84999@@ -97,7 +97,7 @@ struct rpc_procinfo {
85000 unsigned int p_timer; /* Which RTT timer to use */
85001 u32 p_statidx; /* Which procedure to account */
85002 const char * p_name; /* name of procedure */
85003-};
85004+} __do_const;
85005
85006 #ifdef __KERNEL__
85007
85008diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
85009index 2167846..0648fc3 100644
85010--- a/include/linux/sunrpc/svc.h
85011+++ b/include/linux/sunrpc/svc.h
85012@@ -416,7 +416,7 @@ struct svc_procedure {
85013 unsigned int pc_count; /* call count */
85014 unsigned int pc_cachetype; /* cache info (NFS) */
85015 unsigned int pc_xdrressize; /* maximum size of XDR reply */
85016-};
85017+} __do_const;
85018
85019 /*
85020 * Function prototypes.
85021diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
85022index 975da75..318c083 100644
85023--- a/include/linux/sunrpc/svc_rdma.h
85024+++ b/include/linux/sunrpc/svc_rdma.h
85025@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
85026 extern unsigned int svcrdma_max_requests;
85027 extern unsigned int svcrdma_max_req_size;
85028
85029-extern atomic_t rdma_stat_recv;
85030-extern atomic_t rdma_stat_read;
85031-extern atomic_t rdma_stat_write;
85032-extern atomic_t rdma_stat_sq_starve;
85033-extern atomic_t rdma_stat_rq_starve;
85034-extern atomic_t rdma_stat_rq_poll;
85035-extern atomic_t rdma_stat_rq_prod;
85036-extern atomic_t rdma_stat_sq_poll;
85037-extern atomic_t rdma_stat_sq_prod;
85038+extern atomic_unchecked_t rdma_stat_recv;
85039+extern atomic_unchecked_t rdma_stat_read;
85040+extern atomic_unchecked_t rdma_stat_write;
85041+extern atomic_unchecked_t rdma_stat_sq_starve;
85042+extern atomic_unchecked_t rdma_stat_rq_starve;
85043+extern atomic_unchecked_t rdma_stat_rq_poll;
85044+extern atomic_unchecked_t rdma_stat_rq_prod;
85045+extern atomic_unchecked_t rdma_stat_sq_poll;
85046+extern atomic_unchecked_t rdma_stat_sq_prod;
85047
85048 #define RPCRDMA_VERSION 1
85049
85050diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
85051index 8d71d65..f79586e 100644
85052--- a/include/linux/sunrpc/svcauth.h
85053+++ b/include/linux/sunrpc/svcauth.h
85054@@ -120,7 +120,7 @@ struct auth_ops {
85055 int (*release)(struct svc_rqst *rq);
85056 void (*domain_release)(struct auth_domain *);
85057 int (*set_client)(struct svc_rqst *rq);
85058-};
85059+} __do_const;
85060
85061 #define SVC_GARBAGE 1
85062 #define SVC_SYSERR 2
85063diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
85064index e7a018e..49f8b17 100644
85065--- a/include/linux/swiotlb.h
85066+++ b/include/linux/swiotlb.h
85067@@ -60,7 +60,8 @@ extern void
85068
85069 extern void
85070 swiotlb_free_coherent(struct device *hwdev, size_t size,
85071- void *vaddr, dma_addr_t dma_handle);
85072+ void *vaddr, dma_addr_t dma_handle,
85073+ struct dma_attrs *attrs);
85074
85075 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
85076 unsigned long offset, size_t size,
85077diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
85078index bda9b81..629e06e 100644
85079--- a/include/linux/syscalls.h
85080+++ b/include/linux/syscalls.h
85081@@ -99,10 +99,16 @@ union bpf_attr;
85082 #define __MAP(n,...) __MAP##n(__VA_ARGS__)
85083
85084 #define __SC_DECL(t, a) t a
85085+#define __TYPE_IS_U(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))
85086 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
85087 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
85088 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
85089-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
85090+#define __SC_LONG(t, a) __typeof( \
85091+ __builtin_choose_expr( \
85092+ sizeof(t) > sizeof(int), \
85093+ (t) 0, \
85094+ __builtin_choose_expr(__TYPE_IS_U(t), 0UL, 0L) \
85095+ )) a
85096 #define __SC_CAST(t, a) (t) a
85097 #define __SC_ARGS(t, a) a
85098 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
85099@@ -384,11 +390,11 @@ asmlinkage long sys_sync(void);
85100 asmlinkage long sys_fsync(unsigned int fd);
85101 asmlinkage long sys_fdatasync(unsigned int fd);
85102 asmlinkage long sys_bdflush(int func, long data);
85103-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
85104- char __user *type, unsigned long flags,
85105+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
85106+ const char __user *type, unsigned long flags,
85107 void __user *data);
85108-asmlinkage long sys_umount(char __user *name, int flags);
85109-asmlinkage long sys_oldumount(char __user *name);
85110+asmlinkage long sys_umount(const char __user *name, int flags);
85111+asmlinkage long sys_oldumount(const char __user *name);
85112 asmlinkage long sys_truncate(const char __user *path, long length);
85113 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
85114 asmlinkage long sys_stat(const char __user *filename,
85115@@ -600,7 +606,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
85116 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
85117 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
85118 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
85119- struct sockaddr __user *, int);
85120+ struct sockaddr __user *, int) __intentional_overflow(0);
85121 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
85122 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
85123 unsigned int vlen, unsigned flags);
85124diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
85125index 27b3b0b..e093dd9 100644
85126--- a/include/linux/syscore_ops.h
85127+++ b/include/linux/syscore_ops.h
85128@@ -16,7 +16,7 @@ struct syscore_ops {
85129 int (*suspend)(void);
85130 void (*resume)(void);
85131 void (*shutdown)(void);
85132-};
85133+} __do_const;
85134
85135 extern void register_syscore_ops(struct syscore_ops *ops);
85136 extern void unregister_syscore_ops(struct syscore_ops *ops);
85137diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
85138index b7361f8..341a15a 100644
85139--- a/include/linux/sysctl.h
85140+++ b/include/linux/sysctl.h
85141@@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
85142
85143 extern int proc_dostring(struct ctl_table *, int,
85144 void __user *, size_t *, loff_t *);
85145+extern int proc_dostring_modpriv(struct ctl_table *, int,
85146+ void __user *, size_t *, loff_t *);
85147 extern int proc_dointvec(struct ctl_table *, int,
85148 void __user *, size_t *, loff_t *);
85149 extern int proc_dointvec_minmax(struct ctl_table *, int,
85150@@ -113,7 +115,8 @@ struct ctl_table
85151 struct ctl_table_poll *poll;
85152 void *extra1;
85153 void *extra2;
85154-};
85155+} __do_const __randomize_layout;
85156+typedef struct ctl_table __no_const ctl_table_no_const;
85157
85158 struct ctl_node {
85159 struct rb_node node;
85160diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
85161index f97d0db..c1187dc 100644
85162--- a/include/linux/sysfs.h
85163+++ b/include/linux/sysfs.h
85164@@ -34,7 +34,8 @@ struct attribute {
85165 struct lock_class_key *key;
85166 struct lock_class_key skey;
85167 #endif
85168-};
85169+} __do_const;
85170+typedef struct attribute __no_const attribute_no_const;
85171
85172 /**
85173 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
85174@@ -63,7 +64,8 @@ struct attribute_group {
85175 struct attribute *, int);
85176 struct attribute **attrs;
85177 struct bin_attribute **bin_attrs;
85178-};
85179+} __do_const;
85180+typedef struct attribute_group __no_const attribute_group_no_const;
85181
85182 /**
85183 * Use these macros to make defining attributes easier. See include/linux/device.h
85184@@ -128,7 +130,8 @@ struct bin_attribute {
85185 char *, loff_t, size_t);
85186 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
85187 struct vm_area_struct *vma);
85188-};
85189+} __do_const;
85190+typedef struct bin_attribute __no_const bin_attribute_no_const;
85191
85192 /**
85193 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
85194diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
85195index 387fa7d..3fcde6b 100644
85196--- a/include/linux/sysrq.h
85197+++ b/include/linux/sysrq.h
85198@@ -16,6 +16,7 @@
85199
85200 #include <linux/errno.h>
85201 #include <linux/types.h>
85202+#include <linux/compiler.h>
85203
85204 /* Possible values of bitmask for enabling sysrq functions */
85205 /* 0x0001 is reserved for enable everything */
85206@@ -33,7 +34,7 @@ struct sysrq_key_op {
85207 char *help_msg;
85208 char *action_msg;
85209 int enable_mask;
85210-};
85211+} __do_const;
85212
85213 #ifdef CONFIG_MAGIC_SYSRQ
85214
85215diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
85216index ff307b5..f1a4468 100644
85217--- a/include/linux/thread_info.h
85218+++ b/include/linux/thread_info.h
85219@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
85220 #error "no set_restore_sigmask() provided and default one won't work"
85221 #endif
85222
85223+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
85224+
85225+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
85226+{
85227+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
85228+}
85229+
85230 #endif /* __KERNEL__ */
85231
85232 #endif /* _LINUX_THREAD_INFO_H */
85233diff --git a/include/linux/tty.h b/include/linux/tty.h
85234index 5171ef8..1048d83e 100644
85235--- a/include/linux/tty.h
85236+++ b/include/linux/tty.h
85237@@ -202,7 +202,7 @@ struct tty_port {
85238 const struct tty_port_operations *ops; /* Port operations */
85239 spinlock_t lock; /* Lock protecting tty field */
85240 int blocked_open; /* Waiting to open */
85241- int count; /* Usage count */
85242+ atomic_t count; /* Usage count */
85243 wait_queue_head_t open_wait; /* Open waiters */
85244 wait_queue_head_t close_wait; /* Close waiters */
85245 wait_queue_head_t delta_msr_wait; /* Modem status change */
85246@@ -290,7 +290,7 @@ struct tty_struct {
85247 /* If the tty has a pending do_SAK, queue it here - akpm */
85248 struct work_struct SAK_work;
85249 struct tty_port *port;
85250-};
85251+} __randomize_layout;
85252
85253 /* Each of a tty's open files has private_data pointing to tty_file_private */
85254 struct tty_file_private {
85255@@ -555,7 +555,7 @@ extern int tty_port_open(struct tty_port *port,
85256 struct tty_struct *tty, struct file *filp);
85257 static inline int tty_port_users(struct tty_port *port)
85258 {
85259- return port->count + port->blocked_open;
85260+ return atomic_read(&port->count) + port->blocked_open;
85261 }
85262
85263 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
85264diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
85265index 92e337c..f46757b 100644
85266--- a/include/linux/tty_driver.h
85267+++ b/include/linux/tty_driver.h
85268@@ -291,7 +291,7 @@ struct tty_operations {
85269 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
85270 #endif
85271 const struct file_operations *proc_fops;
85272-};
85273+} __do_const __randomize_layout;
85274
85275 struct tty_driver {
85276 int magic; /* magic number for this structure */
85277@@ -325,7 +325,7 @@ struct tty_driver {
85278
85279 const struct tty_operations *ops;
85280 struct list_head tty_drivers;
85281-};
85282+} __randomize_layout;
85283
85284 extern struct list_head tty_drivers;
85285
85286diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
85287index 00c9d68..bc0188b 100644
85288--- a/include/linux/tty_ldisc.h
85289+++ b/include/linux/tty_ldisc.h
85290@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
85291
85292 struct module *owner;
85293
85294- int refcount;
85295+ atomic_t refcount;
85296 };
85297
85298 struct tty_ldisc {
85299diff --git a/include/linux/types.h b/include/linux/types.h
85300index a0bb704..f511c77 100644
85301--- a/include/linux/types.h
85302+++ b/include/linux/types.h
85303@@ -177,10 +177,26 @@ typedef struct {
85304 int counter;
85305 } atomic_t;
85306
85307+#ifdef CONFIG_PAX_REFCOUNT
85308+typedef struct {
85309+ int counter;
85310+} atomic_unchecked_t;
85311+#else
85312+typedef atomic_t atomic_unchecked_t;
85313+#endif
85314+
85315 #ifdef CONFIG_64BIT
85316 typedef struct {
85317 long counter;
85318 } atomic64_t;
85319+
85320+#ifdef CONFIG_PAX_REFCOUNT
85321+typedef struct {
85322+ long counter;
85323+} atomic64_unchecked_t;
85324+#else
85325+typedef atomic64_t atomic64_unchecked_t;
85326+#endif
85327 #endif
85328
85329 struct list_head {
85330diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
85331index ecd3319..8a36ded 100644
85332--- a/include/linux/uaccess.h
85333+++ b/include/linux/uaccess.h
85334@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
85335 long ret; \
85336 mm_segment_t old_fs = get_fs(); \
85337 \
85338- set_fs(KERNEL_DS); \
85339 pagefault_disable(); \
85340- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
85341- pagefault_enable(); \
85342+ set_fs(KERNEL_DS); \
85343+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
85344 set_fs(old_fs); \
85345+ pagefault_enable(); \
85346 ret; \
85347 })
85348
85349diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
85350index 2d1f9b6..d7a9fce 100644
85351--- a/include/linux/uidgid.h
85352+++ b/include/linux/uidgid.h
85353@@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
85354
85355 #endif /* CONFIG_USER_NS */
85356
85357+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
85358+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
85359+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
85360+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
85361+
85362 #endif /* _LINUX_UIDGID_H */
85363diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
85364index baa8171..9ca98ba 100644
85365--- a/include/linux/uio_driver.h
85366+++ b/include/linux/uio_driver.h
85367@@ -67,7 +67,7 @@ struct uio_device {
85368 struct module *owner;
85369 struct device *dev;
85370 int minor;
85371- atomic_t event;
85372+ atomic_unchecked_t event;
85373 struct fasync_struct *async_queue;
85374 wait_queue_head_t wait;
85375 struct uio_info *info;
85376diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
85377index 99c1b4d..562e6f3 100644
85378--- a/include/linux/unaligned/access_ok.h
85379+++ b/include/linux/unaligned/access_ok.h
85380@@ -4,34 +4,34 @@
85381 #include <linux/kernel.h>
85382 #include <asm/byteorder.h>
85383
85384-static inline u16 get_unaligned_le16(const void *p)
85385+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
85386 {
85387- return le16_to_cpup((__le16 *)p);
85388+ return le16_to_cpup((const __le16 *)p);
85389 }
85390
85391-static inline u32 get_unaligned_le32(const void *p)
85392+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
85393 {
85394- return le32_to_cpup((__le32 *)p);
85395+ return le32_to_cpup((const __le32 *)p);
85396 }
85397
85398-static inline u64 get_unaligned_le64(const void *p)
85399+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
85400 {
85401- return le64_to_cpup((__le64 *)p);
85402+ return le64_to_cpup((const __le64 *)p);
85403 }
85404
85405-static inline u16 get_unaligned_be16(const void *p)
85406+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
85407 {
85408- return be16_to_cpup((__be16 *)p);
85409+ return be16_to_cpup((const __be16 *)p);
85410 }
85411
85412-static inline u32 get_unaligned_be32(const void *p)
85413+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
85414 {
85415- return be32_to_cpup((__be32 *)p);
85416+ return be32_to_cpup((const __be32 *)p);
85417 }
85418
85419-static inline u64 get_unaligned_be64(const void *p)
85420+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
85421 {
85422- return be64_to_cpup((__be64 *)p);
85423+ return be64_to_cpup((const __be64 *)p);
85424 }
85425
85426 static inline void put_unaligned_le16(u16 val, void *p)
85427diff --git a/include/linux/usb.h b/include/linux/usb.h
85428index 447a7e2..9cea7e9 100644
85429--- a/include/linux/usb.h
85430+++ b/include/linux/usb.h
85431@@ -571,7 +571,7 @@ struct usb_device {
85432 int maxchild;
85433
85434 u32 quirks;
85435- atomic_t urbnum;
85436+ atomic_unchecked_t urbnum;
85437
85438 unsigned long active_duration;
85439
85440@@ -1655,7 +1655,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
85441
85442 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
85443 __u8 request, __u8 requesttype, __u16 value, __u16 index,
85444- void *data, __u16 size, int timeout);
85445+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
85446 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
85447 void *data, int len, int *actual_length, int timeout);
85448 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
85449diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
85450index d5952bb..9a626d4 100644
85451--- a/include/linux/usb/renesas_usbhs.h
85452+++ b/include/linux/usb/renesas_usbhs.h
85453@@ -39,7 +39,7 @@ enum {
85454 */
85455 struct renesas_usbhs_driver_callback {
85456 int (*notify_hotplug)(struct platform_device *pdev);
85457-};
85458+} __no_const;
85459
85460 /*
85461 * callback functions for platform
85462diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
85463index 9f3579f..3b2afa5 100644
85464--- a/include/linux/user_namespace.h
85465+++ b/include/linux/user_namespace.h
85466@@ -38,7 +38,7 @@ struct user_namespace {
85467 struct key *persistent_keyring_register;
85468 struct rw_semaphore persistent_keyring_register_sem;
85469 #endif
85470-};
85471+} __randomize_layout;
85472
85473 extern struct user_namespace init_user_ns;
85474
85475diff --git a/include/linux/utsname.h b/include/linux/utsname.h
85476index 239e277..22a5cf5 100644
85477--- a/include/linux/utsname.h
85478+++ b/include/linux/utsname.h
85479@@ -24,7 +24,7 @@ struct uts_namespace {
85480 struct new_utsname name;
85481 struct user_namespace *user_ns;
85482 unsigned int proc_inum;
85483-};
85484+} __randomize_layout;
85485 extern struct uts_namespace init_uts_ns;
85486
85487 #ifdef CONFIG_UTS_NS
85488diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
85489index 6f8fbcf..4efc177 100644
85490--- a/include/linux/vermagic.h
85491+++ b/include/linux/vermagic.h
85492@@ -25,9 +25,42 @@
85493 #define MODULE_ARCH_VERMAGIC ""
85494 #endif
85495
85496+#ifdef CONFIG_PAX_REFCOUNT
85497+#define MODULE_PAX_REFCOUNT "REFCOUNT "
85498+#else
85499+#define MODULE_PAX_REFCOUNT ""
85500+#endif
85501+
85502+#ifdef CONSTIFY_PLUGIN
85503+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
85504+#else
85505+#define MODULE_CONSTIFY_PLUGIN ""
85506+#endif
85507+
85508+#ifdef STACKLEAK_PLUGIN
85509+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
85510+#else
85511+#define MODULE_STACKLEAK_PLUGIN ""
85512+#endif
85513+
85514+#ifdef RANDSTRUCT_PLUGIN
85515+#include <generated/randomize_layout_hash.h>
85516+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
85517+#else
85518+#define MODULE_RANDSTRUCT_PLUGIN
85519+#endif
85520+
85521+#ifdef CONFIG_GRKERNSEC
85522+#define MODULE_GRSEC "GRSEC "
85523+#else
85524+#define MODULE_GRSEC ""
85525+#endif
85526+
85527 #define VERMAGIC_STRING \
85528 UTS_RELEASE " " \
85529 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
85530 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
85531- MODULE_ARCH_VERMAGIC
85532+ MODULE_ARCH_VERMAGIC \
85533+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
85534+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
85535
85536diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
85537index b483abd..af305ad 100644
85538--- a/include/linux/vga_switcheroo.h
85539+++ b/include/linux/vga_switcheroo.h
85540@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
85541
85542 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
85543
85544-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
85545+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
85546 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
85547-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
85548+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
85549 #else
85550
85551 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
85552@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
85553
85554 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
85555
85556-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
85557+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
85558 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
85559-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
85560+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
85561
85562 #endif
85563 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
85564diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
85565index b87696f..1d11de7 100644
85566--- a/include/linux/vmalloc.h
85567+++ b/include/linux/vmalloc.h
85568@@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
85569 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
85570 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
85571 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
85572+
85573+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
85574+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
85575+#endif
85576+
85577 /* bits [20..32] reserved for arch specific ioremap internals */
85578
85579 /*
85580@@ -82,6 +87,10 @@ extern void *vmap(struct page **pages, unsigned int count,
85581 unsigned long flags, pgprot_t prot);
85582 extern void vunmap(const void *addr);
85583
85584+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85585+extern void unmap_process_stacks(struct task_struct *task);
85586+#endif
85587+
85588 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
85589 unsigned long uaddr, void *kaddr,
85590 unsigned long size);
85591@@ -142,7 +151,7 @@ extern void free_vm_area(struct vm_struct *area);
85592
85593 /* for /dev/kmem */
85594 extern long vread(char *buf, char *addr, unsigned long count);
85595-extern long vwrite(char *buf, char *addr, unsigned long count);
85596+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
85597
85598 /*
85599 * Internals. Dont't use..
85600diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
85601index 82e7db7..f8ce3d0 100644
85602--- a/include/linux/vmstat.h
85603+++ b/include/linux/vmstat.h
85604@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
85605 /*
85606 * Zone based page accounting with per cpu differentials.
85607 */
85608-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
85609+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
85610
85611 static inline void zone_page_state_add(long x, struct zone *zone,
85612 enum zone_stat_item item)
85613 {
85614- atomic_long_add(x, &zone->vm_stat[item]);
85615- atomic_long_add(x, &vm_stat[item]);
85616+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
85617+ atomic_long_add_unchecked(x, &vm_stat[item]);
85618 }
85619
85620-static inline unsigned long global_page_state(enum zone_stat_item item)
85621+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
85622 {
85623- long x = atomic_long_read(&vm_stat[item]);
85624+ long x = atomic_long_read_unchecked(&vm_stat[item]);
85625 #ifdef CONFIG_SMP
85626 if (x < 0)
85627 x = 0;
85628@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
85629 return x;
85630 }
85631
85632-static inline unsigned long zone_page_state(struct zone *zone,
85633+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
85634 enum zone_stat_item item)
85635 {
85636- long x = atomic_long_read(&zone->vm_stat[item]);
85637+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
85638 #ifdef CONFIG_SMP
85639 if (x < 0)
85640 x = 0;
85641@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
85642 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
85643 enum zone_stat_item item)
85644 {
85645- long x = atomic_long_read(&zone->vm_stat[item]);
85646+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
85647
85648 #ifdef CONFIG_SMP
85649 int cpu;
85650@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
85651
85652 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
85653 {
85654- atomic_long_inc(&zone->vm_stat[item]);
85655- atomic_long_inc(&vm_stat[item]);
85656+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
85657+ atomic_long_inc_unchecked(&vm_stat[item]);
85658 }
85659
85660 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
85661 {
85662- atomic_long_dec(&zone->vm_stat[item]);
85663- atomic_long_dec(&vm_stat[item]);
85664+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
85665+ atomic_long_dec_unchecked(&vm_stat[item]);
85666 }
85667
85668 static inline void __inc_zone_page_state(struct page *page,
85669diff --git a/include/linux/xattr.h b/include/linux/xattr.h
85670index 91b0a68..0e9adf6 100644
85671--- a/include/linux/xattr.h
85672+++ b/include/linux/xattr.h
85673@@ -28,7 +28,7 @@ struct xattr_handler {
85674 size_t size, int handler_flags);
85675 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
85676 size_t size, int flags, int handler_flags);
85677-};
85678+} __do_const;
85679
85680 struct xattr {
85681 const char *name;
85682@@ -37,6 +37,9 @@ struct xattr {
85683 };
85684
85685 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
85686+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
85687+ssize_t pax_getxattr(struct dentry *, void *, size_t);
85688+#endif
85689 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
85690 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
85691 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
85692diff --git a/include/linux/zlib.h b/include/linux/zlib.h
85693index 92dbbd3..13ab0b3 100644
85694--- a/include/linux/zlib.h
85695+++ b/include/linux/zlib.h
85696@@ -31,6 +31,7 @@
85697 #define _ZLIB_H
85698
85699 #include <linux/zconf.h>
85700+#include <linux/compiler.h>
85701
85702 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
85703 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
85704@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
85705
85706 /* basic functions */
85707
85708-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
85709+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
85710 /*
85711 Returns the number of bytes that needs to be allocated for a per-
85712 stream workspace with the specified parameters. A pointer to this
85713diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
85714index eb76cfd..9fd0e7c 100644
85715--- a/include/media/v4l2-dev.h
85716+++ b/include/media/v4l2-dev.h
85717@@ -75,7 +75,7 @@ struct v4l2_file_operations {
85718 int (*mmap) (struct file *, struct vm_area_struct *);
85719 int (*open) (struct file *);
85720 int (*release) (struct file *);
85721-};
85722+} __do_const;
85723
85724 /*
85725 * Newer version of video_device, handled by videodev2.c
85726diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
85727index ffb69da..040393e 100644
85728--- a/include/media/v4l2-device.h
85729+++ b/include/media/v4l2-device.h
85730@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
85731 this function returns 0. If the name ends with a digit (e.g. cx18),
85732 then the name will be set to cx18-0 since cx180 looks really odd. */
85733 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
85734- atomic_t *instance);
85735+ atomic_unchecked_t *instance);
85736
85737 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
85738 Since the parent disappears this ensures that v4l2_dev doesn't have an
85739diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
85740index 2a25dec..bf6dd8a 100644
85741--- a/include/net/9p/transport.h
85742+++ b/include/net/9p/transport.h
85743@@ -62,7 +62,7 @@ struct p9_trans_module {
85744 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
85745 int (*zc_request)(struct p9_client *, struct p9_req_t *,
85746 char *, char *, int , int, int, int);
85747-};
85748+} __do_const;
85749
85750 void v9fs_register_trans(struct p9_trans_module *m);
85751 void v9fs_unregister_trans(struct p9_trans_module *m);
85752diff --git a/include/net/af_unix.h b/include/net/af_unix.h
85753index a175ba4..196eb8242 100644
85754--- a/include/net/af_unix.h
85755+++ b/include/net/af_unix.h
85756@@ -36,7 +36,7 @@ struct unix_skb_parms {
85757 u32 secid; /* Security ID */
85758 #endif
85759 u32 consumed;
85760-};
85761+} __randomize_layout;
85762
85763 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
85764 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
85765diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
85766index ead99f0..6263c4b 100644
85767--- a/include/net/bluetooth/l2cap.h
85768+++ b/include/net/bluetooth/l2cap.h
85769@@ -608,7 +608,7 @@ struct l2cap_ops {
85770 unsigned char *kdata,
85771 struct iovec *iov,
85772 int len);
85773-};
85774+} __do_const;
85775
85776 struct l2cap_conn {
85777 struct hci_conn *hcon;
85778diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
85779index f2ae33d..c457cf0 100644
85780--- a/include/net/caif/cfctrl.h
85781+++ b/include/net/caif/cfctrl.h
85782@@ -52,7 +52,7 @@ struct cfctrl_rsp {
85783 void (*radioset_rsp)(void);
85784 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
85785 struct cflayer *client_layer);
85786-};
85787+} __no_const;
85788
85789 /* Link Setup Parameters for CAIF-Links. */
85790 struct cfctrl_link_param {
85791@@ -101,8 +101,8 @@ struct cfctrl_request_info {
85792 struct cfctrl {
85793 struct cfsrvl serv;
85794 struct cfctrl_rsp res;
85795- atomic_t req_seq_no;
85796- atomic_t rsp_seq_no;
85797+ atomic_unchecked_t req_seq_no;
85798+ atomic_unchecked_t rsp_seq_no;
85799 struct list_head list;
85800 /* Protects from simultaneous access to first_req list */
85801 spinlock_t info_list_lock;
85802diff --git a/include/net/flow.h b/include/net/flow.h
85803index 8109a15..504466d 100644
85804--- a/include/net/flow.h
85805+++ b/include/net/flow.h
85806@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
85807
85808 void flow_cache_flush(struct net *net);
85809 void flow_cache_flush_deferred(struct net *net);
85810-extern atomic_t flow_cache_genid;
85811+extern atomic_unchecked_t flow_cache_genid;
85812
85813 #endif
85814diff --git a/include/net/genetlink.h b/include/net/genetlink.h
85815index af10c2c..a431cc5 100644
85816--- a/include/net/genetlink.h
85817+++ b/include/net/genetlink.h
85818@@ -120,7 +120,7 @@ struct genl_ops {
85819 u8 cmd;
85820 u8 internal_flags;
85821 u8 flags;
85822-};
85823+} __do_const;
85824
85825 int __genl_register_family(struct genl_family *family);
85826
85827diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
85828index 734d9b5..48a9a4b 100644
85829--- a/include/net/gro_cells.h
85830+++ b/include/net/gro_cells.h
85831@@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
85832 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
85833
85834 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
85835- atomic_long_inc(&dev->rx_dropped);
85836+ atomic_long_inc_unchecked(&dev->rx_dropped);
85837 kfree_skb(skb);
85838 return;
85839 }
85840diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
85841index 848e85c..051c7de 100644
85842--- a/include/net/inet_connection_sock.h
85843+++ b/include/net/inet_connection_sock.h
85844@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
85845 int (*bind_conflict)(const struct sock *sk,
85846 const struct inet_bind_bucket *tb, bool relax);
85847 void (*mtu_reduced)(struct sock *sk);
85848-};
85849+} __do_const;
85850
85851 /** inet_connection_sock - INET connection oriented sock
85852 *
85853diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
85854index 80479ab..0c3f647 100644
85855--- a/include/net/inetpeer.h
85856+++ b/include/net/inetpeer.h
85857@@ -47,7 +47,7 @@ struct inet_peer {
85858 */
85859 union {
85860 struct {
85861- atomic_t rid; /* Frag reception counter */
85862+ atomic_unchecked_t rid; /* Frag reception counter */
85863 };
85864 struct rcu_head rcu;
85865 struct inet_peer *gc_next;
85866diff --git a/include/net/ip.h b/include/net/ip.h
85867index 0bb6207..a8878af 100644
85868--- a/include/net/ip.h
85869+++ b/include/net/ip.h
85870@@ -316,7 +316,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
85871 }
85872 }
85873
85874-u32 ip_idents_reserve(u32 hash, int segs);
85875+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
85876 void __ip_select_ident(struct iphdr *iph, int segs);
85877
85878 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
85879diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
85880index dc9d2a2..d985691 100644
85881--- a/include/net/ip_fib.h
85882+++ b/include/net/ip_fib.h
85883@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
85884
85885 #define FIB_RES_SADDR(net, res) \
85886 ((FIB_RES_NH(res).nh_saddr_genid == \
85887- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
85888+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
85889 FIB_RES_NH(res).nh_saddr : \
85890 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
85891 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
85892diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
85893index 615b20b..fd4cbd8 100644
85894--- a/include/net/ip_vs.h
85895+++ b/include/net/ip_vs.h
85896@@ -534,7 +534,7 @@ struct ip_vs_conn {
85897 struct ip_vs_conn *control; /* Master control connection */
85898 atomic_t n_control; /* Number of controlled ones */
85899 struct ip_vs_dest *dest; /* real server */
85900- atomic_t in_pkts; /* incoming packet counter */
85901+ atomic_unchecked_t in_pkts; /* incoming packet counter */
85902
85903 /* Packet transmitter for different forwarding methods. If it
85904 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
85905@@ -682,7 +682,7 @@ struct ip_vs_dest {
85906 __be16 port; /* port number of the server */
85907 union nf_inet_addr addr; /* IP address of the server */
85908 volatile unsigned int flags; /* dest status flags */
85909- atomic_t conn_flags; /* flags to copy to conn */
85910+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
85911 atomic_t weight; /* server weight */
85912
85913 atomic_t refcnt; /* reference counter */
85914@@ -928,11 +928,11 @@ struct netns_ipvs {
85915 /* ip_vs_lblc */
85916 int sysctl_lblc_expiration;
85917 struct ctl_table_header *lblc_ctl_header;
85918- struct ctl_table *lblc_ctl_table;
85919+ ctl_table_no_const *lblc_ctl_table;
85920 /* ip_vs_lblcr */
85921 int sysctl_lblcr_expiration;
85922 struct ctl_table_header *lblcr_ctl_header;
85923- struct ctl_table *lblcr_ctl_table;
85924+ ctl_table_no_const *lblcr_ctl_table;
85925 /* ip_vs_est */
85926 struct list_head est_list; /* estimator list */
85927 spinlock_t est_lock;
85928diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
85929index 8d4f588..2e37ad2 100644
85930--- a/include/net/irda/ircomm_tty.h
85931+++ b/include/net/irda/ircomm_tty.h
85932@@ -33,6 +33,7 @@
85933 #include <linux/termios.h>
85934 #include <linux/timer.h>
85935 #include <linux/tty.h> /* struct tty_struct */
85936+#include <asm/local.h>
85937
85938 #include <net/irda/irias_object.h>
85939 #include <net/irda/ircomm_core.h>
85940diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
85941index 714cc9a..ea05f3e 100644
85942--- a/include/net/iucv/af_iucv.h
85943+++ b/include/net/iucv/af_iucv.h
85944@@ -149,7 +149,7 @@ struct iucv_skb_cb {
85945 struct iucv_sock_list {
85946 struct hlist_head head;
85947 rwlock_t lock;
85948- atomic_t autobind_name;
85949+ atomic_unchecked_t autobind_name;
85950 };
85951
85952 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
85953diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
85954index f3be818..bf46196 100644
85955--- a/include/net/llc_c_ac.h
85956+++ b/include/net/llc_c_ac.h
85957@@ -87,7 +87,7 @@
85958 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
85959 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
85960
85961-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
85962+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
85963
85964 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
85965 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
85966diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
85967index 3948cf1..83b28c4 100644
85968--- a/include/net/llc_c_ev.h
85969+++ b/include/net/llc_c_ev.h
85970@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
85971 return (struct llc_conn_state_ev *)skb->cb;
85972 }
85973
85974-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
85975-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
85976+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
85977+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
85978
85979 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
85980 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
85981diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
85982index 0e79cfb..f46db31 100644
85983--- a/include/net/llc_c_st.h
85984+++ b/include/net/llc_c_st.h
85985@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
85986 u8 next_state;
85987 llc_conn_ev_qfyr_t *ev_qualifiers;
85988 llc_conn_action_t *ev_actions;
85989-};
85990+} __do_const;
85991
85992 struct llc_conn_state {
85993 u8 current_state;
85994diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
85995index a61b98c..aade1eb 100644
85996--- a/include/net/llc_s_ac.h
85997+++ b/include/net/llc_s_ac.h
85998@@ -23,7 +23,7 @@
85999 #define SAP_ACT_TEST_IND 9
86000
86001 /* All action functions must look like this */
86002-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
86003+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
86004
86005 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
86006 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
86007diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
86008index 567c681..cd73ac02 100644
86009--- a/include/net/llc_s_st.h
86010+++ b/include/net/llc_s_st.h
86011@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
86012 llc_sap_ev_t ev;
86013 u8 next_state;
86014 llc_sap_action_t *ev_actions;
86015-};
86016+} __do_const;
86017
86018 struct llc_sap_state {
86019 u8 curr_state;
86020diff --git a/include/net/mac80211.h b/include/net/mac80211.h
86021index 0ad1f47..aaea45b 100644
86022--- a/include/net/mac80211.h
86023+++ b/include/net/mac80211.h
86024@@ -4648,7 +4648,7 @@ struct rate_control_ops {
86025 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
86026
86027 u32 (*get_expected_throughput)(void *priv_sta);
86028-};
86029+} __do_const;
86030
86031 static inline int rate_supported(struct ieee80211_sta *sta,
86032 enum ieee80211_band band,
86033diff --git a/include/net/neighbour.h b/include/net/neighbour.h
86034index f60558d..e5ed9bd 100644
86035--- a/include/net/neighbour.h
86036+++ b/include/net/neighbour.h
86037@@ -163,7 +163,7 @@ struct neigh_ops {
86038 void (*error_report)(struct neighbour *, struct sk_buff *);
86039 int (*output)(struct neighbour *, struct sk_buff *);
86040 int (*connected_output)(struct neighbour *, struct sk_buff *);
86041-};
86042+} __do_const;
86043
86044 struct pneigh_entry {
86045 struct pneigh_entry *next;
86046@@ -217,7 +217,7 @@ struct neigh_table {
86047 struct neigh_statistics __percpu *stats;
86048 struct neigh_hash_table __rcu *nht;
86049 struct pneigh_entry **phash_buckets;
86050-};
86051+} __randomize_layout;
86052
86053 static inline int neigh_parms_family(struct neigh_parms *p)
86054 {
86055diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
86056index e0d6466..e2f3003 100644
86057--- a/include/net/net_namespace.h
86058+++ b/include/net/net_namespace.h
86059@@ -129,8 +129,8 @@ struct net {
86060 struct netns_ipvs *ipvs;
86061 #endif
86062 struct sock *diag_nlsk;
86063- atomic_t fnhe_genid;
86064-};
86065+ atomic_unchecked_t fnhe_genid;
86066+} __randomize_layout;
86067
86068 #include <linux/seq_file_net.h>
86069
86070@@ -286,7 +286,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
86071 #define __net_init __init
86072 #define __net_exit __exit_refok
86073 #define __net_initdata __initdata
86074+#ifdef CONSTIFY_PLUGIN
86075 #define __net_initconst __initconst
86076+#else
86077+#define __net_initconst __initdata
86078+#endif
86079 #endif
86080
86081 struct pernet_operations {
86082@@ -296,7 +300,7 @@ struct pernet_operations {
86083 void (*exit_batch)(struct list_head *net_exit_list);
86084 int *id;
86085 size_t size;
86086-};
86087+} __do_const;
86088
86089 /*
86090 * Use these carefully. If you implement a network device and it
86091@@ -344,12 +348,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
86092
86093 static inline int rt_genid_ipv4(struct net *net)
86094 {
86095- return atomic_read(&net->ipv4.rt_genid);
86096+ return atomic_read_unchecked(&net->ipv4.rt_genid);
86097 }
86098
86099 static inline void rt_genid_bump_ipv4(struct net *net)
86100 {
86101- atomic_inc(&net->ipv4.rt_genid);
86102+ atomic_inc_unchecked(&net->ipv4.rt_genid);
86103 }
86104
86105 extern void (*__fib6_flush_trees)(struct net *net);
86106@@ -376,12 +380,12 @@ static inline void rt_genid_bump_all(struct net *net)
86107
86108 static inline int fnhe_genid(struct net *net)
86109 {
86110- return atomic_read(&net->fnhe_genid);
86111+ return atomic_read_unchecked(&net->fnhe_genid);
86112 }
86113
86114 static inline void fnhe_genid_bump(struct net *net)
86115 {
86116- atomic_inc(&net->fnhe_genid);
86117+ atomic_inc_unchecked(&net->fnhe_genid);
86118 }
86119
86120 #endif /* __NET_NET_NAMESPACE_H */
86121diff --git a/include/net/netlink.h b/include/net/netlink.h
86122index 7b903e1..ad9ca4b 100644
86123--- a/include/net/netlink.h
86124+++ b/include/net/netlink.h
86125@@ -521,7 +521,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
86126 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
86127 {
86128 if (mark)
86129- skb_trim(skb, (unsigned char *) mark - skb->data);
86130+ skb_trim(skb, (const unsigned char *) mark - skb->data);
86131 }
86132
86133 /**
86134diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
86135index 29d6a94..235d3d84 100644
86136--- a/include/net/netns/conntrack.h
86137+++ b/include/net/netns/conntrack.h
86138@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
86139 struct nf_proto_net {
86140 #ifdef CONFIG_SYSCTL
86141 struct ctl_table_header *ctl_table_header;
86142- struct ctl_table *ctl_table;
86143+ ctl_table_no_const *ctl_table;
86144 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
86145 struct ctl_table_header *ctl_compat_header;
86146- struct ctl_table *ctl_compat_table;
86147+ ctl_table_no_const *ctl_compat_table;
86148 #endif
86149 #endif
86150 unsigned int users;
86151@@ -60,7 +60,7 @@ struct nf_ip_net {
86152 struct nf_icmp_net icmpv6;
86153 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
86154 struct ctl_table_header *ctl_table_header;
86155- struct ctl_table *ctl_table;
86156+ ctl_table_no_const *ctl_table;
86157 #endif
86158 };
86159
86160diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
86161index 24945ce..f19e42f 100644
86162--- a/include/net/netns/ipv4.h
86163+++ b/include/net/netns/ipv4.h
86164@@ -83,7 +83,7 @@ struct netns_ipv4 {
86165
86166 struct ping_group_range ping_group_range;
86167
86168- atomic_t dev_addr_genid;
86169+ atomic_unchecked_t dev_addr_genid;
86170
86171 #ifdef CONFIG_SYSCTL
86172 unsigned long *sysctl_local_reserved_ports;
86173@@ -97,6 +97,6 @@ struct netns_ipv4 {
86174 struct fib_rules_ops *mr_rules_ops;
86175 #endif
86176 #endif
86177- atomic_t rt_genid;
86178+ atomic_unchecked_t rt_genid;
86179 };
86180 #endif
86181diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
86182index 69ae41f..4f94868 100644
86183--- a/include/net/netns/ipv6.h
86184+++ b/include/net/netns/ipv6.h
86185@@ -75,8 +75,8 @@ struct netns_ipv6 {
86186 struct fib_rules_ops *mr6_rules_ops;
86187 #endif
86188 #endif
86189- atomic_t dev_addr_genid;
86190- atomic_t fib6_sernum;
86191+ atomic_unchecked_t dev_addr_genid;
86192+ atomic_unchecked_t fib6_sernum;
86193 };
86194
86195 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
86196diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
86197index 9da7982..099321b9 100644
86198--- a/include/net/netns/xfrm.h
86199+++ b/include/net/netns/xfrm.h
86200@@ -78,7 +78,7 @@ struct netns_xfrm {
86201
86202 /* flow cache part */
86203 struct flow_cache flow_cache_global;
86204- atomic_t flow_cache_genid;
86205+ atomic_unchecked_t flow_cache_genid;
86206 struct list_head flow_cache_gc_list;
86207 spinlock_t flow_cache_gc_lock;
86208 struct work_struct flow_cache_gc_work;
86209diff --git a/include/net/ping.h b/include/net/ping.h
86210index 026479b..d9b2829 100644
86211--- a/include/net/ping.h
86212+++ b/include/net/ping.h
86213@@ -54,7 +54,7 @@ struct ping_iter_state {
86214
86215 extern struct proto ping_prot;
86216 #if IS_ENABLED(CONFIG_IPV6)
86217-extern struct pingv6_ops pingv6_ops;
86218+extern struct pingv6_ops *pingv6_ops;
86219 #endif
86220
86221 struct pingfakehdr {
86222diff --git a/include/net/protocol.h b/include/net/protocol.h
86223index d6fcc1f..ca277058 100644
86224--- a/include/net/protocol.h
86225+++ b/include/net/protocol.h
86226@@ -49,7 +49,7 @@ struct net_protocol {
86227 * socket lookup?
86228 */
86229 icmp_strict_tag_validation:1;
86230-};
86231+} __do_const;
86232
86233 #if IS_ENABLED(CONFIG_IPV6)
86234 struct inet6_protocol {
86235@@ -62,7 +62,7 @@ struct inet6_protocol {
86236 u8 type, u8 code, int offset,
86237 __be32 info);
86238 unsigned int flags; /* INET6_PROTO_xxx */
86239-};
86240+} __do_const;
86241
86242 #define INET6_PROTO_NOPOLICY 0x1
86243 #define INET6_PROTO_FINAL 0x2
86244diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
86245index e21b9f9..0191ef0 100644
86246--- a/include/net/rtnetlink.h
86247+++ b/include/net/rtnetlink.h
86248@@ -93,7 +93,7 @@ struct rtnl_link_ops {
86249 int (*fill_slave_info)(struct sk_buff *skb,
86250 const struct net_device *dev,
86251 const struct net_device *slave_dev);
86252-};
86253+} __do_const;
86254
86255 int __rtnl_link_register(struct rtnl_link_ops *ops);
86256 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
86257diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
86258index 4a5b9a3..ca27d73 100644
86259--- a/include/net/sctp/checksum.h
86260+++ b/include/net/sctp/checksum.h
86261@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
86262 unsigned int offset)
86263 {
86264 struct sctphdr *sh = sctp_hdr(skb);
86265- __le32 ret, old = sh->checksum;
86266- const struct skb_checksum_ops ops = {
86267+ __le32 ret, old = sh->checksum;
86268+ static const struct skb_checksum_ops ops = {
86269 .update = sctp_csum_update,
86270 .combine = sctp_csum_combine,
86271 };
86272diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
86273index 72a31db..aaa63d9 100644
86274--- a/include/net/sctp/sm.h
86275+++ b/include/net/sctp/sm.h
86276@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
86277 typedef struct {
86278 sctp_state_fn_t *fn;
86279 const char *name;
86280-} sctp_sm_table_entry_t;
86281+} __do_const sctp_sm_table_entry_t;
86282
86283 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
86284 * currently in use.
86285@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
86286 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
86287
86288 /* Extern declarations for major data structures. */
86289-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
86290+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
86291
86292
86293 /* Get the size of a DATA chunk payload. */
86294diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
86295index 4ff3f67..89ae38e 100644
86296--- a/include/net/sctp/structs.h
86297+++ b/include/net/sctp/structs.h
86298@@ -509,7 +509,7 @@ struct sctp_pf {
86299 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
86300 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
86301 struct sctp_af *af;
86302-};
86303+} __do_const;
86304
86305
86306 /* Structure to track chunk fragments that have been acked, but peer
86307diff --git a/include/net/sock.h b/include/net/sock.h
86308index 7db3db1..a915cca 100644
86309--- a/include/net/sock.h
86310+++ b/include/net/sock.h
86311@@ -355,7 +355,7 @@ struct sock {
86312 unsigned int sk_napi_id;
86313 unsigned int sk_ll_usec;
86314 #endif
86315- atomic_t sk_drops;
86316+ atomic_unchecked_t sk_drops;
86317 int sk_rcvbuf;
86318
86319 struct sk_filter __rcu *sk_filter;
86320@@ -1048,7 +1048,7 @@ struct proto {
86321 void (*destroy_cgroup)(struct mem_cgroup *memcg);
86322 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
86323 #endif
86324-};
86325+} __randomize_layout;
86326
86327 /*
86328 * Bits in struct cg_proto.flags
86329@@ -1235,7 +1235,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
86330 return ret >> PAGE_SHIFT;
86331 }
86332
86333-static inline long
86334+static inline long __intentional_overflow(-1)
86335 sk_memory_allocated(const struct sock *sk)
86336 {
86337 struct proto *prot = sk->sk_prot;
86338@@ -1380,7 +1380,7 @@ struct sock_iocb {
86339 struct scm_cookie *scm;
86340 struct msghdr *msg, async_msg;
86341 struct kiocb *kiocb;
86342-};
86343+} __randomize_layout;
86344
86345 static inline struct sock_iocb *kiocb_to_siocb(struct kiocb *iocb)
86346 {
86347@@ -1820,7 +1820,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
86348 }
86349
86350 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
86351- char __user *from, char *to,
86352+ char __user *from, unsigned char *to,
86353 int copy, int offset)
86354 {
86355 if (skb->ip_summed == CHECKSUM_NONE) {
86356@@ -2092,7 +2092,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
86357 }
86358 }
86359
86360-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
86361+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
86362
86363 /**
86364 * sk_page_frag - return an appropriate page_frag
86365diff --git a/include/net/tcp.h b/include/net/tcp.h
86366index 4062b4f..9ff45e7 100644
86367--- a/include/net/tcp.h
86368+++ b/include/net/tcp.h
86369@@ -519,7 +519,7 @@ void tcp_retransmit_timer(struct sock *sk);
86370 void tcp_xmit_retransmit_queue(struct sock *);
86371 void tcp_simple_retransmit(struct sock *);
86372 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
86373-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
86374+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
86375
86376 void tcp_send_probe0(struct sock *);
86377 void tcp_send_partial(struct sock *);
86378@@ -692,8 +692,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
86379 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
86380 */
86381 struct tcp_skb_cb {
86382- __u32 seq; /* Starting sequence number */
86383- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
86384+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
86385+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
86386 union {
86387 /* Note : tcp_tw_isn is used in input path only
86388 * (isn chosen by tcp_timewait_state_process())
86389@@ -718,7 +718,7 @@ struct tcp_skb_cb {
86390
86391 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
86392 /* 1 byte hole */
86393- __u32 ack_seq; /* Sequence number ACK'd */
86394+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
86395 union {
86396 struct inet_skb_parm h4;
86397 #if IS_ENABLED(CONFIG_IPV6)
86398diff --git a/include/net/xfrm.h b/include/net/xfrm.h
86399index dc4865e..152ee4c 100644
86400--- a/include/net/xfrm.h
86401+++ b/include/net/xfrm.h
86402@@ -285,7 +285,6 @@ struct xfrm_dst;
86403 struct xfrm_policy_afinfo {
86404 unsigned short family;
86405 struct dst_ops *dst_ops;
86406- void (*garbage_collect)(struct net *net);
86407 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
86408 const xfrm_address_t *saddr,
86409 const xfrm_address_t *daddr);
86410@@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
86411 struct net_device *dev,
86412 const struct flowi *fl);
86413 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
86414-};
86415+} __do_const;
86416
86417 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
86418 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
86419@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
86420 int (*transport_finish)(struct sk_buff *skb,
86421 int async);
86422 void (*local_error)(struct sk_buff *skb, u32 mtu);
86423-};
86424+} __do_const;
86425
86426 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
86427 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
86428@@ -437,7 +436,7 @@ struct xfrm_mode {
86429 struct module *owner;
86430 unsigned int encap;
86431 int flags;
86432-};
86433+} __do_const;
86434
86435 /* Flags for xfrm_mode. */
86436 enum {
86437@@ -534,7 +533,7 @@ struct xfrm_policy {
86438 struct timer_list timer;
86439
86440 struct flow_cache_object flo;
86441- atomic_t genid;
86442+ atomic_unchecked_t genid;
86443 u32 priority;
86444 u32 index;
86445 struct xfrm_mark mark;
86446@@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
86447 }
86448
86449 void xfrm_garbage_collect(struct net *net);
86450+void xfrm_garbage_collect_deferred(struct net *net);
86451
86452 #else
86453
86454@@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
86455 static inline void xfrm_garbage_collect(struct net *net)
86456 {
86457 }
86458+static inline void xfrm_garbage_collect_deferred(struct net *net)
86459+{
86460+}
86461 #endif
86462
86463 static __inline__
86464diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
86465index 1017e0b..227aa4d 100644
86466--- a/include/rdma/iw_cm.h
86467+++ b/include/rdma/iw_cm.h
86468@@ -122,7 +122,7 @@ struct iw_cm_verbs {
86469 int backlog);
86470
86471 int (*destroy_listen)(struct iw_cm_id *cm_id);
86472-};
86473+} __no_const;
86474
86475 /**
86476 * iw_create_cm_id - Create an IW CM identifier.
86477diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
86478index 52beadf..598734c 100644
86479--- a/include/scsi/libfc.h
86480+++ b/include/scsi/libfc.h
86481@@ -771,6 +771,7 @@ struct libfc_function_template {
86482 */
86483 void (*disc_stop_final) (struct fc_lport *);
86484 };
86485+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
86486
86487 /**
86488 * struct fc_disc - Discovery context
86489@@ -875,7 +876,7 @@ struct fc_lport {
86490 struct fc_vport *vport;
86491
86492 /* Operational Information */
86493- struct libfc_function_template tt;
86494+ libfc_function_template_no_const tt;
86495 u8 link_up;
86496 u8 qfull;
86497 enum fc_lport_state state;
86498diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
86499index 27ecee7..5f42632 100644
86500--- a/include/scsi/scsi_device.h
86501+++ b/include/scsi/scsi_device.h
86502@@ -186,9 +186,9 @@ struct scsi_device {
86503 unsigned int max_device_blocked; /* what device_blocked counts down from */
86504 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
86505
86506- atomic_t iorequest_cnt;
86507- atomic_t iodone_cnt;
86508- atomic_t ioerr_cnt;
86509+ atomic_unchecked_t iorequest_cnt;
86510+ atomic_unchecked_t iodone_cnt;
86511+ atomic_unchecked_t ioerr_cnt;
86512
86513 struct device sdev_gendev,
86514 sdev_dev;
86515diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
86516index 007a0bc..7188db8 100644
86517--- a/include/scsi/scsi_transport_fc.h
86518+++ b/include/scsi/scsi_transport_fc.h
86519@@ -756,7 +756,8 @@ struct fc_function_template {
86520 unsigned long show_host_system_hostname:1;
86521
86522 unsigned long disable_target_scan:1;
86523-};
86524+} __do_const;
86525+typedef struct fc_function_template __no_const fc_function_template_no_const;
86526
86527
86528 /**
86529diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
86530index ae6c3b8..fd748ac 100644
86531--- a/include/sound/compress_driver.h
86532+++ b/include/sound/compress_driver.h
86533@@ -128,7 +128,7 @@ struct snd_compr_ops {
86534 struct snd_compr_caps *caps);
86535 int (*get_codec_caps) (struct snd_compr_stream *stream,
86536 struct snd_compr_codec_caps *codec);
86537-};
86538+} __no_const;
86539
86540 /**
86541 * struct snd_compr: Compressed device
86542diff --git a/include/sound/soc.h b/include/sound/soc.h
86543index 7ba7130..d46594d 100644
86544--- a/include/sound/soc.h
86545+++ b/include/sound/soc.h
86546@@ -853,7 +853,7 @@ struct snd_soc_codec_driver {
86547 enum snd_soc_dapm_type, int);
86548
86549 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
86550-};
86551+} __do_const;
86552
86553 /* SoC platform interface */
86554 struct snd_soc_platform_driver {
86555@@ -882,7 +882,7 @@ struct snd_soc_platform_driver {
86556 const struct snd_compr_ops *compr_ops;
86557
86558 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
86559-};
86560+} __do_const;
86561
86562 struct snd_soc_dai_link_component {
86563 const char *name;
86564diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
86565index 23c518a..d6ef510 100644
86566--- a/include/target/target_core_base.h
86567+++ b/include/target/target_core_base.h
86568@@ -764,7 +764,7 @@ struct se_device {
86569 atomic_long_t write_bytes;
86570 /* Active commands on this virtual SE device */
86571 atomic_t simple_cmds;
86572- atomic_t dev_ordered_id;
86573+ atomic_unchecked_t dev_ordered_id;
86574 atomic_t dev_ordered_sync;
86575 atomic_t dev_qf_count;
86576 int export_count;
86577diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
86578new file mode 100644
86579index 0000000..fb634b7
86580--- /dev/null
86581+++ b/include/trace/events/fs.h
86582@@ -0,0 +1,53 @@
86583+#undef TRACE_SYSTEM
86584+#define TRACE_SYSTEM fs
86585+
86586+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
86587+#define _TRACE_FS_H
86588+
86589+#include <linux/fs.h>
86590+#include <linux/tracepoint.h>
86591+
86592+TRACE_EVENT(do_sys_open,
86593+
86594+ TP_PROTO(const char *filename, int flags, int mode),
86595+
86596+ TP_ARGS(filename, flags, mode),
86597+
86598+ TP_STRUCT__entry(
86599+ __string( filename, filename )
86600+ __field( int, flags )
86601+ __field( int, mode )
86602+ ),
86603+
86604+ TP_fast_assign(
86605+ __assign_str(filename, filename);
86606+ __entry->flags = flags;
86607+ __entry->mode = mode;
86608+ ),
86609+
86610+ TP_printk("\"%s\" %x %o",
86611+ __get_str(filename), __entry->flags, __entry->mode)
86612+);
86613+
86614+TRACE_EVENT(open_exec,
86615+
86616+ TP_PROTO(const char *filename),
86617+
86618+ TP_ARGS(filename),
86619+
86620+ TP_STRUCT__entry(
86621+ __string( filename, filename )
86622+ ),
86623+
86624+ TP_fast_assign(
86625+ __assign_str(filename, filename);
86626+ ),
86627+
86628+ TP_printk("\"%s\"",
86629+ __get_str(filename))
86630+);
86631+
86632+#endif /* _TRACE_FS_H */
86633+
86634+/* This part must be outside protection */
86635+#include <trace/define_trace.h>
86636diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
86637index 3608beb..df39d8a 100644
86638--- a/include/trace/events/irq.h
86639+++ b/include/trace/events/irq.h
86640@@ -36,7 +36,7 @@ struct softirq_action;
86641 */
86642 TRACE_EVENT(irq_handler_entry,
86643
86644- TP_PROTO(int irq, struct irqaction *action),
86645+ TP_PROTO(int irq, const struct irqaction *action),
86646
86647 TP_ARGS(irq, action),
86648
86649@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
86650 */
86651 TRACE_EVENT(irq_handler_exit,
86652
86653- TP_PROTO(int irq, struct irqaction *action, int ret),
86654+ TP_PROTO(int irq, const struct irqaction *action, int ret),
86655
86656 TP_ARGS(irq, action, ret),
86657
86658diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
86659index 7caf44c..23c6f27 100644
86660--- a/include/uapi/linux/a.out.h
86661+++ b/include/uapi/linux/a.out.h
86662@@ -39,6 +39,14 @@ enum machine_type {
86663 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
86664 };
86665
86666+/* Constants for the N_FLAGS field */
86667+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
86668+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
86669+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
86670+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
86671+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
86672+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
86673+
86674 #if !defined (N_MAGIC)
86675 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
86676 #endif
86677diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
86678index 22b6ad3..aeba37e 100644
86679--- a/include/uapi/linux/bcache.h
86680+++ b/include/uapi/linux/bcache.h
86681@@ -5,6 +5,7 @@
86682 * Bcache on disk data structures
86683 */
86684
86685+#include <linux/compiler.h>
86686 #include <asm/types.h>
86687
86688 #define BITMASK(name, type, field, offset, size) \
86689@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
86690 /* Btree keys - all units are in sectors */
86691
86692 struct bkey {
86693- __u64 high;
86694- __u64 low;
86695+ __u64 high __intentional_overflow(-1);
86696+ __u64 low __intentional_overflow(-1);
86697 __u64 ptr[];
86698 };
86699
86700diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
86701index d876736..ccce5c0 100644
86702--- a/include/uapi/linux/byteorder/little_endian.h
86703+++ b/include/uapi/linux/byteorder/little_endian.h
86704@@ -42,51 +42,51 @@
86705
86706 static inline __le64 __cpu_to_le64p(const __u64 *p)
86707 {
86708- return (__force __le64)*p;
86709+ return (__force const __le64)*p;
86710 }
86711-static inline __u64 __le64_to_cpup(const __le64 *p)
86712+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
86713 {
86714- return (__force __u64)*p;
86715+ return (__force const __u64)*p;
86716 }
86717 static inline __le32 __cpu_to_le32p(const __u32 *p)
86718 {
86719- return (__force __le32)*p;
86720+ return (__force const __le32)*p;
86721 }
86722 static inline __u32 __le32_to_cpup(const __le32 *p)
86723 {
86724- return (__force __u32)*p;
86725+ return (__force const __u32)*p;
86726 }
86727 static inline __le16 __cpu_to_le16p(const __u16 *p)
86728 {
86729- return (__force __le16)*p;
86730+ return (__force const __le16)*p;
86731 }
86732 static inline __u16 __le16_to_cpup(const __le16 *p)
86733 {
86734- return (__force __u16)*p;
86735+ return (__force const __u16)*p;
86736 }
86737 static inline __be64 __cpu_to_be64p(const __u64 *p)
86738 {
86739- return (__force __be64)__swab64p(p);
86740+ return (__force const __be64)__swab64p(p);
86741 }
86742 static inline __u64 __be64_to_cpup(const __be64 *p)
86743 {
86744- return __swab64p((__u64 *)p);
86745+ return __swab64p((const __u64 *)p);
86746 }
86747 static inline __be32 __cpu_to_be32p(const __u32 *p)
86748 {
86749- return (__force __be32)__swab32p(p);
86750+ return (__force const __be32)__swab32p(p);
86751 }
86752-static inline __u32 __be32_to_cpup(const __be32 *p)
86753+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
86754 {
86755- return __swab32p((__u32 *)p);
86756+ return __swab32p((const __u32 *)p);
86757 }
86758 static inline __be16 __cpu_to_be16p(const __u16 *p)
86759 {
86760- return (__force __be16)__swab16p(p);
86761+ return (__force const __be16)__swab16p(p);
86762 }
86763 static inline __u16 __be16_to_cpup(const __be16 *p)
86764 {
86765- return __swab16p((__u16 *)p);
86766+ return __swab16p((const __u16 *)p);
86767 }
86768 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
86769 #define __le64_to_cpus(x) do { (void)(x); } while (0)
86770diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
86771index ea9bf25..5140c61 100644
86772--- a/include/uapi/linux/elf.h
86773+++ b/include/uapi/linux/elf.h
86774@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
86775 #define PT_GNU_EH_FRAME 0x6474e550
86776
86777 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
86778+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
86779+
86780+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
86781+
86782+/* Constants for the e_flags field */
86783+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
86784+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
86785+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
86786+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
86787+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
86788+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
86789
86790 /*
86791 * Extended Numbering
86792@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
86793 #define DT_DEBUG 21
86794 #define DT_TEXTREL 22
86795 #define DT_JMPREL 23
86796+#define DT_FLAGS 30
86797+ #define DF_TEXTREL 0x00000004
86798 #define DT_ENCODING 32
86799 #define OLD_DT_LOOS 0x60000000
86800 #define DT_LOOS 0x6000000d
86801@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
86802 #define PF_W 0x2
86803 #define PF_X 0x1
86804
86805+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
86806+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
86807+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
86808+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
86809+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
86810+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
86811+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
86812+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
86813+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
86814+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
86815+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
86816+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
86817+
86818 typedef struct elf32_phdr{
86819 Elf32_Word p_type;
86820 Elf32_Off p_offset;
86821@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
86822 #define EI_OSABI 7
86823 #define EI_PAD 8
86824
86825+#define EI_PAX 14
86826+
86827 #define ELFMAG0 0x7f /* EI_MAG */
86828 #define ELFMAG1 'E'
86829 #define ELFMAG2 'L'
86830diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
86831index aa169c4..6a2771d 100644
86832--- a/include/uapi/linux/personality.h
86833+++ b/include/uapi/linux/personality.h
86834@@ -30,6 +30,7 @@ enum {
86835 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
86836 ADDR_NO_RANDOMIZE | \
86837 ADDR_COMPAT_LAYOUT | \
86838+ ADDR_LIMIT_3GB | \
86839 MMAP_PAGE_ZERO)
86840
86841 /*
86842diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
86843index 7530e74..e714828 100644
86844--- a/include/uapi/linux/screen_info.h
86845+++ b/include/uapi/linux/screen_info.h
86846@@ -43,7 +43,8 @@ struct screen_info {
86847 __u16 pages; /* 0x32 */
86848 __u16 vesa_attributes; /* 0x34 */
86849 __u32 capabilities; /* 0x36 */
86850- __u8 _reserved[6]; /* 0x3a */
86851+ __u16 vesapm_size; /* 0x3a */
86852+ __u8 _reserved[4]; /* 0x3c */
86853 } __attribute__((packed));
86854
86855 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
86856diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
86857index 0e011eb..82681b1 100644
86858--- a/include/uapi/linux/swab.h
86859+++ b/include/uapi/linux/swab.h
86860@@ -43,7 +43,7 @@
86861 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
86862 */
86863
86864-static inline __attribute_const__ __u16 __fswab16(__u16 val)
86865+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
86866 {
86867 #ifdef __HAVE_BUILTIN_BSWAP16__
86868 return __builtin_bswap16(val);
86869@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
86870 #endif
86871 }
86872
86873-static inline __attribute_const__ __u32 __fswab32(__u32 val)
86874+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
86875 {
86876 #ifdef __HAVE_BUILTIN_BSWAP32__
86877 return __builtin_bswap32(val);
86878@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
86879 #endif
86880 }
86881
86882-static inline __attribute_const__ __u64 __fswab64(__u64 val)
86883+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
86884 {
86885 #ifdef __HAVE_BUILTIN_BSWAP64__
86886 return __builtin_bswap64(val);
86887diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
86888index 43aaba1..1c30b48 100644
86889--- a/include/uapi/linux/sysctl.h
86890+++ b/include/uapi/linux/sysctl.h
86891@@ -155,8 +155,6 @@ enum
86892 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
86893 };
86894
86895-
86896-
86897 /* CTL_VM names: */
86898 enum
86899 {
86900diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
86901index 1590c49..5eab462 100644
86902--- a/include/uapi/linux/xattr.h
86903+++ b/include/uapi/linux/xattr.h
86904@@ -73,5 +73,9 @@
86905 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
86906 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
86907
86908+/* User namespace */
86909+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
86910+#define XATTR_PAX_FLAGS_SUFFIX "flags"
86911+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
86912
86913 #endif /* _UAPI_LINUX_XATTR_H */
86914diff --git a/include/video/udlfb.h b/include/video/udlfb.h
86915index f9466fa..f4e2b81 100644
86916--- a/include/video/udlfb.h
86917+++ b/include/video/udlfb.h
86918@@ -53,10 +53,10 @@ struct dlfb_data {
86919 u32 pseudo_palette[256];
86920 int blank_mode; /*one of FB_BLANK_ */
86921 /* blit-only rendering path metrics, exposed through sysfs */
86922- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
86923- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
86924- atomic_t bytes_sent; /* to usb, after compression including overhead */
86925- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
86926+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
86927+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
86928+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
86929+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
86930 };
86931
86932 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
86933diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
86934index 30f5362..8ed8ac9 100644
86935--- a/include/video/uvesafb.h
86936+++ b/include/video/uvesafb.h
86937@@ -122,6 +122,7 @@ struct uvesafb_par {
86938 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
86939 u8 pmi_setpal; /* PMI for palette changes */
86940 u16 *pmi_base; /* protected mode interface location */
86941+ u8 *pmi_code; /* protected mode code location */
86942 void *pmi_start;
86943 void *pmi_pal;
86944 u8 *vbe_state_orig; /*
86945diff --git a/init/Kconfig b/init/Kconfig
86946index 2081a4d..98d1149 100644
86947--- a/init/Kconfig
86948+++ b/init/Kconfig
86949@@ -1150,6 +1150,7 @@ endif # CGROUPS
86950
86951 config CHECKPOINT_RESTORE
86952 bool "Checkpoint/restore support" if EXPERT
86953+ depends on !GRKERNSEC
86954 default n
86955 help
86956 Enables additional kernel features in a sake of checkpoint/restore.
86957@@ -1659,7 +1660,7 @@ config SLUB_DEBUG
86958
86959 config COMPAT_BRK
86960 bool "Disable heap randomization"
86961- default y
86962+ default n
86963 help
86964 Randomizing heap placement makes heap exploits harder, but it
86965 also breaks ancient binaries (including anything libc5 based).
86966@@ -1990,7 +1991,7 @@ config INIT_ALL_POSSIBLE
86967 config STOP_MACHINE
86968 bool
86969 default y
86970- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
86971+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
86972 help
86973 Need stop_machine() primitive.
86974
86975diff --git a/init/Makefile b/init/Makefile
86976index 7bc47ee..6da2dc7 100644
86977--- a/init/Makefile
86978+++ b/init/Makefile
86979@@ -2,6 +2,9 @@
86980 # Makefile for the linux kernel.
86981 #
86982
86983+ccflags-y := $(GCC_PLUGINS_CFLAGS)
86984+asflags-y := $(GCC_PLUGINS_AFLAGS)
86985+
86986 obj-y := main.o version.o mounts.o
86987 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
86988 obj-y += noinitramfs.o
86989diff --git a/init/do_mounts.c b/init/do_mounts.c
86990index 9b3565c..3f90cf9 100644
86991--- a/init/do_mounts.c
86992+++ b/init/do_mounts.c
86993@@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
86994 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
86995 {
86996 struct super_block *s;
86997- int err = sys_mount(name, "/root", fs, flags, data);
86998+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
86999 if (err)
87000 return err;
87001
87002- sys_chdir("/root");
87003+ sys_chdir((const char __force_user *)"/root");
87004 s = current->fs->pwd.dentry->d_sb;
87005 ROOT_DEV = s->s_dev;
87006 printk(KERN_INFO
87007@@ -485,18 +485,18 @@ void __init change_floppy(char *fmt, ...)
87008 va_start(args, fmt);
87009 vsprintf(buf, fmt, args);
87010 va_end(args);
87011- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
87012+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
87013 if (fd >= 0) {
87014 sys_ioctl(fd, FDEJECT, 0);
87015 sys_close(fd);
87016 }
87017 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
87018- fd = sys_open("/dev/console", O_RDWR, 0);
87019+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
87020 if (fd >= 0) {
87021 sys_ioctl(fd, TCGETS, (long)&termios);
87022 termios.c_lflag &= ~ICANON;
87023 sys_ioctl(fd, TCSETSF, (long)&termios);
87024- sys_read(fd, &c, 1);
87025+ sys_read(fd, (char __user *)&c, 1);
87026 termios.c_lflag |= ICANON;
87027 sys_ioctl(fd, TCSETSF, (long)&termios);
87028 sys_close(fd);
87029@@ -590,8 +590,8 @@ void __init prepare_namespace(void)
87030 mount_root();
87031 out:
87032 devtmpfs_mount("dev");
87033- sys_mount(".", "/", NULL, MS_MOVE, NULL);
87034- sys_chroot(".");
87035+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
87036+ sys_chroot((const char __force_user *)".");
87037 }
87038
87039 static bool is_tmpfs;
87040diff --git a/init/do_mounts.h b/init/do_mounts.h
87041index f5b978a..69dbfe8 100644
87042--- a/init/do_mounts.h
87043+++ b/init/do_mounts.h
87044@@ -15,15 +15,15 @@ extern int root_mountflags;
87045
87046 static inline int create_dev(char *name, dev_t dev)
87047 {
87048- sys_unlink(name);
87049- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
87050+ sys_unlink((char __force_user *)name);
87051+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
87052 }
87053
87054 #if BITS_PER_LONG == 32
87055 static inline u32 bstat(char *name)
87056 {
87057 struct stat64 stat;
87058- if (sys_stat64(name, &stat) != 0)
87059+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
87060 return 0;
87061 if (!S_ISBLK(stat.st_mode))
87062 return 0;
87063@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
87064 static inline u32 bstat(char *name)
87065 {
87066 struct stat stat;
87067- if (sys_newstat(name, &stat) != 0)
87068+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
87069 return 0;
87070 if (!S_ISBLK(stat.st_mode))
87071 return 0;
87072diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
87073index 3e0878e..8a9d7a0 100644
87074--- a/init/do_mounts_initrd.c
87075+++ b/init/do_mounts_initrd.c
87076@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
87077 {
87078 sys_unshare(CLONE_FS | CLONE_FILES);
87079 /* stdin/stdout/stderr for /linuxrc */
87080- sys_open("/dev/console", O_RDWR, 0);
87081+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
87082 sys_dup(0);
87083 sys_dup(0);
87084 /* move initrd over / and chdir/chroot in initrd root */
87085- sys_chdir("/root");
87086- sys_mount(".", "/", NULL, MS_MOVE, NULL);
87087- sys_chroot(".");
87088+ sys_chdir((const char __force_user *)"/root");
87089+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
87090+ sys_chroot((const char __force_user *)".");
87091 sys_setsid();
87092 return 0;
87093 }
87094@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
87095 create_dev("/dev/root.old", Root_RAM0);
87096 /* mount initrd on rootfs' /root */
87097 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
87098- sys_mkdir("/old", 0700);
87099- sys_chdir("/old");
87100+ sys_mkdir((const char __force_user *)"/old", 0700);
87101+ sys_chdir((const char __force_user *)"/old");
87102
87103 /* try loading default modules from initrd */
87104 load_default_modules();
87105@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
87106 current->flags &= ~PF_FREEZER_SKIP;
87107
87108 /* move initrd to rootfs' /old */
87109- sys_mount("..", ".", NULL, MS_MOVE, NULL);
87110+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
87111 /* switch root and cwd back to / of rootfs */
87112- sys_chroot("..");
87113+ sys_chroot((const char __force_user *)"..");
87114
87115 if (new_decode_dev(real_root_dev) == Root_RAM0) {
87116- sys_chdir("/old");
87117+ sys_chdir((const char __force_user *)"/old");
87118 return;
87119 }
87120
87121- sys_chdir("/");
87122+ sys_chdir((const char __force_user *)"/");
87123 ROOT_DEV = new_decode_dev(real_root_dev);
87124 mount_root();
87125
87126 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
87127- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
87128+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
87129 if (!error)
87130 printk("okay\n");
87131 else {
87132- int fd = sys_open("/dev/root.old", O_RDWR, 0);
87133+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
87134 if (error == -ENOENT)
87135 printk("/initrd does not exist. Ignored.\n");
87136 else
87137 printk("failed\n");
87138 printk(KERN_NOTICE "Unmounting old root\n");
87139- sys_umount("/old", MNT_DETACH);
87140+ sys_umount((char __force_user *)"/old", MNT_DETACH);
87141 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
87142 if (fd < 0) {
87143 error = fd;
87144@@ -127,11 +127,11 @@ int __init initrd_load(void)
87145 * mounted in the normal path.
87146 */
87147 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
87148- sys_unlink("/initrd.image");
87149+ sys_unlink((const char __force_user *)"/initrd.image");
87150 handle_initrd();
87151 return 1;
87152 }
87153 }
87154- sys_unlink("/initrd.image");
87155+ sys_unlink((const char __force_user *)"/initrd.image");
87156 return 0;
87157 }
87158diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
87159index 8cb6db5..d729f50 100644
87160--- a/init/do_mounts_md.c
87161+++ b/init/do_mounts_md.c
87162@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
87163 partitioned ? "_d" : "", minor,
87164 md_setup_args[ent].device_names);
87165
87166- fd = sys_open(name, 0, 0);
87167+ fd = sys_open((char __force_user *)name, 0, 0);
87168 if (fd < 0) {
87169 printk(KERN_ERR "md: open failed - cannot start "
87170 "array %s\n", name);
87171@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
87172 * array without it
87173 */
87174 sys_close(fd);
87175- fd = sys_open(name, 0, 0);
87176+ fd = sys_open((char __force_user *)name, 0, 0);
87177 sys_ioctl(fd, BLKRRPART, 0);
87178 }
87179 sys_close(fd);
87180@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
87181
87182 wait_for_device_probe();
87183
87184- fd = sys_open("/dev/md0", 0, 0);
87185+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
87186 if (fd >= 0) {
87187 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
87188 sys_close(fd);
87189diff --git a/init/init_task.c b/init/init_task.c
87190index ba0a7f36..2bcf1d5 100644
87191--- a/init/init_task.c
87192+++ b/init/init_task.c
87193@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
87194 * Initial thread structure. Alignment of this is handled by a special
87195 * linker map entry.
87196 */
87197+#ifdef CONFIG_X86
87198+union thread_union init_thread_union __init_task_data;
87199+#else
87200 union thread_union init_thread_union __init_task_data =
87201 { INIT_THREAD_INFO(init_task) };
87202+#endif
87203diff --git a/init/initramfs.c b/init/initramfs.c
87204index ad1bd77..dca2c1b 100644
87205--- a/init/initramfs.c
87206+++ b/init/initramfs.c
87207@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
87208
87209 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
87210 while (count) {
87211- ssize_t rv = sys_write(fd, p, count);
87212+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
87213
87214 if (rv < 0) {
87215 if (rv == -EINTR || rv == -EAGAIN)
87216@@ -107,7 +107,7 @@ static void __init free_hash(void)
87217 }
87218 }
87219
87220-static long __init do_utime(char *filename, time_t mtime)
87221+static long __init do_utime(char __force_user *filename, time_t mtime)
87222 {
87223 struct timespec t[2];
87224
87225@@ -142,7 +142,7 @@ static void __init dir_utime(void)
87226 struct dir_entry *de, *tmp;
87227 list_for_each_entry_safe(de, tmp, &dir_list, list) {
87228 list_del(&de->list);
87229- do_utime(de->name, de->mtime);
87230+ do_utime((char __force_user *)de->name, de->mtime);
87231 kfree(de->name);
87232 kfree(de);
87233 }
87234@@ -304,7 +304,7 @@ static int __init maybe_link(void)
87235 if (nlink >= 2) {
87236 char *old = find_link(major, minor, ino, mode, collected);
87237 if (old)
87238- return (sys_link(old, collected) < 0) ? -1 : 1;
87239+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
87240 }
87241 return 0;
87242 }
87243@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
87244 {
87245 struct stat st;
87246
87247- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
87248+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
87249 if (S_ISDIR(st.st_mode))
87250- sys_rmdir(path);
87251+ sys_rmdir((char __force_user *)path);
87252 else
87253- sys_unlink(path);
87254+ sys_unlink((char __force_user *)path);
87255 }
87256 }
87257
87258@@ -338,7 +338,7 @@ static int __init do_name(void)
87259 int openflags = O_WRONLY|O_CREAT;
87260 if (ml != 1)
87261 openflags |= O_TRUNC;
87262- wfd = sys_open(collected, openflags, mode);
87263+ wfd = sys_open((char __force_user *)collected, openflags, mode);
87264
87265 if (wfd >= 0) {
87266 sys_fchown(wfd, uid, gid);
87267@@ -350,17 +350,17 @@ static int __init do_name(void)
87268 }
87269 }
87270 } else if (S_ISDIR(mode)) {
87271- sys_mkdir(collected, mode);
87272- sys_chown(collected, uid, gid);
87273- sys_chmod(collected, mode);
87274+ sys_mkdir((char __force_user *)collected, mode);
87275+ sys_chown((char __force_user *)collected, uid, gid);
87276+ sys_chmod((char __force_user *)collected, mode);
87277 dir_add(collected, mtime);
87278 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
87279 S_ISFIFO(mode) || S_ISSOCK(mode)) {
87280 if (maybe_link() == 0) {
87281- sys_mknod(collected, mode, rdev);
87282- sys_chown(collected, uid, gid);
87283- sys_chmod(collected, mode);
87284- do_utime(collected, mtime);
87285+ sys_mknod((char __force_user *)collected, mode, rdev);
87286+ sys_chown((char __force_user *)collected, uid, gid);
87287+ sys_chmod((char __force_user *)collected, mode);
87288+ do_utime((char __force_user *)collected, mtime);
87289 }
87290 }
87291 return 0;
87292@@ -372,7 +372,7 @@ static int __init do_copy(void)
87293 if (xwrite(wfd, victim, body_len) != body_len)
87294 error("write error");
87295 sys_close(wfd);
87296- do_utime(vcollected, mtime);
87297+ do_utime((char __force_user *)vcollected, mtime);
87298 kfree(vcollected);
87299 eat(body_len);
87300 state = SkipIt;
87301@@ -390,9 +390,9 @@ static int __init do_symlink(void)
87302 {
87303 collected[N_ALIGN(name_len) + body_len] = '\0';
87304 clean_path(collected, 0);
87305- sys_symlink(collected + N_ALIGN(name_len), collected);
87306- sys_lchown(collected, uid, gid);
87307- do_utime(collected, mtime);
87308+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
87309+ sys_lchown((char __force_user *)collected, uid, gid);
87310+ do_utime((char __force_user *)collected, mtime);
87311 state = SkipIt;
87312 next_state = Reset;
87313 return 0;
87314diff --git a/init/main.c b/init/main.c
87315index 321d0ce..91b53e5 100644
87316--- a/init/main.c
87317+++ b/init/main.c
87318@@ -98,6 +98,8 @@ extern void radix_tree_init(void);
87319 static inline void mark_rodata_ro(void) { }
87320 #endif
87321
87322+extern void grsecurity_init(void);
87323+
87324 /*
87325 * Debug helper: via this flag we know that we are in 'early bootup code'
87326 * where only the boot processor is running with IRQ disabled. This means
87327@@ -159,6 +161,75 @@ static int __init set_reset_devices(char *str)
87328
87329 __setup("reset_devices", set_reset_devices);
87330
87331+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
87332+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
87333+static int __init setup_grsec_proc_gid(char *str)
87334+{
87335+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
87336+ return 1;
87337+}
87338+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
87339+#endif
87340+
87341+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
87342+unsigned long pax_user_shadow_base __read_only;
87343+EXPORT_SYMBOL(pax_user_shadow_base);
87344+extern char pax_enter_kernel_user[];
87345+extern char pax_exit_kernel_user[];
87346+#endif
87347+
87348+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
87349+static int __init setup_pax_nouderef(char *str)
87350+{
87351+#ifdef CONFIG_X86_32
87352+ unsigned int cpu;
87353+ struct desc_struct *gdt;
87354+
87355+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
87356+ gdt = get_cpu_gdt_table(cpu);
87357+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
87358+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
87359+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
87360+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
87361+ }
87362+ loadsegment(ds, __KERNEL_DS);
87363+ loadsegment(es, __KERNEL_DS);
87364+ loadsegment(ss, __KERNEL_DS);
87365+#else
87366+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
87367+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
87368+ clone_pgd_mask = ~(pgdval_t)0UL;
87369+ pax_user_shadow_base = 0UL;
87370+ setup_clear_cpu_cap(X86_FEATURE_PCID);
87371+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
87372+#endif
87373+
87374+ return 0;
87375+}
87376+early_param("pax_nouderef", setup_pax_nouderef);
87377+
87378+#ifdef CONFIG_X86_64
87379+static int __init setup_pax_weakuderef(char *str)
87380+{
87381+ if (clone_pgd_mask != ~(pgdval_t)0UL)
87382+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
87383+ return 1;
87384+}
87385+__setup("pax_weakuderef", setup_pax_weakuderef);
87386+#endif
87387+#endif
87388+
87389+#ifdef CONFIG_PAX_SOFTMODE
87390+int pax_softmode;
87391+
87392+static int __init setup_pax_softmode(char *str)
87393+{
87394+ get_option(&str, &pax_softmode);
87395+ return 1;
87396+}
87397+__setup("pax_softmode=", setup_pax_softmode);
87398+#endif
87399+
87400 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
87401 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
87402 static const char *panic_later, *panic_param;
87403@@ -728,7 +799,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
87404 struct blacklist_entry *entry;
87405 char *fn_name;
87406
87407- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
87408+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
87409 if (!fn_name)
87410 return false;
87411
87412@@ -780,7 +851,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
87413 {
87414 int count = preempt_count();
87415 int ret;
87416- char msgbuf[64];
87417+ const char *msg1 = "", *msg2 = "";
87418
87419 if (initcall_blacklisted(fn))
87420 return -EPERM;
87421@@ -790,18 +861,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
87422 else
87423 ret = fn();
87424
87425- msgbuf[0] = 0;
87426-
87427 if (preempt_count() != count) {
87428- sprintf(msgbuf, "preemption imbalance ");
87429+ msg1 = " preemption imbalance";
87430 preempt_count_set(count);
87431 }
87432 if (irqs_disabled()) {
87433- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
87434+ msg2 = " disabled interrupts";
87435 local_irq_enable();
87436 }
87437- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
87438+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
87439
87440+ add_latent_entropy();
87441 return ret;
87442 }
87443
87444@@ -907,8 +977,8 @@ static int run_init_process(const char *init_filename)
87445 {
87446 argv_init[0] = init_filename;
87447 return do_execve(getname_kernel(init_filename),
87448- (const char __user *const __user *)argv_init,
87449- (const char __user *const __user *)envp_init);
87450+ (const char __user *const __force_user *)argv_init,
87451+ (const char __user *const __force_user *)envp_init);
87452 }
87453
87454 static int try_to_run_init_process(const char *init_filename)
87455@@ -925,6 +995,10 @@ static int try_to_run_init_process(const char *init_filename)
87456 return ret;
87457 }
87458
87459+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
87460+extern int gr_init_ran;
87461+#endif
87462+
87463 static noinline void __init kernel_init_freeable(void);
87464
87465 static int __ref kernel_init(void *unused)
87466@@ -949,6 +1023,11 @@ static int __ref kernel_init(void *unused)
87467 ramdisk_execute_command, ret);
87468 }
87469
87470+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
87471+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
87472+ gr_init_ran = 1;
87473+#endif
87474+
87475 /*
87476 * We try each of these until one succeeds.
87477 *
87478@@ -1004,7 +1083,7 @@ static noinline void __init kernel_init_freeable(void)
87479 do_basic_setup();
87480
87481 /* Open the /dev/console on the rootfs, this should never fail */
87482- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
87483+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
87484 pr_err("Warning: unable to open an initial console.\n");
87485
87486 (void) sys_dup(0);
87487@@ -1017,11 +1096,13 @@ static noinline void __init kernel_init_freeable(void)
87488 if (!ramdisk_execute_command)
87489 ramdisk_execute_command = "/init";
87490
87491- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
87492+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
87493 ramdisk_execute_command = NULL;
87494 prepare_namespace();
87495 }
87496
87497+ grsecurity_init();
87498+
87499 /*
87500 * Ok, we have completed the initial bootup, and
87501 * we're essentially up and running. Get rid of the
87502diff --git a/ipc/compat.c b/ipc/compat.c
87503index 9b3c85f..1c4d897 100644
87504--- a/ipc/compat.c
87505+++ b/ipc/compat.c
87506@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
87507 COMPAT_SHMLBA);
87508 if (err < 0)
87509 return err;
87510- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
87511+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
87512 }
87513 case SHMDT:
87514 return sys_shmdt(compat_ptr(ptr));
87515diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
87516index e8075b2..76f2c6a 100644
87517--- a/ipc/ipc_sysctl.c
87518+++ b/ipc/ipc_sysctl.c
87519@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
87520 static int proc_ipc_dointvec(struct ctl_table *table, int write,
87521 void __user *buffer, size_t *lenp, loff_t *ppos)
87522 {
87523- struct ctl_table ipc_table;
87524+ ctl_table_no_const ipc_table;
87525
87526 memcpy(&ipc_table, table, sizeof(ipc_table));
87527 ipc_table.data = get_ipc(table);
87528@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
87529 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
87530 void __user *buffer, size_t *lenp, loff_t *ppos)
87531 {
87532- struct ctl_table ipc_table;
87533+ ctl_table_no_const ipc_table;
87534
87535 memcpy(&ipc_table, table, sizeof(ipc_table));
87536 ipc_table.data = get_ipc(table);
87537@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
87538 static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
87539 void __user *buffer, size_t *lenp, loff_t *ppos)
87540 {
87541- struct ctl_table ipc_table;
87542+ ctl_table_no_const ipc_table;
87543 size_t lenp_bef = *lenp;
87544 int rc;
87545
87546@@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
87547 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
87548 void __user *buffer, size_t *lenp, loff_t *ppos)
87549 {
87550- struct ctl_table ipc_table;
87551+ ctl_table_no_const ipc_table;
87552 memcpy(&ipc_table, table, sizeof(ipc_table));
87553 ipc_table.data = get_ipc(table);
87554
87555@@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
87556 static int proc_ipcauto_dointvec_minmax(struct ctl_table *table, int write,
87557 void __user *buffer, size_t *lenp, loff_t *ppos)
87558 {
87559- struct ctl_table ipc_table;
87560+ ctl_table_no_const ipc_table;
87561 int oldval;
87562 int rc;
87563
87564diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
87565index 68d4e95..1477ded 100644
87566--- a/ipc/mq_sysctl.c
87567+++ b/ipc/mq_sysctl.c
87568@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
87569 static int proc_mq_dointvec(struct ctl_table *table, int write,
87570 void __user *buffer, size_t *lenp, loff_t *ppos)
87571 {
87572- struct ctl_table mq_table;
87573+ ctl_table_no_const mq_table;
87574 memcpy(&mq_table, table, sizeof(mq_table));
87575 mq_table.data = get_mq(table);
87576
87577@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
87578 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
87579 void __user *buffer, size_t *lenp, loff_t *ppos)
87580 {
87581- struct ctl_table mq_table;
87582+ ctl_table_no_const mq_table;
87583 memcpy(&mq_table, table, sizeof(mq_table));
87584 mq_table.data = get_mq(table);
87585
87586diff --git a/ipc/mqueue.c b/ipc/mqueue.c
87587index 4fcf39a..d3cc2ec 100644
87588--- a/ipc/mqueue.c
87589+++ b/ipc/mqueue.c
87590@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
87591 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
87592 info->attr.mq_msgsize);
87593
87594+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
87595 spin_lock(&mq_lock);
87596 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
87597 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
87598diff --git a/ipc/shm.c b/ipc/shm.c
87599index 0145479..3d27947 100644
87600--- a/ipc/shm.c
87601+++ b/ipc/shm.c
87602@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
87603 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
87604 #endif
87605
87606+#ifdef CONFIG_GRKERNSEC
87607+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
87608+ const u64 shm_createtime, const kuid_t cuid,
87609+ const int shmid);
87610+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
87611+ const u64 shm_createtime);
87612+#endif
87613+
87614 void shm_init_ns(struct ipc_namespace *ns)
87615 {
87616 ns->shm_ctlmax = SHMMAX;
87617@@ -559,6 +567,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
87618 shp->shm_lprid = 0;
87619 shp->shm_atim = shp->shm_dtim = 0;
87620 shp->shm_ctim = get_seconds();
87621+#ifdef CONFIG_GRKERNSEC
87622+ shp->shm_createtime = ktime_get_ns();
87623+#endif
87624 shp->shm_segsz = size;
87625 shp->shm_nattch = 0;
87626 shp->shm_file = file;
87627@@ -1095,6 +1106,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87628 f_mode = FMODE_READ | FMODE_WRITE;
87629 }
87630 if (shmflg & SHM_EXEC) {
87631+
87632+#ifdef CONFIG_PAX_MPROTECT
87633+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
87634+ goto out;
87635+#endif
87636+
87637 prot |= PROT_EXEC;
87638 acc_mode |= S_IXUGO;
87639 }
87640@@ -1119,6 +1136,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87641 if (err)
87642 goto out_unlock;
87643
87644+#ifdef CONFIG_GRKERNSEC
87645+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
87646+ shp->shm_perm.cuid, shmid) ||
87647+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
87648+ err = -EACCES;
87649+ goto out_unlock;
87650+ }
87651+#endif
87652+
87653 ipc_lock_object(&shp->shm_perm);
87654
87655 /* check if shm_destroy() is tearing down shp */
87656@@ -1131,6 +1157,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87657 path = shp->shm_file->f_path;
87658 path_get(&path);
87659 shp->shm_nattch++;
87660+#ifdef CONFIG_GRKERNSEC
87661+ shp->shm_lapid = current->pid;
87662+#endif
87663 size = i_size_read(path.dentry->d_inode);
87664 ipc_unlock_object(&shp->shm_perm);
87665 rcu_read_unlock();
87666diff --git a/ipc/util.c b/ipc/util.c
87667index 88adc32..3867c68 100644
87668--- a/ipc/util.c
87669+++ b/ipc/util.c
87670@@ -71,6 +71,8 @@ struct ipc_proc_iface {
87671 int (*show)(struct seq_file *, void *);
87672 };
87673
87674+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
87675+
87676 static void ipc_memory_notifier(struct work_struct *work)
87677 {
87678 ipcns_notify(IPCNS_MEMCHANGED);
87679@@ -537,6 +539,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
87680 granted_mode >>= 6;
87681 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
87682 granted_mode >>= 3;
87683+
87684+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
87685+ return -1;
87686+
87687 /* is there some bit set in requested_mode but not in granted_mode? */
87688 if ((requested_mode & ~granted_mode & 0007) &&
87689 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
87690diff --git a/kernel/audit.c b/kernel/audit.c
87691index c6df990..fde80b4 100644
87692--- a/kernel/audit.c
87693+++ b/kernel/audit.c
87694@@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
87695 3) suppressed due to audit_rate_limit
87696 4) suppressed due to audit_backlog_limit
87697 */
87698-static atomic_t audit_lost = ATOMIC_INIT(0);
87699+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
87700
87701 /* The netlink socket. */
87702 static struct sock *audit_sock;
87703@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
87704 unsigned long now;
87705 int print;
87706
87707- atomic_inc(&audit_lost);
87708+ atomic_inc_unchecked(&audit_lost);
87709
87710 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
87711
87712@@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
87713 if (print) {
87714 if (printk_ratelimit())
87715 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
87716- atomic_read(&audit_lost),
87717+ atomic_read_unchecked(&audit_lost),
87718 audit_rate_limit,
87719 audit_backlog_limit);
87720 audit_panic(message);
87721@@ -840,7 +840,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
87722 s.pid = audit_pid;
87723 s.rate_limit = audit_rate_limit;
87724 s.backlog_limit = audit_backlog_limit;
87725- s.lost = atomic_read(&audit_lost);
87726+ s.lost = atomic_read_unchecked(&audit_lost);
87727 s.backlog = skb_queue_len(&audit_skb_queue);
87728 s.version = AUDIT_VERSION_LATEST;
87729 s.backlog_wait_time = audit_backlog_wait_time;
87730diff --git a/kernel/auditsc.c b/kernel/auditsc.c
87731index e420a0c..38137fa 100644
87732--- a/kernel/auditsc.c
87733+++ b/kernel/auditsc.c
87734@@ -2014,7 +2014,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
87735 }
87736
87737 /* global counter which is incremented every time something logs in */
87738-static atomic_t session_id = ATOMIC_INIT(0);
87739+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
87740
87741 static int audit_set_loginuid_perm(kuid_t loginuid)
87742 {
87743@@ -2081,7 +2081,7 @@ int audit_set_loginuid(kuid_t loginuid)
87744
87745 /* are we setting or clearing? */
87746 if (uid_valid(loginuid))
87747- sessionid = (unsigned int)atomic_inc_return(&session_id);
87748+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
87749
87750 task->sessionid = sessionid;
87751 task->loginuid = loginuid;
87752diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
87753index d6594e4..597264b 100644
87754--- a/kernel/bpf/core.c
87755+++ b/kernel/bpf/core.c
87756@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
87757 * random section of illegal instructions.
87758 */
87759 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
87760- hdr = module_alloc(size);
87761+ hdr = module_alloc_exec(size);
87762 if (hdr == NULL)
87763 return NULL;
87764
87765 /* Fill space with illegal/arch-dep instructions. */
87766 bpf_fill_ill_insns(hdr, size);
87767
87768+ pax_open_kernel();
87769 hdr->pages = size / PAGE_SIZE;
87770+ pax_close_kernel();
87771+
87772 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
87773 PAGE_SIZE - sizeof(*hdr));
87774 start = (prandom_u32() % hole) & ~(alignment - 1);
87775@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
87776
87777 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
87778 {
87779- module_free(NULL, hdr);
87780+ module_free_exec(NULL, hdr);
87781 }
87782 #endif /* CONFIG_BPF_JIT */
87783
87784diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
87785index ba61c8c..c60c486 100644
87786--- a/kernel/bpf/syscall.c
87787+++ b/kernel/bpf/syscall.c
87788@@ -539,11 +539,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
87789 int err;
87790
87791 /* the syscall is limited to root temporarily. This restriction will be
87792- * lifted when security audit is clean. Note that eBPF+tracing must have
87793- * this restriction, since it may pass kernel data to user space
87794+ * lifted by upstream when a half-assed security audit is clean. Note
87795+ * that eBPF+tracing must have this restriction, since it may pass
87796+ * kernel data to user space
87797 */
87798 if (!capable(CAP_SYS_ADMIN))
87799 return -EPERM;
87800+#ifdef CONFIG_GRKERNSEC
87801+ return -EPERM;
87802+#endif
87803
87804 if (!access_ok(VERIFY_READ, uattr, 1))
87805 return -EFAULT;
87806diff --git a/kernel/capability.c b/kernel/capability.c
87807index 989f5bf..d317ca0 100644
87808--- a/kernel/capability.c
87809+++ b/kernel/capability.c
87810@@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
87811 * before modification is attempted and the application
87812 * fails.
87813 */
87814+ if (tocopy > ARRAY_SIZE(kdata))
87815+ return -EFAULT;
87816+
87817 if (copy_to_user(dataptr, kdata, tocopy
87818 * sizeof(struct __user_cap_data_struct))) {
87819 return -EFAULT;
87820@@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
87821 int ret;
87822
87823 rcu_read_lock();
87824- ret = security_capable(__task_cred(t), ns, cap);
87825+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
87826+ gr_task_is_capable(t, __task_cred(t), cap);
87827 rcu_read_unlock();
87828
87829- return (ret == 0);
87830+ return ret;
87831 }
87832
87833 /**
87834@@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
87835 int ret;
87836
87837 rcu_read_lock();
87838- ret = security_capable_noaudit(__task_cred(t), ns, cap);
87839+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
87840 rcu_read_unlock();
87841
87842- return (ret == 0);
87843+ return ret;
87844 }
87845
87846 /**
87847@@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
87848 BUG();
87849 }
87850
87851- if (security_capable(current_cred(), ns, cap) == 0) {
87852+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
87853 current->flags |= PF_SUPERPRIV;
87854 return true;
87855 }
87856@@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
87857 }
87858 EXPORT_SYMBOL(ns_capable);
87859
87860+bool ns_capable_nolog(struct user_namespace *ns, int cap)
87861+{
87862+ if (unlikely(!cap_valid(cap))) {
87863+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
87864+ BUG();
87865+ }
87866+
87867+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
87868+ current->flags |= PF_SUPERPRIV;
87869+ return true;
87870+ }
87871+ return false;
87872+}
87873+EXPORT_SYMBOL(ns_capable_nolog);
87874+
87875 /**
87876 * file_ns_capable - Determine if the file's opener had a capability in effect
87877 * @file: The file we want to check
87878@@ -427,6 +446,12 @@ bool capable(int cap)
87879 }
87880 EXPORT_SYMBOL(capable);
87881
87882+bool capable_nolog(int cap)
87883+{
87884+ return ns_capable_nolog(&init_user_ns, cap);
87885+}
87886+EXPORT_SYMBOL(capable_nolog);
87887+
87888 /**
87889 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
87890 * @inode: The inode in question
87891@@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
87892 kgid_has_mapping(ns, inode->i_gid);
87893 }
87894 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
87895+
87896+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
87897+{
87898+ struct user_namespace *ns = current_user_ns();
87899+
87900+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
87901+ kgid_has_mapping(ns, inode->i_gid);
87902+}
87903+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
87904diff --git a/kernel/cgroup.c b/kernel/cgroup.c
87905index 136ecea..45157a6 100644
87906--- a/kernel/cgroup.c
87907+++ b/kernel/cgroup.c
87908@@ -5276,6 +5276,9 @@ static void cgroup_release_agent(struct work_struct *work)
87909 if (!pathbuf || !agentbuf)
87910 goto out;
87911
87912+ if (agentbuf[0] == '\0')
87913+ goto out;
87914+
87915 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
87916 if (!path)
87917 goto out;
87918@@ -5461,7 +5464,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
87919 struct task_struct *task;
87920 int count = 0;
87921
87922- seq_printf(seq, "css_set %p\n", cset);
87923+ seq_printf(seq, "css_set %pK\n", cset);
87924
87925 list_for_each_entry(task, &cset->tasks, cg_list) {
87926 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
87927diff --git a/kernel/compat.c b/kernel/compat.c
87928index ebb3c36..1df606e 100644
87929--- a/kernel/compat.c
87930+++ b/kernel/compat.c
87931@@ -13,6 +13,7 @@
87932
87933 #include <linux/linkage.h>
87934 #include <linux/compat.h>
87935+#include <linux/module.h>
87936 #include <linux/errno.h>
87937 #include <linux/time.h>
87938 #include <linux/signal.h>
87939@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
87940 mm_segment_t oldfs;
87941 long ret;
87942
87943- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
87944+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
87945 oldfs = get_fs();
87946 set_fs(KERNEL_DS);
87947 ret = hrtimer_nanosleep_restart(restart);
87948@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
87949 oldfs = get_fs();
87950 set_fs(KERNEL_DS);
87951 ret = hrtimer_nanosleep(&tu,
87952- rmtp ? (struct timespec __user *)&rmt : NULL,
87953+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
87954 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
87955 set_fs(oldfs);
87956
87957@@ -379,7 +380,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
87958 mm_segment_t old_fs = get_fs();
87959
87960 set_fs(KERNEL_DS);
87961- ret = sys_sigpending((old_sigset_t __user *) &s);
87962+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
87963 set_fs(old_fs);
87964 if (ret == 0)
87965 ret = put_user(s, set);
87966@@ -469,7 +470,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
87967 mm_segment_t old_fs = get_fs();
87968
87969 set_fs(KERNEL_DS);
87970- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
87971+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
87972 set_fs(old_fs);
87973
87974 if (!ret) {
87975@@ -551,8 +552,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
87976 set_fs (KERNEL_DS);
87977 ret = sys_wait4(pid,
87978 (stat_addr ?
87979- (unsigned int __user *) &status : NULL),
87980- options, (struct rusage __user *) &r);
87981+ (unsigned int __force_user *) &status : NULL),
87982+ options, (struct rusage __force_user *) &r);
87983 set_fs (old_fs);
87984
87985 if (ret > 0) {
87986@@ -578,8 +579,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
87987 memset(&info, 0, sizeof(info));
87988
87989 set_fs(KERNEL_DS);
87990- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
87991- uru ? (struct rusage __user *)&ru : NULL);
87992+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
87993+ uru ? (struct rusage __force_user *)&ru : NULL);
87994 set_fs(old_fs);
87995
87996 if ((ret < 0) || (info.si_signo == 0))
87997@@ -713,8 +714,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
87998 oldfs = get_fs();
87999 set_fs(KERNEL_DS);
88000 err = sys_timer_settime(timer_id, flags,
88001- (struct itimerspec __user *) &newts,
88002- (struct itimerspec __user *) &oldts);
88003+ (struct itimerspec __force_user *) &newts,
88004+ (struct itimerspec __force_user *) &oldts);
88005 set_fs(oldfs);
88006 if (!err && old && put_compat_itimerspec(old, &oldts))
88007 return -EFAULT;
88008@@ -731,7 +732,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
88009 oldfs = get_fs();
88010 set_fs(KERNEL_DS);
88011 err = sys_timer_gettime(timer_id,
88012- (struct itimerspec __user *) &ts);
88013+ (struct itimerspec __force_user *) &ts);
88014 set_fs(oldfs);
88015 if (!err && put_compat_itimerspec(setting, &ts))
88016 return -EFAULT;
88017@@ -750,7 +751,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
88018 oldfs = get_fs();
88019 set_fs(KERNEL_DS);
88020 err = sys_clock_settime(which_clock,
88021- (struct timespec __user *) &ts);
88022+ (struct timespec __force_user *) &ts);
88023 set_fs(oldfs);
88024 return err;
88025 }
88026@@ -765,7 +766,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
88027 oldfs = get_fs();
88028 set_fs(KERNEL_DS);
88029 err = sys_clock_gettime(which_clock,
88030- (struct timespec __user *) &ts);
88031+ (struct timespec __force_user *) &ts);
88032 set_fs(oldfs);
88033 if (!err && compat_put_timespec(&ts, tp))
88034 return -EFAULT;
88035@@ -785,7 +786,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
88036
88037 oldfs = get_fs();
88038 set_fs(KERNEL_DS);
88039- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
88040+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
88041 set_fs(oldfs);
88042
88043 err = compat_put_timex(utp, &txc);
88044@@ -805,7 +806,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
88045 oldfs = get_fs();
88046 set_fs(KERNEL_DS);
88047 err = sys_clock_getres(which_clock,
88048- (struct timespec __user *) &ts);
88049+ (struct timespec __force_user *) &ts);
88050 set_fs(oldfs);
88051 if (!err && tp && compat_put_timespec(&ts, tp))
88052 return -EFAULT;
88053@@ -819,7 +820,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
88054 struct timespec tu;
88055 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
88056
88057- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
88058+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
88059 oldfs = get_fs();
88060 set_fs(KERNEL_DS);
88061 err = clock_nanosleep_restart(restart);
88062@@ -851,8 +852,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
88063 oldfs = get_fs();
88064 set_fs(KERNEL_DS);
88065 err = sys_clock_nanosleep(which_clock, flags,
88066- (struct timespec __user *) &in,
88067- (struct timespec __user *) &out);
88068+ (struct timespec __force_user *) &in,
88069+ (struct timespec __force_user *) &out);
88070 set_fs(oldfs);
88071
88072 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
88073@@ -1146,7 +1147,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
88074 mm_segment_t old_fs = get_fs();
88075
88076 set_fs(KERNEL_DS);
88077- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
88078+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
88079 set_fs(old_fs);
88080 if (compat_put_timespec(&t, interval))
88081 return -EFAULT;
88082diff --git a/kernel/configs.c b/kernel/configs.c
88083index c18b1f1..b9a0132 100644
88084--- a/kernel/configs.c
88085+++ b/kernel/configs.c
88086@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
88087 struct proc_dir_entry *entry;
88088
88089 /* create the current config file */
88090+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
88091+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
88092+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
88093+ &ikconfig_file_ops);
88094+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
88095+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
88096+ &ikconfig_file_ops);
88097+#endif
88098+#else
88099 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
88100 &ikconfig_file_ops);
88101+#endif
88102+
88103 if (!entry)
88104 return -ENOMEM;
88105
88106diff --git a/kernel/cred.c b/kernel/cred.c
88107index e0573a4..26c0fd3 100644
88108--- a/kernel/cred.c
88109+++ b/kernel/cred.c
88110@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
88111 validate_creds(cred);
88112 alter_cred_subscribers(cred, -1);
88113 put_cred(cred);
88114+
88115+#ifdef CONFIG_GRKERNSEC_SETXID
88116+ cred = (struct cred *) tsk->delayed_cred;
88117+ if (cred != NULL) {
88118+ tsk->delayed_cred = NULL;
88119+ validate_creds(cred);
88120+ alter_cred_subscribers(cred, -1);
88121+ put_cred(cred);
88122+ }
88123+#endif
88124 }
88125
88126 /**
88127@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
88128 * Always returns 0 thus allowing this function to be tail-called at the end
88129 * of, say, sys_setgid().
88130 */
88131-int commit_creds(struct cred *new)
88132+static int __commit_creds(struct cred *new)
88133 {
88134 struct task_struct *task = current;
88135 const struct cred *old = task->real_cred;
88136@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
88137
88138 get_cred(new); /* we will require a ref for the subj creds too */
88139
88140+ gr_set_role_label(task, new->uid, new->gid);
88141+
88142 /* dumpability changes */
88143 if (!uid_eq(old->euid, new->euid) ||
88144 !gid_eq(old->egid, new->egid) ||
88145@@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
88146 put_cred(old);
88147 return 0;
88148 }
88149+#ifdef CONFIG_GRKERNSEC_SETXID
88150+extern int set_user(struct cred *new);
88151+
88152+void gr_delayed_cred_worker(void)
88153+{
88154+ const struct cred *new = current->delayed_cred;
88155+ struct cred *ncred;
88156+
88157+ current->delayed_cred = NULL;
88158+
88159+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
88160+ // from doing get_cred on it when queueing this
88161+ put_cred(new);
88162+ return;
88163+ } else if (new == NULL)
88164+ return;
88165+
88166+ ncred = prepare_creds();
88167+ if (!ncred)
88168+ goto die;
88169+ // uids
88170+ ncred->uid = new->uid;
88171+ ncred->euid = new->euid;
88172+ ncred->suid = new->suid;
88173+ ncred->fsuid = new->fsuid;
88174+ // gids
88175+ ncred->gid = new->gid;
88176+ ncred->egid = new->egid;
88177+ ncred->sgid = new->sgid;
88178+ ncred->fsgid = new->fsgid;
88179+ // groups
88180+ set_groups(ncred, new->group_info);
88181+ // caps
88182+ ncred->securebits = new->securebits;
88183+ ncred->cap_inheritable = new->cap_inheritable;
88184+ ncred->cap_permitted = new->cap_permitted;
88185+ ncred->cap_effective = new->cap_effective;
88186+ ncred->cap_bset = new->cap_bset;
88187+
88188+ if (set_user(ncred)) {
88189+ abort_creds(ncred);
88190+ goto die;
88191+ }
88192+
88193+ // from doing get_cred on it when queueing this
88194+ put_cred(new);
88195+
88196+ __commit_creds(ncred);
88197+ return;
88198+die:
88199+ // from doing get_cred on it when queueing this
88200+ put_cred(new);
88201+ do_group_exit(SIGKILL);
88202+}
88203+#endif
88204+
88205+int commit_creds(struct cred *new)
88206+{
88207+#ifdef CONFIG_GRKERNSEC_SETXID
88208+ int ret;
88209+ int schedule_it = 0;
88210+ struct task_struct *t;
88211+ unsigned oldsecurebits = current_cred()->securebits;
88212+
88213+ /* we won't get called with tasklist_lock held for writing
88214+ and interrupts disabled as the cred struct in that case is
88215+ init_cred
88216+ */
88217+ if (grsec_enable_setxid && !current_is_single_threaded() &&
88218+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
88219+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
88220+ schedule_it = 1;
88221+ }
88222+ ret = __commit_creds(new);
88223+ if (schedule_it) {
88224+ rcu_read_lock();
88225+ read_lock(&tasklist_lock);
88226+ for (t = next_thread(current); t != current;
88227+ t = next_thread(t)) {
88228+ /* we'll check if the thread has uid 0 in
88229+ * the delayed worker routine
88230+ */
88231+ if (task_securebits(t) == oldsecurebits &&
88232+ t->delayed_cred == NULL) {
88233+ t->delayed_cred = get_cred(new);
88234+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
88235+ set_tsk_need_resched(t);
88236+ }
88237+ }
88238+ read_unlock(&tasklist_lock);
88239+ rcu_read_unlock();
88240+ }
88241+
88242+ return ret;
88243+#else
88244+ return __commit_creds(new);
88245+#endif
88246+}
88247+
88248 EXPORT_SYMBOL(commit_creds);
88249
88250 /**
88251diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
88252index 1adf62b..7736e06 100644
88253--- a/kernel/debug/debug_core.c
88254+++ b/kernel/debug/debug_core.c
88255@@ -124,7 +124,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
88256 */
88257 static atomic_t masters_in_kgdb;
88258 static atomic_t slaves_in_kgdb;
88259-static atomic_t kgdb_break_tasklet_var;
88260+static atomic_unchecked_t kgdb_break_tasklet_var;
88261 atomic_t kgdb_setting_breakpoint;
88262
88263 struct task_struct *kgdb_usethread;
88264@@ -134,7 +134,7 @@ int kgdb_single_step;
88265 static pid_t kgdb_sstep_pid;
88266
88267 /* to keep track of the CPU which is doing the single stepping*/
88268-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
88269+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
88270
88271 /*
88272 * If you are debugging a problem where roundup (the collection of
88273@@ -549,7 +549,7 @@ return_normal:
88274 * kernel will only try for the value of sstep_tries before
88275 * giving up and continuing on.
88276 */
88277- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
88278+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
88279 (kgdb_info[cpu].task &&
88280 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
88281 atomic_set(&kgdb_active, -1);
88282@@ -647,8 +647,8 @@ cpu_master_loop:
88283 }
88284
88285 kgdb_restore:
88286- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
88287- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
88288+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
88289+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
88290 if (kgdb_info[sstep_cpu].task)
88291 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
88292 else
88293@@ -925,18 +925,18 @@ static void kgdb_unregister_callbacks(void)
88294 static void kgdb_tasklet_bpt(unsigned long ing)
88295 {
88296 kgdb_breakpoint();
88297- atomic_set(&kgdb_break_tasklet_var, 0);
88298+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
88299 }
88300
88301 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
88302
88303 void kgdb_schedule_breakpoint(void)
88304 {
88305- if (atomic_read(&kgdb_break_tasklet_var) ||
88306+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
88307 atomic_read(&kgdb_active) != -1 ||
88308 atomic_read(&kgdb_setting_breakpoint))
88309 return;
88310- atomic_inc(&kgdb_break_tasklet_var);
88311+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
88312 tasklet_schedule(&kgdb_tasklet_breakpoint);
88313 }
88314 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
88315diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
88316index 379650b..30c5180 100644
88317--- a/kernel/debug/kdb/kdb_main.c
88318+++ b/kernel/debug/kdb/kdb_main.c
88319@@ -1977,7 +1977,7 @@ static int kdb_lsmod(int argc, const char **argv)
88320 continue;
88321
88322 kdb_printf("%-20s%8u 0x%p ", mod->name,
88323- mod->core_size, (void *)mod);
88324+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
88325 #ifdef CONFIG_MODULE_UNLOAD
88326 kdb_printf("%4ld ", module_refcount(mod));
88327 #endif
88328@@ -1987,7 +1987,7 @@ static int kdb_lsmod(int argc, const char **argv)
88329 kdb_printf(" (Loading)");
88330 else
88331 kdb_printf(" (Live)");
88332- kdb_printf(" 0x%p", mod->module_core);
88333+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
88334
88335 #ifdef CONFIG_MODULE_UNLOAD
88336 {
88337diff --git a/kernel/events/core.c b/kernel/events/core.c
88338index 1cd5eef..e8b5af9 100644
88339--- a/kernel/events/core.c
88340+++ b/kernel/events/core.c
88341@@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
88342 * 0 - disallow raw tracepoint access for unpriv
88343 * 1 - disallow cpu events for unpriv
88344 * 2 - disallow kernel profiling for unpriv
88345+ * 3 - disallow all unpriv perf event use
88346 */
88347-int sysctl_perf_event_paranoid __read_mostly = 1;
88348+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
88349+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
88350+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
88351+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
88352+#else
88353+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
88354+#endif
88355
88356 /* Minimum for 512 kiB + 1 user control page */
88357 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
88358@@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
88359
88360 tmp *= sysctl_perf_cpu_time_max_percent;
88361 do_div(tmp, 100);
88362- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
88363+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
88364 }
88365
88366 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
88367@@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
88368 }
88369 }
88370
88371-static atomic64_t perf_event_id;
88372+static atomic64_unchecked_t perf_event_id;
88373
88374 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
88375 enum event_type_t event_type);
88376@@ -3102,7 +3109,7 @@ static void __perf_event_read(void *info)
88377
88378 static inline u64 perf_event_count(struct perf_event *event)
88379 {
88380- return local64_read(&event->count) + atomic64_read(&event->child_count);
88381+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
88382 }
88383
88384 static u64 perf_event_read(struct perf_event *event)
88385@@ -3528,9 +3535,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
88386 mutex_lock(&event->child_mutex);
88387 total += perf_event_read(event);
88388 *enabled += event->total_time_enabled +
88389- atomic64_read(&event->child_total_time_enabled);
88390+ atomic64_read_unchecked(&event->child_total_time_enabled);
88391 *running += event->total_time_running +
88392- atomic64_read(&event->child_total_time_running);
88393+ atomic64_read_unchecked(&event->child_total_time_running);
88394
88395 list_for_each_entry(child, &event->child_list, child_list) {
88396 total += perf_event_read(child);
88397@@ -3994,10 +4001,10 @@ void perf_event_update_userpage(struct perf_event *event)
88398 userpg->offset -= local64_read(&event->hw.prev_count);
88399
88400 userpg->time_enabled = enabled +
88401- atomic64_read(&event->child_total_time_enabled);
88402+ atomic64_read_unchecked(&event->child_total_time_enabled);
88403
88404 userpg->time_running = running +
88405- atomic64_read(&event->child_total_time_running);
88406+ atomic64_read_unchecked(&event->child_total_time_running);
88407
88408 arch_perf_update_userpage(userpg, now);
88409
88410@@ -4561,7 +4568,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
88411
88412 /* Data. */
88413 sp = perf_user_stack_pointer(regs);
88414- rem = __output_copy_user(handle, (void *) sp, dump_size);
88415+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
88416 dyn_size = dump_size - rem;
88417
88418 perf_output_skip(handle, rem);
88419@@ -4652,11 +4659,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
88420 values[n++] = perf_event_count(event);
88421 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
88422 values[n++] = enabled +
88423- atomic64_read(&event->child_total_time_enabled);
88424+ atomic64_read_unchecked(&event->child_total_time_enabled);
88425 }
88426 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
88427 values[n++] = running +
88428- atomic64_read(&event->child_total_time_running);
88429+ atomic64_read_unchecked(&event->child_total_time_running);
88430 }
88431 if (read_format & PERF_FORMAT_ID)
88432 values[n++] = primary_event_id(event);
88433@@ -6958,7 +6965,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
88434 event->parent = parent_event;
88435
88436 event->ns = get_pid_ns(task_active_pid_ns(current));
88437- event->id = atomic64_inc_return(&perf_event_id);
88438+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
88439
88440 event->state = PERF_EVENT_STATE_INACTIVE;
88441
88442@@ -7237,6 +7244,11 @@ SYSCALL_DEFINE5(perf_event_open,
88443 if (flags & ~PERF_FLAG_ALL)
88444 return -EINVAL;
88445
88446+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
88447+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
88448+ return -EACCES;
88449+#endif
88450+
88451 err = perf_copy_attr(attr_uptr, &attr);
88452 if (err)
88453 return err;
88454@@ -7592,10 +7604,10 @@ static void sync_child_event(struct perf_event *child_event,
88455 /*
88456 * Add back the child's count to the parent's count:
88457 */
88458- atomic64_add(child_val, &parent_event->child_count);
88459- atomic64_add(child_event->total_time_enabled,
88460+ atomic64_add_unchecked(child_val, &parent_event->child_count);
88461+ atomic64_add_unchecked(child_event->total_time_enabled,
88462 &parent_event->child_total_time_enabled);
88463- atomic64_add(child_event->total_time_running,
88464+ atomic64_add_unchecked(child_event->total_time_running,
88465 &parent_event->child_total_time_running);
88466
88467 /*
88468diff --git a/kernel/events/internal.h b/kernel/events/internal.h
88469index 569b2187..19940d9 100644
88470--- a/kernel/events/internal.h
88471+++ b/kernel/events/internal.h
88472@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
88473 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
88474 }
88475
88476-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
88477+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
88478 static inline unsigned long \
88479 func_name(struct perf_output_handle *handle, \
88480- const void *buf, unsigned long len) \
88481+ const void user *buf, unsigned long len) \
88482 { \
88483 unsigned long size, written; \
88484 \
88485@@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
88486 return 0;
88487 }
88488
88489-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
88490+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
88491
88492 static inline unsigned long
88493 memcpy_skip(void *dst, const void *src, unsigned long n)
88494@@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
88495 return 0;
88496 }
88497
88498-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
88499+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
88500
88501 #ifndef arch_perf_out_copy_user
88502 #define arch_perf_out_copy_user arch_perf_out_copy_user
88503@@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
88504 }
88505 #endif
88506
88507-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
88508+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
88509
88510 /* Callchain handling */
88511 extern struct perf_callchain_entry *
88512diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
88513index ed8f2cd..fe8030c 100644
88514--- a/kernel/events/uprobes.c
88515+++ b/kernel/events/uprobes.c
88516@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
88517 {
88518 struct page *page;
88519 uprobe_opcode_t opcode;
88520- int result;
88521+ long result;
88522
88523 pagefault_disable();
88524 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
88525diff --git a/kernel/exit.c b/kernel/exit.c
88526index 5d30019..934add5 100644
88527--- a/kernel/exit.c
88528+++ b/kernel/exit.c
88529@@ -174,6 +174,10 @@ void release_task(struct task_struct *p)
88530 struct task_struct *leader;
88531 int zap_leader;
88532 repeat:
88533+#ifdef CONFIG_NET
88534+ gr_del_task_from_ip_table(p);
88535+#endif
88536+
88537 /* don't need to get the RCU readlock here - the process is dead and
88538 * can't be modifying its own credentials. But shut RCU-lockdep up */
88539 rcu_read_lock();
88540@@ -670,6 +674,8 @@ void do_exit(long code)
88541 int group_dead;
88542 TASKS_RCU(int tasks_rcu_i);
88543
88544+ set_fs(USER_DS);
88545+
88546 profile_task_exit(tsk);
88547
88548 WARN_ON(blk_needs_flush_plug(tsk));
88549@@ -686,7 +692,6 @@ void do_exit(long code)
88550 * mm_release()->clear_child_tid() from writing to a user-controlled
88551 * kernel address.
88552 */
88553- set_fs(USER_DS);
88554
88555 ptrace_event(PTRACE_EVENT_EXIT, code);
88556
88557@@ -744,6 +749,9 @@ void do_exit(long code)
88558 tsk->exit_code = code;
88559 taskstats_exit(tsk, group_dead);
88560
88561+ gr_acl_handle_psacct(tsk, code);
88562+ gr_acl_handle_exit();
88563+
88564 exit_mm(tsk);
88565
88566 if (group_dead)
88567@@ -863,7 +871,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
88568 * Take down every thread in the group. This is called by fatal signals
88569 * as well as by sys_exit_group (below).
88570 */
88571-void
88572+__noreturn void
88573 do_group_exit(int exit_code)
88574 {
88575 struct signal_struct *sig = current->signal;
88576diff --git a/kernel/fork.c b/kernel/fork.c
88577index 9b7d746..5b898ab 100644
88578--- a/kernel/fork.c
88579+++ b/kernel/fork.c
88580@@ -183,6 +183,48 @@ void thread_info_cache_init(void)
88581 # endif
88582 #endif
88583
88584+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88585+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
88586+ int node, void **lowmem_stack)
88587+{
88588+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
88589+ void *ret = NULL;
88590+ unsigned int i;
88591+
88592+ *lowmem_stack = alloc_thread_info_node(tsk, node);
88593+ if (*lowmem_stack == NULL)
88594+ goto out;
88595+
88596+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
88597+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
88598+
88599+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
88600+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
88601+ if (ret == NULL) {
88602+ free_thread_info(*lowmem_stack);
88603+ *lowmem_stack = NULL;
88604+ }
88605+
88606+out:
88607+ return ret;
88608+}
88609+
88610+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
88611+{
88612+ unmap_process_stacks(tsk);
88613+}
88614+#else
88615+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
88616+ int node, void **lowmem_stack)
88617+{
88618+ return alloc_thread_info_node(tsk, node);
88619+}
88620+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
88621+{
88622+ free_thread_info(ti);
88623+}
88624+#endif
88625+
88626 /* SLAB cache for signal_struct structures (tsk->signal) */
88627 static struct kmem_cache *signal_cachep;
88628
88629@@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
88630 /* SLAB cache for mm_struct structures (tsk->mm) */
88631 static struct kmem_cache *mm_cachep;
88632
88633-static void account_kernel_stack(struct thread_info *ti, int account)
88634+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
88635 {
88636+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88637+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
88638+#else
88639 struct zone *zone = page_zone(virt_to_page(ti));
88640+#endif
88641
88642 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
88643 }
88644
88645 void free_task(struct task_struct *tsk)
88646 {
88647- account_kernel_stack(tsk->stack, -1);
88648+ account_kernel_stack(tsk, tsk->stack, -1);
88649 arch_release_thread_info(tsk->stack);
88650- free_thread_info(tsk->stack);
88651+ gr_free_thread_info(tsk, tsk->stack);
88652 rt_mutex_debug_task_free(tsk);
88653 ftrace_graph_exit_task(tsk);
88654 put_seccomp_filter(tsk);
88655@@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88656 {
88657 struct task_struct *tsk;
88658 struct thread_info *ti;
88659+ void *lowmem_stack;
88660 int node = tsk_fork_get_node(orig);
88661 int err;
88662
88663@@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88664 if (!tsk)
88665 return NULL;
88666
88667- ti = alloc_thread_info_node(tsk, node);
88668+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
88669 if (!ti)
88670 goto free_tsk;
88671
88672@@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88673 goto free_ti;
88674
88675 tsk->stack = ti;
88676+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88677+ tsk->lowmem_stack = lowmem_stack;
88678+#endif
88679 #ifdef CONFIG_SECCOMP
88680 /*
88681 * We must handle setting up seccomp filters once we're under
88682@@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88683 set_task_stack_end_magic(tsk);
88684
88685 #ifdef CONFIG_CC_STACKPROTECTOR
88686- tsk->stack_canary = get_random_int();
88687+ tsk->stack_canary = pax_get_random_long();
88688 #endif
88689
88690 /*
88691@@ -352,24 +402,92 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88692 tsk->splice_pipe = NULL;
88693 tsk->task_frag.page = NULL;
88694
88695- account_kernel_stack(ti, 1);
88696+ account_kernel_stack(tsk, ti, 1);
88697
88698 return tsk;
88699
88700 free_ti:
88701- free_thread_info(ti);
88702+ gr_free_thread_info(tsk, ti);
88703 free_tsk:
88704 free_task_struct(tsk);
88705 return NULL;
88706 }
88707
88708 #ifdef CONFIG_MMU
88709-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88710+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
88711+{
88712+ struct vm_area_struct *tmp;
88713+ unsigned long charge;
88714+ struct file *file;
88715+ int retval;
88716+
88717+ charge = 0;
88718+ if (mpnt->vm_flags & VM_ACCOUNT) {
88719+ unsigned long len = vma_pages(mpnt);
88720+
88721+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
88722+ goto fail_nomem;
88723+ charge = len;
88724+ }
88725+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
88726+ if (!tmp)
88727+ goto fail_nomem;
88728+ *tmp = *mpnt;
88729+ tmp->vm_mm = mm;
88730+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
88731+ retval = vma_dup_policy(mpnt, tmp);
88732+ if (retval)
88733+ goto fail_nomem_policy;
88734+ if (anon_vma_fork(tmp, mpnt))
88735+ goto fail_nomem_anon_vma_fork;
88736+ tmp->vm_flags &= ~VM_LOCKED;
88737+ tmp->vm_next = tmp->vm_prev = NULL;
88738+ tmp->vm_mirror = NULL;
88739+ file = tmp->vm_file;
88740+ if (file) {
88741+ struct inode *inode = file_inode(file);
88742+ struct address_space *mapping = file->f_mapping;
88743+
88744+ get_file(file);
88745+ if (tmp->vm_flags & VM_DENYWRITE)
88746+ atomic_dec(&inode->i_writecount);
88747+ mutex_lock(&mapping->i_mmap_mutex);
88748+ if (tmp->vm_flags & VM_SHARED)
88749+ atomic_inc(&mapping->i_mmap_writable);
88750+ flush_dcache_mmap_lock(mapping);
88751+ /* insert tmp into the share list, just after mpnt */
88752+ if (unlikely(tmp->vm_flags & VM_NONLINEAR))
88753+ vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
88754+ else
88755+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
88756+ flush_dcache_mmap_unlock(mapping);
88757+ mutex_unlock(&mapping->i_mmap_mutex);
88758+ }
88759+
88760+ /*
88761+ * Clear hugetlb-related page reserves for children. This only
88762+ * affects MAP_PRIVATE mappings. Faults generated by the child
88763+ * are not guaranteed to succeed, even if read-only
88764+ */
88765+ if (is_vm_hugetlb_page(tmp))
88766+ reset_vma_resv_huge_pages(tmp);
88767+
88768+ return tmp;
88769+
88770+fail_nomem_anon_vma_fork:
88771+ mpol_put(vma_policy(tmp));
88772+fail_nomem_policy:
88773+ kmem_cache_free(vm_area_cachep, tmp);
88774+fail_nomem:
88775+ vm_unacct_memory(charge);
88776+ return NULL;
88777+}
88778+
88779+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88780 {
88781 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
88782 struct rb_node **rb_link, *rb_parent;
88783 int retval;
88784- unsigned long charge;
88785
88786 uprobe_start_dup_mmap();
88787 down_write(&oldmm->mmap_sem);
88788@@ -397,55 +515,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88789
88790 prev = NULL;
88791 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
88792- struct file *file;
88793-
88794 if (mpnt->vm_flags & VM_DONTCOPY) {
88795 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
88796 -vma_pages(mpnt));
88797 continue;
88798 }
88799- charge = 0;
88800- if (mpnt->vm_flags & VM_ACCOUNT) {
88801- unsigned long len = vma_pages(mpnt);
88802-
88803- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
88804- goto fail_nomem;
88805- charge = len;
88806- }
88807- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
88808- if (!tmp)
88809- goto fail_nomem;
88810- *tmp = *mpnt;
88811- INIT_LIST_HEAD(&tmp->anon_vma_chain);
88812- retval = vma_dup_policy(mpnt, tmp);
88813- if (retval)
88814- goto fail_nomem_policy;
88815- tmp->vm_mm = mm;
88816- if (anon_vma_fork(tmp, mpnt))
88817- goto fail_nomem_anon_vma_fork;
88818- tmp->vm_flags &= ~VM_LOCKED;
88819- tmp->vm_next = tmp->vm_prev = NULL;
88820- file = tmp->vm_file;
88821- if (file) {
88822- struct inode *inode = file_inode(file);
88823- struct address_space *mapping = file->f_mapping;
88824-
88825- get_file(file);
88826- if (tmp->vm_flags & VM_DENYWRITE)
88827- atomic_dec(&inode->i_writecount);
88828- mutex_lock(&mapping->i_mmap_mutex);
88829- if (tmp->vm_flags & VM_SHARED)
88830- atomic_inc(&mapping->i_mmap_writable);
88831- flush_dcache_mmap_lock(mapping);
88832- /* insert tmp into the share list, just after mpnt */
88833- if (unlikely(tmp->vm_flags & VM_NONLINEAR))
88834- vma_nonlinear_insert(tmp,
88835- &mapping->i_mmap_nonlinear);
88836- else
88837- vma_interval_tree_insert_after(tmp, mpnt,
88838- &mapping->i_mmap);
88839- flush_dcache_mmap_unlock(mapping);
88840- mutex_unlock(&mapping->i_mmap_mutex);
88841+ tmp = dup_vma(mm, oldmm, mpnt);
88842+ if (!tmp) {
88843+ retval = -ENOMEM;
88844+ goto out;
88845 }
88846
88847 /*
88848@@ -477,6 +555,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88849 if (retval)
88850 goto out;
88851 }
88852+
88853+#ifdef CONFIG_PAX_SEGMEXEC
88854+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
88855+ struct vm_area_struct *mpnt_m;
88856+
88857+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
88858+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
88859+
88860+ if (!mpnt->vm_mirror)
88861+ continue;
88862+
88863+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
88864+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
88865+ mpnt->vm_mirror = mpnt_m;
88866+ } else {
88867+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
88868+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
88869+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
88870+ mpnt->vm_mirror->vm_mirror = mpnt;
88871+ }
88872+ }
88873+ BUG_ON(mpnt_m);
88874+ }
88875+#endif
88876+
88877 /* a new mm has just been created */
88878 arch_dup_mmap(oldmm, mm);
88879 retval = 0;
88880@@ -486,14 +589,6 @@ out:
88881 up_write(&oldmm->mmap_sem);
88882 uprobe_end_dup_mmap();
88883 return retval;
88884-fail_nomem_anon_vma_fork:
88885- mpol_put(vma_policy(tmp));
88886-fail_nomem_policy:
88887- kmem_cache_free(vm_area_cachep, tmp);
88888-fail_nomem:
88889- retval = -ENOMEM;
88890- vm_unacct_memory(charge);
88891- goto out;
88892 }
88893
88894 static inline int mm_alloc_pgd(struct mm_struct *mm)
88895@@ -734,8 +829,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
88896 return ERR_PTR(err);
88897
88898 mm = get_task_mm(task);
88899- if (mm && mm != current->mm &&
88900- !ptrace_may_access(task, mode)) {
88901+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
88902+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
88903 mmput(mm);
88904 mm = ERR_PTR(-EACCES);
88905 }
88906@@ -938,13 +1033,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
88907 spin_unlock(&fs->lock);
88908 return -EAGAIN;
88909 }
88910- fs->users++;
88911+ atomic_inc(&fs->users);
88912 spin_unlock(&fs->lock);
88913 return 0;
88914 }
88915 tsk->fs = copy_fs_struct(fs);
88916 if (!tsk->fs)
88917 return -ENOMEM;
88918+ /* Carry through gr_chroot_dentry and is_chrooted instead
88919+ of recomputing it here. Already copied when the task struct
88920+ is duplicated. This allows pivot_root to not be treated as
88921+ a chroot
88922+ */
88923+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
88924+
88925 return 0;
88926 }
88927
88928@@ -1179,7 +1281,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
88929 * parts of the process environment (as per the clone
88930 * flags). The actual kick-off is left to the caller.
88931 */
88932-static struct task_struct *copy_process(unsigned long clone_flags,
88933+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
88934 unsigned long stack_start,
88935 unsigned long stack_size,
88936 int __user *child_tidptr,
88937@@ -1250,6 +1352,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
88938 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
88939 #endif
88940 retval = -EAGAIN;
88941+
88942+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
88943+
88944 if (atomic_read(&p->real_cred->user->processes) >=
88945 task_rlimit(p, RLIMIT_NPROC)) {
88946 if (p->real_cred->user != INIT_USER &&
88947@@ -1499,6 +1604,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
88948 goto bad_fork_free_pid;
88949 }
88950
88951+ /* synchronizes with gr_set_acls()
88952+ we need to call this past the point of no return for fork()
88953+ */
88954+ gr_copy_label(p);
88955+
88956 if (likely(p->pid)) {
88957 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
88958
88959@@ -1589,6 +1699,8 @@ bad_fork_cleanup_count:
88960 bad_fork_free:
88961 free_task(p);
88962 fork_out:
88963+ gr_log_forkfail(retval);
88964+
88965 return ERR_PTR(retval);
88966 }
88967
88968@@ -1650,6 +1762,7 @@ long do_fork(unsigned long clone_flags,
88969
88970 p = copy_process(clone_flags, stack_start, stack_size,
88971 child_tidptr, NULL, trace);
88972+ add_latent_entropy();
88973 /*
88974 * Do this prior waking up the new thread - the thread pointer
88975 * might get invalid after that point, if the thread exits quickly.
88976@@ -1666,6 +1779,8 @@ long do_fork(unsigned long clone_flags,
88977 if (clone_flags & CLONE_PARENT_SETTID)
88978 put_user(nr, parent_tidptr);
88979
88980+ gr_handle_brute_check();
88981+
88982 if (clone_flags & CLONE_VFORK) {
88983 p->vfork_done = &vfork;
88984 init_completion(&vfork);
88985@@ -1784,7 +1899,7 @@ void __init proc_caches_init(void)
88986 mm_cachep = kmem_cache_create("mm_struct",
88987 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
88988 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
88989- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
88990+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
88991 mmap_init();
88992 nsproxy_cache_init();
88993 }
88994@@ -1824,7 +1939,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
88995 return 0;
88996
88997 /* don't need lock here; in the worst case we'll do useless copy */
88998- if (fs->users == 1)
88999+ if (atomic_read(&fs->users) == 1)
89000 return 0;
89001
89002 *new_fsp = copy_fs_struct(fs);
89003@@ -1936,7 +2051,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
89004 fs = current->fs;
89005 spin_lock(&fs->lock);
89006 current->fs = new_fs;
89007- if (--fs->users)
89008+ gr_set_chroot_entries(current, &current->fs->root);
89009+ if (atomic_dec_return(&fs->users))
89010 new_fs = NULL;
89011 else
89012 new_fs = fs;
89013diff --git a/kernel/futex.c b/kernel/futex.c
89014index 63678b5..512f9af 100644
89015--- a/kernel/futex.c
89016+++ b/kernel/futex.c
89017@@ -201,7 +201,7 @@ struct futex_pi_state {
89018 atomic_t refcount;
89019
89020 union futex_key key;
89021-};
89022+} __randomize_layout;
89023
89024 /**
89025 * struct futex_q - The hashed futex queue entry, one per waiting task
89026@@ -235,7 +235,7 @@ struct futex_q {
89027 struct rt_mutex_waiter *rt_waiter;
89028 union futex_key *requeue_pi_key;
89029 u32 bitset;
89030-};
89031+} __randomize_layout;
89032
89033 static const struct futex_q futex_q_init = {
89034 /* list gets initialized in queue_me()*/
89035@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
89036 struct page *page, *page_head;
89037 int err, ro = 0;
89038
89039+#ifdef CONFIG_PAX_SEGMEXEC
89040+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
89041+ return -EFAULT;
89042+#endif
89043+
89044 /*
89045 * The futex address must be "naturally" aligned.
89046 */
89047@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
89048
89049 static int get_futex_value_locked(u32 *dest, u32 __user *from)
89050 {
89051- int ret;
89052+ unsigned long ret;
89053
89054 pagefault_disable();
89055 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
89056@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
89057 {
89058 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
89059 u32 curval;
89060+ mm_segment_t oldfs;
89061
89062 /*
89063 * This will fail and we want it. Some arch implementations do
89064@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
89065 * implementation, the non-functional ones will return
89066 * -ENOSYS.
89067 */
89068+ oldfs = get_fs();
89069+ set_fs(USER_DS);
89070 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
89071 futex_cmpxchg_enabled = 1;
89072+ set_fs(oldfs);
89073 #endif
89074 }
89075
89076diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
89077index 55c8c93..9ba7ad6 100644
89078--- a/kernel/futex_compat.c
89079+++ b/kernel/futex_compat.c
89080@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
89081 return 0;
89082 }
89083
89084-static void __user *futex_uaddr(struct robust_list __user *entry,
89085+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
89086 compat_long_t futex_offset)
89087 {
89088 compat_uptr_t base = ptr_to_compat(entry);
89089diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
89090index b358a80..fc25240 100644
89091--- a/kernel/gcov/base.c
89092+++ b/kernel/gcov/base.c
89093@@ -114,11 +114,6 @@ void gcov_enable_events(void)
89094 }
89095
89096 #ifdef CONFIG_MODULES
89097-static inline int within(void *addr, void *start, unsigned long size)
89098-{
89099- return ((addr >= start) && (addr < start + size));
89100-}
89101-
89102 /* Update list and generate events when modules are unloaded. */
89103 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
89104 void *data)
89105@@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
89106
89107 /* Remove entries located in module from linked list. */
89108 while ((info = gcov_info_next(info))) {
89109- if (within(info, mod->module_core, mod->core_size)) {
89110+ if (within_module_core_rw((unsigned long)info, mod)) {
89111 gcov_info_unlink(prev, info);
89112 if (gcov_events_enabled)
89113 gcov_event(GCOV_REMOVE, info);
89114diff --git a/kernel/jump_label.c b/kernel/jump_label.c
89115index 9019f15..9a3c42e 100644
89116--- a/kernel/jump_label.c
89117+++ b/kernel/jump_label.c
89118@@ -14,6 +14,7 @@
89119 #include <linux/err.h>
89120 #include <linux/static_key.h>
89121 #include <linux/jump_label_ratelimit.h>
89122+#include <linux/mm.h>
89123
89124 #ifdef HAVE_JUMP_LABEL
89125
89126@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
89127
89128 size = (((unsigned long)stop - (unsigned long)start)
89129 / sizeof(struct jump_entry));
89130+ pax_open_kernel();
89131 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
89132+ pax_close_kernel();
89133 }
89134
89135 static void jump_label_update(struct static_key *key, int enable);
89136@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
89137 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
89138 struct jump_entry *iter;
89139
89140+ pax_open_kernel();
89141 for (iter = iter_start; iter < iter_stop; iter++) {
89142 if (within_module_init(iter->code, mod))
89143 iter->code = 0;
89144 }
89145+ pax_close_kernel();
89146 }
89147
89148 static int
89149diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
89150index 5c5987f..bc502b0 100644
89151--- a/kernel/kallsyms.c
89152+++ b/kernel/kallsyms.c
89153@@ -11,6 +11,9 @@
89154 * Changed the compression method from stem compression to "table lookup"
89155 * compression (see scripts/kallsyms.c for a more complete description)
89156 */
89157+#ifdef CONFIG_GRKERNSEC_HIDESYM
89158+#define __INCLUDED_BY_HIDESYM 1
89159+#endif
89160 #include <linux/kallsyms.h>
89161 #include <linux/module.h>
89162 #include <linux/init.h>
89163@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
89164
89165 static inline int is_kernel_inittext(unsigned long addr)
89166 {
89167+ if (system_state != SYSTEM_BOOTING)
89168+ return 0;
89169+
89170 if (addr >= (unsigned long)_sinittext
89171 && addr <= (unsigned long)_einittext)
89172 return 1;
89173 return 0;
89174 }
89175
89176+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89177+#ifdef CONFIG_MODULES
89178+static inline int is_module_text(unsigned long addr)
89179+{
89180+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
89181+ return 1;
89182+
89183+ addr = ktla_ktva(addr);
89184+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
89185+}
89186+#else
89187+static inline int is_module_text(unsigned long addr)
89188+{
89189+ return 0;
89190+}
89191+#endif
89192+#endif
89193+
89194 static inline int is_kernel_text(unsigned long addr)
89195 {
89196 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
89197@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
89198
89199 static inline int is_kernel(unsigned long addr)
89200 {
89201+
89202+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89203+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
89204+ return 1;
89205+
89206+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
89207+#else
89208 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
89209+#endif
89210+
89211 return 1;
89212 return in_gate_area_no_mm(addr);
89213 }
89214
89215 static int is_ksym_addr(unsigned long addr)
89216 {
89217+
89218+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89219+ if (is_module_text(addr))
89220+ return 0;
89221+#endif
89222+
89223 if (all_var)
89224 return is_kernel(addr);
89225
89226@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
89227
89228 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
89229 {
89230- iter->name[0] = '\0';
89231 iter->nameoff = get_symbol_offset(new_pos);
89232 iter->pos = new_pos;
89233 }
89234@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
89235 {
89236 struct kallsym_iter *iter = m->private;
89237
89238+#ifdef CONFIG_GRKERNSEC_HIDESYM
89239+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
89240+ return 0;
89241+#endif
89242+
89243 /* Some debugging symbols have no name. Ignore them. */
89244 if (!iter->name[0])
89245 return 0;
89246@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
89247 */
89248 type = iter->exported ? toupper(iter->type) :
89249 tolower(iter->type);
89250+
89251 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
89252 type, iter->name, iter->module_name);
89253 } else
89254diff --git a/kernel/kcmp.c b/kernel/kcmp.c
89255index 0aa69ea..a7fcafb 100644
89256--- a/kernel/kcmp.c
89257+++ b/kernel/kcmp.c
89258@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
89259 struct task_struct *task1, *task2;
89260 int ret;
89261
89262+#ifdef CONFIG_GRKERNSEC
89263+ return -ENOSYS;
89264+#endif
89265+
89266 rcu_read_lock();
89267
89268 /*
89269diff --git a/kernel/kexec.c b/kernel/kexec.c
89270index 2abf9f6..c40cf85 100644
89271--- a/kernel/kexec.c
89272+++ b/kernel/kexec.c
89273@@ -1349,7 +1349,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
89274 compat_ulong_t, flags)
89275 {
89276 struct compat_kexec_segment in;
89277- struct kexec_segment out, __user *ksegments;
89278+ struct kexec_segment out;
89279+ struct kexec_segment __user *ksegments;
89280 unsigned long i, result;
89281
89282 /* Don't allow clients that don't understand the native
89283diff --git a/kernel/kmod.c b/kernel/kmod.c
89284index 80f7a6d..3c476d3 100644
89285--- a/kernel/kmod.c
89286+++ b/kernel/kmod.c
89287@@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
89288 kfree(info->argv);
89289 }
89290
89291-static int call_modprobe(char *module_name, int wait)
89292+static int call_modprobe(char *module_name, char *module_param, int wait)
89293 {
89294 struct subprocess_info *info;
89295 static char *envp[] = {
89296@@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
89297 NULL
89298 };
89299
89300- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
89301+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
89302 if (!argv)
89303 goto out;
89304
89305@@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
89306 argv[1] = "-q";
89307 argv[2] = "--";
89308 argv[3] = module_name; /* check free_modprobe_argv() */
89309- argv[4] = NULL;
89310+ argv[4] = module_param;
89311+ argv[5] = NULL;
89312
89313 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
89314 NULL, free_modprobe_argv, NULL);
89315@@ -129,9 +130,8 @@ out:
89316 * If module auto-loading support is disabled then this function
89317 * becomes a no-operation.
89318 */
89319-int __request_module(bool wait, const char *fmt, ...)
89320+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
89321 {
89322- va_list args;
89323 char module_name[MODULE_NAME_LEN];
89324 unsigned int max_modprobes;
89325 int ret;
89326@@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
89327 if (!modprobe_path[0])
89328 return 0;
89329
89330- va_start(args, fmt);
89331- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
89332- va_end(args);
89333+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
89334 if (ret >= MODULE_NAME_LEN)
89335 return -ENAMETOOLONG;
89336
89337@@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
89338 if (ret)
89339 return ret;
89340
89341+#ifdef CONFIG_GRKERNSEC_MODHARDEN
89342+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
89343+ /* hack to workaround consolekit/udisks stupidity */
89344+ read_lock(&tasklist_lock);
89345+ if (!strcmp(current->comm, "mount") &&
89346+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
89347+ read_unlock(&tasklist_lock);
89348+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
89349+ return -EPERM;
89350+ }
89351+ read_unlock(&tasklist_lock);
89352+ }
89353+#endif
89354+
89355 /* If modprobe needs a service that is in a module, we get a recursive
89356 * loop. Limit the number of running kmod threads to max_threads/2 or
89357 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
89358@@ -188,16 +200,61 @@ int __request_module(bool wait, const char *fmt, ...)
89359
89360 trace_module_request(module_name, wait, _RET_IP_);
89361
89362- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
89363+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
89364
89365 atomic_dec(&kmod_concurrent);
89366 return ret;
89367 }
89368+
89369+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
89370+{
89371+ va_list args;
89372+ int ret;
89373+
89374+ va_start(args, fmt);
89375+ ret = ____request_module(wait, module_param, fmt, args);
89376+ va_end(args);
89377+
89378+ return ret;
89379+}
89380+
89381+int __request_module(bool wait, const char *fmt, ...)
89382+{
89383+ va_list args;
89384+ int ret;
89385+
89386+#ifdef CONFIG_GRKERNSEC_MODHARDEN
89387+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
89388+ char module_param[MODULE_NAME_LEN];
89389+
89390+ memset(module_param, 0, sizeof(module_param));
89391+
89392+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
89393+
89394+ va_start(args, fmt);
89395+ ret = ____request_module(wait, module_param, fmt, args);
89396+ va_end(args);
89397+
89398+ return ret;
89399+ }
89400+#endif
89401+
89402+ va_start(args, fmt);
89403+ ret = ____request_module(wait, NULL, fmt, args);
89404+ va_end(args);
89405+
89406+ return ret;
89407+}
89408+
89409 EXPORT_SYMBOL(__request_module);
89410 #endif /* CONFIG_MODULES */
89411
89412 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
89413 {
89414+#ifdef CONFIG_GRKERNSEC
89415+ kfree(info->path);
89416+ info->path = info->origpath;
89417+#endif
89418 if (info->cleanup)
89419 (*info->cleanup)(info);
89420 kfree(info);
89421@@ -240,6 +297,20 @@ static int ____call_usermodehelper(void *data)
89422 */
89423 set_user_nice(current, 0);
89424
89425+#ifdef CONFIG_GRKERNSEC
89426+ /* this is race-free as far as userland is concerned as we copied
89427+ out the path to be used prior to this point and are now operating
89428+ on that copy
89429+ */
89430+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
89431+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
89432+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
89433+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
89434+ retval = -EPERM;
89435+ goto out;
89436+ }
89437+#endif
89438+
89439 retval = -ENOMEM;
89440 new = prepare_kernel_cred(current);
89441 if (!new)
89442@@ -262,8 +333,8 @@ static int ____call_usermodehelper(void *data)
89443 commit_creds(new);
89444
89445 retval = do_execve(getname_kernel(sub_info->path),
89446- (const char __user *const __user *)sub_info->argv,
89447- (const char __user *const __user *)sub_info->envp);
89448+ (const char __user *const __force_user *)sub_info->argv,
89449+ (const char __user *const __force_user *)sub_info->envp);
89450 out:
89451 sub_info->retval = retval;
89452 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
89453@@ -303,7 +374,7 @@ static int wait_for_helper(void *data)
89454 *
89455 * Thus the __user pointer cast is valid here.
89456 */
89457- sys_wait4(pid, (int __user *)&ret, 0, NULL);
89458+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
89459
89460 /*
89461 * If ret is 0, either ____call_usermodehelper failed and the
89462@@ -532,7 +603,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
89463 goto out;
89464
89465 INIT_WORK(&sub_info->work, __call_usermodehelper);
89466+#ifdef CONFIG_GRKERNSEC
89467+ sub_info->origpath = path;
89468+ sub_info->path = kstrdup(path, gfp_mask);
89469+#else
89470 sub_info->path = path;
89471+#endif
89472 sub_info->argv = argv;
89473 sub_info->envp = envp;
89474
89475@@ -645,7 +721,7 @@ EXPORT_SYMBOL(call_usermodehelper);
89476 static int proc_cap_handler(struct ctl_table *table, int write,
89477 void __user *buffer, size_t *lenp, loff_t *ppos)
89478 {
89479- struct ctl_table t;
89480+ ctl_table_no_const t;
89481 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
89482 kernel_cap_t new_cap;
89483 int err, i;
89484diff --git a/kernel/kprobes.c b/kernel/kprobes.c
89485index 3995f54..e247879 100644
89486--- a/kernel/kprobes.c
89487+++ b/kernel/kprobes.c
89488@@ -31,6 +31,9 @@
89489 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
89490 * <prasanna@in.ibm.com> added function-return probes.
89491 */
89492+#ifdef CONFIG_GRKERNSEC_HIDESYM
89493+#define __INCLUDED_BY_HIDESYM 1
89494+#endif
89495 #include <linux/kprobes.h>
89496 #include <linux/hash.h>
89497 #include <linux/init.h>
89498@@ -122,12 +125,12 @@ enum kprobe_slot_state {
89499
89500 static void *alloc_insn_page(void)
89501 {
89502- return module_alloc(PAGE_SIZE);
89503+ return module_alloc_exec(PAGE_SIZE);
89504 }
89505
89506 static void free_insn_page(void *page)
89507 {
89508- module_free(NULL, page);
89509+ module_free_exec(NULL, page);
89510 }
89511
89512 struct kprobe_insn_cache kprobe_insn_slots = {
89513@@ -2187,11 +2190,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
89514 kprobe_type = "k";
89515
89516 if (sym)
89517- seq_printf(pi, "%p %s %s+0x%x %s ",
89518+ seq_printf(pi, "%pK %s %s+0x%x %s ",
89519 p->addr, kprobe_type, sym, offset,
89520 (modname ? modname : " "));
89521 else
89522- seq_printf(pi, "%p %s %p ",
89523+ seq_printf(pi, "%pK %s %pK ",
89524 p->addr, kprobe_type, p->addr);
89525
89526 if (!pp)
89527diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
89528index 6683cce..daf8999 100644
89529--- a/kernel/ksysfs.c
89530+++ b/kernel/ksysfs.c
89531@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
89532 {
89533 if (count+1 > UEVENT_HELPER_PATH_LEN)
89534 return -ENOENT;
89535+ if (!capable(CAP_SYS_ADMIN))
89536+ return -EPERM;
89537 memcpy(uevent_helper, buf, count);
89538 uevent_helper[count] = '\0';
89539 if (count && uevent_helper[count-1] == '\n')
89540@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
89541 return count;
89542 }
89543
89544-static struct bin_attribute notes_attr = {
89545+static bin_attribute_no_const notes_attr __read_only = {
89546 .attr = {
89547 .name = "notes",
89548 .mode = S_IRUGO,
89549diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
89550index 88d0d44..e9ce0ee 100644
89551--- a/kernel/locking/lockdep.c
89552+++ b/kernel/locking/lockdep.c
89553@@ -599,6 +599,10 @@ static int static_obj(void *obj)
89554 end = (unsigned long) &_end,
89555 addr = (unsigned long) obj;
89556
89557+#ifdef CONFIG_PAX_KERNEXEC
89558+ start = ktla_ktva(start);
89559+#endif
89560+
89561 /*
89562 * static variable?
89563 */
89564@@ -740,6 +744,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
89565 if (!static_obj(lock->key)) {
89566 debug_locks_off();
89567 printk("INFO: trying to register non-static key.\n");
89568+ printk("lock:%pS key:%pS.\n", lock, lock->key);
89569 printk("the code is fine but needs lockdep annotation.\n");
89570 printk("turning off the locking correctness validator.\n");
89571 dump_stack();
89572@@ -3081,7 +3086,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
89573 if (!class)
89574 return 0;
89575 }
89576- atomic_inc((atomic_t *)&class->ops);
89577+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
89578 if (very_verbose(class)) {
89579 printk("\nacquire class [%p] %s", class->key, class->name);
89580 if (class->name_version > 1)
89581diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
89582index ef43ac4..2720dfa 100644
89583--- a/kernel/locking/lockdep_proc.c
89584+++ b/kernel/locking/lockdep_proc.c
89585@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
89586 return 0;
89587 }
89588
89589- seq_printf(m, "%p", class->key);
89590+ seq_printf(m, "%pK", class->key);
89591 #ifdef CONFIG_DEBUG_LOCKDEP
89592 seq_printf(m, " OPS:%8ld", class->ops);
89593 #endif
89594@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
89595
89596 list_for_each_entry(entry, &class->locks_after, entry) {
89597 if (entry->distance == 1) {
89598- seq_printf(m, " -> [%p] ", entry->class->key);
89599+ seq_printf(m, " -> [%pK] ", entry->class->key);
89600 print_name(m, entry->class);
89601 seq_puts(m, "\n");
89602 }
89603@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
89604 if (!class->key)
89605 continue;
89606
89607- seq_printf(m, "[%p] ", class->key);
89608+ seq_printf(m, "[%pK] ", class->key);
89609 print_name(m, class);
89610 seq_puts(m, "\n");
89611 }
89612@@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
89613 if (!i)
89614 seq_line(m, '-', 40-namelen, namelen);
89615
89616- snprintf(ip, sizeof(ip), "[<%p>]",
89617+ snprintf(ip, sizeof(ip), "[<%pK>]",
89618 (void *)class->contention_point[i]);
89619 seq_printf(m, "%40s %14lu %29s %pS\n",
89620 name, stats->contention_point[i],
89621@@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
89622 if (!i)
89623 seq_line(m, '-', 40-namelen, namelen);
89624
89625- snprintf(ip, sizeof(ip), "[<%p>]",
89626+ snprintf(ip, sizeof(ip), "[<%pK>]",
89627 (void *)class->contending_point[i]);
89628 seq_printf(m, "%40s %14lu %29s %pS\n",
89629 name, stats->contending_point[i],
89630diff --git a/kernel/locking/mcs_spinlock.c b/kernel/locking/mcs_spinlock.c
89631index 9887a90..0cd2b1d 100644
89632--- a/kernel/locking/mcs_spinlock.c
89633+++ b/kernel/locking/mcs_spinlock.c
89634@@ -100,7 +100,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
89635
89636 prev = decode_cpu(old);
89637 node->prev = prev;
89638- ACCESS_ONCE(prev->next) = node;
89639+ ACCESS_ONCE_RW(prev->next) = node;
89640
89641 /*
89642 * Normally @prev is untouchable after the above store; because at that
89643@@ -172,8 +172,8 @@ unqueue:
89644 * it will wait in Step-A.
89645 */
89646
89647- ACCESS_ONCE(next->prev) = prev;
89648- ACCESS_ONCE(prev->next) = next;
89649+ ACCESS_ONCE_RW(next->prev) = prev;
89650+ ACCESS_ONCE_RW(prev->next) = next;
89651
89652 return false;
89653 }
89654@@ -195,13 +195,13 @@ void osq_unlock(struct optimistic_spin_queue *lock)
89655 node = this_cpu_ptr(&osq_node);
89656 next = xchg(&node->next, NULL);
89657 if (next) {
89658- ACCESS_ONCE(next->locked) = 1;
89659+ ACCESS_ONCE_RW(next->locked) = 1;
89660 return;
89661 }
89662
89663 next = osq_wait_next(lock, node, NULL);
89664 if (next)
89665- ACCESS_ONCE(next->locked) = 1;
89666+ ACCESS_ONCE_RW(next->locked) = 1;
89667 }
89668
89669 #endif
89670diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
89671index 4d60986..5d351c1 100644
89672--- a/kernel/locking/mcs_spinlock.h
89673+++ b/kernel/locking/mcs_spinlock.h
89674@@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
89675 */
89676 return;
89677 }
89678- ACCESS_ONCE(prev->next) = node;
89679+ ACCESS_ONCE_RW(prev->next) = node;
89680
89681 /* Wait until the lock holder passes the lock down. */
89682 arch_mcs_spin_lock_contended(&node->locked);
89683diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
89684index 5cf6731..ce3bc5a 100644
89685--- a/kernel/locking/mutex-debug.c
89686+++ b/kernel/locking/mutex-debug.c
89687@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
89688 }
89689
89690 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89691- struct thread_info *ti)
89692+ struct task_struct *task)
89693 {
89694 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
89695
89696 /* Mark the current thread as blocked on the lock: */
89697- ti->task->blocked_on = waiter;
89698+ task->blocked_on = waiter;
89699 }
89700
89701 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89702- struct thread_info *ti)
89703+ struct task_struct *task)
89704 {
89705 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
89706- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
89707- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
89708- ti->task->blocked_on = NULL;
89709+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
89710+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
89711+ task->blocked_on = NULL;
89712
89713 list_del_init(&waiter->list);
89714 waiter->task = NULL;
89715diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
89716index 0799fd3..d06ae3b 100644
89717--- a/kernel/locking/mutex-debug.h
89718+++ b/kernel/locking/mutex-debug.h
89719@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
89720 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
89721 extern void debug_mutex_add_waiter(struct mutex *lock,
89722 struct mutex_waiter *waiter,
89723- struct thread_info *ti);
89724+ struct task_struct *task);
89725 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89726- struct thread_info *ti);
89727+ struct task_struct *task);
89728 extern void debug_mutex_unlock(struct mutex *lock);
89729 extern void debug_mutex_init(struct mutex *lock, const char *name,
89730 struct lock_class_key *key);
89731diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
89732index dadbf88..4500507 100644
89733--- a/kernel/locking/mutex.c
89734+++ b/kernel/locking/mutex.c
89735@@ -518,7 +518,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
89736 goto skip_wait;
89737
89738 debug_mutex_lock_common(lock, &waiter);
89739- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
89740+ debug_mutex_add_waiter(lock, &waiter, task);
89741
89742 /* add waiting tasks to the end of the waitqueue (FIFO): */
89743 list_add_tail(&waiter.list, &lock->wait_list);
89744@@ -563,7 +563,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
89745 schedule_preempt_disabled();
89746 spin_lock_mutex(&lock->wait_lock, flags);
89747 }
89748- mutex_remove_waiter(lock, &waiter, current_thread_info());
89749+ mutex_remove_waiter(lock, &waiter, task);
89750 /* set it to 0 if there are no waiters left: */
89751 if (likely(list_empty(&lock->wait_list)))
89752 atomic_set(&lock->count, 0);
89753@@ -600,7 +600,7 @@ skip_wait:
89754 return 0;
89755
89756 err:
89757- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
89758+ mutex_remove_waiter(lock, &waiter, task);
89759 spin_unlock_mutex(&lock->wait_lock, flags);
89760 debug_mutex_free_waiter(&waiter);
89761 mutex_release(&lock->dep_map, 1, ip);
89762diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
89763index 1d96dd0..994ff19 100644
89764--- a/kernel/locking/rtmutex-tester.c
89765+++ b/kernel/locking/rtmutex-tester.c
89766@@ -22,7 +22,7 @@
89767 #define MAX_RT_TEST_MUTEXES 8
89768
89769 static spinlock_t rttest_lock;
89770-static atomic_t rttest_event;
89771+static atomic_unchecked_t rttest_event;
89772
89773 struct test_thread_data {
89774 int opcode;
89775@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89776
89777 case RTTEST_LOCKCONT:
89778 td->mutexes[td->opdata] = 1;
89779- td->event = atomic_add_return(1, &rttest_event);
89780+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89781 return 0;
89782
89783 case RTTEST_RESET:
89784@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89785 return 0;
89786
89787 case RTTEST_RESETEVENT:
89788- atomic_set(&rttest_event, 0);
89789+ atomic_set_unchecked(&rttest_event, 0);
89790 return 0;
89791
89792 default:
89793@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89794 return ret;
89795
89796 td->mutexes[id] = 1;
89797- td->event = atomic_add_return(1, &rttest_event);
89798+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89799 rt_mutex_lock(&mutexes[id]);
89800- td->event = atomic_add_return(1, &rttest_event);
89801+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89802 td->mutexes[id] = 4;
89803 return 0;
89804
89805@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89806 return ret;
89807
89808 td->mutexes[id] = 1;
89809- td->event = atomic_add_return(1, &rttest_event);
89810+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89811 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
89812- td->event = atomic_add_return(1, &rttest_event);
89813+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89814 td->mutexes[id] = ret ? 0 : 4;
89815 return ret ? -EINTR : 0;
89816
89817@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89818 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
89819 return ret;
89820
89821- td->event = atomic_add_return(1, &rttest_event);
89822+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89823 rt_mutex_unlock(&mutexes[id]);
89824- td->event = atomic_add_return(1, &rttest_event);
89825+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89826 td->mutexes[id] = 0;
89827 return 0;
89828
89829@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89830 break;
89831
89832 td->mutexes[dat] = 2;
89833- td->event = atomic_add_return(1, &rttest_event);
89834+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89835 break;
89836
89837 default:
89838@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89839 return;
89840
89841 td->mutexes[dat] = 3;
89842- td->event = atomic_add_return(1, &rttest_event);
89843+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89844 break;
89845
89846 case RTTEST_LOCKNOWAIT:
89847@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89848 return;
89849
89850 td->mutexes[dat] = 1;
89851- td->event = atomic_add_return(1, &rttest_event);
89852+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89853 return;
89854
89855 default:
89856diff --git a/kernel/module.c b/kernel/module.c
89857index 88cec1d..d097c28 100644
89858--- a/kernel/module.c
89859+++ b/kernel/module.c
89860@@ -60,6 +60,7 @@
89861 #include <linux/jump_label.h>
89862 #include <linux/pfn.h>
89863 #include <linux/bsearch.h>
89864+#include <linux/grsecurity.h>
89865 #include <uapi/linux/module.h>
89866 #include "module-internal.h"
89867
89868@@ -156,7 +157,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
89869
89870 /* Bounds of module allocation, for speeding __module_address.
89871 * Protected by module_mutex. */
89872-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
89873+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
89874+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
89875
89876 int register_module_notifier(struct notifier_block * nb)
89877 {
89878@@ -323,7 +325,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
89879 return true;
89880
89881 list_for_each_entry_rcu(mod, &modules, list) {
89882- struct symsearch arr[] = {
89883+ struct symsearch modarr[] = {
89884 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
89885 NOT_GPL_ONLY, false },
89886 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
89887@@ -348,7 +350,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
89888 if (mod->state == MODULE_STATE_UNFORMED)
89889 continue;
89890
89891- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
89892+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
89893 return true;
89894 }
89895 return false;
89896@@ -488,7 +490,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
89897 if (!pcpusec->sh_size)
89898 return 0;
89899
89900- if (align > PAGE_SIZE) {
89901+ if (align-1 >= PAGE_SIZE) {
89902 pr_warn("%s: per-cpu alignment %li > %li\n",
89903 mod->name, align, PAGE_SIZE);
89904 align = PAGE_SIZE;
89905@@ -1060,7 +1062,7 @@ struct module_attribute module_uevent =
89906 static ssize_t show_coresize(struct module_attribute *mattr,
89907 struct module_kobject *mk, char *buffer)
89908 {
89909- return sprintf(buffer, "%u\n", mk->mod->core_size);
89910+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
89911 }
89912
89913 static struct module_attribute modinfo_coresize =
89914@@ -1069,7 +1071,7 @@ static struct module_attribute modinfo_coresize =
89915 static ssize_t show_initsize(struct module_attribute *mattr,
89916 struct module_kobject *mk, char *buffer)
89917 {
89918- return sprintf(buffer, "%u\n", mk->mod->init_size);
89919+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
89920 }
89921
89922 static struct module_attribute modinfo_initsize =
89923@@ -1161,12 +1163,29 @@ static int check_version(Elf_Shdr *sechdrs,
89924 goto bad_version;
89925 }
89926
89927+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
89928+ /*
89929+ * avoid potentially printing jibberish on attempted load
89930+ * of a module randomized with a different seed
89931+ */
89932+ pr_warn("no symbol version for %s\n", symname);
89933+#else
89934 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
89935+#endif
89936 return 0;
89937
89938 bad_version:
89939+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
89940+ /*
89941+ * avoid potentially printing jibberish on attempted load
89942+ * of a module randomized with a different seed
89943+ */
89944+ printk("attempted module disagrees about version of symbol %s\n",
89945+ symname);
89946+#else
89947 printk("%s: disagrees about version of symbol %s\n",
89948 mod->name, symname);
89949+#endif
89950 return 0;
89951 }
89952
89953@@ -1282,7 +1301,7 @@ resolve_symbol_wait(struct module *mod,
89954 */
89955 #ifdef CONFIG_SYSFS
89956
89957-#ifdef CONFIG_KALLSYMS
89958+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
89959 static inline bool sect_empty(const Elf_Shdr *sect)
89960 {
89961 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
89962@@ -1422,7 +1441,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
89963 {
89964 unsigned int notes, loaded, i;
89965 struct module_notes_attrs *notes_attrs;
89966- struct bin_attribute *nattr;
89967+ bin_attribute_no_const *nattr;
89968
89969 /* failed to create section attributes, so can't create notes */
89970 if (!mod->sect_attrs)
89971@@ -1534,7 +1553,7 @@ static void del_usage_links(struct module *mod)
89972 static int module_add_modinfo_attrs(struct module *mod)
89973 {
89974 struct module_attribute *attr;
89975- struct module_attribute *temp_attr;
89976+ module_attribute_no_const *temp_attr;
89977 int error = 0;
89978 int i;
89979
89980@@ -1755,21 +1774,21 @@ static void set_section_ro_nx(void *base,
89981
89982 static void unset_module_core_ro_nx(struct module *mod)
89983 {
89984- set_page_attributes(mod->module_core + mod->core_text_size,
89985- mod->module_core + mod->core_size,
89986+ set_page_attributes(mod->module_core_rw,
89987+ mod->module_core_rw + mod->core_size_rw,
89988 set_memory_x);
89989- set_page_attributes(mod->module_core,
89990- mod->module_core + mod->core_ro_size,
89991+ set_page_attributes(mod->module_core_rx,
89992+ mod->module_core_rx + mod->core_size_rx,
89993 set_memory_rw);
89994 }
89995
89996 static void unset_module_init_ro_nx(struct module *mod)
89997 {
89998- set_page_attributes(mod->module_init + mod->init_text_size,
89999- mod->module_init + mod->init_size,
90000+ set_page_attributes(mod->module_init_rw,
90001+ mod->module_init_rw + mod->init_size_rw,
90002 set_memory_x);
90003- set_page_attributes(mod->module_init,
90004- mod->module_init + mod->init_ro_size,
90005+ set_page_attributes(mod->module_init_rx,
90006+ mod->module_init_rx + mod->init_size_rx,
90007 set_memory_rw);
90008 }
90009
90010@@ -1782,14 +1801,14 @@ void set_all_modules_text_rw(void)
90011 list_for_each_entry_rcu(mod, &modules, list) {
90012 if (mod->state == MODULE_STATE_UNFORMED)
90013 continue;
90014- if ((mod->module_core) && (mod->core_text_size)) {
90015- set_page_attributes(mod->module_core,
90016- mod->module_core + mod->core_text_size,
90017+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
90018+ set_page_attributes(mod->module_core_rx,
90019+ mod->module_core_rx + mod->core_size_rx,
90020 set_memory_rw);
90021 }
90022- if ((mod->module_init) && (mod->init_text_size)) {
90023- set_page_attributes(mod->module_init,
90024- mod->module_init + mod->init_text_size,
90025+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
90026+ set_page_attributes(mod->module_init_rx,
90027+ mod->module_init_rx + mod->init_size_rx,
90028 set_memory_rw);
90029 }
90030 }
90031@@ -1805,14 +1824,14 @@ void set_all_modules_text_ro(void)
90032 list_for_each_entry_rcu(mod, &modules, list) {
90033 if (mod->state == MODULE_STATE_UNFORMED)
90034 continue;
90035- if ((mod->module_core) && (mod->core_text_size)) {
90036- set_page_attributes(mod->module_core,
90037- mod->module_core + mod->core_text_size,
90038+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
90039+ set_page_attributes(mod->module_core_rx,
90040+ mod->module_core_rx + mod->core_size_rx,
90041 set_memory_ro);
90042 }
90043- if ((mod->module_init) && (mod->init_text_size)) {
90044- set_page_attributes(mod->module_init,
90045- mod->module_init + mod->init_text_size,
90046+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
90047+ set_page_attributes(mod->module_init_rx,
90048+ mod->module_init_rx + mod->init_size_rx,
90049 set_memory_ro);
90050 }
90051 }
90052@@ -1865,16 +1884,19 @@ static void free_module(struct module *mod)
90053
90054 /* This may be NULL, but that's OK */
90055 unset_module_init_ro_nx(mod);
90056- module_free(mod, mod->module_init);
90057+ module_free(mod, mod->module_init_rw);
90058+ module_free_exec(mod, mod->module_init_rx);
90059 kfree(mod->args);
90060 percpu_modfree(mod);
90061
90062 /* Free lock-classes: */
90063- lockdep_free_key_range(mod->module_core, mod->core_size);
90064+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
90065+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
90066
90067 /* Finally, free the core (containing the module structure) */
90068 unset_module_core_ro_nx(mod);
90069- module_free(mod, mod->module_core);
90070+ module_free_exec(mod, mod->module_core_rx);
90071+ module_free(mod, mod->module_core_rw);
90072
90073 #ifdef CONFIG_MPU
90074 update_protections(current->mm);
90075@@ -1943,9 +1965,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90076 int ret = 0;
90077 const struct kernel_symbol *ksym;
90078
90079+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90080+ int is_fs_load = 0;
90081+ int register_filesystem_found = 0;
90082+ char *p;
90083+
90084+ p = strstr(mod->args, "grsec_modharden_fs");
90085+ if (p) {
90086+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
90087+ /* copy \0 as well */
90088+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
90089+ is_fs_load = 1;
90090+ }
90091+#endif
90092+
90093 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
90094 const char *name = info->strtab + sym[i].st_name;
90095
90096+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90097+ /* it's a real shame this will never get ripped and copied
90098+ upstream! ;(
90099+ */
90100+ if (is_fs_load && !strcmp(name, "register_filesystem"))
90101+ register_filesystem_found = 1;
90102+#endif
90103+
90104 switch (sym[i].st_shndx) {
90105 case SHN_COMMON:
90106 /* Ignore common symbols */
90107@@ -1970,7 +2014,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90108 ksym = resolve_symbol_wait(mod, info, name);
90109 /* Ok if resolved. */
90110 if (ksym && !IS_ERR(ksym)) {
90111+ pax_open_kernel();
90112 sym[i].st_value = ksym->value;
90113+ pax_close_kernel();
90114 break;
90115 }
90116
90117@@ -1989,11 +2035,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90118 secbase = (unsigned long)mod_percpu(mod);
90119 else
90120 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
90121+ pax_open_kernel();
90122 sym[i].st_value += secbase;
90123+ pax_close_kernel();
90124 break;
90125 }
90126 }
90127
90128+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90129+ if (is_fs_load && !register_filesystem_found) {
90130+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
90131+ ret = -EPERM;
90132+ }
90133+#endif
90134+
90135 return ret;
90136 }
90137
90138@@ -2077,22 +2132,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
90139 || s->sh_entsize != ~0UL
90140 || strstarts(sname, ".init"))
90141 continue;
90142- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
90143+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
90144+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
90145+ else
90146+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
90147 pr_debug("\t%s\n", sname);
90148 }
90149- switch (m) {
90150- case 0: /* executable */
90151- mod->core_size = debug_align(mod->core_size);
90152- mod->core_text_size = mod->core_size;
90153- break;
90154- case 1: /* RO: text and ro-data */
90155- mod->core_size = debug_align(mod->core_size);
90156- mod->core_ro_size = mod->core_size;
90157- break;
90158- case 3: /* whole core */
90159- mod->core_size = debug_align(mod->core_size);
90160- break;
90161- }
90162 }
90163
90164 pr_debug("Init section allocation order:\n");
90165@@ -2106,23 +2151,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
90166 || s->sh_entsize != ~0UL
90167 || !strstarts(sname, ".init"))
90168 continue;
90169- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
90170- | INIT_OFFSET_MASK);
90171+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
90172+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
90173+ else
90174+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
90175+ s->sh_entsize |= INIT_OFFSET_MASK;
90176 pr_debug("\t%s\n", sname);
90177 }
90178- switch (m) {
90179- case 0: /* executable */
90180- mod->init_size = debug_align(mod->init_size);
90181- mod->init_text_size = mod->init_size;
90182- break;
90183- case 1: /* RO: text and ro-data */
90184- mod->init_size = debug_align(mod->init_size);
90185- mod->init_ro_size = mod->init_size;
90186- break;
90187- case 3: /* whole init */
90188- mod->init_size = debug_align(mod->init_size);
90189- break;
90190- }
90191 }
90192 }
90193
90194@@ -2295,7 +2330,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
90195
90196 /* Put symbol section at end of init part of module. */
90197 symsect->sh_flags |= SHF_ALLOC;
90198- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
90199+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
90200 info->index.sym) | INIT_OFFSET_MASK;
90201 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
90202
90203@@ -2312,13 +2347,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
90204 }
90205
90206 /* Append room for core symbols at end of core part. */
90207- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
90208- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
90209- mod->core_size += strtab_size;
90210+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
90211+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
90212+ mod->core_size_rx += strtab_size;
90213
90214 /* Put string table section at end of init part of module. */
90215 strsect->sh_flags |= SHF_ALLOC;
90216- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
90217+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
90218 info->index.str) | INIT_OFFSET_MASK;
90219 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
90220 }
90221@@ -2336,12 +2371,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
90222 /* Make sure we get permanent strtab: don't use info->strtab. */
90223 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
90224
90225+ pax_open_kernel();
90226+
90227 /* Set types up while we still have access to sections. */
90228 for (i = 0; i < mod->num_symtab; i++)
90229 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
90230
90231- mod->core_symtab = dst = mod->module_core + info->symoffs;
90232- mod->core_strtab = s = mod->module_core + info->stroffs;
90233+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
90234+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
90235 src = mod->symtab;
90236 for (ndst = i = 0; i < mod->num_symtab; i++) {
90237 if (i == 0 ||
90238@@ -2353,6 +2390,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
90239 }
90240 }
90241 mod->core_num_syms = ndst;
90242+
90243+ pax_close_kernel();
90244 }
90245 #else
90246 static inline void layout_symtab(struct module *mod, struct load_info *info)
90247@@ -2386,17 +2425,33 @@ void * __weak module_alloc(unsigned long size)
90248 return vmalloc_exec(size);
90249 }
90250
90251-static void *module_alloc_update_bounds(unsigned long size)
90252+static void *module_alloc_update_bounds_rw(unsigned long size)
90253 {
90254 void *ret = module_alloc(size);
90255
90256 if (ret) {
90257 mutex_lock(&module_mutex);
90258 /* Update module bounds. */
90259- if ((unsigned long)ret < module_addr_min)
90260- module_addr_min = (unsigned long)ret;
90261- if ((unsigned long)ret + size > module_addr_max)
90262- module_addr_max = (unsigned long)ret + size;
90263+ if ((unsigned long)ret < module_addr_min_rw)
90264+ module_addr_min_rw = (unsigned long)ret;
90265+ if ((unsigned long)ret + size > module_addr_max_rw)
90266+ module_addr_max_rw = (unsigned long)ret + size;
90267+ mutex_unlock(&module_mutex);
90268+ }
90269+ return ret;
90270+}
90271+
90272+static void *module_alloc_update_bounds_rx(unsigned long size)
90273+{
90274+ void *ret = module_alloc_exec(size);
90275+
90276+ if (ret) {
90277+ mutex_lock(&module_mutex);
90278+ /* Update module bounds. */
90279+ if ((unsigned long)ret < module_addr_min_rx)
90280+ module_addr_min_rx = (unsigned long)ret;
90281+ if ((unsigned long)ret + size > module_addr_max_rx)
90282+ module_addr_max_rx = (unsigned long)ret + size;
90283 mutex_unlock(&module_mutex);
90284 }
90285 return ret;
90286@@ -2650,7 +2705,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
90287 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
90288
90289 if (info->index.sym == 0) {
90290+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90291+ /*
90292+ * avoid potentially printing jibberish on attempted load
90293+ * of a module randomized with a different seed
90294+ */
90295+ pr_warn("module has no symbols (stripped?)\n");
90296+#else
90297 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
90298+#endif
90299 return ERR_PTR(-ENOEXEC);
90300 }
90301
90302@@ -2666,8 +2729,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
90303 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
90304 {
90305 const char *modmagic = get_modinfo(info, "vermagic");
90306+ const char *license = get_modinfo(info, "license");
90307 int err;
90308
90309+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
90310+ if (!license || !license_is_gpl_compatible(license))
90311+ return -ENOEXEC;
90312+#endif
90313+
90314 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
90315 modmagic = NULL;
90316
90317@@ -2692,7 +2761,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
90318 }
90319
90320 /* Set up license info based on the info section */
90321- set_license(mod, get_modinfo(info, "license"));
90322+ set_license(mod, license);
90323
90324 return 0;
90325 }
90326@@ -2786,7 +2855,7 @@ static int move_module(struct module *mod, struct load_info *info)
90327 void *ptr;
90328
90329 /* Do the allocs. */
90330- ptr = module_alloc_update_bounds(mod->core_size);
90331+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
90332 /*
90333 * The pointer to this block is stored in the module structure
90334 * which is inside the block. Just mark it as not being a
90335@@ -2796,11 +2865,11 @@ static int move_module(struct module *mod, struct load_info *info)
90336 if (!ptr)
90337 return -ENOMEM;
90338
90339- memset(ptr, 0, mod->core_size);
90340- mod->module_core = ptr;
90341+ memset(ptr, 0, mod->core_size_rw);
90342+ mod->module_core_rw = ptr;
90343
90344- if (mod->init_size) {
90345- ptr = module_alloc_update_bounds(mod->init_size);
90346+ if (mod->init_size_rw) {
90347+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
90348 /*
90349 * The pointer to this block is stored in the module structure
90350 * which is inside the block. This block doesn't need to be
90351@@ -2809,13 +2878,45 @@ static int move_module(struct module *mod, struct load_info *info)
90352 */
90353 kmemleak_ignore(ptr);
90354 if (!ptr) {
90355- module_free(mod, mod->module_core);
90356+ module_free(mod, mod->module_core_rw);
90357 return -ENOMEM;
90358 }
90359- memset(ptr, 0, mod->init_size);
90360- mod->module_init = ptr;
90361+ memset(ptr, 0, mod->init_size_rw);
90362+ mod->module_init_rw = ptr;
90363 } else
90364- mod->module_init = NULL;
90365+ mod->module_init_rw = NULL;
90366+
90367+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
90368+ kmemleak_not_leak(ptr);
90369+ if (!ptr) {
90370+ if (mod->module_init_rw)
90371+ module_free(mod, mod->module_init_rw);
90372+ module_free(mod, mod->module_core_rw);
90373+ return -ENOMEM;
90374+ }
90375+
90376+ pax_open_kernel();
90377+ memset(ptr, 0, mod->core_size_rx);
90378+ pax_close_kernel();
90379+ mod->module_core_rx = ptr;
90380+
90381+ if (mod->init_size_rx) {
90382+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
90383+ kmemleak_ignore(ptr);
90384+ if (!ptr && mod->init_size_rx) {
90385+ module_free_exec(mod, mod->module_core_rx);
90386+ if (mod->module_init_rw)
90387+ module_free(mod, mod->module_init_rw);
90388+ module_free(mod, mod->module_core_rw);
90389+ return -ENOMEM;
90390+ }
90391+
90392+ pax_open_kernel();
90393+ memset(ptr, 0, mod->init_size_rx);
90394+ pax_close_kernel();
90395+ mod->module_init_rx = ptr;
90396+ } else
90397+ mod->module_init_rx = NULL;
90398
90399 /* Transfer each section which specifies SHF_ALLOC */
90400 pr_debug("final section addresses:\n");
90401@@ -2826,16 +2927,45 @@ static int move_module(struct module *mod, struct load_info *info)
90402 if (!(shdr->sh_flags & SHF_ALLOC))
90403 continue;
90404
90405- if (shdr->sh_entsize & INIT_OFFSET_MASK)
90406- dest = mod->module_init
90407- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90408- else
90409- dest = mod->module_core + shdr->sh_entsize;
90410+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
90411+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
90412+ dest = mod->module_init_rw
90413+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90414+ else
90415+ dest = mod->module_init_rx
90416+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90417+ } else {
90418+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
90419+ dest = mod->module_core_rw + shdr->sh_entsize;
90420+ else
90421+ dest = mod->module_core_rx + shdr->sh_entsize;
90422+ }
90423+
90424+ if (shdr->sh_type != SHT_NOBITS) {
90425+
90426+#ifdef CONFIG_PAX_KERNEXEC
90427+#ifdef CONFIG_X86_64
90428+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
90429+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
90430+#endif
90431+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
90432+ pax_open_kernel();
90433+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
90434+ pax_close_kernel();
90435+ } else
90436+#endif
90437
90438- if (shdr->sh_type != SHT_NOBITS)
90439 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
90440+ }
90441 /* Update sh_addr to point to copy in image. */
90442- shdr->sh_addr = (unsigned long)dest;
90443+
90444+#ifdef CONFIG_PAX_KERNEXEC
90445+ if (shdr->sh_flags & SHF_EXECINSTR)
90446+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
90447+ else
90448+#endif
90449+
90450+ shdr->sh_addr = (unsigned long)dest;
90451 pr_debug("\t0x%lx %s\n",
90452 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
90453 }
90454@@ -2892,12 +3022,12 @@ static void flush_module_icache(const struct module *mod)
90455 * Do it before processing of module parameters, so the module
90456 * can provide parameter accessor functions of its own.
90457 */
90458- if (mod->module_init)
90459- flush_icache_range((unsigned long)mod->module_init,
90460- (unsigned long)mod->module_init
90461- + mod->init_size);
90462- flush_icache_range((unsigned long)mod->module_core,
90463- (unsigned long)mod->module_core + mod->core_size);
90464+ if (mod->module_init_rx)
90465+ flush_icache_range((unsigned long)mod->module_init_rx,
90466+ (unsigned long)mod->module_init_rx
90467+ + mod->init_size_rx);
90468+ flush_icache_range((unsigned long)mod->module_core_rx,
90469+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
90470
90471 set_fs(old_fs);
90472 }
90473@@ -2954,8 +3084,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
90474 static void module_deallocate(struct module *mod, struct load_info *info)
90475 {
90476 percpu_modfree(mod);
90477- module_free(mod, mod->module_init);
90478- module_free(mod, mod->module_core);
90479+ module_free_exec(mod, mod->module_init_rx);
90480+ module_free_exec(mod, mod->module_core_rx);
90481+ module_free(mod, mod->module_init_rw);
90482+ module_free(mod, mod->module_core_rw);
90483 }
90484
90485 int __weak module_finalize(const Elf_Ehdr *hdr,
90486@@ -2968,7 +3100,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
90487 static int post_relocation(struct module *mod, const struct load_info *info)
90488 {
90489 /* Sort exception table now relocations are done. */
90490+ pax_open_kernel();
90491 sort_extable(mod->extable, mod->extable + mod->num_exentries);
90492+ pax_close_kernel();
90493
90494 /* Copy relocated percpu area over. */
90495 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
90496@@ -3077,11 +3211,12 @@ static int do_init_module(struct module *mod)
90497 mod->strtab = mod->core_strtab;
90498 #endif
90499 unset_module_init_ro_nx(mod);
90500- module_free(mod, mod->module_init);
90501- mod->module_init = NULL;
90502- mod->init_size = 0;
90503- mod->init_ro_size = 0;
90504- mod->init_text_size = 0;
90505+ module_free(mod, mod->module_init_rw);
90506+ module_free_exec(mod, mod->module_init_rx);
90507+ mod->module_init_rw = NULL;
90508+ mod->module_init_rx = NULL;
90509+ mod->init_size_rw = 0;
90510+ mod->init_size_rx = 0;
90511 mutex_unlock(&module_mutex);
90512 wake_up_all(&module_wq);
90513
90514@@ -3149,16 +3284,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
90515 module_bug_finalize(info->hdr, info->sechdrs, mod);
90516
90517 /* Set RO and NX regions for core */
90518- set_section_ro_nx(mod->module_core,
90519- mod->core_text_size,
90520- mod->core_ro_size,
90521- mod->core_size);
90522+ set_section_ro_nx(mod->module_core_rx,
90523+ mod->core_size_rx,
90524+ mod->core_size_rx,
90525+ mod->core_size_rx);
90526
90527 /* Set RO and NX regions for init */
90528- set_section_ro_nx(mod->module_init,
90529- mod->init_text_size,
90530- mod->init_ro_size,
90531- mod->init_size);
90532+ set_section_ro_nx(mod->module_init_rx,
90533+ mod->init_size_rx,
90534+ mod->init_size_rx,
90535+ mod->init_size_rx);
90536
90537 /* Mark state as coming so strong_try_module_get() ignores us,
90538 * but kallsyms etc. can see us. */
90539@@ -3242,9 +3377,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
90540 if (err)
90541 goto free_unload;
90542
90543+ /* Now copy in args */
90544+ mod->args = strndup_user(uargs, ~0UL >> 1);
90545+ if (IS_ERR(mod->args)) {
90546+ err = PTR_ERR(mod->args);
90547+ goto free_unload;
90548+ }
90549+
90550 /* Set up MODINFO_ATTR fields */
90551 setup_modinfo(mod, info);
90552
90553+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90554+ {
90555+ char *p, *p2;
90556+
90557+ if (strstr(mod->args, "grsec_modharden_netdev")) {
90558+ 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);
90559+ err = -EPERM;
90560+ goto free_modinfo;
90561+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
90562+ p += sizeof("grsec_modharden_normal") - 1;
90563+ p2 = strstr(p, "_");
90564+ if (p2) {
90565+ *p2 = '\0';
90566+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
90567+ *p2 = '_';
90568+ }
90569+ err = -EPERM;
90570+ goto free_modinfo;
90571+ }
90572+ }
90573+#endif
90574+
90575 /* Fix up syms, so that st_value is a pointer to location. */
90576 err = simplify_symbols(mod, info);
90577 if (err < 0)
90578@@ -3260,13 +3424,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
90579
90580 flush_module_icache(mod);
90581
90582- /* Now copy in args */
90583- mod->args = strndup_user(uargs, ~0UL >> 1);
90584- if (IS_ERR(mod->args)) {
90585- err = PTR_ERR(mod->args);
90586- goto free_arch_cleanup;
90587- }
90588-
90589 dynamic_debug_setup(info->debug, info->num_debug);
90590
90591 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
90592@@ -3314,11 +3471,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
90593 ddebug_cleanup:
90594 dynamic_debug_remove(info->debug);
90595 synchronize_sched();
90596- kfree(mod->args);
90597- free_arch_cleanup:
90598 module_arch_cleanup(mod);
90599 free_modinfo:
90600 free_modinfo(mod);
90601+ kfree(mod->args);
90602 free_unload:
90603 module_unload_free(mod);
90604 unlink_mod:
90605@@ -3403,10 +3559,16 @@ static const char *get_ksymbol(struct module *mod,
90606 unsigned long nextval;
90607
90608 /* At worse, next value is at end of module */
90609- if (within_module_init(addr, mod))
90610- nextval = (unsigned long)mod->module_init+mod->init_text_size;
90611+ if (within_module_init_rx(addr, mod))
90612+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
90613+ else if (within_module_init_rw(addr, mod))
90614+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
90615+ else if (within_module_core_rx(addr, mod))
90616+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
90617+ else if (within_module_core_rw(addr, mod))
90618+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
90619 else
90620- nextval = (unsigned long)mod->module_core+mod->core_text_size;
90621+ return NULL;
90622
90623 /* Scan for closest preceding symbol, and next symbol. (ELF
90624 starts real symbols at 1). */
90625@@ -3654,7 +3816,7 @@ static int m_show(struct seq_file *m, void *p)
90626 return 0;
90627
90628 seq_printf(m, "%s %u",
90629- mod->name, mod->init_size + mod->core_size);
90630+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
90631 print_unload_info(m, mod);
90632
90633 /* Informative for users. */
90634@@ -3663,7 +3825,7 @@ static int m_show(struct seq_file *m, void *p)
90635 mod->state == MODULE_STATE_COMING ? "Loading":
90636 "Live");
90637 /* Used by oprofile and other similar tools. */
90638- seq_printf(m, " 0x%pK", mod->module_core);
90639+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
90640
90641 /* Taints info */
90642 if (mod->taints)
90643@@ -3699,7 +3861,17 @@ static const struct file_operations proc_modules_operations = {
90644
90645 static int __init proc_modules_init(void)
90646 {
90647+#ifndef CONFIG_GRKERNSEC_HIDESYM
90648+#ifdef CONFIG_GRKERNSEC_PROC_USER
90649+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
90650+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90651+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
90652+#else
90653 proc_create("modules", 0, NULL, &proc_modules_operations);
90654+#endif
90655+#else
90656+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
90657+#endif
90658 return 0;
90659 }
90660 module_init(proc_modules_init);
90661@@ -3760,7 +3932,8 @@ struct module *__module_address(unsigned long addr)
90662 {
90663 struct module *mod;
90664
90665- if (addr < module_addr_min || addr > module_addr_max)
90666+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
90667+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
90668 return NULL;
90669
90670 list_for_each_entry_rcu(mod, &modules, list) {
90671@@ -3801,11 +3974,20 @@ bool is_module_text_address(unsigned long addr)
90672 */
90673 struct module *__module_text_address(unsigned long addr)
90674 {
90675- struct module *mod = __module_address(addr);
90676+ struct module *mod;
90677+
90678+#ifdef CONFIG_X86_32
90679+ addr = ktla_ktva(addr);
90680+#endif
90681+
90682+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
90683+ return NULL;
90684+
90685+ mod = __module_address(addr);
90686+
90687 if (mod) {
90688 /* Make sure it's within the text section. */
90689- if (!within(addr, mod->module_init, mod->init_text_size)
90690- && !within(addr, mod->module_core, mod->core_text_size))
90691+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
90692 mod = NULL;
90693 }
90694 return mod;
90695diff --git a/kernel/notifier.c b/kernel/notifier.c
90696index 4803da6..1c5eea6 100644
90697--- a/kernel/notifier.c
90698+++ b/kernel/notifier.c
90699@@ -5,6 +5,7 @@
90700 #include <linux/rcupdate.h>
90701 #include <linux/vmalloc.h>
90702 #include <linux/reboot.h>
90703+#include <linux/mm.h>
90704
90705 /*
90706 * Notifier list for kernel code which wants to be called
90707@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
90708 while ((*nl) != NULL) {
90709 if (n->priority > (*nl)->priority)
90710 break;
90711- nl = &((*nl)->next);
90712+ nl = (struct notifier_block **)&((*nl)->next);
90713 }
90714- n->next = *nl;
90715+ pax_open_kernel();
90716+ *(const void **)&n->next = *nl;
90717 rcu_assign_pointer(*nl, n);
90718+ pax_close_kernel();
90719 return 0;
90720 }
90721
90722@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
90723 return 0;
90724 if (n->priority > (*nl)->priority)
90725 break;
90726- nl = &((*nl)->next);
90727+ nl = (struct notifier_block **)&((*nl)->next);
90728 }
90729- n->next = *nl;
90730+ pax_open_kernel();
90731+ *(const void **)&n->next = *nl;
90732 rcu_assign_pointer(*nl, n);
90733+ pax_close_kernel();
90734 return 0;
90735 }
90736
90737@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
90738 {
90739 while ((*nl) != NULL) {
90740 if ((*nl) == n) {
90741+ pax_open_kernel();
90742 rcu_assign_pointer(*nl, n->next);
90743+ pax_close_kernel();
90744 return 0;
90745 }
90746- nl = &((*nl)->next);
90747+ nl = (struct notifier_block **)&((*nl)->next);
90748 }
90749 return -ENOENT;
90750 }
90751diff --git a/kernel/padata.c b/kernel/padata.c
90752index 161402f..598814c 100644
90753--- a/kernel/padata.c
90754+++ b/kernel/padata.c
90755@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
90756 * seq_nr mod. number of cpus in use.
90757 */
90758
90759- seq_nr = atomic_inc_return(&pd->seq_nr);
90760+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
90761 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
90762
90763 return padata_index_to_cpu(pd, cpu_index);
90764@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
90765 padata_init_pqueues(pd);
90766 padata_init_squeues(pd);
90767 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
90768- atomic_set(&pd->seq_nr, -1);
90769+ atomic_set_unchecked(&pd->seq_nr, -1);
90770 atomic_set(&pd->reorder_objects, 0);
90771 atomic_set(&pd->refcnt, 0);
90772 pd->pinst = pinst;
90773diff --git a/kernel/panic.c b/kernel/panic.c
90774index cf80672..f6771b2 100644
90775--- a/kernel/panic.c
90776+++ b/kernel/panic.c
90777@@ -53,7 +53,7 @@ EXPORT_SYMBOL(panic_blink);
90778 /*
90779 * Stop ourself in panic -- architecture code may override this
90780 */
90781-void __weak panic_smp_self_stop(void)
90782+void __weak __noreturn panic_smp_self_stop(void)
90783 {
90784 while (1)
90785 cpu_relax();
90786@@ -422,7 +422,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
90787 disable_trace_on_warning();
90788
90789 pr_warn("------------[ cut here ]------------\n");
90790- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
90791+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
90792 raw_smp_processor_id(), current->pid, file, line, caller);
90793
90794 if (args)
90795@@ -476,7 +476,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
90796 */
90797 __visible void __stack_chk_fail(void)
90798 {
90799- panic("stack-protector: Kernel stack is corrupted in: %p\n",
90800+ dump_stack();
90801+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
90802 __builtin_return_address(0));
90803 }
90804 EXPORT_SYMBOL(__stack_chk_fail);
90805diff --git a/kernel/pid.c b/kernel/pid.c
90806index 82430c8..53d7793 100644
90807--- a/kernel/pid.c
90808+++ b/kernel/pid.c
90809@@ -33,6 +33,7 @@
90810 #include <linux/rculist.h>
90811 #include <linux/bootmem.h>
90812 #include <linux/hash.h>
90813+#include <linux/security.h>
90814 #include <linux/pid_namespace.h>
90815 #include <linux/init_task.h>
90816 #include <linux/syscalls.h>
90817@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
90818
90819 int pid_max = PID_MAX_DEFAULT;
90820
90821-#define RESERVED_PIDS 300
90822+#define RESERVED_PIDS 500
90823
90824 int pid_max_min = RESERVED_PIDS + 1;
90825 int pid_max_max = PID_MAX_LIMIT;
90826@@ -447,10 +448,18 @@ EXPORT_SYMBOL(pid_task);
90827 */
90828 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
90829 {
90830+ struct task_struct *task;
90831+
90832 rcu_lockdep_assert(rcu_read_lock_held(),
90833 "find_task_by_pid_ns() needs rcu_read_lock()"
90834 " protection");
90835- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
90836+
90837+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
90838+
90839+ if (gr_pid_is_chrooted(task))
90840+ return NULL;
90841+
90842+ return task;
90843 }
90844
90845 struct task_struct *find_task_by_vpid(pid_t vnr)
90846@@ -458,6 +467,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
90847 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
90848 }
90849
90850+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
90851+{
90852+ rcu_lockdep_assert(rcu_read_lock_held(),
90853+ "find_task_by_pid_ns() needs rcu_read_lock()"
90854+ " protection");
90855+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
90856+}
90857+
90858 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
90859 {
90860 struct pid *pid;
90861diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
90862index db95d8e..a0ca23f 100644
90863--- a/kernel/pid_namespace.c
90864+++ b/kernel/pid_namespace.c
90865@@ -253,7 +253,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
90866 void __user *buffer, size_t *lenp, loff_t *ppos)
90867 {
90868 struct pid_namespace *pid_ns = task_active_pid_ns(current);
90869- struct ctl_table tmp = *table;
90870+ ctl_table_no_const tmp = *table;
90871
90872 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
90873 return -EPERM;
90874diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
90875index bbef57f..5f94462 100644
90876--- a/kernel/power/Kconfig
90877+++ b/kernel/power/Kconfig
90878@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
90879 config HIBERNATION
90880 bool "Hibernation (aka 'suspend to disk')"
90881 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
90882+ depends on !GRKERNSEC_KMEM
90883+ depends on !PAX_MEMORY_SANITIZE
90884 select HIBERNATE_CALLBACKS
90885 select LZO_COMPRESS
90886 select LZO_DECOMPRESS
90887diff --git a/kernel/power/process.c b/kernel/power/process.c
90888index 5a6ec86..3a8c884 100644
90889--- a/kernel/power/process.c
90890+++ b/kernel/power/process.c
90891@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
90892 unsigned int elapsed_msecs;
90893 bool wakeup = false;
90894 int sleep_usecs = USEC_PER_MSEC;
90895+ bool timedout = false;
90896
90897 do_gettimeofday(&start);
90898
90899@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
90900
90901 while (true) {
90902 todo = 0;
90903+ if (time_after(jiffies, end_time))
90904+ timedout = true;
90905 read_lock(&tasklist_lock);
90906 for_each_process_thread(g, p) {
90907 if (p == current || !freeze_task(p))
90908 continue;
90909
90910- if (!freezer_should_skip(p))
90911+ if (!freezer_should_skip(p)) {
90912 todo++;
90913+ if (timedout) {
90914+ printk(KERN_ERR "Task refusing to freeze:\n");
90915+ sched_show_task(p);
90916+ }
90917+ }
90918 }
90919 read_unlock(&tasklist_lock);
90920
90921@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
90922 todo += wq_busy;
90923 }
90924
90925- if (!todo || time_after(jiffies, end_time))
90926+ if (!todo || timedout)
90927 break;
90928
90929 if (pm_wakeup_pending()) {
90930diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
90931index ced2b84..ffc4791 100644
90932--- a/kernel/printk/printk.c
90933+++ b/kernel/printk/printk.c
90934@@ -489,6 +489,11 @@ static int check_syslog_permissions(int type, bool from_file)
90935 if (from_file && type != SYSLOG_ACTION_OPEN)
90936 return 0;
90937
90938+#ifdef CONFIG_GRKERNSEC_DMESG
90939+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
90940+ return -EPERM;
90941+#endif
90942+
90943 if (syslog_action_restricted(type)) {
90944 if (capable(CAP_SYSLOG))
90945 return 0;
90946diff --git a/kernel/profile.c b/kernel/profile.c
90947index 54bf5ba..df6e0a2 100644
90948--- a/kernel/profile.c
90949+++ b/kernel/profile.c
90950@@ -37,7 +37,7 @@ struct profile_hit {
90951 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
90952 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
90953
90954-static atomic_t *prof_buffer;
90955+static atomic_unchecked_t *prof_buffer;
90956 static unsigned long prof_len, prof_shift;
90957
90958 int prof_on __read_mostly;
90959@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
90960 hits[i].pc = 0;
90961 continue;
90962 }
90963- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
90964+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
90965 hits[i].hits = hits[i].pc = 0;
90966 }
90967 }
90968@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
90969 * Add the current hit(s) and flush the write-queue out
90970 * to the global buffer:
90971 */
90972- atomic_add(nr_hits, &prof_buffer[pc]);
90973+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
90974 for (i = 0; i < NR_PROFILE_HIT; ++i) {
90975- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
90976+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
90977 hits[i].pc = hits[i].hits = 0;
90978 }
90979 out:
90980@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
90981 {
90982 unsigned long pc;
90983 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
90984- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
90985+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
90986 }
90987 #endif /* !CONFIG_SMP */
90988
90989@@ -490,7 +490,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
90990 return -EFAULT;
90991 buf++; p++; count--; read++;
90992 }
90993- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
90994+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
90995 if (copy_to_user(buf, (void *)pnt, count))
90996 return -EFAULT;
90997 read += count;
90998@@ -521,7 +521,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
90999 }
91000 #endif
91001 profile_discard_flip_buffers();
91002- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
91003+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
91004 return count;
91005 }
91006
91007diff --git a/kernel/ptrace.c b/kernel/ptrace.c
91008index 54e7522..5b82dd6 100644
91009--- a/kernel/ptrace.c
91010+++ b/kernel/ptrace.c
91011@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
91012 if (seize)
91013 flags |= PT_SEIZED;
91014 rcu_read_lock();
91015- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
91016+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
91017 flags |= PT_PTRACE_CAP;
91018 rcu_read_unlock();
91019 task->ptrace = flags;
91020@@ -532,7 +532,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
91021 break;
91022 return -EIO;
91023 }
91024- if (copy_to_user(dst, buf, retval))
91025+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
91026 return -EFAULT;
91027 copied += retval;
91028 src += retval;
91029@@ -800,7 +800,7 @@ int ptrace_request(struct task_struct *child, long request,
91030 bool seized = child->ptrace & PT_SEIZED;
91031 int ret = -EIO;
91032 siginfo_t siginfo, *si;
91033- void __user *datavp = (void __user *) data;
91034+ void __user *datavp = (__force void __user *) data;
91035 unsigned long __user *datalp = datavp;
91036 unsigned long flags;
91037
91038@@ -1046,14 +1046,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
91039 goto out;
91040 }
91041
91042+ if (gr_handle_ptrace(child, request)) {
91043+ ret = -EPERM;
91044+ goto out_put_task_struct;
91045+ }
91046+
91047 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
91048 ret = ptrace_attach(child, request, addr, data);
91049 /*
91050 * Some architectures need to do book-keeping after
91051 * a ptrace attach.
91052 */
91053- if (!ret)
91054+ if (!ret) {
91055 arch_ptrace_attach(child);
91056+ gr_audit_ptrace(child);
91057+ }
91058 goto out_put_task_struct;
91059 }
91060
91061@@ -1081,7 +1088,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
91062 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
91063 if (copied != sizeof(tmp))
91064 return -EIO;
91065- return put_user(tmp, (unsigned long __user *)data);
91066+ return put_user(tmp, (__force unsigned long __user *)data);
91067 }
91068
91069 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
91070@@ -1175,7 +1182,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
91071 }
91072
91073 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
91074- compat_long_t, addr, compat_long_t, data)
91075+ compat_ulong_t, addr, compat_ulong_t, data)
91076 {
91077 struct task_struct *child;
91078 long ret;
91079@@ -1191,14 +1198,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
91080 goto out;
91081 }
91082
91083+ if (gr_handle_ptrace(child, request)) {
91084+ ret = -EPERM;
91085+ goto out_put_task_struct;
91086+ }
91087+
91088 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
91089 ret = ptrace_attach(child, request, addr, data);
91090 /*
91091 * Some architectures need to do book-keeping after
91092 * a ptrace attach.
91093 */
91094- if (!ret)
91095+ if (!ret) {
91096 arch_ptrace_attach(child);
91097+ gr_audit_ptrace(child);
91098+ }
91099 goto out_put_task_struct;
91100 }
91101
91102diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
91103index 240fa90..5fa56bd 100644
91104--- a/kernel/rcu/rcutorture.c
91105+++ b/kernel/rcu/rcutorture.c
91106@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
91107 rcu_torture_count) = { 0 };
91108 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
91109 rcu_torture_batch) = { 0 };
91110-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
91111-static atomic_t n_rcu_torture_alloc;
91112-static atomic_t n_rcu_torture_alloc_fail;
91113-static atomic_t n_rcu_torture_free;
91114-static atomic_t n_rcu_torture_mberror;
91115-static atomic_t n_rcu_torture_error;
91116+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
91117+static atomic_unchecked_t n_rcu_torture_alloc;
91118+static atomic_unchecked_t n_rcu_torture_alloc_fail;
91119+static atomic_unchecked_t n_rcu_torture_free;
91120+static atomic_unchecked_t n_rcu_torture_mberror;
91121+static atomic_unchecked_t n_rcu_torture_error;
91122 static long n_rcu_torture_barrier_error;
91123 static long n_rcu_torture_boost_ktrerror;
91124 static long n_rcu_torture_boost_rterror;
91125@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
91126 static long n_rcu_torture_timers;
91127 static long n_barrier_attempts;
91128 static long n_barrier_successes;
91129-static atomic_long_t n_cbfloods;
91130+static atomic_long_unchecked_t n_cbfloods;
91131 static struct list_head rcu_torture_removed;
91132
91133 static int rcu_torture_writer_state;
91134@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
91135
91136 spin_lock_bh(&rcu_torture_lock);
91137 if (list_empty(&rcu_torture_freelist)) {
91138- atomic_inc(&n_rcu_torture_alloc_fail);
91139+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
91140 spin_unlock_bh(&rcu_torture_lock);
91141 return NULL;
91142 }
91143- atomic_inc(&n_rcu_torture_alloc);
91144+ atomic_inc_unchecked(&n_rcu_torture_alloc);
91145 p = rcu_torture_freelist.next;
91146 list_del_init(p);
91147 spin_unlock_bh(&rcu_torture_lock);
91148@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
91149 static void
91150 rcu_torture_free(struct rcu_torture *p)
91151 {
91152- atomic_inc(&n_rcu_torture_free);
91153+ atomic_inc_unchecked(&n_rcu_torture_free);
91154 spin_lock_bh(&rcu_torture_lock);
91155 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
91156 spin_unlock_bh(&rcu_torture_lock);
91157@@ -312,7 +312,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
91158 i = rp->rtort_pipe_count;
91159 if (i > RCU_TORTURE_PIPE_LEN)
91160 i = RCU_TORTURE_PIPE_LEN;
91161- atomic_inc(&rcu_torture_wcount[i]);
91162+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
91163 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
91164 rp->rtort_mbtest = 0;
91165 return true;
91166@@ -799,7 +799,7 @@ rcu_torture_cbflood(void *arg)
91167 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
91168 do {
91169 schedule_timeout_interruptible(cbflood_inter_holdoff);
91170- atomic_long_inc(&n_cbfloods);
91171+ atomic_long_inc_unchecked(&n_cbfloods);
91172 WARN_ON(signal_pending(current));
91173 for (i = 0; i < cbflood_n_burst; i++) {
91174 for (j = 0; j < cbflood_n_per_burst; j++) {
91175@@ -917,7 +917,7 @@ rcu_torture_writer(void *arg)
91176 i = old_rp->rtort_pipe_count;
91177 if (i > RCU_TORTURE_PIPE_LEN)
91178 i = RCU_TORTURE_PIPE_LEN;
91179- atomic_inc(&rcu_torture_wcount[i]);
91180+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
91181 old_rp->rtort_pipe_count++;
91182 switch (synctype[torture_random(&rand) % nsynctypes]) {
91183 case RTWS_DEF_FREE:
91184@@ -1035,7 +1035,7 @@ static void rcu_torture_timer(unsigned long unused)
91185 return;
91186 }
91187 if (p->rtort_mbtest == 0)
91188- atomic_inc(&n_rcu_torture_mberror);
91189+ atomic_inc_unchecked(&n_rcu_torture_mberror);
91190 spin_lock(&rand_lock);
91191 cur_ops->read_delay(&rand);
91192 n_rcu_torture_timers++;
91193@@ -1105,7 +1105,7 @@ rcu_torture_reader(void *arg)
91194 continue;
91195 }
91196 if (p->rtort_mbtest == 0)
91197- atomic_inc(&n_rcu_torture_mberror);
91198+ atomic_inc_unchecked(&n_rcu_torture_mberror);
91199 cur_ops->read_delay(&rand);
91200 preempt_disable();
91201 pipe_count = p->rtort_pipe_count;
91202@@ -1172,11 +1172,11 @@ rcu_torture_stats_print(void)
91203 rcu_torture_current,
91204 rcu_torture_current_version,
91205 list_empty(&rcu_torture_freelist),
91206- atomic_read(&n_rcu_torture_alloc),
91207- atomic_read(&n_rcu_torture_alloc_fail),
91208- atomic_read(&n_rcu_torture_free));
91209+ atomic_read_unchecked(&n_rcu_torture_alloc),
91210+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
91211+ atomic_read_unchecked(&n_rcu_torture_free));
91212 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
91213- atomic_read(&n_rcu_torture_mberror),
91214+ atomic_read_unchecked(&n_rcu_torture_mberror),
91215 n_rcu_torture_boost_ktrerror,
91216 n_rcu_torture_boost_rterror);
91217 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
91218@@ -1188,17 +1188,17 @@ rcu_torture_stats_print(void)
91219 n_barrier_successes,
91220 n_barrier_attempts,
91221 n_rcu_torture_barrier_error);
91222- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
91223+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
91224
91225 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
91226- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
91227+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
91228 n_rcu_torture_barrier_error != 0 ||
91229 n_rcu_torture_boost_ktrerror != 0 ||
91230 n_rcu_torture_boost_rterror != 0 ||
91231 n_rcu_torture_boost_failure != 0 ||
91232 i > 1) {
91233 pr_cont("%s", "!!! ");
91234- atomic_inc(&n_rcu_torture_error);
91235+ atomic_inc_unchecked(&n_rcu_torture_error);
91236 WARN_ON_ONCE(1);
91237 }
91238 pr_cont("Reader Pipe: ");
91239@@ -1215,7 +1215,7 @@ rcu_torture_stats_print(void)
91240 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
91241 pr_cont("Free-Block Circulation: ");
91242 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
91243- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
91244+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
91245 }
91246 pr_cont("\n");
91247
91248@@ -1559,7 +1559,7 @@ rcu_torture_cleanup(void)
91249
91250 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
91251
91252- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
91253+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
91254 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
91255 else if (torture_onoff_failures())
91256 rcu_torture_print_module_parms(cur_ops,
91257@@ -1684,18 +1684,18 @@ rcu_torture_init(void)
91258
91259 rcu_torture_current = NULL;
91260 rcu_torture_current_version = 0;
91261- atomic_set(&n_rcu_torture_alloc, 0);
91262- atomic_set(&n_rcu_torture_alloc_fail, 0);
91263- atomic_set(&n_rcu_torture_free, 0);
91264- atomic_set(&n_rcu_torture_mberror, 0);
91265- atomic_set(&n_rcu_torture_error, 0);
91266+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
91267+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
91268+ atomic_set_unchecked(&n_rcu_torture_free, 0);
91269+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
91270+ atomic_set_unchecked(&n_rcu_torture_error, 0);
91271 n_rcu_torture_barrier_error = 0;
91272 n_rcu_torture_boost_ktrerror = 0;
91273 n_rcu_torture_boost_rterror = 0;
91274 n_rcu_torture_boost_failure = 0;
91275 n_rcu_torture_boosts = 0;
91276 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
91277- atomic_set(&rcu_torture_wcount[i], 0);
91278+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
91279 for_each_possible_cpu(cpu) {
91280 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
91281 per_cpu(rcu_torture_count, cpu)[i] = 0;
91282diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
91283index c0623fc..329c091 100644
91284--- a/kernel/rcu/tiny.c
91285+++ b/kernel/rcu/tiny.c
91286@@ -42,7 +42,7 @@
91287 /* Forward declarations for tiny_plugin.h. */
91288 struct rcu_ctrlblk;
91289 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
91290-static void rcu_process_callbacks(struct softirq_action *unused);
91291+static void rcu_process_callbacks(void);
91292 static void __call_rcu(struct rcu_head *head,
91293 void (*func)(struct rcu_head *rcu),
91294 struct rcu_ctrlblk *rcp);
91295@@ -310,7 +310,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
91296 false));
91297 }
91298
91299-static void rcu_process_callbacks(struct softirq_action *unused)
91300+static __latent_entropy void rcu_process_callbacks(void)
91301 {
91302 __rcu_process_callbacks(&rcu_sched_ctrlblk);
91303 __rcu_process_callbacks(&rcu_bh_ctrlblk);
91304diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
91305index 858c565..7efd915 100644
91306--- a/kernel/rcu/tiny_plugin.h
91307+++ b/kernel/rcu/tiny_plugin.h
91308@@ -152,17 +152,17 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
91309 dump_stack();
91310 }
91311 if (*rcp->curtail && ULONG_CMP_GE(j, js))
91312- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
91313+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
91314 3 * rcu_jiffies_till_stall_check() + 3;
91315 else if (ULONG_CMP_GE(j, js))
91316- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91317+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91318 }
91319
91320 static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
91321 {
91322 rcp->ticks_this_gp = 0;
91323 rcp->gp_start = jiffies;
91324- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91325+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91326 }
91327
91328 static void check_cpu_stalls(void)
91329diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
91330index 9815447..2cdf92a 100644
91331--- a/kernel/rcu/tree.c
91332+++ b/kernel/rcu/tree.c
91333@@ -274,7 +274,7 @@ static void rcu_momentary_dyntick_idle(void)
91334 */
91335 rdtp = this_cpu_ptr(&rcu_dynticks);
91336 smp_mb__before_atomic(); /* Earlier stuff before QS. */
91337- atomic_add(2, &rdtp->dynticks); /* QS. */
91338+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
91339 smp_mb__after_atomic(); /* Later stuff after QS. */
91340 break;
91341 }
91342@@ -534,9 +534,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
91343 rcu_prepare_for_idle(smp_processor_id());
91344 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
91345 smp_mb__before_atomic(); /* See above. */
91346- atomic_inc(&rdtp->dynticks);
91347+ atomic_inc_unchecked(&rdtp->dynticks);
91348 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
91349- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
91350+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
91351 rcu_dynticks_task_enter();
91352
91353 /*
91354@@ -656,10 +656,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
91355 {
91356 rcu_dynticks_task_exit();
91357 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
91358- atomic_inc(&rdtp->dynticks);
91359+ atomic_inc_unchecked(&rdtp->dynticks);
91360 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
91361 smp_mb__after_atomic(); /* See above. */
91362- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
91363+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
91364 rcu_cleanup_after_idle(smp_processor_id());
91365 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
91366 if (!user && !is_idle_task(current)) {
91367@@ -780,14 +780,14 @@ void rcu_nmi_enter(void)
91368 struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
91369
91370 if (rdtp->dynticks_nmi_nesting == 0 &&
91371- (atomic_read(&rdtp->dynticks) & 0x1))
91372+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
91373 return;
91374 rdtp->dynticks_nmi_nesting++;
91375 smp_mb__before_atomic(); /* Force delay from prior write. */
91376- atomic_inc(&rdtp->dynticks);
91377+ atomic_inc_unchecked(&rdtp->dynticks);
91378 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
91379 smp_mb__after_atomic(); /* See above. */
91380- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
91381+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
91382 }
91383
91384 /**
91385@@ -806,9 +806,9 @@ void rcu_nmi_exit(void)
91386 return;
91387 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
91388 smp_mb__before_atomic(); /* See above. */
91389- atomic_inc(&rdtp->dynticks);
91390+ atomic_inc_unchecked(&rdtp->dynticks);
91391 smp_mb__after_atomic(); /* Force delay to next write. */
91392- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
91393+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
91394 }
91395
91396 /**
91397@@ -821,7 +821,7 @@ void rcu_nmi_exit(void)
91398 */
91399 bool notrace __rcu_is_watching(void)
91400 {
91401- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
91402+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
91403 }
91404
91405 /**
91406@@ -904,7 +904,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
91407 static int dyntick_save_progress_counter(struct rcu_data *rdp,
91408 bool *isidle, unsigned long *maxj)
91409 {
91410- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
91411+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
91412 rcu_sysidle_check_cpu(rdp, isidle, maxj);
91413 if ((rdp->dynticks_snap & 0x1) == 0) {
91414 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
91415@@ -933,7 +933,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
91416 int *rcrmp;
91417 unsigned int snap;
91418
91419- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
91420+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
91421 snap = (unsigned int)rdp->dynticks_snap;
91422
91423 /*
91424@@ -996,10 +996,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
91425 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
91426 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
91427 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
91428- ACCESS_ONCE(rdp->cond_resched_completed) =
91429+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
91430 ACCESS_ONCE(rdp->mynode->completed);
91431 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
91432- ACCESS_ONCE(*rcrmp) =
91433+ ACCESS_ONCE_RW(*rcrmp) =
91434 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
91435 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
91436 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
91437@@ -1021,7 +1021,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
91438 rsp->gp_start = j;
91439 smp_wmb(); /* Record start time before stall time. */
91440 j1 = rcu_jiffies_till_stall_check();
91441- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
91442+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
91443 rsp->jiffies_resched = j + j1 / 2;
91444 }
91445
91446@@ -1062,7 +1062,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp)
91447 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91448 return;
91449 }
91450- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
91451+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
91452 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91453
91454 /*
91455@@ -1139,7 +1139,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
91456
91457 raw_spin_lock_irqsave(&rnp->lock, flags);
91458 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
91459- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
91460+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
91461 3 * rcu_jiffies_till_stall_check() + 3;
91462 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91463
91464@@ -1223,7 +1223,7 @@ void rcu_cpu_stall_reset(void)
91465 struct rcu_state *rsp;
91466
91467 for_each_rcu_flavor(rsp)
91468- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
91469+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
91470 }
91471
91472 /*
91473@@ -1609,7 +1609,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
91474 raw_spin_unlock_irq(&rnp->lock);
91475 return 0;
91476 }
91477- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
91478+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
91479
91480 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
91481 /*
91482@@ -1650,9 +1650,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
91483 rdp = this_cpu_ptr(rsp->rda);
91484 rcu_preempt_check_blocked_tasks(rnp);
91485 rnp->qsmask = rnp->qsmaskinit;
91486- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
91487+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
91488 WARN_ON_ONCE(rnp->completed != rsp->completed);
91489- ACCESS_ONCE(rnp->completed) = rsp->completed;
91490+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
91491 if (rnp == rdp->mynode)
91492 (void)__note_gp_changes(rsp, rnp, rdp);
91493 rcu_preempt_boost_start_gp(rnp);
91494@@ -1697,7 +1697,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
91495 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
91496 raw_spin_lock_irq(&rnp->lock);
91497 smp_mb__after_unlock_lock();
91498- ACCESS_ONCE(rsp->gp_flags) =
91499+ ACCESS_ONCE_RW(rsp->gp_flags) =
91500 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
91501 raw_spin_unlock_irq(&rnp->lock);
91502 }
91503@@ -1743,7 +1743,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
91504 rcu_for_each_node_breadth_first(rsp, rnp) {
91505 raw_spin_lock_irq(&rnp->lock);
91506 smp_mb__after_unlock_lock();
91507- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
91508+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
91509 rdp = this_cpu_ptr(rsp->rda);
91510 if (rnp == rdp->mynode)
91511 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
91512@@ -1758,14 +1758,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
91513 rcu_nocb_gp_set(rnp, nocb);
91514
91515 /* Declare grace period done. */
91516- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
91517+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
91518 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
91519 rsp->fqs_state = RCU_GP_IDLE;
91520 rdp = this_cpu_ptr(rsp->rda);
91521 /* Advance CBs to reduce false positives below. */
91522 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
91523 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
91524- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91525+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91526 trace_rcu_grace_period(rsp->name,
91527 ACCESS_ONCE(rsp->gpnum),
91528 TPS("newreq"));
91529@@ -1890,7 +1890,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
91530 */
91531 return false;
91532 }
91533- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91534+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91535 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
91536 TPS("newreq"));
91537
91538@@ -2111,7 +2111,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
91539 rsp->qlen += rdp->qlen;
91540 rdp->n_cbs_orphaned += rdp->qlen;
91541 rdp->qlen_lazy = 0;
91542- ACCESS_ONCE(rdp->qlen) = 0;
91543+ ACCESS_ONCE_RW(rdp->qlen) = 0;
91544 }
91545
91546 /*
91547@@ -2356,7 +2356,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
91548 }
91549 smp_mb(); /* List handling before counting for rcu_barrier(). */
91550 rdp->qlen_lazy -= count_lazy;
91551- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
91552+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
91553 rdp->n_cbs_invoked += count;
91554
91555 /* Reinstate batch limit if we have worked down the excess. */
91556@@ -2519,7 +2519,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
91557 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
91558 return; /* Someone beat us to it. */
91559 }
91560- ACCESS_ONCE(rsp->gp_flags) =
91561+ ACCESS_ONCE_RW(rsp->gp_flags) =
91562 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
91563 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
91564 rcu_gp_kthread_wake(rsp);
91565@@ -2565,7 +2565,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
91566 /*
91567 * Do RCU core processing for the current CPU.
91568 */
91569-static void rcu_process_callbacks(struct softirq_action *unused)
91570+static void rcu_process_callbacks(void)
91571 {
91572 struct rcu_state *rsp;
91573
91574@@ -2677,7 +2677,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
91575 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
91576 if (debug_rcu_head_queue(head)) {
91577 /* Probable double call_rcu(), so leak the callback. */
91578- ACCESS_ONCE(head->func) = rcu_leak_callback;
91579+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
91580 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
91581 return;
91582 }
91583@@ -2705,7 +2705,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
91584 local_irq_restore(flags);
91585 return;
91586 }
91587- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
91588+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
91589 if (lazy)
91590 rdp->qlen_lazy++;
91591 else
91592@@ -2975,11 +2975,11 @@ void synchronize_sched_expedited(void)
91593 * counter wrap on a 32-bit system. Quite a few more CPUs would of
91594 * course be required on a 64-bit system.
91595 */
91596- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
91597+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
91598 (ulong)atomic_long_read(&rsp->expedited_done) +
91599 ULONG_MAX / 8)) {
91600 synchronize_sched();
91601- atomic_long_inc(&rsp->expedited_wrap);
91602+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
91603 return;
91604 }
91605
91606@@ -2987,12 +2987,12 @@ void synchronize_sched_expedited(void)
91607 * Take a ticket. Note that atomic_inc_return() implies a
91608 * full memory barrier.
91609 */
91610- snap = atomic_long_inc_return(&rsp->expedited_start);
91611+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
91612 firstsnap = snap;
91613 if (!try_get_online_cpus()) {
91614 /* CPU hotplug operation in flight, fall back to normal GP. */
91615 wait_rcu_gp(call_rcu_sched);
91616- atomic_long_inc(&rsp->expedited_normal);
91617+ atomic_long_inc_unchecked(&rsp->expedited_normal);
91618 return;
91619 }
91620 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
91621@@ -3005,14 +3005,14 @@ void synchronize_sched_expedited(void)
91622 synchronize_sched_expedited_cpu_stop,
91623 NULL) == -EAGAIN) {
91624 put_online_cpus();
91625- atomic_long_inc(&rsp->expedited_tryfail);
91626+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
91627
91628 /* Check to see if someone else did our work for us. */
91629 s = atomic_long_read(&rsp->expedited_done);
91630 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
91631 /* ensure test happens before caller kfree */
91632 smp_mb__before_atomic(); /* ^^^ */
91633- atomic_long_inc(&rsp->expedited_workdone1);
91634+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
91635 return;
91636 }
91637
91638@@ -3021,7 +3021,7 @@ void synchronize_sched_expedited(void)
91639 udelay(trycount * num_online_cpus());
91640 } else {
91641 wait_rcu_gp(call_rcu_sched);
91642- atomic_long_inc(&rsp->expedited_normal);
91643+ atomic_long_inc_unchecked(&rsp->expedited_normal);
91644 return;
91645 }
91646
91647@@ -3030,7 +3030,7 @@ void synchronize_sched_expedited(void)
91648 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
91649 /* ensure test happens before caller kfree */
91650 smp_mb__before_atomic(); /* ^^^ */
91651- atomic_long_inc(&rsp->expedited_workdone2);
91652+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
91653 return;
91654 }
91655
91656@@ -3044,13 +3044,13 @@ void synchronize_sched_expedited(void)
91657 if (!try_get_online_cpus()) {
91658 /* CPU hotplug operation in flight, use normal GP. */
91659 wait_rcu_gp(call_rcu_sched);
91660- atomic_long_inc(&rsp->expedited_normal);
91661+ atomic_long_inc_unchecked(&rsp->expedited_normal);
91662 return;
91663 }
91664- snap = atomic_long_read(&rsp->expedited_start);
91665+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
91666 smp_mb(); /* ensure read is before try_stop_cpus(). */
91667 }
91668- atomic_long_inc(&rsp->expedited_stoppedcpus);
91669+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
91670
91671 /*
91672 * Everyone up to our most recent fetch is covered by our grace
91673@@ -3059,16 +3059,16 @@ void synchronize_sched_expedited(void)
91674 * than we did already did their update.
91675 */
91676 do {
91677- atomic_long_inc(&rsp->expedited_done_tries);
91678+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
91679 s = atomic_long_read(&rsp->expedited_done);
91680 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
91681 /* ensure test happens before caller kfree */
91682 smp_mb__before_atomic(); /* ^^^ */
91683- atomic_long_inc(&rsp->expedited_done_lost);
91684+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
91685 break;
91686 }
91687 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
91688- atomic_long_inc(&rsp->expedited_done_exit);
91689+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
91690
91691 put_online_cpus();
91692 }
91693@@ -3274,7 +3274,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
91694 * ACCESS_ONCE() to prevent the compiler from speculating
91695 * the increment to precede the early-exit check.
91696 */
91697- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91698+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91699 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
91700 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
91701 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
91702@@ -3329,7 +3329,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
91703
91704 /* Increment ->n_barrier_done to prevent duplicate work. */
91705 smp_mb(); /* Keep increment after above mechanism. */
91706- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91707+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91708 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
91709 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
91710 smp_mb(); /* Keep increment before caller's subsequent code. */
91711@@ -3374,10 +3374,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
91712 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
91713 init_callback_list(rdp);
91714 rdp->qlen_lazy = 0;
91715- ACCESS_ONCE(rdp->qlen) = 0;
91716+ ACCESS_ONCE_RW(rdp->qlen) = 0;
91717 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
91718 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
91719- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
91720+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
91721 rdp->cpu = cpu;
91722 rdp->rsp = rsp;
91723 rcu_boot_init_nocb_percpu_data(rdp);
91724@@ -3410,8 +3410,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
91725 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
91726 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
91727 rcu_sysidle_init_percpu_data(rdp->dynticks);
91728- atomic_set(&rdp->dynticks->dynticks,
91729- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
91730+ atomic_set_unchecked(&rdp->dynticks->dynticks,
91731+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
91732 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
91733
91734 /* Add CPU to rcu_node bitmasks. */
91735diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
91736index bbdc45d..c882ccb 100644
91737--- a/kernel/rcu/tree.h
91738+++ b/kernel/rcu/tree.h
91739@@ -87,11 +87,11 @@ struct rcu_dynticks {
91740 long long dynticks_nesting; /* Track irq/process nesting level. */
91741 /* Process level is worth LLONG_MAX/2. */
91742 int dynticks_nmi_nesting; /* Track NMI nesting level. */
91743- atomic_t dynticks; /* Even value for idle, else odd. */
91744+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
91745 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
91746 long long dynticks_idle_nesting;
91747 /* irq/process nesting level from idle. */
91748- atomic_t dynticks_idle; /* Even value for idle, else odd. */
91749+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
91750 /* "Idle" excludes userspace execution. */
91751 unsigned long dynticks_idle_jiffies;
91752 /* End of last non-NMI non-idle period. */
91753@@ -466,17 +466,17 @@ struct rcu_state {
91754 /* _rcu_barrier(). */
91755 /* End of fields guarded by barrier_mutex. */
91756
91757- atomic_long_t expedited_start; /* Starting ticket. */
91758- atomic_long_t expedited_done; /* Done ticket. */
91759- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
91760- atomic_long_t expedited_tryfail; /* # acquisition failures. */
91761- atomic_long_t expedited_workdone1; /* # done by others #1. */
91762- atomic_long_t expedited_workdone2; /* # done by others #2. */
91763- atomic_long_t expedited_normal; /* # fallbacks to normal. */
91764- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
91765- atomic_long_t expedited_done_tries; /* # tries to update _done. */
91766- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
91767- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
91768+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
91769+ atomic_long_t expedited_done; /* Done ticket. */
91770+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
91771+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
91772+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
91773+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
91774+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
91775+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
91776+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
91777+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
91778+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
91779
91780 unsigned long jiffies_force_qs; /* Time at which to invoke */
91781 /* force_quiescent_state(). */
91782diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
91783index c1d7f27..a64bf49 100644
91784--- a/kernel/rcu/tree_plugin.h
91785+++ b/kernel/rcu/tree_plugin.h
91786@@ -709,7 +709,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
91787 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
91788 {
91789 return !rcu_preempted_readers_exp(rnp) &&
91790- ACCESS_ONCE(rnp->expmask) == 0;
91791+ ACCESS_ONCE_RW(rnp->expmask) == 0;
91792 }
91793
91794 /*
91795@@ -870,7 +870,7 @@ void synchronize_rcu_expedited(void)
91796
91797 /* Clean up and exit. */
91798 smp_mb(); /* ensure expedited GP seen before counter increment. */
91799- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
91800+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
91801 sync_rcu_preempt_exp_count + 1;
91802 unlock_mb_ret:
91803 mutex_unlock(&sync_rcu_preempt_exp_mutex);
91804@@ -1426,7 +1426,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
91805 free_cpumask_var(cm);
91806 }
91807
91808-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
91809+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
91810 .store = &rcu_cpu_kthread_task,
91811 .thread_should_run = rcu_cpu_kthread_should_run,
91812 .thread_fn = rcu_cpu_kthread,
91813@@ -1900,7 +1900,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
91814 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
91815 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
91816 cpu, ticks_value, ticks_title,
91817- atomic_read(&rdtp->dynticks) & 0xfff,
91818+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
91819 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
91820 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
91821 fast_no_hz);
91822@@ -2044,7 +2044,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
91823 return;
91824 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
91825 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
91826- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
91827+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
91828 wake_up(&rdp_leader->nocb_wq);
91829 }
91830 }
91831@@ -2096,7 +2096,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
91832
91833 /* Enqueue the callback on the nocb list and update counts. */
91834 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
91835- ACCESS_ONCE(*old_rhpp) = rhp;
91836+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
91837 atomic_long_add(rhcount, &rdp->nocb_q_count);
91838 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
91839 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
91840@@ -2286,7 +2286,7 @@ wait_again:
91841 continue; /* No CBs here, try next follower. */
91842
91843 /* Move callbacks to wait-for-GP list, which is empty. */
91844- ACCESS_ONCE(rdp->nocb_head) = NULL;
91845+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
91846 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
91847 rdp->nocb_gp_count = atomic_long_xchg(&rdp->nocb_q_count, 0);
91848 rdp->nocb_gp_count_lazy =
91849@@ -2413,7 +2413,7 @@ static int rcu_nocb_kthread(void *arg)
91850 list = ACCESS_ONCE(rdp->nocb_follower_head);
91851 BUG_ON(!list);
91852 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
91853- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
91854+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
91855 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
91856 c = atomic_long_xchg(&rdp->nocb_follower_count, 0);
91857 cl = atomic_long_xchg(&rdp->nocb_follower_count_lazy, 0);
91858@@ -2443,8 +2443,8 @@ static int rcu_nocb_kthread(void *arg)
91859 list = next;
91860 }
91861 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
91862- ACCESS_ONCE(rdp->nocb_p_count) = rdp->nocb_p_count - c;
91863- ACCESS_ONCE(rdp->nocb_p_count_lazy) =
91864+ ACCESS_ONCE_RW(rdp->nocb_p_count) = rdp->nocb_p_count - c;
91865+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) =
91866 rdp->nocb_p_count_lazy - cl;
91867 rdp->n_nocbs_invoked += c;
91868 }
91869@@ -2465,7 +2465,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
91870 if (!rcu_nocb_need_deferred_wakeup(rdp))
91871 return;
91872 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
91873- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
91874+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
91875 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
91876 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
91877 }
91878@@ -2584,7 +2584,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
91879 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
91880 "rcuo%c/%d", rsp->abbr, cpu);
91881 BUG_ON(IS_ERR(t));
91882- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
91883+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
91884 }
91885
91886 /*
91887@@ -2788,11 +2788,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
91888
91889 /* Record start of fully idle period. */
91890 j = jiffies;
91891- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
91892+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
91893 smp_mb__before_atomic();
91894- atomic_inc(&rdtp->dynticks_idle);
91895+ atomic_inc_unchecked(&rdtp->dynticks_idle);
91896 smp_mb__after_atomic();
91897- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
91898+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
91899 }
91900
91901 /*
91902@@ -2861,9 +2861,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
91903
91904 /* Record end of idle period. */
91905 smp_mb__before_atomic();
91906- atomic_inc(&rdtp->dynticks_idle);
91907+ atomic_inc_unchecked(&rdtp->dynticks_idle);
91908 smp_mb__after_atomic();
91909- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
91910+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
91911
91912 /*
91913 * If we are the timekeeping CPU, we are permitted to be non-idle
91914@@ -2908,7 +2908,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
91915 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
91916
91917 /* Pick up current idle and NMI-nesting counter and check. */
91918- cur = atomic_read(&rdtp->dynticks_idle);
91919+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
91920 if (cur & 0x1) {
91921 *isidle = false; /* We are not idle! */
91922 return;
91923@@ -2957,7 +2957,7 @@ static void rcu_sysidle(unsigned long j)
91924 case RCU_SYSIDLE_NOT:
91925
91926 /* First time all are idle, so note a short idle period. */
91927- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
91928+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
91929 break;
91930
91931 case RCU_SYSIDLE_SHORT:
91932@@ -2995,7 +2995,7 @@ static void rcu_sysidle_cancel(void)
91933 {
91934 smp_mb();
91935 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
91936- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
91937+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
91938 }
91939
91940 /*
91941@@ -3047,7 +3047,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
91942 smp_mb(); /* grace period precedes setting inuse. */
91943
91944 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
91945- ACCESS_ONCE(rshp->inuse) = 0;
91946+ ACCESS_ONCE_RW(rshp->inuse) = 0;
91947 }
91948
91949 /*
91950@@ -3200,7 +3200,7 @@ static void rcu_bind_gp_kthread(void)
91951 static void rcu_dynticks_task_enter(void)
91952 {
91953 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
91954- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
91955+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
91956 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
91957 }
91958
91959@@ -3208,6 +3208,6 @@ static void rcu_dynticks_task_enter(void)
91960 static void rcu_dynticks_task_exit(void)
91961 {
91962 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
91963- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
91964+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
91965 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
91966 }
91967diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
91968index 5cdc62e..cc52e88 100644
91969--- a/kernel/rcu/tree_trace.c
91970+++ b/kernel/rcu/tree_trace.c
91971@@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
91972 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
91973 rdp->passed_quiesce, rdp->qs_pending);
91974 seq_printf(m, " dt=%d/%llx/%d df=%lu",
91975- atomic_read(&rdp->dynticks->dynticks),
91976+ atomic_read_unchecked(&rdp->dynticks->dynticks),
91977 rdp->dynticks->dynticks_nesting,
91978 rdp->dynticks->dynticks_nmi_nesting,
91979 rdp->dynticks_fqs);
91980@@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
91981 struct rcu_state *rsp = (struct rcu_state *)m->private;
91982
91983 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",
91984- atomic_long_read(&rsp->expedited_start),
91985+ atomic_long_read_unchecked(&rsp->expedited_start),
91986 atomic_long_read(&rsp->expedited_done),
91987- atomic_long_read(&rsp->expedited_wrap),
91988- atomic_long_read(&rsp->expedited_tryfail),
91989- atomic_long_read(&rsp->expedited_workdone1),
91990- atomic_long_read(&rsp->expedited_workdone2),
91991- atomic_long_read(&rsp->expedited_normal),
91992- atomic_long_read(&rsp->expedited_stoppedcpus),
91993- atomic_long_read(&rsp->expedited_done_tries),
91994- atomic_long_read(&rsp->expedited_done_lost),
91995- atomic_long_read(&rsp->expedited_done_exit));
91996+ atomic_long_read_unchecked(&rsp->expedited_wrap),
91997+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
91998+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
91999+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
92000+ atomic_long_read_unchecked(&rsp->expedited_normal),
92001+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
92002+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
92003+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
92004+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
92005 return 0;
92006 }
92007
92008diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
92009index 3ef8ba5..8c5ebfb6 100644
92010--- a/kernel/rcu/update.c
92011+++ b/kernel/rcu/update.c
92012@@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
92013 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
92014 */
92015 if (till_stall_check < 3) {
92016- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
92017+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
92018 till_stall_check = 3;
92019 } else if (till_stall_check > 300) {
92020- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
92021+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
92022 till_stall_check = 300;
92023 }
92024 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
92025@@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
92026 !ACCESS_ONCE(t->on_rq) ||
92027 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
92028 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
92029- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
92030+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
92031 list_del_init(&t->rcu_tasks_holdout_list);
92032 put_task_struct(t);
92033 return;
92034@@ -588,7 +588,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
92035 !is_idle_task(t)) {
92036 get_task_struct(t);
92037 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
92038- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
92039+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
92040 list_add(&t->rcu_tasks_holdout_list,
92041 &rcu_tasks_holdouts);
92042 }
92043@@ -685,7 +685,7 @@ static void rcu_spawn_tasks_kthread(void)
92044 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
92045 BUG_ON(IS_ERR(t));
92046 smp_mb(); /* Ensure others see full kthread. */
92047- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
92048+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
92049 mutex_unlock(&rcu_tasks_kthread_mutex);
92050 }
92051
92052diff --git a/kernel/resource.c b/kernel/resource.c
92053index 0bcebff..e7cd5b2 100644
92054--- a/kernel/resource.c
92055+++ b/kernel/resource.c
92056@@ -161,8 +161,18 @@ static const struct file_operations proc_iomem_operations = {
92057
92058 static int __init ioresources_init(void)
92059 {
92060+#ifdef CONFIG_GRKERNSEC_PROC_ADD
92061+#ifdef CONFIG_GRKERNSEC_PROC_USER
92062+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
92063+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
92064+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92065+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
92066+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
92067+#endif
92068+#else
92069 proc_create("ioports", 0, NULL, &proc_ioports_operations);
92070 proc_create("iomem", 0, NULL, &proc_iomem_operations);
92071+#endif
92072 return 0;
92073 }
92074 __initcall(ioresources_init);
92075diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
92076index 8a2e230..6020954 100644
92077--- a/kernel/sched/auto_group.c
92078+++ b/kernel/sched/auto_group.c
92079@@ -11,7 +11,7 @@
92080
92081 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
92082 static struct autogroup autogroup_default;
92083-static atomic_t autogroup_seq_nr;
92084+static atomic_unchecked_t autogroup_seq_nr;
92085
92086 void __init autogroup_init(struct task_struct *init_task)
92087 {
92088@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
92089
92090 kref_init(&ag->kref);
92091 init_rwsem(&ag->lock);
92092- ag->id = atomic_inc_return(&autogroup_seq_nr);
92093+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
92094 ag->tg = tg;
92095 #ifdef CONFIG_RT_GROUP_SCHED
92096 /*
92097diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
92098index a63f4dc..349bbb0 100644
92099--- a/kernel/sched/completion.c
92100+++ b/kernel/sched/completion.c
92101@@ -204,7 +204,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
92102 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
92103 * or number of jiffies left till timeout) if completed.
92104 */
92105-long __sched
92106+long __sched __intentional_overflow(-1)
92107 wait_for_completion_interruptible_timeout(struct completion *x,
92108 unsigned long timeout)
92109 {
92110@@ -221,7 +221,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
92111 *
92112 * Return: -ERESTARTSYS if interrupted, 0 if completed.
92113 */
92114-int __sched wait_for_completion_killable(struct completion *x)
92115+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
92116 {
92117 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
92118 if (t == -ERESTARTSYS)
92119@@ -242,7 +242,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
92120 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
92121 * or number of jiffies left till timeout) if completed.
92122 */
92123-long __sched
92124+long __sched __intentional_overflow(-1)
92125 wait_for_completion_killable_timeout(struct completion *x,
92126 unsigned long timeout)
92127 {
92128diff --git a/kernel/sched/core.c b/kernel/sched/core.c
92129index 89e7283..072bc26 100644
92130--- a/kernel/sched/core.c
92131+++ b/kernel/sched/core.c
92132@@ -1885,7 +1885,7 @@ void set_numabalancing_state(bool enabled)
92133 int sysctl_numa_balancing(struct ctl_table *table, int write,
92134 void __user *buffer, size_t *lenp, loff_t *ppos)
92135 {
92136- struct ctl_table t;
92137+ ctl_table_no_const t;
92138 int err;
92139 int state = numabalancing_enabled;
92140
92141@@ -2348,8 +2348,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
92142 next->active_mm = oldmm;
92143 atomic_inc(&oldmm->mm_count);
92144 enter_lazy_tlb(oldmm, next);
92145- } else
92146+ } else {
92147 switch_mm(oldmm, mm, next);
92148+ populate_stack();
92149+ }
92150
92151 if (!prev->mm) {
92152 prev->active_mm = NULL;
92153@@ -3160,6 +3162,8 @@ int can_nice(const struct task_struct *p, const int nice)
92154 /* convert nice value [19,-20] to rlimit style value [1,40] */
92155 int nice_rlim = nice_to_rlimit(nice);
92156
92157+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
92158+
92159 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
92160 capable(CAP_SYS_NICE));
92161 }
92162@@ -3186,7 +3190,8 @@ SYSCALL_DEFINE1(nice, int, increment)
92163 nice = task_nice(current) + increment;
92164
92165 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
92166- if (increment < 0 && !can_nice(current, nice))
92167+ if (increment < 0 && (!can_nice(current, nice) ||
92168+ gr_handle_chroot_nice()))
92169 return -EPERM;
92170
92171 retval = security_task_setnice(current, nice);
92172@@ -3465,6 +3470,7 @@ recheck:
92173 if (policy != p->policy && !rlim_rtprio)
92174 return -EPERM;
92175
92176+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
92177 /* can't increase priority */
92178 if (attr->sched_priority > p->rt_priority &&
92179 attr->sched_priority > rlim_rtprio)
92180@@ -4885,6 +4891,7 @@ void idle_task_exit(void)
92181
92182 if (mm != &init_mm) {
92183 switch_mm(mm, &init_mm, current);
92184+ populate_stack();
92185 finish_arch_post_lock_switch();
92186 }
92187 mmdrop(mm);
92188@@ -4980,7 +4987,7 @@ static void migrate_tasks(unsigned int dead_cpu)
92189
92190 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
92191
92192-static struct ctl_table sd_ctl_dir[] = {
92193+static ctl_table_no_const sd_ctl_dir[] __read_only = {
92194 {
92195 .procname = "sched_domain",
92196 .mode = 0555,
92197@@ -4997,17 +5004,17 @@ static struct ctl_table sd_ctl_root[] = {
92198 {}
92199 };
92200
92201-static struct ctl_table *sd_alloc_ctl_entry(int n)
92202+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
92203 {
92204- struct ctl_table *entry =
92205+ ctl_table_no_const *entry =
92206 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
92207
92208 return entry;
92209 }
92210
92211-static void sd_free_ctl_entry(struct ctl_table **tablep)
92212+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
92213 {
92214- struct ctl_table *entry;
92215+ ctl_table_no_const *entry;
92216
92217 /*
92218 * In the intermediate directories, both the child directory and
92219@@ -5015,22 +5022,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
92220 * will always be set. In the lowest directory the names are
92221 * static strings and all have proc handlers.
92222 */
92223- for (entry = *tablep; entry->mode; entry++) {
92224- if (entry->child)
92225- sd_free_ctl_entry(&entry->child);
92226+ for (entry = tablep; entry->mode; entry++) {
92227+ if (entry->child) {
92228+ sd_free_ctl_entry(entry->child);
92229+ pax_open_kernel();
92230+ entry->child = NULL;
92231+ pax_close_kernel();
92232+ }
92233 if (entry->proc_handler == NULL)
92234 kfree(entry->procname);
92235 }
92236
92237- kfree(*tablep);
92238- *tablep = NULL;
92239+ kfree(tablep);
92240 }
92241
92242 static int min_load_idx = 0;
92243 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
92244
92245 static void
92246-set_table_entry(struct ctl_table *entry,
92247+set_table_entry(ctl_table_no_const *entry,
92248 const char *procname, void *data, int maxlen,
92249 umode_t mode, proc_handler *proc_handler,
92250 bool load_idx)
92251@@ -5050,7 +5060,7 @@ set_table_entry(struct ctl_table *entry,
92252 static struct ctl_table *
92253 sd_alloc_ctl_domain_table(struct sched_domain *sd)
92254 {
92255- struct ctl_table *table = sd_alloc_ctl_entry(14);
92256+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
92257
92258 if (table == NULL)
92259 return NULL;
92260@@ -5088,9 +5098,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
92261 return table;
92262 }
92263
92264-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
92265+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
92266 {
92267- struct ctl_table *entry, *table;
92268+ ctl_table_no_const *entry, *table;
92269 struct sched_domain *sd;
92270 int domain_num = 0, i;
92271 char buf[32];
92272@@ -5117,11 +5127,13 @@ static struct ctl_table_header *sd_sysctl_header;
92273 static void register_sched_domain_sysctl(void)
92274 {
92275 int i, cpu_num = num_possible_cpus();
92276- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
92277+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
92278 char buf[32];
92279
92280 WARN_ON(sd_ctl_dir[0].child);
92281+ pax_open_kernel();
92282 sd_ctl_dir[0].child = entry;
92283+ pax_close_kernel();
92284
92285 if (entry == NULL)
92286 return;
92287@@ -5144,8 +5156,12 @@ static void unregister_sched_domain_sysctl(void)
92288 if (sd_sysctl_header)
92289 unregister_sysctl_table(sd_sysctl_header);
92290 sd_sysctl_header = NULL;
92291- if (sd_ctl_dir[0].child)
92292- sd_free_ctl_entry(&sd_ctl_dir[0].child);
92293+ if (sd_ctl_dir[0].child) {
92294+ sd_free_ctl_entry(sd_ctl_dir[0].child);
92295+ pax_open_kernel();
92296+ sd_ctl_dir[0].child = NULL;
92297+ pax_close_kernel();
92298+ }
92299 }
92300 #else
92301 static void register_sched_domain_sysctl(void)
92302diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
92303index ef2b104..69961f6 100644
92304--- a/kernel/sched/fair.c
92305+++ b/kernel/sched/fair.c
92306@@ -1906,7 +1906,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
92307
92308 static void reset_ptenuma_scan(struct task_struct *p)
92309 {
92310- ACCESS_ONCE(p->mm->numa_scan_seq)++;
92311+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
92312 p->mm->numa_scan_offset = 0;
92313 }
92314
92315@@ -7465,7 +7465,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
92316 * run_rebalance_domains is triggered when needed from the scheduler tick.
92317 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
92318 */
92319-static void run_rebalance_domains(struct softirq_action *h)
92320+static __latent_entropy void run_rebalance_domains(void)
92321 {
92322 struct rq *this_rq = this_rq();
92323 enum cpu_idle_type idle = this_rq->idle_balance ?
92324diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
92325index 2df8ef0..aae070f 100644
92326--- a/kernel/sched/sched.h
92327+++ b/kernel/sched/sched.h
92328@@ -1140,7 +1140,7 @@ struct sched_class {
92329 #ifdef CONFIG_FAIR_GROUP_SCHED
92330 void (*task_move_group) (struct task_struct *p, int on_rq);
92331 #endif
92332-};
92333+} __do_const;
92334
92335 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
92336 {
92337diff --git a/kernel/signal.c b/kernel/signal.c
92338index 8f0876f..1153a5a 100644
92339--- a/kernel/signal.c
92340+++ b/kernel/signal.c
92341@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
92342
92343 int print_fatal_signals __read_mostly;
92344
92345-static void __user *sig_handler(struct task_struct *t, int sig)
92346+static __sighandler_t sig_handler(struct task_struct *t, int sig)
92347 {
92348 return t->sighand->action[sig - 1].sa.sa_handler;
92349 }
92350
92351-static int sig_handler_ignored(void __user *handler, int sig)
92352+static int sig_handler_ignored(__sighandler_t handler, int sig)
92353 {
92354 /* Is it explicitly or implicitly ignored? */
92355 return handler == SIG_IGN ||
92356@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
92357
92358 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
92359 {
92360- void __user *handler;
92361+ __sighandler_t handler;
92362
92363 handler = sig_handler(t, sig);
92364
92365@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
92366 atomic_inc(&user->sigpending);
92367 rcu_read_unlock();
92368
92369+ if (!override_rlimit)
92370+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
92371+
92372 if (override_rlimit ||
92373 atomic_read(&user->sigpending) <=
92374 task_rlimit(t, RLIMIT_SIGPENDING)) {
92375@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
92376
92377 int unhandled_signal(struct task_struct *tsk, int sig)
92378 {
92379- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
92380+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
92381 if (is_global_init(tsk))
92382 return 1;
92383 if (handler != SIG_IGN && handler != SIG_DFL)
92384@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
92385 }
92386 }
92387
92388+ /* allow glibc communication via tgkill to other threads in our
92389+ thread group */
92390+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
92391+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
92392+ && gr_handle_signal(t, sig))
92393+ return -EPERM;
92394+
92395 return security_task_kill(t, info, sig, 0);
92396 }
92397
92398@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
92399 return send_signal(sig, info, p, 1);
92400 }
92401
92402-static int
92403+int
92404 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92405 {
92406 return send_signal(sig, info, t, 0);
92407@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92408 unsigned long int flags;
92409 int ret, blocked, ignored;
92410 struct k_sigaction *action;
92411+ int is_unhandled = 0;
92412
92413 spin_lock_irqsave(&t->sighand->siglock, flags);
92414 action = &t->sighand->action[sig-1];
92415@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92416 }
92417 if (action->sa.sa_handler == SIG_DFL)
92418 t->signal->flags &= ~SIGNAL_UNKILLABLE;
92419+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
92420+ is_unhandled = 1;
92421 ret = specific_send_sig_info(sig, info, t);
92422 spin_unlock_irqrestore(&t->sighand->siglock, flags);
92423
92424+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
92425+ normal operation */
92426+ if (is_unhandled) {
92427+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
92428+ gr_handle_crash(t, sig);
92429+ }
92430+
92431 return ret;
92432 }
92433
92434@@ -1300,8 +1320,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
92435 ret = check_kill_permission(sig, info, p);
92436 rcu_read_unlock();
92437
92438- if (!ret && sig)
92439+ if (!ret && sig) {
92440 ret = do_send_sig_info(sig, info, p, true);
92441+ if (!ret)
92442+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
92443+ }
92444
92445 return ret;
92446 }
92447@@ -2903,7 +2926,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
92448 int error = -ESRCH;
92449
92450 rcu_read_lock();
92451- p = find_task_by_vpid(pid);
92452+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
92453+ /* allow glibc communication via tgkill to other threads in our
92454+ thread group */
92455+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
92456+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
92457+ p = find_task_by_vpid_unrestricted(pid);
92458+ else
92459+#endif
92460+ p = find_task_by_vpid(pid);
92461 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
92462 error = check_kill_permission(sig, info, p);
92463 /*
92464@@ -3236,8 +3267,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
92465 }
92466 seg = get_fs();
92467 set_fs(KERNEL_DS);
92468- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
92469- (stack_t __force __user *) &uoss,
92470+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
92471+ (stack_t __force_user *) &uoss,
92472 compat_user_stack_pointer());
92473 set_fs(seg);
92474 if (ret >= 0 && uoss_ptr) {
92475diff --git a/kernel/smpboot.c b/kernel/smpboot.c
92476index eb89e18..a4e6792 100644
92477--- a/kernel/smpboot.c
92478+++ b/kernel/smpboot.c
92479@@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
92480 }
92481 smpboot_unpark_thread(plug_thread, cpu);
92482 }
92483- list_add(&plug_thread->list, &hotplug_threads);
92484+ pax_list_add(&plug_thread->list, &hotplug_threads);
92485 out:
92486 mutex_unlock(&smpboot_threads_lock);
92487 return ret;
92488@@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
92489 {
92490 get_online_cpus();
92491 mutex_lock(&smpboot_threads_lock);
92492- list_del(&plug_thread->list);
92493+ pax_list_del(&plug_thread->list);
92494 smpboot_destroy_threads(plug_thread);
92495 mutex_unlock(&smpboot_threads_lock);
92496 put_online_cpus();
92497diff --git a/kernel/softirq.c b/kernel/softirq.c
92498index 0699add..d365ad8 100644
92499--- a/kernel/softirq.c
92500+++ b/kernel/softirq.c
92501@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
92502 EXPORT_SYMBOL(irq_stat);
92503 #endif
92504
92505-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
92506+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
92507
92508 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
92509
92510@@ -266,7 +266,7 @@ restart:
92511 kstat_incr_softirqs_this_cpu(vec_nr);
92512
92513 trace_softirq_entry(vec_nr);
92514- h->action(h);
92515+ h->action();
92516 trace_softirq_exit(vec_nr);
92517 if (unlikely(prev_count != preempt_count())) {
92518 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
92519@@ -426,7 +426,7 @@ void __raise_softirq_irqoff(unsigned int nr)
92520 or_softirq_pending(1UL << nr);
92521 }
92522
92523-void open_softirq(int nr, void (*action)(struct softirq_action *))
92524+void __init open_softirq(int nr, void (*action)(void))
92525 {
92526 softirq_vec[nr].action = action;
92527 }
92528@@ -478,7 +478,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
92529 }
92530 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
92531
92532-static void tasklet_action(struct softirq_action *a)
92533+static void tasklet_action(void)
92534 {
92535 struct tasklet_struct *list;
92536
92537@@ -514,7 +514,7 @@ static void tasklet_action(struct softirq_action *a)
92538 }
92539 }
92540
92541-static void tasklet_hi_action(struct softirq_action *a)
92542+static __latent_entropy void tasklet_hi_action(void)
92543 {
92544 struct tasklet_struct *list;
92545
92546@@ -741,7 +741,7 @@ static struct notifier_block cpu_nfb = {
92547 .notifier_call = cpu_callback
92548 };
92549
92550-static struct smp_hotplug_thread softirq_threads = {
92551+static struct smp_hotplug_thread softirq_threads __read_only = {
92552 .store = &ksoftirqd,
92553 .thread_should_run = ksoftirqd_should_run,
92554 .thread_fn = run_ksoftirqd,
92555diff --git a/kernel/sys.c b/kernel/sys.c
92556index 1eaa2f0..d80d27c 100644
92557--- a/kernel/sys.c
92558+++ b/kernel/sys.c
92559@@ -148,6 +148,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
92560 error = -EACCES;
92561 goto out;
92562 }
92563+
92564+ if (gr_handle_chroot_setpriority(p, niceval)) {
92565+ error = -EACCES;
92566+ goto out;
92567+ }
92568+
92569 no_nice = security_task_setnice(p, niceval);
92570 if (no_nice) {
92571 error = no_nice;
92572@@ -353,6 +359,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
92573 goto error;
92574 }
92575
92576+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
92577+ goto error;
92578+
92579+ if (!gid_eq(new->gid, old->gid)) {
92580+ /* make sure we generate a learn log for what will
92581+ end up being a role transition after a full-learning
92582+ policy is generated
92583+ CAP_SETGID is required to perform a transition
92584+ we may not log a CAP_SETGID check above, e.g.
92585+ in the case where new rgid = old egid
92586+ */
92587+ gr_learn_cap(current, new, CAP_SETGID);
92588+ }
92589+
92590 if (rgid != (gid_t) -1 ||
92591 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
92592 new->sgid = new->egid;
92593@@ -388,6 +408,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
92594 old = current_cred();
92595
92596 retval = -EPERM;
92597+
92598+ if (gr_check_group_change(kgid, kgid, kgid))
92599+ goto error;
92600+
92601 if (ns_capable(old->user_ns, CAP_SETGID))
92602 new->gid = new->egid = new->sgid = new->fsgid = kgid;
92603 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
92604@@ -405,7 +429,7 @@ error:
92605 /*
92606 * change the user struct in a credentials set to match the new UID
92607 */
92608-static int set_user(struct cred *new)
92609+int set_user(struct cred *new)
92610 {
92611 struct user_struct *new_user;
92612
92613@@ -485,7 +509,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
92614 goto error;
92615 }
92616
92617+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
92618+ goto error;
92619+
92620 if (!uid_eq(new->uid, old->uid)) {
92621+ /* make sure we generate a learn log for what will
92622+ end up being a role transition after a full-learning
92623+ policy is generated
92624+ CAP_SETUID is required to perform a transition
92625+ we may not log a CAP_SETUID check above, e.g.
92626+ in the case where new ruid = old euid
92627+ */
92628+ gr_learn_cap(current, new, CAP_SETUID);
92629 retval = set_user(new);
92630 if (retval < 0)
92631 goto error;
92632@@ -535,6 +570,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
92633 old = current_cred();
92634
92635 retval = -EPERM;
92636+
92637+ if (gr_check_crash_uid(kuid))
92638+ goto error;
92639+ if (gr_check_user_change(kuid, kuid, kuid))
92640+ goto error;
92641+
92642 if (ns_capable(old->user_ns, CAP_SETUID)) {
92643 new->suid = new->uid = kuid;
92644 if (!uid_eq(kuid, old->uid)) {
92645@@ -604,6 +645,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
92646 goto error;
92647 }
92648
92649+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
92650+ goto error;
92651+
92652 if (ruid != (uid_t) -1) {
92653 new->uid = kruid;
92654 if (!uid_eq(kruid, old->uid)) {
92655@@ -688,6 +732,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
92656 goto error;
92657 }
92658
92659+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
92660+ goto error;
92661+
92662 if (rgid != (gid_t) -1)
92663 new->gid = krgid;
92664 if (egid != (gid_t) -1)
92665@@ -752,12 +799,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
92666 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
92667 ns_capable(old->user_ns, CAP_SETUID)) {
92668 if (!uid_eq(kuid, old->fsuid)) {
92669+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
92670+ goto error;
92671+
92672 new->fsuid = kuid;
92673 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
92674 goto change_okay;
92675 }
92676 }
92677
92678+error:
92679 abort_creds(new);
92680 return old_fsuid;
92681
92682@@ -790,12 +841,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
92683 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
92684 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
92685 ns_capable(old->user_ns, CAP_SETGID)) {
92686+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
92687+ goto error;
92688+
92689 if (!gid_eq(kgid, old->fsgid)) {
92690 new->fsgid = kgid;
92691 goto change_okay;
92692 }
92693 }
92694
92695+error:
92696 abort_creds(new);
92697 return old_fsgid;
92698
92699@@ -1172,19 +1227,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
92700 return -EFAULT;
92701
92702 down_read(&uts_sem);
92703- error = __copy_to_user(&name->sysname, &utsname()->sysname,
92704+ error = __copy_to_user(name->sysname, &utsname()->sysname,
92705 __OLD_UTS_LEN);
92706 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
92707- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
92708+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
92709 __OLD_UTS_LEN);
92710 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
92711- error |= __copy_to_user(&name->release, &utsname()->release,
92712+ error |= __copy_to_user(name->release, &utsname()->release,
92713 __OLD_UTS_LEN);
92714 error |= __put_user(0, name->release + __OLD_UTS_LEN);
92715- error |= __copy_to_user(&name->version, &utsname()->version,
92716+ error |= __copy_to_user(name->version, &utsname()->version,
92717 __OLD_UTS_LEN);
92718 error |= __put_user(0, name->version + __OLD_UTS_LEN);
92719- error |= __copy_to_user(&name->machine, &utsname()->machine,
92720+ error |= __copy_to_user(name->machine, &utsname()->machine,
92721 __OLD_UTS_LEN);
92722 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
92723 up_read(&uts_sem);
92724@@ -1385,6 +1440,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
92725 */
92726 new_rlim->rlim_cur = 1;
92727 }
92728+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
92729+ is changed to a lower value. Since tasks can be created by the same
92730+ user in between this limit change and an execve by this task, force
92731+ a recheck only for this task by setting PF_NPROC_EXCEEDED
92732+ */
92733+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
92734+ tsk->flags |= PF_NPROC_EXCEEDED;
92735 }
92736 if (!retval) {
92737 if (old_rlim)
92738diff --git a/kernel/sysctl.c b/kernel/sysctl.c
92739index 15f2511..181b356 100644
92740--- a/kernel/sysctl.c
92741+++ b/kernel/sysctl.c
92742@@ -94,7 +94,6 @@
92743
92744
92745 #if defined(CONFIG_SYSCTL)
92746-
92747 /* External variables not in a header file. */
92748 extern int max_threads;
92749 extern int suid_dumpable;
92750@@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
92751
92752 /* Constants used for minimum and maximum */
92753 #ifdef CONFIG_LOCKUP_DETECTOR
92754-static int sixty = 60;
92755+static int sixty __read_only = 60;
92756 #endif
92757
92758-static int __maybe_unused neg_one = -1;
92759+static int __maybe_unused neg_one __read_only = -1;
92760
92761-static int zero;
92762-static int __maybe_unused one = 1;
92763-static int __maybe_unused two = 2;
92764-static int __maybe_unused four = 4;
92765-static unsigned long one_ul = 1;
92766-static int one_hundred = 100;
92767+static int zero __read_only = 0;
92768+static int __maybe_unused one __read_only = 1;
92769+static int __maybe_unused two __read_only = 2;
92770+static int __maybe_unused three __read_only = 3;
92771+static int __maybe_unused four __read_only = 4;
92772+static unsigned long one_ul __read_only = 1;
92773+static int one_hundred __read_only = 100;
92774 #ifdef CONFIG_PRINTK
92775-static int ten_thousand = 10000;
92776+static int ten_thousand __read_only = 10000;
92777 #endif
92778
92779 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
92780@@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
92781 void __user *buffer, size_t *lenp, loff_t *ppos);
92782 #endif
92783
92784-#ifdef CONFIG_PRINTK
92785 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
92786 void __user *buffer, size_t *lenp, loff_t *ppos);
92787-#endif
92788
92789 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
92790 void __user *buffer, size_t *lenp, loff_t *ppos);
92791@@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
92792
92793 #endif
92794
92795+extern struct ctl_table grsecurity_table[];
92796+
92797 static struct ctl_table kern_table[];
92798 static struct ctl_table vm_table[];
92799 static struct ctl_table fs_table[];
92800@@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
92801 int sysctl_legacy_va_layout;
92802 #endif
92803
92804+#ifdef CONFIG_PAX_SOFTMODE
92805+static struct ctl_table pax_table[] = {
92806+ {
92807+ .procname = "softmode",
92808+ .data = &pax_softmode,
92809+ .maxlen = sizeof(unsigned int),
92810+ .mode = 0600,
92811+ .proc_handler = &proc_dointvec,
92812+ },
92813+
92814+ { }
92815+};
92816+#endif
92817+
92818 /* The default sysctl tables: */
92819
92820 static struct ctl_table sysctl_base_table[] = {
92821@@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
92822 #endif
92823
92824 static struct ctl_table kern_table[] = {
92825+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
92826+ {
92827+ .procname = "grsecurity",
92828+ .mode = 0500,
92829+ .child = grsecurity_table,
92830+ },
92831+#endif
92832+
92833+#ifdef CONFIG_PAX_SOFTMODE
92834+ {
92835+ .procname = "pax",
92836+ .mode = 0500,
92837+ .child = pax_table,
92838+ },
92839+#endif
92840+
92841 {
92842 .procname = "sched_child_runs_first",
92843 .data = &sysctl_sched_child_runs_first,
92844@@ -642,7 +672,7 @@ static struct ctl_table kern_table[] = {
92845 .data = &modprobe_path,
92846 .maxlen = KMOD_PATH_LEN,
92847 .mode = 0644,
92848- .proc_handler = proc_dostring,
92849+ .proc_handler = proc_dostring_modpriv,
92850 },
92851 {
92852 .procname = "modules_disabled",
92853@@ -809,16 +839,20 @@ static struct ctl_table kern_table[] = {
92854 .extra1 = &zero,
92855 .extra2 = &one,
92856 },
92857+#endif
92858 {
92859 .procname = "kptr_restrict",
92860 .data = &kptr_restrict,
92861 .maxlen = sizeof(int),
92862 .mode = 0644,
92863 .proc_handler = proc_dointvec_minmax_sysadmin,
92864+#ifdef CONFIG_GRKERNSEC_HIDESYM
92865+ .extra1 = &two,
92866+#else
92867 .extra1 = &zero,
92868+#endif
92869 .extra2 = &two,
92870 },
92871-#endif
92872 {
92873 .procname = "ngroups_max",
92874 .data = &ngroups_max,
92875@@ -1065,10 +1099,17 @@ static struct ctl_table kern_table[] = {
92876 */
92877 {
92878 .procname = "perf_event_paranoid",
92879- .data = &sysctl_perf_event_paranoid,
92880- .maxlen = sizeof(sysctl_perf_event_paranoid),
92881+ .data = &sysctl_perf_event_legitimately_concerned,
92882+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
92883 .mode = 0644,
92884- .proc_handler = proc_dointvec,
92885+ /* go ahead, be a hero */
92886+ .proc_handler = proc_dointvec_minmax_sysadmin,
92887+ .extra1 = &neg_one,
92888+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
92889+ .extra2 = &three,
92890+#else
92891+ .extra2 = &two,
92892+#endif
92893 },
92894 {
92895 .procname = "perf_event_mlock_kb",
92896@@ -1327,6 +1368,13 @@ static struct ctl_table vm_table[] = {
92897 .proc_handler = proc_dointvec_minmax,
92898 .extra1 = &zero,
92899 },
92900+ {
92901+ .procname = "heap_stack_gap",
92902+ .data = &sysctl_heap_stack_gap,
92903+ .maxlen = sizeof(sysctl_heap_stack_gap),
92904+ .mode = 0644,
92905+ .proc_handler = proc_doulongvec_minmax,
92906+ },
92907 #else
92908 {
92909 .procname = "nr_trim_pages",
92910@@ -1809,6 +1857,16 @@ int proc_dostring(struct ctl_table *table, int write,
92911 (char __user *)buffer, lenp, ppos);
92912 }
92913
92914+int proc_dostring_modpriv(struct ctl_table *table, int write,
92915+ void __user *buffer, size_t *lenp, loff_t *ppos)
92916+{
92917+ if (write && !capable(CAP_SYS_MODULE))
92918+ return -EPERM;
92919+
92920+ return _proc_do_string(table->data, table->maxlen, write,
92921+ buffer, lenp, ppos);
92922+}
92923+
92924 static size_t proc_skip_spaces(char **buf)
92925 {
92926 size_t ret;
92927@@ -1914,6 +1972,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
92928 len = strlen(tmp);
92929 if (len > *size)
92930 len = *size;
92931+ if (len > sizeof(tmp))
92932+ len = sizeof(tmp);
92933 if (copy_to_user(*buf, tmp, len))
92934 return -EFAULT;
92935 *size -= len;
92936@@ -2091,7 +2151,7 @@ int proc_dointvec(struct ctl_table *table, int write,
92937 static int proc_taint(struct ctl_table *table, int write,
92938 void __user *buffer, size_t *lenp, loff_t *ppos)
92939 {
92940- struct ctl_table t;
92941+ ctl_table_no_const t;
92942 unsigned long tmptaint = get_taint();
92943 int err;
92944
92945@@ -2119,7 +2179,6 @@ static int proc_taint(struct ctl_table *table, int write,
92946 return err;
92947 }
92948
92949-#ifdef CONFIG_PRINTK
92950 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
92951 void __user *buffer, size_t *lenp, loff_t *ppos)
92952 {
92953@@ -2128,7 +2187,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
92954
92955 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
92956 }
92957-#endif
92958
92959 struct do_proc_dointvec_minmax_conv_param {
92960 int *min;
92961@@ -2688,6 +2746,12 @@ int proc_dostring(struct ctl_table *table, int write,
92962 return -ENOSYS;
92963 }
92964
92965+int proc_dostring_modpriv(struct ctl_table *table, int write,
92966+ void __user *buffer, size_t *lenp, loff_t *ppos)
92967+{
92968+ return -ENOSYS;
92969+}
92970+
92971 int proc_dointvec(struct ctl_table *table, int write,
92972 void __user *buffer, size_t *lenp, loff_t *ppos)
92973 {
92974@@ -2744,5 +2808,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
92975 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
92976 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
92977 EXPORT_SYMBOL(proc_dostring);
92978+EXPORT_SYMBOL(proc_dostring_modpriv);
92979 EXPORT_SYMBOL(proc_doulongvec_minmax);
92980 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
92981diff --git a/kernel/taskstats.c b/kernel/taskstats.c
92982index b312fcc7..753d72d 100644
92983--- a/kernel/taskstats.c
92984+++ b/kernel/taskstats.c
92985@@ -28,9 +28,12 @@
92986 #include <linux/fs.h>
92987 #include <linux/file.h>
92988 #include <linux/pid_namespace.h>
92989+#include <linux/grsecurity.h>
92990 #include <net/genetlink.h>
92991 #include <linux/atomic.h>
92992
92993+extern int gr_is_taskstats_denied(int pid);
92994+
92995 /*
92996 * Maximum length of a cpumask that can be specified in
92997 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
92998@@ -576,6 +579,9 @@ err:
92999
93000 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
93001 {
93002+ if (gr_is_taskstats_denied(current->pid))
93003+ return -EACCES;
93004+
93005 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
93006 return cmd_attr_register_cpumask(info);
93007 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
93008diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
93009index a7077d3..dd48a49 100644
93010--- a/kernel/time/alarmtimer.c
93011+++ b/kernel/time/alarmtimer.c
93012@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
93013 struct platform_device *pdev;
93014 int error = 0;
93015 int i;
93016- struct k_clock alarm_clock = {
93017+ static struct k_clock alarm_clock = {
93018 .clock_getres = alarm_clock_getres,
93019 .clock_get = alarm_clock_get,
93020 .timer_create = alarm_timer_create,
93021diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
93022index 37e50aa..57a9501 100644
93023--- a/kernel/time/hrtimer.c
93024+++ b/kernel/time/hrtimer.c
93025@@ -1399,7 +1399,7 @@ void hrtimer_peek_ahead_timers(void)
93026 local_irq_restore(flags);
93027 }
93028
93029-static void run_hrtimer_softirq(struct softirq_action *h)
93030+static __latent_entropy void run_hrtimer_softirq(void)
93031 {
93032 hrtimer_peek_ahead_timers();
93033 }
93034diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
93035index a16b678..8c5bd9d 100644
93036--- a/kernel/time/posix-cpu-timers.c
93037+++ b/kernel/time/posix-cpu-timers.c
93038@@ -1450,14 +1450,14 @@ struct k_clock clock_posix_cpu = {
93039
93040 static __init int init_posix_cpu_timers(void)
93041 {
93042- struct k_clock process = {
93043+ static struct k_clock process = {
93044 .clock_getres = process_cpu_clock_getres,
93045 .clock_get = process_cpu_clock_get,
93046 .timer_create = process_cpu_timer_create,
93047 .nsleep = process_cpu_nsleep,
93048 .nsleep_restart = process_cpu_nsleep_restart,
93049 };
93050- struct k_clock thread = {
93051+ static struct k_clock thread = {
93052 .clock_getres = thread_cpu_clock_getres,
93053 .clock_get = thread_cpu_clock_get,
93054 .timer_create = thread_cpu_timer_create,
93055diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
93056index 31ea01f..7fc61ef 100644
93057--- a/kernel/time/posix-timers.c
93058+++ b/kernel/time/posix-timers.c
93059@@ -43,6 +43,7 @@
93060 #include <linux/hash.h>
93061 #include <linux/posix-clock.h>
93062 #include <linux/posix-timers.h>
93063+#include <linux/grsecurity.h>
93064 #include <linux/syscalls.h>
93065 #include <linux/wait.h>
93066 #include <linux/workqueue.h>
93067@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
93068 * which we beg off on and pass to do_sys_settimeofday().
93069 */
93070
93071-static struct k_clock posix_clocks[MAX_CLOCKS];
93072+static struct k_clock *posix_clocks[MAX_CLOCKS];
93073
93074 /*
93075 * These ones are defined below.
93076@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
93077 */
93078 static __init int init_posix_timers(void)
93079 {
93080- struct k_clock clock_realtime = {
93081+ static struct k_clock clock_realtime = {
93082 .clock_getres = hrtimer_get_res,
93083 .clock_get = posix_clock_realtime_get,
93084 .clock_set = posix_clock_realtime_set,
93085@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
93086 .timer_get = common_timer_get,
93087 .timer_del = common_timer_del,
93088 };
93089- struct k_clock clock_monotonic = {
93090+ static struct k_clock clock_monotonic = {
93091 .clock_getres = hrtimer_get_res,
93092 .clock_get = posix_ktime_get_ts,
93093 .nsleep = common_nsleep,
93094@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
93095 .timer_get = common_timer_get,
93096 .timer_del = common_timer_del,
93097 };
93098- struct k_clock clock_monotonic_raw = {
93099+ static struct k_clock clock_monotonic_raw = {
93100 .clock_getres = hrtimer_get_res,
93101 .clock_get = posix_get_monotonic_raw,
93102 };
93103- struct k_clock clock_realtime_coarse = {
93104+ static struct k_clock clock_realtime_coarse = {
93105 .clock_getres = posix_get_coarse_res,
93106 .clock_get = posix_get_realtime_coarse,
93107 };
93108- struct k_clock clock_monotonic_coarse = {
93109+ static struct k_clock clock_monotonic_coarse = {
93110 .clock_getres = posix_get_coarse_res,
93111 .clock_get = posix_get_monotonic_coarse,
93112 };
93113- struct k_clock clock_tai = {
93114+ static struct k_clock clock_tai = {
93115 .clock_getres = hrtimer_get_res,
93116 .clock_get = posix_get_tai,
93117 .nsleep = common_nsleep,
93118@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
93119 .timer_get = common_timer_get,
93120 .timer_del = common_timer_del,
93121 };
93122- struct k_clock clock_boottime = {
93123+ static struct k_clock clock_boottime = {
93124 .clock_getres = hrtimer_get_res,
93125 .clock_get = posix_get_boottime,
93126 .nsleep = common_nsleep,
93127@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
93128 return;
93129 }
93130
93131- posix_clocks[clock_id] = *new_clock;
93132+ posix_clocks[clock_id] = new_clock;
93133 }
93134 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
93135
93136@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
93137 return (id & CLOCKFD_MASK) == CLOCKFD ?
93138 &clock_posix_dynamic : &clock_posix_cpu;
93139
93140- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
93141+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
93142 return NULL;
93143- return &posix_clocks[id];
93144+ return posix_clocks[id];
93145 }
93146
93147 static int common_timer_create(struct k_itimer *new_timer)
93148@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
93149 struct k_clock *kc = clockid_to_kclock(which_clock);
93150 struct k_itimer *new_timer;
93151 int error, new_timer_id;
93152- sigevent_t event;
93153+ sigevent_t event = { };
93154 int it_id_set = IT_ID_NOT_SET;
93155
93156 if (!kc)
93157@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
93158 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
93159 return -EFAULT;
93160
93161+ /* only the CLOCK_REALTIME clock can be set, all other clocks
93162+ have their clock_set fptr set to a nosettime dummy function
93163+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
93164+ call common_clock_set, which calls do_sys_settimeofday, which
93165+ we hook
93166+ */
93167+
93168 return kc->clock_set(which_clock, &new_tp);
93169 }
93170
93171diff --git a/kernel/time/time.c b/kernel/time/time.c
93172index a9ae20f..d3fbde7 100644
93173--- a/kernel/time/time.c
93174+++ b/kernel/time/time.c
93175@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
93176 return error;
93177
93178 if (tz) {
93179+ /* we log in do_settimeofday called below, so don't log twice
93180+ */
93181+ if (!tv)
93182+ gr_log_timechange();
93183+
93184 sys_tz = *tz;
93185 update_vsyscall_tz();
93186 if (firsttime) {
93187diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
93188index ec1791f..6a086cd 100644
93189--- a/kernel/time/timekeeping.c
93190+++ b/kernel/time/timekeeping.c
93191@@ -15,6 +15,7 @@
93192 #include <linux/init.h>
93193 #include <linux/mm.h>
93194 #include <linux/sched.h>
93195+#include <linux/grsecurity.h>
93196 #include <linux/syscore_ops.h>
93197 #include <linux/clocksource.h>
93198 #include <linux/jiffies.h>
93199@@ -717,6 +718,8 @@ int do_settimeofday(const struct timespec *tv)
93200 if (!timespec_valid_strict(tv))
93201 return -EINVAL;
93202
93203+ gr_log_timechange();
93204+
93205 raw_spin_lock_irqsave(&timekeeper_lock, flags);
93206 write_seqcount_begin(&tk_core.seq);
93207
93208diff --git a/kernel/time/timer.c b/kernel/time/timer.c
93209index 3260ffd..c93cd5e 100644
93210--- a/kernel/time/timer.c
93211+++ b/kernel/time/timer.c
93212@@ -1394,7 +1394,7 @@ void update_process_times(int user_tick)
93213 /*
93214 * This function runs timers and the timer-tq in bottom half context.
93215 */
93216-static void run_timer_softirq(struct softirq_action *h)
93217+static __latent_entropy void run_timer_softirq(void)
93218 {
93219 struct tvec_base *base = __this_cpu_read(tvec_bases);
93220
93221@@ -1457,7 +1457,7 @@ static void process_timeout(unsigned long __data)
93222 *
93223 * In all cases the return value is guaranteed to be non-negative.
93224 */
93225-signed long __sched schedule_timeout(signed long timeout)
93226+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
93227 {
93228 struct timer_list timer;
93229 unsigned long expire;
93230diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
93231index 61ed862..3b52c65 100644
93232--- a/kernel/time/timer_list.c
93233+++ b/kernel/time/timer_list.c
93234@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
93235
93236 static void print_name_offset(struct seq_file *m, void *sym)
93237 {
93238+#ifdef CONFIG_GRKERNSEC_HIDESYM
93239+ SEQ_printf(m, "<%p>", NULL);
93240+#else
93241 char symname[KSYM_NAME_LEN];
93242
93243 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
93244 SEQ_printf(m, "<%pK>", sym);
93245 else
93246 SEQ_printf(m, "%s", symname);
93247+#endif
93248 }
93249
93250 static void
93251@@ -119,7 +123,11 @@ next_one:
93252 static void
93253 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
93254 {
93255+#ifdef CONFIG_GRKERNSEC_HIDESYM
93256+ SEQ_printf(m, " .base: %p\n", NULL);
93257+#else
93258 SEQ_printf(m, " .base: %pK\n", base);
93259+#endif
93260 SEQ_printf(m, " .index: %d\n",
93261 base->index);
93262 SEQ_printf(m, " .resolution: %Lu nsecs\n",
93263@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
93264 {
93265 struct proc_dir_entry *pe;
93266
93267+#ifdef CONFIG_GRKERNSEC_PROC_ADD
93268+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
93269+#else
93270 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
93271+#endif
93272 if (!pe)
93273 return -ENOMEM;
93274 return 0;
93275diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
93276index 1fb08f2..ca4bb1e 100644
93277--- a/kernel/time/timer_stats.c
93278+++ b/kernel/time/timer_stats.c
93279@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
93280 static unsigned long nr_entries;
93281 static struct entry entries[MAX_ENTRIES];
93282
93283-static atomic_t overflow_count;
93284+static atomic_unchecked_t overflow_count;
93285
93286 /*
93287 * The entries are in a hash-table, for fast lookup:
93288@@ -140,7 +140,7 @@ static void reset_entries(void)
93289 nr_entries = 0;
93290 memset(entries, 0, sizeof(entries));
93291 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
93292- atomic_set(&overflow_count, 0);
93293+ atomic_set_unchecked(&overflow_count, 0);
93294 }
93295
93296 static struct entry *alloc_entry(void)
93297@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
93298 if (likely(entry))
93299 entry->count++;
93300 else
93301- atomic_inc(&overflow_count);
93302+ atomic_inc_unchecked(&overflow_count);
93303
93304 out_unlock:
93305 raw_spin_unlock_irqrestore(lock, flags);
93306@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
93307
93308 static void print_name_offset(struct seq_file *m, unsigned long addr)
93309 {
93310+#ifdef CONFIG_GRKERNSEC_HIDESYM
93311+ seq_printf(m, "<%p>", NULL);
93312+#else
93313 char symname[KSYM_NAME_LEN];
93314
93315 if (lookup_symbol_name(addr, symname) < 0)
93316- seq_printf(m, "<%p>", (void *)addr);
93317+ seq_printf(m, "<%pK>", (void *)addr);
93318 else
93319 seq_printf(m, "%s", symname);
93320+#endif
93321 }
93322
93323 static int tstats_show(struct seq_file *m, void *v)
93324@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
93325
93326 seq_puts(m, "Timer Stats Version: v0.3\n");
93327 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
93328- if (atomic_read(&overflow_count))
93329- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
93330+ if (atomic_read_unchecked(&overflow_count))
93331+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
93332 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
93333
93334 for (i = 0; i < nr_entries; i++) {
93335@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
93336 {
93337 struct proc_dir_entry *pe;
93338
93339+#ifdef CONFIG_GRKERNSEC_PROC_ADD
93340+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
93341+#else
93342 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
93343+#endif
93344 if (!pe)
93345 return -ENOMEM;
93346 return 0;
93347diff --git a/kernel/torture.c b/kernel/torture.c
93348index dd70993..0bf694b 100644
93349--- a/kernel/torture.c
93350+++ b/kernel/torture.c
93351@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
93352 mutex_lock(&fullstop_mutex);
93353 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
93354 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
93355- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
93356+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
93357 } else {
93358 pr_warn("Concurrent rmmod and shutdown illegal!\n");
93359 }
93360@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
93361 if (!torture_must_stop()) {
93362 if (stutter > 1) {
93363 schedule_timeout_interruptible(stutter - 1);
93364- ACCESS_ONCE(stutter_pause_test) = 2;
93365+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
93366 }
93367 schedule_timeout_interruptible(1);
93368- ACCESS_ONCE(stutter_pause_test) = 1;
93369+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
93370 }
93371 if (!torture_must_stop())
93372 schedule_timeout_interruptible(stutter);
93373- ACCESS_ONCE(stutter_pause_test) = 0;
93374+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
93375 torture_shutdown_absorb("torture_stutter");
93376 } while (!torture_must_stop());
93377 torture_kthread_stopping("torture_stutter");
93378@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
93379 schedule_timeout_uninterruptible(10);
93380 return true;
93381 }
93382- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
93383+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
93384 mutex_unlock(&fullstop_mutex);
93385 torture_shutdown_cleanup();
93386 torture_shuffle_cleanup();
93387diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
93388index c1bd4ad..4b861dc 100644
93389--- a/kernel/trace/blktrace.c
93390+++ b/kernel/trace/blktrace.c
93391@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
93392 struct blk_trace *bt = filp->private_data;
93393 char buf[16];
93394
93395- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
93396+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
93397
93398 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
93399 }
93400@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
93401 return 1;
93402
93403 bt = buf->chan->private_data;
93404- atomic_inc(&bt->dropped);
93405+ atomic_inc_unchecked(&bt->dropped);
93406 return 0;
93407 }
93408
93409@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
93410
93411 bt->dir = dir;
93412 bt->dev = dev;
93413- atomic_set(&bt->dropped, 0);
93414+ atomic_set_unchecked(&bt->dropped, 0);
93415 INIT_LIST_HEAD(&bt->running_list);
93416
93417 ret = -EIO;
93418diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
93419index 31c90fe..051ce98 100644
93420--- a/kernel/trace/ftrace.c
93421+++ b/kernel/trace/ftrace.c
93422@@ -2183,12 +2183,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
93423 if (unlikely(ftrace_disabled))
93424 return 0;
93425
93426+ ret = ftrace_arch_code_modify_prepare();
93427+ FTRACE_WARN_ON(ret);
93428+ if (ret)
93429+ return 0;
93430+
93431 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
93432+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
93433 if (ret) {
93434 ftrace_bug(ret, ip);
93435- return 0;
93436 }
93437- return 1;
93438+ return ret ? 0 : 1;
93439 }
93440
93441 /*
93442@@ -4492,8 +4497,10 @@ static int ftrace_process_locs(struct module *mod,
93443 if (!count)
93444 return 0;
93445
93446+ pax_open_kernel();
93447 sort(start, count, sizeof(*start),
93448 ftrace_cmp_ips, ftrace_swap_ips);
93449+ pax_close_kernel();
93450
93451 start_pg = ftrace_allocate_pages(count);
93452 if (!start_pg)
93453@@ -5340,7 +5347,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
93454
93455 if (t->ret_stack == NULL) {
93456 atomic_set(&t->tracing_graph_pause, 0);
93457- atomic_set(&t->trace_overrun, 0);
93458+ atomic_set_unchecked(&t->trace_overrun, 0);
93459 t->curr_ret_stack = -1;
93460 /* Make sure the tasks see the -1 first: */
93461 smp_wmb();
93462@@ -5553,7 +5560,7 @@ static void
93463 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
93464 {
93465 atomic_set(&t->tracing_graph_pause, 0);
93466- atomic_set(&t->trace_overrun, 0);
93467+ atomic_set_unchecked(&t->trace_overrun, 0);
93468 t->ftrace_timestamp = 0;
93469 /* make curr_ret_stack visible before we add the ret_stack */
93470 smp_wmb();
93471diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
93472index a56e07c..d46f0ba 100644
93473--- a/kernel/trace/ring_buffer.c
93474+++ b/kernel/trace/ring_buffer.c
93475@@ -352,9 +352,9 @@ struct buffer_data_page {
93476 */
93477 struct buffer_page {
93478 struct list_head list; /* list of buffer pages */
93479- local_t write; /* index for next write */
93480+ local_unchecked_t write; /* index for next write */
93481 unsigned read; /* index for next read */
93482- local_t entries; /* entries on this page */
93483+ local_unchecked_t entries; /* entries on this page */
93484 unsigned long real_end; /* real end of data */
93485 struct buffer_data_page *page; /* Actual data page */
93486 };
93487@@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
93488 unsigned long last_overrun;
93489 local_t entries_bytes;
93490 local_t entries;
93491- local_t overrun;
93492- local_t commit_overrun;
93493+ local_unchecked_t overrun;
93494+ local_unchecked_t commit_overrun;
93495 local_t dropped_events;
93496 local_t committing;
93497 local_t commits;
93498@@ -1032,8 +1032,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
93499 *
93500 * We add a counter to the write field to denote this.
93501 */
93502- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
93503- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
93504+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
93505+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
93506
93507 /*
93508 * Just make sure we have seen our old_write and synchronize
93509@@ -1061,8 +1061,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
93510 * cmpxchg to only update if an interrupt did not already
93511 * do it for us. If the cmpxchg fails, we don't care.
93512 */
93513- (void)local_cmpxchg(&next_page->write, old_write, val);
93514- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
93515+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
93516+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
93517
93518 /*
93519 * No need to worry about races with clearing out the commit.
93520@@ -1429,12 +1429,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
93521
93522 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
93523 {
93524- return local_read(&bpage->entries) & RB_WRITE_MASK;
93525+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
93526 }
93527
93528 static inline unsigned long rb_page_write(struct buffer_page *bpage)
93529 {
93530- return local_read(&bpage->write) & RB_WRITE_MASK;
93531+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
93532 }
93533
93534 static int
93535@@ -1529,7 +1529,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
93536 * bytes consumed in ring buffer from here.
93537 * Increment overrun to account for the lost events.
93538 */
93539- local_add(page_entries, &cpu_buffer->overrun);
93540+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
93541 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
93542 }
93543
93544@@ -2091,7 +2091,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
93545 * it is our responsibility to update
93546 * the counters.
93547 */
93548- local_add(entries, &cpu_buffer->overrun);
93549+ local_add_unchecked(entries, &cpu_buffer->overrun);
93550 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
93551
93552 /*
93553@@ -2241,7 +2241,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93554 if (tail == BUF_PAGE_SIZE)
93555 tail_page->real_end = 0;
93556
93557- local_sub(length, &tail_page->write);
93558+ local_sub_unchecked(length, &tail_page->write);
93559 return;
93560 }
93561
93562@@ -2276,7 +2276,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93563 rb_event_set_padding(event);
93564
93565 /* Set the write back to the previous setting */
93566- local_sub(length, &tail_page->write);
93567+ local_sub_unchecked(length, &tail_page->write);
93568 return;
93569 }
93570
93571@@ -2288,7 +2288,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93572
93573 /* Set write to end of buffer */
93574 length = (tail + length) - BUF_PAGE_SIZE;
93575- local_sub(length, &tail_page->write);
93576+ local_sub_unchecked(length, &tail_page->write);
93577 }
93578
93579 /*
93580@@ -2314,7 +2314,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
93581 * about it.
93582 */
93583 if (unlikely(next_page == commit_page)) {
93584- local_inc(&cpu_buffer->commit_overrun);
93585+ local_inc_unchecked(&cpu_buffer->commit_overrun);
93586 goto out_reset;
93587 }
93588
93589@@ -2370,7 +2370,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
93590 cpu_buffer->tail_page) &&
93591 (cpu_buffer->commit_page ==
93592 cpu_buffer->reader_page))) {
93593- local_inc(&cpu_buffer->commit_overrun);
93594+ local_inc_unchecked(&cpu_buffer->commit_overrun);
93595 goto out_reset;
93596 }
93597 }
93598@@ -2418,7 +2418,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
93599 length += RB_LEN_TIME_EXTEND;
93600
93601 tail_page = cpu_buffer->tail_page;
93602- write = local_add_return(length, &tail_page->write);
93603+ write = local_add_return_unchecked(length, &tail_page->write);
93604
93605 /* set write to only the index of the write */
93606 write &= RB_WRITE_MASK;
93607@@ -2442,7 +2442,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
93608 kmemcheck_annotate_bitfield(event, bitfield);
93609 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
93610
93611- local_inc(&tail_page->entries);
93612+ local_inc_unchecked(&tail_page->entries);
93613
93614 /*
93615 * If this is the first commit on the page, then update
93616@@ -2475,7 +2475,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
93617
93618 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
93619 unsigned long write_mask =
93620- local_read(&bpage->write) & ~RB_WRITE_MASK;
93621+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
93622 unsigned long event_length = rb_event_length(event);
93623 /*
93624 * This is on the tail page. It is possible that
93625@@ -2485,7 +2485,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
93626 */
93627 old_index += write_mask;
93628 new_index += write_mask;
93629- index = local_cmpxchg(&bpage->write, old_index, new_index);
93630+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
93631 if (index == old_index) {
93632 /* update counters */
93633 local_sub(event_length, &cpu_buffer->entries_bytes);
93634@@ -2877,7 +2877,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
93635
93636 /* Do the likely case first */
93637 if (likely(bpage->page == (void *)addr)) {
93638- local_dec(&bpage->entries);
93639+ local_dec_unchecked(&bpage->entries);
93640 return;
93641 }
93642
93643@@ -2889,7 +2889,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
93644 start = bpage;
93645 do {
93646 if (bpage->page == (void *)addr) {
93647- local_dec(&bpage->entries);
93648+ local_dec_unchecked(&bpage->entries);
93649 return;
93650 }
93651 rb_inc_page(cpu_buffer, &bpage);
93652@@ -3173,7 +3173,7 @@ static inline unsigned long
93653 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
93654 {
93655 return local_read(&cpu_buffer->entries) -
93656- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
93657+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
93658 }
93659
93660 /**
93661@@ -3262,7 +3262,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
93662 return 0;
93663
93664 cpu_buffer = buffer->buffers[cpu];
93665- ret = local_read(&cpu_buffer->overrun);
93666+ ret = local_read_unchecked(&cpu_buffer->overrun);
93667
93668 return ret;
93669 }
93670@@ -3285,7 +3285,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
93671 return 0;
93672
93673 cpu_buffer = buffer->buffers[cpu];
93674- ret = local_read(&cpu_buffer->commit_overrun);
93675+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
93676
93677 return ret;
93678 }
93679@@ -3370,7 +3370,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
93680 /* if you care about this being correct, lock the buffer */
93681 for_each_buffer_cpu(buffer, cpu) {
93682 cpu_buffer = buffer->buffers[cpu];
93683- overruns += local_read(&cpu_buffer->overrun);
93684+ overruns += local_read_unchecked(&cpu_buffer->overrun);
93685 }
93686
93687 return overruns;
93688@@ -3541,8 +3541,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
93689 /*
93690 * Reset the reader page to size zero.
93691 */
93692- local_set(&cpu_buffer->reader_page->write, 0);
93693- local_set(&cpu_buffer->reader_page->entries, 0);
93694+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
93695+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
93696 local_set(&cpu_buffer->reader_page->page->commit, 0);
93697 cpu_buffer->reader_page->real_end = 0;
93698
93699@@ -3576,7 +3576,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
93700 * want to compare with the last_overrun.
93701 */
93702 smp_mb();
93703- overwrite = local_read(&(cpu_buffer->overrun));
93704+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
93705
93706 /*
93707 * Here's the tricky part.
93708@@ -4148,8 +4148,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
93709
93710 cpu_buffer->head_page
93711 = list_entry(cpu_buffer->pages, struct buffer_page, list);
93712- local_set(&cpu_buffer->head_page->write, 0);
93713- local_set(&cpu_buffer->head_page->entries, 0);
93714+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
93715+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
93716 local_set(&cpu_buffer->head_page->page->commit, 0);
93717
93718 cpu_buffer->head_page->read = 0;
93719@@ -4159,14 +4159,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
93720
93721 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
93722 INIT_LIST_HEAD(&cpu_buffer->new_pages);
93723- local_set(&cpu_buffer->reader_page->write, 0);
93724- local_set(&cpu_buffer->reader_page->entries, 0);
93725+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
93726+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
93727 local_set(&cpu_buffer->reader_page->page->commit, 0);
93728 cpu_buffer->reader_page->read = 0;
93729
93730 local_set(&cpu_buffer->entries_bytes, 0);
93731- local_set(&cpu_buffer->overrun, 0);
93732- local_set(&cpu_buffer->commit_overrun, 0);
93733+ local_set_unchecked(&cpu_buffer->overrun, 0);
93734+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
93735 local_set(&cpu_buffer->dropped_events, 0);
93736 local_set(&cpu_buffer->entries, 0);
93737 local_set(&cpu_buffer->committing, 0);
93738@@ -4571,8 +4571,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
93739 rb_init_page(bpage);
93740 bpage = reader->page;
93741 reader->page = *data_page;
93742- local_set(&reader->write, 0);
93743- local_set(&reader->entries, 0);
93744+ local_set_unchecked(&reader->write, 0);
93745+ local_set_unchecked(&reader->entries, 0);
93746 reader->read = 0;
93747 *data_page = bpage;
93748
93749diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
93750index 426962b..e8e2d9a 100644
93751--- a/kernel/trace/trace.c
93752+++ b/kernel/trace/trace.c
93753@@ -3488,7 +3488,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
93754 return 0;
93755 }
93756
93757-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
93758+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
93759 {
93760 /* do nothing if flag is already set */
93761 if (!!(trace_flags & mask) == !!enabled)
93762diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
93763index 385391f..8d2250f 100644
93764--- a/kernel/trace/trace.h
93765+++ b/kernel/trace/trace.h
93766@@ -1280,7 +1280,7 @@ extern const char *__stop___tracepoint_str[];
93767 void trace_printk_init_buffers(void);
93768 void trace_printk_start_comm(void);
93769 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
93770-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
93771+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
93772
93773 /*
93774 * Normal trace_printk() and friends allocates special buffers
93775diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
93776index 57b67b1..66082a9 100644
93777--- a/kernel/trace/trace_clock.c
93778+++ b/kernel/trace/trace_clock.c
93779@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
93780 return now;
93781 }
93782
93783-static atomic64_t trace_counter;
93784+static atomic64_unchecked_t trace_counter;
93785
93786 /*
93787 * trace_clock_counter(): simply an atomic counter.
93788@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
93789 */
93790 u64 notrace trace_clock_counter(void)
93791 {
93792- return atomic64_add_return(1, &trace_counter);
93793+ return atomic64_inc_return_unchecked(&trace_counter);
93794 }
93795diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
93796index 1b0df1e..4ebb965 100644
93797--- a/kernel/trace/trace_events.c
93798+++ b/kernel/trace/trace_events.c
93799@@ -1720,7 +1720,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
93800 return 0;
93801 }
93802
93803-struct ftrace_module_file_ops;
93804 static void __add_event_to_tracers(struct ftrace_event_call *call);
93805
93806 /* Add an additional event_call dynamically */
93807diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
93808index f0a0c98..3692dc8 100644
93809--- a/kernel/trace/trace_functions_graph.c
93810+++ b/kernel/trace/trace_functions_graph.c
93811@@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
93812
93813 /* The return trace stack is full */
93814 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
93815- atomic_inc(&current->trace_overrun);
93816+ atomic_inc_unchecked(&current->trace_overrun);
93817 return -EBUSY;
93818 }
93819
93820@@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
93821 *ret = current->ret_stack[index].ret;
93822 trace->func = current->ret_stack[index].func;
93823 trace->calltime = current->ret_stack[index].calltime;
93824- trace->overrun = atomic_read(&current->trace_overrun);
93825+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
93826 trace->depth = index;
93827 }
93828
93829diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
93830index 0abd9b8..6a663a2 100644
93831--- a/kernel/trace/trace_mmiotrace.c
93832+++ b/kernel/trace/trace_mmiotrace.c
93833@@ -24,7 +24,7 @@ struct header_iter {
93834 static struct trace_array *mmio_trace_array;
93835 static bool overrun_detected;
93836 static unsigned long prev_overruns;
93837-static atomic_t dropped_count;
93838+static atomic_unchecked_t dropped_count;
93839
93840 static void mmio_reset_data(struct trace_array *tr)
93841 {
93842@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
93843
93844 static unsigned long count_overruns(struct trace_iterator *iter)
93845 {
93846- unsigned long cnt = atomic_xchg(&dropped_count, 0);
93847+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
93848 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
93849
93850 if (over > prev_overruns)
93851@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
93852 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
93853 sizeof(*entry), 0, pc);
93854 if (!event) {
93855- atomic_inc(&dropped_count);
93856+ atomic_inc_unchecked(&dropped_count);
93857 return;
93858 }
93859 entry = ring_buffer_event_data(event);
93860@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
93861 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
93862 sizeof(*entry), 0, pc);
93863 if (!event) {
93864- atomic_inc(&dropped_count);
93865+ atomic_inc_unchecked(&dropped_count);
93866 return;
93867 }
93868 entry = ring_buffer_event_data(event);
93869diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
93870index c6977d5..d243785 100644
93871--- a/kernel/trace/trace_output.c
93872+++ b/kernel/trace/trace_output.c
93873@@ -712,14 +712,16 @@ int register_ftrace_event(struct trace_event *event)
93874 goto out;
93875 }
93876
93877+ pax_open_kernel();
93878 if (event->funcs->trace == NULL)
93879- event->funcs->trace = trace_nop_print;
93880+ *(void **)&event->funcs->trace = trace_nop_print;
93881 if (event->funcs->raw == NULL)
93882- event->funcs->raw = trace_nop_print;
93883+ *(void **)&event->funcs->raw = trace_nop_print;
93884 if (event->funcs->hex == NULL)
93885- event->funcs->hex = trace_nop_print;
93886+ *(void **)&event->funcs->hex = trace_nop_print;
93887 if (event->funcs->binary == NULL)
93888- event->funcs->binary = trace_nop_print;
93889+ *(void **)&event->funcs->binary = trace_nop_print;
93890+ pax_close_kernel();
93891
93892 key = event->type & (EVENT_HASHSIZE - 1);
93893
93894diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
93895index 1f24ed9..10407ec 100644
93896--- a/kernel/trace/trace_seq.c
93897+++ b/kernel/trace/trace_seq.c
93898@@ -367,7 +367,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
93899
93900 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
93901 if (!IS_ERR(p)) {
93902- p = mangle_path(s->buffer + s->len, p, "\n");
93903+ p = mangle_path(s->buffer + s->len, p, "\n\\");
93904 if (p) {
93905 s->len = p - s->buffer;
93906 return 1;
93907diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
93908index 16eddb3..758b308 100644
93909--- a/kernel/trace/trace_stack.c
93910+++ b/kernel/trace/trace_stack.c
93911@@ -90,7 +90,7 @@ check_stack(unsigned long ip, unsigned long *stack)
93912 return;
93913
93914 /* we do not handle interrupt stacks yet */
93915- if (!object_is_on_stack(stack))
93916+ if (!object_starts_on_stack(stack))
93917 return;
93918
93919 local_irq_save(flags);
93920diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
93921index 29228c4..301bc8c 100644
93922--- a/kernel/trace/trace_syscalls.c
93923+++ b/kernel/trace/trace_syscalls.c
93924@@ -602,6 +602,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
93925 int num;
93926
93927 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93928+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93929+ return -EINVAL;
93930
93931 mutex_lock(&syscall_trace_lock);
93932 if (!sys_perf_refcount_enter)
93933@@ -622,6 +624,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
93934 int num;
93935
93936 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93937+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93938+ return;
93939
93940 mutex_lock(&syscall_trace_lock);
93941 sys_perf_refcount_enter--;
93942@@ -674,6 +678,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
93943 int num;
93944
93945 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93946+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93947+ return -EINVAL;
93948
93949 mutex_lock(&syscall_trace_lock);
93950 if (!sys_perf_refcount_exit)
93951@@ -694,6 +700,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
93952 int num;
93953
93954 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93955+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93956+ return;
93957
93958 mutex_lock(&syscall_trace_lock);
93959 sys_perf_refcount_exit--;
93960diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
93961index a2e37c5..4fa859b 100644
93962--- a/kernel/user_namespace.c
93963+++ b/kernel/user_namespace.c
93964@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
93965 !kgid_has_mapping(parent_ns, group))
93966 return -EPERM;
93967
93968+#ifdef CONFIG_GRKERNSEC
93969+ /*
93970+ * This doesn't really inspire confidence:
93971+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
93972+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
93973+ * Increases kernel attack surface in areas developers
93974+ * previously cared little about ("low importance due
93975+ * to requiring "root" capability")
93976+ * To be removed when this code receives *proper* review
93977+ */
93978+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
93979+ !capable(CAP_SETGID))
93980+ return -EPERM;
93981+#endif
93982+
93983 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
93984 if (!ns)
93985 return -ENOMEM;
93986@@ -974,7 +989,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
93987 if (atomic_read(&current->mm->mm_users) > 1)
93988 return -EINVAL;
93989
93990- if (current->fs->users != 1)
93991+ if (atomic_read(&current->fs->users) != 1)
93992 return -EINVAL;
93993
93994 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
93995diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
93996index c8eac43..4b5f08f 100644
93997--- a/kernel/utsname_sysctl.c
93998+++ b/kernel/utsname_sysctl.c
93999@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
94000 static int proc_do_uts_string(struct ctl_table *table, int write,
94001 void __user *buffer, size_t *lenp, loff_t *ppos)
94002 {
94003- struct ctl_table uts_table;
94004+ ctl_table_no_const uts_table;
94005 int r;
94006 memcpy(&uts_table, table, sizeof(uts_table));
94007 uts_table.data = get_uts(table, write);
94008diff --git a/kernel/watchdog.c b/kernel/watchdog.c
94009index 70bf118..4be3c37 100644
94010--- a/kernel/watchdog.c
94011+++ b/kernel/watchdog.c
94012@@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
94013 static void watchdog_nmi_disable(unsigned int cpu) { return; }
94014 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
94015
94016-static struct smp_hotplug_thread watchdog_threads = {
94017+static struct smp_hotplug_thread watchdog_threads __read_only = {
94018 .store = &softlockup_watchdog,
94019 .thread_should_run = watchdog_should_run,
94020 .thread_fn = watchdog,
94021diff --git a/kernel/workqueue.c b/kernel/workqueue.c
94022index 09b685d..d3565e3 100644
94023--- a/kernel/workqueue.c
94024+++ b/kernel/workqueue.c
94025@@ -4508,7 +4508,7 @@ static void rebind_workers(struct worker_pool *pool)
94026 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
94027 worker_flags |= WORKER_REBOUND;
94028 worker_flags &= ~WORKER_UNBOUND;
94029- ACCESS_ONCE(worker->flags) = worker_flags;
94030+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
94031 }
94032
94033 spin_unlock_irq(&pool->lock);
94034diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
94035index 4e35a5d..8a1f3f0 100644
94036--- a/lib/Kconfig.debug
94037+++ b/lib/Kconfig.debug
94038@@ -894,7 +894,7 @@ config DEBUG_MUTEXES
94039
94040 config DEBUG_WW_MUTEX_SLOWPATH
94041 bool "Wait/wound mutex debugging: Slowpath testing"
94042- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94043+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94044 select DEBUG_LOCK_ALLOC
94045 select DEBUG_SPINLOCK
94046 select DEBUG_MUTEXES
94047@@ -911,7 +911,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
94048
94049 config DEBUG_LOCK_ALLOC
94050 bool "Lock debugging: detect incorrect freeing of live locks"
94051- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94052+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94053 select DEBUG_SPINLOCK
94054 select DEBUG_MUTEXES
94055 select LOCKDEP
94056@@ -925,7 +925,7 @@ config DEBUG_LOCK_ALLOC
94057
94058 config PROVE_LOCKING
94059 bool "Lock debugging: prove locking correctness"
94060- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94061+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94062 select LOCKDEP
94063 select DEBUG_SPINLOCK
94064 select DEBUG_MUTEXES
94065@@ -976,7 +976,7 @@ config LOCKDEP
94066
94067 config LOCK_STAT
94068 bool "Lock usage statistics"
94069- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
94070+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
94071 select LOCKDEP
94072 select DEBUG_SPINLOCK
94073 select DEBUG_MUTEXES
94074@@ -1449,6 +1449,7 @@ config LATENCYTOP
94075 depends on DEBUG_KERNEL
94076 depends on STACKTRACE_SUPPORT
94077 depends on PROC_FS
94078+ depends on !GRKERNSEC_HIDESYM
94079 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
94080 select KALLSYMS
94081 select KALLSYMS_ALL
94082@@ -1465,7 +1466,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
94083 config DEBUG_STRICT_USER_COPY_CHECKS
94084 bool "Strict user copy size checks"
94085 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
94086- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
94087+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
94088 help
94089 Enabling this option turns a certain set of sanity checks for user
94090 copy operations into compile time failures.
94091@@ -1593,7 +1594,7 @@ endmenu # runtime tests
94092
94093 config PROVIDE_OHCI1394_DMA_INIT
94094 bool "Remote debugging over FireWire early on boot"
94095- depends on PCI && X86
94096+ depends on PCI && X86 && !GRKERNSEC
94097 help
94098 If you want to debug problems which hang or crash the kernel early
94099 on boot and the crashing machine has a FireWire port, you can use
94100diff --git a/lib/Makefile b/lib/Makefile
94101index 0211d2b..93f5cc3 100644
94102--- a/lib/Makefile
94103+++ b/lib/Makefile
94104@@ -55,7 +55,7 @@ obj-$(CONFIG_BTREE) += btree.o
94105 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
94106 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
94107 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
94108-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
94109+obj-y += list_debug.o
94110 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
94111
94112 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
94113diff --git a/lib/average.c b/lib/average.c
94114index 114d1be..ab0350c 100644
94115--- a/lib/average.c
94116+++ b/lib/average.c
94117@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
94118 {
94119 unsigned long internal = ACCESS_ONCE(avg->internal);
94120
94121- ACCESS_ONCE(avg->internal) = internal ?
94122+ ACCESS_ONCE_RW(avg->internal) = internal ?
94123 (((internal << avg->weight) - internal) +
94124 (val << avg->factor)) >> avg->weight :
94125 (val << avg->factor);
94126diff --git a/lib/bitmap.c b/lib/bitmap.c
94127index b499ab6..fbdb76c 100644
94128--- a/lib/bitmap.c
94129+++ b/lib/bitmap.c
94130@@ -433,7 +433,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
94131 {
94132 int c, old_c, totaldigits, ndigits, nchunks, nbits;
94133 u32 chunk;
94134- const char __user __force *ubuf = (const char __user __force *)buf;
94135+ const char __user *ubuf = (const char __force_user *)buf;
94136
94137 bitmap_zero(maskp, nmaskbits);
94138
94139@@ -518,7 +518,7 @@ int bitmap_parse_user(const char __user *ubuf,
94140 {
94141 if (!access_ok(VERIFY_READ, ubuf, ulen))
94142 return -EFAULT;
94143- return __bitmap_parse((const char __force *)ubuf,
94144+ return __bitmap_parse((const char __force_kernel *)ubuf,
94145 ulen, 1, maskp, nmaskbits);
94146
94147 }
94148@@ -609,7 +609,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
94149 {
94150 unsigned a, b;
94151 int c, old_c, totaldigits;
94152- const char __user __force *ubuf = (const char __user __force *)buf;
94153+ const char __user *ubuf = (const char __force_user *)buf;
94154 int exp_digit, in_range;
94155
94156 totaldigits = c = 0;
94157@@ -704,7 +704,7 @@ int bitmap_parselist_user(const char __user *ubuf,
94158 {
94159 if (!access_ok(VERIFY_READ, ubuf, ulen))
94160 return -EFAULT;
94161- return __bitmap_parselist((const char __force *)ubuf,
94162+ return __bitmap_parselist((const char __force_kernel *)ubuf,
94163 ulen, 1, maskp, nmaskbits);
94164 }
94165 EXPORT_SYMBOL(bitmap_parselist_user);
94166diff --git a/lib/bug.c b/lib/bug.c
94167index d1d7c78..b354235 100644
94168--- a/lib/bug.c
94169+++ b/lib/bug.c
94170@@ -137,6 +137,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
94171 return BUG_TRAP_TYPE_NONE;
94172
94173 bug = find_bug(bugaddr);
94174+ if (!bug)
94175+ return BUG_TRAP_TYPE_NONE;
94176
94177 file = NULL;
94178 line = 0;
94179diff --git a/lib/debugobjects.c b/lib/debugobjects.c
94180index 547f7f9..a6d4ba0 100644
94181--- a/lib/debugobjects.c
94182+++ b/lib/debugobjects.c
94183@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
94184 if (limit > 4)
94185 return;
94186
94187- is_on_stack = object_is_on_stack(addr);
94188+ is_on_stack = object_starts_on_stack(addr);
94189 if (is_on_stack == onstack)
94190 return;
94191
94192diff --git a/lib/div64.c b/lib/div64.c
94193index 4382ad7..08aa558 100644
94194--- a/lib/div64.c
94195+++ b/lib/div64.c
94196@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
94197 EXPORT_SYMBOL(__div64_32);
94198
94199 #ifndef div_s64_rem
94200-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
94201+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
94202 {
94203 u64 quotient;
94204
94205@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
94206 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
94207 */
94208 #ifndef div64_u64
94209-u64 div64_u64(u64 dividend, u64 divisor)
94210+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
94211 {
94212 u32 high = divisor >> 32;
94213 u64 quot;
94214diff --git a/lib/dma-debug.c b/lib/dma-debug.c
94215index add80cc..0d27550 100644
94216--- a/lib/dma-debug.c
94217+++ b/lib/dma-debug.c
94218@@ -971,7 +971,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
94219
94220 void dma_debug_add_bus(struct bus_type *bus)
94221 {
94222- struct notifier_block *nb;
94223+ notifier_block_no_const *nb;
94224
94225 if (global_disable)
94226 return;
94227@@ -1148,7 +1148,7 @@ static void check_unmap(struct dma_debug_entry *ref)
94228
94229 static void check_for_stack(struct device *dev, void *addr)
94230 {
94231- if (object_is_on_stack(addr))
94232+ if (object_starts_on_stack(addr))
94233 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
94234 "stack [addr=%p]\n", addr);
94235 }
94236diff --git a/lib/hash.c b/lib/hash.c
94237index fea973f..386626f 100644
94238--- a/lib/hash.c
94239+++ b/lib/hash.c
94240@@ -14,7 +14,7 @@
94241 #include <linux/hash.h>
94242 #include <linux/cache.h>
94243
94244-static struct fast_hash_ops arch_hash_ops __read_mostly = {
94245+static struct fast_hash_ops arch_hash_ops __read_only = {
94246 .hash = jhash,
94247 .hash2 = jhash2,
94248 };
94249diff --git a/lib/inflate.c b/lib/inflate.c
94250index 013a761..c28f3fc 100644
94251--- a/lib/inflate.c
94252+++ b/lib/inflate.c
94253@@ -269,7 +269,7 @@ static void free(void *where)
94254 malloc_ptr = free_mem_ptr;
94255 }
94256 #else
94257-#define malloc(a) kmalloc(a, GFP_KERNEL)
94258+#define malloc(a) kmalloc((a), GFP_KERNEL)
94259 #define free(a) kfree(a)
94260 #endif
94261
94262diff --git a/lib/ioremap.c b/lib/ioremap.c
94263index 0c9216c..863bd89 100644
94264--- a/lib/ioremap.c
94265+++ b/lib/ioremap.c
94266@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
94267 unsigned long next;
94268
94269 phys_addr -= addr;
94270- pmd = pmd_alloc(&init_mm, pud, addr);
94271+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
94272 if (!pmd)
94273 return -ENOMEM;
94274 do {
94275@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
94276 unsigned long next;
94277
94278 phys_addr -= addr;
94279- pud = pud_alloc(&init_mm, pgd, addr);
94280+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
94281 if (!pud)
94282 return -ENOMEM;
94283 do {
94284diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
94285index bd2bea9..6b3c95e 100644
94286--- a/lib/is_single_threaded.c
94287+++ b/lib/is_single_threaded.c
94288@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
94289 struct task_struct *p, *t;
94290 bool ret;
94291
94292+ if (!mm)
94293+ return true;
94294+
94295 if (atomic_read(&task->signal->live) != 1)
94296 return false;
94297
94298diff --git a/lib/kobject.c b/lib/kobject.c
94299index 58751bb..93a1853 100644
94300--- a/lib/kobject.c
94301+++ b/lib/kobject.c
94302@@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
94303
94304
94305 static DEFINE_SPINLOCK(kobj_ns_type_lock);
94306-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
94307+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
94308
94309-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
94310+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
94311 {
94312 enum kobj_ns_type type = ops->type;
94313 int error;
94314diff --git a/lib/list_debug.c b/lib/list_debug.c
94315index c24c2f7..f0296f4 100644
94316--- a/lib/list_debug.c
94317+++ b/lib/list_debug.c
94318@@ -11,7 +11,9 @@
94319 #include <linux/bug.h>
94320 #include <linux/kernel.h>
94321 #include <linux/rculist.h>
94322+#include <linux/mm.h>
94323
94324+#ifdef CONFIG_DEBUG_LIST
94325 /*
94326 * Insert a new entry between two known consecutive entries.
94327 *
94328@@ -19,21 +21,40 @@
94329 * the prev/next entries already!
94330 */
94331
94332+static bool __list_add_debug(struct list_head *new,
94333+ struct list_head *prev,
94334+ struct list_head *next)
94335+{
94336+ if (unlikely(next->prev != prev)) {
94337+ printk(KERN_ERR "list_add corruption. next->prev should be "
94338+ "prev (%p), but was %p. (next=%p).\n",
94339+ prev, next->prev, next);
94340+ BUG();
94341+ return false;
94342+ }
94343+ if (unlikely(prev->next != next)) {
94344+ printk(KERN_ERR "list_add corruption. prev->next should be "
94345+ "next (%p), but was %p. (prev=%p).\n",
94346+ next, prev->next, prev);
94347+ BUG();
94348+ return false;
94349+ }
94350+ if (unlikely(new == prev || new == next)) {
94351+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
94352+ new, prev, next);
94353+ BUG();
94354+ return false;
94355+ }
94356+ return true;
94357+}
94358+
94359 void __list_add(struct list_head *new,
94360- struct list_head *prev,
94361- struct list_head *next)
94362+ struct list_head *prev,
94363+ struct list_head *next)
94364 {
94365- WARN(next->prev != prev,
94366- "list_add corruption. next->prev should be "
94367- "prev (%p), but was %p. (next=%p).\n",
94368- prev, next->prev, next);
94369- WARN(prev->next != next,
94370- "list_add corruption. prev->next should be "
94371- "next (%p), but was %p. (prev=%p).\n",
94372- next, prev->next, prev);
94373- WARN(new == prev || new == next,
94374- "list_add double add: new=%p, prev=%p, next=%p.\n",
94375- new, prev, next);
94376+ if (!__list_add_debug(new, prev, next))
94377+ return;
94378+
94379 next->prev = new;
94380 new->next = next;
94381 new->prev = prev;
94382@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
94383 }
94384 EXPORT_SYMBOL(__list_add);
94385
94386-void __list_del_entry(struct list_head *entry)
94387+static bool __list_del_entry_debug(struct list_head *entry)
94388 {
94389 struct list_head *prev, *next;
94390
94391 prev = entry->prev;
94392 next = entry->next;
94393
94394- if (WARN(next == LIST_POISON1,
94395- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
94396- entry, LIST_POISON1) ||
94397- WARN(prev == LIST_POISON2,
94398- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
94399- entry, LIST_POISON2) ||
94400- WARN(prev->next != entry,
94401- "list_del corruption. prev->next should be %p, "
94402- "but was %p\n", entry, prev->next) ||
94403- WARN(next->prev != entry,
94404- "list_del corruption. next->prev should be %p, "
94405- "but was %p\n", entry, next->prev))
94406+ if (unlikely(next == LIST_POISON1)) {
94407+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
94408+ entry, LIST_POISON1);
94409+ BUG();
94410+ return false;
94411+ }
94412+ if (unlikely(prev == LIST_POISON2)) {
94413+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
94414+ entry, LIST_POISON2);
94415+ BUG();
94416+ return false;
94417+ }
94418+ if (unlikely(entry->prev->next != entry)) {
94419+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
94420+ "but was %p\n", entry, prev->next);
94421+ BUG();
94422+ return false;
94423+ }
94424+ if (unlikely(entry->next->prev != entry)) {
94425+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
94426+ "but was %p\n", entry, next->prev);
94427+ BUG();
94428+ return false;
94429+ }
94430+ return true;
94431+}
94432+
94433+void __list_del_entry(struct list_head *entry)
94434+{
94435+ if (!__list_del_entry_debug(entry))
94436 return;
94437
94438- __list_del(prev, next);
94439+ __list_del(entry->prev, entry->next);
94440 }
94441 EXPORT_SYMBOL(__list_del_entry);
94442
94443@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
94444 void __list_add_rcu(struct list_head *new,
94445 struct list_head *prev, struct list_head *next)
94446 {
94447- WARN(next->prev != prev,
94448- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
94449- prev, next->prev, next);
94450- WARN(prev->next != next,
94451- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
94452- next, prev->next, prev);
94453+ if (!__list_add_debug(new, prev, next))
94454+ return;
94455+
94456 new->next = next;
94457 new->prev = prev;
94458 rcu_assign_pointer(list_next_rcu(prev), new);
94459 next->prev = new;
94460 }
94461 EXPORT_SYMBOL(__list_add_rcu);
94462+#endif
94463+
94464+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
94465+{
94466+#ifdef CONFIG_DEBUG_LIST
94467+ if (!__list_add_debug(new, prev, next))
94468+ return;
94469+#endif
94470+
94471+ pax_open_kernel();
94472+ next->prev = new;
94473+ new->next = next;
94474+ new->prev = prev;
94475+ prev->next = new;
94476+ pax_close_kernel();
94477+}
94478+EXPORT_SYMBOL(__pax_list_add);
94479+
94480+void pax_list_del(struct list_head *entry)
94481+{
94482+#ifdef CONFIG_DEBUG_LIST
94483+ if (!__list_del_entry_debug(entry))
94484+ return;
94485+#endif
94486+
94487+ pax_open_kernel();
94488+ __list_del(entry->prev, entry->next);
94489+ entry->next = LIST_POISON1;
94490+ entry->prev = LIST_POISON2;
94491+ pax_close_kernel();
94492+}
94493+EXPORT_SYMBOL(pax_list_del);
94494+
94495+void pax_list_del_init(struct list_head *entry)
94496+{
94497+ pax_open_kernel();
94498+ __list_del(entry->prev, entry->next);
94499+ INIT_LIST_HEAD(entry);
94500+ pax_close_kernel();
94501+}
94502+EXPORT_SYMBOL(pax_list_del_init);
94503+
94504+void __pax_list_add_rcu(struct list_head *new,
94505+ struct list_head *prev, struct list_head *next)
94506+{
94507+#ifdef CONFIG_DEBUG_LIST
94508+ if (!__list_add_debug(new, prev, next))
94509+ return;
94510+#endif
94511+
94512+ pax_open_kernel();
94513+ new->next = next;
94514+ new->prev = prev;
94515+ rcu_assign_pointer(list_next_rcu(prev), new);
94516+ next->prev = new;
94517+ pax_close_kernel();
94518+}
94519+EXPORT_SYMBOL(__pax_list_add_rcu);
94520+
94521+void pax_list_del_rcu(struct list_head *entry)
94522+{
94523+#ifdef CONFIG_DEBUG_LIST
94524+ if (!__list_del_entry_debug(entry))
94525+ return;
94526+#endif
94527+
94528+ pax_open_kernel();
94529+ __list_del(entry->prev, entry->next);
94530+ entry->next = LIST_POISON1;
94531+ entry->prev = LIST_POISON2;
94532+ pax_close_kernel();
94533+}
94534+EXPORT_SYMBOL(pax_list_del_rcu);
94535diff --git a/lib/lockref.c b/lib/lockref.c
94536index d2233de..fa1a2f6 100644
94537--- a/lib/lockref.c
94538+++ b/lib/lockref.c
94539@@ -48,13 +48,13 @@
94540 void lockref_get(struct lockref *lockref)
94541 {
94542 CMPXCHG_LOOP(
94543- new.count++;
94544+ __lockref_inc(&new);
94545 ,
94546 return;
94547 );
94548
94549 spin_lock(&lockref->lock);
94550- lockref->count++;
94551+ __lockref_inc(lockref);
94552 spin_unlock(&lockref->lock);
94553 }
94554 EXPORT_SYMBOL(lockref_get);
94555@@ -69,7 +69,7 @@ int lockref_get_not_zero(struct lockref *lockref)
94556 int retval;
94557
94558 CMPXCHG_LOOP(
94559- new.count++;
94560+ __lockref_inc(&new);
94561 if (!old.count)
94562 return 0;
94563 ,
94564@@ -79,7 +79,7 @@ int lockref_get_not_zero(struct lockref *lockref)
94565 spin_lock(&lockref->lock);
94566 retval = 0;
94567 if (lockref->count) {
94568- lockref->count++;
94569+ __lockref_inc(lockref);
94570 retval = 1;
94571 }
94572 spin_unlock(&lockref->lock);
94573@@ -96,7 +96,7 @@ EXPORT_SYMBOL(lockref_get_not_zero);
94574 int lockref_get_or_lock(struct lockref *lockref)
94575 {
94576 CMPXCHG_LOOP(
94577- new.count++;
94578+ __lockref_inc(&new);
94579 if (!old.count)
94580 break;
94581 ,
94582@@ -106,7 +106,7 @@ int lockref_get_or_lock(struct lockref *lockref)
94583 spin_lock(&lockref->lock);
94584 if (!lockref->count)
94585 return 0;
94586- lockref->count++;
94587+ __lockref_inc(lockref);
94588 spin_unlock(&lockref->lock);
94589 return 1;
94590 }
94591@@ -120,7 +120,7 @@ EXPORT_SYMBOL(lockref_get_or_lock);
94592 int lockref_put_or_lock(struct lockref *lockref)
94593 {
94594 CMPXCHG_LOOP(
94595- new.count--;
94596+ __lockref_dec(&new);
94597 if (old.count <= 1)
94598 break;
94599 ,
94600@@ -130,7 +130,7 @@ int lockref_put_or_lock(struct lockref *lockref)
94601 spin_lock(&lockref->lock);
94602 if (lockref->count <= 1)
94603 return 0;
94604- lockref->count--;
94605+ __lockref_dec(lockref);
94606 spin_unlock(&lockref->lock);
94607 return 1;
94608 }
94609@@ -157,7 +157,7 @@ int lockref_get_not_dead(struct lockref *lockref)
94610 int retval;
94611
94612 CMPXCHG_LOOP(
94613- new.count++;
94614+ __lockref_inc(&new);
94615 if ((int)old.count < 0)
94616 return 0;
94617 ,
94618@@ -167,7 +167,7 @@ int lockref_get_not_dead(struct lockref *lockref)
94619 spin_lock(&lockref->lock);
94620 retval = 0;
94621 if ((int) lockref->count >= 0) {
94622- lockref->count++;
94623+ __lockref_inc(lockref);
94624 retval = 1;
94625 }
94626 spin_unlock(&lockref->lock);
94627diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
94628index 6111bcb..02e816b 100644
94629--- a/lib/percpu-refcount.c
94630+++ b/lib/percpu-refcount.c
94631@@ -31,7 +31,7 @@
94632 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
94633 */
94634
94635-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
94636+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
94637
94638 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
94639
94640diff --git a/lib/radix-tree.c b/lib/radix-tree.c
94641index 3291a8e..346a91e 100644
94642--- a/lib/radix-tree.c
94643+++ b/lib/radix-tree.c
94644@@ -67,7 +67,7 @@ struct radix_tree_preload {
94645 int nr;
94646 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
94647 };
94648-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
94649+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
94650
94651 static inline void *ptr_to_indirect(void *ptr)
94652 {
94653diff --git a/lib/random32.c b/lib/random32.c
94654index 0bee183..526f12f 100644
94655--- a/lib/random32.c
94656+++ b/lib/random32.c
94657@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
94658 }
94659 #endif
94660
94661-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
94662+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
94663
94664 /**
94665 * prandom_u32_state - seeded pseudo-random number generator.
94666diff --git a/lib/rbtree.c b/lib/rbtree.c
94667index c16c81a..4dcbda1 100644
94668--- a/lib/rbtree.c
94669+++ b/lib/rbtree.c
94670@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
94671 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
94672
94673 static const struct rb_augment_callbacks dummy_callbacks = {
94674- dummy_propagate, dummy_copy, dummy_rotate
94675+ .propagate = dummy_propagate,
94676+ .copy = dummy_copy,
94677+ .rotate = dummy_rotate
94678 };
94679
94680 void rb_insert_color(struct rb_node *node, struct rb_root *root)
94681diff --git a/lib/show_mem.c b/lib/show_mem.c
94682index 5e25627..3ed9d7f 100644
94683--- a/lib/show_mem.c
94684+++ b/lib/show_mem.c
94685@@ -44,6 +44,6 @@ void show_mem(unsigned int filter)
94686 quicklist_total_size());
94687 #endif
94688 #ifdef CONFIG_MEMORY_FAILURE
94689- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
94690+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
94691 #endif
94692 }
94693diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
94694index bb2b201..46abaf9 100644
94695--- a/lib/strncpy_from_user.c
94696+++ b/lib/strncpy_from_user.c
94697@@ -21,7 +21,7 @@
94698 */
94699 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
94700 {
94701- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94702+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94703 long res = 0;
94704
94705 /*
94706diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
94707index a28df52..3d55877 100644
94708--- a/lib/strnlen_user.c
94709+++ b/lib/strnlen_user.c
94710@@ -26,7 +26,7 @@
94711 */
94712 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
94713 {
94714- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94715+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94716 long align, res = 0;
94717 unsigned long c;
94718
94719diff --git a/lib/swiotlb.c b/lib/swiotlb.c
94720index 4abda07..b9d3765 100644
94721--- a/lib/swiotlb.c
94722+++ b/lib/swiotlb.c
94723@@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
94724
94725 void
94726 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
94727- dma_addr_t dev_addr)
94728+ dma_addr_t dev_addr, struct dma_attrs *attrs)
94729 {
94730 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
94731
94732diff --git a/lib/usercopy.c b/lib/usercopy.c
94733index 4f5b1dd..7cab418 100644
94734--- a/lib/usercopy.c
94735+++ b/lib/usercopy.c
94736@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
94737 WARN(1, "Buffer overflow detected!\n");
94738 }
94739 EXPORT_SYMBOL(copy_from_user_overflow);
94740+
94741+void copy_to_user_overflow(void)
94742+{
94743+ WARN(1, "Buffer overflow detected!\n");
94744+}
94745+EXPORT_SYMBOL(copy_to_user_overflow);
94746diff --git a/lib/vsprintf.c b/lib/vsprintf.c
94747index ec337f6..8484eb2 100644
94748--- a/lib/vsprintf.c
94749+++ b/lib/vsprintf.c
94750@@ -16,6 +16,9 @@
94751 * - scnprintf and vscnprintf
94752 */
94753
94754+#ifdef CONFIG_GRKERNSEC_HIDESYM
94755+#define __INCLUDED_BY_HIDESYM 1
94756+#endif
94757 #include <stdarg.h>
94758 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
94759 #include <linux/types.h>
94760@@ -625,7 +628,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
94761 #ifdef CONFIG_KALLSYMS
94762 if (*fmt == 'B')
94763 sprint_backtrace(sym, value);
94764- else if (*fmt != 'f' && *fmt != 's')
94765+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
94766 sprint_symbol(sym, value);
94767 else
94768 sprint_symbol_no_offset(sym, value);
94769@@ -1240,7 +1243,11 @@ char *address_val(char *buf, char *end, const void *addr,
94770 return number(buf, end, num, spec);
94771 }
94772
94773+#ifdef CONFIG_GRKERNSEC_HIDESYM
94774+int kptr_restrict __read_mostly = 2;
94775+#else
94776 int kptr_restrict __read_mostly;
94777+#endif
94778
94779 /*
94780 * Show a '%p' thing. A kernel extension is that the '%p' is followed
94781@@ -1251,8 +1258,10 @@ int kptr_restrict __read_mostly;
94782 *
94783 * - 'F' For symbolic function descriptor pointers with offset
94784 * - 'f' For simple symbolic function names without offset
94785+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
94786 * - 'S' For symbolic direct pointers with offset
94787 * - 's' For symbolic direct pointers without offset
94788+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
94789 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
94790 * - 'B' For backtraced symbolic direct pointers with offset
94791 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
94792@@ -1331,12 +1340,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94793
94794 if (!ptr && *fmt != 'K') {
94795 /*
94796- * Print (null) with the same width as a pointer so it makes
94797+ * Print (nil) with the same width as a pointer so it makes
94798 * tabular output look nice.
94799 */
94800 if (spec.field_width == -1)
94801 spec.field_width = default_width;
94802- return string(buf, end, "(null)", spec);
94803+ return string(buf, end, "(nil)", spec);
94804 }
94805
94806 switch (*fmt) {
94807@@ -1346,6 +1355,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94808 /* Fallthrough */
94809 case 'S':
94810 case 's':
94811+#ifdef CONFIG_GRKERNSEC_HIDESYM
94812+ break;
94813+#else
94814+ return symbol_string(buf, end, ptr, spec, fmt);
94815+#endif
94816+ case 'X':
94817+ ptr = dereference_function_descriptor(ptr);
94818+ case 'A':
94819 case 'B':
94820 return symbol_string(buf, end, ptr, spec, fmt);
94821 case 'R':
94822@@ -1403,6 +1420,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94823 va_end(va);
94824 return buf;
94825 }
94826+ case 'P':
94827+ break;
94828 case 'K':
94829 /*
94830 * %pK cannot be used in IRQ context because its test
94831@@ -1460,6 +1479,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94832 ((const struct file *)ptr)->f_path.dentry,
94833 spec, fmt);
94834 }
94835+
94836+#ifdef CONFIG_GRKERNSEC_HIDESYM
94837+ /* 'P' = approved pointers to copy to userland,
94838+ as in the /proc/kallsyms case, as we make it display nothing
94839+ for non-root users, and the real contents for root users
94840+ 'X' = approved simple symbols
94841+ Also ignore 'K' pointers, since we force their NULLing for non-root users
94842+ above
94843+ */
94844+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
94845+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
94846+ dump_stack();
94847+ ptr = NULL;
94848+ }
94849+#endif
94850+
94851 spec.flags |= SMALL;
94852 if (spec.field_width == -1) {
94853 spec.field_width = default_width;
94854@@ -2160,11 +2195,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
94855 typeof(type) value; \
94856 if (sizeof(type) == 8) { \
94857 args = PTR_ALIGN(args, sizeof(u32)); \
94858- *(u32 *)&value = *(u32 *)args; \
94859- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
94860+ *(u32 *)&value = *(const u32 *)args; \
94861+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
94862 } else { \
94863 args = PTR_ALIGN(args, sizeof(type)); \
94864- value = *(typeof(type) *)args; \
94865+ value = *(const typeof(type) *)args; \
94866 } \
94867 args += sizeof(type); \
94868 value; \
94869@@ -2227,7 +2262,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
94870 case FORMAT_TYPE_STR: {
94871 const char *str_arg = args;
94872 args += strlen(str_arg) + 1;
94873- str = string(str, end, (char *)str_arg, spec);
94874+ str = string(str, end, str_arg, spec);
94875 break;
94876 }
94877
94878diff --git a/localversion-grsec b/localversion-grsec
94879new file mode 100644
94880index 0000000..7cd6065
94881--- /dev/null
94882+++ b/localversion-grsec
94883@@ -0,0 +1 @@
94884+-grsec
94885diff --git a/mm/Kconfig b/mm/Kconfig
94886index 1d1ae6b..0f05885 100644
94887--- a/mm/Kconfig
94888+++ b/mm/Kconfig
94889@@ -341,10 +341,11 @@ config KSM
94890 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
94891
94892 config DEFAULT_MMAP_MIN_ADDR
94893- int "Low address space to protect from user allocation"
94894+ int "Low address space to protect from user allocation"
94895 depends on MMU
94896- default 4096
94897- help
94898+ default 32768 if ALPHA || ARM || PARISC || SPARC32
94899+ default 65536
94900+ help
94901 This is the portion of low virtual memory which should be protected
94902 from userspace allocation. Keeping a user from writing to low pages
94903 can help reduce the impact of kernel NULL pointer bugs.
94904@@ -375,7 +376,7 @@ config MEMORY_FAILURE
94905
94906 config HWPOISON_INJECT
94907 tristate "HWPoison pages injector"
94908- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
94909+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
94910 select PROC_PAGE_MONITOR
94911
94912 config NOMMU_INITIAL_TRIM_EXCESS
94913diff --git a/mm/backing-dev.c b/mm/backing-dev.c
94914index 0ae0df5..82ac56b 100644
94915--- a/mm/backing-dev.c
94916+++ b/mm/backing-dev.c
94917@@ -12,7 +12,7 @@
94918 #include <linux/device.h>
94919 #include <trace/events/writeback.h>
94920
94921-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
94922+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
94923
94924 struct backing_dev_info default_backing_dev_info = {
94925 .name = "default",
94926@@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
94927 return err;
94928
94929 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
94930- atomic_long_inc_return(&bdi_seq));
94931+ atomic_long_inc_return_unchecked(&bdi_seq));
94932 if (err) {
94933 bdi_destroy(bdi);
94934 return err;
94935diff --git a/mm/filemap.c b/mm/filemap.c
94936index 14b4642..d71ba82 100644
94937--- a/mm/filemap.c
94938+++ b/mm/filemap.c
94939@@ -2101,7 +2101,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
94940 struct address_space *mapping = file->f_mapping;
94941
94942 if (!mapping->a_ops->readpage)
94943- return -ENOEXEC;
94944+ return -ENODEV;
94945 file_accessed(file);
94946 vma->vm_ops = &generic_file_vm_ops;
94947 return 0;
94948@@ -2279,6 +2279,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
94949 *pos = i_size_read(inode);
94950
94951 if (limit != RLIM_INFINITY) {
94952+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
94953 if (*pos >= limit) {
94954 send_sig(SIGXFSZ, current, 0);
94955 return -EFBIG;
94956diff --git a/mm/fremap.c b/mm/fremap.c
94957index 72b8fa3..c5b39f1 100644
94958--- a/mm/fremap.c
94959+++ b/mm/fremap.c
94960@@ -180,6 +180,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
94961 retry:
94962 vma = find_vma(mm, start);
94963
94964+#ifdef CONFIG_PAX_SEGMEXEC
94965+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
94966+ goto out;
94967+#endif
94968+
94969 /*
94970 * Make sure the vma is shared, that it supports prefaulting,
94971 * and that the remapped range is valid and fully within
94972diff --git a/mm/gup.c b/mm/gup.c
94973index cd62c8c..3bb2053 100644
94974--- a/mm/gup.c
94975+++ b/mm/gup.c
94976@@ -274,11 +274,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
94977 unsigned int fault_flags = 0;
94978 int ret;
94979
94980- /* For mlock, just skip the stack guard page. */
94981- if ((*flags & FOLL_MLOCK) &&
94982- (stack_guard_page_start(vma, address) ||
94983- stack_guard_page_end(vma, address + PAGE_SIZE)))
94984- return -ENOENT;
94985 if (*flags & FOLL_WRITE)
94986 fault_flags |= FAULT_FLAG_WRITE;
94987 if (nonblocking)
94988@@ -444,14 +439,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
94989 if (!(gup_flags & FOLL_FORCE))
94990 gup_flags |= FOLL_NUMA;
94991
94992- do {
94993+ while (nr_pages) {
94994 struct page *page;
94995 unsigned int foll_flags = gup_flags;
94996 unsigned int page_increm;
94997
94998 /* first iteration or cross vma bound */
94999 if (!vma || start >= vma->vm_end) {
95000- vma = find_extend_vma(mm, start);
95001+ vma = find_vma(mm, start);
95002 if (!vma && in_gate_area(mm, start)) {
95003 int ret;
95004 ret = get_gate_page(mm, start & PAGE_MASK,
95005@@ -463,7 +458,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
95006 goto next_page;
95007 }
95008
95009- if (!vma || check_vma_flags(vma, gup_flags))
95010+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
95011 return i ? : -EFAULT;
95012 if (is_vm_hugetlb_page(vma)) {
95013 i = follow_hugetlb_page(mm, vma, pages, vmas,
95014@@ -518,7 +513,7 @@ next_page:
95015 i += page_increm;
95016 start += page_increm * PAGE_SIZE;
95017 nr_pages -= page_increm;
95018- } while (nr_pages);
95019+ }
95020 return i;
95021 }
95022 EXPORT_SYMBOL(__get_user_pages);
95023diff --git a/mm/highmem.c b/mm/highmem.c
95024index 123bcd3..0de52ba 100644
95025--- a/mm/highmem.c
95026+++ b/mm/highmem.c
95027@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
95028 * So no dangers, even with speculative execution.
95029 */
95030 page = pte_page(pkmap_page_table[i]);
95031+ pax_open_kernel();
95032 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
95033-
95034+ pax_close_kernel();
95035 set_page_address(page, NULL);
95036 need_flush = 1;
95037 }
95038@@ -259,9 +260,11 @@ start:
95039 }
95040 }
95041 vaddr = PKMAP_ADDR(last_pkmap_nr);
95042+
95043+ pax_open_kernel();
95044 set_pte_at(&init_mm, vaddr,
95045 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
95046-
95047+ pax_close_kernel();
95048 pkmap_count[last_pkmap_nr] = 1;
95049 set_page_address(page, (void *)vaddr);
95050
95051diff --git a/mm/hugetlb.c b/mm/hugetlb.c
95052index 9fd7227..5628939 100644
95053--- a/mm/hugetlb.c
95054+++ b/mm/hugetlb.c
95055@@ -2258,6 +2258,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
95056 struct ctl_table *table, int write,
95057 void __user *buffer, size_t *length, loff_t *ppos)
95058 {
95059+ ctl_table_no_const t;
95060 struct hstate *h = &default_hstate;
95061 unsigned long tmp = h->max_huge_pages;
95062 int ret;
95063@@ -2265,9 +2266,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
95064 if (!hugepages_supported())
95065 return -ENOTSUPP;
95066
95067- table->data = &tmp;
95068- table->maxlen = sizeof(unsigned long);
95069- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
95070+ t = *table;
95071+ t.data = &tmp;
95072+ t.maxlen = sizeof(unsigned long);
95073+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
95074 if (ret)
95075 goto out;
95076
95077@@ -2302,6 +2304,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
95078 struct hstate *h = &default_hstate;
95079 unsigned long tmp;
95080 int ret;
95081+ ctl_table_no_const hugetlb_table;
95082
95083 if (!hugepages_supported())
95084 return -ENOTSUPP;
95085@@ -2311,9 +2314,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
95086 if (write && hstate_is_gigantic(h))
95087 return -EINVAL;
95088
95089- table->data = &tmp;
95090- table->maxlen = sizeof(unsigned long);
95091- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
95092+ hugetlb_table = *table;
95093+ hugetlb_table.data = &tmp;
95094+ hugetlb_table.maxlen = sizeof(unsigned long);
95095+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
95096 if (ret)
95097 goto out;
95098
95099@@ -2792,6 +2796,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
95100 mutex_unlock(&mapping->i_mmap_mutex);
95101 }
95102
95103+#ifdef CONFIG_PAX_SEGMEXEC
95104+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
95105+{
95106+ struct mm_struct *mm = vma->vm_mm;
95107+ struct vm_area_struct *vma_m;
95108+ unsigned long address_m;
95109+ pte_t *ptep_m;
95110+
95111+ vma_m = pax_find_mirror_vma(vma);
95112+ if (!vma_m)
95113+ return;
95114+
95115+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95116+ address_m = address + SEGMEXEC_TASK_SIZE;
95117+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
95118+ get_page(page_m);
95119+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
95120+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
95121+}
95122+#endif
95123+
95124 /*
95125 * Hugetlb_cow() should be called with page lock of the original hugepage held.
95126 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
95127@@ -2903,6 +2928,11 @@ retry_avoidcopy:
95128 make_huge_pte(vma, new_page, 1));
95129 page_remove_rmap(old_page);
95130 hugepage_add_new_anon_rmap(new_page, vma, address);
95131+
95132+#ifdef CONFIG_PAX_SEGMEXEC
95133+ pax_mirror_huge_pte(vma, address, new_page);
95134+#endif
95135+
95136 /* Make the old page be freed below */
95137 new_page = old_page;
95138 }
95139@@ -3063,6 +3093,10 @@ retry:
95140 && (vma->vm_flags & VM_SHARED)));
95141 set_huge_pte_at(mm, address, ptep, new_pte);
95142
95143+#ifdef CONFIG_PAX_SEGMEXEC
95144+ pax_mirror_huge_pte(vma, address, page);
95145+#endif
95146+
95147 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
95148 /* Optimization, do the COW without a second fault */
95149 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
95150@@ -3129,6 +3163,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95151 struct hstate *h = hstate_vma(vma);
95152 struct address_space *mapping;
95153
95154+#ifdef CONFIG_PAX_SEGMEXEC
95155+ struct vm_area_struct *vma_m;
95156+#endif
95157+
95158 address &= huge_page_mask(h);
95159
95160 ptep = huge_pte_offset(mm, address);
95161@@ -3142,6 +3180,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95162 VM_FAULT_SET_HINDEX(hstate_index(h));
95163 }
95164
95165+#ifdef CONFIG_PAX_SEGMEXEC
95166+ vma_m = pax_find_mirror_vma(vma);
95167+ if (vma_m) {
95168+ unsigned long address_m;
95169+
95170+ if (vma->vm_start > vma_m->vm_start) {
95171+ address_m = address;
95172+ address -= SEGMEXEC_TASK_SIZE;
95173+ vma = vma_m;
95174+ h = hstate_vma(vma);
95175+ } else
95176+ address_m = address + SEGMEXEC_TASK_SIZE;
95177+
95178+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
95179+ return VM_FAULT_OOM;
95180+ address_m &= HPAGE_MASK;
95181+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
95182+ }
95183+#endif
95184+
95185 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
95186 if (!ptep)
95187 return VM_FAULT_OOM;
95188diff --git a/mm/internal.h b/mm/internal.h
95189index a4f90ba..fbdc32b 100644
95190--- a/mm/internal.h
95191+++ b/mm/internal.h
95192@@ -134,6 +134,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
95193
95194 extern int __isolate_free_page(struct page *page, unsigned int order);
95195 extern void __free_pages_bootmem(struct page *page, unsigned int order);
95196+extern void free_compound_page(struct page *page);
95197 extern void prep_compound_page(struct page *page, unsigned long order);
95198 #ifdef CONFIG_MEMORY_FAILURE
95199 extern bool is_free_buddy_page(struct page *page);
95200@@ -390,7 +391,7 @@ extern u32 hwpoison_filter_enable;
95201
95202 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
95203 unsigned long, unsigned long,
95204- unsigned long, unsigned long);
95205+ unsigned long, unsigned long) __intentional_overflow(-1);
95206
95207 extern void set_pageblock_order(void);
95208 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
95209diff --git a/mm/iov_iter.c b/mm/iov_iter.c
95210index e34a3cb..a810efe 100644
95211--- a/mm/iov_iter.c
95212+++ b/mm/iov_iter.c
95213@@ -307,7 +307,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
95214
95215 while (bytes) {
95216 char __user *buf = iov->iov_base + base;
95217- int copy = min(bytes, iov->iov_len - base);
95218+ size_t copy = min(bytes, iov->iov_len - base);
95219
95220 base = 0;
95221 left = __copy_from_user_inatomic(vaddr, buf, copy);
95222@@ -335,7 +335,7 @@ static size_t copy_from_user_atomic_iovec(struct page *page,
95223
95224 kaddr = kmap_atomic(page);
95225 if (likely(i->nr_segs == 1)) {
95226- int left;
95227+ size_t left;
95228 char __user *buf = i->iov->iov_base + i->iov_offset;
95229 left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
95230 copied = bytes - left;
95231@@ -365,7 +365,7 @@ static void advance_iovec(struct iov_iter *i, size_t bytes)
95232 * zero-length segments (without overruning the iovec).
95233 */
95234 while (bytes || unlikely(i->count && !iov->iov_len)) {
95235- int copy;
95236+ size_t copy;
95237
95238 copy = min(bytes, iov->iov_len - base);
95239 BUG_ON(!i->count || i->count < copy);
95240diff --git a/mm/kmemleak.c b/mm/kmemleak.c
95241index 3cda50c..032ba634 100644
95242--- a/mm/kmemleak.c
95243+++ b/mm/kmemleak.c
95244@@ -364,7 +364,7 @@ static void print_unreferenced(struct seq_file *seq,
95245
95246 for (i = 0; i < object->trace_len; i++) {
95247 void *ptr = (void *)object->trace[i];
95248- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
95249+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
95250 }
95251 }
95252
95253@@ -1905,7 +1905,7 @@ static int __init kmemleak_late_init(void)
95254 return -ENOMEM;
95255 }
95256
95257- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
95258+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
95259 &kmemleak_fops);
95260 if (!dentry)
95261 pr_warning("Failed to create the debugfs kmemleak file\n");
95262diff --git a/mm/maccess.c b/mm/maccess.c
95263index d53adf9..03a24bf 100644
95264--- a/mm/maccess.c
95265+++ b/mm/maccess.c
95266@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
95267 set_fs(KERNEL_DS);
95268 pagefault_disable();
95269 ret = __copy_from_user_inatomic(dst,
95270- (__force const void __user *)src, size);
95271+ (const void __force_user *)src, size);
95272 pagefault_enable();
95273 set_fs(old_fs);
95274
95275@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
95276
95277 set_fs(KERNEL_DS);
95278 pagefault_disable();
95279- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
95280+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
95281 pagefault_enable();
95282 set_fs(old_fs);
95283
95284diff --git a/mm/madvise.c b/mm/madvise.c
95285index 0938b30..199abe8 100644
95286--- a/mm/madvise.c
95287+++ b/mm/madvise.c
95288@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
95289 pgoff_t pgoff;
95290 unsigned long new_flags = vma->vm_flags;
95291
95292+#ifdef CONFIG_PAX_SEGMEXEC
95293+ struct vm_area_struct *vma_m;
95294+#endif
95295+
95296 switch (behavior) {
95297 case MADV_NORMAL:
95298 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
95299@@ -126,6 +130,13 @@ success:
95300 /*
95301 * vm_flags is protected by the mmap_sem held in write mode.
95302 */
95303+
95304+#ifdef CONFIG_PAX_SEGMEXEC
95305+ vma_m = pax_find_mirror_vma(vma);
95306+ if (vma_m)
95307+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
95308+#endif
95309+
95310 vma->vm_flags = new_flags;
95311
95312 out:
95313@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
95314 struct vm_area_struct **prev,
95315 unsigned long start, unsigned long end)
95316 {
95317+
95318+#ifdef CONFIG_PAX_SEGMEXEC
95319+ struct vm_area_struct *vma_m;
95320+#endif
95321+
95322 *prev = vma;
95323 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
95324 return -EINVAL;
95325@@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
95326 zap_page_range(vma, start, end - start, &details);
95327 } else
95328 zap_page_range(vma, start, end - start, NULL);
95329+
95330+#ifdef CONFIG_PAX_SEGMEXEC
95331+ vma_m = pax_find_mirror_vma(vma);
95332+ if (vma_m) {
95333+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
95334+ struct zap_details details = {
95335+ .nonlinear_vma = vma_m,
95336+ .last_index = ULONG_MAX,
95337+ };
95338+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
95339+ } else
95340+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
95341+ }
95342+#endif
95343+
95344 return 0;
95345 }
95346
95347@@ -488,6 +519,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
95348 if (end < start)
95349 return error;
95350
95351+#ifdef CONFIG_PAX_SEGMEXEC
95352+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
95353+ if (end > SEGMEXEC_TASK_SIZE)
95354+ return error;
95355+ } else
95356+#endif
95357+
95358+ if (end > TASK_SIZE)
95359+ return error;
95360+
95361 error = 0;
95362 if (end == start)
95363 return error;
95364diff --git a/mm/memory-failure.c b/mm/memory-failure.c
95365index 8639f6b..b623882a 100644
95366--- a/mm/memory-failure.c
95367+++ b/mm/memory-failure.c
95368@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
95369
95370 int sysctl_memory_failure_recovery __read_mostly = 1;
95371
95372-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
95373+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
95374
95375 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
95376
95377@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
95378 pfn, t->comm, t->pid);
95379 si.si_signo = SIGBUS;
95380 si.si_errno = 0;
95381- si.si_addr = (void *)addr;
95382+ si.si_addr = (void __user *)addr;
95383 #ifdef __ARCH_SI_TRAPNO
95384 si.si_trapno = trapno;
95385 #endif
95386@@ -791,7 +791,7 @@ static struct page_state {
95387 unsigned long res;
95388 char *msg;
95389 int (*action)(struct page *p, unsigned long pfn);
95390-} error_states[] = {
95391+} __do_const error_states[] = {
95392 { reserved, reserved, "reserved kernel", me_kernel },
95393 /*
95394 * free pages are specially detected outside this table:
95395@@ -1099,7 +1099,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95396 nr_pages = 1 << compound_order(hpage);
95397 else /* normal page or thp */
95398 nr_pages = 1;
95399- atomic_long_add(nr_pages, &num_poisoned_pages);
95400+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
95401
95402 /*
95403 * We need/can do nothing about count=0 pages.
95404@@ -1128,7 +1128,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95405 if (PageHWPoison(hpage)) {
95406 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
95407 || (p != hpage && TestSetPageHWPoison(hpage))) {
95408- atomic_long_sub(nr_pages, &num_poisoned_pages);
95409+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95410 unlock_page(hpage);
95411 return 0;
95412 }
95413@@ -1196,14 +1196,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95414 */
95415 if (!PageHWPoison(p)) {
95416 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
95417- atomic_long_sub(nr_pages, &num_poisoned_pages);
95418+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95419 put_page(hpage);
95420 res = 0;
95421 goto out;
95422 }
95423 if (hwpoison_filter(p)) {
95424 if (TestClearPageHWPoison(p))
95425- atomic_long_sub(nr_pages, &num_poisoned_pages);
95426+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95427 unlock_page(hpage);
95428 put_page(hpage);
95429 return 0;
95430@@ -1433,7 +1433,7 @@ int unpoison_memory(unsigned long pfn)
95431 return 0;
95432 }
95433 if (TestClearPageHWPoison(p))
95434- atomic_long_dec(&num_poisoned_pages);
95435+ atomic_long_dec_unchecked(&num_poisoned_pages);
95436 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
95437 return 0;
95438 }
95439@@ -1447,7 +1447,7 @@ int unpoison_memory(unsigned long pfn)
95440 */
95441 if (TestClearPageHWPoison(page)) {
95442 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
95443- atomic_long_sub(nr_pages, &num_poisoned_pages);
95444+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95445 freeit = 1;
95446 if (PageHuge(page))
95447 clear_page_hwpoison_huge_page(page);
95448@@ -1572,11 +1572,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
95449 if (PageHuge(page)) {
95450 set_page_hwpoison_huge_page(hpage);
95451 dequeue_hwpoisoned_huge_page(hpage);
95452- atomic_long_add(1 << compound_order(hpage),
95453+ atomic_long_add_unchecked(1 << compound_order(hpage),
95454 &num_poisoned_pages);
95455 } else {
95456 SetPageHWPoison(page);
95457- atomic_long_inc(&num_poisoned_pages);
95458+ atomic_long_inc_unchecked(&num_poisoned_pages);
95459 }
95460 }
95461 return ret;
95462@@ -1615,7 +1615,7 @@ static int __soft_offline_page(struct page *page, int flags)
95463 put_page(page);
95464 pr_info("soft_offline: %#lx: invalidated\n", pfn);
95465 SetPageHWPoison(page);
95466- atomic_long_inc(&num_poisoned_pages);
95467+ atomic_long_inc_unchecked(&num_poisoned_pages);
95468 return 0;
95469 }
95470
95471@@ -1666,7 +1666,7 @@ static int __soft_offline_page(struct page *page, int flags)
95472 if (!is_free_buddy_page(page))
95473 pr_info("soft offline: %#lx: page leaked\n",
95474 pfn);
95475- atomic_long_inc(&num_poisoned_pages);
95476+ atomic_long_inc_unchecked(&num_poisoned_pages);
95477 }
95478 } else {
95479 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
95480@@ -1736,11 +1736,11 @@ int soft_offline_page(struct page *page, int flags)
95481 if (PageHuge(page)) {
95482 set_page_hwpoison_huge_page(hpage);
95483 dequeue_hwpoisoned_huge_page(hpage);
95484- atomic_long_add(1 << compound_order(hpage),
95485+ atomic_long_add_unchecked(1 << compound_order(hpage),
95486 &num_poisoned_pages);
95487 } else {
95488 SetPageHWPoison(page);
95489- atomic_long_inc(&num_poisoned_pages);
95490+ atomic_long_inc_unchecked(&num_poisoned_pages);
95491 }
95492 }
95493 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
95494diff --git a/mm/memory.c b/mm/memory.c
95495index d5f2ae9..4d678b2 100644
95496--- a/mm/memory.c
95497+++ b/mm/memory.c
95498@@ -415,6 +415,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
95499 free_pte_range(tlb, pmd, addr);
95500 } while (pmd++, addr = next, addr != end);
95501
95502+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
95503 start &= PUD_MASK;
95504 if (start < floor)
95505 return;
95506@@ -429,6 +430,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
95507 pmd = pmd_offset(pud, start);
95508 pud_clear(pud);
95509 pmd_free_tlb(tlb, pmd, start);
95510+#endif
95511+
95512 }
95513
95514 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95515@@ -448,6 +451,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95516 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
95517 } while (pud++, addr = next, addr != end);
95518
95519+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
95520 start &= PGDIR_MASK;
95521 if (start < floor)
95522 return;
95523@@ -462,6 +466,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95524 pud = pud_offset(pgd, start);
95525 pgd_clear(pgd);
95526 pud_free_tlb(tlb, pud, start);
95527+#endif
95528+
95529 }
95530
95531 /*
95532@@ -691,10 +697,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
95533 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
95534 */
95535 if (vma->vm_ops)
95536- printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
95537+ printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
95538 vma->vm_ops->fault);
95539 if (vma->vm_file)
95540- printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
95541+ printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
95542 vma->vm_file->f_op->mmap);
95543 dump_stack();
95544 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
95545@@ -1501,6 +1507,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
95546 page_add_file_rmap(page);
95547 set_pte_at(mm, addr, pte, mk_pte(page, prot));
95548
95549+#ifdef CONFIG_PAX_SEGMEXEC
95550+ pax_mirror_file_pte(vma, addr, page, ptl);
95551+#endif
95552+
95553 retval = 0;
95554 pte_unmap_unlock(pte, ptl);
95555 return retval;
95556@@ -1545,9 +1555,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
95557 if (!page_count(page))
95558 return -EINVAL;
95559 if (!(vma->vm_flags & VM_MIXEDMAP)) {
95560+
95561+#ifdef CONFIG_PAX_SEGMEXEC
95562+ struct vm_area_struct *vma_m;
95563+#endif
95564+
95565 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
95566 BUG_ON(vma->vm_flags & VM_PFNMAP);
95567 vma->vm_flags |= VM_MIXEDMAP;
95568+
95569+#ifdef CONFIG_PAX_SEGMEXEC
95570+ vma_m = pax_find_mirror_vma(vma);
95571+ if (vma_m)
95572+ vma_m->vm_flags |= VM_MIXEDMAP;
95573+#endif
95574+
95575 }
95576 return insert_page(vma, addr, page, vma->vm_page_prot);
95577 }
95578@@ -1630,6 +1652,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
95579 unsigned long pfn)
95580 {
95581 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
95582+ BUG_ON(vma->vm_mirror);
95583
95584 if (addr < vma->vm_start || addr >= vma->vm_end)
95585 return -EFAULT;
95586@@ -1877,7 +1900,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
95587
95588 BUG_ON(pud_huge(*pud));
95589
95590- pmd = pmd_alloc(mm, pud, addr);
95591+ pmd = (mm == &init_mm) ?
95592+ pmd_alloc_kernel(mm, pud, addr) :
95593+ pmd_alloc(mm, pud, addr);
95594 if (!pmd)
95595 return -ENOMEM;
95596 do {
95597@@ -1897,7 +1922,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
95598 unsigned long next;
95599 int err;
95600
95601- pud = pud_alloc(mm, pgd, addr);
95602+ pud = (mm == &init_mm) ?
95603+ pud_alloc_kernel(mm, pgd, addr) :
95604+ pud_alloc(mm, pgd, addr);
95605 if (!pud)
95606 return -ENOMEM;
95607 do {
95608@@ -2019,6 +2046,186 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
95609 return ret;
95610 }
95611
95612+#ifdef CONFIG_PAX_SEGMEXEC
95613+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
95614+{
95615+ struct mm_struct *mm = vma->vm_mm;
95616+ spinlock_t *ptl;
95617+ pte_t *pte, entry;
95618+
95619+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
95620+ entry = *pte;
95621+ if (!pte_present(entry)) {
95622+ if (!pte_none(entry)) {
95623+ BUG_ON(pte_file(entry));
95624+ free_swap_and_cache(pte_to_swp_entry(entry));
95625+ pte_clear_not_present_full(mm, address, pte, 0);
95626+ }
95627+ } else {
95628+ struct page *page;
95629+
95630+ flush_cache_page(vma, address, pte_pfn(entry));
95631+ entry = ptep_clear_flush(vma, address, pte);
95632+ BUG_ON(pte_dirty(entry));
95633+ page = vm_normal_page(vma, address, entry);
95634+ if (page) {
95635+ update_hiwater_rss(mm);
95636+ if (PageAnon(page))
95637+ dec_mm_counter_fast(mm, MM_ANONPAGES);
95638+ else
95639+ dec_mm_counter_fast(mm, MM_FILEPAGES);
95640+ page_remove_rmap(page);
95641+ page_cache_release(page);
95642+ }
95643+ }
95644+ pte_unmap_unlock(pte, ptl);
95645+}
95646+
95647+/* PaX: if vma is mirrored, synchronize the mirror's PTE
95648+ *
95649+ * the ptl of the lower mapped page is held on entry and is not released on exit
95650+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
95651+ */
95652+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
95653+{
95654+ struct mm_struct *mm = vma->vm_mm;
95655+ unsigned long address_m;
95656+ spinlock_t *ptl_m;
95657+ struct vm_area_struct *vma_m;
95658+ pmd_t *pmd_m;
95659+ pte_t *pte_m, entry_m;
95660+
95661+ BUG_ON(!page_m || !PageAnon(page_m));
95662+
95663+ vma_m = pax_find_mirror_vma(vma);
95664+ if (!vma_m)
95665+ return;
95666+
95667+ BUG_ON(!PageLocked(page_m));
95668+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95669+ address_m = address + SEGMEXEC_TASK_SIZE;
95670+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95671+ pte_m = pte_offset_map(pmd_m, address_m);
95672+ ptl_m = pte_lockptr(mm, pmd_m);
95673+ if (ptl != ptl_m) {
95674+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95675+ if (!pte_none(*pte_m))
95676+ goto out;
95677+ }
95678+
95679+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
95680+ page_cache_get(page_m);
95681+ page_add_anon_rmap(page_m, vma_m, address_m);
95682+ inc_mm_counter_fast(mm, MM_ANONPAGES);
95683+ set_pte_at(mm, address_m, pte_m, entry_m);
95684+ update_mmu_cache(vma_m, address_m, pte_m);
95685+out:
95686+ if (ptl != ptl_m)
95687+ spin_unlock(ptl_m);
95688+ pte_unmap(pte_m);
95689+ unlock_page(page_m);
95690+}
95691+
95692+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
95693+{
95694+ struct mm_struct *mm = vma->vm_mm;
95695+ unsigned long address_m;
95696+ spinlock_t *ptl_m;
95697+ struct vm_area_struct *vma_m;
95698+ pmd_t *pmd_m;
95699+ pte_t *pte_m, entry_m;
95700+
95701+ BUG_ON(!page_m || PageAnon(page_m));
95702+
95703+ vma_m = pax_find_mirror_vma(vma);
95704+ if (!vma_m)
95705+ return;
95706+
95707+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95708+ address_m = address + SEGMEXEC_TASK_SIZE;
95709+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95710+ pte_m = pte_offset_map(pmd_m, address_m);
95711+ ptl_m = pte_lockptr(mm, pmd_m);
95712+ if (ptl != ptl_m) {
95713+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95714+ if (!pte_none(*pte_m))
95715+ goto out;
95716+ }
95717+
95718+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
95719+ page_cache_get(page_m);
95720+ page_add_file_rmap(page_m);
95721+ inc_mm_counter_fast(mm, MM_FILEPAGES);
95722+ set_pte_at(mm, address_m, pte_m, entry_m);
95723+ update_mmu_cache(vma_m, address_m, pte_m);
95724+out:
95725+ if (ptl != ptl_m)
95726+ spin_unlock(ptl_m);
95727+ pte_unmap(pte_m);
95728+}
95729+
95730+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
95731+{
95732+ struct mm_struct *mm = vma->vm_mm;
95733+ unsigned long address_m;
95734+ spinlock_t *ptl_m;
95735+ struct vm_area_struct *vma_m;
95736+ pmd_t *pmd_m;
95737+ pte_t *pte_m, entry_m;
95738+
95739+ vma_m = pax_find_mirror_vma(vma);
95740+ if (!vma_m)
95741+ return;
95742+
95743+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95744+ address_m = address + SEGMEXEC_TASK_SIZE;
95745+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95746+ pte_m = pte_offset_map(pmd_m, address_m);
95747+ ptl_m = pte_lockptr(mm, pmd_m);
95748+ if (ptl != ptl_m) {
95749+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95750+ if (!pte_none(*pte_m))
95751+ goto out;
95752+ }
95753+
95754+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
95755+ set_pte_at(mm, address_m, pte_m, entry_m);
95756+out:
95757+ if (ptl != ptl_m)
95758+ spin_unlock(ptl_m);
95759+ pte_unmap(pte_m);
95760+}
95761+
95762+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
95763+{
95764+ struct page *page_m;
95765+ pte_t entry;
95766+
95767+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
95768+ goto out;
95769+
95770+ entry = *pte;
95771+ page_m = vm_normal_page(vma, address, entry);
95772+ if (!page_m)
95773+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
95774+ else if (PageAnon(page_m)) {
95775+ if (pax_find_mirror_vma(vma)) {
95776+ pte_unmap_unlock(pte, ptl);
95777+ lock_page(page_m);
95778+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
95779+ if (pte_same(entry, *pte))
95780+ pax_mirror_anon_pte(vma, address, page_m, ptl);
95781+ else
95782+ unlock_page(page_m);
95783+ }
95784+ } else
95785+ pax_mirror_file_pte(vma, address, page_m, ptl);
95786+
95787+out:
95788+ pte_unmap_unlock(pte, ptl);
95789+}
95790+#endif
95791+
95792 /*
95793 * This routine handles present pages, when users try to write
95794 * to a shared page. It is done by copying the page to a new address
95795@@ -2218,6 +2425,12 @@ gotten:
95796 */
95797 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
95798 if (likely(pte_same(*page_table, orig_pte))) {
95799+
95800+#ifdef CONFIG_PAX_SEGMEXEC
95801+ if (pax_find_mirror_vma(vma))
95802+ BUG_ON(!trylock_page(new_page));
95803+#endif
95804+
95805 if (old_page) {
95806 if (!PageAnon(old_page)) {
95807 dec_mm_counter_fast(mm, MM_FILEPAGES);
95808@@ -2271,6 +2484,10 @@ gotten:
95809 page_remove_rmap(old_page);
95810 }
95811
95812+#ifdef CONFIG_PAX_SEGMEXEC
95813+ pax_mirror_anon_pte(vma, address, new_page, ptl);
95814+#endif
95815+
95816 /* Free the old page.. */
95817 new_page = old_page;
95818 ret |= VM_FAULT_WRITE;
95819@@ -2545,6 +2762,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
95820 swap_free(entry);
95821 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
95822 try_to_free_swap(page);
95823+
95824+#ifdef CONFIG_PAX_SEGMEXEC
95825+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
95826+#endif
95827+
95828 unlock_page(page);
95829 if (page != swapcache) {
95830 /*
95831@@ -2568,6 +2790,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
95832
95833 /* No need to invalidate - it was non-present before */
95834 update_mmu_cache(vma, address, page_table);
95835+
95836+#ifdef CONFIG_PAX_SEGMEXEC
95837+ pax_mirror_anon_pte(vma, address, page, ptl);
95838+#endif
95839+
95840 unlock:
95841 pte_unmap_unlock(page_table, ptl);
95842 out:
95843@@ -2587,40 +2814,6 @@ out_release:
95844 }
95845
95846 /*
95847- * This is like a special single-page "expand_{down|up}wards()",
95848- * except we must first make sure that 'address{-|+}PAGE_SIZE'
95849- * doesn't hit another vma.
95850- */
95851-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
95852-{
95853- address &= PAGE_MASK;
95854- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
95855- struct vm_area_struct *prev = vma->vm_prev;
95856-
95857- /*
95858- * Is there a mapping abutting this one below?
95859- *
95860- * That's only ok if it's the same stack mapping
95861- * that has gotten split..
95862- */
95863- if (prev && prev->vm_end == address)
95864- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
95865-
95866- expand_downwards(vma, address - PAGE_SIZE);
95867- }
95868- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
95869- struct vm_area_struct *next = vma->vm_next;
95870-
95871- /* As VM_GROWSDOWN but s/below/above/ */
95872- if (next && next->vm_start == address + PAGE_SIZE)
95873- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
95874-
95875- expand_upwards(vma, address + PAGE_SIZE);
95876- }
95877- return 0;
95878-}
95879-
95880-/*
95881 * We enter with non-exclusive mmap_sem (to exclude vma changes,
95882 * but allow concurrent faults), and pte mapped but not yet locked.
95883 * We return with mmap_sem still held, but pte unmapped and unlocked.
95884@@ -2630,27 +2823,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
95885 unsigned int flags)
95886 {
95887 struct mem_cgroup *memcg;
95888- struct page *page;
95889+ struct page *page = NULL;
95890 spinlock_t *ptl;
95891 pte_t entry;
95892
95893- pte_unmap(page_table);
95894-
95895- /* Check if we need to add a guard page to the stack */
95896- if (check_stack_guard_page(vma, address) < 0)
95897- return VM_FAULT_SIGBUS;
95898-
95899- /* Use the zero-page for reads */
95900 if (!(flags & FAULT_FLAG_WRITE)) {
95901 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
95902 vma->vm_page_prot));
95903- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
95904+ ptl = pte_lockptr(mm, pmd);
95905+ spin_lock(ptl);
95906 if (!pte_none(*page_table))
95907 goto unlock;
95908 goto setpte;
95909 }
95910
95911 /* Allocate our own private page. */
95912+ pte_unmap(page_table);
95913+
95914 if (unlikely(anon_vma_prepare(vma)))
95915 goto oom;
95916 page = alloc_zeroed_user_highpage_movable(vma, address);
95917@@ -2674,6 +2863,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
95918 if (!pte_none(*page_table))
95919 goto release;
95920
95921+#ifdef CONFIG_PAX_SEGMEXEC
95922+ if (pax_find_mirror_vma(vma))
95923+ BUG_ON(!trylock_page(page));
95924+#endif
95925+
95926 inc_mm_counter_fast(mm, MM_ANONPAGES);
95927 page_add_new_anon_rmap(page, vma, address);
95928 mem_cgroup_commit_charge(page, memcg, false);
95929@@ -2683,6 +2877,12 @@ setpte:
95930
95931 /* No need to invalidate - it was non-present before */
95932 update_mmu_cache(vma, address, page_table);
95933+
95934+#ifdef CONFIG_PAX_SEGMEXEC
95935+ if (page)
95936+ pax_mirror_anon_pte(vma, address, page, ptl);
95937+#endif
95938+
95939 unlock:
95940 pte_unmap_unlock(page_table, ptl);
95941 return 0;
95942@@ -2913,6 +3113,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95943 return ret;
95944 }
95945 do_set_pte(vma, address, fault_page, pte, false, false);
95946+
95947+#ifdef CONFIG_PAX_SEGMEXEC
95948+ pax_mirror_file_pte(vma, address, fault_page, ptl);
95949+#endif
95950+
95951 unlock_page(fault_page);
95952 unlock_out:
95953 pte_unmap_unlock(pte, ptl);
95954@@ -2955,7 +3160,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95955 page_cache_release(fault_page);
95956 goto uncharge_out;
95957 }
95958+
95959+#ifdef CONFIG_PAX_SEGMEXEC
95960+ if (pax_find_mirror_vma(vma))
95961+ BUG_ON(!trylock_page(new_page));
95962+#endif
95963+
95964 do_set_pte(vma, address, new_page, pte, true, true);
95965+
95966+#ifdef CONFIG_PAX_SEGMEXEC
95967+ pax_mirror_anon_pte(vma, address, new_page, ptl);
95968+#endif
95969+
95970 mem_cgroup_commit_charge(new_page, memcg, false);
95971 lru_cache_add_active_or_unevictable(new_page, vma);
95972 pte_unmap_unlock(pte, ptl);
95973@@ -3005,6 +3221,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95974 return ret;
95975 }
95976 do_set_pte(vma, address, fault_page, pte, true, false);
95977+
95978+#ifdef CONFIG_PAX_SEGMEXEC
95979+ pax_mirror_file_pte(vma, address, fault_page, ptl);
95980+#endif
95981+
95982 pte_unmap_unlock(pte, ptl);
95983
95984 if (set_page_dirty(fault_page))
95985@@ -3246,6 +3467,12 @@ static int handle_pte_fault(struct mm_struct *mm,
95986 if (flags & FAULT_FLAG_WRITE)
95987 flush_tlb_fix_spurious_fault(vma, address);
95988 }
95989+
95990+#ifdef CONFIG_PAX_SEGMEXEC
95991+ pax_mirror_pte(vma, address, pte, pmd, ptl);
95992+ return 0;
95993+#endif
95994+
95995 unlock:
95996 pte_unmap_unlock(pte, ptl);
95997 return 0;
95998@@ -3265,9 +3492,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95999 pmd_t *pmd;
96000 pte_t *pte;
96001
96002+#ifdef CONFIG_PAX_SEGMEXEC
96003+ struct vm_area_struct *vma_m;
96004+#endif
96005+
96006 if (unlikely(is_vm_hugetlb_page(vma)))
96007 return hugetlb_fault(mm, vma, address, flags);
96008
96009+#ifdef CONFIG_PAX_SEGMEXEC
96010+ vma_m = pax_find_mirror_vma(vma);
96011+ if (vma_m) {
96012+ unsigned long address_m;
96013+ pgd_t *pgd_m;
96014+ pud_t *pud_m;
96015+ pmd_t *pmd_m;
96016+
96017+ if (vma->vm_start > vma_m->vm_start) {
96018+ address_m = address;
96019+ address -= SEGMEXEC_TASK_SIZE;
96020+ vma = vma_m;
96021+ } else
96022+ address_m = address + SEGMEXEC_TASK_SIZE;
96023+
96024+ pgd_m = pgd_offset(mm, address_m);
96025+ pud_m = pud_alloc(mm, pgd_m, address_m);
96026+ if (!pud_m)
96027+ return VM_FAULT_OOM;
96028+ pmd_m = pmd_alloc(mm, pud_m, address_m);
96029+ if (!pmd_m)
96030+ return VM_FAULT_OOM;
96031+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
96032+ return VM_FAULT_OOM;
96033+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
96034+ }
96035+#endif
96036+
96037 pgd = pgd_offset(mm, address);
96038 pud = pud_alloc(mm, pgd, address);
96039 if (!pud)
96040@@ -3401,6 +3660,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
96041 spin_unlock(&mm->page_table_lock);
96042 return 0;
96043 }
96044+
96045+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
96046+{
96047+ pud_t *new = pud_alloc_one(mm, address);
96048+ if (!new)
96049+ return -ENOMEM;
96050+
96051+ smp_wmb(); /* See comment in __pte_alloc */
96052+
96053+ spin_lock(&mm->page_table_lock);
96054+ if (pgd_present(*pgd)) /* Another has populated it */
96055+ pud_free(mm, new);
96056+ else
96057+ pgd_populate_kernel(mm, pgd, new);
96058+ spin_unlock(&mm->page_table_lock);
96059+ return 0;
96060+}
96061 #endif /* __PAGETABLE_PUD_FOLDED */
96062
96063 #ifndef __PAGETABLE_PMD_FOLDED
96064@@ -3431,6 +3707,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
96065 spin_unlock(&mm->page_table_lock);
96066 return 0;
96067 }
96068+
96069+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
96070+{
96071+ pmd_t *new = pmd_alloc_one(mm, address);
96072+ if (!new)
96073+ return -ENOMEM;
96074+
96075+ smp_wmb(); /* See comment in __pte_alloc */
96076+
96077+ spin_lock(&mm->page_table_lock);
96078+#ifndef __ARCH_HAS_4LEVEL_HACK
96079+ if (pud_present(*pud)) /* Another has populated it */
96080+ pmd_free(mm, new);
96081+ else
96082+ pud_populate_kernel(mm, pud, new);
96083+#else
96084+ if (pgd_present(*pud)) /* Another has populated it */
96085+ pmd_free(mm, new);
96086+ else
96087+ pgd_populate_kernel(mm, pud, new);
96088+#endif /* __ARCH_HAS_4LEVEL_HACK */
96089+ spin_unlock(&mm->page_table_lock);
96090+ return 0;
96091+}
96092 #endif /* __PAGETABLE_PMD_FOLDED */
96093
96094 static int __follow_pte(struct mm_struct *mm, unsigned long address,
96095@@ -3540,8 +3840,8 @@ out:
96096 return ret;
96097 }
96098
96099-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
96100- void *buf, int len, int write)
96101+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
96102+ void *buf, size_t len, int write)
96103 {
96104 resource_size_t phys_addr;
96105 unsigned long prot = 0;
96106@@ -3567,8 +3867,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
96107 * Access another process' address space as given in mm. If non-NULL, use the
96108 * given task for page fault accounting.
96109 */
96110-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96111- unsigned long addr, void *buf, int len, int write)
96112+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96113+ unsigned long addr, void *buf, size_t len, int write)
96114 {
96115 struct vm_area_struct *vma;
96116 void *old_buf = buf;
96117@@ -3576,7 +3876,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96118 down_read(&mm->mmap_sem);
96119 /* ignore errors, just check how much was successfully transferred */
96120 while (len) {
96121- int bytes, ret, offset;
96122+ ssize_t bytes, ret, offset;
96123 void *maddr;
96124 struct page *page = NULL;
96125
96126@@ -3637,8 +3937,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96127 *
96128 * The caller must hold a reference on @mm.
96129 */
96130-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
96131- void *buf, int len, int write)
96132+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
96133+ void *buf, size_t len, int write)
96134 {
96135 return __access_remote_vm(NULL, mm, addr, buf, len, write);
96136 }
96137@@ -3648,11 +3948,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
96138 * Source/target buffer must be kernel space,
96139 * Do not walk the page table directly, use get_user_pages
96140 */
96141-int access_process_vm(struct task_struct *tsk, unsigned long addr,
96142- void *buf, int len, int write)
96143+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
96144+ void *buf, size_t len, int write)
96145 {
96146 struct mm_struct *mm;
96147- int ret;
96148+ ssize_t ret;
96149
96150 mm = get_task_mm(tsk);
96151 if (!mm)
96152diff --git a/mm/mempolicy.c b/mm/mempolicy.c
96153index e58725a..e0be017 100644
96154--- a/mm/mempolicy.c
96155+++ b/mm/mempolicy.c
96156@@ -750,6 +750,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
96157 unsigned long vmstart;
96158 unsigned long vmend;
96159
96160+#ifdef CONFIG_PAX_SEGMEXEC
96161+ struct vm_area_struct *vma_m;
96162+#endif
96163+
96164 vma = find_vma(mm, start);
96165 if (!vma || vma->vm_start > start)
96166 return -EFAULT;
96167@@ -793,6 +797,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
96168 err = vma_replace_policy(vma, new_pol);
96169 if (err)
96170 goto out;
96171+
96172+#ifdef CONFIG_PAX_SEGMEXEC
96173+ vma_m = pax_find_mirror_vma(vma);
96174+ if (vma_m) {
96175+ err = vma_replace_policy(vma_m, new_pol);
96176+ if (err)
96177+ goto out;
96178+ }
96179+#endif
96180+
96181 }
96182
96183 out:
96184@@ -1212,6 +1226,17 @@ static long do_mbind(unsigned long start, unsigned long len,
96185
96186 if (end < start)
96187 return -EINVAL;
96188+
96189+#ifdef CONFIG_PAX_SEGMEXEC
96190+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
96191+ if (end > SEGMEXEC_TASK_SIZE)
96192+ return -EINVAL;
96193+ } else
96194+#endif
96195+
96196+ if (end > TASK_SIZE)
96197+ return -EINVAL;
96198+
96199 if (end == start)
96200 return 0;
96201
96202@@ -1437,8 +1462,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
96203 */
96204 tcred = __task_cred(task);
96205 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
96206- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
96207- !capable(CAP_SYS_NICE)) {
96208+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
96209 rcu_read_unlock();
96210 err = -EPERM;
96211 goto out_put;
96212@@ -1469,6 +1493,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
96213 goto out;
96214 }
96215
96216+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
96217+ if (mm != current->mm &&
96218+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
96219+ mmput(mm);
96220+ err = -EPERM;
96221+ goto out;
96222+ }
96223+#endif
96224+
96225 err = do_migrate_pages(mm, old, new,
96226 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
96227
96228diff --git a/mm/migrate.c b/mm/migrate.c
96229index 0143995..b294728 100644
96230--- a/mm/migrate.c
96231+++ b/mm/migrate.c
96232@@ -1495,8 +1495,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
96233 */
96234 tcred = __task_cred(task);
96235 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
96236- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
96237- !capable(CAP_SYS_NICE)) {
96238+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
96239 rcu_read_unlock();
96240 err = -EPERM;
96241 goto out;
96242diff --git a/mm/mlock.c b/mm/mlock.c
96243index 73cf098..ab547c7 100644
96244--- a/mm/mlock.c
96245+++ b/mm/mlock.c
96246@@ -14,6 +14,7 @@
96247 #include <linux/pagevec.h>
96248 #include <linux/mempolicy.h>
96249 #include <linux/syscalls.h>
96250+#include <linux/security.h>
96251 #include <linux/sched.h>
96252 #include <linux/export.h>
96253 #include <linux/rmap.h>
96254@@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
96255 {
96256 unsigned long nstart, end, tmp;
96257 struct vm_area_struct * vma, * prev;
96258- int error;
96259+ int error = 0;
96260
96261 VM_BUG_ON(start & ~PAGE_MASK);
96262 VM_BUG_ON(len != PAGE_ALIGN(len));
96263@@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
96264 return -EINVAL;
96265 if (end == start)
96266 return 0;
96267+ if (end > TASK_SIZE)
96268+ return -EINVAL;
96269+
96270 vma = find_vma(current->mm, start);
96271 if (!vma || vma->vm_start > start)
96272 return -ENOMEM;
96273@@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
96274 for (nstart = start ; ; ) {
96275 vm_flags_t newflags;
96276
96277+#ifdef CONFIG_PAX_SEGMEXEC
96278+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
96279+ break;
96280+#endif
96281+
96282 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
96283
96284 newflags = vma->vm_flags & ~VM_LOCKED;
96285@@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
96286 locked += current->mm->locked_vm;
96287
96288 /* check against resource limits */
96289+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
96290 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
96291 error = do_mlock(start, len, 1);
96292
96293@@ -783,6 +793,11 @@ static int do_mlockall(int flags)
96294 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
96295 vm_flags_t newflags;
96296
96297+#ifdef CONFIG_PAX_SEGMEXEC
96298+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
96299+ break;
96300+#endif
96301+
96302 newflags = vma->vm_flags & ~VM_LOCKED;
96303 if (flags & MCL_CURRENT)
96304 newflags |= VM_LOCKED;
96305@@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
96306 lock_limit >>= PAGE_SHIFT;
96307
96308 ret = -ENOMEM;
96309+
96310+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
96311+
96312 down_write(&current->mm->mmap_sem);
96313-
96314 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
96315 capable(CAP_IPC_LOCK))
96316 ret = do_mlockall(flags);
96317diff --git a/mm/mmap.c b/mm/mmap.c
96318index ae91989..d8308c7 100644
96319--- a/mm/mmap.c
96320+++ b/mm/mmap.c
96321@@ -41,6 +41,7 @@
96322 #include <linux/notifier.h>
96323 #include <linux/memory.h>
96324 #include <linux/printk.h>
96325+#include <linux/random.h>
96326
96327 #include <asm/uaccess.h>
96328 #include <asm/cacheflush.h>
96329@@ -57,6 +58,16 @@
96330 #define arch_rebalance_pgtables(addr, len) (addr)
96331 #endif
96332
96333+static inline void verify_mm_writelocked(struct mm_struct *mm)
96334+{
96335+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
96336+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
96337+ up_read(&mm->mmap_sem);
96338+ BUG();
96339+ }
96340+#endif
96341+}
96342+
96343 static void unmap_region(struct mm_struct *mm,
96344 struct vm_area_struct *vma, struct vm_area_struct *prev,
96345 unsigned long start, unsigned long end);
96346@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
96347 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
96348 *
96349 */
96350-pgprot_t protection_map[16] = {
96351+pgprot_t protection_map[16] __read_only = {
96352 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
96353 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
96354 };
96355
96356-pgprot_t vm_get_page_prot(unsigned long vm_flags)
96357+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
96358 {
96359- return __pgprot(pgprot_val(protection_map[vm_flags &
96360+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
96361 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
96362 pgprot_val(arch_vm_get_page_prot(vm_flags)));
96363+
96364+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96365+ if (!(__supported_pte_mask & _PAGE_NX) &&
96366+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
96367+ (vm_flags & (VM_READ | VM_WRITE)))
96368+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
96369+#endif
96370+
96371+ return prot;
96372 }
96373 EXPORT_SYMBOL(vm_get_page_prot);
96374
96375@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
96376 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
96377 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
96378 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
96379+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
96380 /*
96381 * Make sure vm_committed_as in one cacheline and not cacheline shared with
96382 * other variables. It can be updated by several CPUs frequently.
96383@@ -274,6 +295,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
96384 struct vm_area_struct *next = vma->vm_next;
96385
96386 might_sleep();
96387+ BUG_ON(vma->vm_mirror);
96388 if (vma->vm_ops && vma->vm_ops->close)
96389 vma->vm_ops->close(vma);
96390 if (vma->vm_file)
96391@@ -287,6 +309,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
96392
96393 SYSCALL_DEFINE1(brk, unsigned long, brk)
96394 {
96395+ unsigned long rlim;
96396 unsigned long retval;
96397 unsigned long newbrk, oldbrk;
96398 struct mm_struct *mm = current->mm;
96399@@ -317,7 +340,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
96400 * segment grow beyond its set limit the in case where the limit is
96401 * not page aligned -Ram Gupta
96402 */
96403- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
96404+ rlim = rlimit(RLIMIT_DATA);
96405+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
96406+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
96407+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
96408+ rlim = 4096 * PAGE_SIZE;
96409+#endif
96410+ if (check_data_rlimit(rlim, brk, mm->start_brk,
96411 mm->end_data, mm->start_data))
96412 goto out;
96413
96414@@ -976,6 +1005,12 @@ static int
96415 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
96416 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
96417 {
96418+
96419+#ifdef CONFIG_PAX_SEGMEXEC
96420+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
96421+ return 0;
96422+#endif
96423+
96424 if (is_mergeable_vma(vma, file, vm_flags) &&
96425 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
96426 if (vma->vm_pgoff == vm_pgoff)
96427@@ -995,6 +1030,12 @@ static int
96428 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
96429 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
96430 {
96431+
96432+#ifdef CONFIG_PAX_SEGMEXEC
96433+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
96434+ return 0;
96435+#endif
96436+
96437 if (is_mergeable_vma(vma, file, vm_flags) &&
96438 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
96439 pgoff_t vm_pglen;
96440@@ -1044,6 +1085,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96441 struct vm_area_struct *area, *next;
96442 int err;
96443
96444+#ifdef CONFIG_PAX_SEGMEXEC
96445+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
96446+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
96447+
96448+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
96449+#endif
96450+
96451 /*
96452 * We later require that vma->vm_flags == vm_flags,
96453 * so this tests vma->vm_flags & VM_SPECIAL, too.
96454@@ -1059,6 +1107,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96455 if (next && next->vm_end == end) /* cases 6, 7, 8 */
96456 next = next->vm_next;
96457
96458+#ifdef CONFIG_PAX_SEGMEXEC
96459+ if (prev)
96460+ prev_m = pax_find_mirror_vma(prev);
96461+ if (area)
96462+ area_m = pax_find_mirror_vma(area);
96463+ if (next)
96464+ next_m = pax_find_mirror_vma(next);
96465+#endif
96466+
96467 /*
96468 * Can it merge with the predecessor?
96469 */
96470@@ -1078,9 +1135,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96471 /* cases 1, 6 */
96472 err = vma_adjust(prev, prev->vm_start,
96473 next->vm_end, prev->vm_pgoff, NULL);
96474- } else /* cases 2, 5, 7 */
96475+
96476+#ifdef CONFIG_PAX_SEGMEXEC
96477+ if (!err && prev_m)
96478+ err = vma_adjust(prev_m, prev_m->vm_start,
96479+ next_m->vm_end, prev_m->vm_pgoff, NULL);
96480+#endif
96481+
96482+ } else { /* cases 2, 5, 7 */
96483 err = vma_adjust(prev, prev->vm_start,
96484 end, prev->vm_pgoff, NULL);
96485+
96486+#ifdef CONFIG_PAX_SEGMEXEC
96487+ if (!err && prev_m)
96488+ err = vma_adjust(prev_m, prev_m->vm_start,
96489+ end_m, prev_m->vm_pgoff, NULL);
96490+#endif
96491+
96492+ }
96493 if (err)
96494 return NULL;
96495 khugepaged_enter_vma_merge(prev, vm_flags);
96496@@ -1094,12 +1166,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96497 mpol_equal(policy, vma_policy(next)) &&
96498 can_vma_merge_before(next, vm_flags,
96499 anon_vma, file, pgoff+pglen)) {
96500- if (prev && addr < prev->vm_end) /* case 4 */
96501+ if (prev && addr < prev->vm_end) { /* case 4 */
96502 err = vma_adjust(prev, prev->vm_start,
96503 addr, prev->vm_pgoff, NULL);
96504- else /* cases 3, 8 */
96505+
96506+#ifdef CONFIG_PAX_SEGMEXEC
96507+ if (!err && prev_m)
96508+ err = vma_adjust(prev_m, prev_m->vm_start,
96509+ addr_m, prev_m->vm_pgoff, NULL);
96510+#endif
96511+
96512+ } else { /* cases 3, 8 */
96513 err = vma_adjust(area, addr, next->vm_end,
96514 next->vm_pgoff - pglen, NULL);
96515+
96516+#ifdef CONFIG_PAX_SEGMEXEC
96517+ if (!err && area_m)
96518+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
96519+ next_m->vm_pgoff - pglen, NULL);
96520+#endif
96521+
96522+ }
96523 if (err)
96524 return NULL;
96525 khugepaged_enter_vma_merge(area, vm_flags);
96526@@ -1208,8 +1295,10 @@ none:
96527 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
96528 struct file *file, long pages)
96529 {
96530- const unsigned long stack_flags
96531- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
96532+
96533+#ifdef CONFIG_PAX_RANDMMAP
96534+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
96535+#endif
96536
96537 mm->total_vm += pages;
96538
96539@@ -1217,7 +1306,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
96540 mm->shared_vm += pages;
96541 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
96542 mm->exec_vm += pages;
96543- } else if (flags & stack_flags)
96544+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
96545 mm->stack_vm += pages;
96546 }
96547 #endif /* CONFIG_PROC_FS */
96548@@ -1247,6 +1336,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
96549 locked += mm->locked_vm;
96550 lock_limit = rlimit(RLIMIT_MEMLOCK);
96551 lock_limit >>= PAGE_SHIFT;
96552+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
96553 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
96554 return -EAGAIN;
96555 }
96556@@ -1273,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96557 * (the exception is when the underlying filesystem is noexec
96558 * mounted, in which case we dont add PROT_EXEC.)
96559 */
96560- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
96561+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
96562 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
96563 prot |= PROT_EXEC;
96564
96565@@ -1299,7 +1389,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96566 /* Obtain the address to map to. we verify (or select) it and ensure
96567 * that it represents a valid section of the address space.
96568 */
96569- addr = get_unmapped_area(file, addr, len, pgoff, flags);
96570+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
96571 if (addr & ~PAGE_MASK)
96572 return addr;
96573
96574@@ -1310,6 +1400,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96575 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
96576 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
96577
96578+#ifdef CONFIG_PAX_MPROTECT
96579+ if (mm->pax_flags & MF_PAX_MPROTECT) {
96580+
96581+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
96582+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
96583+ mm->binfmt->handle_mmap)
96584+ mm->binfmt->handle_mmap(file);
96585+#endif
96586+
96587+#ifndef CONFIG_PAX_MPROTECT_COMPAT
96588+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
96589+ gr_log_rwxmmap(file);
96590+
96591+#ifdef CONFIG_PAX_EMUPLT
96592+ vm_flags &= ~VM_EXEC;
96593+#else
96594+ return -EPERM;
96595+#endif
96596+
96597+ }
96598+
96599+ if (!(vm_flags & VM_EXEC))
96600+ vm_flags &= ~VM_MAYEXEC;
96601+#else
96602+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
96603+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
96604+#endif
96605+ else
96606+ vm_flags &= ~VM_MAYWRITE;
96607+ }
96608+#endif
96609+
96610+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96611+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
96612+ vm_flags &= ~VM_PAGEEXEC;
96613+#endif
96614+
96615 if (flags & MAP_LOCKED)
96616 if (!can_do_mlock())
96617 return -EPERM;
96618@@ -1397,6 +1524,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96619 vm_flags |= VM_NORESERVE;
96620 }
96621
96622+ if (!gr_acl_handle_mmap(file, prot))
96623+ return -EACCES;
96624+
96625 addr = mmap_region(file, addr, len, vm_flags, pgoff);
96626 if (!IS_ERR_VALUE(addr) &&
96627 ((vm_flags & VM_LOCKED) ||
96628@@ -1490,7 +1620,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
96629 vm_flags_t vm_flags = vma->vm_flags;
96630
96631 /* If it was private or non-writable, the write bit is already clear */
96632- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
96633+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
96634 return 0;
96635
96636 /* The backer wishes to know when pages are first written to? */
96637@@ -1541,7 +1671,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
96638 struct rb_node **rb_link, *rb_parent;
96639 unsigned long charged = 0;
96640
96641+#ifdef CONFIG_PAX_SEGMEXEC
96642+ struct vm_area_struct *vma_m = NULL;
96643+#endif
96644+
96645+ /*
96646+ * mm->mmap_sem is required to protect against another thread
96647+ * changing the mappings in case we sleep.
96648+ */
96649+ verify_mm_writelocked(mm);
96650+
96651 /* Check against address space limit. */
96652+
96653+#ifdef CONFIG_PAX_RANDMMAP
96654+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
96655+#endif
96656+
96657 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
96658 unsigned long nr_pages;
96659
96660@@ -1560,11 +1705,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
96661
96662 /* Clear old maps */
96663 error = -ENOMEM;
96664-munmap_back:
96665 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
96666 if (do_munmap(mm, addr, len))
96667 return -ENOMEM;
96668- goto munmap_back;
96669+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
96670 }
96671
96672 /*
96673@@ -1595,6 +1739,16 @@ munmap_back:
96674 goto unacct_error;
96675 }
96676
96677+#ifdef CONFIG_PAX_SEGMEXEC
96678+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
96679+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
96680+ if (!vma_m) {
96681+ error = -ENOMEM;
96682+ goto free_vma;
96683+ }
96684+ }
96685+#endif
96686+
96687 vma->vm_mm = mm;
96688 vma->vm_start = addr;
96689 vma->vm_end = addr + len;
96690@@ -1625,6 +1779,13 @@ munmap_back:
96691 if (error)
96692 goto unmap_and_free_vma;
96693
96694+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96695+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
96696+ vma->vm_flags |= VM_PAGEEXEC;
96697+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
96698+ }
96699+#endif
96700+
96701 /* Can addr have changed??
96702 *
96703 * Answer: Yes, several device drivers can do it in their
96704@@ -1643,6 +1804,12 @@ munmap_back:
96705 }
96706
96707 vma_link(mm, vma, prev, rb_link, rb_parent);
96708+
96709+#ifdef CONFIG_PAX_SEGMEXEC
96710+ if (vma_m)
96711+ BUG_ON(pax_mirror_vma(vma_m, vma));
96712+#endif
96713+
96714 /* Once vma denies write, undo our temporary denial count */
96715 if (file) {
96716 if (vm_flags & VM_SHARED)
96717@@ -1655,6 +1822,7 @@ out:
96718 perf_event_mmap(vma);
96719
96720 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
96721+ track_exec_limit(mm, addr, addr + len, vm_flags);
96722 if (vm_flags & VM_LOCKED) {
96723 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
96724 vma == get_gate_vma(current->mm)))
96725@@ -1692,6 +1860,12 @@ allow_write_and_free_vma:
96726 if (vm_flags & VM_DENYWRITE)
96727 allow_write_access(file);
96728 free_vma:
96729+
96730+#ifdef CONFIG_PAX_SEGMEXEC
96731+ if (vma_m)
96732+ kmem_cache_free(vm_area_cachep, vma_m);
96733+#endif
96734+
96735 kmem_cache_free(vm_area_cachep, vma);
96736 unacct_error:
96737 if (charged)
96738@@ -1699,7 +1873,63 @@ unacct_error:
96739 return error;
96740 }
96741
96742-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
96743+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
96744+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
96745+{
96746+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
96747+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
96748+
96749+ return 0;
96750+}
96751+#endif
96752+
96753+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
96754+{
96755+ if (!vma) {
96756+#ifdef CONFIG_STACK_GROWSUP
96757+ if (addr > sysctl_heap_stack_gap)
96758+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
96759+ else
96760+ vma = find_vma(current->mm, 0);
96761+ if (vma && (vma->vm_flags & VM_GROWSUP))
96762+ return false;
96763+#endif
96764+ return true;
96765+ }
96766+
96767+ if (addr + len > vma->vm_start)
96768+ return false;
96769+
96770+ if (vma->vm_flags & VM_GROWSDOWN)
96771+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
96772+#ifdef CONFIG_STACK_GROWSUP
96773+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
96774+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
96775+#endif
96776+ else if (offset)
96777+ return offset <= vma->vm_start - addr - len;
96778+
96779+ return true;
96780+}
96781+
96782+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
96783+{
96784+ if (vma->vm_start < len)
96785+ return -ENOMEM;
96786+
96787+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
96788+ if (offset <= vma->vm_start - len)
96789+ return vma->vm_start - len - offset;
96790+ else
96791+ return -ENOMEM;
96792+ }
96793+
96794+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
96795+ return vma->vm_start - len - sysctl_heap_stack_gap;
96796+ return -ENOMEM;
96797+}
96798+
96799+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
96800 {
96801 /*
96802 * We implement the search by looking for an rbtree node that
96803@@ -1747,11 +1977,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
96804 }
96805 }
96806
96807- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
96808+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
96809 check_current:
96810 /* Check if current node has a suitable gap */
96811 if (gap_start > high_limit)
96812 return -ENOMEM;
96813+
96814+ if (gap_end - gap_start > info->threadstack_offset)
96815+ gap_start += info->threadstack_offset;
96816+ else
96817+ gap_start = gap_end;
96818+
96819+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
96820+ if (gap_end - gap_start > sysctl_heap_stack_gap)
96821+ gap_start += sysctl_heap_stack_gap;
96822+ else
96823+ gap_start = gap_end;
96824+ }
96825+ if (vma->vm_flags & VM_GROWSDOWN) {
96826+ if (gap_end - gap_start > sysctl_heap_stack_gap)
96827+ gap_end -= sysctl_heap_stack_gap;
96828+ else
96829+ gap_end = gap_start;
96830+ }
96831 if (gap_end >= low_limit && gap_end - gap_start >= length)
96832 goto found;
96833
96834@@ -1801,7 +2049,7 @@ found:
96835 return gap_start;
96836 }
96837
96838-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
96839+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
96840 {
96841 struct mm_struct *mm = current->mm;
96842 struct vm_area_struct *vma;
96843@@ -1855,6 +2103,24 @@ check_current:
96844 gap_end = vma->vm_start;
96845 if (gap_end < low_limit)
96846 return -ENOMEM;
96847+
96848+ if (gap_end - gap_start > info->threadstack_offset)
96849+ gap_end -= info->threadstack_offset;
96850+ else
96851+ gap_end = gap_start;
96852+
96853+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
96854+ if (gap_end - gap_start > sysctl_heap_stack_gap)
96855+ gap_start += sysctl_heap_stack_gap;
96856+ else
96857+ gap_start = gap_end;
96858+ }
96859+ if (vma->vm_flags & VM_GROWSDOWN) {
96860+ if (gap_end - gap_start > sysctl_heap_stack_gap)
96861+ gap_end -= sysctl_heap_stack_gap;
96862+ else
96863+ gap_end = gap_start;
96864+ }
96865 if (gap_start <= high_limit && gap_end - gap_start >= length)
96866 goto found;
96867
96868@@ -1918,6 +2184,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96869 struct mm_struct *mm = current->mm;
96870 struct vm_area_struct *vma;
96871 struct vm_unmapped_area_info info;
96872+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
96873
96874 if (len > TASK_SIZE - mmap_min_addr)
96875 return -ENOMEM;
96876@@ -1925,11 +2192,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96877 if (flags & MAP_FIXED)
96878 return addr;
96879
96880+#ifdef CONFIG_PAX_RANDMMAP
96881+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
96882+#endif
96883+
96884 if (addr) {
96885 addr = PAGE_ALIGN(addr);
96886 vma = find_vma(mm, addr);
96887 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
96888- (!vma || addr + len <= vma->vm_start))
96889+ check_heap_stack_gap(vma, addr, len, offset))
96890 return addr;
96891 }
96892
96893@@ -1938,6 +2209,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96894 info.low_limit = mm->mmap_base;
96895 info.high_limit = TASK_SIZE;
96896 info.align_mask = 0;
96897+ info.threadstack_offset = offset;
96898 return vm_unmapped_area(&info);
96899 }
96900 #endif
96901@@ -1956,6 +2228,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96902 struct mm_struct *mm = current->mm;
96903 unsigned long addr = addr0;
96904 struct vm_unmapped_area_info info;
96905+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
96906
96907 /* requested length too big for entire address space */
96908 if (len > TASK_SIZE - mmap_min_addr)
96909@@ -1964,12 +2237,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96910 if (flags & MAP_FIXED)
96911 return addr;
96912
96913+#ifdef CONFIG_PAX_RANDMMAP
96914+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
96915+#endif
96916+
96917 /* requesting a specific address */
96918 if (addr) {
96919 addr = PAGE_ALIGN(addr);
96920 vma = find_vma(mm, addr);
96921 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
96922- (!vma || addr + len <= vma->vm_start))
96923+ check_heap_stack_gap(vma, addr, len, offset))
96924 return addr;
96925 }
96926
96927@@ -1978,6 +2255,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96928 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
96929 info.high_limit = mm->mmap_base;
96930 info.align_mask = 0;
96931+ info.threadstack_offset = offset;
96932 addr = vm_unmapped_area(&info);
96933
96934 /*
96935@@ -1990,6 +2268,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96936 VM_BUG_ON(addr != -ENOMEM);
96937 info.flags = 0;
96938 info.low_limit = TASK_UNMAPPED_BASE;
96939+
96940+#ifdef CONFIG_PAX_RANDMMAP
96941+ if (mm->pax_flags & MF_PAX_RANDMMAP)
96942+ info.low_limit += mm->delta_mmap;
96943+#endif
96944+
96945 info.high_limit = TASK_SIZE;
96946 addr = vm_unmapped_area(&info);
96947 }
96948@@ -2090,6 +2374,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
96949 return vma;
96950 }
96951
96952+#ifdef CONFIG_PAX_SEGMEXEC
96953+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
96954+{
96955+ struct vm_area_struct *vma_m;
96956+
96957+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
96958+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
96959+ BUG_ON(vma->vm_mirror);
96960+ return NULL;
96961+ }
96962+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
96963+ vma_m = vma->vm_mirror;
96964+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
96965+ BUG_ON(vma->vm_file != vma_m->vm_file);
96966+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
96967+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
96968+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
96969+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
96970+ return vma_m;
96971+}
96972+#endif
96973+
96974 /*
96975 * Verify that the stack growth is acceptable and
96976 * update accounting. This is shared with both the
96977@@ -2106,6 +2412,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
96978 return -ENOMEM;
96979
96980 /* Stack limit test */
96981+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
96982 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
96983 return -ENOMEM;
96984
96985@@ -2116,6 +2423,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
96986 locked = mm->locked_vm + grow;
96987 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
96988 limit >>= PAGE_SHIFT;
96989+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
96990 if (locked > limit && !capable(CAP_IPC_LOCK))
96991 return -ENOMEM;
96992 }
96993@@ -2145,37 +2453,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
96994 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
96995 * vma is the last one with address > vma->vm_end. Have to extend vma.
96996 */
96997+#ifndef CONFIG_IA64
96998+static
96999+#endif
97000 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
97001 {
97002 int error;
97003+ bool locknext;
97004
97005 if (!(vma->vm_flags & VM_GROWSUP))
97006 return -EFAULT;
97007
97008+ /* Also guard against wrapping around to address 0. */
97009+ if (address < PAGE_ALIGN(address+1))
97010+ address = PAGE_ALIGN(address+1);
97011+ else
97012+ return -ENOMEM;
97013+
97014 /*
97015 * We must make sure the anon_vma is allocated
97016 * so that the anon_vma locking is not a noop.
97017 */
97018 if (unlikely(anon_vma_prepare(vma)))
97019 return -ENOMEM;
97020+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
97021+ if (locknext && anon_vma_prepare(vma->vm_next))
97022+ return -ENOMEM;
97023 vma_lock_anon_vma(vma);
97024+ if (locknext)
97025+ vma_lock_anon_vma(vma->vm_next);
97026
97027 /*
97028 * vma->vm_start/vm_end cannot change under us because the caller
97029 * is required to hold the mmap_sem in read mode. We need the
97030- * anon_vma lock to serialize against concurrent expand_stacks.
97031- * Also guard against wrapping around to address 0.
97032+ * anon_vma locks to serialize against concurrent expand_stacks
97033+ * and expand_upwards.
97034 */
97035- if (address < PAGE_ALIGN(address+4))
97036- address = PAGE_ALIGN(address+4);
97037- else {
97038- vma_unlock_anon_vma(vma);
97039- return -ENOMEM;
97040- }
97041 error = 0;
97042
97043 /* Somebody else might have raced and expanded it already */
97044- if (address > vma->vm_end) {
97045+ 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)
97046+ error = -ENOMEM;
97047+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
97048 unsigned long size, grow;
97049
97050 size = address - vma->vm_start;
97051@@ -2210,6 +2529,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
97052 }
97053 }
97054 }
97055+ if (locknext)
97056+ vma_unlock_anon_vma(vma->vm_next);
97057 vma_unlock_anon_vma(vma);
97058 khugepaged_enter_vma_merge(vma, vma->vm_flags);
97059 validate_mm(vma->vm_mm);
97060@@ -2224,6 +2545,8 @@ int expand_downwards(struct vm_area_struct *vma,
97061 unsigned long address)
97062 {
97063 int error;
97064+ bool lockprev = false;
97065+ struct vm_area_struct *prev;
97066
97067 /*
97068 * We must make sure the anon_vma is allocated
97069@@ -2237,6 +2560,15 @@ int expand_downwards(struct vm_area_struct *vma,
97070 if (error)
97071 return error;
97072
97073+ prev = vma->vm_prev;
97074+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
97075+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
97076+#endif
97077+ if (lockprev && anon_vma_prepare(prev))
97078+ return -ENOMEM;
97079+ if (lockprev)
97080+ vma_lock_anon_vma(prev);
97081+
97082 vma_lock_anon_vma(vma);
97083
97084 /*
97085@@ -2246,9 +2578,17 @@ int expand_downwards(struct vm_area_struct *vma,
97086 */
97087
97088 /* Somebody else might have raced and expanded it already */
97089- if (address < vma->vm_start) {
97090+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
97091+ error = -ENOMEM;
97092+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
97093 unsigned long size, grow;
97094
97095+#ifdef CONFIG_PAX_SEGMEXEC
97096+ struct vm_area_struct *vma_m;
97097+
97098+ vma_m = pax_find_mirror_vma(vma);
97099+#endif
97100+
97101 size = vma->vm_end - address;
97102 grow = (vma->vm_start - address) >> PAGE_SHIFT;
97103
97104@@ -2273,13 +2613,27 @@ int expand_downwards(struct vm_area_struct *vma,
97105 vma->vm_pgoff -= grow;
97106 anon_vma_interval_tree_post_update_vma(vma);
97107 vma_gap_update(vma);
97108+
97109+#ifdef CONFIG_PAX_SEGMEXEC
97110+ if (vma_m) {
97111+ anon_vma_interval_tree_pre_update_vma(vma_m);
97112+ vma_m->vm_start -= grow << PAGE_SHIFT;
97113+ vma_m->vm_pgoff -= grow;
97114+ anon_vma_interval_tree_post_update_vma(vma_m);
97115+ vma_gap_update(vma_m);
97116+ }
97117+#endif
97118+
97119 spin_unlock(&vma->vm_mm->page_table_lock);
97120
97121+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
97122 perf_event_mmap(vma);
97123 }
97124 }
97125 }
97126 vma_unlock_anon_vma(vma);
97127+ if (lockprev)
97128+ vma_unlock_anon_vma(prev);
97129 khugepaged_enter_vma_merge(vma, vma->vm_flags);
97130 validate_mm(vma->vm_mm);
97131 return error;
97132@@ -2377,6 +2731,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
97133 do {
97134 long nrpages = vma_pages(vma);
97135
97136+#ifdef CONFIG_PAX_SEGMEXEC
97137+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
97138+ vma = remove_vma(vma);
97139+ continue;
97140+ }
97141+#endif
97142+
97143 if (vma->vm_flags & VM_ACCOUNT)
97144 nr_accounted += nrpages;
97145 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
97146@@ -2421,6 +2782,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
97147 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
97148 vma->vm_prev = NULL;
97149 do {
97150+
97151+#ifdef CONFIG_PAX_SEGMEXEC
97152+ if (vma->vm_mirror) {
97153+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
97154+ vma->vm_mirror->vm_mirror = NULL;
97155+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
97156+ vma->vm_mirror = NULL;
97157+ }
97158+#endif
97159+
97160 vma_rb_erase(vma, &mm->mm_rb);
97161 mm->map_count--;
97162 tail_vma = vma;
97163@@ -2448,14 +2819,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97164 struct vm_area_struct *new;
97165 int err = -ENOMEM;
97166
97167+#ifdef CONFIG_PAX_SEGMEXEC
97168+ struct vm_area_struct *vma_m, *new_m = NULL;
97169+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
97170+#endif
97171+
97172 if (is_vm_hugetlb_page(vma) && (addr &
97173 ~(huge_page_mask(hstate_vma(vma)))))
97174 return -EINVAL;
97175
97176+#ifdef CONFIG_PAX_SEGMEXEC
97177+ vma_m = pax_find_mirror_vma(vma);
97178+#endif
97179+
97180 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97181 if (!new)
97182 goto out_err;
97183
97184+#ifdef CONFIG_PAX_SEGMEXEC
97185+ if (vma_m) {
97186+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97187+ if (!new_m) {
97188+ kmem_cache_free(vm_area_cachep, new);
97189+ goto out_err;
97190+ }
97191+ }
97192+#endif
97193+
97194 /* most fields are the same, copy all, and then fixup */
97195 *new = *vma;
97196
97197@@ -2468,6 +2858,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97198 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
97199 }
97200
97201+#ifdef CONFIG_PAX_SEGMEXEC
97202+ if (vma_m) {
97203+ *new_m = *vma_m;
97204+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
97205+ new_m->vm_mirror = new;
97206+ new->vm_mirror = new_m;
97207+
97208+ if (new_below)
97209+ new_m->vm_end = addr_m;
97210+ else {
97211+ new_m->vm_start = addr_m;
97212+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
97213+ }
97214+ }
97215+#endif
97216+
97217 err = vma_dup_policy(vma, new);
97218 if (err)
97219 goto out_free_vma;
97220@@ -2488,6 +2894,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97221 else
97222 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
97223
97224+#ifdef CONFIG_PAX_SEGMEXEC
97225+ if (!err && vma_m) {
97226+ struct mempolicy *pol = vma_policy(new);
97227+
97228+ if (anon_vma_clone(new_m, vma_m))
97229+ goto out_free_mpol;
97230+
97231+ mpol_get(pol);
97232+ set_vma_policy(new_m, pol);
97233+
97234+ if (new_m->vm_file)
97235+ get_file(new_m->vm_file);
97236+
97237+ if (new_m->vm_ops && new_m->vm_ops->open)
97238+ new_m->vm_ops->open(new_m);
97239+
97240+ if (new_below)
97241+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
97242+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
97243+ else
97244+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
97245+
97246+ if (err) {
97247+ if (new_m->vm_ops && new_m->vm_ops->close)
97248+ new_m->vm_ops->close(new_m);
97249+ if (new_m->vm_file)
97250+ fput(new_m->vm_file);
97251+ mpol_put(pol);
97252+ }
97253+ }
97254+#endif
97255+
97256 /* Success. */
97257 if (!err)
97258 return 0;
97259@@ -2497,10 +2935,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97260 new->vm_ops->close(new);
97261 if (new->vm_file)
97262 fput(new->vm_file);
97263- unlink_anon_vmas(new);
97264 out_free_mpol:
97265 mpol_put(vma_policy(new));
97266 out_free_vma:
97267+
97268+#ifdef CONFIG_PAX_SEGMEXEC
97269+ if (new_m) {
97270+ unlink_anon_vmas(new_m);
97271+ kmem_cache_free(vm_area_cachep, new_m);
97272+ }
97273+#endif
97274+
97275+ unlink_anon_vmas(new);
97276 kmem_cache_free(vm_area_cachep, new);
97277 out_err:
97278 return err;
97279@@ -2513,6 +2959,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97280 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97281 unsigned long addr, int new_below)
97282 {
97283+
97284+#ifdef CONFIG_PAX_SEGMEXEC
97285+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
97286+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
97287+ if (mm->map_count >= sysctl_max_map_count-1)
97288+ return -ENOMEM;
97289+ } else
97290+#endif
97291+
97292 if (mm->map_count >= sysctl_max_map_count)
97293 return -ENOMEM;
97294
97295@@ -2524,11 +2979,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97296 * work. This now handles partial unmappings.
97297 * Jeremy Fitzhardinge <jeremy@goop.org>
97298 */
97299+#ifdef CONFIG_PAX_SEGMEXEC
97300 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97301 {
97302+ int ret = __do_munmap(mm, start, len);
97303+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
97304+ return ret;
97305+
97306+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
97307+}
97308+
97309+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97310+#else
97311+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97312+#endif
97313+{
97314 unsigned long end;
97315 struct vm_area_struct *vma, *prev, *last;
97316
97317+ /*
97318+ * mm->mmap_sem is required to protect against another thread
97319+ * changing the mappings in case we sleep.
97320+ */
97321+ verify_mm_writelocked(mm);
97322+
97323 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
97324 return -EINVAL;
97325
97326@@ -2604,6 +3078,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97327 /* Fix up all other VM information */
97328 remove_vma_list(mm, vma);
97329
97330+ track_exec_limit(mm, start, end, 0UL);
97331+
97332 return 0;
97333 }
97334
97335@@ -2612,6 +3088,13 @@ int vm_munmap(unsigned long start, size_t len)
97336 int ret;
97337 struct mm_struct *mm = current->mm;
97338
97339+
97340+#ifdef CONFIG_PAX_SEGMEXEC
97341+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
97342+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
97343+ return -EINVAL;
97344+#endif
97345+
97346 down_write(&mm->mmap_sem);
97347 ret = do_munmap(mm, start, len);
97348 up_write(&mm->mmap_sem);
97349@@ -2625,16 +3108,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
97350 return vm_munmap(addr, len);
97351 }
97352
97353-static inline void verify_mm_writelocked(struct mm_struct *mm)
97354-{
97355-#ifdef CONFIG_DEBUG_VM
97356- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
97357- WARN_ON(1);
97358- up_read(&mm->mmap_sem);
97359- }
97360-#endif
97361-}
97362-
97363 /*
97364 * this is really a simplified "do_mmap". it only handles
97365 * anonymous maps. eventually we may be able to do some
97366@@ -2648,6 +3121,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97367 struct rb_node **rb_link, *rb_parent;
97368 pgoff_t pgoff = addr >> PAGE_SHIFT;
97369 int error;
97370+ unsigned long charged;
97371
97372 len = PAGE_ALIGN(len);
97373 if (!len)
97374@@ -2655,10 +3129,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97375
97376 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
97377
97378+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
97379+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
97380+ flags &= ~VM_EXEC;
97381+
97382+#ifdef CONFIG_PAX_MPROTECT
97383+ if (mm->pax_flags & MF_PAX_MPROTECT)
97384+ flags &= ~VM_MAYEXEC;
97385+#endif
97386+
97387+ }
97388+#endif
97389+
97390 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
97391 if (error & ~PAGE_MASK)
97392 return error;
97393
97394+ charged = len >> PAGE_SHIFT;
97395+
97396 error = mlock_future_check(mm, mm->def_flags, len);
97397 if (error)
97398 return error;
97399@@ -2672,21 +3160,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97400 /*
97401 * Clear old maps. this also does some error checking for us
97402 */
97403- munmap_back:
97404 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
97405 if (do_munmap(mm, addr, len))
97406 return -ENOMEM;
97407- goto munmap_back;
97408+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
97409 }
97410
97411 /* Check against address space limits *after* clearing old maps... */
97412- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
97413+ if (!may_expand_vm(mm, charged))
97414 return -ENOMEM;
97415
97416 if (mm->map_count > sysctl_max_map_count)
97417 return -ENOMEM;
97418
97419- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
97420+ if (security_vm_enough_memory_mm(mm, charged))
97421 return -ENOMEM;
97422
97423 /* Can we just expand an old private anonymous mapping? */
97424@@ -2700,7 +3187,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97425 */
97426 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97427 if (!vma) {
97428- vm_unacct_memory(len >> PAGE_SHIFT);
97429+ vm_unacct_memory(charged);
97430 return -ENOMEM;
97431 }
97432
97433@@ -2714,10 +3201,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97434 vma_link(mm, vma, prev, rb_link, rb_parent);
97435 out:
97436 perf_event_mmap(vma);
97437- mm->total_vm += len >> PAGE_SHIFT;
97438+ mm->total_vm += charged;
97439 if (flags & VM_LOCKED)
97440- mm->locked_vm += (len >> PAGE_SHIFT);
97441+ mm->locked_vm += charged;
97442 vma->vm_flags |= VM_SOFTDIRTY;
97443+ track_exec_limit(mm, addr, addr + len, flags);
97444 return addr;
97445 }
97446
97447@@ -2779,6 +3267,7 @@ void exit_mmap(struct mm_struct *mm)
97448 while (vma) {
97449 if (vma->vm_flags & VM_ACCOUNT)
97450 nr_accounted += vma_pages(vma);
97451+ vma->vm_mirror = NULL;
97452 vma = remove_vma(vma);
97453 }
97454 vm_unacct_memory(nr_accounted);
97455@@ -2796,6 +3285,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
97456 struct vm_area_struct *prev;
97457 struct rb_node **rb_link, *rb_parent;
97458
97459+#ifdef CONFIG_PAX_SEGMEXEC
97460+ struct vm_area_struct *vma_m = NULL;
97461+#endif
97462+
97463+ if (security_mmap_addr(vma->vm_start))
97464+ return -EPERM;
97465+
97466 /*
97467 * The vm_pgoff of a purely anonymous vma should be irrelevant
97468 * until its first write fault, when page's anon_vma and index
97469@@ -2819,7 +3315,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
97470 security_vm_enough_memory_mm(mm, vma_pages(vma)))
97471 return -ENOMEM;
97472
97473+#ifdef CONFIG_PAX_SEGMEXEC
97474+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
97475+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97476+ if (!vma_m)
97477+ return -ENOMEM;
97478+ }
97479+#endif
97480+
97481 vma_link(mm, vma, prev, rb_link, rb_parent);
97482+
97483+#ifdef CONFIG_PAX_SEGMEXEC
97484+ if (vma_m)
97485+ BUG_ON(pax_mirror_vma(vma_m, vma));
97486+#endif
97487+
97488 return 0;
97489 }
97490
97491@@ -2838,6 +3348,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
97492 struct rb_node **rb_link, *rb_parent;
97493 bool faulted_in_anon_vma = true;
97494
97495+ BUG_ON(vma->vm_mirror);
97496+
97497 /*
97498 * If anonymous vma has not yet been faulted, update new pgoff
97499 * to match new location, to increase its chance of merging.
97500@@ -2902,6 +3414,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
97501 return NULL;
97502 }
97503
97504+#ifdef CONFIG_PAX_SEGMEXEC
97505+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
97506+{
97507+ struct vm_area_struct *prev_m;
97508+ struct rb_node **rb_link_m, *rb_parent_m;
97509+ struct mempolicy *pol_m;
97510+
97511+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
97512+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
97513+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
97514+ *vma_m = *vma;
97515+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
97516+ if (anon_vma_clone(vma_m, vma))
97517+ return -ENOMEM;
97518+ pol_m = vma_policy(vma_m);
97519+ mpol_get(pol_m);
97520+ set_vma_policy(vma_m, pol_m);
97521+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
97522+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
97523+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
97524+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
97525+ if (vma_m->vm_file)
97526+ get_file(vma_m->vm_file);
97527+ if (vma_m->vm_ops && vma_m->vm_ops->open)
97528+ vma_m->vm_ops->open(vma_m);
97529+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
97530+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
97531+ vma_m->vm_mirror = vma;
97532+ vma->vm_mirror = vma_m;
97533+ return 0;
97534+}
97535+#endif
97536+
97537 /*
97538 * Return true if the calling process may expand its vm space by the passed
97539 * number of pages
97540@@ -2913,6 +3458,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
97541
97542 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
97543
97544+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
97545 if (cur + npages > lim)
97546 return 0;
97547 return 1;
97548@@ -2995,6 +3541,22 @@ static struct vm_area_struct *__install_special_mapping(
97549 vma->vm_start = addr;
97550 vma->vm_end = addr + len;
97551
97552+#ifdef CONFIG_PAX_MPROTECT
97553+ if (mm->pax_flags & MF_PAX_MPROTECT) {
97554+#ifndef CONFIG_PAX_MPROTECT_COMPAT
97555+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
97556+ return ERR_PTR(-EPERM);
97557+ if (!(vm_flags & VM_EXEC))
97558+ vm_flags &= ~VM_MAYEXEC;
97559+#else
97560+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
97561+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
97562+#endif
97563+ else
97564+ vm_flags &= ~VM_MAYWRITE;
97565+ }
97566+#endif
97567+
97568 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
97569 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
97570
97571diff --git a/mm/mprotect.c b/mm/mprotect.c
97572index ace9345..63320dc 100644
97573--- a/mm/mprotect.c
97574+++ b/mm/mprotect.c
97575@@ -24,10 +24,18 @@
97576 #include <linux/migrate.h>
97577 #include <linux/perf_event.h>
97578 #include <linux/ksm.h>
97579+#include <linux/sched/sysctl.h>
97580+
97581+#ifdef CONFIG_PAX_MPROTECT
97582+#include <linux/elf.h>
97583+#include <linux/binfmts.h>
97584+#endif
97585+
97586 #include <asm/uaccess.h>
97587 #include <asm/pgtable.h>
97588 #include <asm/cacheflush.h>
97589 #include <asm/tlbflush.h>
97590+#include <asm/mmu_context.h>
97591
97592 /*
97593 * For a prot_numa update we only hold mmap_sem for read so there is a
97594@@ -251,6 +259,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
97595 return pages;
97596 }
97597
97598+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
97599+/* called while holding the mmap semaphor for writing except stack expansion */
97600+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
97601+{
97602+ unsigned long oldlimit, newlimit = 0UL;
97603+
97604+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
97605+ return;
97606+
97607+ spin_lock(&mm->page_table_lock);
97608+ oldlimit = mm->context.user_cs_limit;
97609+ if ((prot & VM_EXEC) && oldlimit < end)
97610+ /* USER_CS limit moved up */
97611+ newlimit = end;
97612+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
97613+ /* USER_CS limit moved down */
97614+ newlimit = start;
97615+
97616+ if (newlimit) {
97617+ mm->context.user_cs_limit = newlimit;
97618+
97619+#ifdef CONFIG_SMP
97620+ wmb();
97621+ cpus_clear(mm->context.cpu_user_cs_mask);
97622+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
97623+#endif
97624+
97625+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
97626+ }
97627+ spin_unlock(&mm->page_table_lock);
97628+ if (newlimit == end) {
97629+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
97630+
97631+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
97632+ if (is_vm_hugetlb_page(vma))
97633+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
97634+ else
97635+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
97636+ }
97637+}
97638+#endif
97639+
97640 int
97641 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97642 unsigned long start, unsigned long end, unsigned long newflags)
97643@@ -263,11 +313,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97644 int error;
97645 int dirty_accountable = 0;
97646
97647+#ifdef CONFIG_PAX_SEGMEXEC
97648+ struct vm_area_struct *vma_m = NULL;
97649+ unsigned long start_m, end_m;
97650+
97651+ start_m = start + SEGMEXEC_TASK_SIZE;
97652+ end_m = end + SEGMEXEC_TASK_SIZE;
97653+#endif
97654+
97655 if (newflags == oldflags) {
97656 *pprev = vma;
97657 return 0;
97658 }
97659
97660+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
97661+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
97662+
97663+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
97664+ return -ENOMEM;
97665+
97666+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
97667+ return -ENOMEM;
97668+ }
97669+
97670 /*
97671 * If we make a private mapping writable we increase our commit;
97672 * but (without finer accounting) cannot reduce our commit if we
97673@@ -284,6 +352,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97674 }
97675 }
97676
97677+#ifdef CONFIG_PAX_SEGMEXEC
97678+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
97679+ if (start != vma->vm_start) {
97680+ error = split_vma(mm, vma, start, 1);
97681+ if (error)
97682+ goto fail;
97683+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
97684+ *pprev = (*pprev)->vm_next;
97685+ }
97686+
97687+ if (end != vma->vm_end) {
97688+ error = split_vma(mm, vma, end, 0);
97689+ if (error)
97690+ goto fail;
97691+ }
97692+
97693+ if (pax_find_mirror_vma(vma)) {
97694+ error = __do_munmap(mm, start_m, end_m - start_m);
97695+ if (error)
97696+ goto fail;
97697+ } else {
97698+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97699+ if (!vma_m) {
97700+ error = -ENOMEM;
97701+ goto fail;
97702+ }
97703+ vma->vm_flags = newflags;
97704+ error = pax_mirror_vma(vma_m, vma);
97705+ if (error) {
97706+ vma->vm_flags = oldflags;
97707+ goto fail;
97708+ }
97709+ }
97710+ }
97711+#endif
97712+
97713 /*
97714 * First try to merge with previous and/or next vma.
97715 */
97716@@ -314,7 +418,19 @@ success:
97717 * vm_flags and vm_page_prot are protected by the mmap_sem
97718 * held in write mode.
97719 */
97720+
97721+#ifdef CONFIG_PAX_SEGMEXEC
97722+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
97723+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
97724+#endif
97725+
97726 vma->vm_flags = newflags;
97727+
97728+#ifdef CONFIG_PAX_MPROTECT
97729+ if (mm->binfmt && mm->binfmt->handle_mprotect)
97730+ mm->binfmt->handle_mprotect(vma, newflags);
97731+#endif
97732+
97733 dirty_accountable = vma_wants_writenotify(vma);
97734 vma_set_page_prot(vma);
97735
97736@@ -350,6 +466,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97737 end = start + len;
97738 if (end <= start)
97739 return -ENOMEM;
97740+
97741+#ifdef CONFIG_PAX_SEGMEXEC
97742+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
97743+ if (end > SEGMEXEC_TASK_SIZE)
97744+ return -EINVAL;
97745+ } else
97746+#endif
97747+
97748+ if (end > TASK_SIZE)
97749+ return -EINVAL;
97750+
97751 if (!arch_validate_prot(prot))
97752 return -EINVAL;
97753
97754@@ -357,7 +484,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97755 /*
97756 * Does the application expect PROT_READ to imply PROT_EXEC:
97757 */
97758- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
97759+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
97760 prot |= PROT_EXEC;
97761
97762 vm_flags = calc_vm_prot_bits(prot);
97763@@ -389,6 +516,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97764 if (start > vma->vm_start)
97765 prev = vma;
97766
97767+#ifdef CONFIG_PAX_MPROTECT
97768+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
97769+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
97770+#endif
97771+
97772 for (nstart = start ; ; ) {
97773 unsigned long newflags;
97774
97775@@ -399,6 +531,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97776
97777 /* newflags >> 4 shift VM_MAY% in place of VM_% */
97778 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
97779+ if (prot & (PROT_WRITE | PROT_EXEC))
97780+ gr_log_rwxmprotect(vma);
97781+
97782+ error = -EACCES;
97783+ goto out;
97784+ }
97785+
97786+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
97787 error = -EACCES;
97788 goto out;
97789 }
97790@@ -413,6 +553,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97791 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
97792 if (error)
97793 goto out;
97794+
97795+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
97796+
97797 nstart = tmp;
97798
97799 if (nstart < prev->vm_end)
97800diff --git a/mm/mremap.c b/mm/mremap.c
97801index b147f66..98a695a 100644
97802--- a/mm/mremap.c
97803+++ b/mm/mremap.c
97804@@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
97805 continue;
97806 pte = ptep_get_and_clear(mm, old_addr, old_pte);
97807 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
97808+
97809+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
97810+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
97811+ pte = pte_exprotect(pte);
97812+#endif
97813+
97814 pte = move_soft_dirty_pte(pte);
97815 set_pte_at(mm, new_addr, new_pte, pte);
97816 }
97817@@ -345,6 +351,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
97818 if (is_vm_hugetlb_page(vma))
97819 goto Einval;
97820
97821+#ifdef CONFIG_PAX_SEGMEXEC
97822+ if (pax_find_mirror_vma(vma))
97823+ goto Einval;
97824+#endif
97825+
97826 /* We can't remap across vm area boundaries */
97827 if (old_len > vma->vm_end - addr)
97828 goto Efault;
97829@@ -400,20 +411,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
97830 unsigned long ret = -EINVAL;
97831 unsigned long charged = 0;
97832 unsigned long map_flags;
97833+ unsigned long pax_task_size = TASK_SIZE;
97834
97835 if (new_addr & ~PAGE_MASK)
97836 goto out;
97837
97838- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
97839+#ifdef CONFIG_PAX_SEGMEXEC
97840+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
97841+ pax_task_size = SEGMEXEC_TASK_SIZE;
97842+#endif
97843+
97844+ pax_task_size -= PAGE_SIZE;
97845+
97846+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
97847 goto out;
97848
97849 /* Check if the location we're moving into overlaps the
97850 * old location at all, and fail if it does.
97851 */
97852- if ((new_addr <= addr) && (new_addr+new_len) > addr)
97853- goto out;
97854-
97855- if ((addr <= new_addr) && (addr+old_len) > new_addr)
97856+ if (addr + old_len > new_addr && new_addr + new_len > addr)
97857 goto out;
97858
97859 ret = do_munmap(mm, new_addr, new_len);
97860@@ -482,6 +498,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97861 unsigned long ret = -EINVAL;
97862 unsigned long charged = 0;
97863 bool locked = false;
97864+ unsigned long pax_task_size = TASK_SIZE;
97865
97866 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
97867 return ret;
97868@@ -503,6 +520,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97869 if (!new_len)
97870 return ret;
97871
97872+#ifdef CONFIG_PAX_SEGMEXEC
97873+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
97874+ pax_task_size = SEGMEXEC_TASK_SIZE;
97875+#endif
97876+
97877+ pax_task_size -= PAGE_SIZE;
97878+
97879+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
97880+ old_len > pax_task_size || addr > pax_task_size-old_len)
97881+ return ret;
97882+
97883 down_write(&current->mm->mmap_sem);
97884
97885 if (flags & MREMAP_FIXED) {
97886@@ -553,6 +581,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97887 new_addr = addr;
97888 }
97889 ret = addr;
97890+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
97891 goto out;
97892 }
97893 }
97894@@ -576,7 +605,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97895 goto out;
97896 }
97897
97898+ map_flags = vma->vm_flags;
97899 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
97900+ if (!(ret & ~PAGE_MASK)) {
97901+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
97902+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
97903+ }
97904 }
97905 out:
97906 if (ret & ~PAGE_MASK)
97907diff --git a/mm/nommu.c b/mm/nommu.c
97908index bd1808e..b63d87c 100644
97909--- a/mm/nommu.c
97910+++ b/mm/nommu.c
97911@@ -70,7 +70,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
97912 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
97913 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
97914 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
97915-int heap_stack_gap = 0;
97916
97917 atomic_long_t mmap_pages_allocated;
97918
97919@@ -857,15 +856,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
97920 EXPORT_SYMBOL(find_vma);
97921
97922 /*
97923- * find a VMA
97924- * - we don't extend stack VMAs under NOMMU conditions
97925- */
97926-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
97927-{
97928- return find_vma(mm, addr);
97929-}
97930-
97931-/*
97932 * expand a stack to a given address
97933 * - not supported under NOMMU conditions
97934 */
97935@@ -1572,6 +1562,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97936
97937 /* most fields are the same, copy all, and then fixup */
97938 *new = *vma;
97939+ INIT_LIST_HEAD(&new->anon_vma_chain);
97940 *region = *vma->vm_region;
97941 new->vm_region = region;
97942
97943@@ -2002,8 +1993,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
97944 }
97945 EXPORT_SYMBOL(generic_file_remap_pages);
97946
97947-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97948- unsigned long addr, void *buf, int len, int write)
97949+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97950+ unsigned long addr, void *buf, size_t len, int write)
97951 {
97952 struct vm_area_struct *vma;
97953
97954@@ -2044,8 +2035,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97955 *
97956 * The caller must hold a reference on @mm.
97957 */
97958-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97959- void *buf, int len, int write)
97960+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
97961+ void *buf, size_t len, int write)
97962 {
97963 return __access_remote_vm(NULL, mm, addr, buf, len, write);
97964 }
97965@@ -2054,7 +2045,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97966 * Access another process' address space.
97967 * - source/target buffer must be kernel space
97968 */
97969-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
97970+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
97971 {
97972 struct mm_struct *mm;
97973
97974diff --git a/mm/page-writeback.c b/mm/page-writeback.c
97975index 19ceae8..70848ee 100644
97976--- a/mm/page-writeback.c
97977+++ b/mm/page-writeback.c
97978@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
97979 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
97980 * - the bdi dirty thresh drops quickly due to change of JBOD workload
97981 */
97982-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
97983+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
97984 unsigned long thresh,
97985 unsigned long bg_thresh,
97986 unsigned long dirty,
97987diff --git a/mm/page_alloc.c b/mm/page_alloc.c
97988index 616a2c9..0e755f6 100644
97989--- a/mm/page_alloc.c
97990+++ b/mm/page_alloc.c
97991@@ -59,6 +59,7 @@
97992 #include <linux/page-debug-flags.h>
97993 #include <linux/hugetlb.h>
97994 #include <linux/sched/rt.h>
97995+#include <linux/random.h>
97996
97997 #include <asm/sections.h>
97998 #include <asm/tlbflush.h>
97999@@ -356,7 +357,7 @@ out:
98000 * This usage means that zero-order pages may not be compound.
98001 */
98002
98003-static void free_compound_page(struct page *page)
98004+void free_compound_page(struct page *page)
98005 {
98006 __free_pages_ok(page, compound_order(page));
98007 }
98008@@ -741,6 +742,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
98009 int i;
98010 int bad = 0;
98011
98012+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98013+ unsigned long index = 1UL << order;
98014+#endif
98015+
98016 trace_mm_page_free(page, order);
98017 kmemcheck_free_shadow(page, order);
98018
98019@@ -757,6 +762,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
98020 debug_check_no_obj_freed(page_address(page),
98021 PAGE_SIZE << order);
98022 }
98023+
98024+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98025+ for (; index; --index)
98026+ sanitize_highpage(page + index - 1);
98027+#endif
98028+
98029 arch_free_page(page, order);
98030 kernel_map_pages(page, 1 << order, 0);
98031
98032@@ -780,6 +791,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
98033 local_irq_restore(flags);
98034 }
98035
98036+#ifdef CONFIG_PAX_LATENT_ENTROPY
98037+bool __meminitdata extra_latent_entropy;
98038+
98039+static int __init setup_pax_extra_latent_entropy(char *str)
98040+{
98041+ extra_latent_entropy = true;
98042+ return 0;
98043+}
98044+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
98045+
98046+volatile u64 latent_entropy __latent_entropy;
98047+EXPORT_SYMBOL(latent_entropy);
98048+#endif
98049+
98050 void __init __free_pages_bootmem(struct page *page, unsigned int order)
98051 {
98052 unsigned int nr_pages = 1 << order;
98053@@ -795,6 +820,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
98054 __ClearPageReserved(p);
98055 set_page_count(p, 0);
98056
98057+#ifdef CONFIG_PAX_LATENT_ENTROPY
98058+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
98059+ u64 hash = 0;
98060+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
98061+ const u64 *data = lowmem_page_address(page);
98062+
98063+ for (index = 0; index < end; index++)
98064+ hash ^= hash + data[index];
98065+ latent_entropy ^= hash;
98066+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
98067+ }
98068+#endif
98069+
98070 page_zone(page)->managed_pages += nr_pages;
98071 set_page_refcounted(page);
98072 __free_pages(page, order);
98073@@ -923,8 +961,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags)
98074 arch_alloc_page(page, order);
98075 kernel_map_pages(page, 1 << order, 1);
98076
98077+#ifndef CONFIG_PAX_MEMORY_SANITIZE
98078 if (gfp_flags & __GFP_ZERO)
98079 prep_zero_page(page, order, gfp_flags);
98080+#endif
98081
98082 if (order && (gfp_flags & __GFP_COMP))
98083 prep_compound_page(page, order);
98084@@ -1602,7 +1642,7 @@ again:
98085 }
98086
98087 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
98088- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
98089+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
98090 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
98091 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
98092
98093@@ -1923,7 +1963,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
98094 do {
98095 mod_zone_page_state(zone, NR_ALLOC_BATCH,
98096 high_wmark_pages(zone) - low_wmark_pages(zone) -
98097- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
98098+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
98099 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
98100 } while (zone++ != preferred_zone);
98101 }
98102@@ -5698,7 +5738,7 @@ static void __setup_per_zone_wmarks(void)
98103
98104 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
98105 high_wmark_pages(zone) - low_wmark_pages(zone) -
98106- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
98107+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
98108
98109 setup_zone_migrate_reserve(zone);
98110 spin_unlock_irqrestore(&zone->lock, flags);
98111diff --git a/mm/percpu.c b/mm/percpu.c
98112index 014bab6..db5a76f 100644
98113--- a/mm/percpu.c
98114+++ b/mm/percpu.c
98115@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
98116 static unsigned int pcpu_high_unit_cpu __read_mostly;
98117
98118 /* the address of the first chunk which starts with the kernel static area */
98119-void *pcpu_base_addr __read_mostly;
98120+void *pcpu_base_addr __read_only;
98121 EXPORT_SYMBOL_GPL(pcpu_base_addr);
98122
98123 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
98124diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
98125index 5077afc..846c9ef 100644
98126--- a/mm/process_vm_access.c
98127+++ b/mm/process_vm_access.c
98128@@ -13,6 +13,7 @@
98129 #include <linux/uio.h>
98130 #include <linux/sched.h>
98131 #include <linux/highmem.h>
98132+#include <linux/security.h>
98133 #include <linux/ptrace.h>
98134 #include <linux/slab.h>
98135 #include <linux/syscalls.h>
98136@@ -157,19 +158,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
98137 ssize_t iov_len;
98138 size_t total_len = iov_iter_count(iter);
98139
98140+ return -ENOSYS; // PaX: until properly audited
98141+
98142 /*
98143 * Work out how many pages of struct pages we're going to need
98144 * when eventually calling get_user_pages
98145 */
98146 for (i = 0; i < riovcnt; i++) {
98147 iov_len = rvec[i].iov_len;
98148- if (iov_len > 0) {
98149- nr_pages_iov = ((unsigned long)rvec[i].iov_base
98150- + iov_len)
98151- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
98152- / PAGE_SIZE + 1;
98153- nr_pages = max(nr_pages, nr_pages_iov);
98154- }
98155+ if (iov_len <= 0)
98156+ continue;
98157+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
98158+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
98159+ nr_pages = max(nr_pages, nr_pages_iov);
98160 }
98161
98162 if (nr_pages == 0)
98163@@ -197,6 +198,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
98164 goto free_proc_pages;
98165 }
98166
98167+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
98168+ rc = -EPERM;
98169+ goto put_task_struct;
98170+ }
98171+
98172 mm = mm_access(task, PTRACE_MODE_ATTACH);
98173 if (!mm || IS_ERR(mm)) {
98174 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
98175diff --git a/mm/rmap.c b/mm/rmap.c
98176index 3e4c721..a5e3e39 100644
98177--- a/mm/rmap.c
98178+++ b/mm/rmap.c
98179@@ -164,6 +164,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98180 struct anon_vma *anon_vma = vma->anon_vma;
98181 struct anon_vma_chain *avc;
98182
98183+#ifdef CONFIG_PAX_SEGMEXEC
98184+ struct anon_vma_chain *avc_m = NULL;
98185+#endif
98186+
98187 might_sleep();
98188 if (unlikely(!anon_vma)) {
98189 struct mm_struct *mm = vma->vm_mm;
98190@@ -173,6 +177,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98191 if (!avc)
98192 goto out_enomem;
98193
98194+#ifdef CONFIG_PAX_SEGMEXEC
98195+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
98196+ if (!avc_m)
98197+ goto out_enomem_free_avc;
98198+#endif
98199+
98200 anon_vma = find_mergeable_anon_vma(vma);
98201 allocated = NULL;
98202 if (!anon_vma) {
98203@@ -186,6 +196,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98204 /* page_table_lock to protect against threads */
98205 spin_lock(&mm->page_table_lock);
98206 if (likely(!vma->anon_vma)) {
98207+
98208+#ifdef CONFIG_PAX_SEGMEXEC
98209+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
98210+
98211+ if (vma_m) {
98212+ BUG_ON(vma_m->anon_vma);
98213+ vma_m->anon_vma = anon_vma;
98214+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
98215+ avc_m = NULL;
98216+ }
98217+#endif
98218+
98219 vma->anon_vma = anon_vma;
98220 anon_vma_chain_link(vma, avc, anon_vma);
98221 allocated = NULL;
98222@@ -196,12 +218,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98223
98224 if (unlikely(allocated))
98225 put_anon_vma(allocated);
98226+
98227+#ifdef CONFIG_PAX_SEGMEXEC
98228+ if (unlikely(avc_m))
98229+ anon_vma_chain_free(avc_m);
98230+#endif
98231+
98232 if (unlikely(avc))
98233 anon_vma_chain_free(avc);
98234 }
98235 return 0;
98236
98237 out_enomem_free_avc:
98238+
98239+#ifdef CONFIG_PAX_SEGMEXEC
98240+ if (avc_m)
98241+ anon_vma_chain_free(avc_m);
98242+#endif
98243+
98244 anon_vma_chain_free(avc);
98245 out_enomem:
98246 return -ENOMEM;
98247@@ -237,7 +271,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
98248 * Attach the anon_vmas from src to dst.
98249 * Returns 0 on success, -ENOMEM on failure.
98250 */
98251-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
98252+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
98253 {
98254 struct anon_vma_chain *avc, *pavc;
98255 struct anon_vma *root = NULL;
98256@@ -270,7 +304,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
98257 * the corresponding VMA in the parent process is attached to.
98258 * Returns 0 on success, non-zero on failure.
98259 */
98260-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
98261+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
98262 {
98263 struct anon_vma_chain *avc;
98264 struct anon_vma *anon_vma;
98265@@ -376,8 +410,10 @@ static void anon_vma_ctor(void *data)
98266 void __init anon_vma_init(void)
98267 {
98268 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
98269- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
98270- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
98271+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
98272+ anon_vma_ctor);
98273+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
98274+ SLAB_PANIC|SLAB_NO_SANITIZE);
98275 }
98276
98277 /*
98278diff --git a/mm/shmem.c b/mm/shmem.c
98279index 185836b..d7255a1 100644
98280--- a/mm/shmem.c
98281+++ b/mm/shmem.c
98282@@ -33,7 +33,7 @@
98283 #include <linux/swap.h>
98284 #include <linux/aio.h>
98285
98286-static struct vfsmount *shm_mnt;
98287+struct vfsmount *shm_mnt;
98288
98289 #ifdef CONFIG_SHMEM
98290 /*
98291@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
98292 #define BOGO_DIRENT_SIZE 20
98293
98294 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
98295-#define SHORT_SYMLINK_LEN 128
98296+#define SHORT_SYMLINK_LEN 64
98297
98298 /*
98299 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
98300@@ -2558,6 +2558,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
98301 static int shmem_xattr_validate(const char *name)
98302 {
98303 struct { const char *prefix; size_t len; } arr[] = {
98304+
98305+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
98306+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
98307+#endif
98308+
98309 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
98310 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
98311 };
98312@@ -2613,6 +2618,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
98313 if (err)
98314 return err;
98315
98316+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
98317+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
98318+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
98319+ return -EOPNOTSUPP;
98320+ if (size > 8)
98321+ return -EINVAL;
98322+ }
98323+#endif
98324+
98325 return simple_xattr_set(&info->xattrs, name, value, size, flags);
98326 }
98327
98328@@ -2996,8 +3010,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
98329 int err = -ENOMEM;
98330
98331 /* Round up to L1_CACHE_BYTES to resist false sharing */
98332- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
98333- L1_CACHE_BYTES), GFP_KERNEL);
98334+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
98335 if (!sbinfo)
98336 return -ENOMEM;
98337
98338diff --git a/mm/slab.c b/mm/slab.c
98339index f34e053..78a3839 100644
98340--- a/mm/slab.c
98341+++ b/mm/slab.c
98342@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
98343 if ((x)->max_freeable < i) \
98344 (x)->max_freeable = i; \
98345 } while (0)
98346-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
98347-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
98348-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
98349-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
98350+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
98351+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
98352+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
98353+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
98354+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
98355+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
98356 #else
98357 #define STATS_INC_ACTIVE(x) do { } while (0)
98358 #define STATS_DEC_ACTIVE(x) do { } while (0)
98359@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
98360 #define STATS_INC_ALLOCMISS(x) do { } while (0)
98361 #define STATS_INC_FREEHIT(x) do { } while (0)
98362 #define STATS_INC_FREEMISS(x) do { } while (0)
98363+#define STATS_INC_SANITIZED(x) do { } while (0)
98364+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
98365 #endif
98366
98367 #if DEBUG
98368@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
98369 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
98370 */
98371 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
98372- const struct page *page, void *obj)
98373+ const struct page *page, const void *obj)
98374 {
98375 u32 offset = (obj - page->s_mem);
98376 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
98377@@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
98378 * structures first. Without this, further allocations will bug.
98379 */
98380 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
98381- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
98382+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
98383 slab_state = PARTIAL_NODE;
98384
98385 slab_early_init = 0;
98386@@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
98387
98388 cachep = find_mergeable(size, align, flags, name, ctor);
98389 if (cachep) {
98390- cachep->refcount++;
98391+ atomic_inc(&cachep->refcount);
98392
98393 /*
98394 * Adjust the object sizes so that we clear
98395@@ -3352,6 +3356,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
98396 struct array_cache *ac = cpu_cache_get(cachep);
98397
98398 check_irq_off();
98399+
98400+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98401+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
98402+ STATS_INC_NOT_SANITIZED(cachep);
98403+ else {
98404+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
98405+
98406+ if (cachep->ctor)
98407+ cachep->ctor(objp);
98408+
98409+ STATS_INC_SANITIZED(cachep);
98410+ }
98411+#endif
98412+
98413 kmemleak_free_recursive(objp, cachep->flags);
98414 objp = cache_free_debugcheck(cachep, objp, caller);
98415
98416@@ -3557,6 +3575,7 @@ void kfree(const void *objp)
98417
98418 if (unlikely(ZERO_OR_NULL_PTR(objp)))
98419 return;
98420+ VM_BUG_ON(!virt_addr_valid(objp));
98421 local_irq_save(flags);
98422 kfree_debugcheck(objp);
98423 c = virt_to_cache(objp);
98424@@ -3979,14 +3998,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
98425 }
98426 /* cpu stats */
98427 {
98428- unsigned long allochit = atomic_read(&cachep->allochit);
98429- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
98430- unsigned long freehit = atomic_read(&cachep->freehit);
98431- unsigned long freemiss = atomic_read(&cachep->freemiss);
98432+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
98433+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
98434+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
98435+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
98436
98437 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
98438 allochit, allocmiss, freehit, freemiss);
98439 }
98440+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98441+ {
98442+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
98443+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
98444+
98445+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
98446+ }
98447+#endif
98448 #endif
98449 }
98450
98451@@ -4200,13 +4227,69 @@ static const struct file_operations proc_slabstats_operations = {
98452 static int __init slab_proc_init(void)
98453 {
98454 #ifdef CONFIG_DEBUG_SLAB_LEAK
98455- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
98456+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
98457 #endif
98458 return 0;
98459 }
98460 module_init(slab_proc_init);
98461 #endif
98462
98463+bool is_usercopy_object(const void *ptr)
98464+{
98465+ struct page *page;
98466+ struct kmem_cache *cachep;
98467+
98468+ if (ZERO_OR_NULL_PTR(ptr))
98469+ return false;
98470+
98471+ if (!slab_is_available())
98472+ return false;
98473+
98474+ if (!virt_addr_valid(ptr))
98475+ return false;
98476+
98477+ page = virt_to_head_page(ptr);
98478+
98479+ if (!PageSlab(page))
98480+ return false;
98481+
98482+ cachep = page->slab_cache;
98483+ return cachep->flags & SLAB_USERCOPY;
98484+}
98485+
98486+#ifdef CONFIG_PAX_USERCOPY
98487+const char *check_heap_object(const void *ptr, unsigned long n)
98488+{
98489+ struct page *page;
98490+ struct kmem_cache *cachep;
98491+ unsigned int objnr;
98492+ unsigned long offset;
98493+
98494+ if (ZERO_OR_NULL_PTR(ptr))
98495+ return "<null>";
98496+
98497+ if (!virt_addr_valid(ptr))
98498+ return NULL;
98499+
98500+ page = virt_to_head_page(ptr);
98501+
98502+ if (!PageSlab(page))
98503+ return NULL;
98504+
98505+ cachep = page->slab_cache;
98506+ if (!(cachep->flags & SLAB_USERCOPY))
98507+ return cachep->name;
98508+
98509+ objnr = obj_to_index(cachep, page, ptr);
98510+ BUG_ON(objnr >= cachep->num);
98511+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
98512+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
98513+ return NULL;
98514+
98515+ return cachep->name;
98516+}
98517+#endif
98518+
98519 /**
98520 * ksize - get the actual amount of memory allocated for a given object
98521 * @objp: Pointer to the object
98522diff --git a/mm/slab.h b/mm/slab.h
98523index ab019e6..fbcac34 100644
98524--- a/mm/slab.h
98525+++ b/mm/slab.h
98526@@ -22,7 +22,7 @@ struct kmem_cache {
98527 unsigned int align; /* Alignment as calculated */
98528 unsigned long flags; /* Active flags on the slab */
98529 const char *name; /* Slab name for sysfs */
98530- int refcount; /* Use counter */
98531+ atomic_t refcount; /* Use counter */
98532 void (*ctor)(void *); /* Called on object slot creation */
98533 struct list_head list; /* List of all slab caches on the system */
98534 };
98535@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
98536 /* The slab cache that manages slab cache information */
98537 extern struct kmem_cache *kmem_cache;
98538
98539+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98540+#ifdef CONFIG_X86_64
98541+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
98542+#else
98543+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
98544+#endif
98545+enum pax_sanitize_mode {
98546+ PAX_SANITIZE_SLAB_OFF = 0,
98547+ PAX_SANITIZE_SLAB_FAST,
98548+ PAX_SANITIZE_SLAB_FULL,
98549+};
98550+extern enum pax_sanitize_mode pax_sanitize_slab;
98551+#endif
98552+
98553 unsigned long calculate_alignment(unsigned long flags,
98554 unsigned long align, unsigned long size);
98555
98556@@ -116,7 +130,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
98557
98558 /* Legal flag mask for kmem_cache_create(), for various configurations */
98559 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
98560- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
98561+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
98562+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
98563
98564 #if defined(CONFIG_DEBUG_SLAB)
98565 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
98566@@ -300,6 +315,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
98567 return s;
98568
98569 page = virt_to_head_page(x);
98570+
98571+ BUG_ON(!PageSlab(page));
98572+
98573 cachep = page->slab_cache;
98574 if (slab_equal_or_root(cachep, s))
98575 return cachep;
98576diff --git a/mm/slab_common.c b/mm/slab_common.c
98577index dcdab81..3576646 100644
98578--- a/mm/slab_common.c
98579+++ b/mm/slab_common.c
98580@@ -25,11 +25,35 @@
98581
98582 #include "slab.h"
98583
98584-enum slab_state slab_state;
98585+enum slab_state slab_state __read_only;
98586 LIST_HEAD(slab_caches);
98587 DEFINE_MUTEX(slab_mutex);
98588 struct kmem_cache *kmem_cache;
98589
98590+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98591+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
98592+static int __init pax_sanitize_slab_setup(char *str)
98593+{
98594+ if (!str)
98595+ return 0;
98596+
98597+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
98598+ pr_info("PaX slab sanitization: %s\n", "disabled");
98599+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
98600+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
98601+ pr_info("PaX slab sanitization: %s\n", "fast");
98602+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
98603+ } else if (!strcmp(str, "full")) {
98604+ pr_info("PaX slab sanitization: %s\n", "full");
98605+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
98606+ } else
98607+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
98608+
98609+ return 0;
98610+}
98611+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
98612+#endif
98613+
98614 /*
98615 * Set of flags that will prevent slab merging
98616 */
98617@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
98618 * Merge control. If this is set then no merging of slab caches will occur.
98619 * (Could be removed. This was introduced to pacify the merge skeptics.)
98620 */
98621-static int slab_nomerge;
98622+static int slab_nomerge = 1;
98623
98624 static int __init setup_slab_nomerge(char *str)
98625 {
98626@@ -218,7 +242,7 @@ int slab_unmergeable(struct kmem_cache *s)
98627 /*
98628 * We may have set a slab to be unmergeable during bootstrap.
98629 */
98630- if (s->refcount < 0)
98631+ if (atomic_read(&s->refcount) < 0)
98632 return 1;
98633
98634 return 0;
98635@@ -322,7 +346,7 @@ do_kmem_cache_create(char *name, size_t object_size, size_t size, size_t align,
98636 if (err)
98637 goto out_free_cache;
98638
98639- s->refcount = 1;
98640+ atomic_set(&s->refcount, 1);
98641 list_add(&s->list, &slab_caches);
98642 out:
98643 if (err)
98644@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
98645 */
98646 flags &= CACHE_CREATE_MASK;
98647
98648+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98649+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
98650+ flags |= SLAB_NO_SANITIZE;
98651+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
98652+ flags &= ~SLAB_NO_SANITIZE;
98653+#endif
98654+
98655 s = __kmem_cache_alias(name, size, align, flags, ctor);
98656 if (s)
98657 goto out_unlock;
98658@@ -505,8 +536,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
98659
98660 mutex_lock(&slab_mutex);
98661
98662- s->refcount--;
98663- if (s->refcount)
98664+ if (!atomic_dec_and_test(&s->refcount))
98665 goto out_unlock;
98666
98667 if (memcg_cleanup_cache_params(s) != 0)
98668@@ -526,7 +556,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
98669 rcu_barrier();
98670
98671 memcg_free_cache_params(s);
98672-#ifdef SLAB_SUPPORTS_SYSFS
98673+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
98674 sysfs_slab_remove(s);
98675 #else
98676 slab_kmem_cache_release(s);
98677@@ -582,7 +612,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
98678 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
98679 name, size, err);
98680
98681- s->refcount = -1; /* Exempt from merging for now */
98682+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
98683 }
98684
98685 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
98686@@ -595,7 +625,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
98687
98688 create_boot_cache(s, name, size, flags);
98689 list_add(&s->list, &slab_caches);
98690- s->refcount = 1;
98691+ atomic_set(&s->refcount, 1);
98692 return s;
98693 }
98694
98695@@ -607,6 +637,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
98696 EXPORT_SYMBOL(kmalloc_dma_caches);
98697 #endif
98698
98699+#ifdef CONFIG_PAX_USERCOPY_SLABS
98700+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
98701+EXPORT_SYMBOL(kmalloc_usercopy_caches);
98702+#endif
98703+
98704 /*
98705 * Conversion table for small slabs sizes / 8 to the index in the
98706 * kmalloc array. This is necessary for slabs < 192 since we have non power
98707@@ -671,6 +706,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
98708 return kmalloc_dma_caches[index];
98709
98710 #endif
98711+
98712+#ifdef CONFIG_PAX_USERCOPY_SLABS
98713+ if (unlikely((flags & GFP_USERCOPY)))
98714+ return kmalloc_usercopy_caches[index];
98715+
98716+#endif
98717+
98718 return kmalloc_caches[index];
98719 }
98720
98721@@ -727,7 +769,7 @@ void __init create_kmalloc_caches(unsigned long flags)
98722 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
98723 if (!kmalloc_caches[i]) {
98724 kmalloc_caches[i] = create_kmalloc_cache(NULL,
98725- 1 << i, flags);
98726+ 1 << i, SLAB_USERCOPY | flags);
98727 }
98728
98729 /*
98730@@ -736,10 +778,10 @@ void __init create_kmalloc_caches(unsigned long flags)
98731 * earlier power of two caches
98732 */
98733 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
98734- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
98735+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
98736
98737 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
98738- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
98739+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
98740 }
98741
98742 /* Kmalloc array is now usable */
98743@@ -772,6 +814,23 @@ void __init create_kmalloc_caches(unsigned long flags)
98744 }
98745 }
98746 #endif
98747+
98748+#ifdef CONFIG_PAX_USERCOPY_SLABS
98749+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
98750+ struct kmem_cache *s = kmalloc_caches[i];
98751+
98752+ if (s) {
98753+ int size = kmalloc_size(i);
98754+ char *n = kasprintf(GFP_NOWAIT,
98755+ "usercopy-kmalloc-%d", size);
98756+
98757+ BUG_ON(!n);
98758+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
98759+ size, SLAB_USERCOPY | flags);
98760+ }
98761+ }
98762+#endif
98763+
98764 }
98765 #endif /* !CONFIG_SLOB */
98766
98767@@ -830,6 +889,9 @@ void print_slabinfo_header(struct seq_file *m)
98768 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
98769 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
98770 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
98771+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98772+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
98773+#endif
98774 #endif
98775 seq_putc(m, '\n');
98776 }
98777diff --git a/mm/slob.c b/mm/slob.c
98778index 96a8620..3e7e663 100644
98779--- a/mm/slob.c
98780+++ b/mm/slob.c
98781@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
98782 /*
98783 * Return the size of a slob block.
98784 */
98785-static slobidx_t slob_units(slob_t *s)
98786+static slobidx_t slob_units(const slob_t *s)
98787 {
98788 if (s->units > 0)
98789 return s->units;
98790@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
98791 /*
98792 * Return the next free slob block pointer after this one.
98793 */
98794-static slob_t *slob_next(slob_t *s)
98795+static slob_t *slob_next(const slob_t *s)
98796 {
98797 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
98798 slobidx_t next;
98799@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
98800 /*
98801 * Returns true if s is the last free block in its page.
98802 */
98803-static int slob_last(slob_t *s)
98804+static int slob_last(const slob_t *s)
98805 {
98806 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
98807 }
98808
98809-static void *slob_new_pages(gfp_t gfp, int order, int node)
98810+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
98811 {
98812- void *page;
98813+ struct page *page;
98814
98815 #ifdef CONFIG_NUMA
98816 if (node != NUMA_NO_NODE)
98817@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
98818 if (!page)
98819 return NULL;
98820
98821- return page_address(page);
98822+ __SetPageSlab(page);
98823+ return page;
98824 }
98825
98826-static void slob_free_pages(void *b, int order)
98827+static void slob_free_pages(struct page *sp, int order)
98828 {
98829 if (current->reclaim_state)
98830 current->reclaim_state->reclaimed_slab += 1 << order;
98831- free_pages((unsigned long)b, order);
98832+ __ClearPageSlab(sp);
98833+ page_mapcount_reset(sp);
98834+ sp->private = 0;
98835+ __free_pages(sp, order);
98836 }
98837
98838 /*
98839@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
98840
98841 /* Not enough space: must allocate a new page */
98842 if (!b) {
98843- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
98844- if (!b)
98845+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
98846+ if (!sp)
98847 return NULL;
98848- sp = virt_to_page(b);
98849- __SetPageSlab(sp);
98850+ b = page_address(sp);
98851
98852 spin_lock_irqsave(&slob_lock, flags);
98853 sp->units = SLOB_UNITS(PAGE_SIZE);
98854 sp->freelist = b;
98855+ sp->private = 0;
98856 INIT_LIST_HEAD(&sp->lru);
98857 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
98858 set_slob_page_free(sp, slob_list);
98859@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
98860 /*
98861 * slob_free: entry point into the slob allocator.
98862 */
98863-static void slob_free(void *block, int size)
98864+static void slob_free(struct kmem_cache *c, void *block, int size)
98865 {
98866 struct page *sp;
98867 slob_t *prev, *next, *b = (slob_t *)block;
98868@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
98869 if (slob_page_free(sp))
98870 clear_slob_page_free(sp);
98871 spin_unlock_irqrestore(&slob_lock, flags);
98872- __ClearPageSlab(sp);
98873- page_mapcount_reset(sp);
98874- slob_free_pages(b, 0);
98875+ slob_free_pages(sp, 0);
98876 return;
98877 }
98878
98879+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98880+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
98881+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
98882+#endif
98883+
98884 if (!slob_page_free(sp)) {
98885 /* This slob page is about to become partially free. Easy! */
98886 sp->units = units;
98887@@ -424,11 +431,10 @@ out:
98888 */
98889
98890 static __always_inline void *
98891-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
98892+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
98893 {
98894- unsigned int *m;
98895- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98896- void *ret;
98897+ slob_t *m;
98898+ void *ret = NULL;
98899
98900 gfp &= gfp_allowed_mask;
98901
98902@@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
98903
98904 if (!m)
98905 return NULL;
98906- *m = size;
98907+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
98908+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
98909+ m[0].units = size;
98910+ m[1].units = align;
98911 ret = (void *)m + align;
98912
98913 trace_kmalloc_node(caller, ret,
98914 size, size + align, gfp, node);
98915 } else {
98916 unsigned int order = get_order(size);
98917+ struct page *page;
98918
98919 if (likely(order))
98920 gfp |= __GFP_COMP;
98921- ret = slob_new_pages(gfp, order, node);
98922+ page = slob_new_pages(gfp, order, node);
98923+ if (page) {
98924+ ret = page_address(page);
98925+ page->private = size;
98926+ }
98927
98928 trace_kmalloc_node(caller, ret,
98929 size, PAGE_SIZE << order, gfp, node);
98930 }
98931
98932- kmemleak_alloc(ret, size, 1, gfp);
98933+ return ret;
98934+}
98935+
98936+static __always_inline void *
98937+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
98938+{
98939+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98940+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
98941+
98942+ if (!ZERO_OR_NULL_PTR(ret))
98943+ kmemleak_alloc(ret, size, 1, gfp);
98944 return ret;
98945 }
98946
98947@@ -491,34 +515,112 @@ void kfree(const void *block)
98948 return;
98949 kmemleak_free(block);
98950
98951+ VM_BUG_ON(!virt_addr_valid(block));
98952 sp = virt_to_page(block);
98953- if (PageSlab(sp)) {
98954+ VM_BUG_ON(!PageSlab(sp));
98955+ if (!sp->private) {
98956 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98957- unsigned int *m = (unsigned int *)(block - align);
98958- slob_free(m, *m + align);
98959- } else
98960+ slob_t *m = (slob_t *)(block - align);
98961+ slob_free(NULL, m, m[0].units + align);
98962+ } else {
98963+ __ClearPageSlab(sp);
98964+ page_mapcount_reset(sp);
98965+ sp->private = 0;
98966 __free_pages(sp, compound_order(sp));
98967+ }
98968 }
98969 EXPORT_SYMBOL(kfree);
98970
98971+bool is_usercopy_object(const void *ptr)
98972+{
98973+ if (!slab_is_available())
98974+ return false;
98975+
98976+ // PAX: TODO
98977+
98978+ return false;
98979+}
98980+
98981+#ifdef CONFIG_PAX_USERCOPY
98982+const char *check_heap_object(const void *ptr, unsigned long n)
98983+{
98984+ struct page *page;
98985+ const slob_t *free;
98986+ const void *base;
98987+ unsigned long flags;
98988+
98989+ if (ZERO_OR_NULL_PTR(ptr))
98990+ return "<null>";
98991+
98992+ if (!virt_addr_valid(ptr))
98993+ return NULL;
98994+
98995+ page = virt_to_head_page(ptr);
98996+ if (!PageSlab(page))
98997+ return NULL;
98998+
98999+ if (page->private) {
99000+ base = page;
99001+ if (base <= ptr && n <= page->private - (ptr - base))
99002+ return NULL;
99003+ return "<slob>";
99004+ }
99005+
99006+ /* some tricky double walking to find the chunk */
99007+ spin_lock_irqsave(&slob_lock, flags);
99008+ base = (void *)((unsigned long)ptr & PAGE_MASK);
99009+ free = page->freelist;
99010+
99011+ while (!slob_last(free) && (void *)free <= ptr) {
99012+ base = free + slob_units(free);
99013+ free = slob_next(free);
99014+ }
99015+
99016+ while (base < (void *)free) {
99017+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
99018+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
99019+ int offset;
99020+
99021+ if (ptr < base + align)
99022+ break;
99023+
99024+ offset = ptr - base - align;
99025+ if (offset >= m) {
99026+ base += size;
99027+ continue;
99028+ }
99029+
99030+ if (n > m - offset)
99031+ break;
99032+
99033+ spin_unlock_irqrestore(&slob_lock, flags);
99034+ return NULL;
99035+ }
99036+
99037+ spin_unlock_irqrestore(&slob_lock, flags);
99038+ return "<slob>";
99039+}
99040+#endif
99041+
99042 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
99043 size_t ksize(const void *block)
99044 {
99045 struct page *sp;
99046 int align;
99047- unsigned int *m;
99048+ slob_t *m;
99049
99050 BUG_ON(!block);
99051 if (unlikely(block == ZERO_SIZE_PTR))
99052 return 0;
99053
99054 sp = virt_to_page(block);
99055- if (unlikely(!PageSlab(sp)))
99056- return PAGE_SIZE << compound_order(sp);
99057+ VM_BUG_ON(!PageSlab(sp));
99058+ if (sp->private)
99059+ return sp->private;
99060
99061 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
99062- m = (unsigned int *)(block - align);
99063- return SLOB_UNITS(*m) * SLOB_UNIT;
99064+ m = (slob_t *)(block - align);
99065+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
99066 }
99067 EXPORT_SYMBOL(ksize);
99068
99069@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
99070
99071 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
99072 {
99073- void *b;
99074+ void *b = NULL;
99075
99076 flags &= gfp_allowed_mask;
99077
99078 lockdep_trace_alloc(flags);
99079
99080+#ifdef CONFIG_PAX_USERCOPY_SLABS
99081+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
99082+#else
99083 if (c->size < PAGE_SIZE) {
99084 b = slob_alloc(c->size, flags, c->align, node);
99085 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
99086 SLOB_UNITS(c->size) * SLOB_UNIT,
99087 flags, node);
99088 } else {
99089- b = slob_new_pages(flags, get_order(c->size), node);
99090+ struct page *sp;
99091+
99092+ sp = slob_new_pages(flags, get_order(c->size), node);
99093+ if (sp) {
99094+ b = page_address(sp);
99095+ sp->private = c->size;
99096+ }
99097 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
99098 PAGE_SIZE << get_order(c->size),
99099 flags, node);
99100 }
99101+#endif
99102
99103 if (b && c->ctor)
99104 c->ctor(b);
99105@@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
99106 EXPORT_SYMBOL(kmem_cache_alloc_node);
99107 #endif
99108
99109-static void __kmem_cache_free(void *b, int size)
99110+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
99111 {
99112- if (size < PAGE_SIZE)
99113- slob_free(b, size);
99114+ struct page *sp;
99115+
99116+ sp = virt_to_page(b);
99117+ BUG_ON(!PageSlab(sp));
99118+ if (!sp->private)
99119+ slob_free(c, b, size);
99120 else
99121- slob_free_pages(b, get_order(size));
99122+ slob_free_pages(sp, get_order(size));
99123 }
99124
99125 static void kmem_rcu_free(struct rcu_head *head)
99126@@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
99127 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
99128 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
99129
99130- __kmem_cache_free(b, slob_rcu->size);
99131+ __kmem_cache_free(NULL, b, slob_rcu->size);
99132 }
99133
99134 void kmem_cache_free(struct kmem_cache *c, void *b)
99135 {
99136+ int size = c->size;
99137+
99138+#ifdef CONFIG_PAX_USERCOPY_SLABS
99139+ if (size + c->align < PAGE_SIZE) {
99140+ size += c->align;
99141+ b -= c->align;
99142+ }
99143+#endif
99144+
99145 kmemleak_free_recursive(b, c->flags);
99146 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
99147 struct slob_rcu *slob_rcu;
99148- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
99149- slob_rcu->size = c->size;
99150+ slob_rcu = b + (size - sizeof(struct slob_rcu));
99151+ slob_rcu->size = size;
99152 call_rcu(&slob_rcu->head, kmem_rcu_free);
99153 } else {
99154- __kmem_cache_free(b, c->size);
99155+ __kmem_cache_free(c, b, size);
99156 }
99157
99158+#ifdef CONFIG_PAX_USERCOPY_SLABS
99159+ trace_kfree(_RET_IP_, b);
99160+#else
99161 trace_kmem_cache_free(_RET_IP_, b);
99162+#endif
99163+
99164 }
99165 EXPORT_SYMBOL(kmem_cache_free);
99166
99167diff --git a/mm/slub.c b/mm/slub.c
99168index ae7b9f1..7b3fdbe 100644
99169--- a/mm/slub.c
99170+++ b/mm/slub.c
99171@@ -197,7 +197,7 @@ struct track {
99172
99173 enum track_item { TRACK_ALLOC, TRACK_FREE };
99174
99175-#ifdef CONFIG_SYSFS
99176+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99177 static int sysfs_slab_add(struct kmem_cache *);
99178 static int sysfs_slab_alias(struct kmem_cache *, const char *);
99179 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
99180@@ -535,7 +535,7 @@ static void print_track(const char *s, struct track *t)
99181 if (!t->addr)
99182 return;
99183
99184- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
99185+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
99186 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
99187 #ifdef CONFIG_STACKTRACE
99188 {
99189@@ -2645,6 +2645,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
99190
99191 slab_free_hook(s, x);
99192
99193+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99194+ if (!(s->flags & SLAB_NO_SANITIZE)) {
99195+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
99196+ if (s->ctor)
99197+ s->ctor(x);
99198+ }
99199+#endif
99200+
99201 redo:
99202 /*
99203 * Determine the currently cpus per cpu slab.
99204@@ -2982,6 +2990,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
99205 s->inuse = size;
99206
99207 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
99208+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99209+ (!(flags & SLAB_NO_SANITIZE)) ||
99210+#endif
99211 s->ctor)) {
99212 /*
99213 * Relocate free pointer after the object if it is not
99214@@ -3301,6 +3312,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
99215 EXPORT_SYMBOL(__kmalloc_node);
99216 #endif
99217
99218+bool is_usercopy_object(const void *ptr)
99219+{
99220+ struct page *page;
99221+ struct kmem_cache *s;
99222+
99223+ if (ZERO_OR_NULL_PTR(ptr))
99224+ return false;
99225+
99226+ if (!slab_is_available())
99227+ return false;
99228+
99229+ if (!virt_addr_valid(ptr))
99230+ return false;
99231+
99232+ page = virt_to_head_page(ptr);
99233+
99234+ if (!PageSlab(page))
99235+ return false;
99236+
99237+ s = page->slab_cache;
99238+ return s->flags & SLAB_USERCOPY;
99239+}
99240+
99241+#ifdef CONFIG_PAX_USERCOPY
99242+const char *check_heap_object(const void *ptr, unsigned long n)
99243+{
99244+ struct page *page;
99245+ struct kmem_cache *s;
99246+ unsigned long offset;
99247+
99248+ if (ZERO_OR_NULL_PTR(ptr))
99249+ return "<null>";
99250+
99251+ if (!virt_addr_valid(ptr))
99252+ return NULL;
99253+
99254+ page = virt_to_head_page(ptr);
99255+
99256+ if (!PageSlab(page))
99257+ return NULL;
99258+
99259+ s = page->slab_cache;
99260+ if (!(s->flags & SLAB_USERCOPY))
99261+ return s->name;
99262+
99263+ offset = (ptr - page_address(page)) % s->size;
99264+ if (offset <= s->object_size && n <= s->object_size - offset)
99265+ return NULL;
99266+
99267+ return s->name;
99268+}
99269+#endif
99270+
99271 size_t ksize(const void *object)
99272 {
99273 struct page *page;
99274@@ -3329,6 +3393,7 @@ void kfree(const void *x)
99275 if (unlikely(ZERO_OR_NULL_PTR(x)))
99276 return;
99277
99278+ VM_BUG_ON(!virt_addr_valid(x));
99279 page = virt_to_head_page(x);
99280 if (unlikely(!PageSlab(page))) {
99281 BUG_ON(!PageCompound(page));
99282@@ -3624,7 +3689,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99283 int i;
99284 struct kmem_cache *c;
99285
99286- s->refcount++;
99287+ atomic_inc(&s->refcount);
99288
99289 /*
99290 * Adjust the object sizes so that we clear
99291@@ -3643,7 +3708,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99292 }
99293
99294 if (sysfs_slab_alias(s, name)) {
99295- s->refcount--;
99296+ atomic_dec(&s->refcount);
99297 s = NULL;
99298 }
99299 }
99300@@ -3760,7 +3825,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
99301 }
99302 #endif
99303
99304-#ifdef CONFIG_SYSFS
99305+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99306 static int count_inuse(struct page *page)
99307 {
99308 return page->inuse;
99309@@ -4041,7 +4106,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
99310 len += sprintf(buf + len, "%7ld ", l->count);
99311
99312 if (l->addr)
99313+#ifdef CONFIG_GRKERNSEC_HIDESYM
99314+ len += sprintf(buf + len, "%pS", NULL);
99315+#else
99316 len += sprintf(buf + len, "%pS", (void *)l->addr);
99317+#endif
99318 else
99319 len += sprintf(buf + len, "<not-available>");
99320
99321@@ -4143,12 +4212,12 @@ static void __init resiliency_test(void)
99322 validate_slab_cache(kmalloc_caches[9]);
99323 }
99324 #else
99325-#ifdef CONFIG_SYSFS
99326+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99327 static void resiliency_test(void) {};
99328 #endif
99329 #endif
99330
99331-#ifdef CONFIG_SYSFS
99332+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99333 enum slab_stat_type {
99334 SL_ALL, /* All slabs */
99335 SL_PARTIAL, /* Only partially allocated slabs */
99336@@ -4385,13 +4454,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
99337 {
99338 if (!s->ctor)
99339 return 0;
99340+#ifdef CONFIG_GRKERNSEC_HIDESYM
99341+ return sprintf(buf, "%pS\n", NULL);
99342+#else
99343 return sprintf(buf, "%pS\n", s->ctor);
99344+#endif
99345 }
99346 SLAB_ATTR_RO(ctor);
99347
99348 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
99349 {
99350- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
99351+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
99352 }
99353 SLAB_ATTR_RO(aliases);
99354
99355@@ -4479,6 +4552,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
99356 SLAB_ATTR_RO(cache_dma);
99357 #endif
99358
99359+#ifdef CONFIG_PAX_USERCOPY_SLABS
99360+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
99361+{
99362+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
99363+}
99364+SLAB_ATTR_RO(usercopy);
99365+#endif
99366+
99367+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99368+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
99369+{
99370+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
99371+}
99372+SLAB_ATTR_RO(sanitize);
99373+#endif
99374+
99375 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
99376 {
99377 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
99378@@ -4534,7 +4623,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
99379 * as well as cause other issues like converting a mergeable
99380 * cache into an umergeable one.
99381 */
99382- if (s->refcount > 1)
99383+ if (atomic_read(&s->refcount) > 1)
99384 return -EINVAL;
99385
99386 s->flags &= ~SLAB_TRACE;
99387@@ -4654,7 +4743,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
99388 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
99389 size_t length)
99390 {
99391- if (s->refcount > 1)
99392+ if (atomic_read(&s->refcount) > 1)
99393 return -EINVAL;
99394
99395 s->flags &= ~SLAB_FAILSLAB;
99396@@ -4824,6 +4913,12 @@ static struct attribute *slab_attrs[] = {
99397 #ifdef CONFIG_ZONE_DMA
99398 &cache_dma_attr.attr,
99399 #endif
99400+#ifdef CONFIG_PAX_USERCOPY_SLABS
99401+ &usercopy_attr.attr,
99402+#endif
99403+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99404+ &sanitize_attr.attr,
99405+#endif
99406 #ifdef CONFIG_NUMA
99407 &remote_node_defrag_ratio_attr.attr,
99408 #endif
99409@@ -5068,6 +5163,7 @@ static char *create_unique_id(struct kmem_cache *s)
99410 return name;
99411 }
99412
99413+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99414 static int sysfs_slab_add(struct kmem_cache *s)
99415 {
99416 int err;
99417@@ -5141,6 +5237,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
99418 kobject_del(&s->kobj);
99419 kobject_put(&s->kobj);
99420 }
99421+#endif
99422
99423 /*
99424 * Need to buffer aliases during bootup until sysfs becomes
99425@@ -5154,6 +5251,7 @@ struct saved_alias {
99426
99427 static struct saved_alias *alias_list;
99428
99429+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99430 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
99431 {
99432 struct saved_alias *al;
99433@@ -5176,6 +5274,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
99434 alias_list = al;
99435 return 0;
99436 }
99437+#endif
99438
99439 static int __init slab_sysfs_init(void)
99440 {
99441diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
99442index 4cba9c2..b4f9fcc 100644
99443--- a/mm/sparse-vmemmap.c
99444+++ b/mm/sparse-vmemmap.c
99445@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
99446 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
99447 if (!p)
99448 return NULL;
99449- pud_populate(&init_mm, pud, p);
99450+ pud_populate_kernel(&init_mm, pud, p);
99451 }
99452 return pud;
99453 }
99454@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
99455 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
99456 if (!p)
99457 return NULL;
99458- pgd_populate(&init_mm, pgd, p);
99459+ pgd_populate_kernel(&init_mm, pgd, p);
99460 }
99461 return pgd;
99462 }
99463diff --git a/mm/sparse.c b/mm/sparse.c
99464index d1b48b6..6e8590e 100644
99465--- a/mm/sparse.c
99466+++ b/mm/sparse.c
99467@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
99468
99469 for (i = 0; i < PAGES_PER_SECTION; i++) {
99470 if (PageHWPoison(&memmap[i])) {
99471- atomic_long_sub(1, &num_poisoned_pages);
99472+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
99473 ClearPageHWPoison(&memmap[i]);
99474 }
99475 }
99476diff --git a/mm/swap.c b/mm/swap.c
99477index 8a12b33..7068e78 100644
99478--- a/mm/swap.c
99479+++ b/mm/swap.c
99480@@ -31,6 +31,7 @@
99481 #include <linux/memcontrol.h>
99482 #include <linux/gfp.h>
99483 #include <linux/uio.h>
99484+#include <linux/hugetlb.h>
99485
99486 #include "internal.h"
99487
99488@@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
99489
99490 __page_cache_release(page);
99491 dtor = get_compound_page_dtor(page);
99492+ if (!PageHuge(page))
99493+ BUG_ON(dtor != free_compound_page);
99494 (*dtor)(page);
99495 }
99496
99497diff --git a/mm/swapfile.c b/mm/swapfile.c
99498index 8798b2e..348f9dd 100644
99499--- a/mm/swapfile.c
99500+++ b/mm/swapfile.c
99501@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
99502
99503 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
99504 /* Activity counter to indicate that a swapon or swapoff has occurred */
99505-static atomic_t proc_poll_event = ATOMIC_INIT(0);
99506+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
99507
99508 static inline unsigned char swap_count(unsigned char ent)
99509 {
99510@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
99511 spin_unlock(&swap_lock);
99512
99513 err = 0;
99514- atomic_inc(&proc_poll_event);
99515+ atomic_inc_unchecked(&proc_poll_event);
99516 wake_up_interruptible(&proc_poll_wait);
99517
99518 out_dput:
99519@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
99520
99521 poll_wait(file, &proc_poll_wait, wait);
99522
99523- if (seq->poll_event != atomic_read(&proc_poll_event)) {
99524- seq->poll_event = atomic_read(&proc_poll_event);
99525+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
99526+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
99527 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
99528 }
99529
99530@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
99531 return ret;
99532
99533 seq = file->private_data;
99534- seq->poll_event = atomic_read(&proc_poll_event);
99535+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
99536 return 0;
99537 }
99538
99539@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
99540 (frontswap_map) ? "FS" : "");
99541
99542 mutex_unlock(&swapon_mutex);
99543- atomic_inc(&proc_poll_event);
99544+ atomic_inc_unchecked(&proc_poll_event);
99545 wake_up_interruptible(&proc_poll_wait);
99546
99547 if (S_ISREG(inode->i_mode))
99548diff --git a/mm/util.c b/mm/util.c
99549index fec39d4..3e60325 100644
99550--- a/mm/util.c
99551+++ b/mm/util.c
99552@@ -195,6 +195,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
99553 void arch_pick_mmap_layout(struct mm_struct *mm)
99554 {
99555 mm->mmap_base = TASK_UNMAPPED_BASE;
99556+
99557+#ifdef CONFIG_PAX_RANDMMAP
99558+ if (mm->pax_flags & MF_PAX_RANDMMAP)
99559+ mm->mmap_base += mm->delta_mmap;
99560+#endif
99561+
99562 mm->get_unmapped_area = arch_get_unmapped_area;
99563 }
99564 #endif
99565@@ -371,6 +377,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
99566 if (!mm->arg_end)
99567 goto out_mm; /* Shh! No looking before we're done */
99568
99569+ if (gr_acl_handle_procpidmem(task))
99570+ goto out_mm;
99571+
99572 len = mm->arg_end - mm->arg_start;
99573
99574 if (len > buflen)
99575diff --git a/mm/vmalloc.c b/mm/vmalloc.c
99576index 90520af..24231aa 100644
99577--- a/mm/vmalloc.c
99578+++ b/mm/vmalloc.c
99579@@ -40,6 +40,21 @@ struct vfree_deferred {
99580 };
99581 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
99582
99583+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99584+struct stack_deferred_llist {
99585+ struct llist_head list;
99586+ void *stack;
99587+ void *lowmem_stack;
99588+};
99589+
99590+struct stack_deferred {
99591+ struct stack_deferred_llist list;
99592+ struct work_struct wq;
99593+};
99594+
99595+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
99596+#endif
99597+
99598 static void __vunmap(const void *, int);
99599
99600 static void free_work(struct work_struct *w)
99601@@ -47,12 +62,30 @@ static void free_work(struct work_struct *w)
99602 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
99603 struct llist_node *llnode = llist_del_all(&p->list);
99604 while (llnode) {
99605- void *p = llnode;
99606+ void *x = llnode;
99607 llnode = llist_next(llnode);
99608- __vunmap(p, 1);
99609+ __vunmap(x, 1);
99610 }
99611 }
99612
99613+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99614+static void unmap_work(struct work_struct *w)
99615+{
99616+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
99617+ struct llist_node *llnode = llist_del_all(&p->list.list);
99618+ while (llnode) {
99619+ struct stack_deferred_llist *x =
99620+ llist_entry((struct llist_head *)llnode,
99621+ struct stack_deferred_llist, list);
99622+ void *stack = ACCESS_ONCE(x->stack);
99623+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
99624+ llnode = llist_next(llnode);
99625+ __vunmap(stack, 0);
99626+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
99627+ }
99628+}
99629+#endif
99630+
99631 /*** Page table manipulation functions ***/
99632
99633 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
99634@@ -61,8 +94,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
99635
99636 pte = pte_offset_kernel(pmd, addr);
99637 do {
99638- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
99639- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
99640+
99641+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99642+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
99643+ BUG_ON(!pte_exec(*pte));
99644+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
99645+ continue;
99646+ }
99647+#endif
99648+
99649+ {
99650+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
99651+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
99652+ }
99653 } while (pte++, addr += PAGE_SIZE, addr != end);
99654 }
99655
99656@@ -122,16 +166,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
99657 pte = pte_alloc_kernel(pmd, addr);
99658 if (!pte)
99659 return -ENOMEM;
99660+
99661+ pax_open_kernel();
99662 do {
99663 struct page *page = pages[*nr];
99664
99665- if (WARN_ON(!pte_none(*pte)))
99666+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99667+ if (pgprot_val(prot) & _PAGE_NX)
99668+#endif
99669+
99670+ if (!pte_none(*pte)) {
99671+ pax_close_kernel();
99672+ WARN_ON(1);
99673 return -EBUSY;
99674- if (WARN_ON(!page))
99675+ }
99676+ if (!page) {
99677+ pax_close_kernel();
99678+ WARN_ON(1);
99679 return -ENOMEM;
99680+ }
99681 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
99682 (*nr)++;
99683 } while (pte++, addr += PAGE_SIZE, addr != end);
99684+ pax_close_kernel();
99685 return 0;
99686 }
99687
99688@@ -141,7 +198,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
99689 pmd_t *pmd;
99690 unsigned long next;
99691
99692- pmd = pmd_alloc(&init_mm, pud, addr);
99693+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
99694 if (!pmd)
99695 return -ENOMEM;
99696 do {
99697@@ -158,7 +215,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
99698 pud_t *pud;
99699 unsigned long next;
99700
99701- pud = pud_alloc(&init_mm, pgd, addr);
99702+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
99703 if (!pud)
99704 return -ENOMEM;
99705 do {
99706@@ -218,6 +275,12 @@ int is_vmalloc_or_module_addr(const void *x)
99707 if (addr >= MODULES_VADDR && addr < MODULES_END)
99708 return 1;
99709 #endif
99710+
99711+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99712+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
99713+ return 1;
99714+#endif
99715+
99716 return is_vmalloc_addr(x);
99717 }
99718
99719@@ -238,8 +301,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
99720
99721 if (!pgd_none(*pgd)) {
99722 pud_t *pud = pud_offset(pgd, addr);
99723+#ifdef CONFIG_X86
99724+ if (!pud_large(*pud))
99725+#endif
99726 if (!pud_none(*pud)) {
99727 pmd_t *pmd = pmd_offset(pud, addr);
99728+#ifdef CONFIG_X86
99729+ if (!pmd_large(*pmd))
99730+#endif
99731 if (!pmd_none(*pmd)) {
99732 pte_t *ptep, pte;
99733
99734@@ -1183,13 +1252,23 @@ void __init vmalloc_init(void)
99735 for_each_possible_cpu(i) {
99736 struct vmap_block_queue *vbq;
99737 struct vfree_deferred *p;
99738+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99739+ struct stack_deferred *p2;
99740+#endif
99741
99742 vbq = &per_cpu(vmap_block_queue, i);
99743 spin_lock_init(&vbq->lock);
99744 INIT_LIST_HEAD(&vbq->free);
99745+
99746 p = &per_cpu(vfree_deferred, i);
99747 init_llist_head(&p->list);
99748 INIT_WORK(&p->wq, free_work);
99749+
99750+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99751+ p2 = &per_cpu(stack_deferred, i);
99752+ init_llist_head(&p2->list.list);
99753+ INIT_WORK(&p2->wq, unmap_work);
99754+#endif
99755 }
99756
99757 /* Import existing vmlist entries. */
99758@@ -1314,6 +1393,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
99759 struct vm_struct *area;
99760
99761 BUG_ON(in_interrupt());
99762+
99763+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99764+ if (flags & VM_KERNEXEC) {
99765+ if (start != VMALLOC_START || end != VMALLOC_END)
99766+ return NULL;
99767+ start = (unsigned long)MODULES_EXEC_VADDR;
99768+ end = (unsigned long)MODULES_EXEC_END;
99769+ }
99770+#endif
99771+
99772 if (flags & VM_IOREMAP)
99773 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
99774
99775@@ -1519,6 +1608,23 @@ void vunmap(const void *addr)
99776 }
99777 EXPORT_SYMBOL(vunmap);
99778
99779+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99780+void unmap_process_stacks(struct task_struct *task)
99781+{
99782+ if (unlikely(in_interrupt())) {
99783+ struct stack_deferred *p = &__get_cpu_var(stack_deferred);
99784+ struct stack_deferred_llist *list = task->stack;
99785+ list->stack = task->stack;
99786+ list->lowmem_stack = task->lowmem_stack;
99787+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
99788+ schedule_work(&p->wq);
99789+ } else {
99790+ __vunmap(task->stack, 0);
99791+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
99792+ }
99793+}
99794+#endif
99795+
99796 /**
99797 * vmap - map an array of pages into virtually contiguous space
99798 * @pages: array of page pointers
99799@@ -1539,6 +1645,11 @@ void *vmap(struct page **pages, unsigned int count,
99800 if (count > totalram_pages)
99801 return NULL;
99802
99803+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99804+ if (!(pgprot_val(prot) & _PAGE_NX))
99805+ flags |= VM_KERNEXEC;
99806+#endif
99807+
99808 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
99809 __builtin_return_address(0));
99810 if (!area)
99811@@ -1641,6 +1752,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
99812 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
99813 goto fail;
99814
99815+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99816+ if (!(pgprot_val(prot) & _PAGE_NX))
99817+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
99818+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
99819+ else
99820+#endif
99821+
99822 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
99823 start, end, node, gfp_mask, caller);
99824 if (!area)
99825@@ -1817,10 +1935,9 @@ EXPORT_SYMBOL(vzalloc_node);
99826 * For tight control over page level allocator and protection flags
99827 * use __vmalloc() instead.
99828 */
99829-
99830 void *vmalloc_exec(unsigned long size)
99831 {
99832- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
99833+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
99834 NUMA_NO_NODE, __builtin_return_address(0));
99835 }
99836
99837@@ -2127,6 +2244,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
99838 {
99839 struct vm_struct *area;
99840
99841+ BUG_ON(vma->vm_mirror);
99842+
99843 size = PAGE_ALIGN(size);
99844
99845 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
99846@@ -2609,7 +2728,11 @@ static int s_show(struct seq_file *m, void *p)
99847 v->addr, v->addr + v->size, v->size);
99848
99849 if (v->caller)
99850+#ifdef CONFIG_GRKERNSEC_HIDESYM
99851+ seq_printf(m, " %pK", v->caller);
99852+#else
99853 seq_printf(m, " %pS", v->caller);
99854+#endif
99855
99856 if (v->nr_pages)
99857 seq_printf(m, " pages=%d", v->nr_pages);
99858diff --git a/mm/vmstat.c b/mm/vmstat.c
99859index 1b12d39..57b29b2 100644
99860--- a/mm/vmstat.c
99861+++ b/mm/vmstat.c
99862@@ -22,6 +22,7 @@
99863 #include <linux/writeback.h>
99864 #include <linux/compaction.h>
99865 #include <linux/mm_inline.h>
99866+#include <linux/grsecurity.h>
99867
99868 #include "internal.h"
99869
99870@@ -81,7 +82,7 @@ void vm_events_fold_cpu(int cpu)
99871 *
99872 * vm_stat contains the global counters
99873 */
99874-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
99875+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
99876 EXPORT_SYMBOL(vm_stat);
99877
99878 #ifdef CONFIG_SMP
99879@@ -433,7 +434,7 @@ static int fold_diff(int *diff)
99880
99881 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
99882 if (diff[i]) {
99883- atomic_long_add(diff[i], &vm_stat[i]);
99884+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
99885 changes++;
99886 }
99887 return changes;
99888@@ -471,7 +472,7 @@ static int refresh_cpu_vm_stats(void)
99889 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
99890 if (v) {
99891
99892- atomic_long_add(v, &zone->vm_stat[i]);
99893+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
99894 global_diff[i] += v;
99895 #ifdef CONFIG_NUMA
99896 /* 3 seconds idle till flush */
99897@@ -535,7 +536,7 @@ void cpu_vm_stats_fold(int cpu)
99898
99899 v = p->vm_stat_diff[i];
99900 p->vm_stat_diff[i] = 0;
99901- atomic_long_add(v, &zone->vm_stat[i]);
99902+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
99903 global_diff[i] += v;
99904 }
99905 }
99906@@ -555,8 +556,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
99907 if (pset->vm_stat_diff[i]) {
99908 int v = pset->vm_stat_diff[i];
99909 pset->vm_stat_diff[i] = 0;
99910- atomic_long_add(v, &zone->vm_stat[i]);
99911- atomic_long_add(v, &vm_stat[i]);
99912+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
99913+ atomic_long_add_unchecked(v, &vm_stat[i]);
99914 }
99915 }
99916 #endif
99917@@ -1189,10 +1190,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
99918 stat_items_size += sizeof(struct vm_event_state);
99919 #endif
99920
99921- v = kmalloc(stat_items_size, GFP_KERNEL);
99922+ v = kzalloc(stat_items_size, GFP_KERNEL);
99923 m->private = v;
99924 if (!v)
99925 return ERR_PTR(-ENOMEM);
99926+
99927+#ifdef CONFIG_GRKERNSEC_PROC_ADD
99928+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99929+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
99930+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
99931+ && !in_group_p(grsec_proc_gid)
99932+#endif
99933+ )
99934+ return (unsigned long *)m->private + *pos;
99935+#endif
99936+#endif
99937+
99938 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
99939 v[i] = global_page_state(i);
99940 v += NR_VM_ZONE_STAT_ITEMS;
99941@@ -1424,10 +1437,16 @@ static int __init setup_vmstat(void)
99942 cpu_notifier_register_done();
99943 #endif
99944 #ifdef CONFIG_PROC_FS
99945- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
99946- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
99947- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
99948- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
99949+ {
99950+ mode_t gr_mode = S_IRUGO;
99951+#ifdef CONFIG_GRKERNSEC_PROC_ADD
99952+ gr_mode = S_IRUSR;
99953+#endif
99954+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
99955+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
99956+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
99957+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
99958+ }
99959 #endif
99960 return 0;
99961 }
99962diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
99963index 64c6bed..b79a5de 100644
99964--- a/net/8021q/vlan.c
99965+++ b/net/8021q/vlan.c
99966@@ -481,7 +481,7 @@ out:
99967 return NOTIFY_DONE;
99968 }
99969
99970-static struct notifier_block vlan_notifier_block __read_mostly = {
99971+static struct notifier_block vlan_notifier_block = {
99972 .notifier_call = vlan_device_event,
99973 };
99974
99975@@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
99976 err = -EPERM;
99977 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
99978 break;
99979- if ((args.u.name_type >= 0) &&
99980- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
99981+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
99982 struct vlan_net *vn;
99983
99984 vn = net_generic(net, vlan_net_id);
99985diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
99986index 8ac8a5c..991defc 100644
99987--- a/net/8021q/vlan_netlink.c
99988+++ b/net/8021q/vlan_netlink.c
99989@@ -238,7 +238,7 @@ nla_put_failure:
99990 return -EMSGSIZE;
99991 }
99992
99993-struct rtnl_link_ops vlan_link_ops __read_mostly = {
99994+struct rtnl_link_ops vlan_link_ops = {
99995 .kind = "vlan",
99996 .maxtype = IFLA_VLAN_MAX,
99997 .policy = vlan_policy,
99998diff --git a/net/9p/client.c b/net/9p/client.c
99999index e86a9bea..e91f70e 100644
100000--- a/net/9p/client.c
100001+++ b/net/9p/client.c
100002@@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
100003 len - inline_len);
100004 } else {
100005 err = copy_from_user(ename + inline_len,
100006- uidata, len - inline_len);
100007+ (char __force_user *)uidata, len - inline_len);
100008 if (err) {
100009 err = -EFAULT;
100010 goto out_err;
100011@@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
100012 kernel_buf = 1;
100013 indata = data;
100014 } else
100015- indata = (__force char *)udata;
100016+ indata = (__force_kernel char *)udata;
100017 /*
100018 * response header len is 11
100019 * PDU Header(7) + IO Size (4)
100020@@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
100021 kernel_buf = 1;
100022 odata = data;
100023 } else
100024- odata = (char *)udata;
100025+ odata = (char __force_kernel *)udata;
100026 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
100027 P9_ZC_HDR_SZ, kernel_buf, "dqd",
100028 fid->fid, offset, rsize);
100029diff --git a/net/9p/mod.c b/net/9p/mod.c
100030index 6ab36ae..6f1841b 100644
100031--- a/net/9p/mod.c
100032+++ b/net/9p/mod.c
100033@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
100034 void v9fs_register_trans(struct p9_trans_module *m)
100035 {
100036 spin_lock(&v9fs_trans_lock);
100037- list_add_tail(&m->list, &v9fs_trans_list);
100038+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
100039 spin_unlock(&v9fs_trans_lock);
100040 }
100041 EXPORT_SYMBOL(v9fs_register_trans);
100042@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
100043 void v9fs_unregister_trans(struct p9_trans_module *m)
100044 {
100045 spin_lock(&v9fs_trans_lock);
100046- list_del_init(&m->list);
100047+ pax_list_del_init((struct list_head *)&m->list);
100048 spin_unlock(&v9fs_trans_lock);
100049 }
100050 EXPORT_SYMBOL(v9fs_unregister_trans);
100051diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
100052index 80d08f6..de63fd1 100644
100053--- a/net/9p/trans_fd.c
100054+++ b/net/9p/trans_fd.c
100055@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
100056 oldfs = get_fs();
100057 set_fs(get_ds());
100058 /* The cast to a user pointer is valid due to the set_fs() */
100059- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
100060+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
100061 set_fs(oldfs);
100062
100063 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
100064diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
100065index af46bc4..f9adfcd 100644
100066--- a/net/appletalk/atalk_proc.c
100067+++ b/net/appletalk/atalk_proc.c
100068@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
100069 struct proc_dir_entry *p;
100070 int rc = -ENOMEM;
100071
100072- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
100073+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
100074 if (!atalk_proc_dir)
100075 goto out;
100076
100077diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
100078index 876fbe8..8bbea9f 100644
100079--- a/net/atm/atm_misc.c
100080+++ b/net/atm/atm_misc.c
100081@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
100082 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
100083 return 1;
100084 atm_return(vcc, truesize);
100085- atomic_inc(&vcc->stats->rx_drop);
100086+ atomic_inc_unchecked(&vcc->stats->rx_drop);
100087 return 0;
100088 }
100089 EXPORT_SYMBOL(atm_charge);
100090@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
100091 }
100092 }
100093 atm_return(vcc, guess);
100094- atomic_inc(&vcc->stats->rx_drop);
100095+ atomic_inc_unchecked(&vcc->stats->rx_drop);
100096 return NULL;
100097 }
100098 EXPORT_SYMBOL(atm_alloc_charge);
100099@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
100100
100101 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
100102 {
100103-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
100104+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
100105 __SONET_ITEMS
100106 #undef __HANDLE_ITEM
100107 }
100108@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
100109
100110 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
100111 {
100112-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
100113+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
100114 __SONET_ITEMS
100115 #undef __HANDLE_ITEM
100116 }
100117diff --git a/net/atm/lec.c b/net/atm/lec.c
100118index 4b98f89..5a2f6cb 100644
100119--- a/net/atm/lec.c
100120+++ b/net/atm/lec.c
100121@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
100122 }
100123
100124 static struct lane2_ops lane2_ops = {
100125- lane2_resolve, /* resolve, spec 3.1.3 */
100126- lane2_associate_req, /* associate_req, spec 3.1.4 */
100127- NULL /* associate indicator, spec 3.1.5 */
100128+ .resolve = lane2_resolve,
100129+ .associate_req = lane2_associate_req,
100130+ .associate_indicator = NULL
100131 };
100132
100133 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
100134diff --git a/net/atm/lec.h b/net/atm/lec.h
100135index 4149db1..f2ab682 100644
100136--- a/net/atm/lec.h
100137+++ b/net/atm/lec.h
100138@@ -48,7 +48,7 @@ struct lane2_ops {
100139 const u8 *tlvs, u32 sizeoftlvs);
100140 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
100141 const u8 *tlvs, u32 sizeoftlvs);
100142-};
100143+} __no_const;
100144
100145 /*
100146 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
100147diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
100148index d1b2d9a..d549f7f 100644
100149--- a/net/atm/mpoa_caches.c
100150+++ b/net/atm/mpoa_caches.c
100151@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
100152
100153
100154 static struct in_cache_ops ingress_ops = {
100155- in_cache_add_entry, /* add_entry */
100156- in_cache_get, /* get */
100157- in_cache_get_with_mask, /* get_with_mask */
100158- in_cache_get_by_vcc, /* get_by_vcc */
100159- in_cache_put, /* put */
100160- in_cache_remove_entry, /* remove_entry */
100161- cache_hit, /* cache_hit */
100162- clear_count_and_expired, /* clear_count */
100163- check_resolving_entries, /* check_resolving */
100164- refresh_entries, /* refresh */
100165- in_destroy_cache /* destroy_cache */
100166+ .add_entry = in_cache_add_entry,
100167+ .get = in_cache_get,
100168+ .get_with_mask = in_cache_get_with_mask,
100169+ .get_by_vcc = in_cache_get_by_vcc,
100170+ .put = in_cache_put,
100171+ .remove_entry = in_cache_remove_entry,
100172+ .cache_hit = cache_hit,
100173+ .clear_count = clear_count_and_expired,
100174+ .check_resolving = check_resolving_entries,
100175+ .refresh = refresh_entries,
100176+ .destroy_cache = in_destroy_cache
100177 };
100178
100179 static struct eg_cache_ops egress_ops = {
100180- eg_cache_add_entry, /* add_entry */
100181- eg_cache_get_by_cache_id, /* get_by_cache_id */
100182- eg_cache_get_by_tag, /* get_by_tag */
100183- eg_cache_get_by_vcc, /* get_by_vcc */
100184- eg_cache_get_by_src_ip, /* get_by_src_ip */
100185- eg_cache_put, /* put */
100186- eg_cache_remove_entry, /* remove_entry */
100187- update_eg_cache_entry, /* update */
100188- clear_expired, /* clear_expired */
100189- eg_destroy_cache /* destroy_cache */
100190+ .add_entry = eg_cache_add_entry,
100191+ .get_by_cache_id = eg_cache_get_by_cache_id,
100192+ .get_by_tag = eg_cache_get_by_tag,
100193+ .get_by_vcc = eg_cache_get_by_vcc,
100194+ .get_by_src_ip = eg_cache_get_by_src_ip,
100195+ .put = eg_cache_put,
100196+ .remove_entry = eg_cache_remove_entry,
100197+ .update = update_eg_cache_entry,
100198+ .clear_expired = clear_expired,
100199+ .destroy_cache = eg_destroy_cache
100200 };
100201
100202
100203diff --git a/net/atm/proc.c b/net/atm/proc.c
100204index bbb6461..cf04016 100644
100205--- a/net/atm/proc.c
100206+++ b/net/atm/proc.c
100207@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
100208 const struct k_atm_aal_stats *stats)
100209 {
100210 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
100211- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
100212- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
100213- atomic_read(&stats->rx_drop));
100214+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
100215+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
100216+ atomic_read_unchecked(&stats->rx_drop));
100217 }
100218
100219 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
100220diff --git a/net/atm/resources.c b/net/atm/resources.c
100221index 0447d5d..3cf4728 100644
100222--- a/net/atm/resources.c
100223+++ b/net/atm/resources.c
100224@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
100225 static void copy_aal_stats(struct k_atm_aal_stats *from,
100226 struct atm_aal_stats *to)
100227 {
100228-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
100229+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
100230 __AAL_STAT_ITEMS
100231 #undef __HANDLE_ITEM
100232 }
100233@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
100234 static void subtract_aal_stats(struct k_atm_aal_stats *from,
100235 struct atm_aal_stats *to)
100236 {
100237-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
100238+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
100239 __AAL_STAT_ITEMS
100240 #undef __HANDLE_ITEM
100241 }
100242diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
100243index 919a5ce..cc6b444 100644
100244--- a/net/ax25/sysctl_net_ax25.c
100245+++ b/net/ax25/sysctl_net_ax25.c
100246@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
100247 {
100248 char path[sizeof("net/ax25/") + IFNAMSIZ];
100249 int k;
100250- struct ctl_table *table;
100251+ ctl_table_no_const *table;
100252
100253 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
100254 if (!table)
100255diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
100256index 1e80539..676c37a 100644
100257--- a/net/batman-adv/bat_iv_ogm.c
100258+++ b/net/batman-adv/bat_iv_ogm.c
100259@@ -313,7 +313,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
100260
100261 /* randomize initial seqno to avoid collision */
100262 get_random_bytes(&random_seqno, sizeof(random_seqno));
100263- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
100264+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
100265
100266 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
100267 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
100268@@ -918,9 +918,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
100269 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
100270
100271 /* change sequence number to network order */
100272- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
100273+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
100274 batadv_ogm_packet->seqno = htonl(seqno);
100275- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
100276+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
100277
100278 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
100279
100280@@ -1597,7 +1597,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
100281 return;
100282
100283 /* could be changed by schedule_own_packet() */
100284- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
100285+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
100286
100287 if (ogm_packet->flags & BATADV_DIRECTLINK)
100288 has_directlink_flag = true;
100289diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
100290index fc1835c..42f2c2f 100644
100291--- a/net/batman-adv/fragmentation.c
100292+++ b/net/batman-adv/fragmentation.c
100293@@ -251,7 +251,7 @@ batadv_frag_merge_packets(struct hlist_head *chain, struct sk_buff *skb)
100294 kfree(entry);
100295
100296 /* Make room for the rest of the fragments. */
100297- if (pskb_expand_head(skb_out, 0, size - skb->len, GFP_ATOMIC) < 0) {
100298+ if (pskb_expand_head(skb_out, 0, size - skb_out->len, GFP_ATOMIC) < 0) {
100299 kfree_skb(skb_out);
100300 skb_out = NULL;
100301 goto free;
100302@@ -450,7 +450,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
100303 frag_header.packet_type = BATADV_UNICAST_FRAG;
100304 frag_header.version = BATADV_COMPAT_VERSION;
100305 frag_header.ttl = BATADV_TTL;
100306- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
100307+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
100308 frag_header.reserved = 0;
100309 frag_header.no = 0;
100310 frag_header.total_size = htons(skb->len);
100311diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
100312index 5467955..75ad4e3 100644
100313--- a/net/batman-adv/soft-interface.c
100314+++ b/net/batman-adv/soft-interface.c
100315@@ -296,7 +296,7 @@ send:
100316 primary_if->net_dev->dev_addr);
100317
100318 /* set broadcast sequence number */
100319- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
100320+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
100321 bcast_packet->seqno = htonl(seqno);
100322
100323 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
100324@@ -761,7 +761,7 @@ static int batadv_softif_init_late(struct net_device *dev)
100325 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
100326
100327 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
100328- atomic_set(&bat_priv->bcast_seqno, 1);
100329+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
100330 atomic_set(&bat_priv->tt.vn, 0);
100331 atomic_set(&bat_priv->tt.local_changes, 0);
100332 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
100333@@ -775,7 +775,7 @@ static int batadv_softif_init_late(struct net_device *dev)
100334
100335 /* randomize initial seqno to avoid collision */
100336 get_random_bytes(&random_seqno, sizeof(random_seqno));
100337- atomic_set(&bat_priv->frag_seqno, random_seqno);
100338+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
100339
100340 bat_priv->primary_if = NULL;
100341 bat_priv->num_ifaces = 0;
100342@@ -983,7 +983,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
100343 return 0;
100344 }
100345
100346-struct rtnl_link_ops batadv_link_ops __read_mostly = {
100347+struct rtnl_link_ops batadv_link_ops = {
100348 .kind = "batadv",
100349 .priv_size = sizeof(struct batadv_priv),
100350 .setup = batadv_softif_init_early,
100351diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
100352index 8854c05..ee5d5497 100644
100353--- a/net/batman-adv/types.h
100354+++ b/net/batman-adv/types.h
100355@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
100356 struct batadv_hard_iface_bat_iv {
100357 unsigned char *ogm_buff;
100358 int ogm_buff_len;
100359- atomic_t ogm_seqno;
100360+ atomic_unchecked_t ogm_seqno;
100361 };
100362
100363 /**
100364@@ -768,7 +768,7 @@ struct batadv_priv {
100365 atomic_t bonding;
100366 atomic_t fragmentation;
100367 atomic_t packet_size_max;
100368- atomic_t frag_seqno;
100369+ atomic_unchecked_t frag_seqno;
100370 #ifdef CONFIG_BATMAN_ADV_BLA
100371 atomic_t bridge_loop_avoidance;
100372 #endif
100373@@ -787,7 +787,7 @@ struct batadv_priv {
100374 #endif
100375 uint32_t isolation_mark;
100376 uint32_t isolation_mark_mask;
100377- atomic_t bcast_seqno;
100378+ atomic_unchecked_t bcast_seqno;
100379 atomic_t bcast_queue_left;
100380 atomic_t batman_queue_left;
100381 char num_ifaces;
100382diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
100383index c2e0d14..bfa852b 100644
100384--- a/net/bluetooth/6lowpan.c
100385+++ b/net/bluetooth/6lowpan.c
100386@@ -367,7 +367,6 @@ static int recv_pkt(struct sk_buff *skb, struct net_device *dev,
100387
100388 drop:
100389 dev->stats.rx_dropped++;
100390- kfree_skb(skb);
100391 return NET_RX_DROP;
100392 }
100393
100394diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
100395index 85bcc21..ce82722d 100644
100396--- a/net/bluetooth/bnep/core.c
100397+++ b/net/bluetooth/bnep/core.c
100398@@ -533,6 +533,9 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
100399
100400 BT_DBG("");
100401
100402+ if (!l2cap_is_socket(sock))
100403+ return -EBADFD;
100404+
100405 baswap((void *) dst, &l2cap_pi(sock->sk)->chan->dst);
100406 baswap((void *) src, &l2cap_pi(sock->sk)->chan->src);
100407
100408diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
100409index 67fe5e8..278a194 100644
100410--- a/net/bluetooth/cmtp/core.c
100411+++ b/net/bluetooth/cmtp/core.c
100412@@ -334,6 +334,9 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
100413
100414 BT_DBG("");
100415
100416+ if (!l2cap_is_socket(sock))
100417+ return -EBADFD;
100418+
100419 session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL);
100420 if (!session)
100421 return -ENOMEM;
100422diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
100423index 115f149..f0ba286 100644
100424--- a/net/bluetooth/hci_sock.c
100425+++ b/net/bluetooth/hci_sock.c
100426@@ -1067,7 +1067,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
100427 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
100428 }
100429
100430- len = min_t(unsigned int, len, sizeof(uf));
100431+ len = min((size_t)len, sizeof(uf));
100432 if (copy_from_user(&uf, optval, len)) {
100433 err = -EFAULT;
100434 break;
100435diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
100436index 1b7d605..02ebd10 100644
100437--- a/net/bluetooth/hidp/core.c
100438+++ b/net/bluetooth/hidp/core.c
100439@@ -1318,13 +1318,14 @@ int hidp_connection_add(struct hidp_connadd_req *req,
100440 {
100441 struct hidp_session *session;
100442 struct l2cap_conn *conn;
100443- struct l2cap_chan *chan = l2cap_pi(ctrl_sock->sk)->chan;
100444+ struct l2cap_chan *chan;
100445 int ret;
100446
100447 ret = hidp_verify_sockets(ctrl_sock, intr_sock);
100448 if (ret)
100449 return ret;
100450
100451+ chan = l2cap_pi(ctrl_sock->sk)->chan;
100452 conn = NULL;
100453 l2cap_chan_lock(chan);
100454 if (chan->conn)
100455diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
100456index b6f9777..36d3039 100644
100457--- a/net/bluetooth/l2cap_core.c
100458+++ b/net/bluetooth/l2cap_core.c
100459@@ -3512,8 +3512,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
100460 break;
100461
100462 case L2CAP_CONF_RFC:
100463- if (olen == sizeof(rfc))
100464- memcpy(&rfc, (void *)val, olen);
100465+ if (olen != sizeof(rfc))
100466+ break;
100467+
100468+ memcpy(&rfc, (void *)val, olen);
100469
100470 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
100471 rfc.mode != chan->mode)
100472diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
100473index 31f106e..323f606 100644
100474--- a/net/bluetooth/l2cap_sock.c
100475+++ b/net/bluetooth/l2cap_sock.c
100476@@ -628,7 +628,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
100477 struct sock *sk = sock->sk;
100478 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
100479 struct l2cap_options opts;
100480- int len, err = 0;
100481+ int err = 0;
100482+ size_t len = optlen;
100483 u32 opt;
100484
100485 BT_DBG("sk %p", sk);
100486@@ -655,7 +656,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
100487 opts.max_tx = chan->max_tx;
100488 opts.txwin_size = chan->tx_win;
100489
100490- len = min_t(unsigned int, sizeof(opts), optlen);
100491+ len = min(sizeof(opts), len);
100492 if (copy_from_user((char *) &opts, optval, len)) {
100493 err = -EFAULT;
100494 break;
100495@@ -742,7 +743,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100496 struct bt_security sec;
100497 struct bt_power pwr;
100498 struct l2cap_conn *conn;
100499- int len, err = 0;
100500+ int err = 0;
100501+ size_t len = optlen;
100502 u32 opt;
100503
100504 BT_DBG("sk %p", sk);
100505@@ -766,7 +768,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100506
100507 sec.level = BT_SECURITY_LOW;
100508
100509- len = min_t(unsigned int, sizeof(sec), optlen);
100510+ len = min(sizeof(sec), len);
100511 if (copy_from_user((char *) &sec, optval, len)) {
100512 err = -EFAULT;
100513 break;
100514@@ -862,7 +864,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100515
100516 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
100517
100518- len = min_t(unsigned int, sizeof(pwr), optlen);
100519+ len = min(sizeof(pwr), len);
100520 if (copy_from_user((char *) &pwr, optval, len)) {
100521 err = -EFAULT;
100522 break;
100523diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
100524index 8bbbb5e..6fc0950 100644
100525--- a/net/bluetooth/rfcomm/sock.c
100526+++ b/net/bluetooth/rfcomm/sock.c
100527@@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
100528 struct sock *sk = sock->sk;
100529 struct bt_security sec;
100530 int err = 0;
100531- size_t len;
100532+ size_t len = optlen;
100533 u32 opt;
100534
100535 BT_DBG("sk %p", sk);
100536@@ -709,7 +709,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
100537
100538 sec.level = BT_SECURITY_LOW;
100539
100540- len = min_t(unsigned int, sizeof(sec), optlen);
100541+ len = min(sizeof(sec), len);
100542 if (copy_from_user((char *) &sec, optval, len)) {
100543 err = -EFAULT;
100544 break;
100545diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
100546index 8e385a0..a5bdd8e 100644
100547--- a/net/bluetooth/rfcomm/tty.c
100548+++ b/net/bluetooth/rfcomm/tty.c
100549@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
100550 BT_DBG("tty %p id %d", tty, tty->index);
100551
100552 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
100553- dev->channel, dev->port.count);
100554+ dev->channel, atomic_read(&dev->port.count));
100555
100556 err = tty_port_open(&dev->port, tty, filp);
100557 if (err)
100558@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
100559 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
100560
100561 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
100562- dev->port.count);
100563+ atomic_read(&dev->port.count));
100564
100565 tty_port_close(&dev->port, tty, filp);
100566 }
100567diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
100568index e5ec470..cbfabd1 100644
100569--- a/net/bridge/br_netlink.c
100570+++ b/net/bridge/br_netlink.c
100571@@ -564,7 +564,7 @@ static struct rtnl_af_ops br_af_ops = {
100572 .get_link_af_size = br_get_link_af_size,
100573 };
100574
100575-struct rtnl_link_ops br_link_ops __read_mostly = {
100576+struct rtnl_link_ops br_link_ops = {
100577 .kind = "bridge",
100578 .priv_size = sizeof(struct net_bridge),
100579 .setup = br_dev_setup,
100580diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
100581index d9a8c05..8dadc6c6 100644
100582--- a/net/bridge/netfilter/ebtables.c
100583+++ b/net/bridge/netfilter/ebtables.c
100584@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
100585 tmp.valid_hooks = t->table->valid_hooks;
100586 }
100587 mutex_unlock(&ebt_mutex);
100588- if (copy_to_user(user, &tmp, *len) != 0) {
100589+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100590 BUGPRINT("c2u Didn't work\n");
100591 ret = -EFAULT;
100592 break;
100593@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
100594 goto out;
100595 tmp.valid_hooks = t->valid_hooks;
100596
100597- if (copy_to_user(user, &tmp, *len) != 0) {
100598+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100599 ret = -EFAULT;
100600 break;
100601 }
100602@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
100603 tmp.entries_size = t->table->entries_size;
100604 tmp.valid_hooks = t->table->valid_hooks;
100605
100606- if (copy_to_user(user, &tmp, *len) != 0) {
100607+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100608 ret = -EFAULT;
100609 break;
100610 }
100611diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
100612index f5afda1..dcf770a 100644
100613--- a/net/caif/cfctrl.c
100614+++ b/net/caif/cfctrl.c
100615@@ -10,6 +10,7 @@
100616 #include <linux/spinlock.h>
100617 #include <linux/slab.h>
100618 #include <linux/pkt_sched.h>
100619+#include <linux/sched.h>
100620 #include <net/caif/caif_layer.h>
100621 #include <net/caif/cfpkt.h>
100622 #include <net/caif/cfctrl.h>
100623@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
100624 memset(&dev_info, 0, sizeof(dev_info));
100625 dev_info.id = 0xff;
100626 cfsrvl_init(&this->serv, 0, &dev_info, false);
100627- atomic_set(&this->req_seq_no, 1);
100628- atomic_set(&this->rsp_seq_no, 1);
100629+ atomic_set_unchecked(&this->req_seq_no, 1);
100630+ atomic_set_unchecked(&this->rsp_seq_no, 1);
100631 this->serv.layer.receive = cfctrl_recv;
100632 sprintf(this->serv.layer.name, "ctrl");
100633 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
100634@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
100635 struct cfctrl_request_info *req)
100636 {
100637 spin_lock_bh(&ctrl->info_list_lock);
100638- atomic_inc(&ctrl->req_seq_no);
100639- req->sequence_no = atomic_read(&ctrl->req_seq_no);
100640+ atomic_inc_unchecked(&ctrl->req_seq_no);
100641+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
100642 list_add_tail(&req->list, &ctrl->list);
100643 spin_unlock_bh(&ctrl->info_list_lock);
100644 }
100645@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
100646 if (p != first)
100647 pr_warn("Requests are not received in order\n");
100648
100649- atomic_set(&ctrl->rsp_seq_no,
100650+ atomic_set_unchecked(&ctrl->rsp_seq_no,
100651 p->sequence_no);
100652 list_del(&p->list);
100653 goto out;
100654diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
100655index 4589ff67..46d6b8f 100644
100656--- a/net/caif/chnl_net.c
100657+++ b/net/caif/chnl_net.c
100658@@ -516,7 +516,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
100659 };
100660
100661
100662-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
100663+static struct rtnl_link_ops ipcaif_link_ops = {
100664 .kind = "caif",
100665 .priv_size = sizeof(struct chnl_net),
100666 .setup = ipcaif_net_setup,
100667diff --git a/net/can/af_can.c b/net/can/af_can.c
100668index ce82337..5d17b4d 100644
100669--- a/net/can/af_can.c
100670+++ b/net/can/af_can.c
100671@@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
100672 };
100673
100674 /* notifier block for netdevice event */
100675-static struct notifier_block can_netdev_notifier __read_mostly = {
100676+static struct notifier_block can_netdev_notifier = {
100677 .notifier_call = can_notifier,
100678 };
100679
100680diff --git a/net/can/bcm.c b/net/can/bcm.c
100681index dcb75c0..24b1b43 100644
100682--- a/net/can/bcm.c
100683+++ b/net/can/bcm.c
100684@@ -1624,7 +1624,7 @@ static int __init bcm_module_init(void)
100685 }
100686
100687 /* create /proc/net/can-bcm directory */
100688- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
100689+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
100690 return 0;
100691 }
100692
100693diff --git a/net/can/gw.c b/net/can/gw.c
100694index 050a211..bb9fe33 100644
100695--- a/net/can/gw.c
100696+++ b/net/can/gw.c
100697@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
100698 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
100699
100700 static HLIST_HEAD(cgw_list);
100701-static struct notifier_block notifier;
100702
100703 static struct kmem_cache *cgw_cache __read_mostly;
100704
100705@@ -947,6 +946,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
100706 return err;
100707 }
100708
100709+static struct notifier_block notifier = {
100710+ .notifier_call = cgw_notifier
100711+};
100712+
100713 static __init int cgw_module_init(void)
100714 {
100715 /* sanitize given module parameter */
100716@@ -962,7 +965,6 @@ static __init int cgw_module_init(void)
100717 return -ENOMEM;
100718
100719 /* set notifier */
100720- notifier.notifier_call = cgw_notifier;
100721 register_netdevice_notifier(&notifier);
100722
100723 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
100724diff --git a/net/can/proc.c b/net/can/proc.c
100725index 1a19b98..df2b4ec 100644
100726--- a/net/can/proc.c
100727+++ b/net/can/proc.c
100728@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
100729 void can_init_proc(void)
100730 {
100731 /* create /proc/net/can directory */
100732- can_dir = proc_mkdir("can", init_net.proc_net);
100733+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
100734
100735 if (!can_dir) {
100736 printk(KERN_INFO "can: failed to create /proc/net/can . "
100737diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
100738index 8d1653c..77ad145 100644
100739--- a/net/ceph/messenger.c
100740+++ b/net/ceph/messenger.c
100741@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
100742 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
100743
100744 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
100745-static atomic_t addr_str_seq = ATOMIC_INIT(0);
100746+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
100747
100748 static struct page *zero_page; /* used in certain error cases */
100749
100750@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
100751 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
100752 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
100753
100754- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
100755+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
100756 s = addr_str[i];
100757
100758 switch (ss->ss_family) {
100759diff --git a/net/compat.c b/net/compat.c
100760index bc8aeef..f9c070c 100644
100761--- a/net/compat.c
100762+++ b/net/compat.c
100763@@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
100764 return -EFAULT;
100765 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
100766 kmsg->msg_namelen = sizeof(struct sockaddr_storage);
100767- kmsg->msg_name = compat_ptr(tmp1);
100768- kmsg->msg_iov = compat_ptr(tmp2);
100769- kmsg->msg_control = compat_ptr(tmp3);
100770+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
100771+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
100772+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
100773 return 0;
100774 }
100775
100776@@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100777
100778 if (kern_msg->msg_name && kern_msg->msg_namelen) {
100779 if (mode == VERIFY_READ) {
100780- int err = move_addr_to_kernel(kern_msg->msg_name,
100781+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
100782 kern_msg->msg_namelen,
100783 kern_address);
100784 if (err < 0)
100785@@ -100,7 +100,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100786 }
100787
100788 tot_len = iov_from_user_compat_to_kern(kern_iov,
100789- (struct compat_iovec __user *)kern_msg->msg_iov,
100790+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
100791 kern_msg->msg_iovlen);
100792 if (tot_len >= 0)
100793 kern_msg->msg_iov = kern_iov;
100794@@ -120,20 +120,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100795
100796 #define CMSG_COMPAT_FIRSTHDR(msg) \
100797 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
100798- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
100799+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
100800 (struct compat_cmsghdr __user *)NULL)
100801
100802 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
100803 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
100804 (ucmlen) <= (unsigned long) \
100805 ((mhdr)->msg_controllen - \
100806- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
100807+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
100808
100809 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
100810 struct compat_cmsghdr __user *cmsg, int cmsg_len)
100811 {
100812 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
100813- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
100814+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
100815 msg->msg_controllen)
100816 return NULL;
100817 return (struct compat_cmsghdr __user *)ptr;
100818@@ -223,7 +223,7 @@ Efault:
100819
100820 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
100821 {
100822- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
100823+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
100824 struct compat_cmsghdr cmhdr;
100825 struct compat_timeval ctv;
100826 struct compat_timespec cts[3];
100827@@ -279,7 +279,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
100828
100829 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
100830 {
100831- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
100832+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
100833 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
100834 int fdnum = scm->fp->count;
100835 struct file **fp = scm->fp->fp;
100836@@ -367,7 +367,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
100837 return -EFAULT;
100838 old_fs = get_fs();
100839 set_fs(KERNEL_DS);
100840- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
100841+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
100842 set_fs(old_fs);
100843
100844 return err;
100845@@ -428,7 +428,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
100846 len = sizeof(ktime);
100847 old_fs = get_fs();
100848 set_fs(KERNEL_DS);
100849- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
100850+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
100851 set_fs(old_fs);
100852
100853 if (!err) {
100854@@ -571,7 +571,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100855 case MCAST_JOIN_GROUP:
100856 case MCAST_LEAVE_GROUP:
100857 {
100858- struct compat_group_req __user *gr32 = (void *)optval;
100859+ struct compat_group_req __user *gr32 = (void __user *)optval;
100860 struct group_req __user *kgr =
100861 compat_alloc_user_space(sizeof(struct group_req));
100862 u32 interface;
100863@@ -592,7 +592,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100864 case MCAST_BLOCK_SOURCE:
100865 case MCAST_UNBLOCK_SOURCE:
100866 {
100867- struct compat_group_source_req __user *gsr32 = (void *)optval;
100868+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
100869 struct group_source_req __user *kgsr = compat_alloc_user_space(
100870 sizeof(struct group_source_req));
100871 u32 interface;
100872@@ -613,7 +613,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100873 }
100874 case MCAST_MSFILTER:
100875 {
100876- struct compat_group_filter __user *gf32 = (void *)optval;
100877+ struct compat_group_filter __user *gf32 = (void __user *)optval;
100878 struct group_filter __user *kgf;
100879 u32 interface, fmode, numsrc;
100880
100881@@ -651,7 +651,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
100882 char __user *optval, int __user *optlen,
100883 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
100884 {
100885- struct compat_group_filter __user *gf32 = (void *)optval;
100886+ struct compat_group_filter __user *gf32 = (void __user *)optval;
100887 struct group_filter __user *kgf;
100888 int __user *koptlen;
100889 u32 interface, fmode, numsrc;
100890@@ -804,7 +804,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
100891
100892 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
100893 return -EINVAL;
100894- if (copy_from_user(a, args, nas[call]))
100895+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
100896 return -EFAULT;
100897 a0 = a[0];
100898 a1 = a[1];
100899diff --git a/net/core/datagram.c b/net/core/datagram.c
100900index fdbc9a8..cd6972c 100644
100901--- a/net/core/datagram.c
100902+++ b/net/core/datagram.c
100903@@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
100904 }
100905
100906 kfree_skb(skb);
100907- atomic_inc(&sk->sk_drops);
100908+ atomic_inc_unchecked(&sk->sk_drops);
100909 sk_mem_reclaim_partial(sk);
100910
100911 return err;
100912diff --git a/net/core/dev.c b/net/core/dev.c
100913index 945bbd0..8b1a370 100644
100914--- a/net/core/dev.c
100915+++ b/net/core/dev.c
100916@@ -1683,14 +1683,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
100917 {
100918 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
100919 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
100920- atomic_long_inc(&dev->rx_dropped);
100921+ atomic_long_inc_unchecked(&dev->rx_dropped);
100922 kfree_skb(skb);
100923 return NET_RX_DROP;
100924 }
100925 }
100926
100927 if (unlikely(!is_skb_forwardable(dev, skb))) {
100928- atomic_long_inc(&dev->rx_dropped);
100929+ atomic_long_inc_unchecked(&dev->rx_dropped);
100930 kfree_skb(skb);
100931 return NET_RX_DROP;
100932 }
100933@@ -2985,7 +2985,7 @@ recursion_alert:
100934 drop:
100935 rcu_read_unlock_bh();
100936
100937- atomic_long_inc(&dev->tx_dropped);
100938+ atomic_long_inc_unchecked(&dev->tx_dropped);
100939 kfree_skb_list(skb);
100940 return rc;
100941 out:
100942@@ -3328,7 +3328,7 @@ enqueue:
100943
100944 local_irq_restore(flags);
100945
100946- atomic_long_inc(&skb->dev->rx_dropped);
100947+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
100948 kfree_skb(skb);
100949 return NET_RX_DROP;
100950 }
100951@@ -3405,7 +3405,7 @@ int netif_rx_ni(struct sk_buff *skb)
100952 }
100953 EXPORT_SYMBOL(netif_rx_ni);
100954
100955-static void net_tx_action(struct softirq_action *h)
100956+static __latent_entropy void net_tx_action(void)
100957 {
100958 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
100959
100960@@ -3738,7 +3738,7 @@ ncls:
100961 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
100962 } else {
100963 drop:
100964- atomic_long_inc(&skb->dev->rx_dropped);
100965+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
100966 kfree_skb(skb);
100967 /* Jamal, now you will not able to escape explaining
100968 * me how you were going to use this. :-)
100969@@ -4502,7 +4502,7 @@ void netif_napi_del(struct napi_struct *napi)
100970 }
100971 EXPORT_SYMBOL(netif_napi_del);
100972
100973-static void net_rx_action(struct softirq_action *h)
100974+static __latent_entropy void net_rx_action(void)
100975 {
100976 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
100977 unsigned long time_limit = jiffies + 2;
100978@@ -6548,8 +6548,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
100979 } else {
100980 netdev_stats_to_stats64(storage, &dev->stats);
100981 }
100982- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
100983- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
100984+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
100985+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
100986 return storage;
100987 }
100988 EXPORT_SYMBOL(dev_get_stats);
100989diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
100990index 72e899a..79a9409 100644
100991--- a/net/core/dev_ioctl.c
100992+++ b/net/core/dev_ioctl.c
100993@@ -365,8 +365,13 @@ void dev_load(struct net *net, const char *name)
100994 no_module = !dev;
100995 if (no_module && capable(CAP_NET_ADMIN))
100996 no_module = request_module("netdev-%s", name);
100997- if (no_module && capable(CAP_SYS_MODULE))
100998+ if (no_module && capable(CAP_SYS_MODULE)) {
100999+#ifdef CONFIG_GRKERNSEC_MODHARDEN
101000+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
101001+#else
101002 request_module("%s", name);
101003+#endif
101004+ }
101005 }
101006 EXPORT_SYMBOL(dev_load);
101007
101008diff --git a/net/core/filter.c b/net/core/filter.c
101009index 647b122..18a7ff6 100644
101010--- a/net/core/filter.c
101011+++ b/net/core/filter.c
101012@@ -532,7 +532,11 @@ do_pass:
101013
101014 /* Unkown instruction. */
101015 default:
101016- goto err;
101017+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
101018+ fp->code, fp->jt, fp->jf, fp->k);
101019+ kfree(addrs);
101020+ BUG();
101021+ return -EINVAL;
101022 }
101023
101024 insn++;
101025@@ -576,7 +580,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
101026 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
101027 int pc, ret = 0;
101028
101029- BUILD_BUG_ON(BPF_MEMWORDS > 16);
101030+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
101031
101032 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
101033 if (!masks)
101034@@ -987,7 +991,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
101035 if (!fp)
101036 return -ENOMEM;
101037
101038- memcpy(fp->insns, fprog->filter, fsize);
101039+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
101040
101041 fp->len = fprog->len;
101042 /* Since unattached filters are not copied back to user
101043diff --git a/net/core/flow.c b/net/core/flow.c
101044index a0348fd..6951c76 100644
101045--- a/net/core/flow.c
101046+++ b/net/core/flow.c
101047@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
101048 static int flow_entry_valid(struct flow_cache_entry *fle,
101049 struct netns_xfrm *xfrm)
101050 {
101051- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
101052+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
101053 return 0;
101054 if (fle->object && !fle->object->ops->check(fle->object))
101055 return 0;
101056@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
101057 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
101058 fcp->hash_count++;
101059 }
101060- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
101061+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
101062 flo = fle->object;
101063 if (!flo)
101064 goto ret_object;
101065@@ -263,7 +263,7 @@ nocache:
101066 }
101067 flo = resolver(net, key, family, dir, flo, ctx);
101068 if (fle) {
101069- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
101070+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
101071 if (!IS_ERR(flo))
101072 fle->object = flo;
101073 else
101074diff --git a/net/core/iovec.c b/net/core/iovec.c
101075index e1ec45a..e5c6f16 100644
101076--- a/net/core/iovec.c
101077+++ b/net/core/iovec.c
101078@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
101079 if (m->msg_name && m->msg_namelen) {
101080 if (mode == VERIFY_READ) {
101081 void __user *namep;
101082- namep = (void __user __force *) m->msg_name;
101083+ namep = (void __force_user *) m->msg_name;
101084 err = move_addr_to_kernel(namep, m->msg_namelen,
101085 address);
101086 if (err < 0)
101087@@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
101088 }
101089
101090 size = m->msg_iovlen * sizeof(struct iovec);
101091- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
101092+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
101093 return -EFAULT;
101094
101095 m->msg_iov = iov;
101096diff --git a/net/core/neighbour.c b/net/core/neighbour.c
101097index ef31fef..8be66d9 100644
101098--- a/net/core/neighbour.c
101099+++ b/net/core/neighbour.c
101100@@ -2825,7 +2825,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
101101 void __user *buffer, size_t *lenp, loff_t *ppos)
101102 {
101103 int size, ret;
101104- struct ctl_table tmp = *ctl;
101105+ ctl_table_no_const tmp = *ctl;
101106
101107 tmp.extra1 = &zero;
101108 tmp.extra2 = &unres_qlen_max;
101109@@ -2887,7 +2887,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
101110 void __user *buffer,
101111 size_t *lenp, loff_t *ppos)
101112 {
101113- struct ctl_table tmp = *ctl;
101114+ ctl_table_no_const tmp = *ctl;
101115 int ret;
101116
101117 tmp.extra1 = &zero;
101118diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
101119index 2bf8329..2eb1423 100644
101120--- a/net/core/net-procfs.c
101121+++ b/net/core/net-procfs.c
101122@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
101123 struct rtnl_link_stats64 temp;
101124 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
101125
101126- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101127+ if (gr_proc_is_restricted())
101128+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101129+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
101130+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
101131+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
101132+ else
101133+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101134 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
101135 dev->name, stats->rx_bytes, stats->rx_packets,
101136 stats->rx_errors,
101137@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
101138 return 0;
101139 }
101140
101141-static const struct seq_operations dev_seq_ops = {
101142+const struct seq_operations dev_seq_ops = {
101143 .start = dev_seq_start,
101144 .next = dev_seq_next,
101145 .stop = dev_seq_stop,
101146@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
101147
101148 static int softnet_seq_open(struct inode *inode, struct file *file)
101149 {
101150- return seq_open(file, &softnet_seq_ops);
101151+ return seq_open_restrict(file, &softnet_seq_ops);
101152 }
101153
101154 static const struct file_operations softnet_seq_fops = {
101155@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
101156 else
101157 seq_printf(seq, "%04x", ntohs(pt->type));
101158
101159+#ifdef CONFIG_GRKERNSEC_HIDESYM
101160+ seq_printf(seq, " %-8s %pf\n",
101161+ pt->dev ? pt->dev->name : "", NULL);
101162+#else
101163 seq_printf(seq, " %-8s %pf\n",
101164 pt->dev ? pt->dev->name : "", pt->func);
101165+#endif
101166 }
101167
101168 return 0;
101169diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
101170index 9dd0669..c52fb1b 100644
101171--- a/net/core/net-sysfs.c
101172+++ b/net/core/net-sysfs.c
101173@@ -278,7 +278,7 @@ static ssize_t carrier_changes_show(struct device *dev,
101174 {
101175 struct net_device *netdev = to_net_dev(dev);
101176 return sprintf(buf, fmt_dec,
101177- atomic_read(&netdev->carrier_changes));
101178+ atomic_read_unchecked(&netdev->carrier_changes));
101179 }
101180 static DEVICE_ATTR_RO(carrier_changes);
101181
101182diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
101183index 7f15517..f7d65c0 100644
101184--- a/net/core/net_namespace.c
101185+++ b/net/core/net_namespace.c
101186@@ -445,7 +445,7 @@ static int __register_pernet_operations(struct list_head *list,
101187 int error;
101188 LIST_HEAD(net_exit_list);
101189
101190- list_add_tail(&ops->list, list);
101191+ pax_list_add_tail((struct list_head *)&ops->list, list);
101192 if (ops->init || (ops->id && ops->size)) {
101193 for_each_net(net) {
101194 error = ops_init(ops, net);
101195@@ -458,7 +458,7 @@ static int __register_pernet_operations(struct list_head *list,
101196
101197 out_undo:
101198 /* If I have an error cleanup all namespaces I initialized */
101199- list_del(&ops->list);
101200+ pax_list_del((struct list_head *)&ops->list);
101201 ops_exit_list(ops, &net_exit_list);
101202 ops_free_list(ops, &net_exit_list);
101203 return error;
101204@@ -469,7 +469,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
101205 struct net *net;
101206 LIST_HEAD(net_exit_list);
101207
101208- list_del(&ops->list);
101209+ pax_list_del((struct list_head *)&ops->list);
101210 for_each_net(net)
101211 list_add_tail(&net->exit_list, &net_exit_list);
101212 ops_exit_list(ops, &net_exit_list);
101213@@ -603,7 +603,7 @@ int register_pernet_device(struct pernet_operations *ops)
101214 mutex_lock(&net_mutex);
101215 error = register_pernet_operations(&pernet_list, ops);
101216 if (!error && (first_device == &pernet_list))
101217- first_device = &ops->list;
101218+ first_device = (struct list_head *)&ops->list;
101219 mutex_unlock(&net_mutex);
101220 return error;
101221 }
101222diff --git a/net/core/netpoll.c b/net/core/netpoll.c
101223index e6645b4..43e1af9 100644
101224--- a/net/core/netpoll.c
101225+++ b/net/core/netpoll.c
101226@@ -379,7 +379,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
101227 struct udphdr *udph;
101228 struct iphdr *iph;
101229 struct ethhdr *eth;
101230- static atomic_t ip_ident;
101231+ static atomic_unchecked_t ip_ident;
101232 struct ipv6hdr *ip6h;
101233
101234 udp_len = len + sizeof(*udph);
101235@@ -450,7 +450,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
101236 put_unaligned(0x45, (unsigned char *)iph);
101237 iph->tos = 0;
101238 put_unaligned(htons(ip_len), &(iph->tot_len));
101239- iph->id = htons(atomic_inc_return(&ip_ident));
101240+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
101241 iph->frag_off = 0;
101242 iph->ttl = 64;
101243 iph->protocol = IPPROTO_UDP;
101244diff --git a/net/core/pktgen.c b/net/core/pktgen.c
101245index 443256b..bbff424 100644
101246--- a/net/core/pktgen.c
101247+++ b/net/core/pktgen.c
101248@@ -3753,7 +3753,7 @@ static int __net_init pg_net_init(struct net *net)
101249 pn->net = net;
101250 INIT_LIST_HEAD(&pn->pktgen_threads);
101251 pn->pktgen_exiting = false;
101252- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
101253+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
101254 if (!pn->proc_dir) {
101255 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
101256 return -ENODEV;
101257diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
101258index 76321ea..3129bd6 100644
101259--- a/net/core/rtnetlink.c
101260+++ b/net/core/rtnetlink.c
101261@@ -58,7 +58,7 @@ struct rtnl_link {
101262 rtnl_doit_func doit;
101263 rtnl_dumpit_func dumpit;
101264 rtnl_calcit_func calcit;
101265-};
101266+} __no_const;
101267
101268 static DEFINE_MUTEX(rtnl_mutex);
101269
101270@@ -304,10 +304,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
101271 * to use the ops for creating device. So do not
101272 * fill up dellink as well. That disables rtnl_dellink.
101273 */
101274- if (ops->setup && !ops->dellink)
101275- ops->dellink = unregister_netdevice_queue;
101276+ if (ops->setup && !ops->dellink) {
101277+ pax_open_kernel();
101278+ *(void **)&ops->dellink = unregister_netdevice_queue;
101279+ pax_close_kernel();
101280+ }
101281
101282- list_add_tail(&ops->list, &link_ops);
101283+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
101284 return 0;
101285 }
101286 EXPORT_SYMBOL_GPL(__rtnl_link_register);
101287@@ -354,7 +357,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
101288 for_each_net(net) {
101289 __rtnl_kill_links(net, ops);
101290 }
101291- list_del(&ops->list);
101292+ pax_list_del((struct list_head *)&ops->list);
101293 }
101294 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
101295
101296@@ -1014,7 +1017,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
101297 (dev->ifalias &&
101298 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
101299 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
101300- atomic_read(&dev->carrier_changes)))
101301+ atomic_read_unchecked(&dev->carrier_changes)))
101302 goto nla_put_failure;
101303
101304 if (1) {
101305diff --git a/net/core/scm.c b/net/core/scm.c
101306index b442e7e..6f5b5a2 100644
101307--- a/net/core/scm.c
101308+++ b/net/core/scm.c
101309@@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
101310 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
101311 {
101312 struct cmsghdr __user *cm
101313- = (__force struct cmsghdr __user *)msg->msg_control;
101314+ = (struct cmsghdr __force_user *)msg->msg_control;
101315 struct cmsghdr cmhdr;
101316 int cmlen = CMSG_LEN(len);
101317 int err;
101318@@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
101319 err = -EFAULT;
101320 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
101321 goto out;
101322- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
101323+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
101324 goto out;
101325 cmlen = CMSG_SPACE(len);
101326 if (msg->msg_controllen < cmlen)
101327@@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
101328 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
101329 {
101330 struct cmsghdr __user *cm
101331- = (__force struct cmsghdr __user*)msg->msg_control;
101332+ = (struct cmsghdr __force_user *)msg->msg_control;
101333
101334 int fdmax = 0;
101335 int fdnum = scm->fp->count;
101336@@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
101337 if (fdnum < fdmax)
101338 fdmax = fdnum;
101339
101340- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
101341+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
101342 i++, cmfptr++)
101343 {
101344 struct socket *sock;
101345diff --git a/net/core/skbuff.c b/net/core/skbuff.c
101346index 32e31c2..e981248 100644
101347--- a/net/core/skbuff.c
101348+++ b/net/core/skbuff.c
101349@@ -2025,7 +2025,7 @@ EXPORT_SYMBOL(__skb_checksum);
101350 __wsum skb_checksum(const struct sk_buff *skb, int offset,
101351 int len, __wsum csum)
101352 {
101353- const struct skb_checksum_ops ops = {
101354+ static const struct skb_checksum_ops ops = {
101355 .update = csum_partial_ext,
101356 .combine = csum_block_add_ext,
101357 };
101358@@ -3255,12 +3255,14 @@ void __init skb_init(void)
101359 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
101360 sizeof(struct sk_buff),
101361 0,
101362- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
101363+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
101364+ SLAB_NO_SANITIZE,
101365 NULL);
101366 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
101367 sizeof(struct sk_buff_fclones),
101368 0,
101369- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
101370+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
101371+ SLAB_NO_SANITIZE,
101372 NULL);
101373 }
101374
101375diff --git a/net/core/sock.c b/net/core/sock.c
101376index 15e0c67..0310f4a 100644
101377--- a/net/core/sock.c
101378+++ b/net/core/sock.c
101379@@ -441,7 +441,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101380 struct sk_buff_head *list = &sk->sk_receive_queue;
101381
101382 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
101383- atomic_inc(&sk->sk_drops);
101384+ atomic_inc_unchecked(&sk->sk_drops);
101385 trace_sock_rcvqueue_full(sk, skb);
101386 return -ENOMEM;
101387 }
101388@@ -451,7 +451,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101389 return err;
101390
101391 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
101392- atomic_inc(&sk->sk_drops);
101393+ atomic_inc_unchecked(&sk->sk_drops);
101394 return -ENOBUFS;
101395 }
101396
101397@@ -464,7 +464,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101398 skb_dst_force(skb);
101399
101400 spin_lock_irqsave(&list->lock, flags);
101401- skb->dropcount = atomic_read(&sk->sk_drops);
101402+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
101403 __skb_queue_tail(list, skb);
101404 spin_unlock_irqrestore(&list->lock, flags);
101405
101406@@ -484,7 +484,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
101407 skb->dev = NULL;
101408
101409 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
101410- atomic_inc(&sk->sk_drops);
101411+ atomic_inc_unchecked(&sk->sk_drops);
101412 goto discard_and_relse;
101413 }
101414 if (nested)
101415@@ -502,7 +502,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
101416 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
101417 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
101418 bh_unlock_sock(sk);
101419- atomic_inc(&sk->sk_drops);
101420+ atomic_inc_unchecked(&sk->sk_drops);
101421 goto discard_and_relse;
101422 }
101423
101424@@ -991,12 +991,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101425 struct timeval tm;
101426 } v;
101427
101428- int lv = sizeof(int);
101429- int len;
101430+ unsigned int lv = sizeof(int);
101431+ unsigned int len;
101432
101433 if (get_user(len, optlen))
101434 return -EFAULT;
101435- if (len < 0)
101436+ if (len > INT_MAX)
101437 return -EINVAL;
101438
101439 memset(&v, 0, sizeof(v));
101440@@ -1134,11 +1134,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101441
101442 case SO_PEERNAME:
101443 {
101444- char address[128];
101445+ char address[_K_SS_MAXSIZE];
101446
101447 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
101448 return -ENOTCONN;
101449- if (lv < len)
101450+ if (lv < len || sizeof address < len)
101451 return -EINVAL;
101452 if (copy_to_user(optval, address, len))
101453 return -EFAULT;
101454@@ -1219,7 +1219,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101455
101456 if (len > lv)
101457 len = lv;
101458- if (copy_to_user(optval, &v, len))
101459+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
101460 return -EFAULT;
101461 lenout:
101462 if (put_user(len, optlen))
101463@@ -2315,7 +2315,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
101464 */
101465 smp_wmb();
101466 atomic_set(&sk->sk_refcnt, 1);
101467- atomic_set(&sk->sk_drops, 0);
101468+ atomic_set_unchecked(&sk->sk_drops, 0);
101469 }
101470 EXPORT_SYMBOL(sock_init_data);
101471
101472@@ -2443,6 +2443,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
101473 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
101474 int level, int type)
101475 {
101476+ struct sock_extended_err ee;
101477 struct sock_exterr_skb *serr;
101478 struct sk_buff *skb;
101479 int copied, err;
101480@@ -2464,7 +2465,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
101481 sock_recv_timestamp(msg, sk, skb);
101482
101483 serr = SKB_EXT_ERR(skb);
101484- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
101485+ ee = serr->ee;
101486+ put_cmsg(msg, level, type, sizeof ee, &ee);
101487
101488 msg->msg_flags |= MSG_ERRQUEUE;
101489 err = copied;
101490diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
101491index ad704c7..ca48aff 100644
101492--- a/net/core/sock_diag.c
101493+++ b/net/core/sock_diag.c
101494@@ -9,26 +9,33 @@
101495 #include <linux/inet_diag.h>
101496 #include <linux/sock_diag.h>
101497
101498-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
101499+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
101500 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
101501 static DEFINE_MUTEX(sock_diag_table_mutex);
101502
101503 int sock_diag_check_cookie(void *sk, __u32 *cookie)
101504 {
101505+#ifndef CONFIG_GRKERNSEC_HIDESYM
101506 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
101507 cookie[1] != INET_DIAG_NOCOOKIE) &&
101508 ((u32)(unsigned long)sk != cookie[0] ||
101509 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
101510 return -ESTALE;
101511 else
101512+#endif
101513 return 0;
101514 }
101515 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
101516
101517 void sock_diag_save_cookie(void *sk, __u32 *cookie)
101518 {
101519+#ifdef CONFIG_GRKERNSEC_HIDESYM
101520+ cookie[0] = 0;
101521+ cookie[1] = 0;
101522+#else
101523 cookie[0] = (u32)(unsigned long)sk;
101524 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
101525+#endif
101526 }
101527 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
101528
101529@@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
101530 mutex_lock(&sock_diag_table_mutex);
101531 if (sock_diag_handlers[hndl->family])
101532 err = -EBUSY;
101533- else
101534+ else {
101535+ pax_open_kernel();
101536 sock_diag_handlers[hndl->family] = hndl;
101537+ pax_close_kernel();
101538+ }
101539 mutex_unlock(&sock_diag_table_mutex);
101540
101541 return err;
101542@@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
101543
101544 mutex_lock(&sock_diag_table_mutex);
101545 BUG_ON(sock_diag_handlers[family] != hnld);
101546+ pax_open_kernel();
101547 sock_diag_handlers[family] = NULL;
101548+ pax_close_kernel();
101549 mutex_unlock(&sock_diag_table_mutex);
101550 }
101551 EXPORT_SYMBOL_GPL(sock_diag_unregister);
101552diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
101553index cf9cd13..50683950 100644
101554--- a/net/core/sysctl_net_core.c
101555+++ b/net/core/sysctl_net_core.c
101556@@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
101557 {
101558 unsigned int orig_size, size;
101559 int ret, i;
101560- struct ctl_table tmp = {
101561+ ctl_table_no_const tmp = {
101562 .data = &size,
101563 .maxlen = sizeof(size),
101564 .mode = table->mode
101565@@ -200,7 +200,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
101566 void __user *buffer, size_t *lenp, loff_t *ppos)
101567 {
101568 char id[IFNAMSIZ];
101569- struct ctl_table tbl = {
101570+ ctl_table_no_const tbl = {
101571 .data = id,
101572 .maxlen = IFNAMSIZ,
101573 };
101574@@ -263,7 +263,7 @@ static struct ctl_table net_core_table[] = {
101575 .mode = 0644,
101576 .proc_handler = proc_dointvec
101577 },
101578-#ifdef CONFIG_BPF_JIT
101579+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
101580 {
101581 .procname = "bpf_jit_enable",
101582 .data = &bpf_jit_enable,
101583@@ -379,13 +379,12 @@ static struct ctl_table netns_core_table[] = {
101584
101585 static __net_init int sysctl_core_net_init(struct net *net)
101586 {
101587- struct ctl_table *tbl;
101588+ ctl_table_no_const *tbl = NULL;
101589
101590 net->core.sysctl_somaxconn = SOMAXCONN;
101591
101592- tbl = netns_core_table;
101593 if (!net_eq(net, &init_net)) {
101594- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
101595+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
101596 if (tbl == NULL)
101597 goto err_dup;
101598
101599@@ -395,17 +394,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
101600 if (net->user_ns != &init_user_ns) {
101601 tbl[0].procname = NULL;
101602 }
101603- }
101604-
101605- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
101606+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
101607+ } else
101608+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
101609 if (net->core.sysctl_hdr == NULL)
101610 goto err_reg;
101611
101612 return 0;
101613
101614 err_reg:
101615- if (tbl != netns_core_table)
101616- kfree(tbl);
101617+ kfree(tbl);
101618 err_dup:
101619 return -ENOMEM;
101620 }
101621@@ -420,7 +418,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
101622 kfree(tbl);
101623 }
101624
101625-static __net_initdata struct pernet_operations sysctl_core_ops = {
101626+static __net_initconst struct pernet_operations sysctl_core_ops = {
101627 .init = sysctl_core_net_init,
101628 .exit = sysctl_core_net_exit,
101629 };
101630diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
101631index 25733d5..b9360f0 100644
101632--- a/net/decnet/af_decnet.c
101633+++ b/net/decnet/af_decnet.c
101634@@ -466,6 +466,7 @@ static struct proto dn_proto = {
101635 .sysctl_rmem = sysctl_decnet_rmem,
101636 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
101637 .obj_size = sizeof(struct dn_sock),
101638+ .slab_flags = SLAB_USERCOPY,
101639 };
101640
101641 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
101642diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
101643index 4400da7..3429972 100644
101644--- a/net/decnet/dn_dev.c
101645+++ b/net/decnet/dn_dev.c
101646@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
101647 .extra1 = &min_t3,
101648 .extra2 = &max_t3
101649 },
101650- {0}
101651+ { }
101652 },
101653 };
101654
101655diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
101656index 5325b54..a0d4d69 100644
101657--- a/net/decnet/sysctl_net_decnet.c
101658+++ b/net/decnet/sysctl_net_decnet.c
101659@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
101660
101661 if (len > *lenp) len = *lenp;
101662
101663- if (copy_to_user(buffer, addr, len))
101664+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
101665 return -EFAULT;
101666
101667 *lenp = len;
101668@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
101669
101670 if (len > *lenp) len = *lenp;
101671
101672- if (copy_to_user(buffer, devname, len))
101673+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
101674 return -EFAULT;
101675
101676 *lenp = len;
101677diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
101678index a2c7e4c..3dc9f67 100644
101679--- a/net/hsr/hsr_netlink.c
101680+++ b/net/hsr/hsr_netlink.c
101681@@ -102,7 +102,7 @@ nla_put_failure:
101682 return -EMSGSIZE;
101683 }
101684
101685-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
101686+static struct rtnl_link_ops hsr_link_ops = {
101687 .kind = "hsr",
101688 .maxtype = IFLA_HSR_MAX,
101689 .policy = hsr_policy,
101690diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
101691index 4413629..dea596a 100644
101692--- a/net/ieee802154/6lowpan_rtnl.c
101693+++ b/net/ieee802154/6lowpan_rtnl.c
101694@@ -635,7 +635,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
101695 dev_put(real_dev);
101696 }
101697
101698-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
101699+static struct rtnl_link_ops lowpan_link_ops = {
101700 .kind = "lowpan",
101701 .priv_size = sizeof(struct lowpan_dev_info),
101702 .setup = lowpan_setup,
101703diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
101704index 7cfcd68..84ca5b7 100644
101705--- a/net/ieee802154/reassembly.c
101706+++ b/net/ieee802154/reassembly.c
101707@@ -433,14 +433,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
101708
101709 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101710 {
101711- struct ctl_table *table;
101712+ ctl_table_no_const *table = NULL;
101713 struct ctl_table_header *hdr;
101714 struct netns_ieee802154_lowpan *ieee802154_lowpan =
101715 net_ieee802154_lowpan(net);
101716
101717- table = lowpan_frags_ns_ctl_table;
101718 if (!net_eq(net, &init_net)) {
101719- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
101720+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
101721 GFP_KERNEL);
101722 if (table == NULL)
101723 goto err_alloc;
101724@@ -455,9 +454,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101725 /* Don't export sysctls to unprivileged users */
101726 if (net->user_ns != &init_user_ns)
101727 table[0].procname = NULL;
101728- }
101729-
101730- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
101731+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
101732+ } else
101733+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
101734 if (hdr == NULL)
101735 goto err_reg;
101736
101737@@ -465,8 +464,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101738 return 0;
101739
101740 err_reg:
101741- if (!net_eq(net, &init_net))
101742- kfree(table);
101743+ kfree(table);
101744 err_alloc:
101745 return -ENOMEM;
101746 }
101747diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
101748index e67da4e..da217942 100644
101749--- a/net/ipv4/af_inet.c
101750+++ b/net/ipv4/af_inet.c
101751@@ -1392,7 +1392,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
101752 return ip_recv_error(sk, msg, len, addr_len);
101753 #if IS_ENABLED(CONFIG_IPV6)
101754 if (sk->sk_family == AF_INET6)
101755- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
101756+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
101757 #endif
101758 return -EINVAL;
101759 }
101760diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
101761index 214882e..ec032f6 100644
101762--- a/net/ipv4/devinet.c
101763+++ b/net/ipv4/devinet.c
101764@@ -69,7 +69,8 @@
101765
101766 static struct ipv4_devconf ipv4_devconf = {
101767 .data = {
101768- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
101769+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
101770+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
101771 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
101772 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
101773 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
101774@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
101775
101776 static struct ipv4_devconf ipv4_devconf_dflt = {
101777 .data = {
101778- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
101779+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
101780+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
101781 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
101782 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
101783 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
101784@@ -1548,7 +1550,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
101785 idx = 0;
101786 head = &net->dev_index_head[h];
101787 rcu_read_lock();
101788- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
101789+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
101790 net->dev_base_seq;
101791 hlist_for_each_entry_rcu(dev, head, index_hlist) {
101792 if (idx < s_idx)
101793@@ -1866,7 +1868,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
101794 idx = 0;
101795 head = &net->dev_index_head[h];
101796 rcu_read_lock();
101797- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
101798+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
101799 net->dev_base_seq;
101800 hlist_for_each_entry_rcu(dev, head, index_hlist) {
101801 if (idx < s_idx)
101802@@ -2101,7 +2103,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
101803 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
101804 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
101805
101806-static struct devinet_sysctl_table {
101807+static const struct devinet_sysctl_table {
101808 struct ctl_table_header *sysctl_header;
101809 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
101810 } devinet_sysctl = {
101811@@ -2233,7 +2235,7 @@ static __net_init int devinet_init_net(struct net *net)
101812 int err;
101813 struct ipv4_devconf *all, *dflt;
101814 #ifdef CONFIG_SYSCTL
101815- struct ctl_table *tbl = ctl_forward_entry;
101816+ ctl_table_no_const *tbl = NULL;
101817 struct ctl_table_header *forw_hdr;
101818 #endif
101819
101820@@ -2251,7 +2253,7 @@ static __net_init int devinet_init_net(struct net *net)
101821 goto err_alloc_dflt;
101822
101823 #ifdef CONFIG_SYSCTL
101824- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
101825+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
101826 if (tbl == NULL)
101827 goto err_alloc_ctl;
101828
101829@@ -2271,7 +2273,10 @@ static __net_init int devinet_init_net(struct net *net)
101830 goto err_reg_dflt;
101831
101832 err = -ENOMEM;
101833- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
101834+ if (!net_eq(net, &init_net))
101835+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
101836+ else
101837+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
101838 if (forw_hdr == NULL)
101839 goto err_reg_ctl;
101840 net->ipv4.forw_hdr = forw_hdr;
101841@@ -2287,8 +2292,7 @@ err_reg_ctl:
101842 err_reg_dflt:
101843 __devinet_sysctl_unregister(all);
101844 err_reg_all:
101845- if (tbl != ctl_forward_entry)
101846- kfree(tbl);
101847+ kfree(tbl);
101848 err_alloc_ctl:
101849 #endif
101850 if (dflt != &ipv4_devconf_dflt)
101851diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
101852index 23104a3..9f5570b 100644
101853--- a/net/ipv4/fib_frontend.c
101854+++ b/net/ipv4/fib_frontend.c
101855@@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
101856 #ifdef CONFIG_IP_ROUTE_MULTIPATH
101857 fib_sync_up(dev);
101858 #endif
101859- atomic_inc(&net->ipv4.dev_addr_genid);
101860+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101861 rt_cache_flush(dev_net(dev));
101862 break;
101863 case NETDEV_DOWN:
101864 fib_del_ifaddr(ifa, NULL);
101865- atomic_inc(&net->ipv4.dev_addr_genid);
101866+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101867 if (ifa->ifa_dev->ifa_list == NULL) {
101868 /* Last address was deleted from this interface.
101869 * Disable IP.
101870@@ -1060,7 +1060,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
101871 #ifdef CONFIG_IP_ROUTE_MULTIPATH
101872 fib_sync_up(dev);
101873 #endif
101874- atomic_inc(&net->ipv4.dev_addr_genid);
101875+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101876 rt_cache_flush(net);
101877 break;
101878 case NETDEV_DOWN:
101879diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
101880index f99f41b..1879da9 100644
101881--- a/net/ipv4/fib_semantics.c
101882+++ b/net/ipv4/fib_semantics.c
101883@@ -770,7 +770,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
101884 nh->nh_saddr = inet_select_addr(nh->nh_dev,
101885 nh->nh_gw,
101886 nh->nh_parent->fib_scope);
101887- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
101888+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
101889
101890 return nh->nh_saddr;
101891 }
101892diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
101893index 9111a4e..3576905 100644
101894--- a/net/ipv4/inet_hashtables.c
101895+++ b/net/ipv4/inet_hashtables.c
101896@@ -18,6 +18,7 @@
101897 #include <linux/sched.h>
101898 #include <linux/slab.h>
101899 #include <linux/wait.h>
101900+#include <linux/security.h>
101901
101902 #include <net/inet_connection_sock.h>
101903 #include <net/inet_hashtables.h>
101904@@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
101905 return inet_ehashfn(net, laddr, lport, faddr, fport);
101906 }
101907
101908+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
101909+
101910 /*
101911 * Allocate and initialize a new local port bind bucket.
101912 * The bindhash mutex for snum's hash chain must be held here.
101913@@ -554,6 +557,8 @@ ok:
101914 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
101915 spin_unlock(&head->lock);
101916
101917+ gr_update_task_in_ip_table(inet_sk(sk));
101918+
101919 if (tw) {
101920 inet_twsk_deschedule(tw, death_row);
101921 while (twrefcnt) {
101922diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
101923index 241afd7..31b95d5 100644
101924--- a/net/ipv4/inetpeer.c
101925+++ b/net/ipv4/inetpeer.c
101926@@ -461,7 +461,7 @@ relookup:
101927 if (p) {
101928 p->daddr = *daddr;
101929 atomic_set(&p->refcnt, 1);
101930- atomic_set(&p->rid, 0);
101931+ atomic_set_unchecked(&p->rid, 0);
101932 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
101933 p->rate_tokens = 0;
101934 /* 60*HZ is arbitrary, but chosen enough high so that the first
101935diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
101936index 2811cc1..ad5a534 100644
101937--- a/net/ipv4/ip_fragment.c
101938+++ b/net/ipv4/ip_fragment.c
101939@@ -268,7 +268,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
101940 return 0;
101941
101942 start = qp->rid;
101943- end = atomic_inc_return(&peer->rid);
101944+ end = atomic_inc_return_unchecked(&peer->rid);
101945 qp->rid = end;
101946
101947 rc = qp->q.fragments && (end - start) > max;
101948@@ -746,12 +746,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
101949
101950 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
101951 {
101952- struct ctl_table *table;
101953+ ctl_table_no_const *table = NULL;
101954 struct ctl_table_header *hdr;
101955
101956- table = ip4_frags_ns_ctl_table;
101957 if (!net_eq(net, &init_net)) {
101958- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
101959+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
101960 if (table == NULL)
101961 goto err_alloc;
101962
101963@@ -765,9 +764,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
101964 /* Don't export sysctls to unprivileged users */
101965 if (net->user_ns != &init_user_ns)
101966 table[0].procname = NULL;
101967- }
101968+ hdr = register_net_sysctl(net, "net/ipv4", table);
101969+ } else
101970+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
101971
101972- hdr = register_net_sysctl(net, "net/ipv4", table);
101973 if (hdr == NULL)
101974 goto err_reg;
101975
101976@@ -775,8 +775,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
101977 return 0;
101978
101979 err_reg:
101980- if (!net_eq(net, &init_net))
101981- kfree(table);
101982+ kfree(table);
101983 err_alloc:
101984 return -ENOMEM;
101985 }
101986diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
101987index 12055fd..df852c4 100644
101988--- a/net/ipv4/ip_gre.c
101989+++ b/net/ipv4/ip_gre.c
101990@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
101991 module_param(log_ecn_error, bool, 0644);
101992 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
101993
101994-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
101995+static struct rtnl_link_ops ipgre_link_ops;
101996 static int ipgre_tunnel_init(struct net_device *dev);
101997
101998 static int ipgre_net_id __read_mostly;
101999@@ -815,7 +815,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
102000 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
102001 };
102002
102003-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
102004+static struct rtnl_link_ops ipgre_link_ops = {
102005 .kind = "gre",
102006 .maxtype = IFLA_GRE_MAX,
102007 .policy = ipgre_policy,
102008@@ -829,7 +829,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
102009 .fill_info = ipgre_fill_info,
102010 };
102011
102012-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
102013+static struct rtnl_link_ops ipgre_tap_ops = {
102014 .kind = "gretap",
102015 .maxtype = IFLA_GRE_MAX,
102016 .policy = ipgre_policy,
102017diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
102018index 3d4da2c..40f9c29 100644
102019--- a/net/ipv4/ip_input.c
102020+++ b/net/ipv4/ip_input.c
102021@@ -147,6 +147,10 @@
102022 #include <linux/mroute.h>
102023 #include <linux/netlink.h>
102024
102025+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102026+extern int grsec_enable_blackhole;
102027+#endif
102028+
102029 /*
102030 * Process Router Attention IP option (RFC 2113)
102031 */
102032@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
102033 if (!raw) {
102034 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
102035 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
102036+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102037+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
102038+#endif
102039 icmp_send(skb, ICMP_DEST_UNREACH,
102040 ICMP_PROT_UNREACH, 0);
102041 }
102042diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
102043index 9daf217..dc6972d 100644
102044--- a/net/ipv4/ip_sockglue.c
102045+++ b/net/ipv4/ip_sockglue.c
102046@@ -1177,7 +1177,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
102047 len = min_t(unsigned int, len, opt->optlen);
102048 if (put_user(len, optlen))
102049 return -EFAULT;
102050- if (copy_to_user(optval, opt->__data, len))
102051+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
102052+ copy_to_user(optval, opt->__data, len))
102053 return -EFAULT;
102054 return 0;
102055 }
102056@@ -1308,7 +1309,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
102057 if (sk->sk_type != SOCK_STREAM)
102058 return -ENOPROTOOPT;
102059
102060- msg.msg_control = (__force void *) optval;
102061+ msg.msg_control = (__force_kernel void *) optval;
102062 msg.msg_controllen = len;
102063 msg.msg_flags = flags;
102064
102065diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
102066index 1a7e979..fd05aa4 100644
102067--- a/net/ipv4/ip_vti.c
102068+++ b/net/ipv4/ip_vti.c
102069@@ -45,7 +45,7 @@
102070 #include <net/net_namespace.h>
102071 #include <net/netns/generic.h>
102072
102073-static struct rtnl_link_ops vti_link_ops __read_mostly;
102074+static struct rtnl_link_ops vti_link_ops;
102075
102076 static int vti_net_id __read_mostly;
102077 static int vti_tunnel_init(struct net_device *dev);
102078@@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
102079 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
102080 };
102081
102082-static struct rtnl_link_ops vti_link_ops __read_mostly = {
102083+static struct rtnl_link_ops vti_link_ops = {
102084 .kind = "vti",
102085 .maxtype = IFLA_VTI_MAX,
102086 .policy = vti_policy,
102087diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
102088index 648fa14..97864d0 100644
102089--- a/net/ipv4/ipconfig.c
102090+++ b/net/ipv4/ipconfig.c
102091@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
102092
102093 mm_segment_t oldfs = get_fs();
102094 set_fs(get_ds());
102095- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
102096+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
102097 set_fs(oldfs);
102098 return res;
102099 }
102100@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
102101
102102 mm_segment_t oldfs = get_fs();
102103 set_fs(get_ds());
102104- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
102105+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
102106 set_fs(oldfs);
102107 return res;
102108 }
102109@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
102110
102111 mm_segment_t oldfs = get_fs();
102112 set_fs(get_ds());
102113- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
102114+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
102115 set_fs(oldfs);
102116 return res;
102117 }
102118diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
102119index 37096d6..86abb03 100644
102120--- a/net/ipv4/ipip.c
102121+++ b/net/ipv4/ipip.c
102122@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
102123 static int ipip_net_id __read_mostly;
102124
102125 static int ipip_tunnel_init(struct net_device *dev);
102126-static struct rtnl_link_ops ipip_link_ops __read_mostly;
102127+static struct rtnl_link_ops ipip_link_ops;
102128
102129 static int ipip_err(struct sk_buff *skb, u32 info)
102130 {
102131@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
102132 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
102133 };
102134
102135-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
102136+static struct rtnl_link_ops ipip_link_ops = {
102137 .kind = "ipip",
102138 .maxtype = IFLA_IPTUN_MAX,
102139 .policy = ipip_policy,
102140diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
102141index f95b6f9..2ee2097 100644
102142--- a/net/ipv4/netfilter/arp_tables.c
102143+++ b/net/ipv4/netfilter/arp_tables.c
102144@@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
102145 #endif
102146
102147 static int get_info(struct net *net, void __user *user,
102148- const int *len, int compat)
102149+ int len, int compat)
102150 {
102151 char name[XT_TABLE_MAXNAMELEN];
102152 struct xt_table *t;
102153 int ret;
102154
102155- if (*len != sizeof(struct arpt_getinfo)) {
102156- duprintf("length %u != %Zu\n", *len,
102157+ if (len != sizeof(struct arpt_getinfo)) {
102158+ duprintf("length %u != %Zu\n", len,
102159 sizeof(struct arpt_getinfo));
102160 return -EINVAL;
102161 }
102162@@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
102163 info.size = private->size;
102164 strcpy(info.name, name);
102165
102166- if (copy_to_user(user, &info, *len) != 0)
102167+ if (copy_to_user(user, &info, len) != 0)
102168 ret = -EFAULT;
102169 else
102170 ret = 0;
102171@@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
102172
102173 switch (cmd) {
102174 case ARPT_SO_GET_INFO:
102175- ret = get_info(sock_net(sk), user, len, 1);
102176+ ret = get_info(sock_net(sk), user, *len, 1);
102177 break;
102178 case ARPT_SO_GET_ENTRIES:
102179 ret = compat_get_entries(sock_net(sk), user, len);
102180@@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
102181
102182 switch (cmd) {
102183 case ARPT_SO_GET_INFO:
102184- ret = get_info(sock_net(sk), user, len, 0);
102185+ ret = get_info(sock_net(sk), user, *len, 0);
102186 break;
102187
102188 case ARPT_SO_GET_ENTRIES:
102189diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
102190index 99e810f..3711b81 100644
102191--- a/net/ipv4/netfilter/ip_tables.c
102192+++ b/net/ipv4/netfilter/ip_tables.c
102193@@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
102194 #endif
102195
102196 static int get_info(struct net *net, void __user *user,
102197- const int *len, int compat)
102198+ int len, int compat)
102199 {
102200 char name[XT_TABLE_MAXNAMELEN];
102201 struct xt_table *t;
102202 int ret;
102203
102204- if (*len != sizeof(struct ipt_getinfo)) {
102205- duprintf("length %u != %zu\n", *len,
102206+ if (len != sizeof(struct ipt_getinfo)) {
102207+ duprintf("length %u != %zu\n", len,
102208 sizeof(struct ipt_getinfo));
102209 return -EINVAL;
102210 }
102211@@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
102212 info.size = private->size;
102213 strcpy(info.name, name);
102214
102215- if (copy_to_user(user, &info, *len) != 0)
102216+ if (copy_to_user(user, &info, len) != 0)
102217 ret = -EFAULT;
102218 else
102219 ret = 0;
102220@@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
102221
102222 switch (cmd) {
102223 case IPT_SO_GET_INFO:
102224- ret = get_info(sock_net(sk), user, len, 1);
102225+ ret = get_info(sock_net(sk), user, *len, 1);
102226 break;
102227 case IPT_SO_GET_ENTRIES:
102228 ret = compat_get_entries(sock_net(sk), user, len);
102229@@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
102230
102231 switch (cmd) {
102232 case IPT_SO_GET_INFO:
102233- ret = get_info(sock_net(sk), user, len, 0);
102234+ ret = get_info(sock_net(sk), user, *len, 0);
102235 break;
102236
102237 case IPT_SO_GET_ENTRIES:
102238diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
102239index e90f83a..3e6acca 100644
102240--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
102241+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
102242@@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
102243 spin_lock_init(&cn->lock);
102244
102245 #ifdef CONFIG_PROC_FS
102246- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
102247+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
102248 if (!cn->procdir) {
102249 pr_err("Unable to proc dir entry\n");
102250 return -ENOMEM;
102251diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
102252index 5d740cc..b2842b9 100644
102253--- a/net/ipv4/ping.c
102254+++ b/net/ipv4/ping.c
102255@@ -59,7 +59,7 @@ struct ping_table {
102256 };
102257
102258 static struct ping_table ping_table;
102259-struct pingv6_ops pingv6_ops;
102260+struct pingv6_ops *pingv6_ops;
102261 EXPORT_SYMBOL_GPL(pingv6_ops);
102262
102263 static u16 ping_port_rover;
102264@@ -350,7 +350,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
102265 return -ENODEV;
102266 }
102267 }
102268- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
102269+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
102270 scoped);
102271 rcu_read_unlock();
102272
102273@@ -558,7 +558,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
102274 }
102275 #if IS_ENABLED(CONFIG_IPV6)
102276 } else if (skb->protocol == htons(ETH_P_IPV6)) {
102277- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
102278+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
102279 #endif
102280 }
102281
102282@@ -576,7 +576,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
102283 info, (u8 *)icmph);
102284 #if IS_ENABLED(CONFIG_IPV6)
102285 } else if (family == AF_INET6) {
102286- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
102287+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
102288 info, (u8 *)icmph);
102289 #endif
102290 }
102291@@ -910,10 +910,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
102292 }
102293
102294 if (inet6_sk(sk)->rxopt.all)
102295- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
102296+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
102297 if (skb->protocol == htons(ETH_P_IPV6) &&
102298 inet6_sk(sk)->rxopt.all)
102299- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
102300+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
102301 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
102302 ip_cmsg_recv(msg, skb);
102303 #endif
102304@@ -1105,7 +1105,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
102305 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
102306 0, sock_i_ino(sp),
102307 atomic_read(&sp->sk_refcnt), sp,
102308- atomic_read(&sp->sk_drops));
102309+ atomic_read_unchecked(&sp->sk_drops));
102310 }
102311
102312 static int ping_v4_seq_show(struct seq_file *seq, void *v)
102313diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
102314index 739db31..74f0210 100644
102315--- a/net/ipv4/raw.c
102316+++ b/net/ipv4/raw.c
102317@@ -314,7 +314,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
102318 int raw_rcv(struct sock *sk, struct sk_buff *skb)
102319 {
102320 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
102321- atomic_inc(&sk->sk_drops);
102322+ atomic_inc_unchecked(&sk->sk_drops);
102323 kfree_skb(skb);
102324 return NET_RX_DROP;
102325 }
102326@@ -755,16 +755,20 @@ static int raw_init(struct sock *sk)
102327
102328 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
102329 {
102330+ struct icmp_filter filter;
102331+
102332 if (optlen > sizeof(struct icmp_filter))
102333 optlen = sizeof(struct icmp_filter);
102334- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
102335+ if (copy_from_user(&filter, optval, optlen))
102336 return -EFAULT;
102337+ raw_sk(sk)->filter = filter;
102338 return 0;
102339 }
102340
102341 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
102342 {
102343 int len, ret = -EFAULT;
102344+ struct icmp_filter filter;
102345
102346 if (get_user(len, optlen))
102347 goto out;
102348@@ -774,8 +778,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
102349 if (len > sizeof(struct icmp_filter))
102350 len = sizeof(struct icmp_filter);
102351 ret = -EFAULT;
102352- if (put_user(len, optlen) ||
102353- copy_to_user(optval, &raw_sk(sk)->filter, len))
102354+ filter = raw_sk(sk)->filter;
102355+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
102356 goto out;
102357 ret = 0;
102358 out: return ret;
102359@@ -1004,7 +1008,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
102360 0, 0L, 0,
102361 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
102362 0, sock_i_ino(sp),
102363- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
102364+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
102365 }
102366
102367 static int raw_seq_show(struct seq_file *seq, void *v)
102368diff --git a/net/ipv4/route.c b/net/ipv4/route.c
102369index 6a2155b..d426880 100644
102370--- a/net/ipv4/route.c
102371+++ b/net/ipv4/route.c
102372@@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
102373
102374 static int rt_cache_seq_open(struct inode *inode, struct file *file)
102375 {
102376- return seq_open(file, &rt_cache_seq_ops);
102377+ return seq_open_restrict(file, &rt_cache_seq_ops);
102378 }
102379
102380 static const struct file_operations rt_cache_seq_fops = {
102381@@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
102382
102383 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
102384 {
102385- return seq_open(file, &rt_cpu_seq_ops);
102386+ return seq_open_restrict(file, &rt_cpu_seq_ops);
102387 }
102388
102389 static const struct file_operations rt_cpu_seq_fops = {
102390@@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
102391
102392 static int rt_acct_proc_open(struct inode *inode, struct file *file)
102393 {
102394- return single_open(file, rt_acct_proc_show, NULL);
102395+ return single_open_restrict(file, rt_acct_proc_show, NULL);
102396 }
102397
102398 static const struct file_operations rt_acct_proc_fops = {
102399@@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
102400
102401 #define IP_IDENTS_SZ 2048u
102402 struct ip_ident_bucket {
102403- atomic_t id;
102404+ atomic_unchecked_t id;
102405 u32 stamp32;
102406 };
102407
102408-static struct ip_ident_bucket *ip_idents __read_mostly;
102409+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
102410
102411 /* In order to protect privacy, we add a perturbation to identifiers
102412 * if one generator is seldom used. This makes hard for an attacker
102413@@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
102414 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
102415 delta = prandom_u32_max(now - old);
102416
102417- return atomic_add_return(segs + delta, &bucket->id) - segs;
102418+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
102419 }
102420 EXPORT_SYMBOL(ip_idents_reserve);
102421
102422@@ -2624,34 +2624,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
102423 .maxlen = sizeof(int),
102424 .mode = 0200,
102425 .proc_handler = ipv4_sysctl_rtcache_flush,
102426+ .extra1 = &init_net,
102427 },
102428 { },
102429 };
102430
102431 static __net_init int sysctl_route_net_init(struct net *net)
102432 {
102433- struct ctl_table *tbl;
102434+ ctl_table_no_const *tbl = NULL;
102435
102436- tbl = ipv4_route_flush_table;
102437 if (!net_eq(net, &init_net)) {
102438- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
102439+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
102440 if (tbl == NULL)
102441 goto err_dup;
102442
102443 /* Don't export sysctls to unprivileged users */
102444 if (net->user_ns != &init_user_ns)
102445 tbl[0].procname = NULL;
102446- }
102447- tbl[0].extra1 = net;
102448+ tbl[0].extra1 = net;
102449+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
102450+ } else
102451+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
102452
102453- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
102454 if (net->ipv4.route_hdr == NULL)
102455 goto err_reg;
102456 return 0;
102457
102458 err_reg:
102459- if (tbl != ipv4_route_flush_table)
102460- kfree(tbl);
102461+ kfree(tbl);
102462 err_dup:
102463 return -ENOMEM;
102464 }
102465@@ -2674,8 +2674,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
102466
102467 static __net_init int rt_genid_init(struct net *net)
102468 {
102469- atomic_set(&net->ipv4.rt_genid, 0);
102470- atomic_set(&net->fnhe_genid, 0);
102471+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
102472+ atomic_set_unchecked(&net->fnhe_genid, 0);
102473 get_random_bytes(&net->ipv4.dev_addr_genid,
102474 sizeof(net->ipv4.dev_addr_genid));
102475 return 0;
102476@@ -2718,11 +2718,7 @@ int __init ip_rt_init(void)
102477 {
102478 int rc = 0;
102479
102480- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
102481- if (!ip_idents)
102482- panic("IP: failed to allocate ip_idents\n");
102483-
102484- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
102485+ prandom_bytes(ip_idents, sizeof(ip_idents));
102486
102487 #ifdef CONFIG_IP_ROUTE_CLASSID
102488 ip_rt_acct = __alloc_percpu(256 * sizeof(struct ip_rt_acct), __alignof__(struct ip_rt_acct));
102489diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
102490index b3c53c8..35cc18d 100644
102491--- a/net/ipv4/sysctl_net_ipv4.c
102492+++ b/net/ipv4/sysctl_net_ipv4.c
102493@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
102494 container_of(table->data, struct net, ipv4.ip_local_ports.range);
102495 int ret;
102496 int range[2];
102497- struct ctl_table tmp = {
102498+ ctl_table_no_const tmp = {
102499 .data = &range,
102500 .maxlen = sizeof(range),
102501 .mode = table->mode,
102502@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
102503 int ret;
102504 gid_t urange[2];
102505 kgid_t low, high;
102506- struct ctl_table tmp = {
102507+ ctl_table_no_const tmp = {
102508 .data = &urange,
102509 .maxlen = sizeof(urange),
102510 .mode = table->mode,
102511@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
102512 void __user *buffer, size_t *lenp, loff_t *ppos)
102513 {
102514 char val[TCP_CA_NAME_MAX];
102515- struct ctl_table tbl = {
102516+ ctl_table_no_const tbl = {
102517 .data = val,
102518 .maxlen = TCP_CA_NAME_MAX,
102519 };
102520@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
102521 void __user *buffer, size_t *lenp,
102522 loff_t *ppos)
102523 {
102524- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
102525+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
102526 int ret;
102527
102528 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
102529@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
102530 void __user *buffer, size_t *lenp,
102531 loff_t *ppos)
102532 {
102533- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
102534+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
102535 int ret;
102536
102537 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
102538@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
102539 void __user *buffer, size_t *lenp,
102540 loff_t *ppos)
102541 {
102542- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
102543+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
102544 struct tcp_fastopen_context *ctxt;
102545 int ret;
102546 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
102547@@ -874,13 +874,12 @@ static struct ctl_table ipv4_net_table[] = {
102548
102549 static __net_init int ipv4_sysctl_init_net(struct net *net)
102550 {
102551- struct ctl_table *table;
102552+ ctl_table_no_const *table = NULL;
102553
102554- table = ipv4_net_table;
102555 if (!net_eq(net, &init_net)) {
102556 int i;
102557
102558- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
102559+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
102560 if (table == NULL)
102561 goto err_alloc;
102562
102563@@ -889,7 +888,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
102564 table[i].data += (void *)net - (void *)&init_net;
102565 }
102566
102567- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
102568+ if (!net_eq(net, &init_net))
102569+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
102570+ else
102571+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
102572 if (net->ipv4.ipv4_hdr == NULL)
102573 goto err_reg;
102574
102575diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
102576index d107ee2..bcebf11 100644
102577--- a/net/ipv4/tcp_input.c
102578+++ b/net/ipv4/tcp_input.c
102579@@ -765,7 +765,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
102580 * without any lock. We want to make sure compiler wont store
102581 * intermediate values in this location.
102582 */
102583- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
102584+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
102585 sk->sk_max_pacing_rate);
102586 }
102587
102588@@ -4527,7 +4527,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
102589 * simplifies code)
102590 */
102591 static void
102592-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
102593+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
102594 struct sk_buff *head, struct sk_buff *tail,
102595 u32 start, u32 end)
102596 {
102597@@ -5506,6 +5506,7 @@ discard:
102598 tcp_paws_reject(&tp->rx_opt, 0))
102599 goto discard_and_undo;
102600
102601+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
102602 if (th->syn) {
102603 /* We see SYN without ACK. It is attempt of
102604 * simultaneous connect with crossed SYNs.
102605@@ -5556,6 +5557,7 @@ discard:
102606 goto discard;
102607 #endif
102608 }
102609+#endif
102610 /* "fifth, if neither of the SYN or RST bits is set then
102611 * drop the segment and return."
102612 */
102613@@ -5602,7 +5604,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
102614 goto discard;
102615
102616 if (th->syn) {
102617- if (th->fin)
102618+ if (th->fin || th->urg || th->psh)
102619 goto discard;
102620 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
102621 return 1;
102622diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
102623index ef7089c..a3e65fb 100644
102624--- a/net/ipv4/tcp_ipv4.c
102625+++ b/net/ipv4/tcp_ipv4.c
102626@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
102627 int sysctl_tcp_low_latency __read_mostly;
102628 EXPORT_SYMBOL(sysctl_tcp_low_latency);
102629
102630+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102631+extern int grsec_enable_blackhole;
102632+#endif
102633+
102634 #ifdef CONFIG_TCP_MD5SIG
102635 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
102636 __be32 daddr, __be32 saddr, const struct tcphdr *th);
102637@@ -1469,6 +1473,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
102638 return 0;
102639
102640 reset:
102641+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102642+ if (!grsec_enable_blackhole)
102643+#endif
102644 tcp_v4_send_reset(rsk, skb);
102645 discard:
102646 kfree_skb(skb);
102647@@ -1633,12 +1640,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
102648 TCP_SKB_CB(skb)->sacked = 0;
102649
102650 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
102651- if (!sk)
102652+ if (!sk) {
102653+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102654+ ret = 1;
102655+#endif
102656 goto no_tcp_socket;
102657-
102658+ }
102659 process:
102660- if (sk->sk_state == TCP_TIME_WAIT)
102661+ if (sk->sk_state == TCP_TIME_WAIT) {
102662+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102663+ ret = 2;
102664+#endif
102665 goto do_time_wait;
102666+ }
102667
102668 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
102669 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
102670@@ -1694,6 +1708,10 @@ csum_error:
102671 bad_packet:
102672 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
102673 } else {
102674+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102675+ if (!grsec_enable_blackhole || (ret == 1 &&
102676+ (skb->dev->flags & IFF_LOOPBACK)))
102677+#endif
102678 tcp_v4_send_reset(NULL, skb);
102679 }
102680
102681diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
102682index 63d2680..2db9d6b 100644
102683--- a/net/ipv4/tcp_minisocks.c
102684+++ b/net/ipv4/tcp_minisocks.c
102685@@ -27,6 +27,10 @@
102686 #include <net/inet_common.h>
102687 #include <net/xfrm.h>
102688
102689+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102690+extern int grsec_enable_blackhole;
102691+#endif
102692+
102693 int sysctl_tcp_syncookies __read_mostly = 1;
102694 EXPORT_SYMBOL(sysctl_tcp_syncookies);
102695
102696@@ -739,7 +743,10 @@ embryonic_reset:
102697 * avoid becoming vulnerable to outside attack aiming at
102698 * resetting legit local connections.
102699 */
102700- req->rsk_ops->send_reset(sk, skb);
102701+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102702+ if (!grsec_enable_blackhole)
102703+#endif
102704+ req->rsk_ops->send_reset(sk, skb);
102705 } else if (fastopen) { /* received a valid RST pkt */
102706 reqsk_fastopen_remove(sk, req, true);
102707 tcp_reset(sk);
102708diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
102709index ebf5ff5..4d1ff32 100644
102710--- a/net/ipv4/tcp_probe.c
102711+++ b/net/ipv4/tcp_probe.c
102712@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
102713 if (cnt + width >= len)
102714 break;
102715
102716- if (copy_to_user(buf + cnt, tbuf, width))
102717+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
102718 return -EFAULT;
102719 cnt += width;
102720 }
102721diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
102722index 9b21ae8..4eb67df 100644
102723--- a/net/ipv4/tcp_timer.c
102724+++ b/net/ipv4/tcp_timer.c
102725@@ -22,6 +22,10 @@
102726 #include <linux/gfp.h>
102727 #include <net/tcp.h>
102728
102729+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102730+extern int grsec_lastack_retries;
102731+#endif
102732+
102733 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
102734 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
102735 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
102736@@ -191,6 +195,13 @@ static int tcp_write_timeout(struct sock *sk)
102737 }
102738 }
102739
102740+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102741+ if ((sk->sk_state == TCP_LAST_ACK) &&
102742+ (grsec_lastack_retries > 0) &&
102743+ (grsec_lastack_retries < retry_until))
102744+ retry_until = grsec_lastack_retries;
102745+#endif
102746+
102747 if (retransmits_timed_out(sk, retry_until,
102748 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
102749 /* Has it gone just too far? */
102750diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
102751index cd0db54..93a6518 100644
102752--- a/net/ipv4/udp.c
102753+++ b/net/ipv4/udp.c
102754@@ -87,6 +87,7 @@
102755 #include <linux/types.h>
102756 #include <linux/fcntl.h>
102757 #include <linux/module.h>
102758+#include <linux/security.h>
102759 #include <linux/socket.h>
102760 #include <linux/sockios.h>
102761 #include <linux/igmp.h>
102762@@ -114,6 +115,10 @@
102763 #include <net/busy_poll.h>
102764 #include "udp_impl.h"
102765
102766+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102767+extern int grsec_enable_blackhole;
102768+#endif
102769+
102770 struct udp_table udp_table __read_mostly;
102771 EXPORT_SYMBOL(udp_table);
102772
102773@@ -595,6 +600,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
102774 return true;
102775 }
102776
102777+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
102778+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
102779+
102780 /*
102781 * This routine is called by the ICMP module when it gets some
102782 * sort of error condition. If err < 0 then the socket should
102783@@ -932,9 +940,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
102784 dport = usin->sin_port;
102785 if (dport == 0)
102786 return -EINVAL;
102787+
102788+ err = gr_search_udp_sendmsg(sk, usin);
102789+ if (err)
102790+ return err;
102791 } else {
102792 if (sk->sk_state != TCP_ESTABLISHED)
102793 return -EDESTADDRREQ;
102794+
102795+ err = gr_search_udp_sendmsg(sk, NULL);
102796+ if (err)
102797+ return err;
102798+
102799 daddr = inet->inet_daddr;
102800 dport = inet->inet_dport;
102801 /* Open fast path for connected socket.
102802@@ -1182,7 +1199,7 @@ static unsigned int first_packet_length(struct sock *sk)
102803 IS_UDPLITE(sk));
102804 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
102805 IS_UDPLITE(sk));
102806- atomic_inc(&sk->sk_drops);
102807+ atomic_inc_unchecked(&sk->sk_drops);
102808 __skb_unlink(skb, rcvq);
102809 __skb_queue_tail(&list_kill, skb);
102810 }
102811@@ -1262,6 +1279,10 @@ try_again:
102812 if (!skb)
102813 goto out;
102814
102815+ err = gr_search_udp_recvmsg(sk, skb);
102816+ if (err)
102817+ goto out_free;
102818+
102819 ulen = skb->len - sizeof(struct udphdr);
102820 copied = len;
102821 if (copied > ulen)
102822@@ -1295,7 +1316,7 @@ try_again:
102823 if (unlikely(err)) {
102824 trace_kfree_skb(skb, udp_recvmsg);
102825 if (!peeked) {
102826- atomic_inc(&sk->sk_drops);
102827+ atomic_inc_unchecked(&sk->sk_drops);
102828 UDP_INC_STATS_USER(sock_net(sk),
102829 UDP_MIB_INERRORS, is_udplite);
102830 }
102831@@ -1592,7 +1613,7 @@ csum_error:
102832 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
102833 drop:
102834 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
102835- atomic_inc(&sk->sk_drops);
102836+ atomic_inc_unchecked(&sk->sk_drops);
102837 kfree_skb(skb);
102838 return -1;
102839 }
102840@@ -1611,7 +1632,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
102841 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
102842
102843 if (!skb1) {
102844- atomic_inc(&sk->sk_drops);
102845+ atomic_inc_unchecked(&sk->sk_drops);
102846 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
102847 IS_UDPLITE(sk));
102848 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
102849@@ -1812,6 +1833,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
102850 goto csum_error;
102851
102852 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
102853+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102854+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
102855+#endif
102856 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
102857
102858 /*
102859@@ -2398,7 +2422,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
102860 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
102861 0, sock_i_ino(sp),
102862 atomic_read(&sp->sk_refcnt), sp,
102863- atomic_read(&sp->sk_drops));
102864+ atomic_read_unchecked(&sp->sk_drops));
102865 }
102866
102867 int udp4_seq_show(struct seq_file *seq, void *v)
102868diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
102869index 6156f68..d6ab46d 100644
102870--- a/net/ipv4/xfrm4_policy.c
102871+++ b/net/ipv4/xfrm4_policy.c
102872@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
102873 fl4->flowi4_tos = iph->tos;
102874 }
102875
102876-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
102877+static int xfrm4_garbage_collect(struct dst_ops *ops)
102878 {
102879 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
102880
102881- xfrm4_policy_afinfo.garbage_collect(net);
102882+ xfrm_garbage_collect_deferred(net);
102883 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
102884 }
102885
102886@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
102887
102888 static int __net_init xfrm4_net_init(struct net *net)
102889 {
102890- struct ctl_table *table;
102891+ ctl_table_no_const *table = NULL;
102892 struct ctl_table_header *hdr;
102893
102894- table = xfrm4_policy_table;
102895 if (!net_eq(net, &init_net)) {
102896- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
102897+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
102898 if (!table)
102899 goto err_alloc;
102900
102901 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
102902- }
102903-
102904- hdr = register_net_sysctl(net, "net/ipv4", table);
102905+ hdr = register_net_sysctl(net, "net/ipv4", table);
102906+ } else
102907+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
102908 if (!hdr)
102909 goto err_reg;
102910
102911@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
102912 return 0;
102913
102914 err_reg:
102915- if (!net_eq(net, &init_net))
102916- kfree(table);
102917+ kfree(table);
102918 err_alloc:
102919 return -ENOMEM;
102920 }
102921diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
102922index 0169ccf..50d7b04 100644
102923--- a/net/ipv6/addrconf.c
102924+++ b/net/ipv6/addrconf.c
102925@@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
102926 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
102927 .mtu6 = IPV6_MIN_MTU,
102928 .accept_ra = 1,
102929- .accept_redirects = 1,
102930+ .accept_redirects = 0,
102931 .autoconf = 1,
102932 .force_mld_version = 0,
102933 .mldv1_unsolicited_report_interval = 10 * HZ,
102934@@ -208,7 +208,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
102935 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
102936 .mtu6 = IPV6_MIN_MTU,
102937 .accept_ra = 1,
102938- .accept_redirects = 1,
102939+ .accept_redirects = 0,
102940 .autoconf = 1,
102941 .force_mld_version = 0,
102942 .mldv1_unsolicited_report_interval = 10 * HZ,
102943@@ -604,7 +604,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
102944 idx = 0;
102945 head = &net->dev_index_head[h];
102946 rcu_read_lock();
102947- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
102948+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
102949 net->dev_base_seq;
102950 hlist_for_each_entry_rcu(dev, head, index_hlist) {
102951 if (idx < s_idx)
102952@@ -2396,7 +2396,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
102953 p.iph.ihl = 5;
102954 p.iph.protocol = IPPROTO_IPV6;
102955 p.iph.ttl = 64;
102956- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
102957+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
102958
102959 if (ops->ndo_do_ioctl) {
102960 mm_segment_t oldfs = get_fs();
102961@@ -3534,16 +3534,23 @@ static const struct file_operations if6_fops = {
102962 .release = seq_release_net,
102963 };
102964
102965+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
102966+extern void unregister_ipv6_seq_ops_addr(void);
102967+
102968 static int __net_init if6_proc_net_init(struct net *net)
102969 {
102970- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
102971+ register_ipv6_seq_ops_addr(&if6_seq_ops);
102972+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
102973+ unregister_ipv6_seq_ops_addr();
102974 return -ENOMEM;
102975+ }
102976 return 0;
102977 }
102978
102979 static void __net_exit if6_proc_net_exit(struct net *net)
102980 {
102981 remove_proc_entry("if_inet6", net->proc_net);
102982+ unregister_ipv6_seq_ops_addr();
102983 }
102984
102985 static struct pernet_operations if6_proc_net_ops = {
102986@@ -4159,7 +4166,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
102987 s_ip_idx = ip_idx = cb->args[2];
102988
102989 rcu_read_lock();
102990- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
102991+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
102992 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
102993 idx = 0;
102994 head = &net->dev_index_head[h];
102995@@ -4788,7 +4795,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
102996 rt_genid_bump_ipv6(net);
102997 break;
102998 }
102999- atomic_inc(&net->ipv6.dev_addr_genid);
103000+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
103001 }
103002
103003 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
103004@@ -4808,7 +4815,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
103005 int *valp = ctl->data;
103006 int val = *valp;
103007 loff_t pos = *ppos;
103008- struct ctl_table lctl;
103009+ ctl_table_no_const lctl;
103010 int ret;
103011
103012 /*
103013@@ -4893,7 +4900,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
103014 int *valp = ctl->data;
103015 int val = *valp;
103016 loff_t pos = *ppos;
103017- struct ctl_table lctl;
103018+ ctl_table_no_const lctl;
103019 int ret;
103020
103021 /*
103022diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
103023index e8c4400..a4cd5da 100644
103024--- a/net/ipv6/af_inet6.c
103025+++ b/net/ipv6/af_inet6.c
103026@@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
103027 net->ipv6.sysctl.icmpv6_time = 1*HZ;
103028 net->ipv6.sysctl.flowlabel_consistency = 1;
103029 net->ipv6.sysctl.auto_flowlabels = 0;
103030- atomic_set(&net->ipv6.fib6_sernum, 1);
103031+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
103032
103033 err = ipv6_init_mibs(net);
103034 if (err)
103035diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
103036index 2cdc383..09cffb8 100644
103037--- a/net/ipv6/datagram.c
103038+++ b/net/ipv6/datagram.c
103039@@ -928,5 +928,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
103040 0,
103041 sock_i_ino(sp),
103042 atomic_read(&sp->sk_refcnt), sp,
103043- atomic_read(&sp->sk_drops));
103044+ atomic_read_unchecked(&sp->sk_drops));
103045 }
103046diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
103047index 97ae700..18dcae0 100644
103048--- a/net/ipv6/icmp.c
103049+++ b/net/ipv6/icmp.c
103050@@ -997,7 +997,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
103051
103052 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
103053 {
103054- struct ctl_table *table;
103055+ ctl_table_no_const *table;
103056
103057 table = kmemdup(ipv6_icmp_table_template,
103058 sizeof(ipv6_icmp_table_template),
103059diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
103060index b2d1838..0194c04 100644
103061--- a/net/ipv6/ip6_fib.c
103062+++ b/net/ipv6/ip6_fib.c
103063@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
103064 int new, old;
103065
103066 do {
103067- old = atomic_read(&net->ipv6.fib6_sernum);
103068+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
103069 new = old < INT_MAX ? old + 1 : 1;
103070- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
103071+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
103072 old, new) != old);
103073 return new;
103074 }
103075diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
103076index 0e32d2e..98cbe65 100644
103077--- a/net/ipv6/ip6_gre.c
103078+++ b/net/ipv6/ip6_gre.c
103079@@ -71,8 +71,8 @@ struct ip6gre_net {
103080 struct net_device *fb_tunnel_dev;
103081 };
103082
103083-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
103084-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
103085+static struct rtnl_link_ops ip6gre_link_ops;
103086+static struct rtnl_link_ops ip6gre_tap_ops;
103087 static int ip6gre_tunnel_init(struct net_device *dev);
103088 static void ip6gre_tunnel_setup(struct net_device *dev);
103089 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
103090@@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
103091 }
103092
103093
103094-static struct inet6_protocol ip6gre_protocol __read_mostly = {
103095+static struct inet6_protocol ip6gre_protocol = {
103096 .handler = ip6gre_rcv,
103097 .err_handler = ip6gre_err,
103098 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
103099@@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
103100 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
103101 };
103102
103103-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
103104+static struct rtnl_link_ops ip6gre_link_ops = {
103105 .kind = "ip6gre",
103106 .maxtype = IFLA_GRE_MAX,
103107 .policy = ip6gre_policy,
103108@@ -1664,7 +1664,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
103109 .fill_info = ip6gre_fill_info,
103110 };
103111
103112-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
103113+static struct rtnl_link_ops ip6gre_tap_ops = {
103114 .kind = "ip6gretap",
103115 .maxtype = IFLA_GRE_MAX,
103116 .policy = ip6gre_policy,
103117diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
103118index 9cb94cf..5678108 100644
103119--- a/net/ipv6/ip6_tunnel.c
103120+++ b/net/ipv6/ip6_tunnel.c
103121@@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
103122
103123 static int ip6_tnl_dev_init(struct net_device *dev);
103124 static void ip6_tnl_dev_setup(struct net_device *dev);
103125-static struct rtnl_link_ops ip6_link_ops __read_mostly;
103126+static struct rtnl_link_ops ip6_link_ops;
103127
103128 static int ip6_tnl_net_id __read_mostly;
103129 struct ip6_tnl_net {
103130@@ -1706,7 +1706,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
103131 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
103132 };
103133
103134-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
103135+static struct rtnl_link_ops ip6_link_ops = {
103136 .kind = "ip6tnl",
103137 .maxtype = IFLA_IPTUN_MAX,
103138 .policy = ip6_tnl_policy,
103139diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
103140index bcda14d..49378c9 100644
103141--- a/net/ipv6/ip6_vti.c
103142+++ b/net/ipv6/ip6_vti.c
103143@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
103144
103145 static int vti6_dev_init(struct net_device *dev);
103146 static void vti6_dev_setup(struct net_device *dev);
103147-static struct rtnl_link_ops vti6_link_ops __read_mostly;
103148+static struct rtnl_link_ops vti6_link_ops;
103149
103150 static int vti6_net_id __read_mostly;
103151 struct vti6_net {
103152@@ -981,7 +981,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
103153 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
103154 };
103155
103156-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
103157+static struct rtnl_link_ops vti6_link_ops = {
103158 .kind = "vti6",
103159 .maxtype = IFLA_VTI_MAX,
103160 .policy = vti6_policy,
103161diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
103162index e1a9583..7dd8f4d 100644
103163--- a/net/ipv6/ipv6_sockglue.c
103164+++ b/net/ipv6/ipv6_sockglue.c
103165@@ -993,7 +993,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
103166 if (sk->sk_type != SOCK_STREAM)
103167 return -ENOPROTOOPT;
103168
103169- msg.msg_control = optval;
103170+ msg.msg_control = (void __force_kernel *)optval;
103171 msg.msg_controllen = len;
103172 msg.msg_flags = flags;
103173
103174diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
103175index e080fbb..412b3cf 100644
103176--- a/net/ipv6/netfilter/ip6_tables.c
103177+++ b/net/ipv6/netfilter/ip6_tables.c
103178@@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
103179 #endif
103180
103181 static int get_info(struct net *net, void __user *user,
103182- const int *len, int compat)
103183+ int len, int compat)
103184 {
103185 char name[XT_TABLE_MAXNAMELEN];
103186 struct xt_table *t;
103187 int ret;
103188
103189- if (*len != sizeof(struct ip6t_getinfo)) {
103190- duprintf("length %u != %zu\n", *len,
103191+ if (len != sizeof(struct ip6t_getinfo)) {
103192+ duprintf("length %u != %zu\n", len,
103193 sizeof(struct ip6t_getinfo));
103194 return -EINVAL;
103195 }
103196@@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
103197 info.size = private->size;
103198 strcpy(info.name, name);
103199
103200- if (copy_to_user(user, &info, *len) != 0)
103201+ if (copy_to_user(user, &info, len) != 0)
103202 ret = -EFAULT;
103203 else
103204 ret = 0;
103205@@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103206
103207 switch (cmd) {
103208 case IP6T_SO_GET_INFO:
103209- ret = get_info(sock_net(sk), user, len, 1);
103210+ ret = get_info(sock_net(sk), user, *len, 1);
103211 break;
103212 case IP6T_SO_GET_ENTRIES:
103213 ret = compat_get_entries(sock_net(sk), user, len);
103214@@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103215
103216 switch (cmd) {
103217 case IP6T_SO_GET_INFO:
103218- ret = get_info(sock_net(sk), user, len, 0);
103219+ ret = get_info(sock_net(sk), user, *len, 0);
103220 break;
103221
103222 case IP6T_SO_GET_ENTRIES:
103223diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
103224index 6f187c8..34b367f 100644
103225--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
103226+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
103227@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
103228
103229 static int nf_ct_frag6_sysctl_register(struct net *net)
103230 {
103231- struct ctl_table *table;
103232+ ctl_table_no_const *table = NULL;
103233 struct ctl_table_header *hdr;
103234
103235- table = nf_ct_frag6_sysctl_table;
103236 if (!net_eq(net, &init_net)) {
103237- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
103238+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
103239 GFP_KERNEL);
103240 if (table == NULL)
103241 goto err_alloc;
103242@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
103243 table[2].data = &net->nf_frag.frags.high_thresh;
103244 table[2].extra1 = &net->nf_frag.frags.low_thresh;
103245 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
103246- }
103247-
103248- hdr = register_net_sysctl(net, "net/netfilter", table);
103249+ hdr = register_net_sysctl(net, "net/netfilter", table);
103250+ } else
103251+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
103252 if (hdr == NULL)
103253 goto err_reg;
103254
103255@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
103256 return 0;
103257
103258 err_reg:
103259- if (!net_eq(net, &init_net))
103260- kfree(table);
103261+ kfree(table);
103262 err_alloc:
103263 return -ENOMEM;
103264 }
103265diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
103266index 5b7a1ed..d9da205 100644
103267--- a/net/ipv6/ping.c
103268+++ b/net/ipv6/ping.c
103269@@ -240,6 +240,24 @@ static struct pernet_operations ping_v6_net_ops = {
103270 };
103271 #endif
103272
103273+static struct pingv6_ops real_pingv6_ops = {
103274+ .ipv6_recv_error = ipv6_recv_error,
103275+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
103276+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
103277+ .icmpv6_err_convert = icmpv6_err_convert,
103278+ .ipv6_icmp_error = ipv6_icmp_error,
103279+ .ipv6_chk_addr = ipv6_chk_addr,
103280+};
103281+
103282+static struct pingv6_ops dummy_pingv6_ops = {
103283+ .ipv6_recv_error = dummy_ipv6_recv_error,
103284+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
103285+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
103286+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
103287+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
103288+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
103289+};
103290+
103291 int __init pingv6_init(void)
103292 {
103293 #ifdef CONFIG_PROC_FS
103294@@ -247,13 +265,7 @@ int __init pingv6_init(void)
103295 if (ret)
103296 return ret;
103297 #endif
103298- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
103299- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
103300- pingv6_ops.ip6_datagram_recv_specific_ctl =
103301- ip6_datagram_recv_specific_ctl;
103302- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
103303- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
103304- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
103305+ pingv6_ops = &real_pingv6_ops;
103306 return inet6_register_protosw(&pingv6_protosw);
103307 }
103308
103309@@ -262,14 +274,9 @@ int __init pingv6_init(void)
103310 */
103311 void pingv6_exit(void)
103312 {
103313- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
103314- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
103315- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
103316- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
103317- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
103318- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
103319 #ifdef CONFIG_PROC_FS
103320 unregister_pernet_subsys(&ping_v6_net_ops);
103321 #endif
103322+ pingv6_ops = &dummy_pingv6_ops;
103323 inet6_unregister_protosw(&pingv6_protosw);
103324 }
103325diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
103326index 1752cd0..3c6af41 100644
103327--- a/net/ipv6/proc.c
103328+++ b/net/ipv6/proc.c
103329@@ -309,7 +309,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
103330 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
103331 goto proc_snmp6_fail;
103332
103333- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
103334+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
103335 if (!net->mib.proc_net_devsnmp6)
103336 goto proc_dev_snmp6_fail;
103337 return 0;
103338diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
103339index 896af88..6e2ba628 100644
103340--- a/net/ipv6/raw.c
103341+++ b/net/ipv6/raw.c
103342@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
103343 {
103344 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
103345 skb_checksum_complete(skb)) {
103346- atomic_inc(&sk->sk_drops);
103347+ atomic_inc_unchecked(&sk->sk_drops);
103348 kfree_skb(skb);
103349 return NET_RX_DROP;
103350 }
103351@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
103352 struct raw6_sock *rp = raw6_sk(sk);
103353
103354 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
103355- atomic_inc(&sk->sk_drops);
103356+ atomic_inc_unchecked(&sk->sk_drops);
103357 kfree_skb(skb);
103358 return NET_RX_DROP;
103359 }
103360@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
103361
103362 if (inet->hdrincl) {
103363 if (skb_checksum_complete(skb)) {
103364- atomic_inc(&sk->sk_drops);
103365+ atomic_inc_unchecked(&sk->sk_drops);
103366 kfree_skb(skb);
103367 return NET_RX_DROP;
103368 }
103369@@ -608,7 +608,7 @@ out:
103370 return err;
103371 }
103372
103373-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
103374+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
103375 struct flowi6 *fl6, struct dst_entry **dstp,
103376 unsigned int flags)
103377 {
103378@@ -914,12 +914,15 @@ do_confirm:
103379 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
103380 char __user *optval, int optlen)
103381 {
103382+ struct icmp6_filter filter;
103383+
103384 switch (optname) {
103385 case ICMPV6_FILTER:
103386 if (optlen > sizeof(struct icmp6_filter))
103387 optlen = sizeof(struct icmp6_filter);
103388- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
103389+ if (copy_from_user(&filter, optval, optlen))
103390 return -EFAULT;
103391+ raw6_sk(sk)->filter = filter;
103392 return 0;
103393 default:
103394 return -ENOPROTOOPT;
103395@@ -932,6 +935,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
103396 char __user *optval, int __user *optlen)
103397 {
103398 int len;
103399+ struct icmp6_filter filter;
103400
103401 switch (optname) {
103402 case ICMPV6_FILTER:
103403@@ -943,7 +947,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
103404 len = sizeof(struct icmp6_filter);
103405 if (put_user(len, optlen))
103406 return -EFAULT;
103407- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
103408+ filter = raw6_sk(sk)->filter;
103409+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
103410 return -EFAULT;
103411 return 0;
103412 default:
103413diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
103414index 1a157ca..9fc05f4 100644
103415--- a/net/ipv6/reassembly.c
103416+++ b/net/ipv6/reassembly.c
103417@@ -625,12 +625,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
103418
103419 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103420 {
103421- struct ctl_table *table;
103422+ ctl_table_no_const *table = NULL;
103423 struct ctl_table_header *hdr;
103424
103425- table = ip6_frags_ns_ctl_table;
103426 if (!net_eq(net, &init_net)) {
103427- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
103428+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
103429 if (table == NULL)
103430 goto err_alloc;
103431
103432@@ -644,9 +643,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103433 /* Don't export sysctls to unprivileged users */
103434 if (net->user_ns != &init_user_ns)
103435 table[0].procname = NULL;
103436- }
103437+ hdr = register_net_sysctl(net, "net/ipv6", table);
103438+ } else
103439+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
103440
103441- hdr = register_net_sysctl(net, "net/ipv6", table);
103442 if (hdr == NULL)
103443 goto err_reg;
103444
103445@@ -654,8 +654,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103446 return 0;
103447
103448 err_reg:
103449- if (!net_eq(net, &init_net))
103450- kfree(table);
103451+ kfree(table);
103452 err_alloc:
103453 return -ENOMEM;
103454 }
103455diff --git a/net/ipv6/route.c b/net/ipv6/route.c
103456index a318dd89..7ecfea6 100644
103457--- a/net/ipv6/route.c
103458+++ b/net/ipv6/route.c
103459@@ -2965,7 +2965,7 @@ struct ctl_table ipv6_route_table_template[] = {
103460
103461 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
103462 {
103463- struct ctl_table *table;
103464+ ctl_table_no_const *table;
103465
103466 table = kmemdup(ipv6_route_table_template,
103467 sizeof(ipv6_route_table_template),
103468diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
103469index a24557a..00a9ed1 100644
103470--- a/net/ipv6/sit.c
103471+++ b/net/ipv6/sit.c
103472@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
103473 static void ipip6_dev_free(struct net_device *dev);
103474 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
103475 __be32 *v4dst);
103476-static struct rtnl_link_ops sit_link_ops __read_mostly;
103477+static struct rtnl_link_ops sit_link_ops;
103478
103479 static int sit_net_id __read_mostly;
103480 struct sit_net {
103481@@ -1750,7 +1750,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
103482 unregister_netdevice_queue(dev, head);
103483 }
103484
103485-static struct rtnl_link_ops sit_link_ops __read_mostly = {
103486+static struct rtnl_link_ops sit_link_ops = {
103487 .kind = "sit",
103488 .maxtype = IFLA_IPTUN_MAX,
103489 .policy = ipip6_policy,
103490diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
103491index c5c10fa..2577d51 100644
103492--- a/net/ipv6/sysctl_net_ipv6.c
103493+++ b/net/ipv6/sysctl_net_ipv6.c
103494@@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
103495
103496 static int __net_init ipv6_sysctl_net_init(struct net *net)
103497 {
103498- struct ctl_table *ipv6_table;
103499+ ctl_table_no_const *ipv6_table;
103500 struct ctl_table *ipv6_route_table;
103501 struct ctl_table *ipv6_icmp_table;
103502 int err;
103503diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
103504index c277951..c7ee5bf 100644
103505--- a/net/ipv6/tcp_ipv6.c
103506+++ b/net/ipv6/tcp_ipv6.c
103507@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
103508 }
103509 }
103510
103511+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103512+extern int grsec_enable_blackhole;
103513+#endif
103514+
103515 static void tcp_v6_hash(struct sock *sk)
103516 {
103517 if (sk->sk_state != TCP_CLOSE) {
103518@@ -1341,6 +1345,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
103519 return 0;
103520
103521 reset:
103522+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103523+ if (!grsec_enable_blackhole)
103524+#endif
103525 tcp_v6_send_reset(sk, skb);
103526 discard:
103527 if (opt_skb)
103528@@ -1434,12 +1441,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
103529
103530 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
103531 tcp_v6_iif(skb));
103532- if (!sk)
103533+ if (!sk) {
103534+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103535+ ret = 1;
103536+#endif
103537 goto no_tcp_socket;
103538+ }
103539
103540 process:
103541- if (sk->sk_state == TCP_TIME_WAIT)
103542+ if (sk->sk_state == TCP_TIME_WAIT) {
103543+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103544+ ret = 2;
103545+#endif
103546 goto do_time_wait;
103547+ }
103548
103549 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
103550 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
103551@@ -1486,6 +1501,10 @@ csum_error:
103552 bad_packet:
103553 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
103554 } else {
103555+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103556+ if (!grsec_enable_blackhole || (ret == 1 &&
103557+ (skb->dev->flags & IFF_LOOPBACK)))
103558+#endif
103559 tcp_v6_send_reset(NULL, skb);
103560 }
103561
103562diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
103563index f6ba535..b41033f 100644
103564--- a/net/ipv6/udp.c
103565+++ b/net/ipv6/udp.c
103566@@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
103567 udp_ipv6_hash_secret + net_hash_mix(net));
103568 }
103569
103570+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103571+extern int grsec_enable_blackhole;
103572+#endif
103573+
103574 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
103575 {
103576 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
103577@@ -434,7 +438,7 @@ try_again:
103578 if (unlikely(err)) {
103579 trace_kfree_skb(skb, udpv6_recvmsg);
103580 if (!peeked) {
103581- atomic_inc(&sk->sk_drops);
103582+ atomic_inc_unchecked(&sk->sk_drops);
103583 if (is_udp4)
103584 UDP_INC_STATS_USER(sock_net(sk),
103585 UDP_MIB_INERRORS,
103586@@ -701,7 +705,7 @@ csum_error:
103587 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
103588 drop:
103589 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
103590- atomic_inc(&sk->sk_drops);
103591+ atomic_inc_unchecked(&sk->sk_drops);
103592 kfree_skb(skb);
103593 return -1;
103594 }
103595@@ -740,7 +744,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
103596 if (likely(skb1 == NULL))
103597 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
103598 if (!skb1) {
103599- atomic_inc(&sk->sk_drops);
103600+ atomic_inc_unchecked(&sk->sk_drops);
103601 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
103602 IS_UDPLITE(sk));
103603 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
103604@@ -919,6 +923,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
103605 goto csum_error;
103606
103607 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
103608+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103609+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
103610+#endif
103611 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
103612
103613 kfree_skb(skb);
103614diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
103615index 5f98364..5ca982a 100644
103616--- a/net/ipv6/xfrm6_policy.c
103617+++ b/net/ipv6/xfrm6_policy.c
103618@@ -130,8 +130,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
103619 {
103620 struct flowi6 *fl6 = &fl->u.ip6;
103621 int onlyproto = 0;
103622- u16 offset = skb_network_header_len(skb);
103623 const struct ipv6hdr *hdr = ipv6_hdr(skb);
103624+ u16 offset = sizeof(*hdr);
103625 struct ipv6_opt_hdr *exthdr;
103626 const unsigned char *nh = skb_network_header(skb);
103627 u8 nexthdr = nh[IP6CB(skb)->nhoff];
103628@@ -217,11 +217,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
103629 }
103630 }
103631
103632-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
103633+static int xfrm6_garbage_collect(struct dst_ops *ops)
103634 {
103635 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
103636
103637- xfrm6_policy_afinfo.garbage_collect(net);
103638+ xfrm_garbage_collect_deferred(net);
103639 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
103640 }
103641
103642@@ -334,19 +334,19 @@ static struct ctl_table xfrm6_policy_table[] = {
103643
103644 static int __net_init xfrm6_net_init(struct net *net)
103645 {
103646- struct ctl_table *table;
103647+ ctl_table_no_const *table = NULL;
103648 struct ctl_table_header *hdr;
103649
103650- table = xfrm6_policy_table;
103651 if (!net_eq(net, &init_net)) {
103652- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
103653+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
103654 if (!table)
103655 goto err_alloc;
103656
103657 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
103658- }
103659+ hdr = register_net_sysctl(net, "net/ipv6", table);
103660+ } else
103661+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
103662
103663- hdr = register_net_sysctl(net, "net/ipv6", table);
103664 if (!hdr)
103665 goto err_reg;
103666
103667@@ -354,8 +354,7 @@ static int __net_init xfrm6_net_init(struct net *net)
103668 return 0;
103669
103670 err_reg:
103671- if (!net_eq(net, &init_net))
103672- kfree(table);
103673+ kfree(table);
103674 err_alloc:
103675 return -ENOMEM;
103676 }
103677diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
103678index e15c16a..7cf07aa 100644
103679--- a/net/ipx/ipx_proc.c
103680+++ b/net/ipx/ipx_proc.c
103681@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
103682 struct proc_dir_entry *p;
103683 int rc = -ENOMEM;
103684
103685- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
103686+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
103687
103688 if (!ipx_proc_dir)
103689 goto out;
103690diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
103691index 61ceb4c..e788eb8 100644
103692--- a/net/irda/ircomm/ircomm_tty.c
103693+++ b/net/irda/ircomm/ircomm_tty.c
103694@@ -317,10 +317,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103695 add_wait_queue(&port->open_wait, &wait);
103696
103697 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
103698- __FILE__, __LINE__, tty->driver->name, port->count);
103699+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103700
103701 spin_lock_irqsave(&port->lock, flags);
103702- port->count--;
103703+ atomic_dec(&port->count);
103704 port->blocked_open++;
103705 spin_unlock_irqrestore(&port->lock, flags);
103706
103707@@ -355,7 +355,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103708 }
103709
103710 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
103711- __FILE__, __LINE__, tty->driver->name, port->count);
103712+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103713
103714 schedule();
103715 }
103716@@ -365,12 +365,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103717
103718 spin_lock_irqsave(&port->lock, flags);
103719 if (!tty_hung_up_p(filp))
103720- port->count++;
103721+ atomic_inc(&port->count);
103722 port->blocked_open--;
103723 spin_unlock_irqrestore(&port->lock, flags);
103724
103725 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
103726- __FILE__, __LINE__, tty->driver->name, port->count);
103727+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103728
103729 if (!retval)
103730 port->flags |= ASYNC_NORMAL_ACTIVE;
103731@@ -444,12 +444,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
103732
103733 /* ++ is not atomic, so this should be protected - Jean II */
103734 spin_lock_irqsave(&self->port.lock, flags);
103735- self->port.count++;
103736+ atomic_inc(&self->port.count);
103737 spin_unlock_irqrestore(&self->port.lock, flags);
103738 tty_port_tty_set(&self->port, tty);
103739
103740 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
103741- self->line, self->port.count);
103742+ self->line, atomic_read(&self->port.count));
103743
103744 /* Not really used by us, but lets do it anyway */
103745 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
103746@@ -985,7 +985,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
103747 tty_kref_put(port->tty);
103748 }
103749 port->tty = NULL;
103750- port->count = 0;
103751+ atomic_set(&port->count, 0);
103752 spin_unlock_irqrestore(&port->lock, flags);
103753
103754 wake_up_interruptible(&port->open_wait);
103755@@ -1342,7 +1342,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
103756 seq_putc(m, '\n');
103757
103758 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
103759- seq_printf(m, "Open count: %d\n", self->port.count);
103760+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
103761 seq_printf(m, "Max data size: %d\n", self->max_data_size);
103762 seq_printf(m, "Max header size: %d\n", self->max_header_size);
103763
103764diff --git a/net/irda/irproc.c b/net/irda/irproc.c
103765index b9ac598..f88cc56 100644
103766--- a/net/irda/irproc.c
103767+++ b/net/irda/irproc.c
103768@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
103769 {
103770 int i;
103771
103772- proc_irda = proc_mkdir("irda", init_net.proc_net);
103773+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
103774 if (proc_irda == NULL)
103775 return;
103776
103777diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
103778index a089b6b..3ca3b60 100644
103779--- a/net/iucv/af_iucv.c
103780+++ b/net/iucv/af_iucv.c
103781@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
103782 {
103783 char name[12];
103784
103785- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
103786+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
103787 while (__iucv_get_sock_by_name(name)) {
103788 sprintf(name, "%08x",
103789- atomic_inc_return(&iucv_sk_list.autobind_name));
103790+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
103791 }
103792 memcpy(iucv->src_name, name, 8);
103793 }
103794diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
103795index 2a6a1fd..6c112b0 100644
103796--- a/net/iucv/iucv.c
103797+++ b/net/iucv/iucv.c
103798@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
103799 return NOTIFY_OK;
103800 }
103801
103802-static struct notifier_block __refdata iucv_cpu_notifier = {
103803+static struct notifier_block iucv_cpu_notifier = {
103804 .notifier_call = iucv_cpu_notify,
103805 };
103806
103807diff --git a/net/key/af_key.c b/net/key/af_key.c
103808index 1847ec4..26ef732 100644
103809--- a/net/key/af_key.c
103810+++ b/net/key/af_key.c
103811@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
103812 static u32 get_acqseq(void)
103813 {
103814 u32 res;
103815- static atomic_t acqseq;
103816+ static atomic_unchecked_t acqseq;
103817
103818 do {
103819- res = atomic_inc_return(&acqseq);
103820+ res = atomic_inc_return_unchecked(&acqseq);
103821 } while (!res);
103822 return res;
103823 }
103824diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
103825index edb78e6..8dc654a 100644
103826--- a/net/l2tp/l2tp_eth.c
103827+++ b/net/l2tp/l2tp_eth.c
103828@@ -42,12 +42,12 @@ struct l2tp_eth {
103829 struct sock *tunnel_sock;
103830 struct l2tp_session *session;
103831 struct list_head list;
103832- atomic_long_t tx_bytes;
103833- atomic_long_t tx_packets;
103834- atomic_long_t tx_dropped;
103835- atomic_long_t rx_bytes;
103836- atomic_long_t rx_packets;
103837- atomic_long_t rx_errors;
103838+ atomic_long_unchecked_t tx_bytes;
103839+ atomic_long_unchecked_t tx_packets;
103840+ atomic_long_unchecked_t tx_dropped;
103841+ atomic_long_unchecked_t rx_bytes;
103842+ atomic_long_unchecked_t rx_packets;
103843+ atomic_long_unchecked_t rx_errors;
103844 };
103845
103846 /* via l2tp_session_priv() */
103847@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
103848 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
103849
103850 if (likely(ret == NET_XMIT_SUCCESS)) {
103851- atomic_long_add(len, &priv->tx_bytes);
103852- atomic_long_inc(&priv->tx_packets);
103853+ atomic_long_add_unchecked(len, &priv->tx_bytes);
103854+ atomic_long_inc_unchecked(&priv->tx_packets);
103855 } else {
103856- atomic_long_inc(&priv->tx_dropped);
103857+ atomic_long_inc_unchecked(&priv->tx_dropped);
103858 }
103859 return NETDEV_TX_OK;
103860 }
103861@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
103862 {
103863 struct l2tp_eth *priv = netdev_priv(dev);
103864
103865- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
103866- stats->tx_packets = atomic_long_read(&priv->tx_packets);
103867- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
103868- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
103869- stats->rx_packets = atomic_long_read(&priv->rx_packets);
103870- stats->rx_errors = atomic_long_read(&priv->rx_errors);
103871+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
103872+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
103873+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
103874+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
103875+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
103876+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
103877 return stats;
103878 }
103879
103880@@ -166,15 +166,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
103881 nf_reset(skb);
103882
103883 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
103884- atomic_long_inc(&priv->rx_packets);
103885- atomic_long_add(data_len, &priv->rx_bytes);
103886+ atomic_long_inc_unchecked(&priv->rx_packets);
103887+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
103888 } else {
103889- atomic_long_inc(&priv->rx_errors);
103890+ atomic_long_inc_unchecked(&priv->rx_errors);
103891 }
103892 return;
103893
103894 error:
103895- atomic_long_inc(&priv->rx_errors);
103896+ atomic_long_inc_unchecked(&priv->rx_errors);
103897 kfree_skb(skb);
103898 }
103899
103900diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
103901index 1a3c7e0..80f8b0c 100644
103902--- a/net/llc/llc_proc.c
103903+++ b/net/llc/llc_proc.c
103904@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
103905 int rc = -ENOMEM;
103906 struct proc_dir_entry *p;
103907
103908- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
103909+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
103910 if (!llc_proc_dir)
103911 goto out;
103912
103913diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
103914index 343da1e..509873f 100644
103915--- a/net/mac80211/cfg.c
103916+++ b/net/mac80211/cfg.c
103917@@ -541,7 +541,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
103918 ret = ieee80211_vif_use_channel(sdata, chandef,
103919 IEEE80211_CHANCTX_EXCLUSIVE);
103920 }
103921- } else if (local->open_count == local->monitors) {
103922+ } else if (local_read(&local->open_count) == local->monitors) {
103923 local->_oper_chandef = *chandef;
103924 ieee80211_hw_config(local, 0);
103925 }
103926@@ -3326,7 +3326,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
103927 else
103928 local->probe_req_reg--;
103929
103930- if (!local->open_count)
103931+ if (!local_read(&local->open_count))
103932 break;
103933
103934 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
103935@@ -3460,8 +3460,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
103936 if (chanctx_conf) {
103937 *chandef = sdata->vif.bss_conf.chandef;
103938 ret = 0;
103939- } else if (local->open_count > 0 &&
103940- local->open_count == local->monitors &&
103941+ } else if (local_read(&local->open_count) > 0 &&
103942+ local_read(&local->open_count) == local->monitors &&
103943 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
103944 if (local->use_chanctx)
103945 *chandef = local->monitor_chandef;
103946diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
103947index 8c68da3..0695016 100644
103948--- a/net/mac80211/ieee80211_i.h
103949+++ b/net/mac80211/ieee80211_i.h
103950@@ -29,6 +29,7 @@
103951 #include <net/ieee80211_radiotap.h>
103952 #include <net/cfg80211.h>
103953 #include <net/mac80211.h>
103954+#include <asm/local.h>
103955 #include "key.h"
103956 #include "sta_info.h"
103957 #include "debug.h"
103958@@ -1057,7 +1058,7 @@ struct ieee80211_local {
103959 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
103960 spinlock_t queue_stop_reason_lock;
103961
103962- int open_count;
103963+ local_t open_count;
103964 int monitors, cooked_mntrs;
103965 /* number of interfaces with corresponding FIF_ flags */
103966 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
103967diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
103968index eeae0ab..0f24585 100644
103969--- a/net/mac80211/iface.c
103970+++ b/net/mac80211/iface.c
103971@@ -533,7 +533,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103972 break;
103973 }
103974
103975- if (local->open_count == 0) {
103976+ if (local_read(&local->open_count) == 0) {
103977 res = drv_start(local);
103978 if (res)
103979 goto err_del_bss;
103980@@ -580,7 +580,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103981 res = drv_add_interface(local, sdata);
103982 if (res)
103983 goto err_stop;
103984- } else if (local->monitors == 0 && local->open_count == 0) {
103985+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
103986 res = ieee80211_add_virtual_monitor(local);
103987 if (res)
103988 goto err_stop;
103989@@ -689,7 +689,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103990 atomic_inc(&local->iff_promiscs);
103991
103992 if (coming_up)
103993- local->open_count++;
103994+ local_inc(&local->open_count);
103995
103996 if (hw_reconf_flags)
103997 ieee80211_hw_config(local, hw_reconf_flags);
103998@@ -727,7 +727,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103999 err_del_interface:
104000 drv_remove_interface(local, sdata);
104001 err_stop:
104002- if (!local->open_count)
104003+ if (!local_read(&local->open_count))
104004 drv_stop(local);
104005 err_del_bss:
104006 sdata->bss = NULL;
104007@@ -893,7 +893,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104008 }
104009
104010 if (going_down)
104011- local->open_count--;
104012+ local_dec(&local->open_count);
104013
104014 switch (sdata->vif.type) {
104015 case NL80211_IFTYPE_AP_VLAN:
104016@@ -955,7 +955,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104017 }
104018 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
104019
104020- if (local->open_count == 0)
104021+ if (local_read(&local->open_count) == 0)
104022 ieee80211_clear_tx_pending(local);
104023
104024 /*
104025@@ -998,7 +998,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104026 if (cancel_scan)
104027 flush_delayed_work(&local->scan_work);
104028
104029- if (local->open_count == 0) {
104030+ if (local_read(&local->open_count) == 0) {
104031 ieee80211_stop_device(local);
104032
104033 /* no reconfiguring after stop! */
104034@@ -1009,7 +1009,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
104035 ieee80211_configure_filter(local);
104036 ieee80211_hw_config(local, hw_reconf_flags);
104037
104038- if (local->monitors == local->open_count)
104039+ if (local->monitors == local_read(&local->open_count))
104040 ieee80211_add_virtual_monitor(local);
104041 }
104042
104043diff --git a/net/mac80211/main.c b/net/mac80211/main.c
104044index 0de7c93..884b2ca 100644
104045--- a/net/mac80211/main.c
104046+++ b/net/mac80211/main.c
104047@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
104048 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
104049 IEEE80211_CONF_CHANGE_POWER);
104050
104051- if (changed && local->open_count) {
104052+ if (changed && local_read(&local->open_count)) {
104053 ret = drv_config(local, changed);
104054 /*
104055 * Goal:
104056diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
104057index 4c5192e..04cc0d8 100644
104058--- a/net/mac80211/pm.c
104059+++ b/net/mac80211/pm.c
104060@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
104061 struct ieee80211_sub_if_data *sdata;
104062 struct sta_info *sta;
104063
104064- if (!local->open_count)
104065+ if (!local_read(&local->open_count))
104066 goto suspend;
104067
104068 ieee80211_scan_cancel(local);
104069@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
104070 cancel_work_sync(&local->dynamic_ps_enable_work);
104071 del_timer_sync(&local->dynamic_ps_timer);
104072
104073- local->wowlan = wowlan && local->open_count;
104074+ local->wowlan = wowlan && local_read(&local->open_count);
104075 if (local->wowlan) {
104076 int err = drv_suspend(local, wowlan);
104077 if (err < 0) {
104078@@ -125,7 +125,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
104079 WARN_ON(!list_empty(&local->chanctx_list));
104080
104081 /* stop hardware - this must stop RX */
104082- if (local->open_count)
104083+ if (local_read(&local->open_count))
104084 ieee80211_stop_device(local);
104085
104086 suspend:
104087diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
104088index 6081329..ab23834 100644
104089--- a/net/mac80211/rate.c
104090+++ b/net/mac80211/rate.c
104091@@ -720,7 +720,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
104092
104093 ASSERT_RTNL();
104094
104095- if (local->open_count)
104096+ if (local_read(&local->open_count))
104097 return -EBUSY;
104098
104099 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
104100diff --git a/net/mac80211/util.c b/net/mac80211/util.c
104101index 3c61060..7bed2e3 100644
104102--- a/net/mac80211/util.c
104103+++ b/net/mac80211/util.c
104104@@ -1669,7 +1669,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
104105 }
104106 #endif
104107 /* everything else happens only if HW was up & running */
104108- if (!local->open_count)
104109+ if (!local_read(&local->open_count))
104110 goto wake_up;
104111
104112 /*
104113@@ -1895,7 +1895,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
104114 local->in_reconfig = false;
104115 barrier();
104116
104117- if (local->monitors == local->open_count && local->monitors > 0)
104118+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
104119 ieee80211_add_virtual_monitor(local);
104120
104121 /*
104122diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
104123index ae5096ab..e5aa70a 100644
104124--- a/net/netfilter/Kconfig
104125+++ b/net/netfilter/Kconfig
104126@@ -1105,6 +1105,16 @@ config NETFILTER_XT_MATCH_ESP
104127
104128 To compile it as a module, choose M here. If unsure, say N.
104129
104130+config NETFILTER_XT_MATCH_GRADM
104131+ tristate '"gradm" match support'
104132+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
104133+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
104134+ ---help---
104135+ The gradm match allows to match on grsecurity RBAC being enabled.
104136+ It is useful when iptables rules are applied early on bootup to
104137+ prevent connections to the machine (except from a trusted host)
104138+ while the RBAC system is disabled.
104139+
104140 config NETFILTER_XT_MATCH_HASHLIMIT
104141 tristate '"hashlimit" match support'
104142 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
104143diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
104144index a9571be..c59e173 100644
104145--- a/net/netfilter/Makefile
104146+++ b/net/netfilter/Makefile
104147@@ -137,6 +137,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
104148 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
104149 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
104150 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
104151+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
104152 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
104153 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
104154 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
104155diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
104156index d259da3..6a32b2c 100644
104157--- a/net/netfilter/ipset/ip_set_core.c
104158+++ b/net/netfilter/ipset/ip_set_core.c
104159@@ -1952,7 +1952,7 @@ done:
104160 return ret;
104161 }
104162
104163-static struct nf_sockopt_ops so_set __read_mostly = {
104164+static struct nf_sockopt_ops so_set = {
104165 .pf = PF_INET,
104166 .get_optmin = SO_IP_SET,
104167 .get_optmax = SO_IP_SET + 1,
104168diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
104169index b0f7b62..0541842 100644
104170--- a/net/netfilter/ipvs/ip_vs_conn.c
104171+++ b/net/netfilter/ipvs/ip_vs_conn.c
104172@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
104173 /* Increase the refcnt counter of the dest */
104174 ip_vs_dest_hold(dest);
104175
104176- conn_flags = atomic_read(&dest->conn_flags);
104177+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
104178 if (cp->protocol != IPPROTO_UDP)
104179 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
104180 flags = cp->flags;
104181@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
104182
104183 cp->control = NULL;
104184 atomic_set(&cp->n_control, 0);
104185- atomic_set(&cp->in_pkts, 0);
104186+ atomic_set_unchecked(&cp->in_pkts, 0);
104187
104188 cp->packet_xmit = NULL;
104189 cp->app = NULL;
104190@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
104191
104192 /* Don't drop the entry if its number of incoming packets is not
104193 located in [0, 8] */
104194- i = atomic_read(&cp->in_pkts);
104195+ i = atomic_read_unchecked(&cp->in_pkts);
104196 if (i > 8 || i < 0) return 0;
104197
104198 if (!todrop_rate[i]) return 0;
104199diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
104200index 990decb..5075248 100644
104201--- a/net/netfilter/ipvs/ip_vs_core.c
104202+++ b/net/netfilter/ipvs/ip_vs_core.c
104203@@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
104204 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
104205 /* do not touch skb anymore */
104206
104207- atomic_inc(&cp->in_pkts);
104208+ atomic_inc_unchecked(&cp->in_pkts);
104209 ip_vs_conn_put(cp);
104210 return ret;
104211 }
104212@@ -1712,7 +1712,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
104213 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
104214 pkts = sysctl_sync_threshold(ipvs);
104215 else
104216- pkts = atomic_add_return(1, &cp->in_pkts);
104217+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104218
104219 if (ipvs->sync_state & IP_VS_STATE_MASTER)
104220 ip_vs_sync_conn(net, cp, pkts);
104221diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
104222index ac7ba68..9735acb9 100644
104223--- a/net/netfilter/ipvs/ip_vs_ctl.c
104224+++ b/net/netfilter/ipvs/ip_vs_ctl.c
104225@@ -800,7 +800,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
104226 */
104227 ip_vs_rs_hash(ipvs, dest);
104228 }
104229- atomic_set(&dest->conn_flags, conn_flags);
104230+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
104231
104232 /* bind the service */
104233 old_svc = rcu_dereference_protected(dest->svc, 1);
104234@@ -1665,7 +1665,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
104235 * align with netns init in ip_vs_control_net_init()
104236 */
104237
104238-static struct ctl_table vs_vars[] = {
104239+static ctl_table_no_const vs_vars[] __read_only = {
104240 {
104241 .procname = "amemthresh",
104242 .maxlen = sizeof(int),
104243@@ -2000,7 +2000,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
104244 " %-7s %-6d %-10d %-10d\n",
104245 &dest->addr.in6,
104246 ntohs(dest->port),
104247- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
104248+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
104249 atomic_read(&dest->weight),
104250 atomic_read(&dest->activeconns),
104251 atomic_read(&dest->inactconns));
104252@@ -2011,7 +2011,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
104253 "%-7s %-6d %-10d %-10d\n",
104254 ntohl(dest->addr.ip),
104255 ntohs(dest->port),
104256- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
104257+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
104258 atomic_read(&dest->weight),
104259 atomic_read(&dest->activeconns),
104260 atomic_read(&dest->inactconns));
104261@@ -2500,7 +2500,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
104262
104263 entry.addr = dest->addr.ip;
104264 entry.port = dest->port;
104265- entry.conn_flags = atomic_read(&dest->conn_flags);
104266+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
104267 entry.weight = atomic_read(&dest->weight);
104268 entry.u_threshold = dest->u_threshold;
104269 entry.l_threshold = dest->l_threshold;
104270@@ -3040,7 +3040,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
104271 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
104272 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
104273 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
104274- (atomic_read(&dest->conn_flags) &
104275+ (atomic_read_unchecked(&dest->conn_flags) &
104276 IP_VS_CONN_F_FWD_MASK)) ||
104277 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
104278 atomic_read(&dest->weight)) ||
104279@@ -3673,7 +3673,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
104280 {
104281 int idx;
104282 struct netns_ipvs *ipvs = net_ipvs(net);
104283- struct ctl_table *tbl;
104284+ ctl_table_no_const *tbl;
104285
104286 atomic_set(&ipvs->dropentry, 0);
104287 spin_lock_init(&ipvs->dropentry_lock);
104288diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
104289index 127f140..553d652 100644
104290--- a/net/netfilter/ipvs/ip_vs_lblc.c
104291+++ b/net/netfilter/ipvs/ip_vs_lblc.c
104292@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
104293 * IPVS LBLC sysctl table
104294 */
104295 #ifdef CONFIG_SYSCTL
104296-static struct ctl_table vs_vars_table[] = {
104297+static ctl_table_no_const vs_vars_table[] __read_only = {
104298 {
104299 .procname = "lblc_expiration",
104300 .data = NULL,
104301diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
104302index 2229d2d..b32b785 100644
104303--- a/net/netfilter/ipvs/ip_vs_lblcr.c
104304+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
104305@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
104306 * IPVS LBLCR sysctl table
104307 */
104308
104309-static struct ctl_table vs_vars_table[] = {
104310+static ctl_table_no_const vs_vars_table[] __read_only = {
104311 {
104312 .procname = "lblcr_expiration",
104313 .data = NULL,
104314diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
104315index 7162c86..9eeb60e 100644
104316--- a/net/netfilter/ipvs/ip_vs_sync.c
104317+++ b/net/netfilter/ipvs/ip_vs_sync.c
104318@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
104319 cp = cp->control;
104320 if (cp) {
104321 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
104322- pkts = atomic_add_return(1, &cp->in_pkts);
104323+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104324 else
104325 pkts = sysctl_sync_threshold(ipvs);
104326 ip_vs_sync_conn(net, cp->control, pkts);
104327@@ -771,7 +771,7 @@ control:
104328 if (!cp)
104329 return;
104330 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
104331- pkts = atomic_add_return(1, &cp->in_pkts);
104332+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104333 else
104334 pkts = sysctl_sync_threshold(ipvs);
104335 goto sloop;
104336@@ -901,7 +901,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
104337
104338 if (opt)
104339 memcpy(&cp->in_seq, opt, sizeof(*opt));
104340- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
104341+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
104342 cp->state = state;
104343 cp->old_state = cp->state;
104344 /*
104345diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
104346index bd90bf8..816a020d 100644
104347--- a/net/netfilter/ipvs/ip_vs_xmit.c
104348+++ b/net/netfilter/ipvs/ip_vs_xmit.c
104349@@ -1215,7 +1215,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
104350 else
104351 rc = NF_ACCEPT;
104352 /* do not touch skb anymore */
104353- atomic_inc(&cp->in_pkts);
104354+ atomic_inc_unchecked(&cp->in_pkts);
104355 goto out;
104356 }
104357
104358@@ -1308,7 +1308,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
104359 else
104360 rc = NF_ACCEPT;
104361 /* do not touch skb anymore */
104362- atomic_inc(&cp->in_pkts);
104363+ atomic_inc_unchecked(&cp->in_pkts);
104364 goto out;
104365 }
104366
104367diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
104368index a4b5e2a..13b1de3 100644
104369--- a/net/netfilter/nf_conntrack_acct.c
104370+++ b/net/netfilter/nf_conntrack_acct.c
104371@@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
104372 #ifdef CONFIG_SYSCTL
104373 static int nf_conntrack_acct_init_sysctl(struct net *net)
104374 {
104375- struct ctl_table *table;
104376+ ctl_table_no_const *table;
104377
104378 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
104379 GFP_KERNEL);
104380diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
104381index 5016a69..594f8e9 100644
104382--- a/net/netfilter/nf_conntrack_core.c
104383+++ b/net/netfilter/nf_conntrack_core.c
104384@@ -1739,6 +1739,10 @@ void nf_conntrack_init_end(void)
104385 #define DYING_NULLS_VAL ((1<<30)+1)
104386 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
104387
104388+#ifdef CONFIG_GRKERNSEC_HIDESYM
104389+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
104390+#endif
104391+
104392 int nf_conntrack_init_net(struct net *net)
104393 {
104394 int ret = -ENOMEM;
104395@@ -1764,7 +1768,11 @@ int nf_conntrack_init_net(struct net *net)
104396 if (!net->ct.stat)
104397 goto err_pcpu_lists;
104398
104399+#ifdef CONFIG_GRKERNSEC_HIDESYM
104400+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
104401+#else
104402 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
104403+#endif
104404 if (!net->ct.slabname)
104405 goto err_slabname;
104406
104407diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
104408index 4e78c57..ec8fb74 100644
104409--- a/net/netfilter/nf_conntrack_ecache.c
104410+++ b/net/netfilter/nf_conntrack_ecache.c
104411@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
104412 #ifdef CONFIG_SYSCTL
104413 static int nf_conntrack_event_init_sysctl(struct net *net)
104414 {
104415- struct ctl_table *table;
104416+ ctl_table_no_const *table;
104417
104418 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
104419 GFP_KERNEL);
104420diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
104421index 5b3eae7..dd4b8fe 100644
104422--- a/net/netfilter/nf_conntrack_helper.c
104423+++ b/net/netfilter/nf_conntrack_helper.c
104424@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
104425
104426 static int nf_conntrack_helper_init_sysctl(struct net *net)
104427 {
104428- struct ctl_table *table;
104429+ ctl_table_no_const *table;
104430
104431 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
104432 GFP_KERNEL);
104433diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
104434index b65d586..beec902 100644
104435--- a/net/netfilter/nf_conntrack_proto.c
104436+++ b/net/netfilter/nf_conntrack_proto.c
104437@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
104438
104439 static void
104440 nf_ct_unregister_sysctl(struct ctl_table_header **header,
104441- struct ctl_table **table,
104442+ ctl_table_no_const **table,
104443 unsigned int users)
104444 {
104445 if (users > 0)
104446diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
104447index cf65a1e..2f291e9 100644
104448--- a/net/netfilter/nf_conntrack_standalone.c
104449+++ b/net/netfilter/nf_conntrack_standalone.c
104450@@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
104451
104452 static int nf_conntrack_standalone_init_sysctl(struct net *net)
104453 {
104454- struct ctl_table *table;
104455+ ctl_table_no_const *table;
104456
104457 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
104458 GFP_KERNEL);
104459diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
104460index 7a394df..bd91a8a 100644
104461--- a/net/netfilter/nf_conntrack_timestamp.c
104462+++ b/net/netfilter/nf_conntrack_timestamp.c
104463@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
104464 #ifdef CONFIG_SYSCTL
104465 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
104466 {
104467- struct ctl_table *table;
104468+ ctl_table_no_const *table;
104469
104470 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
104471 GFP_KERNEL);
104472diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
104473index d719764..311bc60 100644
104474--- a/net/netfilter/nf_log.c
104475+++ b/net/netfilter/nf_log.c
104476@@ -353,7 +353,7 @@ static const struct file_operations nflog_file_ops = {
104477
104478 #ifdef CONFIG_SYSCTL
104479 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
104480-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
104481+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
104482
104483 static int nf_log_proc_dostring(struct ctl_table *table, int write,
104484 void __user *buffer, size_t *lenp, loff_t *ppos)
104485@@ -384,14 +384,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
104486 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
104487 mutex_unlock(&nf_log_mutex);
104488 } else {
104489+ ctl_table_no_const nf_log_table = *table;
104490+
104491 mutex_lock(&nf_log_mutex);
104492 logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
104493 lockdep_is_held(&nf_log_mutex));
104494 if (!logger)
104495- table->data = "NONE";
104496+ nf_log_table.data = "NONE";
104497 else
104498- table->data = logger->name;
104499- r = proc_dostring(table, write, buffer, lenp, ppos);
104500+ nf_log_table.data = logger->name;
104501+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
104502 mutex_unlock(&nf_log_mutex);
104503 }
104504
104505diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
104506index c68c1e5..8b5d670 100644
104507--- a/net/netfilter/nf_sockopt.c
104508+++ b/net/netfilter/nf_sockopt.c
104509@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
104510 }
104511 }
104512
104513- list_add(&reg->list, &nf_sockopts);
104514+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
104515 out:
104516 mutex_unlock(&nf_sockopt_mutex);
104517 return ret;
104518@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
104519 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
104520 {
104521 mutex_lock(&nf_sockopt_mutex);
104522- list_del(&reg->list);
104523+ pax_list_del((struct list_head *)&reg->list);
104524 mutex_unlock(&nf_sockopt_mutex);
104525 }
104526 EXPORT_SYMBOL(nf_unregister_sockopt);
104527diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
104528index 5f1be5b..2cba8cd 100644
104529--- a/net/netfilter/nfnetlink_log.c
104530+++ b/net/netfilter/nfnetlink_log.c
104531@@ -80,7 +80,7 @@ static int nfnl_log_net_id __read_mostly;
104532 struct nfnl_log_net {
104533 spinlock_t instances_lock;
104534 struct hlist_head instance_table[INSTANCE_BUCKETS];
104535- atomic_t global_seq;
104536+ atomic_unchecked_t global_seq;
104537 };
104538
104539 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
104540@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
104541 /* global sequence number */
104542 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
104543 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
104544- htonl(atomic_inc_return(&log->global_seq))))
104545+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
104546 goto nla_put_failure;
104547
104548 if (data_len) {
104549diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
104550new file mode 100644
104551index 0000000..c566332
104552--- /dev/null
104553+++ b/net/netfilter/xt_gradm.c
104554@@ -0,0 +1,51 @@
104555+/*
104556+ * gradm match for netfilter
104557