]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.0-3.18.1-201412281149.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.1-201412281149.patch
CommitLineData
728ec72e
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 3f84029..3c5b65e 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..9531fcc 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,7 +62,25 @@
1011 * to ensure that the update happens.
1012 */
1013
1014-#define ATOMIC_OP(op, c_op, asm_op) \
1015+#ifdef CONFIG_PAX_REFCOUNT
1016+#define __OVERFLOW_POST \
1017+ " bvc 3f\n" \
1018+ "2: " REFCOUNT_TRAP_INSN "\n"\
1019+ "3:\n"
1020+#define __OVERFLOW_POST_RETURN \
1021+ " bvc 3f\n" \
1022+" mov %0, %1\n" \
1023+ "2: " REFCOUNT_TRAP_INSN "\n"\
1024+ "3:\n"
1025+#define __OVERFLOW_EXTABLE \
1026+ "4:\n"
1027+ _ASM_EXTABLE(2b, 4b)
1028+#else
1029+#define __OVERFLOW_POST
1030+#define __OVERFLOW_EXTABLE
1031+#endif
1032+
1033+#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1034 static inline void atomic_##op(int i, atomic_t *v) \
1035 { \
1036 unsigned long tmp; \
1037@@ -48,15 +90,20 @@ static inline void atomic_##op(int i, atomic_t *v) \
1038 __asm__ __volatile__("@ atomic_" #op "\n" \
1039 "1: ldrex %0, [%3]\n" \
1040 " " #asm_op " %0, %0, %4\n" \
1041+ post_op \
1042 " strex %1, %0, [%3]\n" \
1043 " teq %1, #0\n" \
1044-" bne 1b" \
1045+" bne 1b\n" \
1046+ extable \
1047 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1048 : "r" (&v->counter), "Ir" (i) \
1049 : "cc"); \
1050 } \
1051
1052-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1053+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op, , )\
1054+ __ATOMIC_OP(op, _unchecked, c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1055+
1056+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1057 static inline int atomic_##op##_return(int i, atomic_t *v) \
1058 { \
1059 unsigned long tmp; \
1060@@ -68,9 +115,11 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1061 __asm__ __volatile__("@ atomic_" #op "_return\n" \
1062 "1: ldrex %0, [%3]\n" \
1063 " " #asm_op " %0, %0, %4\n" \
1064+ post_op \
1065 " strex %1, %0, [%3]\n" \
1066 " teq %1, #0\n" \
1067-" bne 1b" \
1068+" bne 1b\n" \
1069+ extable \
1070 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1071 : "r" (&v->counter), "Ir" (i) \
1072 : "cc"); \
1073@@ -80,6 +129,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1074 return result; \
1075 }
1076
1077+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op, , )\
1078+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1079+
1080 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1081 {
1082 int oldval;
1083@@ -115,12 +167,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1084 __asm__ __volatile__ ("@ atomic_add_unless\n"
1085 "1: ldrex %0, [%4]\n"
1086 " teq %0, %5\n"
1087-" beq 2f\n"
1088-" add %1, %0, %6\n"
1089+" beq 4f\n"
1090+" adds %1, %0, %6\n"
1091+
1092+#ifdef CONFIG_PAX_REFCOUNT
1093+" bvc 3f\n"
1094+"2: " REFCOUNT_TRAP_INSN "\n"
1095+"3:\n"
1096+#endif
1097+
1098 " strex %2, %1, [%4]\n"
1099 " teq %2, #0\n"
1100 " bne 1b\n"
1101-"2:"
1102+"4:"
1103+
1104+#ifdef CONFIG_PAX_REFCOUNT
1105+ _ASM_EXTABLE(2b, 4b)
1106+#endif
1107+
1108 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1109 : "r" (&v->counter), "r" (u), "r" (a)
1110 : "cc");
1111@@ -131,6 +195,28 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1112 return oldval;
1113 }
1114
1115+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1116+{
1117+ unsigned long oldval, res;
1118+
1119+ smp_mb();
1120+
1121+ do {
1122+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1123+ "ldrex %1, [%3]\n"
1124+ "mov %0, #0\n"
1125+ "teq %1, %4\n"
1126+ "strexeq %0, %5, [%3]\n"
1127+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1128+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1129+ : "cc");
1130+ } while (res);
1131+
1132+ smp_mb();
1133+
1134+ return oldval;
1135+}
1136+
1137 #else /* ARM_ARCH_6 */
1138
1139 #ifdef CONFIG_SMP
1140@@ -175,6 +261,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1141 return ret;
1142 }
1143
1144+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1145+{
1146+ return atomic_cmpxchg(v, old, new);
1147+}
1148+
1149 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1150 {
1151 int c, old;
1152@@ -196,16 +287,38 @@ ATOMIC_OPS(sub, -=, sub)
1153
1154 #undef ATOMIC_OPS
1155 #undef ATOMIC_OP_RETURN
1156+#undef __ATOMIC_OP_RETURN
1157 #undef ATOMIC_OP
1158+#undef __ATOMIC_OP
1159
1160 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1161+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1162+{
1163+ return xchg(&v->counter, new);
1164+}
1165
1166 #define atomic_inc(v) atomic_add(1, v)
1167+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1168+{
1169+ atomic_add_unchecked(1, v);
1170+}
1171 #define atomic_dec(v) atomic_sub(1, v)
1172+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1173+{
1174+ atomic_sub_unchecked(1, v);
1175+}
1176
1177 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1178+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1179+{
1180+ return atomic_add_return_unchecked(1, v) == 0;
1181+}
1182 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1183 #define atomic_inc_return(v) (atomic_add_return(1, v))
1184+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1185+{
1186+ return atomic_add_return_unchecked(1, v);
1187+}
1188 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1189 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1190
1191@@ -216,6 +329,14 @@ typedef struct {
1192 long long counter;
1193 } atomic64_t;
1194
1195+#ifdef CONFIG_PAX_REFCOUNT
1196+typedef struct {
1197+ long long counter;
1198+} atomic64_unchecked_t;
1199+#else
1200+typedef atomic64_t atomic64_unchecked_t;
1201+#endif
1202+
1203 #define ATOMIC64_INIT(i) { (i) }
1204
1205 #ifdef CONFIG_ARM_LPAE
1206@@ -232,6 +353,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1207 return result;
1208 }
1209
1210+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1211+{
1212+ long long result;
1213+
1214+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1215+" ldrd %0, %H0, [%1]"
1216+ : "=&r" (result)
1217+ : "r" (&v->counter), "Qo" (v->counter)
1218+ );
1219+
1220+ return result;
1221+}
1222+
1223 static inline void atomic64_set(atomic64_t *v, long long i)
1224 {
1225 __asm__ __volatile__("@ atomic64_set\n"
1226@@ -240,6 +374,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1227 : "r" (&v->counter), "r" (i)
1228 );
1229 }
1230+
1231+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1232+{
1233+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1234+" strd %2, %H2, [%1]"
1235+ : "=Qo" (v->counter)
1236+ : "r" (&v->counter), "r" (i)
1237+ );
1238+}
1239 #else
1240 static inline long long atomic64_read(const atomic64_t *v)
1241 {
1242@@ -254,6 +397,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1243 return result;
1244 }
1245
1246+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1247+{
1248+ long long result;
1249+
1250+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1251+" ldrexd %0, %H0, [%1]"
1252+ : "=&r" (result)
1253+ : "r" (&v->counter), "Qo" (v->counter)
1254+ );
1255+
1256+ return result;
1257+}
1258+
1259 static inline void atomic64_set(atomic64_t *v, long long i)
1260 {
1261 long long tmp;
1262@@ -268,29 +424,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1263 : "r" (&v->counter), "r" (i)
1264 : "cc");
1265 }
1266+
1267+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1268+{
1269+ long long tmp;
1270+
1271+ prefetchw(&v->counter);
1272+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1273+"1: ldrexd %0, %H0, [%2]\n"
1274+" strexd %0, %3, %H3, [%2]\n"
1275+" teq %0, #0\n"
1276+" bne 1b"
1277+ : "=&r" (tmp), "=Qo" (v->counter)
1278+ : "r" (&v->counter), "r" (i)
1279+ : "cc");
1280+}
1281 #endif
1282
1283-#define ATOMIC64_OP(op, op1, op2) \
1284-static inline void atomic64_##op(long long i, atomic64_t *v) \
1285+#undef __OVERFLOW_POST_RETURN
1286+#define __OVERFLOW_POST_RETURN \
1287+ " bvc 3f\n" \
1288+" mov %0, %1\n" \
1289+" mov %H0, %H1\n" \
1290+ "2: " REFCOUNT_TRAP_INSN "\n"\
1291+ "3:\n"
1292+
1293+#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1294+static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1295 { \
1296 long long result; \
1297 unsigned long tmp; \
1298 \
1299 prefetchw(&v->counter); \
1300- __asm__ __volatile__("@ atomic64_" #op "\n" \
1301+ __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1302 "1: ldrexd %0, %H0, [%3]\n" \
1303 " " #op1 " %Q0, %Q0, %Q4\n" \
1304 " " #op2 " %R0, %R0, %R4\n" \
1305+ post_op \
1306 " strexd %1, %0, %H0, [%3]\n" \
1307 " teq %1, #0\n" \
1308-" bne 1b" \
1309+" bne 1b\n" \
1310+ extable \
1311 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1312 : "r" (&v->counter), "r" (i) \
1313 : "cc"); \
1314 } \
1315
1316-#define ATOMIC64_OP_RETURN(op, op1, op2) \
1317-static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1318+#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, , op1, op2, , ) \
1319+ __ATOMIC64_OP(op, _unchecked, op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1320+
1321+#define __ATOMIC64_OP_RETURN(op, op1, op2, post_op, extable) \
1322+static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1323 { \
1324 long long result; \
1325 unsigned long tmp; \
1326@@ -298,13 +482,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1327 smp_mb(); \
1328 prefetchw(&v->counter); \
1329 \
1330- __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1331+ __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1332 "1: ldrexd %0, %H0, [%3]\n" \
1333 " " #op1 " %Q0, %Q0, %Q4\n" \
1334 " " #op2 " %R0, %R0, %R4\n" \
1335+ post_op \
1336 " strexd %1, %0, %H0, [%3]\n" \
1337 " teq %1, #0\n" \
1338-" bne 1b" \
1339+" bne 1b\n" \
1340+ extable \
1341 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1342 : "r" (&v->counter), "r" (i) \
1343 : "cc"); \
1344@@ -314,6 +500,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1345 return result; \
1346 }
1347
1348+#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, , op1, op2, , ) \
1349+ __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1350+
1351 #define ATOMIC64_OPS(op, op1, op2) \
1352 ATOMIC64_OP(op, op1, op2) \
1353 ATOMIC64_OP_RETURN(op, op1, op2)
1354@@ -323,7 +512,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1355
1356 #undef ATOMIC64_OPS
1357 #undef ATOMIC64_OP_RETURN
1358+#undef __ATOMIC64_OP_RETURN
1359 #undef ATOMIC64_OP
1360+#undef __ATOMIC64_OP
1361+#undef __OVERFLOW_EXTABLE
1362+#undef __OVERFLOW_POST_RETURN
1363+#undef __OVERFLOW_POST
1364
1365 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1366 long long new)
1367@@ -351,6 +545,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1368 return oldval;
1369 }
1370
1371+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1372+ long long new)
1373+{
1374+ long long oldval;
1375+ unsigned long res;
1376+
1377+ smp_mb();
1378+
1379+ do {
1380+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1381+ "ldrexd %1, %H1, [%3]\n"
1382+ "mov %0, #0\n"
1383+ "teq %1, %4\n"
1384+ "teqeq %H1, %H4\n"
1385+ "strexdeq %0, %5, %H5, [%3]"
1386+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1387+ : "r" (&ptr->counter), "r" (old), "r" (new)
1388+ : "cc");
1389+ } while (res);
1390+
1391+ smp_mb();
1392+
1393+ return oldval;
1394+}
1395+
1396 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1397 {
1398 long long result;
1399@@ -376,21 +595,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1400 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1401 {
1402 long long result;
1403- unsigned long tmp;
1404+ u64 tmp;
1405
1406 smp_mb();
1407 prefetchw(&v->counter);
1408
1409 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1410-"1: ldrexd %0, %H0, [%3]\n"
1411-" subs %Q0, %Q0, #1\n"
1412-" sbc %R0, %R0, #0\n"
1413+"1: ldrexd %1, %H1, [%3]\n"
1414+" subs %Q0, %Q1, #1\n"
1415+" sbcs %R0, %R1, #0\n"
1416+
1417+#ifdef CONFIG_PAX_REFCOUNT
1418+" bvc 3f\n"
1419+" mov %Q0, %Q1\n"
1420+" mov %R0, %R1\n"
1421+"2: " REFCOUNT_TRAP_INSN "\n"
1422+"3:\n"
1423+#endif
1424+
1425 " teq %R0, #0\n"
1426-" bmi 2f\n"
1427+" bmi 4f\n"
1428 " strexd %1, %0, %H0, [%3]\n"
1429 " teq %1, #0\n"
1430 " bne 1b\n"
1431-"2:"
1432+"4:\n"
1433+
1434+#ifdef CONFIG_PAX_REFCOUNT
1435+ _ASM_EXTABLE(2b, 4b)
1436+#endif
1437+
1438 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1439 : "r" (&v->counter)
1440 : "cc");
1441@@ -414,13 +647,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1442 " teq %0, %5\n"
1443 " teqeq %H0, %H5\n"
1444 " moveq %1, #0\n"
1445-" beq 2f\n"
1446+" beq 4f\n"
1447 " adds %Q0, %Q0, %Q6\n"
1448-" adc %R0, %R0, %R6\n"
1449+" adcs %R0, %R0, %R6\n"
1450+
1451+#ifdef CONFIG_PAX_REFCOUNT
1452+" bvc 3f\n"
1453+"2: " REFCOUNT_TRAP_INSN "\n"
1454+"3:\n"
1455+#endif
1456+
1457 " strexd %2, %0, %H0, [%4]\n"
1458 " teq %2, #0\n"
1459 " bne 1b\n"
1460-"2:"
1461+"4:\n"
1462+
1463+#ifdef CONFIG_PAX_REFCOUNT
1464+ _ASM_EXTABLE(2b, 4b)
1465+#endif
1466+
1467 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1468 : "r" (&v->counter), "r" (u), "r" (a)
1469 : "cc");
1470@@ -433,10 +678,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1471
1472 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1473 #define atomic64_inc(v) atomic64_add(1LL, (v))
1474+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1475 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1476+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1477 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1478 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1479 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1480+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1481 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1482 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1483 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1484diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1485index c6a3e73..35cca85 100644
1486--- a/arch/arm/include/asm/barrier.h
1487+++ b/arch/arm/include/asm/barrier.h
1488@@ -63,7 +63,7 @@
1489 do { \
1490 compiletime_assert_atomic_type(*p); \
1491 smp_mb(); \
1492- ACCESS_ONCE(*p) = (v); \
1493+ ACCESS_ONCE_RW(*p) = (v); \
1494 } while (0)
1495
1496 #define smp_load_acquire(p) \
1497diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1498index 75fe66b..ba3dee4 100644
1499--- a/arch/arm/include/asm/cache.h
1500+++ b/arch/arm/include/asm/cache.h
1501@@ -4,8 +4,10 @@
1502 #ifndef __ASMARM_CACHE_H
1503 #define __ASMARM_CACHE_H
1504
1505+#include <linux/const.h>
1506+
1507 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1508-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1509+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1510
1511 /*
1512 * Memory returned by kmalloc() may be used for DMA, so we must make
1513@@ -24,5 +26,6 @@
1514 #endif
1515
1516 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1517+#define __read_only __attribute__ ((__section__(".data..read_only")))
1518
1519 #endif
1520diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1521index 10e78d0..dc8505d 100644
1522--- a/arch/arm/include/asm/cacheflush.h
1523+++ b/arch/arm/include/asm/cacheflush.h
1524@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1525 void (*dma_unmap_area)(const void *, size_t, int);
1526
1527 void (*dma_flush_range)(const void *, const void *);
1528-};
1529+} __no_const;
1530
1531 /*
1532 * Select the calling method
1533diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1534index 5233151..87a71fa 100644
1535--- a/arch/arm/include/asm/checksum.h
1536+++ b/arch/arm/include/asm/checksum.h
1537@@ -37,7 +37,19 @@ __wsum
1538 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1539
1540 __wsum
1541-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1542+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1543+
1544+static inline __wsum
1545+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1546+{
1547+ __wsum ret;
1548+ pax_open_userland();
1549+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1550+ pax_close_userland();
1551+ return ret;
1552+}
1553+
1554+
1555
1556 /*
1557 * Fold a partial checksum without adding pseudo headers
1558diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1559index abb2c37..96db950 100644
1560--- a/arch/arm/include/asm/cmpxchg.h
1561+++ b/arch/arm/include/asm/cmpxchg.h
1562@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1563
1564 #define xchg(ptr,x) \
1565 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1566+#define xchg_unchecked(ptr,x) \
1567+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1568
1569 #include <asm-generic/cmpxchg-local.h>
1570
1571diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1572index 6ddbe44..b5e38b1 100644
1573--- a/arch/arm/include/asm/domain.h
1574+++ b/arch/arm/include/asm/domain.h
1575@@ -48,18 +48,37 @@
1576 * Domain types
1577 */
1578 #define DOMAIN_NOACCESS 0
1579-#define DOMAIN_CLIENT 1
1580 #ifdef CONFIG_CPU_USE_DOMAINS
1581+#define DOMAIN_USERCLIENT 1
1582+#define DOMAIN_KERNELCLIENT 1
1583 #define DOMAIN_MANAGER 3
1584+#define DOMAIN_VECTORS DOMAIN_USER
1585 #else
1586+
1587+#ifdef CONFIG_PAX_KERNEXEC
1588 #define DOMAIN_MANAGER 1
1589+#define DOMAIN_KERNEXEC 3
1590+#else
1591+#define DOMAIN_MANAGER 1
1592+#endif
1593+
1594+#ifdef CONFIG_PAX_MEMORY_UDEREF
1595+#define DOMAIN_USERCLIENT 0
1596+#define DOMAIN_UDEREF 1
1597+#define DOMAIN_VECTORS DOMAIN_KERNEL
1598+#else
1599+#define DOMAIN_USERCLIENT 1
1600+#define DOMAIN_VECTORS DOMAIN_USER
1601+#endif
1602+#define DOMAIN_KERNELCLIENT 1
1603+
1604 #endif
1605
1606 #define domain_val(dom,type) ((type) << (2*(dom)))
1607
1608 #ifndef __ASSEMBLY__
1609
1610-#ifdef CONFIG_CPU_USE_DOMAINS
1611+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1612 static inline void set_domain(unsigned val)
1613 {
1614 asm volatile(
1615@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1616 isb();
1617 }
1618
1619-#define modify_domain(dom,type) \
1620- do { \
1621- struct thread_info *thread = current_thread_info(); \
1622- unsigned int domain = thread->cpu_domain; \
1623- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1624- thread->cpu_domain = domain | domain_val(dom, type); \
1625- set_domain(thread->cpu_domain); \
1626- } while (0)
1627-
1628+extern void modify_domain(unsigned int dom, unsigned int type);
1629 #else
1630 static inline void set_domain(unsigned val) { }
1631 static inline void modify_domain(unsigned dom, unsigned type) { }
1632diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1633index afb9caf..9a0bac0 100644
1634--- a/arch/arm/include/asm/elf.h
1635+++ b/arch/arm/include/asm/elf.h
1636@@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1637 the loader. We need to make sure that it is out of the way of the program
1638 that it will "exec", and that there is sufficient room for the brk. */
1639
1640-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1641+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1642+
1643+#ifdef CONFIG_PAX_ASLR
1644+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1645+
1646+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1647+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1648+#endif
1649
1650 /* When the program starts, a1 contains a pointer to a function to be
1651 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1652@@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1653 extern void elf_set_personality(const struct elf32_hdr *);
1654 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1655
1656-struct mm_struct;
1657-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1658-#define arch_randomize_brk arch_randomize_brk
1659-
1660 #ifdef CONFIG_MMU
1661 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1662 struct linux_binprm;
1663diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1664index de53547..52b9a28 100644
1665--- a/arch/arm/include/asm/fncpy.h
1666+++ b/arch/arm/include/asm/fncpy.h
1667@@ -81,7 +81,9 @@
1668 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1669 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1670 \
1671+ pax_open_kernel(); \
1672 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1673+ pax_close_kernel(); \
1674 flush_icache_range((unsigned long)(dest_buf), \
1675 (unsigned long)(dest_buf) + (size)); \
1676 \
1677diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1678index 53e69da..3fdc896 100644
1679--- a/arch/arm/include/asm/futex.h
1680+++ b/arch/arm/include/asm/futex.h
1681@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1682 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1683 return -EFAULT;
1684
1685+ pax_open_userland();
1686+
1687 smp_mb();
1688 /* Prefetching cannot fault */
1689 prefetchw(uaddr);
1690@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1691 : "cc", "memory");
1692 smp_mb();
1693
1694+ pax_close_userland();
1695+
1696 *uval = val;
1697 return ret;
1698 }
1699@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1700 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1701 return -EFAULT;
1702
1703+ pax_open_userland();
1704+
1705 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1706 "1: " TUSER(ldr) " %1, [%4]\n"
1707 " teq %1, %2\n"
1708@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1709 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1710 : "cc", "memory");
1711
1712+ pax_close_userland();
1713+
1714 *uval = val;
1715 return ret;
1716 }
1717@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1718 return -EFAULT;
1719
1720 pagefault_disable(); /* implies preempt_disable() */
1721+ pax_open_userland();
1722
1723 switch (op) {
1724 case FUTEX_OP_SET:
1725@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1726 ret = -ENOSYS;
1727 }
1728
1729+ pax_close_userland();
1730 pagefault_enable(); /* subsumes preempt_enable() */
1731
1732 if (!ret) {
1733diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1734index 83eb2f7..ed77159 100644
1735--- a/arch/arm/include/asm/kmap_types.h
1736+++ b/arch/arm/include/asm/kmap_types.h
1737@@ -4,6 +4,6 @@
1738 /*
1739 * This is the "bare minimum". AIO seems to require this.
1740 */
1741-#define KM_TYPE_NR 16
1742+#define KM_TYPE_NR 17
1743
1744 #endif
1745diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1746index 9e614a1..3302cca 100644
1747--- a/arch/arm/include/asm/mach/dma.h
1748+++ b/arch/arm/include/asm/mach/dma.h
1749@@ -22,7 +22,7 @@ struct dma_ops {
1750 int (*residue)(unsigned int, dma_t *); /* optional */
1751 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1752 const char *type;
1753-};
1754+} __do_const;
1755
1756 struct dma_struct {
1757 void *addr; /* single DMA address */
1758diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1759index f98c7f3..e5c626d 100644
1760--- a/arch/arm/include/asm/mach/map.h
1761+++ b/arch/arm/include/asm/mach/map.h
1762@@ -23,17 +23,19 @@ struct map_desc {
1763
1764 /* types 0-3 are defined in asm/io.h */
1765 enum {
1766- MT_UNCACHED = 4,
1767- MT_CACHECLEAN,
1768- MT_MINICLEAN,
1769+ MT_UNCACHED_RW = 4,
1770+ MT_CACHECLEAN_RO,
1771+ MT_MINICLEAN_RO,
1772 MT_LOW_VECTORS,
1773 MT_HIGH_VECTORS,
1774- MT_MEMORY_RWX,
1775+ __MT_MEMORY_RWX,
1776 MT_MEMORY_RW,
1777- MT_ROM,
1778- MT_MEMORY_RWX_NONCACHED,
1779+ MT_MEMORY_RX,
1780+ MT_ROM_RX,
1781+ MT_MEMORY_RW_NONCACHED,
1782+ MT_MEMORY_RX_NONCACHED,
1783 MT_MEMORY_RW_DTCM,
1784- MT_MEMORY_RWX_ITCM,
1785+ MT_MEMORY_RX_ITCM,
1786 MT_MEMORY_RW_SO,
1787 MT_MEMORY_DMA_READY,
1788 };
1789diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1790index 891a56b..48f337e 100644
1791--- a/arch/arm/include/asm/outercache.h
1792+++ b/arch/arm/include/asm/outercache.h
1793@@ -36,7 +36,7 @@ struct outer_cache_fns {
1794
1795 /* This is an ARM L2C thing */
1796 void (*write_sec)(unsigned long, unsigned);
1797-};
1798+} __no_const;
1799
1800 extern struct outer_cache_fns outer_cache;
1801
1802diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1803index 4355f0e..cd9168e 100644
1804--- a/arch/arm/include/asm/page.h
1805+++ b/arch/arm/include/asm/page.h
1806@@ -23,6 +23,7 @@
1807
1808 #else
1809
1810+#include <linux/compiler.h>
1811 #include <asm/glue.h>
1812
1813 /*
1814@@ -114,7 +115,7 @@ struct cpu_user_fns {
1815 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1816 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1817 unsigned long vaddr, struct vm_area_struct *vma);
1818-};
1819+} __no_const;
1820
1821 #ifdef MULTI_USER
1822 extern struct cpu_user_fns cpu_user;
1823diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1824index 78a7793..e3dc06c 100644
1825--- a/arch/arm/include/asm/pgalloc.h
1826+++ b/arch/arm/include/asm/pgalloc.h
1827@@ -17,6 +17,7 @@
1828 #include <asm/processor.h>
1829 #include <asm/cacheflush.h>
1830 #include <asm/tlbflush.h>
1831+#include <asm/system_info.h>
1832
1833 #define check_pgt_cache() do { } while (0)
1834
1835@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1836 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1837 }
1838
1839+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1840+{
1841+ pud_populate(mm, pud, pmd);
1842+}
1843+
1844 #else /* !CONFIG_ARM_LPAE */
1845
1846 /*
1847@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1848 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1849 #define pmd_free(mm, pmd) do { } while (0)
1850 #define pud_populate(mm,pmd,pte) BUG()
1851+#define pud_populate_kernel(mm,pmd,pte) BUG()
1852
1853 #endif /* CONFIG_ARM_LPAE */
1854
1855@@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1856 __free_page(pte);
1857 }
1858
1859+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1860+{
1861+#ifdef CONFIG_ARM_LPAE
1862+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1863+#else
1864+ if (addr & SECTION_SIZE)
1865+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1866+ else
1867+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1868+#endif
1869+ flush_pmd_entry(pmdp);
1870+}
1871+
1872 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1873 pmdval_t prot)
1874 {
1875@@ -157,7 +177,7 @@ pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmdp, pte_t *ptep)
1876 static inline void
1877 pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep)
1878 {
1879- __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE);
1880+ __pmd_populate(pmdp, page_to_phys(ptep), _PAGE_USER_TABLE | __supported_pmd_mask);
1881 }
1882 #define pmd_pgtable(pmd) pmd_page(pmd)
1883
1884diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1885index 5cfba15..f415e1a 100644
1886--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1887+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1888@@ -20,12 +20,15 @@
1889 #define PMD_TYPE_FAULT (_AT(pmdval_t, 0) << 0)
1890 #define PMD_TYPE_TABLE (_AT(pmdval_t, 1) << 0)
1891 #define PMD_TYPE_SECT (_AT(pmdval_t, 2) << 0)
1892+#define PMD_PXNTABLE (_AT(pmdval_t, 1) << 2) /* v7 */
1893 #define PMD_BIT4 (_AT(pmdval_t, 1) << 4)
1894 #define PMD_DOMAIN(x) (_AT(pmdval_t, (x)) << 5)
1895 #define PMD_PROTECTION (_AT(pmdval_t, 1) << 9) /* v5 */
1896+
1897 /*
1898 * - section
1899 */
1900+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1901 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1902 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1903 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1904@@ -37,6 +40,7 @@
1905 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1906 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1907 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1908+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1909
1910 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1911 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1912@@ -66,6 +70,7 @@
1913 * - extended small page/tiny page
1914 */
1915 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1916+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1917 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1918 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1919 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1920diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1921index f027941..f36ce30 100644
1922--- a/arch/arm/include/asm/pgtable-2level.h
1923+++ b/arch/arm/include/asm/pgtable-2level.h
1924@@ -126,6 +126,9 @@
1925 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1926 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1927
1928+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1929+#define L_PTE_PXN (_AT(pteval_t, 0))
1930+
1931 /*
1932 * These are the memory types, defined to be compatible with
1933 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1934diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
1935index 9fd61c7..f8f1cff 100644
1936--- a/arch/arm/include/asm/pgtable-3level-hwdef.h
1937+++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
1938@@ -76,6 +76,7 @@
1939 #define PTE_EXT_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1940 #define PTE_EXT_AF (_AT(pteval_t, 1) << 10) /* Access Flag */
1941 #define PTE_EXT_NG (_AT(pteval_t, 1) << 11) /* nG */
1942+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1943 #define PTE_EXT_XN (_AT(pteval_t, 1) << 54) /* XN */
1944
1945 /*
1946diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1947index a31ecdad..95e98d4 100644
1948--- a/arch/arm/include/asm/pgtable-3level.h
1949+++ b/arch/arm/include/asm/pgtable-3level.h
1950@@ -81,6 +81,7 @@
1951 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
1952 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1953 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1954+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1955 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
1956 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
1957 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
1958@@ -92,10 +93,12 @@
1959 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
1960 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
1961 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
1962+#define PMD_SECT_RDONLY PMD_SECT_AP2
1963
1964 /*
1965 * To be used in assembly code with the upper page attributes.
1966 */
1967+#define L_PTE_PXN_HIGH (1 << (53 - 32))
1968 #define L_PTE_XN_HIGH (1 << (54 - 32))
1969 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
1970
1971diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
1972index 3b30062..01a5f9d 100644
1973--- a/arch/arm/include/asm/pgtable.h
1974+++ b/arch/arm/include/asm/pgtable.h
1975@@ -33,6 +33,9 @@
1976 #include <asm/pgtable-2level.h>
1977 #endif
1978
1979+#define ktla_ktva(addr) (addr)
1980+#define ktva_ktla(addr) (addr)
1981+
1982 /*
1983 * Just any arbitrary offset to the start of the vmalloc VM area: the
1984 * current 8MB value just means that there will be a 8MB "hole" after the
1985@@ -48,6 +51,9 @@
1986 #define LIBRARY_TEXT_START 0x0c000000
1987
1988 #ifndef __ASSEMBLY__
1989+extern pteval_t __supported_pte_mask;
1990+extern pmdval_t __supported_pmd_mask;
1991+
1992 extern void __pte_error(const char *file, int line, pte_t);
1993 extern void __pmd_error(const char *file, int line, pmd_t);
1994 extern void __pgd_error(const char *file, int line, pgd_t);
1995@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
1996 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
1997 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
1998
1999+#define __HAVE_ARCH_PAX_OPEN_KERNEL
2000+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2001+
2002+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2003+#include <asm/domain.h>
2004+#include <linux/thread_info.h>
2005+#include <linux/preempt.h>
2006+
2007+static inline int test_domain(int domain, int domaintype)
2008+{
2009+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2010+}
2011+#endif
2012+
2013+#ifdef CONFIG_PAX_KERNEXEC
2014+static inline unsigned long pax_open_kernel(void) {
2015+#ifdef CONFIG_ARM_LPAE
2016+ /* TODO */
2017+#else
2018+ preempt_disable();
2019+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2020+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2021+#endif
2022+ return 0;
2023+}
2024+
2025+static inline unsigned long pax_close_kernel(void) {
2026+#ifdef CONFIG_ARM_LPAE
2027+ /* TODO */
2028+#else
2029+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2030+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2031+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2032+ preempt_enable_no_resched();
2033+#endif
2034+ return 0;
2035+}
2036+#else
2037+static inline unsigned long pax_open_kernel(void) { return 0; }
2038+static inline unsigned long pax_close_kernel(void) { return 0; }
2039+#endif
2040+
2041 /*
2042 * This is the lowest virtual address we can permit any user space
2043 * mapping to be mapped at. This is particularly important for
2044@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2045 /*
2046 * The pgprot_* and protection_map entries will be fixed up in runtime
2047 * to include the cachable and bufferable bits based on memory policy,
2048- * as well as any architecture dependent bits like global/ASID and SMP
2049- * shared mapping bits.
2050+ * as well as any architecture dependent bits like global/ASID, PXN,
2051+ * and SMP shared mapping bits.
2052 */
2053 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2054
2055@@ -267,7 +315,7 @@ PTE_BIT_FUNC(mknexec, |= L_PTE_XN);
2056 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2057 {
2058 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2059- L_PTE_NONE | L_PTE_VALID;
2060+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2061 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2062 return pte;
2063 }
2064diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2065index c25ef3e..735f14b 100644
2066--- a/arch/arm/include/asm/psci.h
2067+++ b/arch/arm/include/asm/psci.h
2068@@ -32,7 +32,7 @@ struct psci_operations {
2069 int (*affinity_info)(unsigned long target_affinity,
2070 unsigned long lowest_affinity_level);
2071 int (*migrate_info_type)(void);
2072-};
2073+} __no_const;
2074
2075 extern struct psci_operations psci_ops;
2076 extern struct smp_operations psci_smp_ops;
2077diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2078index 18f5a55..5072a40 100644
2079--- a/arch/arm/include/asm/smp.h
2080+++ b/arch/arm/include/asm/smp.h
2081@@ -107,7 +107,7 @@ struct smp_operations {
2082 int (*cpu_disable)(unsigned int cpu);
2083 #endif
2084 #endif
2085-};
2086+} __no_const;
2087
2088 struct of_cpu_method {
2089 const char *method;
2090diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2091index ce73ab6..7310f8a 100644
2092--- a/arch/arm/include/asm/thread_info.h
2093+++ b/arch/arm/include/asm/thread_info.h
2094@@ -78,9 +78,9 @@ struct thread_info {
2095 .flags = 0, \
2096 .preempt_count = INIT_PREEMPT_COUNT, \
2097 .addr_limit = KERNEL_DS, \
2098- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2099- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2100- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2101+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2102+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2103+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2104 .restart_block = { \
2105 .fn = do_no_restart_syscall, \
2106 }, \
2107@@ -154,7 +154,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2108 #define TIF_SYSCALL_AUDIT 9
2109 #define TIF_SYSCALL_TRACEPOINT 10
2110 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2111-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2112+/* within 8 bits of TIF_SYSCALL_TRACE
2113+ * to meet flexible second operand requirements
2114+ */
2115+#define TIF_GRSEC_SETXID 12
2116+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2117 #define TIF_USING_IWMMXT 17
2118 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2119 #define TIF_RESTORE_SIGMASK 20
2120@@ -168,10 +172,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2121 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2122 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2123 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2124+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2125
2126 /* Checks for any syscall work in entry-common.S */
2127 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2128- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2129+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2130
2131 /*
2132 * Change these and you break ASM code in entry-common.S
2133diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2134index 5f833f7..76e6644 100644
2135--- a/arch/arm/include/asm/tls.h
2136+++ b/arch/arm/include/asm/tls.h
2137@@ -3,6 +3,7 @@
2138
2139 #include <linux/compiler.h>
2140 #include <asm/thread_info.h>
2141+#include <asm/pgtable.h>
2142
2143 #ifdef __ASSEMBLY__
2144 #include <asm/asm-offsets.h>
2145@@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2146 * at 0xffff0fe0 must be used instead. (see
2147 * entry-armv.S for details)
2148 */
2149+ pax_open_kernel();
2150 *((unsigned int *)0xffff0ff0) = val;
2151+ pax_close_kernel();
2152 #endif
2153 }
2154
2155diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2156index 4767eb9..bf00668 100644
2157--- a/arch/arm/include/asm/uaccess.h
2158+++ b/arch/arm/include/asm/uaccess.h
2159@@ -18,6 +18,7 @@
2160 #include <asm/domain.h>
2161 #include <asm/unified.h>
2162 #include <asm/compiler.h>
2163+#include <asm/pgtable.h>
2164
2165 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2166 #include <asm-generic/uaccess-unaligned.h>
2167@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2168 static inline void set_fs(mm_segment_t fs)
2169 {
2170 current_thread_info()->addr_limit = fs;
2171- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2172+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2173 }
2174
2175 #define segment_eq(a,b) ((a) == (b))
2176
2177+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2178+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2179+
2180+static inline void pax_open_userland(void)
2181+{
2182+
2183+#ifdef CONFIG_PAX_MEMORY_UDEREF
2184+ if (segment_eq(get_fs(), USER_DS)) {
2185+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2186+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2187+ }
2188+#endif
2189+
2190+}
2191+
2192+static inline void pax_close_userland(void)
2193+{
2194+
2195+#ifdef CONFIG_PAX_MEMORY_UDEREF
2196+ if (segment_eq(get_fs(), USER_DS)) {
2197+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2198+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2199+ }
2200+#endif
2201+
2202+}
2203+
2204 #define __addr_ok(addr) ({ \
2205 unsigned long flag; \
2206 __asm__("cmp %2, %0; movlo %0, #0" \
2207@@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2208
2209 #define get_user(x,p) \
2210 ({ \
2211+ int __e; \
2212 might_fault(); \
2213- __get_user_check(x,p); \
2214+ pax_open_userland(); \
2215+ __e = __get_user_check(x,p); \
2216+ pax_close_userland(); \
2217+ __e; \
2218 })
2219
2220 extern int __put_user_1(void *, unsigned int);
2221@@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2222
2223 #define put_user(x,p) \
2224 ({ \
2225+ int __e; \
2226 might_fault(); \
2227- __put_user_check(x,p); \
2228+ pax_open_userland(); \
2229+ __e = __put_user_check(x,p); \
2230+ pax_close_userland(); \
2231+ __e; \
2232 })
2233
2234 #else /* CONFIG_MMU */
2235@@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2236
2237 #endif /* CONFIG_MMU */
2238
2239+#define access_ok_noprefault(type,addr,size) access_ok((type),(addr),(size))
2240 #define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
2241
2242 #define user_addr_max() \
2243@@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2244 #define __get_user(x,ptr) \
2245 ({ \
2246 long __gu_err = 0; \
2247+ pax_open_userland(); \
2248 __get_user_err((x),(ptr),__gu_err); \
2249+ pax_close_userland(); \
2250 __gu_err; \
2251 })
2252
2253 #define __get_user_error(x,ptr,err) \
2254 ({ \
2255+ pax_open_userland(); \
2256 __get_user_err((x),(ptr),err); \
2257+ pax_close_userland(); \
2258 (void) 0; \
2259 })
2260
2261@@ -368,13 +409,17 @@ do { \
2262 #define __put_user(x,ptr) \
2263 ({ \
2264 long __pu_err = 0; \
2265+ pax_open_userland(); \
2266 __put_user_err((x),(ptr),__pu_err); \
2267+ pax_close_userland(); \
2268 __pu_err; \
2269 })
2270
2271 #define __put_user_error(x,ptr,err) \
2272 ({ \
2273+ pax_open_userland(); \
2274 __put_user_err((x),(ptr),err); \
2275+ pax_close_userland(); \
2276 (void) 0; \
2277 })
2278
2279@@ -474,11 +519,44 @@ do { \
2280
2281
2282 #ifdef CONFIG_MMU
2283-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2284-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
2285+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
2286+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
2287+
2288+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2289+{
2290+ unsigned long ret;
2291+
2292+ check_object_size(to, n, false);
2293+ pax_open_userland();
2294+ ret = ___copy_from_user(to, from, n);
2295+ pax_close_userland();
2296+ return ret;
2297+}
2298+
2299+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2300+{
2301+ unsigned long ret;
2302+
2303+ check_object_size(from, n, true);
2304+ pax_open_userland();
2305+ ret = ___copy_to_user(to, from, n);
2306+ pax_close_userland();
2307+ return ret;
2308+}
2309+
2310 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2311-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2312+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2313 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2314+
2315+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2316+{
2317+ unsigned long ret;
2318+ pax_open_userland();
2319+ ret = ___clear_user(addr, n);
2320+ pax_close_userland();
2321+ return ret;
2322+}
2323+
2324 #else
2325 #define __copy_from_user(to,from,n) (memcpy(to, (void __force *)from, n), 0)
2326 #define __copy_to_user(to,from,n) (memcpy((void __force *)to, from, n), 0)
2327@@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2328
2329 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2330 {
2331+ if ((long)n < 0)
2332+ return n;
2333+
2334 if (access_ok(VERIFY_READ, from, n))
2335 n = __copy_from_user(to, from, n);
2336 else /* security hole - plug it */
2337@@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2338
2339 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2340 {
2341+ if ((long)n < 0)
2342+ return n;
2343+
2344 if (access_ok(VERIFY_WRITE, to, n))
2345 n = __copy_to_user(to, from, n);
2346 return n;
2347diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2348index 5af0ed1..cea83883 100644
2349--- a/arch/arm/include/uapi/asm/ptrace.h
2350+++ b/arch/arm/include/uapi/asm/ptrace.h
2351@@ -92,7 +92,7 @@
2352 * ARMv7 groups of PSR bits
2353 */
2354 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2355-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2356+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2357 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2358 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2359
2360diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2361index a88671c..1cc895e 100644
2362--- a/arch/arm/kernel/armksyms.c
2363+++ b/arch/arm/kernel/armksyms.c
2364@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2365
2366 /* networking */
2367 EXPORT_SYMBOL(csum_partial);
2368-EXPORT_SYMBOL(csum_partial_copy_from_user);
2369+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2370 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2371 EXPORT_SYMBOL(__csum_ipv6_magic);
2372
2373@@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2374 #ifdef CONFIG_MMU
2375 EXPORT_SYMBOL(copy_page);
2376
2377-EXPORT_SYMBOL(__copy_from_user);
2378-EXPORT_SYMBOL(__copy_to_user);
2379-EXPORT_SYMBOL(__clear_user);
2380+EXPORT_SYMBOL(___copy_from_user);
2381+EXPORT_SYMBOL(___copy_to_user);
2382+EXPORT_SYMBOL(___clear_user);
2383
2384 EXPORT_SYMBOL(__get_user_1);
2385 EXPORT_SYMBOL(__get_user_2);
2386diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2387index 2f5555d..d493c91 100644
2388--- a/arch/arm/kernel/entry-armv.S
2389+++ b/arch/arm/kernel/entry-armv.S
2390@@ -47,6 +47,87 @@
2391 9997:
2392 .endm
2393
2394+ .macro pax_enter_kernel
2395+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2396+ @ make aligned space for saved DACR
2397+ sub sp, sp, #8
2398+ @ save regs
2399+ stmdb sp!, {r1, r2}
2400+ @ read DACR from cpu_domain into r1
2401+ mov r2, sp
2402+ @ assume 8K pages, since we have to split the immediate in two
2403+ bic r2, r2, #(0x1fc0)
2404+ bic r2, r2, #(0x3f)
2405+ ldr r1, [r2, #TI_CPU_DOMAIN]
2406+ @ store old DACR on stack
2407+ str r1, [sp, #8]
2408+#ifdef CONFIG_PAX_KERNEXEC
2409+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2410+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2411+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2412+#endif
2413+#ifdef CONFIG_PAX_MEMORY_UDEREF
2414+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2415+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2416+#endif
2417+ @ write r1 to current_thread_info()->cpu_domain
2418+ str r1, [r2, #TI_CPU_DOMAIN]
2419+ @ write r1 to DACR
2420+ mcr p15, 0, r1, c3, c0, 0
2421+ @ instruction sync
2422+ instr_sync
2423+ @ restore regs
2424+ ldmia sp!, {r1, r2}
2425+#endif
2426+ .endm
2427+
2428+ .macro pax_open_userland
2429+#ifdef CONFIG_PAX_MEMORY_UDEREF
2430+ @ save regs
2431+ stmdb sp!, {r0, r1}
2432+ @ read DACR from cpu_domain into r1
2433+ mov r0, sp
2434+ @ assume 8K pages, since we have to split the immediate in two
2435+ bic r0, r0, #(0x1fc0)
2436+ bic r0, r0, #(0x3f)
2437+ ldr r1, [r0, #TI_CPU_DOMAIN]
2438+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2439+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2440+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2441+ @ write r1 to current_thread_info()->cpu_domain
2442+ str r1, [r0, #TI_CPU_DOMAIN]
2443+ @ write r1 to DACR
2444+ mcr p15, 0, r1, c3, c0, 0
2445+ @ instruction sync
2446+ instr_sync
2447+ @ restore regs
2448+ ldmia sp!, {r0, r1}
2449+#endif
2450+ .endm
2451+
2452+ .macro pax_close_userland
2453+#ifdef CONFIG_PAX_MEMORY_UDEREF
2454+ @ save regs
2455+ stmdb sp!, {r0, r1}
2456+ @ read DACR from cpu_domain into r1
2457+ mov r0, sp
2458+ @ assume 8K pages, since we have to split the immediate in two
2459+ bic r0, r0, #(0x1fc0)
2460+ bic r0, r0, #(0x3f)
2461+ ldr r1, [r0, #TI_CPU_DOMAIN]
2462+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2463+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2464+ @ write r1 to current_thread_info()->cpu_domain
2465+ str r1, [r0, #TI_CPU_DOMAIN]
2466+ @ write r1 to DACR
2467+ mcr p15, 0, r1, c3, c0, 0
2468+ @ instruction sync
2469+ instr_sync
2470+ @ restore regs
2471+ ldmia sp!, {r0, r1}
2472+#endif
2473+ .endm
2474+
2475 .macro pabt_helper
2476 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2477 #ifdef MULTI_PABORT
2478@@ -89,11 +170,15 @@
2479 * Invalid mode handlers
2480 */
2481 .macro inv_entry, reason
2482+
2483+ pax_enter_kernel
2484+
2485 sub sp, sp, #S_FRAME_SIZE
2486 ARM( stmib sp, {r1 - lr} )
2487 THUMB( stmia sp, {r0 - r12} )
2488 THUMB( str sp, [sp, #S_SP] )
2489 THUMB( str lr, [sp, #S_LR] )
2490+
2491 mov r1, #\reason
2492 .endm
2493
2494@@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
2495 .macro svc_entry, stack_hole=0, trace=1
2496 UNWIND(.fnstart )
2497 UNWIND(.save {r0 - pc} )
2498+
2499+ pax_enter_kernel
2500+
2501 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2502+
2503 #ifdef CONFIG_THUMB2_KERNEL
2504 SPFIX( str r0, [sp] ) @ temporarily saved
2505 SPFIX( mov r0, sp )
2506@@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
2507 ldmia r0, {r3 - r5}
2508 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2509 mov r6, #-1 @ "" "" "" ""
2510+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2511+ @ offset sp by 8 as done in pax_enter_kernel
2512+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2513+#else
2514 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2515+#endif
2516 SPFIX( addeq r2, r2, #4 )
2517 str r3, [sp, #-4]! @ save the "real" r0 copied
2518 @ from the exception stack
2519@@ -368,6 +462,9 @@ ENDPROC(__fiq_abt)
2520 .macro usr_entry, trace=1
2521 UNWIND(.fnstart )
2522 UNWIND(.cantunwind ) @ don't unwind the user space
2523+
2524+ pax_enter_kernel_user
2525+
2526 sub sp, sp, #S_FRAME_SIZE
2527 ARM( stmib sp, {r1 - r12} )
2528 THUMB( stmia sp, {r0 - r12} )
2529@@ -478,7 +575,9 @@ __und_usr:
2530 tst r3, #PSR_T_BIT @ Thumb mode?
2531 bne __und_usr_thumb
2532 sub r4, r2, #4 @ ARM instr at LR - 4
2533+ pax_open_userland
2534 1: ldrt r0, [r4]
2535+ pax_close_userland
2536 ARM_BE8(rev r0, r0) @ little endian instruction
2537
2538 @ r0 = 32-bit ARM instruction which caused the exception
2539@@ -512,11 +611,15 @@ __und_usr_thumb:
2540 */
2541 .arch armv6t2
2542 #endif
2543+ pax_open_userland
2544 2: ldrht r5, [r4]
2545+ pax_close_userland
2546 ARM_BE8(rev16 r5, r5) @ little endian instruction
2547 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2548 blo __und_usr_fault_16 @ 16bit undefined instruction
2549+ pax_open_userland
2550 3: ldrht r0, [r2]
2551+ pax_close_userland
2552 ARM_BE8(rev16 r0, r0) @ little endian instruction
2553 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2554 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2555@@ -546,7 +649,8 @@ ENDPROC(__und_usr)
2556 */
2557 .pushsection .fixup, "ax"
2558 .align 2
2559-4: str r4, [sp, #S_PC] @ retry current instruction
2560+4: pax_close_userland
2561+ str r4, [sp, #S_PC] @ retry current instruction
2562 ret r9
2563 .popsection
2564 .pushsection __ex_table,"a"
2565@@ -766,7 +870,7 @@ ENTRY(__switch_to)
2566 THUMB( str lr, [ip], #4 )
2567 ldr r4, [r2, #TI_TP_VALUE]
2568 ldr r5, [r2, #TI_TP_VALUE + 4]
2569-#ifdef CONFIG_CPU_USE_DOMAINS
2570+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2571 ldr r6, [r2, #TI_CPU_DOMAIN]
2572 #endif
2573 switch_tls r1, r4, r5, r3, r7
2574@@ -775,7 +879,7 @@ ENTRY(__switch_to)
2575 ldr r8, =__stack_chk_guard
2576 ldr r7, [r7, #TSK_STACK_CANARY]
2577 #endif
2578-#ifdef CONFIG_CPU_USE_DOMAINS
2579+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2580 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2581 #endif
2582 mov r5, r0
2583diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2584index 6bb09d4..113e875 100644
2585--- a/arch/arm/kernel/entry-common.S
2586+++ b/arch/arm/kernel/entry-common.S
2587@@ -11,18 +11,46 @@
2588 #include <asm/assembler.h>
2589 #include <asm/unistd.h>
2590 #include <asm/ftrace.h>
2591+#include <asm/domain.h>
2592 #include <asm/unwind.h>
2593
2594+#include "entry-header.S"
2595+
2596 #ifdef CONFIG_NEED_RET_TO_USER
2597 #include <mach/entry-macro.S>
2598 #else
2599 .macro arch_ret_to_user, tmp1, tmp2
2600+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2601+ @ save regs
2602+ stmdb sp!, {r1, r2}
2603+ @ read DACR from cpu_domain into r1
2604+ mov r2, sp
2605+ @ assume 8K pages, since we have to split the immediate in two
2606+ bic r2, r2, #(0x1fc0)
2607+ bic r2, r2, #(0x3f)
2608+ ldr r1, [r2, #TI_CPU_DOMAIN]
2609+#ifdef CONFIG_PAX_KERNEXEC
2610+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2611+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2612+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2613+#endif
2614+#ifdef CONFIG_PAX_MEMORY_UDEREF
2615+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2616+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2617+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2618+#endif
2619+ @ write r1 to current_thread_info()->cpu_domain
2620+ str r1, [r2, #TI_CPU_DOMAIN]
2621+ @ write r1 to DACR
2622+ mcr p15, 0, r1, c3, c0, 0
2623+ @ instruction sync
2624+ instr_sync
2625+ @ restore regs
2626+ ldmia sp!, {r1, r2}
2627+#endif
2628 .endm
2629 #endif
2630
2631-#include "entry-header.S"
2632-
2633-
2634 .align 5
2635 /*
2636 * This is the fast syscall return path. We do as little as
2637@@ -406,6 +434,12 @@ ENTRY(vector_swi)
2638 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2639 #endif
2640
2641+ /*
2642+ * do this here to avoid a performance hit of wrapping the code above
2643+ * that directly dereferences userland to parse the SWI instruction
2644+ */
2645+ pax_enter_kernel_user
2646+
2647 adr tbl, sys_call_table @ load syscall table pointer
2648
2649 #if defined(CONFIG_OABI_COMPAT)
2650diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2651index 4176df7..a901f8d 100644
2652--- a/arch/arm/kernel/entry-header.S
2653+++ b/arch/arm/kernel/entry-header.S
2654@@ -196,6 +196,60 @@
2655 msr cpsr_c, \rtemp @ switch back to the SVC mode
2656 .endm
2657
2658+ .macro pax_enter_kernel_user
2659+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2660+ @ save regs
2661+ stmdb sp!, {r0, r1}
2662+ @ read DACR from cpu_domain into r1
2663+ mov r0, sp
2664+ @ assume 8K pages, since we have to split the immediate in two
2665+ bic r0, r0, #(0x1fc0)
2666+ bic r0, r0, #(0x3f)
2667+ ldr r1, [r0, #TI_CPU_DOMAIN]
2668+#ifdef CONFIG_PAX_MEMORY_UDEREF
2669+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2670+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2671+#endif
2672+#ifdef CONFIG_PAX_KERNEXEC
2673+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2674+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2675+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2676+#endif
2677+ @ write r1 to current_thread_info()->cpu_domain
2678+ str r1, [r0, #TI_CPU_DOMAIN]
2679+ @ write r1 to DACR
2680+ mcr p15, 0, r1, c3, c0, 0
2681+ @ instruction sync
2682+ instr_sync
2683+ @ restore regs
2684+ ldmia sp!, {r0, r1}
2685+#endif
2686+ .endm
2687+
2688+ .macro pax_exit_kernel
2689+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2690+ @ save regs
2691+ stmdb sp!, {r0, r1}
2692+ @ read old DACR from stack into r1
2693+ ldr r1, [sp, #(8 + S_SP)]
2694+ sub r1, r1, #8
2695+ ldr r1, [r1]
2696+
2697+ @ write r1 to current_thread_info()->cpu_domain
2698+ mov r0, sp
2699+ @ assume 8K pages, since we have to split the immediate in two
2700+ bic r0, r0, #(0x1fc0)
2701+ bic r0, r0, #(0x3f)
2702+ str r1, [r0, #TI_CPU_DOMAIN]
2703+ @ write r1 to DACR
2704+ mcr p15, 0, r1, c3, c0, 0
2705+ @ instruction sync
2706+ instr_sync
2707+ @ restore regs
2708+ ldmia sp!, {r0, r1}
2709+#endif
2710+ .endm
2711+
2712 #ifndef CONFIG_THUMB2_KERNEL
2713 .macro svc_exit, rpsr, irq = 0
2714 .if \irq != 0
2715@@ -215,6 +269,9 @@
2716 blne trace_hardirqs_off
2717 #endif
2718 .endif
2719+
2720+ pax_exit_kernel
2721+
2722 msr spsr_cxsf, \rpsr
2723 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2724 @ We must avoid clrex due to Cortex-A15 erratum #830321
2725@@ -290,6 +347,9 @@
2726 blne trace_hardirqs_off
2727 #endif
2728 .endif
2729+
2730+ pax_exit_kernel
2731+
2732 ldr lr, [sp, #S_SP] @ top of the stack
2733 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2734
2735diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2736index b37752a..ff5cb72 100644
2737--- a/arch/arm/kernel/fiq.c
2738+++ b/arch/arm/kernel/fiq.c
2739@@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2740 void *base = vectors_page;
2741 unsigned offset = FIQ_OFFSET;
2742
2743+ pax_open_kernel();
2744 memcpy(base + offset, start, length);
2745+ pax_close_kernel();
2746+
2747 if (!cache_is_vipt_nonaliasing())
2748 flush_icache_range((unsigned long)base + offset, offset +
2749 length);
2750diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2751index 664eee8..f470938 100644
2752--- a/arch/arm/kernel/head.S
2753+++ b/arch/arm/kernel/head.S
2754@@ -437,7 +437,7 @@ __enable_mmu:
2755 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2756 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2757 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2758- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2759+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2760 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2761 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2762 #endif
2763diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2764index 6a4dffe..4a86a70 100644
2765--- a/arch/arm/kernel/module.c
2766+++ b/arch/arm/kernel/module.c
2767@@ -38,12 +38,39 @@
2768 #endif
2769
2770 #ifdef CONFIG_MMU
2771-void *module_alloc(unsigned long size)
2772+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2773 {
2774+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2775+ return NULL;
2776 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2777- GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE,
2778+ GFP_KERNEL, prot, NUMA_NO_NODE,
2779 __builtin_return_address(0));
2780 }
2781+
2782+void *module_alloc(unsigned long size)
2783+{
2784+
2785+#ifdef CONFIG_PAX_KERNEXEC
2786+ return __module_alloc(size, PAGE_KERNEL);
2787+#else
2788+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2789+#endif
2790+
2791+}
2792+
2793+#ifdef CONFIG_PAX_KERNEXEC
2794+void module_free_exec(struct module *mod, void *module_region)
2795+{
2796+ module_free(mod, module_region);
2797+}
2798+EXPORT_SYMBOL(module_free_exec);
2799+
2800+void *module_alloc_exec(unsigned long size)
2801+{
2802+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2803+}
2804+EXPORT_SYMBOL(module_alloc_exec);
2805+#endif
2806 #endif
2807
2808 int
2809diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2810index 07314af..c46655c 100644
2811--- a/arch/arm/kernel/patch.c
2812+++ b/arch/arm/kernel/patch.c
2813@@ -18,6 +18,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2814 bool thumb2 = IS_ENABLED(CONFIG_THUMB2_KERNEL);
2815 int size;
2816
2817+ pax_open_kernel();
2818 if (thumb2 && __opcode_is_thumb16(insn)) {
2819 *(u16 *)addr = __opcode_to_mem_thumb16(insn);
2820 size = sizeof(u16);
2821@@ -39,6 +40,7 @@ void __kprobes __patch_text(void *addr, unsigned int insn)
2822 *(u32 *)addr = insn;
2823 size = sizeof(u32);
2824 }
2825+ pax_close_kernel();
2826
2827 flush_icache_range((uintptr_t)(addr),
2828 (uintptr_t)(addr) + size);
2829diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2830index fe972a2..a772d83 100644
2831--- a/arch/arm/kernel/process.c
2832+++ b/arch/arm/kernel/process.c
2833@@ -207,6 +207,7 @@ void machine_power_off(void)
2834
2835 if (pm_power_off)
2836 pm_power_off();
2837+ BUG();
2838 }
2839
2840 /*
2841@@ -220,7 +221,7 @@ void machine_power_off(void)
2842 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2843 * to use. Implementing such co-ordination would be essentially impossible.
2844 */
2845-void machine_restart(char *cmd)
2846+__noreturn void machine_restart(char *cmd)
2847 {
2848 local_irq_disable();
2849 smp_send_stop();
2850@@ -246,8 +247,8 @@ void __show_regs(struct pt_regs *regs)
2851
2852 show_regs_print_info(KERN_DEFAULT);
2853
2854- print_symbol("PC is at %s\n", instruction_pointer(regs));
2855- print_symbol("LR is at %s\n", regs->ARM_lr);
2856+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2857+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2858 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2859 "sp : %08lx ip : %08lx fp : %08lx\n",
2860 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2861@@ -424,12 +425,6 @@ unsigned long get_wchan(struct task_struct *p)
2862 return 0;
2863 }
2864
2865-unsigned long arch_randomize_brk(struct mm_struct *mm)
2866-{
2867- unsigned long range_end = mm->brk + 0x02000000;
2868- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2869-}
2870-
2871 #ifdef CONFIG_MMU
2872 #ifdef CONFIG_KUSER_HELPERS
2873 /*
2874@@ -445,7 +440,7 @@ static struct vm_area_struct gate_vma = {
2875
2876 static int __init gate_vma_init(void)
2877 {
2878- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2879+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2880 return 0;
2881 }
2882 arch_initcall(gate_vma_init);
2883@@ -474,81 +469,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2884 return is_gate_vma(vma) ? "[vectors]" : NULL;
2885 }
2886
2887-/* If possible, provide a placement hint at a random offset from the
2888- * stack for the signal page.
2889- */
2890-static unsigned long sigpage_addr(const struct mm_struct *mm,
2891- unsigned int npages)
2892-{
2893- unsigned long offset;
2894- unsigned long first;
2895- unsigned long last;
2896- unsigned long addr;
2897- unsigned int slots;
2898-
2899- first = PAGE_ALIGN(mm->start_stack);
2900-
2901- last = TASK_SIZE - (npages << PAGE_SHIFT);
2902-
2903- /* No room after stack? */
2904- if (first > last)
2905- return 0;
2906-
2907- /* Just enough room? */
2908- if (first == last)
2909- return first;
2910-
2911- slots = ((last - first) >> PAGE_SHIFT) + 1;
2912-
2913- offset = get_random_int() % slots;
2914-
2915- addr = first + (offset << PAGE_SHIFT);
2916-
2917- return addr;
2918-}
2919-
2920-static struct page *signal_page;
2921-extern struct page *get_signal_page(void);
2922-
2923-static const struct vm_special_mapping sigpage_mapping = {
2924- .name = "[sigpage]",
2925- .pages = &signal_page,
2926-};
2927-
2928 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2929 {
2930 struct mm_struct *mm = current->mm;
2931- struct vm_area_struct *vma;
2932- unsigned long addr;
2933- unsigned long hint;
2934- int ret = 0;
2935-
2936- if (!signal_page)
2937- signal_page = get_signal_page();
2938- if (!signal_page)
2939- return -ENOMEM;
2940
2941 down_write(&mm->mmap_sem);
2942- hint = sigpage_addr(mm, 1);
2943- addr = get_unmapped_area(NULL, hint, PAGE_SIZE, 0, 0);
2944- if (IS_ERR_VALUE(addr)) {
2945- ret = addr;
2946- goto up_fail;
2947- }
2948-
2949- vma = _install_special_mapping(mm, addr, PAGE_SIZE,
2950- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2951- &sigpage_mapping);
2952-
2953- if (IS_ERR(vma)) {
2954- ret = PTR_ERR(vma);
2955- goto up_fail;
2956- }
2957-
2958- mm->context.sigpage = addr;
2959-
2960- up_fail:
2961+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
2962 up_write(&mm->mmap_sem);
2963- return ret;
2964+ return 0;
2965 }
2966 #endif
2967diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
2968index f73891b..cf3004e 100644
2969--- a/arch/arm/kernel/psci.c
2970+++ b/arch/arm/kernel/psci.c
2971@@ -28,7 +28,7 @@
2972 #include <asm/psci.h>
2973 #include <asm/system_misc.h>
2974
2975-struct psci_operations psci_ops;
2976+struct psci_operations psci_ops __read_only;
2977
2978 static int (*invoke_psci_fn)(u32, u32, u32, u32);
2979 typedef int (*psci_initcall_t)(const struct device_node *);
2980diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
2981index ef9119f..31995a3 100644
2982--- a/arch/arm/kernel/ptrace.c
2983+++ b/arch/arm/kernel/ptrace.c
2984@@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
2985 regs->ARM_ip = ip;
2986 }
2987
2988+#ifdef CONFIG_GRKERNSEC_SETXID
2989+extern void gr_delayed_cred_worker(void);
2990+#endif
2991+
2992 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
2993 {
2994 current_thread_info()->syscall = scno;
2995
2996+#ifdef CONFIG_GRKERNSEC_SETXID
2997+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
2998+ gr_delayed_cred_worker();
2999+#endif
3000+
3001 /* Do the secure computing check first; failures should be fast. */
3002 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3003 if (secure_computing() == -1)
3004diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3005index c031063..e277ab8 100644
3006--- a/arch/arm/kernel/setup.c
3007+++ b/arch/arm/kernel/setup.c
3008@@ -104,21 +104,23 @@ EXPORT_SYMBOL(elf_hwcap);
3009 unsigned int elf_hwcap2 __read_mostly;
3010 EXPORT_SYMBOL(elf_hwcap2);
3011
3012+pteval_t __supported_pte_mask __read_only;
3013+pmdval_t __supported_pmd_mask __read_only;
3014
3015 #ifdef MULTI_CPU
3016-struct processor processor __read_mostly;
3017+struct processor processor __read_only;
3018 #endif
3019 #ifdef MULTI_TLB
3020-struct cpu_tlb_fns cpu_tlb __read_mostly;
3021+struct cpu_tlb_fns cpu_tlb __read_only;
3022 #endif
3023 #ifdef MULTI_USER
3024-struct cpu_user_fns cpu_user __read_mostly;
3025+struct cpu_user_fns cpu_user __read_only;
3026 #endif
3027 #ifdef MULTI_CACHE
3028-struct cpu_cache_fns cpu_cache __read_mostly;
3029+struct cpu_cache_fns cpu_cache __read_only;
3030 #endif
3031 #ifdef CONFIG_OUTER_CACHE
3032-struct outer_cache_fns outer_cache __read_mostly;
3033+struct outer_cache_fns outer_cache __read_only;
3034 EXPORT_SYMBOL(outer_cache);
3035 #endif
3036
3037@@ -252,9 +254,13 @@ static int __get_cpu_architecture(void)
3038 asm("mrc p15, 0, %0, c0, c1, 4"
3039 : "=r" (mmfr0));
3040 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3041- (mmfr0 & 0x000000f0) >= 0x00000030)
3042+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3043 cpu_arch = CPU_ARCH_ARMv7;
3044- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3045+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3046+ __supported_pte_mask |= L_PTE_PXN;
3047+ __supported_pmd_mask |= PMD_PXNTABLE;
3048+ }
3049+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3050 (mmfr0 & 0x000000f0) == 0x00000020)
3051 cpu_arch = CPU_ARCH_ARMv6;
3052 else
3053diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3054index bd19834..e4d8c66 100644
3055--- a/arch/arm/kernel/signal.c
3056+++ b/arch/arm/kernel/signal.c
3057@@ -24,8 +24,6 @@
3058
3059 extern const unsigned long sigreturn_codes[7];
3060
3061-static unsigned long signal_return_offset;
3062-
3063 #ifdef CONFIG_CRUNCH
3064 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3065 {
3066@@ -396,8 +394,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3067 * except when the MPU has protected the vectors
3068 * page from PL0
3069 */
3070- retcode = mm->context.sigpage + signal_return_offset +
3071- (idx << 2) + thumb;
3072+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3073 } else
3074 #endif
3075 {
3076@@ -604,33 +601,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3077 } while (thread_flags & _TIF_WORK_MASK);
3078 return 0;
3079 }
3080-
3081-struct page *get_signal_page(void)
3082-{
3083- unsigned long ptr;
3084- unsigned offset;
3085- struct page *page;
3086- void *addr;
3087-
3088- page = alloc_pages(GFP_KERNEL, 0);
3089-
3090- if (!page)
3091- return NULL;
3092-
3093- addr = page_address(page);
3094-
3095- /* Give the signal return code some randomness */
3096- offset = 0x200 + (get_random_int() & 0x7fc);
3097- signal_return_offset = offset;
3098-
3099- /*
3100- * Copy signal return handlers into the vector page, and
3101- * set sigreturn to be a pointer to these.
3102- */
3103- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3104-
3105- ptr = (unsigned long)addr + offset;
3106- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3107-
3108- return page;
3109-}
3110diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3111index 13396d3..589d615 100644
3112--- a/arch/arm/kernel/smp.c
3113+++ b/arch/arm/kernel/smp.c
3114@@ -76,7 +76,7 @@ enum ipi_msg_type {
3115
3116 static DECLARE_COMPLETION(cpu_running);
3117
3118-static struct smp_operations smp_ops;
3119+static struct smp_operations smp_ops __read_only;
3120
3121 void __init smp_set_ops(struct smp_operations *ops)
3122 {
3123diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3124index 7a3be1d..b00c7de 100644
3125--- a/arch/arm/kernel/tcm.c
3126+++ b/arch/arm/kernel/tcm.c
3127@@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3128 .virtual = ITCM_OFFSET,
3129 .pfn = __phys_to_pfn(ITCM_OFFSET),
3130 .length = 0,
3131- .type = MT_MEMORY_RWX_ITCM,
3132+ .type = MT_MEMORY_RX_ITCM,
3133 }
3134 };
3135
3136@@ -267,7 +267,9 @@ no_dtcm:
3137 start = &__sitcm_text;
3138 end = &__eitcm_text;
3139 ram = &__itcm_start;
3140+ pax_open_kernel();
3141 memcpy(start, ram, itcm_code_sz);
3142+ pax_close_kernel();
3143 pr_debug("CPU ITCM: copied code from %p - %p\n",
3144 start, end);
3145 itcm_present = true;
3146diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3147index 9f5d818..e013427 100644
3148--- a/arch/arm/kernel/traps.c
3149+++ b/arch/arm/kernel/traps.c
3150@@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3151 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3152 {
3153 #ifdef CONFIG_KALLSYMS
3154- printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3155+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3156 #else
3157 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3158 #endif
3159@@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3160 static int die_owner = -1;
3161 static unsigned int die_nest_count;
3162
3163+extern void gr_handle_kernel_exploit(void);
3164+
3165 static unsigned long oops_begin(void)
3166 {
3167 int cpu;
3168@@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3169 panic("Fatal exception in interrupt");
3170 if (panic_on_oops)
3171 panic("Fatal exception");
3172+
3173+ gr_handle_kernel_exploit();
3174+
3175 if (signr)
3176 do_exit(signr);
3177 }
3178@@ -880,7 +885,11 @@ void __init early_trap_init(void *vectors_base)
3179 kuser_init(vectors_base);
3180
3181 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3182- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3183+
3184+#ifndef CONFIG_PAX_MEMORY_UDEREF
3185+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3186+#endif
3187+
3188 #else /* ifndef CONFIG_CPU_V7M */
3189 /*
3190 * on V7-M there is no need to copy the vector table to a dedicated
3191diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3192index 8e95aa4..595dfc8 100644
3193--- a/arch/arm/kernel/vmlinux.lds.S
3194+++ b/arch/arm/kernel/vmlinux.lds.S
3195@@ -8,7 +8,11 @@
3196 #include <asm/thread_info.h>
3197 #include <asm/memory.h>
3198 #include <asm/page.h>
3199-
3200+
3201+#ifdef CONFIG_PAX_KERNEXEC
3202+#include <asm/pgtable.h>
3203+#endif
3204+
3205 #define PROC_INFO \
3206 . = ALIGN(4); \
3207 VMLINUX_SYMBOL(__proc_info_begin) = .; \
3208@@ -34,7 +38,7 @@
3209 #endif
3210
3211 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3212- defined(CONFIG_GENERIC_BUG)
3213+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3214 #define ARM_EXIT_KEEP(x) x
3215 #define ARM_EXIT_DISCARD(x)
3216 #else
3217@@ -90,6 +94,11 @@ SECTIONS
3218 _text = .;
3219 HEAD_TEXT
3220 }
3221+
3222+#ifdef CONFIG_PAX_KERNEXEC
3223+ . = ALIGN(1<<SECTION_SHIFT);
3224+#endif
3225+
3226 .text : { /* Real text segment */
3227 _stext = .; /* Text and read-only data */
3228 __exception_text_start = .;
3229@@ -112,6 +121,8 @@ SECTIONS
3230 ARM_CPU_KEEP(PROC_INFO)
3231 }
3232
3233+ _etext = .; /* End of text section */
3234+
3235 RO_DATA(PAGE_SIZE)
3236
3237 . = ALIGN(4);
3238@@ -142,7 +153,9 @@ SECTIONS
3239
3240 NOTES
3241
3242- _etext = .; /* End of text and rodata section */
3243+#ifdef CONFIG_PAX_KERNEXEC
3244+ . = ALIGN(1<<SECTION_SHIFT);
3245+#endif
3246
3247 #ifndef CONFIG_XIP_KERNEL
3248 . = ALIGN(PAGE_SIZE);
3249@@ -221,6 +234,11 @@ SECTIONS
3250 #else
3251 . = ALIGN(THREAD_SIZE);
3252 __init_end = .;
3253+
3254+#ifdef CONFIG_PAX_KERNEXEC
3255+ . = ALIGN(1<<SECTION_SHIFT);
3256+#endif
3257+
3258 __data_loc = .;
3259 #endif
3260
3261diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3262index 9e193c8..3560fe6 100644
3263--- a/arch/arm/kvm/arm.c
3264+++ b/arch/arm/kvm/arm.c
3265@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3266 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3267
3268 /* The VMID used in the VTTBR */
3269-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3270+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3271 static u8 kvm_next_vmid;
3272 static DEFINE_SPINLOCK(kvm_vmid_lock);
3273
3274@@ -354,7 +354,7 @@ void force_vm_exit(const cpumask_t *mask)
3275 */
3276 static bool need_new_vmid_gen(struct kvm *kvm)
3277 {
3278- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3279+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3280 }
3281
3282 /**
3283@@ -387,7 +387,7 @@ static void update_vttbr(struct kvm *kvm)
3284
3285 /* First user of a new VMID generation? */
3286 if (unlikely(kvm_next_vmid == 0)) {
3287- atomic64_inc(&kvm_vmid_gen);
3288+ atomic64_inc_unchecked(&kvm_vmid_gen);
3289 kvm_next_vmid = 1;
3290
3291 /*
3292@@ -404,7 +404,7 @@ static void update_vttbr(struct kvm *kvm)
3293 kvm_call_hyp(__kvm_flush_vm_context);
3294 }
3295
3296- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3297+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3298 kvm->arch.vmid = kvm_next_vmid;
3299 kvm_next_vmid++;
3300
3301@@ -980,7 +980,7 @@ static void check_kvm_target_cpu(void *ret)
3302 /**
3303 * Initialize Hyp-mode and memory mappings on all CPUs.
3304 */
3305-int kvm_arch_init(void *opaque)
3306+int kvm_arch_init(const void *opaque)
3307 {
3308 int err;
3309 int ret, cpu;
3310diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3311index 14a0d98..7771a7d 100644
3312--- a/arch/arm/lib/clear_user.S
3313+++ b/arch/arm/lib/clear_user.S
3314@@ -12,14 +12,14 @@
3315
3316 .text
3317
3318-/* Prototype: int __clear_user(void *addr, size_t sz)
3319+/* Prototype: int ___clear_user(void *addr, size_t sz)
3320 * Purpose : clear some user memory
3321 * Params : addr - user memory address to clear
3322 * : sz - number of bytes to clear
3323 * Returns : number of bytes NOT cleared
3324 */
3325 ENTRY(__clear_user_std)
3326-WEAK(__clear_user)
3327+WEAK(___clear_user)
3328 stmfd sp!, {r1, lr}
3329 mov r2, #0
3330 cmp r1, #4
3331@@ -44,7 +44,7 @@ WEAK(__clear_user)
3332 USER( strnebt r2, [r0])
3333 mov r0, #0
3334 ldmfd sp!, {r1, pc}
3335-ENDPROC(__clear_user)
3336+ENDPROC(___clear_user)
3337 ENDPROC(__clear_user_std)
3338
3339 .pushsection .fixup,"ax"
3340diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3341index 66a477a..bee61d3 100644
3342--- a/arch/arm/lib/copy_from_user.S
3343+++ b/arch/arm/lib/copy_from_user.S
3344@@ -16,7 +16,7 @@
3345 /*
3346 * Prototype:
3347 *
3348- * size_t __copy_from_user(void *to, const void *from, size_t n)
3349+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3350 *
3351 * Purpose:
3352 *
3353@@ -84,11 +84,11 @@
3354
3355 .text
3356
3357-ENTRY(__copy_from_user)
3358+ENTRY(___copy_from_user)
3359
3360 #include "copy_template.S"
3361
3362-ENDPROC(__copy_from_user)
3363+ENDPROC(___copy_from_user)
3364
3365 .pushsection .fixup,"ax"
3366 .align 0
3367diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3368index 6ee2f67..d1cce76 100644
3369--- a/arch/arm/lib/copy_page.S
3370+++ b/arch/arm/lib/copy_page.S
3371@@ -10,6 +10,7 @@
3372 * ASM optimised string functions
3373 */
3374 #include <linux/linkage.h>
3375+#include <linux/const.h>
3376 #include <asm/assembler.h>
3377 #include <asm/asm-offsets.h>
3378 #include <asm/cache.h>
3379diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3380index d066df6..df28194 100644
3381--- a/arch/arm/lib/copy_to_user.S
3382+++ b/arch/arm/lib/copy_to_user.S
3383@@ -16,7 +16,7 @@
3384 /*
3385 * Prototype:
3386 *
3387- * size_t __copy_to_user(void *to, const void *from, size_t n)
3388+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3389 *
3390 * Purpose:
3391 *
3392@@ -88,11 +88,11 @@
3393 .text
3394
3395 ENTRY(__copy_to_user_std)
3396-WEAK(__copy_to_user)
3397+WEAK(___copy_to_user)
3398
3399 #include "copy_template.S"
3400
3401-ENDPROC(__copy_to_user)
3402+ENDPROC(___copy_to_user)
3403 ENDPROC(__copy_to_user_std)
3404
3405 .pushsection .fixup,"ax"
3406diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3407index 7d08b43..f7ca7ea 100644
3408--- a/arch/arm/lib/csumpartialcopyuser.S
3409+++ b/arch/arm/lib/csumpartialcopyuser.S
3410@@ -57,8 +57,8 @@
3411 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3412 */
3413
3414-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3415-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3416+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3417+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3418
3419 #include "csumpartialcopygeneric.S"
3420
3421diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3422index 312d43e..21d2322 100644
3423--- a/arch/arm/lib/delay.c
3424+++ b/arch/arm/lib/delay.c
3425@@ -29,7 +29,7 @@
3426 /*
3427 * Default to the loop-based delay implementation.
3428 */
3429-struct arm_delay_ops arm_delay_ops = {
3430+struct arm_delay_ops arm_delay_ops __read_only = {
3431 .delay = __loop_delay,
3432 .const_udelay = __loop_const_udelay,
3433 .udelay = __loop_udelay,
3434diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3435index 3e58d71..029817c 100644
3436--- a/arch/arm/lib/uaccess_with_memcpy.c
3437+++ b/arch/arm/lib/uaccess_with_memcpy.c
3438@@ -136,7 +136,7 @@ out:
3439 }
3440
3441 unsigned long
3442-__copy_to_user(void __user *to, const void *from, unsigned long n)
3443+___copy_to_user(void __user *to, const void *from, unsigned long n)
3444 {
3445 /*
3446 * This test is stubbed out of the main function above to keep
3447@@ -190,7 +190,7 @@ out:
3448 return n;
3449 }
3450
3451-unsigned long __clear_user(void __user *addr, unsigned long n)
3452+unsigned long ___clear_user(void __user *addr, unsigned long n)
3453 {
3454 /* See rational for this in __copy_to_user() above. */
3455 if (n < 64)
3456diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
3457index 9610792..4dfb851 100644
3458--- a/arch/arm/mach-at91/setup.c
3459+++ b/arch/arm/mach-at91/setup.c
3460@@ -83,7 +83,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
3461
3462 desc->pfn = __phys_to_pfn(base);
3463 desc->length = length;
3464- desc->type = MT_MEMORY_RWX_NONCACHED;
3465+ desc->type = MT_MEMORY_RW_NONCACHED;
3466
3467 pr_info("sram at 0x%lx of 0x%x mapped at 0x%lx\n",
3468 base, length, desc->virtual);
3469diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3470index 7f352de..6dc0929 100644
3471--- a/arch/arm/mach-keystone/keystone.c
3472+++ b/arch/arm/mach-keystone/keystone.c
3473@@ -27,7 +27,7 @@
3474
3475 #include "keystone.h"
3476
3477-static struct notifier_block platform_nb;
3478+static notifier_block_no_const platform_nb;
3479 static unsigned long keystone_dma_pfn_offset __read_mostly;
3480
3481 static int keystone_platform_notifier(struct notifier_block *nb,
3482diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3483index 044b511..afd1da8 100644
3484--- a/arch/arm/mach-mvebu/coherency.c
3485+++ b/arch/arm/mach-mvebu/coherency.c
3486@@ -316,7 +316,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3487
3488 /*
3489 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3490- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3491+ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3492 * is needed as a workaround for a deadlock issue between the PCIe
3493 * interface and the cache controller.
3494 */
3495@@ -329,7 +329,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3496 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3497
3498 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3499- mtype = MT_UNCACHED;
3500+ mtype = MT_UNCACHED_RW;
3501
3502 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3503 }
3504diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3505index 97767a2..9233746 100644
3506--- a/arch/arm/mach-omap2/board-n8x0.c
3507+++ b/arch/arm/mach-omap2/board-n8x0.c
3508@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3509 }
3510 #endif
3511
3512-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3513+struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3514 .late_init = n8x0_menelaus_late_init,
3515 };
3516
3517diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
3518index 5fa3755..1e8c247 100644
3519--- a/arch/arm/mach-omap2/gpmc.c
3520+++ b/arch/arm/mach-omap2/gpmc.c
3521@@ -151,7 +151,6 @@ struct omap3_gpmc_regs {
3522 };
3523
3524 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
3525-static struct irq_chip gpmc_irq_chip;
3526 static int gpmc_irq_start;
3527
3528 static struct resource gpmc_mem_root;
3529@@ -736,6 +735,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
3530
3531 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
3532
3533+static struct irq_chip gpmc_irq_chip = {
3534+ .name = "gpmc",
3535+ .irq_startup = gpmc_irq_noop_ret,
3536+ .irq_enable = gpmc_irq_enable,
3537+ .irq_disable = gpmc_irq_disable,
3538+ .irq_shutdown = gpmc_irq_noop,
3539+ .irq_ack = gpmc_irq_noop,
3540+ .irq_mask = gpmc_irq_noop,
3541+ .irq_unmask = gpmc_irq_noop,
3542+
3543+};
3544+
3545 static int gpmc_setup_irq(void)
3546 {
3547 int i;
3548@@ -750,15 +761,6 @@ static int gpmc_setup_irq(void)
3549 return gpmc_irq_start;
3550 }
3551
3552- gpmc_irq_chip.name = "gpmc";
3553- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
3554- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
3555- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
3556- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
3557- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
3558- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
3559- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
3560-
3561 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
3562 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
3563
3564diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3565index 6944ae3..bc587ca 100644
3566--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3567+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3568@@ -86,7 +86,7 @@ struct cpu_pm_ops {
3569 void (*resume)(void);
3570 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3571 void (*hotplug_restart)(void);
3572-};
3573+} __no_const;
3574
3575 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3576 static struct powerdomain *mpuss_pd;
3577@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3578 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3579 {}
3580
3581-struct cpu_pm_ops omap_pm_ops = {
3582+static struct cpu_pm_ops omap_pm_ops __read_only = {
3583 .finish_suspend = default_finish_suspend,
3584 .resume = dummy_cpu_resume,
3585 .scu_prepare = dummy_scu_prepare,
3586diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3587index f961c46..4a453dc 100644
3588--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3589+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3590@@ -344,7 +344,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3591 return NOTIFY_OK;
3592 }
3593
3594-static struct notifier_block __refdata irq_hotplug_notifier = {
3595+static struct notifier_block irq_hotplug_notifier = {
3596 .notifier_call = irq_cpu_hotplug_notify,
3597 };
3598
3599diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3600index 8c58b71..95b655f 100644
3601--- a/arch/arm/mach-omap2/omap_device.c
3602+++ b/arch/arm/mach-omap2/omap_device.c
3603@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3604 struct platform_device __init *omap_device_build(const char *pdev_name,
3605 int pdev_id,
3606 struct omap_hwmod *oh,
3607- void *pdata, int pdata_len)
3608+ const void *pdata, int pdata_len)
3609 {
3610 struct omap_hwmod *ohs[] = { oh };
3611
3612@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3613 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3614 int pdev_id,
3615 struct omap_hwmod **ohs,
3616- int oh_cnt, void *pdata,
3617+ int oh_cnt, const void *pdata,
3618 int pdata_len)
3619 {
3620 int ret = -ENOMEM;
3621diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3622index 78c02b3..c94109a 100644
3623--- a/arch/arm/mach-omap2/omap_device.h
3624+++ b/arch/arm/mach-omap2/omap_device.h
3625@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3626 /* Core code interface */
3627
3628 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3629- struct omap_hwmod *oh, void *pdata,
3630+ struct omap_hwmod *oh, const void *pdata,
3631 int pdata_len);
3632
3633 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3634 struct omap_hwmod **oh, int oh_cnt,
3635- void *pdata, int pdata_len);
3636+ const void *pdata, int pdata_len);
3637
3638 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3639 struct omap_hwmod **ohs, int oh_cnt);
3640diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3641index 716247e..8df346d 100644
3642--- a/arch/arm/mach-omap2/omap_hwmod.c
3643+++ b/arch/arm/mach-omap2/omap_hwmod.c
3644@@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
3645 int (*init_clkdm)(struct omap_hwmod *oh);
3646 void (*update_context_lost)(struct omap_hwmod *oh);
3647 int (*get_context_lost)(struct omap_hwmod *oh);
3648-};
3649+} __no_const;
3650
3651 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3652-static struct omap_hwmod_soc_ops soc_ops;
3653+static struct omap_hwmod_soc_ops soc_ops __read_only;
3654
3655 /* omap_hwmod_list contains all registered struct omap_hwmods */
3656 static LIST_HEAD(omap_hwmod_list);
3657diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3658index 95fee54..cfa9cf1 100644
3659--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3660+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3661@@ -10,6 +10,7 @@
3662
3663 #include <linux/kernel.h>
3664 #include <linux/init.h>
3665+#include <asm/pgtable.h>
3666
3667 #include "powerdomain.h"
3668
3669@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3670
3671 void __init am43xx_powerdomains_init(void)
3672 {
3673- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3674+ pax_open_kernel();
3675+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3676+ pax_close_kernel();
3677 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3678 pwrdm_register_pwrdms(powerdomains_am43xx);
3679 pwrdm_complete_init();
3680diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3681index ff0a68c..b312aa0 100644
3682--- a/arch/arm/mach-omap2/wd_timer.c
3683+++ b/arch/arm/mach-omap2/wd_timer.c
3684@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3685 struct omap_hwmod *oh;
3686 char *oh_name = "wd_timer2";
3687 char *dev_name = "omap_wdt";
3688- struct omap_wd_timer_platform_data pdata;
3689+ static struct omap_wd_timer_platform_data pdata = {
3690+ .read_reset_sources = prm_read_reset_sources
3691+ };
3692
3693 if (!cpu_class_is_omap2() || of_have_populated_dt())
3694 return 0;
3695@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3696 return -EINVAL;
3697 }
3698
3699- pdata.read_reset_sources = prm_read_reset_sources;
3700-
3701 pdev = omap_device_build(dev_name, id, oh, &pdata,
3702 sizeof(struct omap_wd_timer_platform_data));
3703 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3704diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3705index b30bf5c..d0825bf 100644
3706--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3707+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3708@@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3709 bool entered_lp2 = false;
3710
3711 if (tegra_pending_sgi())
3712- ACCESS_ONCE(abort_flag) = true;
3713+ ACCESS_ONCE_RW(abort_flag) = true;
3714
3715 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3716
3717diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3718index 2dea8b5..6499da2 100644
3719--- a/arch/arm/mach-ux500/setup.h
3720+++ b/arch/arm/mach-ux500/setup.h
3721@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3722 .type = MT_DEVICE, \
3723 }
3724
3725-#define __MEM_DEV_DESC(x, sz) { \
3726- .virtual = IO_ADDRESS(x), \
3727- .pfn = __phys_to_pfn(x), \
3728- .length = sz, \
3729- .type = MT_MEMORY_RWX, \
3730-}
3731-
3732 extern struct smp_operations ux500_smp_ops;
3733 extern void ux500_cpu_die(unsigned int cpu);
3734
3735diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3736index 7eb94e6..799ad3e 100644
3737--- a/arch/arm/mm/Kconfig
3738+++ b/arch/arm/mm/Kconfig
3739@@ -446,6 +446,7 @@ config CPU_32v5
3740
3741 config CPU_32v6
3742 bool
3743+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3744 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3745
3746 config CPU_32v6K
3747@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3748
3749 config CPU_USE_DOMAINS
3750 bool
3751+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3752 help
3753 This option enables or disables the use of domain switching
3754 via the set_fs() function.
3755@@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3756
3757 config KUSER_HELPERS
3758 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3759- depends on MMU
3760+ depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3761 default y
3762 help
3763 Warning: disabling this option may break user programs.
3764@@ -812,7 +814,7 @@ config KUSER_HELPERS
3765 See Documentation/arm/kernel_user_helpers.txt for details.
3766
3767 However, the fixed address nature of these helpers can be used
3768- by ROP (return orientated programming) authors when creating
3769+ by ROP (Return Oriented Programming) authors when creating
3770 exploits.
3771
3772 If all of the binaries and libraries which run on your platform
3773diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3774index 83792f4..c25d36b 100644
3775--- a/arch/arm/mm/alignment.c
3776+++ b/arch/arm/mm/alignment.c
3777@@ -216,10 +216,12 @@ union offset_union {
3778 #define __get16_unaligned_check(ins,val,addr) \
3779 do { \
3780 unsigned int err = 0, v, a = addr; \
3781+ pax_open_userland(); \
3782 __get8_unaligned_check(ins,v,a,err); \
3783 val = v << ((BE) ? 8 : 0); \
3784 __get8_unaligned_check(ins,v,a,err); \
3785 val |= v << ((BE) ? 0 : 8); \
3786+ pax_close_userland(); \
3787 if (err) \
3788 goto fault; \
3789 } while (0)
3790@@ -233,6 +235,7 @@ union offset_union {
3791 #define __get32_unaligned_check(ins,val,addr) \
3792 do { \
3793 unsigned int err = 0, v, a = addr; \
3794+ pax_open_userland(); \
3795 __get8_unaligned_check(ins,v,a,err); \
3796 val = v << ((BE) ? 24 : 0); \
3797 __get8_unaligned_check(ins,v,a,err); \
3798@@ -241,6 +244,7 @@ union offset_union {
3799 val |= v << ((BE) ? 8 : 16); \
3800 __get8_unaligned_check(ins,v,a,err); \
3801 val |= v << ((BE) ? 0 : 24); \
3802+ pax_close_userland(); \
3803 if (err) \
3804 goto fault; \
3805 } while (0)
3806@@ -254,6 +258,7 @@ union offset_union {
3807 #define __put16_unaligned_check(ins,val,addr) \
3808 do { \
3809 unsigned int err = 0, v = val, a = addr; \
3810+ pax_open_userland(); \
3811 __asm__( FIRST_BYTE_16 \
3812 ARM( "1: "ins" %1, [%2], #1\n" ) \
3813 THUMB( "1: "ins" %1, [%2]\n" ) \
3814@@ -273,6 +278,7 @@ union offset_union {
3815 " .popsection\n" \
3816 : "=r" (err), "=&r" (v), "=&r" (a) \
3817 : "0" (err), "1" (v), "2" (a)); \
3818+ pax_close_userland(); \
3819 if (err) \
3820 goto fault; \
3821 } while (0)
3822@@ -286,6 +292,7 @@ union offset_union {
3823 #define __put32_unaligned_check(ins,val,addr) \
3824 do { \
3825 unsigned int err = 0, v = val, a = addr; \
3826+ pax_open_userland(); \
3827 __asm__( FIRST_BYTE_32 \
3828 ARM( "1: "ins" %1, [%2], #1\n" ) \
3829 THUMB( "1: "ins" %1, [%2]\n" ) \
3830@@ -315,6 +322,7 @@ union offset_union {
3831 " .popsection\n" \
3832 : "=r" (err), "=&r" (v), "=&r" (a) \
3833 : "0" (err), "1" (v), "2" (a)); \
3834+ pax_close_userland(); \
3835 if (err) \
3836 goto fault; \
3837 } while (0)
3838diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3839index 5e65ca8..879e7b3 100644
3840--- a/arch/arm/mm/cache-l2x0.c
3841+++ b/arch/arm/mm/cache-l2x0.c
3842@@ -42,7 +42,7 @@ struct l2c_init_data {
3843 void (*fixup)(void __iomem *, u32, struct outer_cache_fns *);
3844 void (*save)(void __iomem *);
3845 struct outer_cache_fns outer_cache;
3846-};
3847+} __do_const;
3848
3849 #define CACHE_LINE_SIZE 32
3850
3851diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3852index 6eb97b3..ac509f6 100644
3853--- a/arch/arm/mm/context.c
3854+++ b/arch/arm/mm/context.c
3855@@ -43,7 +43,7 @@
3856 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3857
3858 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3859-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3860+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3861 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3862
3863 static DEFINE_PER_CPU(atomic64_t, active_asids);
3864@@ -182,7 +182,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3865 {
3866 static u32 cur_idx = 1;
3867 u64 asid = atomic64_read(&mm->context.id);
3868- u64 generation = atomic64_read(&asid_generation);
3869+ u64 generation = atomic64_read_unchecked(&asid_generation);
3870
3871 if (asid != 0 && is_reserved_asid(asid)) {
3872 /*
3873@@ -203,7 +203,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3874 */
3875 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3876 if (asid == NUM_USER_ASIDS) {
3877- generation = atomic64_add_return(ASID_FIRST_VERSION,
3878+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3879 &asid_generation);
3880 flush_context(cpu);
3881 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3882@@ -234,14 +234,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3883 cpu_set_reserved_ttbr0();
3884
3885 asid = atomic64_read(&mm->context.id);
3886- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3887+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3888 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3889 goto switch_mm_fastpath;
3890
3891 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3892 /* Check that our ASID belongs to the current generation. */
3893 asid = atomic64_read(&mm->context.id);
3894- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3895+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3896 asid = new_context(mm, cpu);
3897 atomic64_set(&mm->context.id, asid);
3898 }
3899diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3900index eb8830a..e8ff52e 100644
3901--- a/arch/arm/mm/fault.c
3902+++ b/arch/arm/mm/fault.c
3903@@ -25,6 +25,7 @@
3904 #include <asm/system_misc.h>
3905 #include <asm/system_info.h>
3906 #include <asm/tlbflush.h>
3907+#include <asm/sections.h>
3908
3909 #include "fault.h"
3910
3911@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3912 if (fixup_exception(regs))
3913 return;
3914
3915+#ifdef CONFIG_PAX_MEMORY_UDEREF
3916+ if (addr < TASK_SIZE) {
3917+ if (current->signal->curr_ip)
3918+ 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),
3919+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3920+ else
3921+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3922+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3923+ }
3924+#endif
3925+
3926+#ifdef CONFIG_PAX_KERNEXEC
3927+ if ((fsr & FSR_WRITE) &&
3928+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3929+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3930+ {
3931+ if (current->signal->curr_ip)
3932+ 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),
3933+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3934+ else
3935+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3936+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3937+ }
3938+#endif
3939+
3940 /*
3941 * No handler, we'll have to terminate things with extreme prejudice.
3942 */
3943@@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3944 }
3945 #endif
3946
3947+#ifdef CONFIG_PAX_PAGEEXEC
3948+ if (fsr & FSR_LNX_PF) {
3949+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3950+ do_group_exit(SIGKILL);
3951+ }
3952+#endif
3953+
3954 tsk->thread.address = addr;
3955 tsk->thread.error_code = fsr;
3956 tsk->thread.trap_no = 14;
3957@@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3958 }
3959 #endif /* CONFIG_MMU */
3960
3961+#ifdef CONFIG_PAX_PAGEEXEC
3962+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3963+{
3964+ long i;
3965+
3966+ printk(KERN_ERR "PAX: bytes at PC: ");
3967+ for (i = 0; i < 20; i++) {
3968+ unsigned char c;
3969+ if (get_user(c, (__force unsigned char __user *)pc+i))
3970+ printk(KERN_CONT "?? ");
3971+ else
3972+ printk(KERN_CONT "%02x ", c);
3973+ }
3974+ printk("\n");
3975+
3976+ printk(KERN_ERR "PAX: bytes at SP-4: ");
3977+ for (i = -1; i < 20; i++) {
3978+ unsigned long c;
3979+ if (get_user(c, (__force unsigned long __user *)sp+i))
3980+ printk(KERN_CONT "???????? ");
3981+ else
3982+ printk(KERN_CONT "%08lx ", c);
3983+ }
3984+ printk("\n");
3985+}
3986+#endif
3987+
3988 /*
3989 * First Level Translation Fault Handler
3990 *
3991@@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3992 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
3993 struct siginfo info;
3994
3995+#ifdef CONFIG_PAX_MEMORY_UDEREF
3996+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
3997+ if (current->signal->curr_ip)
3998+ 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),
3999+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4000+ else
4001+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
4002+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
4003+ goto die;
4004+ }
4005+#endif
4006+
4007 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4008 return;
4009
4010+die:
4011 printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4012 inf->name, fsr, addr);
4013
4014@@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4015 ifsr_info[nr].name = name;
4016 }
4017
4018+asmlinkage int sys_sigreturn(struct pt_regs *regs);
4019+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4020+
4021 asmlinkage void __exception
4022 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4023 {
4024 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4025 struct siginfo info;
4026+ unsigned long pc = instruction_pointer(regs);
4027+
4028+ if (user_mode(regs)) {
4029+ unsigned long sigpage = current->mm->context.sigpage;
4030+
4031+ if (sigpage <= pc && pc < sigpage + 7*4) {
4032+ if (pc < sigpage + 3*4)
4033+ sys_sigreturn(regs);
4034+ else
4035+ sys_rt_sigreturn(regs);
4036+ return;
4037+ }
4038+ if (pc == 0xffff0f60UL) {
4039+ /*
4040+ * PaX: __kuser_cmpxchg64 emulation
4041+ */
4042+ // TODO
4043+ //regs->ARM_pc = regs->ARM_lr;
4044+ //return;
4045+ }
4046+ if (pc == 0xffff0fa0UL) {
4047+ /*
4048+ * PaX: __kuser_memory_barrier emulation
4049+ */
4050+ // dmb(); implied by the exception
4051+ regs->ARM_pc = regs->ARM_lr;
4052+ return;
4053+ }
4054+ if (pc == 0xffff0fc0UL) {
4055+ /*
4056+ * PaX: __kuser_cmpxchg emulation
4057+ */
4058+ // TODO
4059+ //long new;
4060+ //int op;
4061+
4062+ //op = FUTEX_OP_SET << 28;
4063+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4064+ //regs->ARM_r0 = old != new;
4065+ //regs->ARM_pc = regs->ARM_lr;
4066+ //return;
4067+ }
4068+ if (pc == 0xffff0fe0UL) {
4069+ /*
4070+ * PaX: __kuser_get_tls emulation
4071+ */
4072+ regs->ARM_r0 = current_thread_info()->tp_value[0];
4073+ regs->ARM_pc = regs->ARM_lr;
4074+ return;
4075+ }
4076+ }
4077+
4078+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4079+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4080+ if (current->signal->curr_ip)
4081+ 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),
4082+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4083+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4084+ else
4085+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4086+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4087+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4088+ goto die;
4089+ }
4090+#endif
4091+
4092+#ifdef CONFIG_PAX_REFCOUNT
4093+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4094+#ifdef CONFIG_THUMB2_KERNEL
4095+ unsigned short bkpt;
4096+
4097+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4098+#else
4099+ unsigned int bkpt;
4100+
4101+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4102+#endif
4103+ current->thread.error_code = ifsr;
4104+ current->thread.trap_no = 0;
4105+ pax_report_refcount_overflow(regs);
4106+ fixup_exception(regs);
4107+ return;
4108+ }
4109+ }
4110+#endif
4111
4112 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4113 return;
4114
4115+die:
4116 printk(KERN_ALERT "Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4117 inf->name, ifsr, addr);
4118
4119diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4120index cf08bdf..772656c 100644
4121--- a/arch/arm/mm/fault.h
4122+++ b/arch/arm/mm/fault.h
4123@@ -3,6 +3,7 @@
4124
4125 /*
4126 * Fault status register encodings. We steal bit 31 for our own purposes.
4127+ * Set when the FSR value is from an instruction fault.
4128 */
4129 #define FSR_LNX_PF (1 << 31)
4130 #define FSR_WRITE (1 << 11)
4131@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4132 }
4133 #endif
4134
4135+/* valid for LPAE and !LPAE */
4136+static inline int is_xn_fault(unsigned int fsr)
4137+{
4138+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4139+}
4140+
4141+static inline int is_domain_fault(unsigned int fsr)
4142+{
4143+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4144+}
4145+
4146 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4147 unsigned long search_exception_table(unsigned long addr);
4148
4149diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4150index 9481f85..6dae261 100644
4151--- a/arch/arm/mm/init.c
4152+++ b/arch/arm/mm/init.c
4153@@ -31,6 +31,8 @@
4154 #include <asm/setup.h>
4155 #include <asm/tlb.h>
4156 #include <asm/fixmap.h>
4157+#include <asm/system_info.h>
4158+#include <asm/cp15.h>
4159
4160 #include <asm/mach/arch.h>
4161 #include <asm/mach/map.h>
4162@@ -619,7 +621,46 @@ void free_initmem(void)
4163 {
4164 #ifdef CONFIG_HAVE_TCM
4165 extern char __tcm_start, __tcm_end;
4166+#endif
4167
4168+#ifdef CONFIG_PAX_KERNEXEC
4169+ unsigned long addr;
4170+ pgd_t *pgd;
4171+ pud_t *pud;
4172+ pmd_t *pmd;
4173+ int cpu_arch = cpu_architecture();
4174+ unsigned int cr = get_cr();
4175+
4176+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4177+ /* make pages tables, etc before .text NX */
4178+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4179+ pgd = pgd_offset_k(addr);
4180+ pud = pud_offset(pgd, addr);
4181+ pmd = pmd_offset(pud, addr);
4182+ __section_update(pmd, addr, PMD_SECT_XN);
4183+ }
4184+ /* make init NX */
4185+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4186+ pgd = pgd_offset_k(addr);
4187+ pud = pud_offset(pgd, addr);
4188+ pmd = pmd_offset(pud, addr);
4189+ __section_update(pmd, addr, PMD_SECT_XN);
4190+ }
4191+ /* make kernel code/rodata RX */
4192+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4193+ pgd = pgd_offset_k(addr);
4194+ pud = pud_offset(pgd, addr);
4195+ pmd = pmd_offset(pud, addr);
4196+#ifdef CONFIG_ARM_LPAE
4197+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4198+#else
4199+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4200+#endif
4201+ }
4202+ }
4203+#endif
4204+
4205+#ifdef CONFIG_HAVE_TCM
4206 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4207 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4208 #endif
4209diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4210index d1e5ad7..84dcbf2 100644
4211--- a/arch/arm/mm/ioremap.c
4212+++ b/arch/arm/mm/ioremap.c
4213@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4214 unsigned int mtype;
4215
4216 if (cached)
4217- mtype = MT_MEMORY_RWX;
4218+ mtype = MT_MEMORY_RX;
4219 else
4220- mtype = MT_MEMORY_RWX_NONCACHED;
4221+ mtype = MT_MEMORY_RX_NONCACHED;
4222
4223 return __arm_ioremap_caller(phys_addr, size, mtype,
4224 __builtin_return_address(0));
4225diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4226index 5e85ed3..b10a7ed 100644
4227--- a/arch/arm/mm/mmap.c
4228+++ b/arch/arm/mm/mmap.c
4229@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4230 struct vm_area_struct *vma;
4231 int do_align = 0;
4232 int aliasing = cache_is_vipt_aliasing();
4233+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4234 struct vm_unmapped_area_info info;
4235
4236 /*
4237@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4238 if (len > TASK_SIZE)
4239 return -ENOMEM;
4240
4241+#ifdef CONFIG_PAX_RANDMMAP
4242+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4243+#endif
4244+
4245 if (addr) {
4246 if (do_align)
4247 addr = COLOUR_ALIGN(addr, pgoff);
4248@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4249 addr = PAGE_ALIGN(addr);
4250
4251 vma = find_vma(mm, addr);
4252- if (TASK_SIZE - len >= addr &&
4253- (!vma || addr + len <= vma->vm_start))
4254+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4255 return addr;
4256 }
4257
4258@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4259 info.high_limit = TASK_SIZE;
4260 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4261 info.align_offset = pgoff << PAGE_SHIFT;
4262+ info.threadstack_offset = offset;
4263 return vm_unmapped_area(&info);
4264 }
4265
4266@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4267 unsigned long addr = addr0;
4268 int do_align = 0;
4269 int aliasing = cache_is_vipt_aliasing();
4270+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4271 struct vm_unmapped_area_info info;
4272
4273 /*
4274@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4275 return addr;
4276 }
4277
4278+#ifdef CONFIG_PAX_RANDMMAP
4279+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4280+#endif
4281+
4282 /* requesting a specific address */
4283 if (addr) {
4284 if (do_align)
4285@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4286 else
4287 addr = PAGE_ALIGN(addr);
4288 vma = find_vma(mm, addr);
4289- if (TASK_SIZE - len >= addr &&
4290- (!vma || addr + len <= vma->vm_start))
4291+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4292 return addr;
4293 }
4294
4295@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4296 info.high_limit = mm->mmap_base;
4297 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4298 info.align_offset = pgoff << PAGE_SHIFT;
4299+ info.threadstack_offset = offset;
4300 addr = vm_unmapped_area(&info);
4301
4302 /*
4303@@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4304 {
4305 unsigned long random_factor = 0UL;
4306
4307+#ifdef CONFIG_PAX_RANDMMAP
4308+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4309+#endif
4310+
4311 /* 8 bits of randomness in 20 address space bits */
4312 if ((current->flags & PF_RANDOMIZE) &&
4313 !(current->personality & ADDR_NO_RANDOMIZE))
4314@@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4315
4316 if (mmap_is_legacy()) {
4317 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4318+
4319+#ifdef CONFIG_PAX_RANDMMAP
4320+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4321+ mm->mmap_base += mm->delta_mmap;
4322+#endif
4323+
4324 mm->get_unmapped_area = arch_get_unmapped_area;
4325 } else {
4326 mm->mmap_base = mmap_base(random_factor);
4327+
4328+#ifdef CONFIG_PAX_RANDMMAP
4329+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4330+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4331+#endif
4332+
4333 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4334 }
4335 }
4336diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4337index 9f98cec..115fcb6 100644
4338--- a/arch/arm/mm/mmu.c
4339+++ b/arch/arm/mm/mmu.c
4340@@ -40,6 +40,22 @@
4341 #include "mm.h"
4342 #include "tcm.h"
4343
4344+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4345+void modify_domain(unsigned int dom, unsigned int type)
4346+{
4347+ struct thread_info *thread = current_thread_info();
4348+ unsigned int domain = thread->cpu_domain;
4349+ /*
4350+ * DOMAIN_MANAGER might be defined to some other value,
4351+ * use the arch-defined constant
4352+ */
4353+ domain &= ~domain_val(dom, 3);
4354+ thread->cpu_domain = domain | domain_val(dom, type);
4355+ set_domain(thread->cpu_domain);
4356+}
4357+EXPORT_SYMBOL(modify_domain);
4358+#endif
4359+
4360 /*
4361 * empty_zero_page is a special page that is used for
4362 * zero-initialized data and COW.
4363@@ -239,7 +255,15 @@ __setup("noalign", noalign_setup);
4364 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4365 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4366
4367-static struct mem_type mem_types[] = {
4368+#ifdef CONFIG_PAX_KERNEXEC
4369+#define L_PTE_KERNEXEC L_PTE_RDONLY
4370+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4371+#else
4372+#define L_PTE_KERNEXEC L_PTE_DIRTY
4373+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4374+#endif
4375+
4376+static struct mem_type mem_types[] __read_only = {
4377 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4378 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4379 L_PTE_SHARED,
4380@@ -268,19 +292,19 @@ static struct mem_type mem_types[] = {
4381 .prot_sect = PROT_SECT_DEVICE,
4382 .domain = DOMAIN_IO,
4383 },
4384- [MT_UNCACHED] = {
4385+ [MT_UNCACHED_RW] = {
4386 .prot_pte = PROT_PTE_DEVICE,
4387 .prot_l1 = PMD_TYPE_TABLE,
4388 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4389 .domain = DOMAIN_IO,
4390 },
4391- [MT_CACHECLEAN] = {
4392- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4393+ [MT_CACHECLEAN_RO] = {
4394+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4395 .domain = DOMAIN_KERNEL,
4396 },
4397 #ifndef CONFIG_ARM_LPAE
4398- [MT_MINICLEAN] = {
4399- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4400+ [MT_MINICLEAN_RO] = {
4401+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4402 .domain = DOMAIN_KERNEL,
4403 },
4404 #endif
4405@@ -288,15 +312,15 @@ static struct mem_type mem_types[] = {
4406 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4407 L_PTE_RDONLY,
4408 .prot_l1 = PMD_TYPE_TABLE,
4409- .domain = DOMAIN_USER,
4410+ .domain = DOMAIN_VECTORS,
4411 },
4412 [MT_HIGH_VECTORS] = {
4413 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4414 L_PTE_USER | L_PTE_RDONLY,
4415 .prot_l1 = PMD_TYPE_TABLE,
4416- .domain = DOMAIN_USER,
4417+ .domain = DOMAIN_VECTORS,
4418 },
4419- [MT_MEMORY_RWX] = {
4420+ [__MT_MEMORY_RWX] = {
4421 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4422 .prot_l1 = PMD_TYPE_TABLE,
4423 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4424@@ -309,17 +333,30 @@ static struct mem_type mem_types[] = {
4425 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4426 .domain = DOMAIN_KERNEL,
4427 },
4428- [MT_ROM] = {
4429- .prot_sect = PMD_TYPE_SECT,
4430+ [MT_MEMORY_RX] = {
4431+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4432+ .prot_l1 = PMD_TYPE_TABLE,
4433+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4434+ .domain = DOMAIN_KERNEL,
4435+ },
4436+ [MT_ROM_RX] = {
4437+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4438 .domain = DOMAIN_KERNEL,
4439 },
4440- [MT_MEMORY_RWX_NONCACHED] = {
4441+ [MT_MEMORY_RW_NONCACHED] = {
4442 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4443 L_PTE_MT_BUFFERABLE,
4444 .prot_l1 = PMD_TYPE_TABLE,
4445 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4446 .domain = DOMAIN_KERNEL,
4447 },
4448+ [MT_MEMORY_RX_NONCACHED] = {
4449+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4450+ L_PTE_MT_BUFFERABLE,
4451+ .prot_l1 = PMD_TYPE_TABLE,
4452+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4453+ .domain = DOMAIN_KERNEL,
4454+ },
4455 [MT_MEMORY_RW_DTCM] = {
4456 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4457 L_PTE_XN,
4458@@ -327,9 +364,10 @@ static struct mem_type mem_types[] = {
4459 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4460 .domain = DOMAIN_KERNEL,
4461 },
4462- [MT_MEMORY_RWX_ITCM] = {
4463- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4464+ [MT_MEMORY_RX_ITCM] = {
4465+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4466 .prot_l1 = PMD_TYPE_TABLE,
4467+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4468 .domain = DOMAIN_KERNEL,
4469 },
4470 [MT_MEMORY_RW_SO] = {
4471@@ -547,9 +585,14 @@ static void __init build_mem_type_table(void)
4472 * Mark cache clean areas and XIP ROM read only
4473 * from SVC mode and no access from userspace.
4474 */
4475- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4476- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4477- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4478+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4479+#ifdef CONFIG_PAX_KERNEXEC
4480+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4481+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4482+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4483+#endif
4484+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4485+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4486 #endif
4487
4488 /*
4489@@ -566,13 +609,17 @@ static void __init build_mem_type_table(void)
4490 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4491 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4492 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4493- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4494- mem_types[MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4495+ mem_types[__MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4496+ mem_types[__MT_MEMORY_RWX].prot_pte |= L_PTE_SHARED;
4497 mem_types[MT_MEMORY_RW].prot_sect |= PMD_SECT_S;
4498 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4499+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4500+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4501 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4502- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4503- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4504+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4505+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4506+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4507+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4508 }
4509 }
4510
4511@@ -583,15 +630,20 @@ static void __init build_mem_type_table(void)
4512 if (cpu_arch >= CPU_ARCH_ARMv6) {
4513 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4514 /* Non-cacheable Normal is XCB = 001 */
4515- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4516+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4517+ PMD_SECT_BUFFERED;
4518+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4519 PMD_SECT_BUFFERED;
4520 } else {
4521 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4522- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4523+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4524+ PMD_SECT_TEX(1);
4525+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4526 PMD_SECT_TEX(1);
4527 }
4528 } else {
4529- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4530+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4531+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4532 }
4533
4534 #ifdef CONFIG_ARM_LPAE
4535@@ -607,6 +659,8 @@ static void __init build_mem_type_table(void)
4536 vecs_pgprot |= PTE_EXT_AF;
4537 #endif
4538
4539+ user_pgprot |= __supported_pte_mask;
4540+
4541 for (i = 0; i < 16; i++) {
4542 pteval_t v = pgprot_val(protection_map[i]);
4543 protection_map[i] = __pgprot(v | user_pgprot);
4544@@ -624,21 +678,24 @@ static void __init build_mem_type_table(void)
4545
4546 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4547 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4548- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4549- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4550+ mem_types[__MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4551+ mem_types[__MT_MEMORY_RWX].prot_pte |= kern_pgprot;
4552 mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd;
4553 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4554+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4555+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4556 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4557- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4558- mem_types[MT_ROM].prot_sect |= cp->pmd;
4559+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4560+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4561+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4562
4563 switch (cp->pmd) {
4564 case PMD_SECT_WT:
4565- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4566+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4567 break;
4568 case PMD_SECT_WB:
4569 case PMD_SECT_WBWA:
4570- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4571+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4572 break;
4573 }
4574 pr_info("Memory policy: %sData cache %s\n",
4575@@ -856,7 +913,7 @@ static void __init create_mapping(struct map_desc *md)
4576 return;
4577 }
4578
4579- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4580+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4581 md->virtual >= PAGE_OFFSET &&
4582 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4583 printk(KERN_WARNING "BUG: mapping for 0x%08llx"
4584@@ -1224,18 +1281,15 @@ void __init arm_mm_memblock_reserve(void)
4585 * called function. This means you can't use any function or debugging
4586 * method which may touch any device, otherwise the kernel _will_ crash.
4587 */
4588+
4589+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4590+
4591 static void __init devicemaps_init(const struct machine_desc *mdesc)
4592 {
4593 struct map_desc map;
4594 unsigned long addr;
4595- void *vectors;
4596
4597- /*
4598- * Allocate the vector page early.
4599- */
4600- vectors = early_alloc(PAGE_SIZE * 2);
4601-
4602- early_trap_init(vectors);
4603+ early_trap_init(&vectors);
4604
4605 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4606 pmd_clear(pmd_off_k(addr));
4607@@ -1248,7 +1302,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4608 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4609 map.virtual = MODULES_VADDR;
4610 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4611- map.type = MT_ROM;
4612+ map.type = MT_ROM_RX;
4613 create_mapping(&map);
4614 #endif
4615
4616@@ -1259,14 +1313,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4617 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4618 map.virtual = FLUSH_BASE;
4619 map.length = SZ_1M;
4620- map.type = MT_CACHECLEAN;
4621+ map.type = MT_CACHECLEAN_RO;
4622 create_mapping(&map);
4623 #endif
4624 #ifdef FLUSH_BASE_MINICACHE
4625 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4626 map.virtual = FLUSH_BASE_MINICACHE;
4627 map.length = SZ_1M;
4628- map.type = MT_MINICLEAN;
4629+ map.type = MT_MINICLEAN_RO;
4630 create_mapping(&map);
4631 #endif
4632
4633@@ -1275,7 +1329,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4634 * location (0xffff0000). If we aren't using high-vectors, also
4635 * create a mapping at the low-vectors virtual address.
4636 */
4637- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4638+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4639 map.virtual = 0xffff0000;
4640 map.length = PAGE_SIZE;
4641 #ifdef CONFIG_KUSER_HELPERS
4642@@ -1335,8 +1389,10 @@ static void __init kmap_init(void)
4643 static void __init map_lowmem(void)
4644 {
4645 struct memblock_region *reg;
4646+#ifndef CONFIG_PAX_KERNEXEC
4647 unsigned long kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4648 unsigned long kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4649+#endif
4650
4651 /* Map all the lowmem memory banks. */
4652 for_each_memblock(memory, reg) {
4653@@ -1349,11 +1405,48 @@ static void __init map_lowmem(void)
4654 if (start >= end)
4655 break;
4656
4657+#ifdef CONFIG_PAX_KERNEXEC
4658+ map.pfn = __phys_to_pfn(start);
4659+ map.virtual = __phys_to_virt(start);
4660+ map.length = end - start;
4661+
4662+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4663+ struct map_desc kernel;
4664+ struct map_desc initmap;
4665+
4666+ /* when freeing initmem we will make this RW */
4667+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4668+ initmap.virtual = (unsigned long)__init_begin;
4669+ initmap.length = _sdata - __init_begin;
4670+ initmap.type = __MT_MEMORY_RWX;
4671+ create_mapping(&initmap);
4672+
4673+ /* when freeing initmem we will make this RX */
4674+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4675+ kernel.virtual = (unsigned long)_stext;
4676+ kernel.length = __init_begin - _stext;
4677+ kernel.type = __MT_MEMORY_RWX;
4678+ create_mapping(&kernel);
4679+
4680+ if (map.virtual < (unsigned long)_stext) {
4681+ map.length = (unsigned long)_stext - map.virtual;
4682+ map.type = __MT_MEMORY_RWX;
4683+ create_mapping(&map);
4684+ }
4685+
4686+ map.pfn = __phys_to_pfn(__pa(_sdata));
4687+ map.virtual = (unsigned long)_sdata;
4688+ map.length = end - __pa(_sdata);
4689+ }
4690+
4691+ map.type = MT_MEMORY_RW;
4692+ create_mapping(&map);
4693+#else
4694 if (end < kernel_x_start || start >= kernel_x_end) {
4695 map.pfn = __phys_to_pfn(start);
4696 map.virtual = __phys_to_virt(start);
4697 map.length = end - start;
4698- map.type = MT_MEMORY_RWX;
4699+ map.type = __MT_MEMORY_RWX;
4700
4701 create_mapping(&map);
4702 } else {
4703@@ -1370,7 +1463,7 @@ static void __init map_lowmem(void)
4704 map.pfn = __phys_to_pfn(kernel_x_start);
4705 map.virtual = __phys_to_virt(kernel_x_start);
4706 map.length = kernel_x_end - kernel_x_start;
4707- map.type = MT_MEMORY_RWX;
4708+ map.type = __MT_MEMORY_RWX;
4709
4710 create_mapping(&map);
4711
4712@@ -1383,6 +1476,7 @@ static void __init map_lowmem(void)
4713 create_mapping(&map);
4714 }
4715 }
4716+#endif
4717 }
4718 }
4719
4720diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4721index e1268f9..a9755a7 100644
4722--- a/arch/arm/net/bpf_jit_32.c
4723+++ b/arch/arm/net/bpf_jit_32.c
4724@@ -20,6 +20,7 @@
4725 #include <asm/cacheflush.h>
4726 #include <asm/hwcap.h>
4727 #include <asm/opcodes.h>
4728+#include <asm/pgtable.h>
4729
4730 #include "bpf_jit_32.h"
4731
4732@@ -71,7 +72,11 @@ struct jit_ctx {
4733 #endif
4734 };
4735
4736+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4737+int bpf_jit_enable __read_only;
4738+#else
4739 int bpf_jit_enable __read_mostly;
4740+#endif
4741
4742 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4743 {
4744@@ -178,8 +183,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4745 {
4746 u32 *ptr;
4747 /* We are guaranteed to have aligned memory. */
4748+ pax_open_kernel();
4749 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4750 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4751+ pax_close_kernel();
4752 }
4753
4754 static void build_prologue(struct jit_ctx *ctx)
4755diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4756index 5b217f4..c23f40e 100644
4757--- a/arch/arm/plat-iop/setup.c
4758+++ b/arch/arm/plat-iop/setup.c
4759@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4760 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4761 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4762 .length = IOP3XX_PERIPHERAL_SIZE,
4763- .type = MT_UNCACHED,
4764+ .type = MT_UNCACHED_RW,
4765 },
4766 };
4767
4768diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4769index a5bc92d..0bb4730 100644
4770--- a/arch/arm/plat-omap/sram.c
4771+++ b/arch/arm/plat-omap/sram.c
4772@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4773 * Looks like we need to preserve some bootloader code at the
4774 * beginning of SRAM for jumping to flash for reboot to work...
4775 */
4776+ pax_open_kernel();
4777 memset_io(omap_sram_base + omap_sram_skip, 0,
4778 omap_sram_size - omap_sram_skip);
4779+ pax_close_kernel();
4780 }
4781diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
4782index ce6d763..cfea917 100644
4783--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
4784+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
4785@@ -47,7 +47,7 @@ struct samsung_dma_ops {
4786 int (*started)(unsigned ch);
4787 int (*flush)(unsigned ch);
4788 int (*stop)(unsigned ch);
4789-};
4790+} __no_const;
4791
4792 extern void *samsung_dmadev_get_ops(void);
4793 extern void *s3c_dma_get_ops(void);
4794diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4795index 6389d60..b5d3bdd 100644
4796--- a/arch/arm64/include/asm/barrier.h
4797+++ b/arch/arm64/include/asm/barrier.h
4798@@ -41,7 +41,7 @@
4799 do { \
4800 compiletime_assert_atomic_type(*p); \
4801 barrier(); \
4802- ACCESS_ONCE(*p) = (v); \
4803+ ACCESS_ONCE_RW(*p) = (v); \
4804 } while (0)
4805
4806 #define smp_load_acquire(p) \
4807diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4808index 3bf8f4e..5dd5491 100644
4809--- a/arch/arm64/include/asm/uaccess.h
4810+++ b/arch/arm64/include/asm/uaccess.h
4811@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4812 flag; \
4813 })
4814
4815+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4816 #define access_ok(type, addr, size) __range_ok(addr, size)
4817 #define user_addr_max get_fs
4818
4819diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4820index c3a58a1..78fbf54 100644
4821--- a/arch/avr32/include/asm/cache.h
4822+++ b/arch/avr32/include/asm/cache.h
4823@@ -1,8 +1,10 @@
4824 #ifndef __ASM_AVR32_CACHE_H
4825 #define __ASM_AVR32_CACHE_H
4826
4827+#include <linux/const.h>
4828+
4829 #define L1_CACHE_SHIFT 5
4830-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4831+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4832
4833 /*
4834 * Memory returned by kmalloc() may be used for DMA, so we must make
4835diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4836index d232888..87c8df1 100644
4837--- a/arch/avr32/include/asm/elf.h
4838+++ b/arch/avr32/include/asm/elf.h
4839@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4840 the loader. We need to make sure that it is out of the way of the program
4841 that it will "exec", and that there is sufficient room for the brk. */
4842
4843-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4844+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4845
4846+#ifdef CONFIG_PAX_ASLR
4847+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4848+
4849+#define PAX_DELTA_MMAP_LEN 15
4850+#define PAX_DELTA_STACK_LEN 15
4851+#endif
4852
4853 /* This yields a mask that user programs can use to figure out what
4854 instruction set this CPU supports. This could be done in user space,
4855diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4856index 479330b..53717a8 100644
4857--- a/arch/avr32/include/asm/kmap_types.h
4858+++ b/arch/avr32/include/asm/kmap_types.h
4859@@ -2,9 +2,9 @@
4860 #define __ASM_AVR32_KMAP_TYPES_H
4861
4862 #ifdef CONFIG_DEBUG_HIGHMEM
4863-# define KM_TYPE_NR 29
4864+# define KM_TYPE_NR 30
4865 #else
4866-# define KM_TYPE_NR 14
4867+# define KM_TYPE_NR 15
4868 #endif
4869
4870 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4871diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4872index 0eca933..eb78c7b 100644
4873--- a/arch/avr32/mm/fault.c
4874+++ b/arch/avr32/mm/fault.c
4875@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4876
4877 int exception_trace = 1;
4878
4879+#ifdef CONFIG_PAX_PAGEEXEC
4880+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4881+{
4882+ unsigned long i;
4883+
4884+ printk(KERN_ERR "PAX: bytes at PC: ");
4885+ for (i = 0; i < 20; i++) {
4886+ unsigned char c;
4887+ if (get_user(c, (unsigned char *)pc+i))
4888+ printk(KERN_CONT "???????? ");
4889+ else
4890+ printk(KERN_CONT "%02x ", c);
4891+ }
4892+ printk("\n");
4893+}
4894+#endif
4895+
4896 /*
4897 * This routine handles page faults. It determines the address and the
4898 * problem, and then passes it off to one of the appropriate routines.
4899@@ -176,6 +193,16 @@ bad_area:
4900 up_read(&mm->mmap_sem);
4901
4902 if (user_mode(regs)) {
4903+
4904+#ifdef CONFIG_PAX_PAGEEXEC
4905+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4906+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4907+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4908+ do_group_exit(SIGKILL);
4909+ }
4910+ }
4911+#endif
4912+
4913 if (exception_trace && printk_ratelimit())
4914 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4915 "sp %08lx ecr %lu\n",
4916diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4917index 568885a..f8008df 100644
4918--- a/arch/blackfin/include/asm/cache.h
4919+++ b/arch/blackfin/include/asm/cache.h
4920@@ -7,6 +7,7 @@
4921 #ifndef __ARCH_BLACKFIN_CACHE_H
4922 #define __ARCH_BLACKFIN_CACHE_H
4923
4924+#include <linux/const.h>
4925 #include <linux/linkage.h> /* for asmlinkage */
4926
4927 /*
4928@@ -14,7 +15,7 @@
4929 * Blackfin loads 32 bytes for cache
4930 */
4931 #define L1_CACHE_SHIFT 5
4932-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4933+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4934 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4935
4936 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4937diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4938index aea2718..3639a60 100644
4939--- a/arch/cris/include/arch-v10/arch/cache.h
4940+++ b/arch/cris/include/arch-v10/arch/cache.h
4941@@ -1,8 +1,9 @@
4942 #ifndef _ASM_ARCH_CACHE_H
4943 #define _ASM_ARCH_CACHE_H
4944
4945+#include <linux/const.h>
4946 /* Etrax 100LX have 32-byte cache-lines. */
4947-#define L1_CACHE_BYTES 32
4948 #define L1_CACHE_SHIFT 5
4949+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4950
4951 #endif /* _ASM_ARCH_CACHE_H */
4952diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
4953index 7caf25d..ee65ac5 100644
4954--- a/arch/cris/include/arch-v32/arch/cache.h
4955+++ b/arch/cris/include/arch-v32/arch/cache.h
4956@@ -1,11 +1,12 @@
4957 #ifndef _ASM_CRIS_ARCH_CACHE_H
4958 #define _ASM_CRIS_ARCH_CACHE_H
4959
4960+#include <linux/const.h>
4961 #include <arch/hwregs/dma.h>
4962
4963 /* A cache-line is 32 bytes. */
4964-#define L1_CACHE_BYTES 32
4965 #define L1_CACHE_SHIFT 5
4966+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4967
4968 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4969
4970diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
4971index 102190a..5334cea 100644
4972--- a/arch/frv/include/asm/atomic.h
4973+++ b/arch/frv/include/asm/atomic.h
4974@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
4975 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
4976 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
4977
4978+#define atomic64_read_unchecked(v) atomic64_read(v)
4979+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4980+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4981+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4982+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4983+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4984+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4985+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4986+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4987+
4988 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
4989 {
4990 int c, old;
4991diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
4992index 2797163..c2a401df9 100644
4993--- a/arch/frv/include/asm/cache.h
4994+++ b/arch/frv/include/asm/cache.h
4995@@ -12,10 +12,11 @@
4996 #ifndef __ASM_CACHE_H
4997 #define __ASM_CACHE_H
4998
4999+#include <linux/const.h>
5000
5001 /* bytes per L1 cache line */
5002 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5003-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5004+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5005
5006 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5007 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5008diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5009index 43901f2..0d8b865 100644
5010--- a/arch/frv/include/asm/kmap_types.h
5011+++ b/arch/frv/include/asm/kmap_types.h
5012@@ -2,6 +2,6 @@
5013 #ifndef _ASM_KMAP_TYPES_H
5014 #define _ASM_KMAP_TYPES_H
5015
5016-#define KM_TYPE_NR 17
5017+#define KM_TYPE_NR 18
5018
5019 #endif
5020diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5021index 836f147..4cf23f5 100644
5022--- a/arch/frv/mm/elf-fdpic.c
5023+++ b/arch/frv/mm/elf-fdpic.c
5024@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5025 {
5026 struct vm_area_struct *vma;
5027 struct vm_unmapped_area_info info;
5028+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5029
5030 if (len > TASK_SIZE)
5031 return -ENOMEM;
5032@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5033 if (addr) {
5034 addr = PAGE_ALIGN(addr);
5035 vma = find_vma(current->mm, addr);
5036- if (TASK_SIZE - len >= addr &&
5037- (!vma || addr + len <= vma->vm_start))
5038+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5039 goto success;
5040 }
5041
5042@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5043 info.high_limit = (current->mm->start_stack - 0x00200000);
5044 info.align_mask = 0;
5045 info.align_offset = 0;
5046+ info.threadstack_offset = offset;
5047 addr = vm_unmapped_area(&info);
5048 if (!(addr & ~PAGE_MASK))
5049 goto success;
5050diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5051index 2635117..fa223cb 100644
5052--- a/arch/hexagon/include/asm/cache.h
5053+++ b/arch/hexagon/include/asm/cache.h
5054@@ -21,9 +21,11 @@
5055 #ifndef __ASM_CACHE_H
5056 #define __ASM_CACHE_H
5057
5058+#include <linux/const.h>
5059+
5060 /* Bytes per L1 cache line */
5061-#define L1_CACHE_SHIFT (5)
5062-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5063+#define L1_CACHE_SHIFT 5
5064+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5065
5066 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
5067 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
5068diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5069index c84c88b..2a6e1ba 100644
5070--- a/arch/ia64/Kconfig
5071+++ b/arch/ia64/Kconfig
5072@@ -549,6 +549,7 @@ source "drivers/sn/Kconfig"
5073 config KEXEC
5074 bool "kexec system call"
5075 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5076+ depends on !GRKERNSEC_KMEM
5077 help
5078 kexec is a system call that implements the ability to shutdown your
5079 current kernel, and to start another kernel. It is like a reboot
5080diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5081index 5441b14..039a446 100644
5082--- a/arch/ia64/Makefile
5083+++ b/arch/ia64/Makefile
5084@@ -99,5 +99,6 @@ endef
5085 archprepare: make_nr_irqs_h FORCE
5086 PHONY += make_nr_irqs_h FORCE
5087
5088+make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5089 make_nr_irqs_h: FORCE
5090 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5091diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5092index 0bf0350..2ad1957 100644
5093--- a/arch/ia64/include/asm/atomic.h
5094+++ b/arch/ia64/include/asm/atomic.h
5095@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5096 #define atomic64_inc(v) atomic64_add(1, (v))
5097 #define atomic64_dec(v) atomic64_sub(1, (v))
5098
5099+#define atomic64_read_unchecked(v) atomic64_read(v)
5100+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5101+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5102+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5103+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5104+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5105+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5106+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5107+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5108+
5109 #endif /* _ASM_IA64_ATOMIC_H */
5110diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5111index a48957c..e097b56 100644
5112--- a/arch/ia64/include/asm/barrier.h
5113+++ b/arch/ia64/include/asm/barrier.h
5114@@ -67,7 +67,7 @@
5115 do { \
5116 compiletime_assert_atomic_type(*p); \
5117 barrier(); \
5118- ACCESS_ONCE(*p) = (v); \
5119+ ACCESS_ONCE_RW(*p) = (v); \
5120 } while (0)
5121
5122 #define smp_load_acquire(p) \
5123diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5124index 988254a..e1ee885 100644
5125--- a/arch/ia64/include/asm/cache.h
5126+++ b/arch/ia64/include/asm/cache.h
5127@@ -1,6 +1,7 @@
5128 #ifndef _ASM_IA64_CACHE_H
5129 #define _ASM_IA64_CACHE_H
5130
5131+#include <linux/const.h>
5132
5133 /*
5134 * Copyright (C) 1998-2000 Hewlett-Packard Co
5135@@ -9,7 +10,7 @@
5136
5137 /* Bytes per L1 (data) cache line. */
5138 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5139-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5140+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5141
5142 #ifdef CONFIG_SMP
5143 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5144diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5145index 5a83c5c..4d7f553 100644
5146--- a/arch/ia64/include/asm/elf.h
5147+++ b/arch/ia64/include/asm/elf.h
5148@@ -42,6 +42,13 @@
5149 */
5150 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5151
5152+#ifdef CONFIG_PAX_ASLR
5153+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5154+
5155+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5156+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5157+#endif
5158+
5159 #define PT_IA_64_UNWIND 0x70000001
5160
5161 /* IA-64 relocations: */
5162diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5163index 5767cdf..7462574 100644
5164--- a/arch/ia64/include/asm/pgalloc.h
5165+++ b/arch/ia64/include/asm/pgalloc.h
5166@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5167 pgd_val(*pgd_entry) = __pa(pud);
5168 }
5169
5170+static inline void
5171+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5172+{
5173+ pgd_populate(mm, pgd_entry, pud);
5174+}
5175+
5176 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5177 {
5178 return quicklist_alloc(0, GFP_KERNEL, NULL);
5179@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5180 pud_val(*pud_entry) = __pa(pmd);
5181 }
5182
5183+static inline void
5184+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5185+{
5186+ pud_populate(mm, pud_entry, pmd);
5187+}
5188+
5189 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5190 {
5191 return quicklist_alloc(0, GFP_KERNEL, NULL);
5192diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5193index 7935115..c0eca6a 100644
5194--- a/arch/ia64/include/asm/pgtable.h
5195+++ b/arch/ia64/include/asm/pgtable.h
5196@@ -12,7 +12,7 @@
5197 * David Mosberger-Tang <davidm@hpl.hp.com>
5198 */
5199
5200-
5201+#include <linux/const.h>
5202 #include <asm/mman.h>
5203 #include <asm/page.h>
5204 #include <asm/processor.h>
5205@@ -142,6 +142,17 @@
5206 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5207 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5208 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5209+
5210+#ifdef CONFIG_PAX_PAGEEXEC
5211+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5212+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5213+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5214+#else
5215+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5216+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5217+# define PAGE_COPY_NOEXEC PAGE_COPY
5218+#endif
5219+
5220 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5221 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5222 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5223diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5224index 45698cd..e8e2dbc 100644
5225--- a/arch/ia64/include/asm/spinlock.h
5226+++ b/arch/ia64/include/asm/spinlock.h
5227@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5228 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5229
5230 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5231- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5232+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5233 }
5234
5235 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5236diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5237index 449c8c0..3d4b1e9 100644
5238--- a/arch/ia64/include/asm/uaccess.h
5239+++ b/arch/ia64/include/asm/uaccess.h
5240@@ -70,6 +70,7 @@
5241 && ((segment).seg == KERNEL_DS.seg \
5242 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5243 })
5244+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5245 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5246
5247 /*
5248@@ -240,12 +241,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5249 static inline unsigned long
5250 __copy_to_user (void __user *to, const void *from, unsigned long count)
5251 {
5252+ if (count > INT_MAX)
5253+ return count;
5254+
5255+ if (!__builtin_constant_p(count))
5256+ check_object_size(from, count, true);
5257+
5258 return __copy_user(to, (__force void __user *) from, count);
5259 }
5260
5261 static inline unsigned long
5262 __copy_from_user (void *to, const void __user *from, unsigned long count)
5263 {
5264+ if (count > INT_MAX)
5265+ return count;
5266+
5267+ if (!__builtin_constant_p(count))
5268+ check_object_size(to, count, false);
5269+
5270 return __copy_user((__force void __user *) to, from, count);
5271 }
5272
5273@@ -255,10 +268,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5274 ({ \
5275 void __user *__cu_to = (to); \
5276 const void *__cu_from = (from); \
5277- long __cu_len = (n); \
5278+ unsigned long __cu_len = (n); \
5279 \
5280- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5281+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5282+ if (!__builtin_constant_p(n)) \
5283+ check_object_size(__cu_from, __cu_len, true); \
5284 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5285+ } \
5286 __cu_len; \
5287 })
5288
5289@@ -266,11 +282,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5290 ({ \
5291 void *__cu_to = (to); \
5292 const void __user *__cu_from = (from); \
5293- long __cu_len = (n); \
5294+ unsigned long __cu_len = (n); \
5295 \
5296 __chk_user_ptr(__cu_from); \
5297- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5298+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5299+ if (!__builtin_constant_p(n)) \
5300+ check_object_size(__cu_to, __cu_len, false); \
5301 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5302+ } \
5303 __cu_len; \
5304 })
5305
5306diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5307index 24603be..948052d 100644
5308--- a/arch/ia64/kernel/module.c
5309+++ b/arch/ia64/kernel/module.c
5310@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
5311 void
5312 module_free (struct module *mod, void *module_region)
5313 {
5314- if (mod && mod->arch.init_unw_table &&
5315- module_region == mod->module_init) {
5316+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
5317 unw_remove_unwind_table(mod->arch.init_unw_table);
5318 mod->arch.init_unw_table = NULL;
5319 }
5320@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5321 }
5322
5323 static inline int
5324+in_init_rx (const struct module *mod, uint64_t addr)
5325+{
5326+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5327+}
5328+
5329+static inline int
5330+in_init_rw (const struct module *mod, uint64_t addr)
5331+{
5332+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5333+}
5334+
5335+static inline int
5336 in_init (const struct module *mod, uint64_t addr)
5337 {
5338- return addr - (uint64_t) mod->module_init < mod->init_size;
5339+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5340+}
5341+
5342+static inline int
5343+in_core_rx (const struct module *mod, uint64_t addr)
5344+{
5345+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5346+}
5347+
5348+static inline int
5349+in_core_rw (const struct module *mod, uint64_t addr)
5350+{
5351+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5352 }
5353
5354 static inline int
5355 in_core (const struct module *mod, uint64_t addr)
5356 {
5357- return addr - (uint64_t) mod->module_core < mod->core_size;
5358+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5359 }
5360
5361 static inline int
5362@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5363 break;
5364
5365 case RV_BDREL:
5366- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5367+ if (in_init_rx(mod, val))
5368+ val -= (uint64_t) mod->module_init_rx;
5369+ else if (in_init_rw(mod, val))
5370+ val -= (uint64_t) mod->module_init_rw;
5371+ else if (in_core_rx(mod, val))
5372+ val -= (uint64_t) mod->module_core_rx;
5373+ else if (in_core_rw(mod, val))
5374+ val -= (uint64_t) mod->module_core_rw;
5375 break;
5376
5377 case RV_LTV:
5378@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5379 * addresses have been selected...
5380 */
5381 uint64_t gp;
5382- if (mod->core_size > MAX_LTOFF)
5383+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5384 /*
5385 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5386 * at the end of the module.
5387 */
5388- gp = mod->core_size - MAX_LTOFF / 2;
5389+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5390 else
5391- gp = mod->core_size / 2;
5392- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5393+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5394+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5395 mod->arch.gp = gp;
5396 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5397 }
5398diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5399index c39c3cd..3c77738 100644
5400--- a/arch/ia64/kernel/palinfo.c
5401+++ b/arch/ia64/kernel/palinfo.c
5402@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5403 return NOTIFY_OK;
5404 }
5405
5406-static struct notifier_block __refdata palinfo_cpu_notifier =
5407+static struct notifier_block palinfo_cpu_notifier =
5408 {
5409 .notifier_call = palinfo_cpu_callback,
5410 .priority = 0,
5411diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5412index 41e33f8..65180b2a 100644
5413--- a/arch/ia64/kernel/sys_ia64.c
5414+++ b/arch/ia64/kernel/sys_ia64.c
5415@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5416 unsigned long align_mask = 0;
5417 struct mm_struct *mm = current->mm;
5418 struct vm_unmapped_area_info info;
5419+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5420
5421 if (len > RGN_MAP_LIMIT)
5422 return -ENOMEM;
5423@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5424 if (REGION_NUMBER(addr) == RGN_HPAGE)
5425 addr = 0;
5426 #endif
5427+
5428+#ifdef CONFIG_PAX_RANDMMAP
5429+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5430+ addr = mm->free_area_cache;
5431+ else
5432+#endif
5433+
5434 if (!addr)
5435 addr = TASK_UNMAPPED_BASE;
5436
5437@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5438 info.high_limit = TASK_SIZE;
5439 info.align_mask = align_mask;
5440 info.align_offset = 0;
5441+ info.threadstack_offset = offset;
5442 return vm_unmapped_area(&info);
5443 }
5444
5445diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5446index 84f8a52..7c76178 100644
5447--- a/arch/ia64/kernel/vmlinux.lds.S
5448+++ b/arch/ia64/kernel/vmlinux.lds.S
5449@@ -192,7 +192,7 @@ SECTIONS {
5450 /* Per-cpu data: */
5451 . = ALIGN(PERCPU_PAGE_SIZE);
5452 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5453- __phys_per_cpu_start = __per_cpu_load;
5454+ __phys_per_cpu_start = per_cpu_load;
5455 /*
5456 * ensure percpu data fits
5457 * into percpu page size
5458diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5459index 7225dad..2a7c8256 100644
5460--- a/arch/ia64/mm/fault.c
5461+++ b/arch/ia64/mm/fault.c
5462@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5463 return pte_present(pte);
5464 }
5465
5466+#ifdef CONFIG_PAX_PAGEEXEC
5467+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5468+{
5469+ unsigned long i;
5470+
5471+ printk(KERN_ERR "PAX: bytes at PC: ");
5472+ for (i = 0; i < 8; i++) {
5473+ unsigned int c;
5474+ if (get_user(c, (unsigned int *)pc+i))
5475+ printk(KERN_CONT "???????? ");
5476+ else
5477+ printk(KERN_CONT "%08x ", c);
5478+ }
5479+ printk("\n");
5480+}
5481+#endif
5482+
5483 # define VM_READ_BIT 0
5484 # define VM_WRITE_BIT 1
5485 # define VM_EXEC_BIT 2
5486@@ -151,8 +168,21 @@ retry:
5487 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5488 goto bad_area;
5489
5490- if ((vma->vm_flags & mask) != mask)
5491+ if ((vma->vm_flags & mask) != mask) {
5492+
5493+#ifdef CONFIG_PAX_PAGEEXEC
5494+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5495+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5496+ goto bad_area;
5497+
5498+ up_read(&mm->mmap_sem);
5499+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5500+ do_group_exit(SIGKILL);
5501+ }
5502+#endif
5503+
5504 goto bad_area;
5505+ }
5506
5507 /*
5508 * If for any reason at all we couldn't handle the fault, make
5509diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5510index 76069c1..c2aa816 100644
5511--- a/arch/ia64/mm/hugetlbpage.c
5512+++ b/arch/ia64/mm/hugetlbpage.c
5513@@ -149,6 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5514 unsigned long pgoff, unsigned long flags)
5515 {
5516 struct vm_unmapped_area_info info;
5517+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5518
5519 if (len > RGN_MAP_LIMIT)
5520 return -ENOMEM;
5521@@ -172,6 +173,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5522 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5523 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5524 info.align_offset = 0;
5525+ info.threadstack_offset = offset;
5526 return vm_unmapped_area(&info);
5527 }
5528
5529diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5530index 6b33457..88b5124 100644
5531--- a/arch/ia64/mm/init.c
5532+++ b/arch/ia64/mm/init.c
5533@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5534 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5535 vma->vm_end = vma->vm_start + PAGE_SIZE;
5536 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5537+
5538+#ifdef CONFIG_PAX_PAGEEXEC
5539+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5540+ vma->vm_flags &= ~VM_EXEC;
5541+
5542+#ifdef CONFIG_PAX_MPROTECT
5543+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5544+ vma->vm_flags &= ~VM_MAYEXEC;
5545+#endif
5546+
5547+ }
5548+#endif
5549+
5550 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5551 down_write(&current->mm->mmap_sem);
5552 if (insert_vm_struct(current->mm, vma)) {
5553@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5554 gate_vma.vm_start = FIXADDR_USER_START;
5555 gate_vma.vm_end = FIXADDR_USER_END;
5556 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5557- gate_vma.vm_page_prot = __P101;
5558+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5559
5560 return 0;
5561 }
5562diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5563index 40b3ee9..8c2c112 100644
5564--- a/arch/m32r/include/asm/cache.h
5565+++ b/arch/m32r/include/asm/cache.h
5566@@ -1,8 +1,10 @@
5567 #ifndef _ASM_M32R_CACHE_H
5568 #define _ASM_M32R_CACHE_H
5569
5570+#include <linux/const.h>
5571+
5572 /* L1 cache line size */
5573 #define L1_CACHE_SHIFT 4
5574-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5575+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5576
5577 #endif /* _ASM_M32R_CACHE_H */
5578diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5579index 82abd15..d95ae5d 100644
5580--- a/arch/m32r/lib/usercopy.c
5581+++ b/arch/m32r/lib/usercopy.c
5582@@ -14,6 +14,9 @@
5583 unsigned long
5584 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5585 {
5586+ if ((long)n < 0)
5587+ return n;
5588+
5589 prefetch(from);
5590 if (access_ok(VERIFY_WRITE, to, n))
5591 __copy_user(to,from,n);
5592@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5593 unsigned long
5594 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5595 {
5596+ if ((long)n < 0)
5597+ return n;
5598+
5599 prefetchw(to);
5600 if (access_ok(VERIFY_READ, from, n))
5601 __copy_user_zeroing(to,from,n);
5602diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5603index 0395c51..5f26031 100644
5604--- a/arch/m68k/include/asm/cache.h
5605+++ b/arch/m68k/include/asm/cache.h
5606@@ -4,9 +4,11 @@
5607 #ifndef __ARCH_M68K_CACHE_H
5608 #define __ARCH_M68K_CACHE_H
5609
5610+#include <linux/const.h>
5611+
5612 /* bytes per L1 cache line */
5613 #define L1_CACHE_SHIFT 4
5614-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5615+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5616
5617 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5618
5619diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5620index c7591e8..ecef036 100644
5621--- a/arch/metag/include/asm/barrier.h
5622+++ b/arch/metag/include/asm/barrier.h
5623@@ -89,7 +89,7 @@ static inline void fence(void)
5624 do { \
5625 compiletime_assert_atomic_type(*p); \
5626 smp_mb(); \
5627- ACCESS_ONCE(*p) = (v); \
5628+ ACCESS_ONCE_RW(*p) = (v); \
5629 } while (0)
5630
5631 #define smp_load_acquire(p) \
5632diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5633index 3c32075..ae0ae75 100644
5634--- a/arch/metag/mm/hugetlbpage.c
5635+++ b/arch/metag/mm/hugetlbpage.c
5636@@ -200,6 +200,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5637 info.high_limit = TASK_SIZE;
5638 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5639 info.align_offset = 0;
5640+ info.threadstack_offset = 0;
5641 return vm_unmapped_area(&info);
5642 }
5643
5644diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5645index 4efe96a..60e8699 100644
5646--- a/arch/microblaze/include/asm/cache.h
5647+++ b/arch/microblaze/include/asm/cache.h
5648@@ -13,11 +13,12 @@
5649 #ifndef _ASM_MICROBLAZE_CACHE_H
5650 #define _ASM_MICROBLAZE_CACHE_H
5651
5652+#include <linux/const.h>
5653 #include <asm/registers.h>
5654
5655 #define L1_CACHE_SHIFT 5
5656 /* word-granular cache in microblaze */
5657-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5658+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5659
5660 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5661
5662diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5663index 9536ef9..9333776 100644
5664--- a/arch/mips/Kconfig
5665+++ b/arch/mips/Kconfig
5666@@ -2413,6 +2413,7 @@ source "kernel/Kconfig.preempt"
5667
5668 config KEXEC
5669 bool "Kexec system call"
5670+ depends on !GRKERNSEC_KMEM
5671 help
5672 kexec is a system call that implements the ability to shutdown your
5673 current kernel, and to start another kernel. It is like a reboot
5674diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5675index 02f2444..506969c 100644
5676--- a/arch/mips/cavium-octeon/dma-octeon.c
5677+++ b/arch/mips/cavium-octeon/dma-octeon.c
5678@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5679 if (dma_release_from_coherent(dev, order, vaddr))
5680 return;
5681
5682- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5683+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5684 }
5685
5686 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5687diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5688index 6dd6bfc..903b0d6 100644
5689--- a/arch/mips/include/asm/atomic.h
5690+++ b/arch/mips/include/asm/atomic.h
5691@@ -21,15 +21,39 @@
5692 #include <asm/cmpxchg.h>
5693 #include <asm/war.h>
5694
5695+#ifdef CONFIG_GENERIC_ATOMIC64
5696+#include <asm-generic/atomic64.h>
5697+#endif
5698+
5699 #define ATOMIC_INIT(i) { (i) }
5700
5701+#ifdef CONFIG_64BIT
5702+#define _ASM_EXTABLE(from, to) \
5703+" .section __ex_table,\"a\"\n" \
5704+" .dword " #from ", " #to"\n" \
5705+" .previous\n"
5706+#else
5707+#define _ASM_EXTABLE(from, to) \
5708+" .section __ex_table,\"a\"\n" \
5709+" .word " #from ", " #to"\n" \
5710+" .previous\n"
5711+#endif
5712+
5713 /*
5714 * atomic_read - read atomic variable
5715 * @v: pointer of type atomic_t
5716 *
5717 * Atomically reads the value of @v.
5718 */
5719-#define atomic_read(v) ACCESS_ONCE((v)->counter)
5720+static inline int atomic_read(const atomic_t *v)
5721+{
5722+ return ACCESS_ONCE(v->counter);
5723+}
5724+
5725+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5726+{
5727+ return ACCESS_ONCE(v->counter);
5728+}
5729
5730 /*
5731 * atomic_set - set atomic variable
5732@@ -38,47 +62,77 @@
5733 *
5734 * Atomically sets the value of @v to @i.
5735 */
5736-#define atomic_set(v, i) ((v)->counter = (i))
5737+static inline void atomic_set(atomic_t *v, int i)
5738+{
5739+ v->counter = i;
5740+}
5741
5742-#define ATOMIC_OP(op, c_op, asm_op) \
5743-static __inline__ void atomic_##op(int i, atomic_t * v) \
5744+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5745+{
5746+ v->counter = i;
5747+}
5748+
5749+#ifdef CONFIG_PAX_REFCOUNT
5750+#define __OVERFLOW_POST \
5751+ " b 4f \n" \
5752+ " .set noreorder \n" \
5753+ "3: b 5f \n" \
5754+ " move %0, %1 \n" \
5755+ " .set reorder \n"
5756+#define __OVERFLOW_EXTABLE \
5757+ "3:\n" \
5758+ _ASM_EXTABLE(2b, 3b)
5759+#else
5760+#define __OVERFLOW_POST
5761+#define __OVERFLOW_EXTABLE
5762+#endif
5763+
5764+#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5765+static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5766 { \
5767 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5768 int temp; \
5769 \
5770 __asm__ __volatile__( \
5771- " .set arch=r4000 \n" \
5772- "1: ll %0, %1 # atomic_" #op " \n" \
5773- " " #asm_op " %0, %2 \n" \
5774+ " .set mips3 \n" \
5775+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5776+ "2: " #asm_op " %0, %2 \n" \
5777 " sc %0, %1 \n" \
5778 " beqzl %0, 1b \n" \
5779+ extable \
5780 " .set mips0 \n" \
5781 : "=&r" (temp), "+m" (v->counter) \
5782 : "Ir" (i)); \
5783 } else if (kernel_uses_llsc) { \
5784 int temp; \
5785 \
5786- do { \
5787- __asm__ __volatile__( \
5788- " .set arch=r4000 \n" \
5789- " ll %0, %1 # atomic_" #op "\n" \
5790- " " #asm_op " %0, %2 \n" \
5791- " sc %0, %1 \n" \
5792- " .set mips0 \n" \
5793- : "=&r" (temp), "+m" (v->counter) \
5794- : "Ir" (i)); \
5795- } while (unlikely(!temp)); \
5796+ __asm__ __volatile__( \
5797+ " .set mips3 \n" \
5798+ " ll %0, %1 # atomic_" #op #suffix "\n" \
5799+ "2: " #asm_op " %0, %2 \n" \
5800+ " sc %0, %1 \n" \
5801+ " beqz %0, 1b \n" \
5802+ extable \
5803+ " .set mips0 \n" \
5804+ : "=&r" (temp), "+m" (v->counter) \
5805+ : "Ir" (i)); \
5806 } else { \
5807 unsigned long flags; \
5808 \
5809 raw_local_irq_save(flags); \
5810- v->counter c_op i; \
5811+ __asm__ __volatile__( \
5812+ "2: " #asm_op " %0, %1 \n" \
5813+ extable \
5814+ : "+r" (v->counter) : "Ir" (i)); \
5815 raw_local_irq_restore(flags); \
5816 } \
5817 } \
5818
5819-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5820-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5821+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , asm_op##u) \
5822+ __ATOMIC_OP(op, _unchecked, asm_op)
5823+
5824+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5825+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5826 { \
5827 int result; \
5828 \
5829@@ -88,37 +142,47 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5830 int temp; \
5831 \
5832 __asm__ __volatile__( \
5833- " .set arch=r4000 \n" \
5834- "1: ll %1, %2 # atomic_" #op "_return \n" \
5835- " " #asm_op " %0, %1, %3 \n" \
5836+ " .set mips3 \n" \
5837+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5838+ "2: " #asm_op " %0, %1, %3 \n" \
5839 " sc %0, %2 \n" \
5840 " beqzl %0, 1b \n" \
5841- " " #asm_op " %0, %1, %3 \n" \
5842+ post_op \
5843+ extable \
5844+ "4: " #asm_op " %0, %1, %3 \n" \
5845+ "5: \n" \
5846 " .set mips0 \n" \
5847 : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5848 : "Ir" (i)); \
5849 } else if (kernel_uses_llsc) { \
5850 int temp; \
5851 \
5852- do { \
5853- __asm__ __volatile__( \
5854- " .set arch=r4000 \n" \
5855- " ll %1, %2 # atomic_" #op "_return \n" \
5856- " " #asm_op " %0, %1, %3 \n" \
5857- " sc %0, %2 \n" \
5858- " .set mips0 \n" \
5859- : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5860- : "Ir" (i)); \
5861- } while (unlikely(!result)); \
5862+ __asm__ __volatile__( \
5863+ " .set mips3 \n" \
5864+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5865+ "2: " #asm_op " %0, %1, %3 \n" \
5866+ " sc %0, %2 \n" \
5867+ " beqz %0, 1b \n" \
5868+ post_op \
5869+ extable \
5870+ "4: " #asm_op " %0, %1, %3 \n" \
5871+ "5: \n" \
5872+ " .set mips0 \n" \
5873+ : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
5874+ : "Ir" (i)); \
5875 \
5876 result = temp; result c_op i; \
5877 } else { \
5878 unsigned long flags; \
5879 \
5880 raw_local_irq_save(flags); \
5881- result = v->counter; \
5882- result c_op i; \
5883- v->counter = result; \
5884+ __asm__ __volatile__( \
5885+ " lw %0, %1 \n" \
5886+ "2: " #asm_op " %0, %1, %2 \n" \
5887+ " sw %0, %1 \n" \
5888+ "3: \n" \
5889+ extable \
5890+ : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
5891 raw_local_irq_restore(flags); \
5892 } \
5893 \
5894@@ -127,16 +191,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5895 return result; \
5896 }
5897
5898-#define ATOMIC_OPS(op, c_op, asm_op) \
5899- ATOMIC_OP(op, c_op, asm_op) \
5900- ATOMIC_OP_RETURN(op, c_op, asm_op)
5901+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
5902+ __ATOMIC_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
5903
5904-ATOMIC_OPS(add, +=, addu)
5905-ATOMIC_OPS(sub, -=, subu)
5906+#define ATOMIC_OPS(op, asm_op) \
5907+ ATOMIC_OP(op, asm_op) \
5908+ ATOMIC_OP_RETURN(op, asm_op)
5909+
5910+ATOMIC_OPS(add, add)
5911+ATOMIC_OPS(sub, sub)
5912
5913 #undef ATOMIC_OPS
5914 #undef ATOMIC_OP_RETURN
5915+#undef __ATOMIC_OP_RETURN
5916 #undef ATOMIC_OP
5917+#undef __ATOMIC_OP
5918
5919 /*
5920 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
5921@@ -146,7 +215,7 @@ ATOMIC_OPS(sub, -=, subu)
5922 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5923 * The function returns the old value of @v minus @i.
5924 */
5925-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5926+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5927 {
5928 int result;
5929
5930@@ -203,8 +272,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5931 return result;
5932 }
5933
5934-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5935-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
5936+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
5937+{
5938+ return cmpxchg(&v->counter, old, new);
5939+}
5940+
5941+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
5942+ int new)
5943+{
5944+ return cmpxchg(&(v->counter), old, new);
5945+}
5946+
5947+static inline int atomic_xchg(atomic_t *v, int new)
5948+{
5949+ return xchg(&v->counter, new);
5950+}
5951+
5952+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
5953+{
5954+ return xchg(&(v->counter), new);
5955+}
5956
5957 /**
5958 * __atomic_add_unless - add unless the number is a given value
5959@@ -232,6 +319,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5960
5961 #define atomic_dec_return(v) atomic_sub_return(1, (v))
5962 #define atomic_inc_return(v) atomic_add_return(1, (v))
5963+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
5964+{
5965+ return atomic_add_return_unchecked(1, v);
5966+}
5967
5968 /*
5969 * atomic_sub_and_test - subtract value from variable and test result
5970@@ -253,6 +344,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5971 * other cases.
5972 */
5973 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
5974+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
5975+{
5976+ return atomic_add_return_unchecked(1, v) == 0;
5977+}
5978
5979 /*
5980 * atomic_dec_and_test - decrement by 1 and test
5981@@ -277,6 +372,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5982 * Atomically increments @v by 1.
5983 */
5984 #define atomic_inc(v) atomic_add(1, (v))
5985+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
5986+{
5987+ atomic_add_unchecked(1, v);
5988+}
5989
5990 /*
5991 * atomic_dec - decrement and test
5992@@ -285,6 +384,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5993 * Atomically decrements @v by 1.
5994 */
5995 #define atomic_dec(v) atomic_sub(1, (v))
5996+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
5997+{
5998+ atomic_sub_unchecked(1, v);
5999+}
6000
6001 /*
6002 * atomic_add_negative - add and test if negative
6003@@ -306,54 +409,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6004 * @v: pointer of type atomic64_t
6005 *
6006 */
6007-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6008+static inline long atomic64_read(const atomic64_t *v)
6009+{
6010+ return ACCESS_ONCE(v->counter);
6011+}
6012+
6013+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6014+{
6015+ return ACCESS_ONCE(v->counter);
6016+}
6017
6018 /*
6019 * atomic64_set - set atomic variable
6020 * @v: pointer of type atomic64_t
6021 * @i: required value
6022 */
6023-#define atomic64_set(v, i) ((v)->counter = (i))
6024+static inline void atomic64_set(atomic64_t *v, long i)
6025+{
6026+ v->counter = i;
6027+}
6028
6029-#define ATOMIC64_OP(op, c_op, asm_op) \
6030-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6031+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6032+{
6033+ v->counter = i;
6034+}
6035+
6036+#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6037+static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6038 { \
6039 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6040 long temp; \
6041 \
6042 __asm__ __volatile__( \
6043- " .set arch=r4000 \n" \
6044- "1: lld %0, %1 # atomic64_" #op " \n" \
6045- " " #asm_op " %0, %2 \n" \
6046+ " .set mips3 \n" \
6047+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6048+ "2: " #asm_op " %0, %2 \n" \
6049 " scd %0, %1 \n" \
6050 " beqzl %0, 1b \n" \
6051+ extable \
6052 " .set mips0 \n" \
6053 : "=&r" (temp), "+m" (v->counter) \
6054 : "Ir" (i)); \
6055 } else if (kernel_uses_llsc) { \
6056 long temp; \
6057 \
6058- do { \
6059- __asm__ __volatile__( \
6060- " .set arch=r4000 \n" \
6061- " lld %0, %1 # atomic64_" #op "\n" \
6062- " " #asm_op " %0, %2 \n" \
6063- " scd %0, %1 \n" \
6064- " .set mips0 \n" \
6065- : "=&r" (temp), "+m" (v->counter) \
6066- : "Ir" (i)); \
6067- } while (unlikely(!temp)); \
6068+ __asm__ __volatile__( \
6069+ " .set mips3 \n" \
6070+ " lld %0, %1 # atomic64_" #op #suffix "\n" \
6071+ "2: " #asm_op " %0, %2 \n" \
6072+ " scd %0, %1 \n" \
6073+ " beqz %0, 1b \n" \
6074+ extable \
6075+ " .set mips0 \n" \
6076+ : "=&r" (temp), "+m" (v->counter) \
6077+ : "Ir" (i)); \
6078 } else { \
6079 unsigned long flags; \
6080 \
6081 raw_local_irq_save(flags); \
6082- v->counter c_op i; \
6083+ __asm__ __volatile__( \
6084+ "2: " #asm_op " %0, %1 \n" \
6085+ extable \
6086+ : "+r" (v->counter) : "Ir" (i)); \
6087 raw_local_irq_restore(flags); \
6088 } \
6089 } \
6090
6091-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6092-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6093+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , asm_op##u) \
6094+ __ATOMIC64_OP(op, _unchecked, asm_op)
6095+
6096+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6097+static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6098 { \
6099 long result; \
6100 \
6101@@ -363,38 +489,48 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6102 long temp; \
6103 \
6104 __asm__ __volatile__( \
6105- " .set arch=r4000 \n" \
6106+ " .set mips3 \n" \
6107 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6108- " " #asm_op " %0, %1, %3 \n" \
6109+ "2: " #asm_op " %0, %1, %3 \n" \
6110 " scd %0, %2 \n" \
6111 " beqzl %0, 1b \n" \
6112- " " #asm_op " %0, %1, %3 \n" \
6113+ post_op \
6114+ extable \
6115+ "4: " #asm_op " %0, %1, %3 \n" \
6116+ "5: \n" \
6117 " .set mips0 \n" \
6118 : "=&r" (result), "=&r" (temp), "+m" (v->counter) \
6119 : "Ir" (i)); \
6120 } else if (kernel_uses_llsc) { \
6121 long temp; \
6122 \
6123- do { \
6124- __asm__ __volatile__( \
6125- " .set arch=r4000 \n" \
6126- " lld %1, %2 # atomic64_" #op "_return\n" \
6127- " " #asm_op " %0, %1, %3 \n" \
6128- " scd %0, %2 \n" \
6129- " .set mips0 \n" \
6130- : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
6131- : "Ir" (i), "m" (v->counter) \
6132- : "memory"); \
6133- } while (unlikely(!result)); \
6134+ __asm__ __volatile__( \
6135+ " .set mips3 \n" \
6136+ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n" \
6137+ "2: " #asm_op " %0, %1, %3 \n" \
6138+ " scd %0, %2 \n" \
6139+ " beqz %0, 1b \n" \
6140+ post_op \
6141+ extable \
6142+ "4: " #asm_op " %0, %1, %3 \n" \
6143+ "5: \n" \
6144+ " .set mips0 \n" \
6145+ : "=&r" (result), "=&r" (temp), "=m" (v->counter) \
6146+ : "Ir" (i), "m" (v->counter) \
6147+ : "memory"); \
6148 \
6149 result = temp; result c_op i; \
6150 } else { \
6151 unsigned long flags; \
6152 \
6153 raw_local_irq_save(flags); \
6154- result = v->counter; \
6155- result c_op i; \
6156- v->counter = result; \
6157+ __asm__ __volatile__( \
6158+ " ld %0, %1 \n" \
6159+ "2: " #asm_op " %0, %1, %2 \n" \
6160+ " sd %0, %1 \n" \
6161+ "3: \n" \
6162+ extable \
6163+ : "=&r" (result), "+m" (v->counter) : "Ir" (i)); \
6164 raw_local_irq_restore(flags); \
6165 } \
6166 \
6167@@ -403,16 +539,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6168 return result; \
6169 }
6170
6171-#define ATOMIC64_OPS(op, c_op, asm_op) \
6172- ATOMIC64_OP(op, c_op, asm_op) \
6173- ATOMIC64_OP_RETURN(op, c_op, asm_op)
6174+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , asm_op##u, , __OVERFLOW_EXTABLE) \
6175+ __ATOMIC64_OP_RETURN(op, _unchecked, asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6176
6177-ATOMIC64_OPS(add, +=, daddu)
6178-ATOMIC64_OPS(sub, -=, dsubu)
6179+#define ATOMIC64_OPS(op, asm_op) \
6180+ ATOMIC64_OP(op, asm_op) \
6181+ ATOMIC64_OP_RETURN(op, asm_op)
6182+
6183+ATOMIC64_OPS(add, dadd)
6184+ATOMIC64_OPS(sub, dsub)
6185
6186 #undef ATOMIC64_OPS
6187 #undef ATOMIC64_OP_RETURN
6188+#undef __ATOMIC64_OP_RETURN
6189 #undef ATOMIC64_OP
6190+#undef __ATOMIC64_OP
6191+#undef __OVERFLOW_EXTABLE
6192+#undef __OVERFLOW_POST
6193
6194 /*
6195 * atomic64_sub_if_positive - conditionally subtract integer from atomic variable
6196@@ -422,7 +565,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6197 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6198 * The function returns the old value of @v minus @i.
6199 */
6200-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6201+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6202 {
6203 long result;
6204
6205@@ -479,9 +622,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6206 return result;
6207 }
6208
6209-#define atomic64_cmpxchg(v, o, n) \
6210- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6211-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6212+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6213+{
6214+ return cmpxchg(&v->counter, old, new);
6215+}
6216+
6217+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6218+ long new)
6219+{
6220+ return cmpxchg(&(v->counter), old, new);
6221+}
6222+
6223+static inline long atomic64_xchg(atomic64_t *v, long new)
6224+{
6225+ return xchg(&v->counter, new);
6226+}
6227+
6228+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6229+{
6230+ return xchg(&(v->counter), new);
6231+}
6232
6233 /**
6234 * atomic64_add_unless - add unless the number is a given value
6235@@ -511,6 +671,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6236
6237 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6238 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6239+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6240
6241 /*
6242 * atomic64_sub_and_test - subtract value from variable and test result
6243@@ -532,6 +693,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6244 * other cases.
6245 */
6246 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6247+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6248
6249 /*
6250 * atomic64_dec_and_test - decrement by 1 and test
6251@@ -556,6 +718,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6252 * Atomically increments @v by 1.
6253 */
6254 #define atomic64_inc(v) atomic64_add(1, (v))
6255+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6256
6257 /*
6258 * atomic64_dec - decrement and test
6259@@ -564,6 +727,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6260 * Atomically decrements @v by 1.
6261 */
6262 #define atomic64_dec(v) atomic64_sub(1, (v))
6263+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6264
6265 /*
6266 * atomic64_add_negative - add and test if negative
6267diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6268index d0101dd..266982c 100644
6269--- a/arch/mips/include/asm/barrier.h
6270+++ b/arch/mips/include/asm/barrier.h
6271@@ -184,7 +184,7 @@
6272 do { \
6273 compiletime_assert_atomic_type(*p); \
6274 smp_mb(); \
6275- ACCESS_ONCE(*p) = (v); \
6276+ ACCESS_ONCE_RW(*p) = (v); \
6277 } while (0)
6278
6279 #define smp_load_acquire(p) \
6280diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6281index b4db69f..8f3b093 100644
6282--- a/arch/mips/include/asm/cache.h
6283+++ b/arch/mips/include/asm/cache.h
6284@@ -9,10 +9,11 @@
6285 #ifndef _ASM_CACHE_H
6286 #define _ASM_CACHE_H
6287
6288+#include <linux/const.h>
6289 #include <kmalloc.h>
6290
6291 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6292-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6293+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6294
6295 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6296 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6297diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6298index 1d38fe0..9beabc9 100644
6299--- a/arch/mips/include/asm/elf.h
6300+++ b/arch/mips/include/asm/elf.h
6301@@ -381,13 +381,16 @@ extern const char *__elf_platform;
6302 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6303 #endif
6304
6305+#ifdef CONFIG_PAX_ASLR
6306+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6307+
6308+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6309+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6310+#endif
6311+
6312 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6313 struct linux_binprm;
6314 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6315 int uses_interp);
6316
6317-struct mm_struct;
6318-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6319-#define arch_randomize_brk arch_randomize_brk
6320-
6321 #endif /* _ASM_ELF_H */
6322diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6323index c1f6afa..38cc6e9 100644
6324--- a/arch/mips/include/asm/exec.h
6325+++ b/arch/mips/include/asm/exec.h
6326@@ -12,6 +12,6 @@
6327 #ifndef _ASM_EXEC_H
6328 #define _ASM_EXEC_H
6329
6330-extern unsigned long arch_align_stack(unsigned long sp);
6331+#define arch_align_stack(x) ((x) & ~0xfUL)
6332
6333 #endif /* _ASM_EXEC_H */
6334diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6335index 9e8ef59..1139d6b 100644
6336--- a/arch/mips/include/asm/hw_irq.h
6337+++ b/arch/mips/include/asm/hw_irq.h
6338@@ -10,7 +10,7 @@
6339
6340 #include <linux/atomic.h>
6341
6342-extern atomic_t irq_err_count;
6343+extern atomic_unchecked_t irq_err_count;
6344
6345 /*
6346 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6347diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6348index 46dfc3c..a16b13a 100644
6349--- a/arch/mips/include/asm/local.h
6350+++ b/arch/mips/include/asm/local.h
6351@@ -12,15 +12,25 @@ typedef struct
6352 atomic_long_t a;
6353 } local_t;
6354
6355+typedef struct {
6356+ atomic_long_unchecked_t a;
6357+} local_unchecked_t;
6358+
6359 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6360
6361 #define local_read(l) atomic_long_read(&(l)->a)
6362+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6363 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6364+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6365
6366 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6367+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6368 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6369+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6370 #define local_inc(l) atomic_long_inc(&(l)->a)
6371+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6372 #define local_dec(l) atomic_long_dec(&(l)->a)
6373+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6374
6375 /*
6376 * Same as above, but return the result value
6377@@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6378 return result;
6379 }
6380
6381+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6382+{
6383+ unsigned long result;
6384+
6385+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6386+ unsigned long temp;
6387+
6388+ __asm__ __volatile__(
6389+ " .set mips3 \n"
6390+ "1:" __LL "%1, %2 # local_add_return \n"
6391+ " addu %0, %1, %3 \n"
6392+ __SC "%0, %2 \n"
6393+ " beqzl %0, 1b \n"
6394+ " addu %0, %1, %3 \n"
6395+ " .set mips0 \n"
6396+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6397+ : "Ir" (i), "m" (l->a.counter)
6398+ : "memory");
6399+ } else if (kernel_uses_llsc) {
6400+ unsigned long temp;
6401+
6402+ __asm__ __volatile__(
6403+ " .set mips3 \n"
6404+ "1:" __LL "%1, %2 # local_add_return \n"
6405+ " addu %0, %1, %3 \n"
6406+ __SC "%0, %2 \n"
6407+ " beqz %0, 1b \n"
6408+ " addu %0, %1, %3 \n"
6409+ " .set mips0 \n"
6410+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6411+ : "Ir" (i), "m" (l->a.counter)
6412+ : "memory");
6413+ } else {
6414+ unsigned long flags;
6415+
6416+ local_irq_save(flags);
6417+ result = l->a.counter;
6418+ result += i;
6419+ l->a.counter = result;
6420+ local_irq_restore(flags);
6421+ }
6422+
6423+ return result;
6424+}
6425+
6426 static __inline__ long local_sub_return(long i, local_t * l)
6427 {
6428 unsigned long result;
6429@@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6430
6431 #define local_cmpxchg(l, o, n) \
6432 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6433+#define local_cmpxchg_unchecked(l, o, n) \
6434+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6435 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6436
6437 /**
6438diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6439index 3be8180..c4798d5 100644
6440--- a/arch/mips/include/asm/page.h
6441+++ b/arch/mips/include/asm/page.h
6442@@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6443 #ifdef CONFIG_CPU_MIPS32
6444 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6445 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6446- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6447+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6448 #else
6449 typedef struct { unsigned long long pte; } pte_t;
6450 #define pte_val(x) ((x).pte)
6451diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6452index b336037..5b874cc 100644
6453--- a/arch/mips/include/asm/pgalloc.h
6454+++ b/arch/mips/include/asm/pgalloc.h
6455@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6456 {
6457 set_pud(pud, __pud((unsigned long)pmd));
6458 }
6459+
6460+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6461+{
6462+ pud_populate(mm, pud, pmd);
6463+}
6464 #endif
6465
6466 /*
6467diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6468index d6d1928..ce4f822 100644
6469--- a/arch/mips/include/asm/pgtable.h
6470+++ b/arch/mips/include/asm/pgtable.h
6471@@ -20,6 +20,9 @@
6472 #include <asm/io.h>
6473 #include <asm/pgtable-bits.h>
6474
6475+#define ktla_ktva(addr) (addr)
6476+#define ktva_ktla(addr) (addr)
6477+
6478 struct mm_struct;
6479 struct vm_area_struct;
6480
6481diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6482index 7de8658..c109224 100644
6483--- a/arch/mips/include/asm/thread_info.h
6484+++ b/arch/mips/include/asm/thread_info.h
6485@@ -105,6 +105,9 @@ static inline struct thread_info *current_thread_info(void)
6486 #define TIF_SECCOMP 4 /* secure computing */
6487 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6488 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6489+/* li takes a 32bit immediate */
6490+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6491+
6492 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6493 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6494 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6495@@ -138,14 +141,16 @@ static inline struct thread_info *current_thread_info(void)
6496 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6497 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6498 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6499+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6500
6501 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6502 _TIF_SYSCALL_AUDIT | \
6503- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6504+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6505+ _TIF_GRSEC_SETXID)
6506
6507 /* work to do in syscall_trace_leave() */
6508 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6509- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6510+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6511
6512 /* work to do on interrupt/exception return */
6513 #define _TIF_WORK_MASK \
6514@@ -153,7 +158,7 @@ static inline struct thread_info *current_thread_info(void)
6515 /* work to do on any return to u-space */
6516 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6517 _TIF_WORK_SYSCALL_EXIT | \
6518- _TIF_SYSCALL_TRACEPOINT)
6519+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6520
6521 /*
6522 * We stash processor id into a COP0 register to retrieve it fast
6523diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6524index 22a5624..7c96295 100644
6525--- a/arch/mips/include/asm/uaccess.h
6526+++ b/arch/mips/include/asm/uaccess.h
6527@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6528 __ok == 0; \
6529 })
6530
6531+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6532 #define access_ok(type, addr, size) \
6533 likely(__access_ok((addr), (size), __access_mask))
6534
6535diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6536index 1188e00..41cf144 100644
6537--- a/arch/mips/kernel/binfmt_elfn32.c
6538+++ b/arch/mips/kernel/binfmt_elfn32.c
6539@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6540 #undef ELF_ET_DYN_BASE
6541 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6542
6543+#ifdef CONFIG_PAX_ASLR
6544+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6545+
6546+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6547+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6548+#endif
6549+
6550 #include <asm/processor.h>
6551 #include <linux/module.h>
6552 #include <linux/elfcore.h>
6553diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6554index 9287678..f870e47 100644
6555--- a/arch/mips/kernel/binfmt_elfo32.c
6556+++ b/arch/mips/kernel/binfmt_elfo32.c
6557@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6558 #undef ELF_ET_DYN_BASE
6559 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6560
6561+#ifdef CONFIG_PAX_ASLR
6562+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6563+
6564+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6565+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6566+#endif
6567+
6568 #include <asm/processor.h>
6569
6570 #include <linux/module.h>
6571diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6572index 50b3648..c2f3cec 100644
6573--- a/arch/mips/kernel/i8259.c
6574+++ b/arch/mips/kernel/i8259.c
6575@@ -201,7 +201,7 @@ spurious_8259A_irq:
6576 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6577 spurious_irq_mask |= irqmask;
6578 }
6579- atomic_inc(&irq_err_count);
6580+ atomic_inc_unchecked(&irq_err_count);
6581 /*
6582 * Theoretically we do not have to handle this IRQ,
6583 * but in Linux this does not cause problems and is
6584diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6585index 44a1f79..2bd6aa3 100644
6586--- a/arch/mips/kernel/irq-gt641xx.c
6587+++ b/arch/mips/kernel/irq-gt641xx.c
6588@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6589 }
6590 }
6591
6592- atomic_inc(&irq_err_count);
6593+ atomic_inc_unchecked(&irq_err_count);
6594 }
6595
6596 void __init gt641xx_irq_init(void)
6597diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6598index d2bfbc2..a8eacd2 100644
6599--- a/arch/mips/kernel/irq.c
6600+++ b/arch/mips/kernel/irq.c
6601@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6602 printk("unexpected IRQ # %d\n", irq);
6603 }
6604
6605-atomic_t irq_err_count;
6606+atomic_unchecked_t irq_err_count;
6607
6608 int arch_show_interrupts(struct seq_file *p, int prec)
6609 {
6610- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6611+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6612 return 0;
6613 }
6614
6615 asmlinkage void spurious_interrupt(void)
6616 {
6617- atomic_inc(&irq_err_count);
6618+ atomic_inc_unchecked(&irq_err_count);
6619 }
6620
6621 void __init init_IRQ(void)
6622@@ -109,7 +109,10 @@ void __init init_IRQ(void)
6623 #endif
6624 }
6625
6626+
6627 #ifdef DEBUG_STACKOVERFLOW
6628+extern void gr_handle_kernel_exploit(void);
6629+
6630 static inline void check_stack_overflow(void)
6631 {
6632 unsigned long sp;
6633@@ -125,6 +128,7 @@ static inline void check_stack_overflow(void)
6634 printk("do_IRQ: stack overflow: %ld\n",
6635 sp - sizeof(struct thread_info));
6636 dump_stack();
6637+ gr_handle_kernel_exploit();
6638 }
6639 }
6640 #else
6641diff --git a/arch/mips/kernel/pm-cps.c b/arch/mips/kernel/pm-cps.c
6642index 0614717..002fa43 100644
6643--- a/arch/mips/kernel/pm-cps.c
6644+++ b/arch/mips/kernel/pm-cps.c
6645@@ -172,7 +172,7 @@ int cps_pm_enter_state(enum cps_pm_state state)
6646 nc_core_ready_count = nc_addr;
6647
6648 /* Ensure ready_count is zero-initialised before the assembly runs */
6649- ACCESS_ONCE(*nc_core_ready_count) = 0;
6650+ ACCESS_ONCE_RW(*nc_core_ready_count) = 0;
6651 coupled_barrier(&per_cpu(pm_barrier, core), online);
6652
6653 /* Run the generated entry code */
6654diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
6655index 636b074..8fbb91f 100644
6656--- a/arch/mips/kernel/process.c
6657+++ b/arch/mips/kernel/process.c
6658@@ -520,15 +520,3 @@ unsigned long get_wchan(struct task_struct *task)
6659 out:
6660 return pc;
6661 }
6662-
6663-/*
6664- * Don't forget that the stack pointer must be aligned on a 8 bytes
6665- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
6666- */
6667-unsigned long arch_align_stack(unsigned long sp)
6668-{
6669- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6670- sp -= get_random_int() & ~PAGE_MASK;
6671-
6672- return sp & ALMASK;
6673-}
6674diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
6675index 9d1487d..10c5da5 100644
6676--- a/arch/mips/kernel/ptrace.c
6677+++ b/arch/mips/kernel/ptrace.c
6678@@ -761,6 +761,10 @@ long arch_ptrace(struct task_struct *child, long request,
6679 return ret;
6680 }
6681
6682+#ifdef CONFIG_GRKERNSEC_SETXID
6683+extern void gr_delayed_cred_worker(void);
6684+#endif
6685+
6686 /*
6687 * Notification of system call entry/exit
6688 * - triggered by current->work.syscall_trace
6689@@ -777,6 +781,11 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)
6690 tracehook_report_syscall_entry(regs))
6691 ret = -1;
6692
6693+#ifdef CONFIG_GRKERNSEC_SETXID
6694+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
6695+ gr_delayed_cred_worker();
6696+#endif
6697+
6698 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
6699 trace_sys_enter(regs, regs->regs[2]);
6700
6701diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
6702index 07fc524..b9d7f28 100644
6703--- a/arch/mips/kernel/reset.c
6704+++ b/arch/mips/kernel/reset.c
6705@@ -13,6 +13,7 @@
6706 #include <linux/reboot.h>
6707
6708 #include <asm/reboot.h>
6709+#include <asm/bug.h>
6710
6711 /*
6712 * Urgs ... Too many MIPS machines to handle this in a generic way.
6713@@ -29,16 +30,19 @@ void machine_restart(char *command)
6714 {
6715 if (_machine_restart)
6716 _machine_restart(command);
6717+ BUG();
6718 }
6719
6720 void machine_halt(void)
6721 {
6722 if (_machine_halt)
6723 _machine_halt();
6724+ BUG();
6725 }
6726
6727 void machine_power_off(void)
6728 {
6729 if (pm_power_off)
6730 pm_power_off();
6731+ BUG();
6732 }
6733diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
6734index 2242bdd..b284048 100644
6735--- a/arch/mips/kernel/sync-r4k.c
6736+++ b/arch/mips/kernel/sync-r4k.c
6737@@ -18,8 +18,8 @@
6738 #include <asm/mipsregs.h>
6739
6740 static atomic_t count_start_flag = ATOMIC_INIT(0);
6741-static atomic_t count_count_start = ATOMIC_INIT(0);
6742-static atomic_t count_count_stop = ATOMIC_INIT(0);
6743+static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
6744+static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
6745 static atomic_t count_reference = ATOMIC_INIT(0);
6746
6747 #define COUNTON 100
6748@@ -58,13 +58,13 @@ void synchronise_count_master(int cpu)
6749
6750 for (i = 0; i < NR_LOOPS; i++) {
6751 /* slaves loop on '!= 2' */
6752- while (atomic_read(&count_count_start) != 1)
6753+ while (atomic_read_unchecked(&count_count_start) != 1)
6754 mb();
6755- atomic_set(&count_count_stop, 0);
6756+ atomic_set_unchecked(&count_count_stop, 0);
6757 smp_wmb();
6758
6759 /* this lets the slaves write their count register */
6760- atomic_inc(&count_count_start);
6761+ atomic_inc_unchecked(&count_count_start);
6762
6763 /*
6764 * Everyone initialises count in the last loop:
6765@@ -75,11 +75,11 @@ void synchronise_count_master(int cpu)
6766 /*
6767 * Wait for all slaves to leave the synchronization point:
6768 */
6769- while (atomic_read(&count_count_stop) != 1)
6770+ while (atomic_read_unchecked(&count_count_stop) != 1)
6771 mb();
6772- atomic_set(&count_count_start, 0);
6773+ atomic_set_unchecked(&count_count_start, 0);
6774 smp_wmb();
6775- atomic_inc(&count_count_stop);
6776+ atomic_inc_unchecked(&count_count_stop);
6777 }
6778 /* Arrange for an interrupt in a short while */
6779 write_c0_compare(read_c0_count() + COUNTON);
6780@@ -112,8 +112,8 @@ void synchronise_count_slave(int cpu)
6781 initcount = atomic_read(&count_reference);
6782
6783 for (i = 0; i < NR_LOOPS; i++) {
6784- atomic_inc(&count_count_start);
6785- while (atomic_read(&count_count_start) != 2)
6786+ atomic_inc_unchecked(&count_count_start);
6787+ while (atomic_read_unchecked(&count_count_start) != 2)
6788 mb();
6789
6790 /*
6791@@ -122,8 +122,8 @@ void synchronise_count_slave(int cpu)
6792 if (i == NR_LOOPS-1)
6793 write_c0_count(initcount);
6794
6795- atomic_inc(&count_count_stop);
6796- while (atomic_read(&count_count_stop) != 2)
6797+ atomic_inc_unchecked(&count_count_stop);
6798+ while (atomic_read_unchecked(&count_count_stop) != 2)
6799 mb();
6800 }
6801 /* Arrange for an interrupt in a short while */
6802diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
6803index 22b19c2..c5cc8c4 100644
6804--- a/arch/mips/kernel/traps.c
6805+++ b/arch/mips/kernel/traps.c
6806@@ -688,7 +688,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
6807 siginfo_t info;
6808
6809 prev_state = exception_enter();
6810- die_if_kernel("Integer overflow", regs);
6811+ if (unlikely(!user_mode(regs))) {
6812+
6813+#ifdef CONFIG_PAX_REFCOUNT
6814+ if (fixup_exception(regs)) {
6815+ pax_report_refcount_overflow(regs);
6816+ exception_exit(prev_state);
6817+ return;
6818+ }
6819+#endif
6820+
6821+ die("Integer overflow", regs);
6822+ }
6823
6824 info.si_code = FPE_INTOVF;
6825 info.si_signo = SIGFPE;
6826diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
6827index e3b21e5..ea5ff7c 100644
6828--- a/arch/mips/kvm/mips.c
6829+++ b/arch/mips/kvm/mips.c
6830@@ -805,7 +805,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
6831 return r;
6832 }
6833
6834-int kvm_arch_init(void *opaque)
6835+int kvm_arch_init(const void *opaque)
6836 {
6837 if (kvm_mips_callbacks) {
6838 kvm_err("kvm: module already exists\n");
6839diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
6840index becc42b..9e43d4b 100644
6841--- a/arch/mips/mm/fault.c
6842+++ b/arch/mips/mm/fault.c
6843@@ -28,6 +28,23 @@
6844 #include <asm/highmem.h> /* For VMALLOC_END */
6845 #include <linux/kdebug.h>
6846
6847+#ifdef CONFIG_PAX_PAGEEXEC
6848+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6849+{
6850+ unsigned long i;
6851+
6852+ printk(KERN_ERR "PAX: bytes at PC: ");
6853+ for (i = 0; i < 5; i++) {
6854+ unsigned int c;
6855+ if (get_user(c, (unsigned int *)pc+i))
6856+ printk(KERN_CONT "???????? ");
6857+ else
6858+ printk(KERN_CONT "%08x ", c);
6859+ }
6860+ printk("\n");
6861+}
6862+#endif
6863+
6864 /*
6865 * This routine handles page faults. It determines the address,
6866 * and the problem, and then passes it off to one of the appropriate
6867@@ -199,6 +216,14 @@ bad_area:
6868 bad_area_nosemaphore:
6869 /* User mode accesses just cause a SIGSEGV */
6870 if (user_mode(regs)) {
6871+
6872+#ifdef CONFIG_PAX_PAGEEXEC
6873+ if (cpu_has_rixi && (mm->pax_flags & MF_PAX_PAGEEXEC) && !write && address == instruction_pointer(regs)) {
6874+ pax_report_fault(regs, (void *)address, (void *)user_stack_pointer(regs));
6875+ do_group_exit(SIGKILL);
6876+ }
6877+#endif
6878+
6879 tsk->thread.cp0_badvaddr = address;
6880 tsk->thread.error_code = write;
6881 #if 0
6882diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
6883index f1baadd..5472dca 100644
6884--- a/arch/mips/mm/mmap.c
6885+++ b/arch/mips/mm/mmap.c
6886@@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6887 struct vm_area_struct *vma;
6888 unsigned long addr = addr0;
6889 int do_color_align;
6890+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
6891 struct vm_unmapped_area_info info;
6892
6893 if (unlikely(len > TASK_SIZE))
6894@@ -84,6 +85,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6895 do_color_align = 1;
6896
6897 /* requesting a specific address */
6898+
6899+#ifdef CONFIG_PAX_RANDMMAP
6900+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
6901+#endif
6902+
6903 if (addr) {
6904 if (do_color_align)
6905 addr = COLOUR_ALIGN(addr, pgoff);
6906@@ -91,14 +97,14 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
6907 addr = PAGE_ALIGN(addr);
6908
6909 vma = find_vma(mm, addr);
6910- if (TASK_SIZE - len >= addr &&
6911- (!vma || addr + len <= vma->vm_start))
6912+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
6913 return addr;
6914 }
6915
6916 info.length = len;
6917 info.align_mask = do_color_align ? (PAGE_MASK & shm_align_mask) : 0;
6918 info.align_offset = pgoff << PAGE_SHIFT;
6919+ info.threadstack_offset = offset;
6920
6921 if (dir == DOWN) {
6922 info.flags = VM_UNMAPPED_AREA_TOPDOWN;
6923@@ -146,6 +152,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6924 {
6925 unsigned long random_factor = 0UL;
6926
6927+#ifdef CONFIG_PAX_RANDMMAP
6928+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
6929+#endif
6930+
6931 if (current->flags & PF_RANDOMIZE) {
6932 random_factor = get_random_int();
6933 random_factor = random_factor << PAGE_SHIFT;
6934@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6935
6936 if (mmap_is_legacy()) {
6937 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
6938+
6939+#ifdef CONFIG_PAX_RANDMMAP
6940+ if (mm->pax_flags & MF_PAX_RANDMMAP)
6941+ mm->mmap_base += mm->delta_mmap;
6942+#endif
6943+
6944 mm->get_unmapped_area = arch_get_unmapped_area;
6945 } else {
6946 mm->mmap_base = mmap_base(random_factor);
6947+
6948+#ifdef CONFIG_PAX_RANDMMAP
6949+ if (mm->pax_flags & MF_PAX_RANDMMAP)
6950+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
6951+#endif
6952+
6953 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
6954 }
6955 }
6956
6957-static inline unsigned long brk_rnd(void)
6958-{
6959- unsigned long rnd = get_random_int();
6960-
6961- rnd = rnd << PAGE_SHIFT;
6962- /* 8MB for 32bit, 256MB for 64bit */
6963- if (TASK_IS_32BIT_ADDR)
6964- rnd = rnd & 0x7ffffful;
6965- else
6966- rnd = rnd & 0xffffffful;
6967-
6968- return rnd;
6969-}
6970-
6971-unsigned long arch_randomize_brk(struct mm_struct *mm)
6972-{
6973- unsigned long base = mm->brk;
6974- unsigned long ret;
6975-
6976- ret = PAGE_ALIGN(base + brk_rnd());
6977-
6978- if (ret < mm->brk)
6979- return mm->brk;
6980-
6981- return ret;
6982-}
6983-
6984 int __virt_addr_valid(const volatile void *kaddr)
6985 {
6986 return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
6987diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
6988index 59cccd9..f39ac2f 100644
6989--- a/arch/mips/pci/pci-octeon.c
6990+++ b/arch/mips/pci/pci-octeon.c
6991@@ -327,8 +327,8 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn,
6992
6993
6994 static struct pci_ops octeon_pci_ops = {
6995- octeon_read_config,
6996- octeon_write_config,
6997+ .read = octeon_read_config,
6998+ .write = octeon_write_config,
6999 };
7000
7001 static struct resource octeon_pci_mem_resource = {
7002diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
7003index 5e36c33..eb4a17b 100644
7004--- a/arch/mips/pci/pcie-octeon.c
7005+++ b/arch/mips/pci/pcie-octeon.c
7006@@ -1792,8 +1792,8 @@ static int octeon_dummy_write_config(struct pci_bus *bus, unsigned int devfn,
7007 }
7008
7009 static struct pci_ops octeon_pcie0_ops = {
7010- octeon_pcie0_read_config,
7011- octeon_pcie0_write_config,
7012+ .read = octeon_pcie0_read_config,
7013+ .write = octeon_pcie0_write_config,
7014 };
7015
7016 static struct resource octeon_pcie0_mem_resource = {
7017@@ -1813,8 +1813,8 @@ static struct pci_controller octeon_pcie0_controller = {
7018 };
7019
7020 static struct pci_ops octeon_pcie1_ops = {
7021- octeon_pcie1_read_config,
7022- octeon_pcie1_write_config,
7023+ .read = octeon_pcie1_read_config,
7024+ .write = octeon_pcie1_write_config,
7025 };
7026
7027 static struct resource octeon_pcie1_mem_resource = {
7028@@ -1834,8 +1834,8 @@ static struct pci_controller octeon_pcie1_controller = {
7029 };
7030
7031 static struct pci_ops octeon_dummy_ops = {
7032- octeon_dummy_read_config,
7033- octeon_dummy_write_config,
7034+ .read = octeon_dummy_read_config,
7035+ .write = octeon_dummy_write_config,
7036 };
7037
7038 static struct resource octeon_dummy_mem_resource = {
7039diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
7040index a2358b4..7cead4f 100644
7041--- a/arch/mips/sgi-ip27/ip27-nmi.c
7042+++ b/arch/mips/sgi-ip27/ip27-nmi.c
7043@@ -187,9 +187,9 @@ void
7044 cont_nmi_dump(void)
7045 {
7046 #ifndef REAL_NMI_SIGNAL
7047- static atomic_t nmied_cpus = ATOMIC_INIT(0);
7048+ static atomic_unchecked_t nmied_cpus = ATOMIC_INIT(0);
7049
7050- atomic_inc(&nmied_cpus);
7051+ atomic_inc_unchecked(&nmied_cpus);
7052 #endif
7053 /*
7054 * Only allow 1 cpu to proceed
7055@@ -233,7 +233,7 @@ cont_nmi_dump(void)
7056 udelay(10000);
7057 }
7058 #else
7059- while (atomic_read(&nmied_cpus) != num_online_cpus());
7060+ while (atomic_read_unchecked(&nmied_cpus) != num_online_cpus());
7061 #endif
7062
7063 /*
7064diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
7065index a046b30..6799527 100644
7066--- a/arch/mips/sni/rm200.c
7067+++ b/arch/mips/sni/rm200.c
7068@@ -270,7 +270,7 @@ spurious_8259A_irq:
7069 "spurious RM200 8259A interrupt: IRQ%d.\n", irq);
7070 spurious_irq_mask |= irqmask;
7071 }
7072- atomic_inc(&irq_err_count);
7073+ atomic_inc_unchecked(&irq_err_count);
7074 /*
7075 * Theoretically we do not have to handle this IRQ,
7076 * but in Linux this does not cause problems and is
7077diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
7078index 41e873b..34d33a7 100644
7079--- a/arch/mips/vr41xx/common/icu.c
7080+++ b/arch/mips/vr41xx/common/icu.c
7081@@ -653,7 +653,7 @@ static int icu_get_irq(unsigned int irq)
7082
7083 printk(KERN_ERR "spurious ICU interrupt: %04x,%04x\n", pend1, pend2);
7084
7085- atomic_inc(&irq_err_count);
7086+ atomic_inc_unchecked(&irq_err_count);
7087
7088 return -1;
7089 }
7090diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
7091index ae0e4ee..e8f0692 100644
7092--- a/arch/mips/vr41xx/common/irq.c
7093+++ b/arch/mips/vr41xx/common/irq.c
7094@@ -64,7 +64,7 @@ static void irq_dispatch(unsigned int irq)
7095 irq_cascade_t *cascade;
7096
7097 if (irq >= NR_IRQS) {
7098- atomic_inc(&irq_err_count);
7099+ atomic_inc_unchecked(&irq_err_count);
7100 return;
7101 }
7102
7103@@ -84,7 +84,7 @@ static void irq_dispatch(unsigned int irq)
7104 ret = cascade->get_irq(irq);
7105 irq = ret;
7106 if (ret < 0)
7107- atomic_inc(&irq_err_count);
7108+ atomic_inc_unchecked(&irq_err_count);
7109 else
7110 irq_dispatch(irq);
7111 if (!irqd_irq_disabled(idata) && chip->irq_unmask)
7112diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7113index 967d144..db12197 100644
7114--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
7115+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
7116@@ -11,12 +11,14 @@
7117 #ifndef _ASM_PROC_CACHE_H
7118 #define _ASM_PROC_CACHE_H
7119
7120+#include <linux/const.h>
7121+
7122 /* L1 cache */
7123
7124 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7125 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
7126-#define L1_CACHE_BYTES 16 /* bytes per entry */
7127 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
7128+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7129 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
7130
7131 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7132diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7133index bcb5df2..84fabd2 100644
7134--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7135+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
7136@@ -16,13 +16,15 @@
7137 #ifndef _ASM_PROC_CACHE_H
7138 #define _ASM_PROC_CACHE_H
7139
7140+#include <linux/const.h>
7141+
7142 /*
7143 * L1 cache
7144 */
7145 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
7146 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
7147-#define L1_CACHE_BYTES 32 /* bytes per entry */
7148 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
7149+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
7150 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
7151
7152 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
7153diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
7154index 4ce7a01..449202a 100644
7155--- a/arch/openrisc/include/asm/cache.h
7156+++ b/arch/openrisc/include/asm/cache.h
7157@@ -19,11 +19,13 @@
7158 #ifndef __ASM_OPENRISC_CACHE_H
7159 #define __ASM_OPENRISC_CACHE_H
7160
7161+#include <linux/const.h>
7162+
7163 /* FIXME: How can we replace these with values from the CPU...
7164 * they shouldn't be hard-coded!
7165 */
7166
7167-#define L1_CACHE_BYTES 16
7168 #define L1_CACHE_SHIFT 4
7169+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7170
7171 #endif /* __ASM_OPENRISC_CACHE_H */
7172diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
7173index 226f8ca..9d9b87d 100644
7174--- a/arch/parisc/include/asm/atomic.h
7175+++ b/arch/parisc/include/asm/atomic.h
7176@@ -273,6 +273,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
7177 return dec;
7178 }
7179
7180+#define atomic64_read_unchecked(v) atomic64_read(v)
7181+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7182+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7183+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7184+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7185+#define atomic64_inc_unchecked(v) atomic64_inc(v)
7186+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7187+#define atomic64_dec_unchecked(v) atomic64_dec(v)
7188+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7189+
7190 #endif /* !CONFIG_64BIT */
7191
7192
7193diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
7194index 47f11c7..3420df2 100644
7195--- a/arch/parisc/include/asm/cache.h
7196+++ b/arch/parisc/include/asm/cache.h
7197@@ -5,6 +5,7 @@
7198 #ifndef __ARCH_PARISC_CACHE_H
7199 #define __ARCH_PARISC_CACHE_H
7200
7201+#include <linux/const.h>
7202
7203 /*
7204 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
7205@@ -15,13 +16,13 @@
7206 * just ruin performance.
7207 */
7208 #ifdef CONFIG_PA20
7209-#define L1_CACHE_BYTES 64
7210 #define L1_CACHE_SHIFT 6
7211 #else
7212-#define L1_CACHE_BYTES 32
7213 #define L1_CACHE_SHIFT 5
7214 #endif
7215
7216+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7217+
7218 #ifndef __ASSEMBLY__
7219
7220 #define SMP_CACHE_BYTES L1_CACHE_BYTES
7221diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
7222index 3391d06..c23a2cc 100644
7223--- a/arch/parisc/include/asm/elf.h
7224+++ b/arch/parisc/include/asm/elf.h
7225@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
7226
7227 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
7228
7229+#ifdef CONFIG_PAX_ASLR
7230+#define PAX_ELF_ET_DYN_BASE 0x10000UL
7231+
7232+#define PAX_DELTA_MMAP_LEN 16
7233+#define PAX_DELTA_STACK_LEN 16
7234+#endif
7235+
7236 /* This yields a mask that user programs can use to figure out what
7237 instruction set this CPU supports. This could be done in user space,
7238 but it's not easy, and we've already done it here. */
7239diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
7240index f213f5b..0af3e8e 100644
7241--- a/arch/parisc/include/asm/pgalloc.h
7242+++ b/arch/parisc/include/asm/pgalloc.h
7243@@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7244 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
7245 }
7246
7247+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
7248+{
7249+ pgd_populate(mm, pgd, pmd);
7250+}
7251+
7252 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
7253 {
7254 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
7255@@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
7256 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
7257 #define pmd_free(mm, x) do { } while (0)
7258 #define pgd_populate(mm, pmd, pte) BUG()
7259+#define pgd_populate_kernel(mm, pmd, pte) BUG()
7260
7261 #endif
7262
7263diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
7264index 22b89d1..ce34230 100644
7265--- a/arch/parisc/include/asm/pgtable.h
7266+++ b/arch/parisc/include/asm/pgtable.h
7267@@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
7268 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
7269 #define PAGE_COPY PAGE_EXECREAD
7270 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
7271+
7272+#ifdef CONFIG_PAX_PAGEEXEC
7273+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
7274+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7275+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
7276+#else
7277+# define PAGE_SHARED_NOEXEC PAGE_SHARED
7278+# define PAGE_COPY_NOEXEC PAGE_COPY
7279+# define PAGE_READONLY_NOEXEC PAGE_READONLY
7280+#endif
7281+
7282 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
7283 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
7284 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
7285diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
7286index a5cb070..8604ddc 100644
7287--- a/arch/parisc/include/asm/uaccess.h
7288+++ b/arch/parisc/include/asm/uaccess.h
7289@@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
7290 const void __user *from,
7291 unsigned long n)
7292 {
7293- int sz = __compiletime_object_size(to);
7294+ size_t sz = __compiletime_object_size(to);
7295 int ret = -EFAULT;
7296
7297- if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
7298+ if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
7299 ret = __copy_from_user(to, from, n);
7300 else
7301 copy_from_user_overflow();
7302diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
7303index 50dfafc..b9fc230 100644
7304--- a/arch/parisc/kernel/module.c
7305+++ b/arch/parisc/kernel/module.c
7306@@ -98,16 +98,38 @@
7307
7308 /* three functions to determine where in the module core
7309 * or init pieces the location is */
7310+static inline int in_init_rx(struct module *me, void *loc)
7311+{
7312+ return (loc >= me->module_init_rx &&
7313+ loc < (me->module_init_rx + me->init_size_rx));
7314+}
7315+
7316+static inline int in_init_rw(struct module *me, void *loc)
7317+{
7318+ return (loc >= me->module_init_rw &&
7319+ loc < (me->module_init_rw + me->init_size_rw));
7320+}
7321+
7322 static inline int in_init(struct module *me, void *loc)
7323 {
7324- return (loc >= me->module_init &&
7325- loc <= (me->module_init + me->init_size));
7326+ return in_init_rx(me, loc) || in_init_rw(me, loc);
7327+}
7328+
7329+static inline int in_core_rx(struct module *me, void *loc)
7330+{
7331+ return (loc >= me->module_core_rx &&
7332+ loc < (me->module_core_rx + me->core_size_rx));
7333+}
7334+
7335+static inline int in_core_rw(struct module *me, void *loc)
7336+{
7337+ return (loc >= me->module_core_rw &&
7338+ loc < (me->module_core_rw + me->core_size_rw));
7339 }
7340
7341 static inline int in_core(struct module *me, void *loc)
7342 {
7343- return (loc >= me->module_core &&
7344- loc <= (me->module_core + me->core_size));
7345+ return in_core_rx(me, loc) || in_core_rw(me, loc);
7346 }
7347
7348 static inline int in_local(struct module *me, void *loc)
7349@@ -371,13 +393,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
7350 }
7351
7352 /* align things a bit */
7353- me->core_size = ALIGN(me->core_size, 16);
7354- me->arch.got_offset = me->core_size;
7355- me->core_size += gots * sizeof(struct got_entry);
7356+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7357+ me->arch.got_offset = me->core_size_rw;
7358+ me->core_size_rw += gots * sizeof(struct got_entry);
7359
7360- me->core_size = ALIGN(me->core_size, 16);
7361- me->arch.fdesc_offset = me->core_size;
7362- me->core_size += fdescs * sizeof(Elf_Fdesc);
7363+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
7364+ me->arch.fdesc_offset = me->core_size_rw;
7365+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
7366
7367 me->arch.got_max = gots;
7368 me->arch.fdesc_max = fdescs;
7369@@ -395,7 +417,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7370
7371 BUG_ON(value == 0);
7372
7373- got = me->module_core + me->arch.got_offset;
7374+ got = me->module_core_rw + me->arch.got_offset;
7375 for (i = 0; got[i].addr; i++)
7376 if (got[i].addr == value)
7377 goto out;
7378@@ -413,7 +435,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
7379 #ifdef CONFIG_64BIT
7380 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7381 {
7382- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
7383+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
7384
7385 if (!value) {
7386 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
7387@@ -431,7 +453,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
7388
7389 /* Create new one */
7390 fdesc->addr = value;
7391- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7392+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7393 return (Elf_Addr)fdesc;
7394 }
7395 #endif /* CONFIG_64BIT */
7396@@ -843,7 +865,7 @@ register_unwind_table(struct module *me,
7397
7398 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
7399 end = table + sechdrs[me->arch.unwind_section].sh_size;
7400- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
7401+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
7402
7403 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
7404 me->arch.unwind_section, table, end, gp);
7405diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
7406index e1ffea2..46ed66e 100644
7407--- a/arch/parisc/kernel/sys_parisc.c
7408+++ b/arch/parisc/kernel/sys_parisc.c
7409@@ -89,6 +89,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7410 unsigned long task_size = TASK_SIZE;
7411 int do_color_align, last_mmap;
7412 struct vm_unmapped_area_info info;
7413+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7414
7415 if (len > task_size)
7416 return -ENOMEM;
7417@@ -106,6 +107,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7418 goto found_addr;
7419 }
7420
7421+#ifdef CONFIG_PAX_RANDMMAP
7422+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7423+#endif
7424+
7425 if (addr) {
7426 if (do_color_align && last_mmap)
7427 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7428@@ -124,6 +129,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
7429 info.high_limit = mmap_upper_limit();
7430 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7431 info.align_offset = shared_align_offset(last_mmap, pgoff);
7432+ info.threadstack_offset = offset;
7433 addr = vm_unmapped_area(&info);
7434
7435 found_addr:
7436@@ -143,6 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7437 unsigned long addr = addr0;
7438 int do_color_align, last_mmap;
7439 struct vm_unmapped_area_info info;
7440+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
7441
7442 #ifdef CONFIG_64BIT
7443 /* This should only ever run for 32-bit processes. */
7444@@ -167,6 +174,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7445 }
7446
7447 /* requesting a specific address */
7448+#ifdef CONFIG_PAX_RANDMMAP
7449+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
7450+#endif
7451+
7452 if (addr) {
7453 if (do_color_align && last_mmap)
7454 addr = COLOR_ALIGN(addr, last_mmap, pgoff);
7455@@ -184,6 +195,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7456 info.high_limit = mm->mmap_base;
7457 info.align_mask = last_mmap ? (PAGE_MASK & (SHM_COLOUR - 1)) : 0;
7458 info.align_offset = shared_align_offset(last_mmap, pgoff);
7459+ info.threadstack_offset = offset;
7460 addr = vm_unmapped_area(&info);
7461 if (!(addr & ~PAGE_MASK))
7462 goto found_addr;
7463@@ -249,6 +261,13 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
7464 mm->mmap_legacy_base = mmap_legacy_base();
7465 mm->mmap_base = mmap_upper_limit();
7466
7467+#ifdef CONFIG_PAX_RANDMMAP
7468+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
7469+ mm->mmap_legacy_base += mm->delta_mmap;
7470+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
7471+ }
7472+#endif
7473+
7474 if (mmap_is_legacy()) {
7475 mm->mmap_base = mm->mmap_legacy_base;
7476 mm->get_unmapped_area = arch_get_unmapped_area;
7477diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
7478index 47ee620..1107387 100644
7479--- a/arch/parisc/kernel/traps.c
7480+++ b/arch/parisc/kernel/traps.c
7481@@ -726,9 +726,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
7482
7483 down_read(&current->mm->mmap_sem);
7484 vma = find_vma(current->mm,regs->iaoq[0]);
7485- if (vma && (regs->iaoq[0] >= vma->vm_start)
7486- && (vma->vm_flags & VM_EXEC)) {
7487-
7488+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
7489 fault_address = regs->iaoq[0];
7490 fault_space = regs->iasq[0];
7491
7492diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
7493index 3ca9c11..d163ef7 100644
7494--- a/arch/parisc/mm/fault.c
7495+++ b/arch/parisc/mm/fault.c
7496@@ -15,6 +15,7 @@
7497 #include <linux/sched.h>
7498 #include <linux/interrupt.h>
7499 #include <linux/module.h>
7500+#include <linux/unistd.h>
7501
7502 #include <asm/uaccess.h>
7503 #include <asm/traps.h>
7504@@ -50,7 +51,7 @@ int show_unhandled_signals = 1;
7505 static unsigned long
7506 parisc_acctyp(unsigned long code, unsigned int inst)
7507 {
7508- if (code == 6 || code == 16)
7509+ if (code == 6 || code == 7 || code == 16)
7510 return VM_EXEC;
7511
7512 switch (inst & 0xf0000000) {
7513@@ -136,6 +137,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
7514 }
7515 #endif
7516
7517+#ifdef CONFIG_PAX_PAGEEXEC
7518+/*
7519+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
7520+ *
7521+ * returns 1 when task should be killed
7522+ * 2 when rt_sigreturn trampoline was detected
7523+ * 3 when unpatched PLT trampoline was detected
7524+ */
7525+static int pax_handle_fetch_fault(struct pt_regs *regs)
7526+{
7527+
7528+#ifdef CONFIG_PAX_EMUPLT
7529+ int err;
7530+
7531+ do { /* PaX: unpatched PLT emulation */
7532+ unsigned int bl, depwi;
7533+
7534+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
7535+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
7536+
7537+ if (err)
7538+ break;
7539+
7540+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
7541+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
7542+
7543+ err = get_user(ldw, (unsigned int *)addr);
7544+ err |= get_user(bv, (unsigned int *)(addr+4));
7545+ err |= get_user(ldw2, (unsigned int *)(addr+8));
7546+
7547+ if (err)
7548+ break;
7549+
7550+ if (ldw == 0x0E801096U &&
7551+ bv == 0xEAC0C000U &&
7552+ ldw2 == 0x0E881095U)
7553+ {
7554+ unsigned int resolver, map;
7555+
7556+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
7557+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
7558+ if (err)
7559+ break;
7560+
7561+ regs->gr[20] = instruction_pointer(regs)+8;
7562+ regs->gr[21] = map;
7563+ regs->gr[22] = resolver;
7564+ regs->iaoq[0] = resolver | 3UL;
7565+ regs->iaoq[1] = regs->iaoq[0] + 4;
7566+ return 3;
7567+ }
7568+ }
7569+ } while (0);
7570+#endif
7571+
7572+#ifdef CONFIG_PAX_EMUTRAMP
7573+
7574+#ifndef CONFIG_PAX_EMUSIGRT
7575+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
7576+ return 1;
7577+#endif
7578+
7579+ do { /* PaX: rt_sigreturn emulation */
7580+ unsigned int ldi1, ldi2, bel, nop;
7581+
7582+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
7583+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
7584+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
7585+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
7586+
7587+ if (err)
7588+ break;
7589+
7590+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
7591+ ldi2 == 0x3414015AU &&
7592+ bel == 0xE4008200U &&
7593+ nop == 0x08000240U)
7594+ {
7595+ regs->gr[25] = (ldi1 & 2) >> 1;
7596+ regs->gr[20] = __NR_rt_sigreturn;
7597+ regs->gr[31] = regs->iaoq[1] + 16;
7598+ regs->sr[0] = regs->iasq[1];
7599+ regs->iaoq[0] = 0x100UL;
7600+ regs->iaoq[1] = regs->iaoq[0] + 4;
7601+ regs->iasq[0] = regs->sr[2];
7602+ regs->iasq[1] = regs->sr[2];
7603+ return 2;
7604+ }
7605+ } while (0);
7606+#endif
7607+
7608+ return 1;
7609+}
7610+
7611+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7612+{
7613+ unsigned long i;
7614+
7615+ printk(KERN_ERR "PAX: bytes at PC: ");
7616+ for (i = 0; i < 5; i++) {
7617+ unsigned int c;
7618+ if (get_user(c, (unsigned int *)pc+i))
7619+ printk(KERN_CONT "???????? ");
7620+ else
7621+ printk(KERN_CONT "%08x ", c);
7622+ }
7623+ printk("\n");
7624+}
7625+#endif
7626+
7627 int fixup_exception(struct pt_regs *regs)
7628 {
7629 const struct exception_table_entry *fix;
7630@@ -234,8 +345,33 @@ retry:
7631
7632 good_area:
7633
7634- if ((vma->vm_flags & acc_type) != acc_type)
7635+ if ((vma->vm_flags & acc_type) != acc_type) {
7636+
7637+#ifdef CONFIG_PAX_PAGEEXEC
7638+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
7639+ (address & ~3UL) == instruction_pointer(regs))
7640+ {
7641+ up_read(&mm->mmap_sem);
7642+ switch (pax_handle_fetch_fault(regs)) {
7643+
7644+#ifdef CONFIG_PAX_EMUPLT
7645+ case 3:
7646+ return;
7647+#endif
7648+
7649+#ifdef CONFIG_PAX_EMUTRAMP
7650+ case 2:
7651+ return;
7652+#endif
7653+
7654+ }
7655+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
7656+ do_group_exit(SIGKILL);
7657+ }
7658+#endif
7659+
7660 goto bad_area;
7661+ }
7662
7663 /*
7664 * If for any reason at all we couldn't handle the fault, make
7665diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
7666index 88eace4..4ba2591 100644
7667--- a/arch/powerpc/Kconfig
7668+++ b/arch/powerpc/Kconfig
7669@@ -404,6 +404,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
7670 config KEXEC
7671 bool "kexec system call"
7672 depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
7673+ depends on !GRKERNSEC_KMEM
7674 help
7675 kexec is a system call that implements the ability to shutdown your
7676 current kernel, and to start another kernel. It is like a reboot
7677diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
7678index 512d278..d31fadd 100644
7679--- a/arch/powerpc/include/asm/atomic.h
7680+++ b/arch/powerpc/include/asm/atomic.h
7681@@ -12,6 +12,11 @@
7682
7683 #define ATOMIC_INIT(i) { (i) }
7684
7685+#define _ASM_EXTABLE(from, to) \
7686+" .section __ex_table,\"a\"\n" \
7687+ PPC_LONG" " #from ", " #to"\n" \
7688+" .previous\n"
7689+
7690 static __inline__ int atomic_read(const atomic_t *v)
7691 {
7692 int t;
7693@@ -21,39 +26,80 @@ static __inline__ int atomic_read(const atomic_t *v)
7694 return t;
7695 }
7696
7697+static __inline__ int atomic_read_unchecked(const atomic_unchecked_t *v)
7698+{
7699+ int t;
7700+
7701+ __asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7702+
7703+ return t;
7704+}
7705+
7706 static __inline__ void atomic_set(atomic_t *v, int i)
7707 {
7708 __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7709 }
7710
7711-#define ATOMIC_OP(op, asm_op) \
7712-static __inline__ void atomic_##op(int a, atomic_t *v) \
7713+static __inline__ void atomic_set_unchecked(atomic_unchecked_t *v, int i)
7714+{
7715+ __asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7716+}
7717+
7718+#ifdef CONFIG_PAX_REFCOUNT
7719+#define __REFCOUNT_OP(op) op##o.
7720+#define __OVERFLOW_PRE \
7721+ " mcrxr cr0\n"
7722+#define __OVERFLOW_POST \
7723+ " bf 4*cr0+so, 3f\n" \
7724+ "2: .long 0x00c00b00\n" \
7725+ "3:\n"
7726+#define __OVERFLOW_EXTABLE \
7727+ "\n4:\n"
7728+ _ASM_EXTABLE(2b, 4b)
7729+#else
7730+#define __REFCOUNT_OP(op) op
7731+#define __OVERFLOW_PRE
7732+#define __OVERFLOW_POST
7733+#define __OVERFLOW_EXTABLE
7734+#endif
7735+
7736+#define __ATOMIC_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7737+static inline void atomic_##op##suffix(int a, atomic##suffix##_t *v) \
7738 { \
7739 int t; \
7740 \
7741 __asm__ __volatile__( \
7742-"1: lwarx %0,0,%3 # atomic_" #op "\n" \
7743+"1: lwarx %0,0,%3 # atomic_" #op #suffix "\n" \
7744+ pre_op \
7745 #asm_op " %0,%2,%0\n" \
7746+ post_op \
7747 PPC405_ERR77(0,%3) \
7748 " stwcx. %0,0,%3 \n" \
7749 " bne- 1b\n" \
7750+ extable \
7751 : "=&r" (t), "+m" (v->counter) \
7752 : "r" (a), "r" (&v->counter) \
7753 : "cc"); \
7754 } \
7755
7756-#define ATOMIC_OP_RETURN(op, asm_op) \
7757-static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7758+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, , , asm_op, , ) \
7759+ __ATOMIC_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7760+
7761+#define __ATOMIC_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
7762+static inline int atomic_##op##_return##suffix(int a, atomic##suffix##_t *v)\
7763 { \
7764 int t; \
7765 \
7766 __asm__ __volatile__( \
7767 PPC_ATOMIC_ENTRY_BARRIER \
7768-"1: lwarx %0,0,%2 # atomic_" #op "_return\n" \
7769+"1: lwarx %0,0,%2 # atomic_" #op "_return" #suffix "\n" \
7770+ pre_op \
7771 #asm_op " %0,%1,%0\n" \
7772+ post_op \
7773 PPC405_ERR77(0,%2) \
7774 " stwcx. %0,0,%2 \n" \
7775 " bne- 1b\n" \
7776+ extable \
7777 PPC_ATOMIC_EXIT_BARRIER \
7778 : "=&r" (t) \
7779 : "r" (a), "r" (&v->counter) \
7780@@ -62,6 +108,9 @@ static __inline__ int atomic_##op##_return(int a, atomic_t *v) \
7781 return t; \
7782 }
7783
7784+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, , , asm_op, , )\
7785+ __ATOMIC_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
7786+
7787 #define ATOMIC_OPS(op, asm_op) ATOMIC_OP(op, asm_op) ATOMIC_OP_RETURN(op, asm_op)
7788
7789 ATOMIC_OPS(add, add)
7790@@ -69,42 +118,29 @@ ATOMIC_OPS(sub, subf)
7791
7792 #undef ATOMIC_OPS
7793 #undef ATOMIC_OP_RETURN
7794+#undef __ATOMIC_OP_RETURN
7795 #undef ATOMIC_OP
7796+#undef __ATOMIC_OP
7797
7798 #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
7799
7800-static __inline__ void atomic_inc(atomic_t *v)
7801-{
7802- int t;
7803+/*
7804+ * atomic_inc - increment atomic variable
7805+ * @v: pointer of type atomic_t
7806+ *
7807+ * Automatically increments @v by 1
7808+ */
7809+#define atomic_inc(v) atomic_add(1, (v))
7810+#define atomic_inc_return(v) atomic_add_return(1, (v))
7811
7812- __asm__ __volatile__(
7813-"1: lwarx %0,0,%2 # atomic_inc\n\
7814- addic %0,%0,1\n"
7815- PPC405_ERR77(0,%2)
7816-" stwcx. %0,0,%2 \n\
7817- bne- 1b"
7818- : "=&r" (t), "+m" (v->counter)
7819- : "r" (&v->counter)
7820- : "cc", "xer");
7821+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
7822+{
7823+ atomic_add_unchecked(1, v);
7824 }
7825
7826-static __inline__ int atomic_inc_return(atomic_t *v)
7827+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
7828 {
7829- int t;
7830-
7831- __asm__ __volatile__(
7832- PPC_ATOMIC_ENTRY_BARRIER
7833-"1: lwarx %0,0,%1 # atomic_inc_return\n\
7834- addic %0,%0,1\n"
7835- PPC405_ERR77(0,%1)
7836-" stwcx. %0,0,%1 \n\
7837- bne- 1b"
7838- PPC_ATOMIC_EXIT_BARRIER
7839- : "=&r" (t)
7840- : "r" (&v->counter)
7841- : "cc", "xer", "memory");
7842-
7843- return t;
7844+ return atomic_add_return_unchecked(1, v);
7845 }
7846
7847 /*
7848@@ -117,43 +153,38 @@ static __inline__ int atomic_inc_return(atomic_t *v)
7849 */
7850 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
7851
7852-static __inline__ void atomic_dec(atomic_t *v)
7853+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
7854 {
7855- int t;
7856-
7857- __asm__ __volatile__(
7858-"1: lwarx %0,0,%2 # atomic_dec\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+ return atomic_add_return_unchecked(1, v) == 0;
7867 }
7868
7869-static __inline__ int atomic_dec_return(atomic_t *v)
7870+/*
7871+ * atomic_dec - decrement atomic variable
7872+ * @v: pointer of type atomic_t
7873+ *
7874+ * Atomically decrements @v by 1
7875+ */
7876+#define atomic_dec(v) atomic_sub(1, (v))
7877+#define atomic_dec_return(v) atomic_sub_return(1, (v))
7878+
7879+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
7880 {
7881- int t;
7882-
7883- __asm__ __volatile__(
7884- PPC_ATOMIC_ENTRY_BARRIER
7885-"1: lwarx %0,0,%1 # atomic_dec_return\n\
7886- addic %0,%0,-1\n"
7887- PPC405_ERR77(0,%1)
7888-" stwcx. %0,0,%1\n\
7889- bne- 1b"
7890- PPC_ATOMIC_EXIT_BARRIER
7891- : "=&r" (t)
7892- : "r" (&v->counter)
7893- : "cc", "xer", "memory");
7894-
7895- return t;
7896+ atomic_sub_unchecked(1, v);
7897 }
7898
7899 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
7900 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
7901
7902+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
7903+{
7904+ return cmpxchg(&(v->counter), old, new);
7905+}
7906+
7907+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
7908+{
7909+ return xchg(&(v->counter), new);
7910+}
7911+
7912 /**
7913 * __atomic_add_unless - add unless the number is a given value
7914 * @v: pointer of type atomic_t
7915@@ -171,11 +202,27 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
7916 PPC_ATOMIC_ENTRY_BARRIER
7917 "1: lwarx %0,0,%1 # __atomic_add_unless\n\
7918 cmpw 0,%0,%3 \n\
7919- beq- 2f \n\
7920- add %0,%2,%0 \n"
7921+ beq- 2f \n"
7922+
7923+#ifdef CONFIG_PAX_REFCOUNT
7924+" mcrxr cr0\n"
7925+" addo. %0,%2,%0\n"
7926+" bf 4*cr0+so, 4f\n"
7927+"3:.long " "0x00c00b00""\n"
7928+"4:\n"
7929+#else
7930+ "add %0,%2,%0 \n"
7931+#endif
7932+
7933 PPC405_ERR77(0,%2)
7934 " stwcx. %0,0,%1 \n\
7935 bne- 1b \n"
7936+"5:"
7937+
7938+#ifdef CONFIG_PAX_REFCOUNT
7939+ _ASM_EXTABLE(3b, 5b)
7940+#endif
7941+
7942 PPC_ATOMIC_EXIT_BARRIER
7943 " subf %0,%2,%0 \n\
7944 2:"
7945@@ -248,6 +295,11 @@ static __inline__ int atomic_dec_if_positive(atomic_t *v)
7946 }
7947 #define atomic_dec_if_positive atomic_dec_if_positive
7948
7949+#define smp_mb__before_atomic_dec() smp_mb()
7950+#define smp_mb__after_atomic_dec() smp_mb()
7951+#define smp_mb__before_atomic_inc() smp_mb()
7952+#define smp_mb__after_atomic_inc() smp_mb()
7953+
7954 #ifdef __powerpc64__
7955
7956 #define ATOMIC64_INIT(i) { (i) }
7957@@ -261,37 +313,60 @@ static __inline__ long atomic64_read(const atomic64_t *v)
7958 return t;
7959 }
7960
7961+static __inline__ long atomic64_read_unchecked(const atomic64_unchecked_t *v)
7962+{
7963+ long t;
7964+
7965+ __asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));
7966+
7967+ return t;
7968+}
7969+
7970 static __inline__ void atomic64_set(atomic64_t *v, long i)
7971 {
7972 __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7973 }
7974
7975-#define ATOMIC64_OP(op, asm_op) \
7976-static __inline__ void atomic64_##op(long a, atomic64_t *v) \
7977+static __inline__ void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
7978+{
7979+ __asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));
7980+}
7981+
7982+#define __ATOMIC64_OP(op, suffix, pre_op, asm_op, post_op, extable) \
7983+static inline void atomic64_##op##suffix(long a, atomic64##suffix##_t *v)\
7984 { \
7985 long t; \
7986 \
7987 __asm__ __volatile__( \
7988 "1: ldarx %0,0,%3 # atomic64_" #op "\n" \
7989+ pre_op \
7990 #asm_op " %0,%2,%0\n" \
7991+ post_op \
7992 " stdcx. %0,0,%3 \n" \
7993 " bne- 1b\n" \
7994+ extable \
7995 : "=&r" (t), "+m" (v->counter) \
7996 : "r" (a), "r" (&v->counter) \
7997 : "cc"); \
7998 }
7999
8000-#define ATOMIC64_OP_RETURN(op, asm_op) \
8001-static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8002+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, , , asm_op, , ) \
8003+ __ATOMIC64_OP(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8004+
8005+#define __ATOMIC64_OP_RETURN(op, suffix, pre_op, asm_op, post_op, extable)\
8006+static inline long atomic64_##op##_return##suffix(long a, atomic64##suffix##_t *v)\
8007 { \
8008 long t; \
8009 \
8010 __asm__ __volatile__( \
8011 PPC_ATOMIC_ENTRY_BARRIER \
8012 "1: ldarx %0,0,%2 # atomic64_" #op "_return\n" \
8013+ pre_op \
8014 #asm_op " %0,%1,%0\n" \
8015+ post_op \
8016 " stdcx. %0,0,%2 \n" \
8017 " bne- 1b\n" \
8018+ extable \
8019 PPC_ATOMIC_EXIT_BARRIER \
8020 : "=&r" (t) \
8021 : "r" (a), "r" (&v->counter) \
8022@@ -300,6 +375,9 @@ static __inline__ long atomic64_##op##_return(long a, atomic64_t *v) \
8023 return t; \
8024 }
8025
8026+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, , , asm_op, , )\
8027+ __ATOMIC64_OP_RETURN(op, _unchecked, __OVERFLOW_PRE, __REFCOUNT_OP(asm_op), __OVERFLOW_POST, __OVERFLOW_EXTABLE)
8028+
8029 #define ATOMIC64_OPS(op, asm_op) ATOMIC64_OP(op, asm_op) ATOMIC64_OP_RETURN(op, asm_op)
8030
8031 ATOMIC64_OPS(add, add)
8032@@ -307,40 +385,33 @@ ATOMIC64_OPS(sub, subf)
8033
8034 #undef ATOMIC64_OPS
8035 #undef ATOMIC64_OP_RETURN
8036+#undef __ATOMIC64_OP_RETURN
8037 #undef ATOMIC64_OP
8038+#undef __ATOMIC64_OP
8039+#undef __OVERFLOW_EXTABLE
8040+#undef __OVERFLOW_POST
8041+#undef __OVERFLOW_PRE
8042+#undef __REFCOUNT_OP
8043
8044 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
8045
8046-static __inline__ void atomic64_inc(atomic64_t *v)
8047-{
8048- long t;
8049+/*
8050+ * atomic64_inc - increment atomic variable
8051+ * @v: pointer of type atomic64_t
8052+ *
8053+ * Automatically increments @v by 1
8054+ */
8055+#define atomic64_inc(v) atomic64_add(1, (v))
8056+#define atomic64_inc_return(v) atomic64_add_return(1, (v))
8057
8058- __asm__ __volatile__(
8059-"1: ldarx %0,0,%2 # atomic64_inc\n\
8060- addic %0,%0,1\n\
8061- stdcx. %0,0,%2 \n\
8062- bne- 1b"
8063- : "=&r" (t), "+m" (v->counter)
8064- : "r" (&v->counter)
8065- : "cc", "xer");
8066+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
8067+{
8068+ atomic64_add_unchecked(1, v);
8069 }
8070
8071-static __inline__ long atomic64_inc_return(atomic64_t *v)
8072+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
8073 {
8074- long t;
8075-
8076- __asm__ __volatile__(
8077- PPC_ATOMIC_ENTRY_BARRIER
8078-"1: ldarx %0,0,%1 # atomic64_inc_return\n\
8079- addic %0,%0,1\n\
8080- stdcx. %0,0,%1 \n\
8081- bne- 1b"
8082- PPC_ATOMIC_EXIT_BARRIER
8083- : "=&r" (t)
8084- : "r" (&v->counter)
8085- : "cc", "xer", "memory");
8086-
8087- return t;
8088+ return atomic64_add_return_unchecked(1, v);
8089 }
8090
8091 /*
8092@@ -353,36 +424,18 @@ static __inline__ long atomic64_inc_return(atomic64_t *v)
8093 */
8094 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
8095
8096-static __inline__ void atomic64_dec(atomic64_t *v)
8097+/*
8098+ * atomic64_dec - decrement atomic variable
8099+ * @v: pointer of type atomic64_t
8100+ *
8101+ * Atomically decrements @v by 1
8102+ */
8103+#define atomic64_dec(v) atomic64_sub(1, (v))
8104+#define atomic64_dec_return(v) atomic64_sub_return(1, (v))
8105+
8106+static __inline__ void atomic64_dec_unchecked(atomic64_unchecked_t *v)
8107 {
8108- long t;
8109-
8110- __asm__ __volatile__(
8111-"1: ldarx %0,0,%2 # atomic64_dec\n\
8112- addic %0,%0,-1\n\
8113- stdcx. %0,0,%2\n\
8114- bne- 1b"
8115- : "=&r" (t), "+m" (v->counter)
8116- : "r" (&v->counter)
8117- : "cc", "xer");
8118-}
8119-
8120-static __inline__ long atomic64_dec_return(atomic64_t *v)
8121-{
8122- long t;
8123-
8124- __asm__ __volatile__(
8125- PPC_ATOMIC_ENTRY_BARRIER
8126-"1: ldarx %0,0,%1 # atomic64_dec_return\n\
8127- addic %0,%0,-1\n\
8128- stdcx. %0,0,%1\n\
8129- bne- 1b"
8130- PPC_ATOMIC_EXIT_BARRIER
8131- : "=&r" (t)
8132- : "r" (&v->counter)
8133- : "cc", "xer", "memory");
8134-
8135- return t;
8136+ atomic64_sub_unchecked(1, v);
8137 }
8138
8139 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
8140@@ -415,6 +468,16 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v)
8141 #define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
8142 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
8143
8144+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
8145+{
8146+ return cmpxchg(&(v->counter), old, new);
8147+}
8148+
8149+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
8150+{
8151+ return xchg(&(v->counter), new);
8152+}
8153+
8154 /**
8155 * atomic64_add_unless - add unless the number is a given value
8156 * @v: pointer of type atomic64_t
8157@@ -430,13 +493,29 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
8158
8159 __asm__ __volatile__ (
8160 PPC_ATOMIC_ENTRY_BARRIER
8161-"1: ldarx %0,0,%1 # __atomic_add_unless\n\
8162+"1: ldarx %0,0,%1 # atomic64_add_unless\n\
8163 cmpd 0,%0,%3 \n\
8164- beq- 2f \n\
8165- add %0,%2,%0 \n"
8166+ beq- 2f \n"
8167+
8168+#ifdef CONFIG_PAX_REFCOUNT
8169+" mcrxr cr0\n"
8170+" addo. %0,%2,%0\n"
8171+" bf 4*cr0+so, 4f\n"
8172+"3:.long " "0x00c00b00""\n"
8173+"4:\n"
8174+#else
8175+ "add %0,%2,%0 \n"
8176+#endif
8177+
8178 " stdcx. %0,0,%1 \n\
8179 bne- 1b \n"
8180 PPC_ATOMIC_EXIT_BARRIER
8181+"5:"
8182+
8183+#ifdef CONFIG_PAX_REFCOUNT
8184+ _ASM_EXTABLE(3b, 5b)
8185+#endif
8186+
8187 " subf %0,%2,%0 \n\
8188 2:"
8189 : "=&r" (t)
8190diff --git a/arch/powerpc/include/asm/barrier.h b/arch/powerpc/include/asm/barrier.h
8191index bab79a1..4a3eabc 100644
8192--- a/arch/powerpc/include/asm/barrier.h
8193+++ b/arch/powerpc/include/asm/barrier.h
8194@@ -73,7 +73,7 @@
8195 do { \
8196 compiletime_assert_atomic_type(*p); \
8197 __lwsync(); \
8198- ACCESS_ONCE(*p) = (v); \
8199+ ACCESS_ONCE_RW(*p) = (v); \
8200 } while (0)
8201
8202 #define smp_load_acquire(p) \
8203diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
8204index 34a05a1..a1f2c67 100644
8205--- a/arch/powerpc/include/asm/cache.h
8206+++ b/arch/powerpc/include/asm/cache.h
8207@@ -4,6 +4,7 @@
8208 #ifdef __KERNEL__
8209
8210 #include <asm/reg.h>
8211+#include <linux/const.h>
8212
8213 /* bytes per L1 cache line */
8214 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
8215@@ -23,7 +24,7 @@
8216 #define L1_CACHE_SHIFT 7
8217 #endif
8218
8219-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
8220+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
8221
8222 #define SMP_CACHE_BYTES L1_CACHE_BYTES
8223
8224diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
8225index 888d8f3..66f581c 100644
8226--- a/arch/powerpc/include/asm/elf.h
8227+++ b/arch/powerpc/include/asm/elf.h
8228@@ -28,8 +28,19 @@
8229 the loader. We need to make sure that it is out of the way of the program
8230 that it will "exec", and that there is sufficient room for the brk. */
8231
8232-extern unsigned long randomize_et_dyn(unsigned long base);
8233-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
8234+#define ELF_ET_DYN_BASE (0x20000000)
8235+
8236+#ifdef CONFIG_PAX_ASLR
8237+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
8238+
8239+#ifdef __powerpc64__
8240+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
8241+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
8242+#else
8243+#define PAX_DELTA_MMAP_LEN 15
8244+#define PAX_DELTA_STACK_LEN 15
8245+#endif
8246+#endif
8247
8248 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
8249
8250@@ -129,10 +140,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
8251 (0x7ff >> (PAGE_SHIFT - 12)) : \
8252 (0x3ffff >> (PAGE_SHIFT - 12)))
8253
8254-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
8255-#define arch_randomize_brk arch_randomize_brk
8256-
8257-
8258 #ifdef CONFIG_SPU_BASE
8259 /* Notes used in ET_CORE. Note name is "SPU/<fd>/<filename>". */
8260 #define NT_SPU 1
8261diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
8262index 8196e9c..d83a9f3 100644
8263--- a/arch/powerpc/include/asm/exec.h
8264+++ b/arch/powerpc/include/asm/exec.h
8265@@ -4,6 +4,6 @@
8266 #ifndef _ASM_POWERPC_EXEC_H
8267 #define _ASM_POWERPC_EXEC_H
8268
8269-extern unsigned long arch_align_stack(unsigned long sp);
8270+#define arch_align_stack(x) ((x) & ~0xfUL)
8271
8272 #endif /* _ASM_POWERPC_EXEC_H */
8273diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
8274index 5acabbd..7ea14fa 100644
8275--- a/arch/powerpc/include/asm/kmap_types.h
8276+++ b/arch/powerpc/include/asm/kmap_types.h
8277@@ -10,7 +10,7 @@
8278 * 2 of the License, or (at your option) any later version.
8279 */
8280
8281-#define KM_TYPE_NR 16
8282+#define KM_TYPE_NR 17
8283
8284 #endif /* __KERNEL__ */
8285 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
8286diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
8287index b8da913..c02b593 100644
8288--- a/arch/powerpc/include/asm/local.h
8289+++ b/arch/powerpc/include/asm/local.h
8290@@ -9,21 +9,65 @@ typedef struct
8291 atomic_long_t a;
8292 } local_t;
8293
8294+typedef struct
8295+{
8296+ atomic_long_unchecked_t a;
8297+} local_unchecked_t;
8298+
8299 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
8300
8301 #define local_read(l) atomic_long_read(&(l)->a)
8302+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
8303 #define local_set(l,i) atomic_long_set(&(l)->a, (i))
8304+#define local_set_unchecked(l,i) atomic_long_set_unchecked(&(l)->a, (i))
8305
8306 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
8307+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
8308 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
8309+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
8310 #define local_inc(l) atomic_long_inc(&(l)->a)
8311+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
8312 #define local_dec(l) atomic_long_dec(&(l)->a)
8313+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
8314
8315 static __inline__ long local_add_return(long a, local_t *l)
8316 {
8317 long t;
8318
8319 __asm__ __volatile__(
8320+"1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n"
8321+
8322+#ifdef CONFIG_PAX_REFCOUNT
8323+" mcrxr cr0\n"
8324+" addo. %0,%1,%0\n"
8325+" bf 4*cr0+so, 3f\n"
8326+"2:.long " "0x00c00b00""\n"
8327+#else
8328+" add %0,%1,%0\n"
8329+#endif
8330+
8331+"3:\n"
8332+ PPC405_ERR77(0,%2)
8333+ PPC_STLCX "%0,0,%2 \n\
8334+ bne- 1b"
8335+
8336+#ifdef CONFIG_PAX_REFCOUNT
8337+"\n4:\n"
8338+ _ASM_EXTABLE(2b, 4b)
8339+#endif
8340+
8341+ : "=&r" (t)
8342+ : "r" (a), "r" (&(l->a.counter))
8343+ : "cc", "memory");
8344+
8345+ return t;
8346+}
8347+
8348+static __inline__ long local_add_return_unchecked(long a, local_unchecked_t *l)
8349+{
8350+ long t;
8351+
8352+ __asm__ __volatile__(
8353 "1:" PPC_LLARX(%0,0,%2,0) " # local_add_return\n\
8354 add %0,%1,%0\n"
8355 PPC405_ERR77(0,%2)
8356@@ -101,6 +145,8 @@ static __inline__ long local_dec_return(local_t *l)
8357
8358 #define local_cmpxchg(l, o, n) \
8359 (cmpxchg_local(&((l)->a.counter), (o), (n)))
8360+#define local_cmpxchg_unchecked(l, o, n) \
8361+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
8362 #define local_xchg(l, n) (xchg_local(&((l)->a.counter), (n)))
8363
8364 /**
8365diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
8366index 8565c25..2865190 100644
8367--- a/arch/powerpc/include/asm/mman.h
8368+++ b/arch/powerpc/include/asm/mman.h
8369@@ -24,7 +24,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
8370 }
8371 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
8372
8373-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
8374+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
8375 {
8376 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
8377 }
8378diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
8379index 26fe1ae..987ffc5 100644
8380--- a/arch/powerpc/include/asm/page.h
8381+++ b/arch/powerpc/include/asm/page.h
8382@@ -227,8 +227,9 @@ extern long long virt_phys_offset;
8383 * and needs to be executable. This means the whole heap ends
8384 * up being executable.
8385 */
8386-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8387- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8388+#define VM_DATA_DEFAULT_FLAGS32 \
8389+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8390+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8391
8392 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8393 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8394@@ -256,6 +257,9 @@ extern long long virt_phys_offset;
8395 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
8396 #endif
8397
8398+#define ktla_ktva(addr) (addr)
8399+#define ktva_ktla(addr) (addr)
8400+
8401 #ifndef CONFIG_PPC_BOOK3S_64
8402 /*
8403 * Use the top bit of the higher-level page table entries to indicate whether
8404diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
8405index d908a46..3753f71 100644
8406--- a/arch/powerpc/include/asm/page_64.h
8407+++ b/arch/powerpc/include/asm/page_64.h
8408@@ -172,15 +172,18 @@ do { \
8409 * stack by default, so in the absence of a PT_GNU_STACK program header
8410 * we turn execute permission off.
8411 */
8412-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
8413- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8414+#define VM_STACK_DEFAULT_FLAGS32 \
8415+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
8416+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8417
8418 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
8419 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
8420
8421+#ifndef CONFIG_PAX_PAGEEXEC
8422 #define VM_STACK_DEFAULT_FLAGS \
8423 (is_32bit_task() ? \
8424 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
8425+#endif
8426
8427 #include <asm-generic/getorder.h>
8428
8429diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
8430index 4b0be20..c15a27d 100644
8431--- a/arch/powerpc/include/asm/pgalloc-64.h
8432+++ b/arch/powerpc/include/asm/pgalloc-64.h
8433@@ -54,6 +54,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
8434 #ifndef CONFIG_PPC_64K_PAGES
8435
8436 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
8437+#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
8438
8439 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
8440 {
8441@@ -71,6 +72,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8442 pud_set(pud, (unsigned long)pmd);
8443 }
8444
8445+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
8446+{
8447+ pud_populate(mm, pud, pmd);
8448+}
8449+
8450 #define pmd_populate(mm, pmd, pte_page) \
8451 pmd_populate_kernel(mm, pmd, page_address(pte_page))
8452 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
8453@@ -173,6 +179,7 @@ extern void __tlb_remove_table(void *_table);
8454 #endif
8455
8456 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
8457+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
8458
8459 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
8460 pte_t *pte)
8461diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
8462index 316f9a5..ba05c77 100644
8463--- a/arch/powerpc/include/asm/pgtable.h
8464+++ b/arch/powerpc/include/asm/pgtable.h
8465@@ -2,6 +2,7 @@
8466 #define _ASM_POWERPC_PGTABLE_H
8467 #ifdef __KERNEL__
8468
8469+#include <linux/const.h>
8470 #ifndef __ASSEMBLY__
8471 #include <linux/mmdebug.h>
8472 #include <linux/mmzone.h>
8473diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
8474index 4aad413..85d86bf 100644
8475--- a/arch/powerpc/include/asm/pte-hash32.h
8476+++ b/arch/powerpc/include/asm/pte-hash32.h
8477@@ -21,6 +21,7 @@
8478 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
8479 #define _PAGE_USER 0x004 /* usermode access allowed */
8480 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
8481+#define _PAGE_EXEC _PAGE_GUARDED
8482 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
8483 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
8484 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
8485diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
8486index c998279..d13a9f8 100644
8487--- a/arch/powerpc/include/asm/reg.h
8488+++ b/arch/powerpc/include/asm/reg.h
8489@@ -251,6 +251,7 @@
8490 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
8491 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
8492 #define DSISR_NOHPTE 0x40000000 /* no translation found */
8493+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
8494 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
8495 #define DSISR_ISSTORE 0x02000000 /* access was a store */
8496 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
8497diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
8498index 5a6614a..d89995d1 100644
8499--- a/arch/powerpc/include/asm/smp.h
8500+++ b/arch/powerpc/include/asm/smp.h
8501@@ -51,7 +51,7 @@ struct smp_ops_t {
8502 int (*cpu_disable)(void);
8503 void (*cpu_die)(unsigned int nr);
8504 int (*cpu_bootable)(unsigned int nr);
8505-};
8506+} __no_const;
8507
8508 extern void smp_send_debugger_break(void);
8509 extern void start_secondary_resume(void);
8510diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
8511index 4dbe072..b803275 100644
8512--- a/arch/powerpc/include/asm/spinlock.h
8513+++ b/arch/powerpc/include/asm/spinlock.h
8514@@ -204,13 +204,29 @@ static inline long __arch_read_trylock(arch_rwlock_t *rw)
8515 __asm__ __volatile__(
8516 "1: " PPC_LWARX(%0,0,%1,1) "\n"
8517 __DO_SIGN_EXTEND
8518-" addic. %0,%0,1\n\
8519- ble- 2f\n"
8520+
8521+#ifdef CONFIG_PAX_REFCOUNT
8522+" mcrxr cr0\n"
8523+" addico. %0,%0,1\n"
8524+" bf 4*cr0+so, 3f\n"
8525+"2:.long " "0x00c00b00""\n"
8526+#else
8527+" addic. %0,%0,1\n"
8528+#endif
8529+
8530+"3:\n"
8531+ "ble- 4f\n"
8532 PPC405_ERR77(0,%1)
8533 " stwcx. %0,0,%1\n\
8534 bne- 1b\n"
8535 PPC_ACQUIRE_BARRIER
8536-"2:" : "=&r" (tmp)
8537+"4:"
8538+
8539+#ifdef CONFIG_PAX_REFCOUNT
8540+ _ASM_EXTABLE(2b,4b)
8541+#endif
8542+
8543+ : "=&r" (tmp)
8544 : "r" (&rw->lock)
8545 : "cr0", "xer", "memory");
8546
8547@@ -286,11 +302,27 @@ static inline void arch_read_unlock(arch_rwlock_t *rw)
8548 __asm__ __volatile__(
8549 "# read_unlock\n\t"
8550 PPC_RELEASE_BARRIER
8551-"1: lwarx %0,0,%1\n\
8552- addic %0,%0,-1\n"
8553+"1: lwarx %0,0,%1\n"
8554+
8555+#ifdef CONFIG_PAX_REFCOUNT
8556+" mcrxr cr0\n"
8557+" addico. %0,%0,-1\n"
8558+" bf 4*cr0+so, 3f\n"
8559+"2:.long " "0x00c00b00""\n"
8560+#else
8561+" addic. %0,%0,-1\n"
8562+#endif
8563+
8564+"3:\n"
8565 PPC405_ERR77(0,%1)
8566 " stwcx. %0,0,%1\n\
8567 bne- 1b"
8568+
8569+#ifdef CONFIG_PAX_REFCOUNT
8570+"\n4:\n"
8571+ _ASM_EXTABLE(2b, 4b)
8572+#endif
8573+
8574 : "=&r"(tmp)
8575 : "r"(&rw->lock)
8576 : "cr0", "xer", "memory");
8577diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
8578index b034ecd..af7e31f 100644
8579--- a/arch/powerpc/include/asm/thread_info.h
8580+++ b/arch/powerpc/include/asm/thread_info.h
8581@@ -107,6 +107,8 @@ static inline struct thread_info *current_thread_info(void)
8582 #if defined(CONFIG_PPC64)
8583 #define TIF_ELF2ABI 18 /* function descriptors must die! */
8584 #endif
8585+/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
8586+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
8587
8588 /* as above, but as bit values */
8589 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
8590@@ -125,9 +127,10 @@ static inline struct thread_info *current_thread_info(void)
8591 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
8592 #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
8593 #define _TIF_NOHZ (1<<TIF_NOHZ)
8594+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
8595 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
8596 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
8597- _TIF_NOHZ)
8598+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
8599
8600 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
8601 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
8602diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
8603index 9485b43..3bd3c16 100644
8604--- a/arch/powerpc/include/asm/uaccess.h
8605+++ b/arch/powerpc/include/asm/uaccess.h
8606@@ -58,6 +58,7 @@
8607
8608 #endif
8609
8610+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
8611 #define access_ok(type, addr, size) \
8612 (__chk_user_ptr(addr), \
8613 __access_ok((__force unsigned long)(addr), (size), get_fs()))
8614@@ -318,52 +319,6 @@ do { \
8615 extern unsigned long __copy_tofrom_user(void __user *to,
8616 const void __user *from, unsigned long size);
8617
8618-#ifndef __powerpc64__
8619-
8620-static inline unsigned long copy_from_user(void *to,
8621- const void __user *from, unsigned long n)
8622-{
8623- unsigned long over;
8624-
8625- if (access_ok(VERIFY_READ, from, n))
8626- return __copy_tofrom_user((__force void __user *)to, from, n);
8627- if ((unsigned long)from < TASK_SIZE) {
8628- over = (unsigned long)from + n - TASK_SIZE;
8629- return __copy_tofrom_user((__force void __user *)to, from,
8630- n - over) + over;
8631- }
8632- return n;
8633-}
8634-
8635-static inline unsigned long copy_to_user(void __user *to,
8636- const void *from, unsigned long n)
8637-{
8638- unsigned long over;
8639-
8640- if (access_ok(VERIFY_WRITE, to, n))
8641- return __copy_tofrom_user(to, (__force void __user *)from, n);
8642- if ((unsigned long)to < TASK_SIZE) {
8643- over = (unsigned long)to + n - TASK_SIZE;
8644- return __copy_tofrom_user(to, (__force void __user *)from,
8645- n - over) + over;
8646- }
8647- return n;
8648-}
8649-
8650-#else /* __powerpc64__ */
8651-
8652-#define __copy_in_user(to, from, size) \
8653- __copy_tofrom_user((to), (from), (size))
8654-
8655-extern unsigned long copy_from_user(void *to, const void __user *from,
8656- unsigned long n);
8657-extern unsigned long copy_to_user(void __user *to, const void *from,
8658- unsigned long n);
8659-extern unsigned long copy_in_user(void __user *to, const void __user *from,
8660- unsigned long n);
8661-
8662-#endif /* __powerpc64__ */
8663-
8664 static inline unsigned long __copy_from_user_inatomic(void *to,
8665 const void __user *from, unsigned long n)
8666 {
8667@@ -387,6 +342,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
8668 if (ret == 0)
8669 return 0;
8670 }
8671+
8672+ if (!__builtin_constant_p(n))
8673+ check_object_size(to, n, false);
8674+
8675 return __copy_tofrom_user((__force void __user *)to, from, n);
8676 }
8677
8678@@ -413,6 +372,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
8679 if (ret == 0)
8680 return 0;
8681 }
8682+
8683+ if (!__builtin_constant_p(n))
8684+ check_object_size(from, n, true);
8685+
8686 return __copy_tofrom_user(to, (__force const void __user *)from, n);
8687 }
8688
8689@@ -430,6 +393,92 @@ static inline unsigned long __copy_to_user(void __user *to,
8690 return __copy_to_user_inatomic(to, from, size);
8691 }
8692
8693+#ifndef __powerpc64__
8694+
8695+static inline unsigned long __must_check copy_from_user(void *to,
8696+ const void __user *from, unsigned long n)
8697+{
8698+ unsigned long over;
8699+
8700+ if ((long)n < 0)
8701+ return n;
8702+
8703+ if (access_ok(VERIFY_READ, from, n)) {
8704+ if (!__builtin_constant_p(n))
8705+ check_object_size(to, n, false);
8706+ return __copy_tofrom_user((__force void __user *)to, from, n);
8707+ }
8708+ if ((unsigned long)from < TASK_SIZE) {
8709+ over = (unsigned long)from + n - TASK_SIZE;
8710+ if (!__builtin_constant_p(n - over))
8711+ check_object_size(to, n - over, false);
8712+ return __copy_tofrom_user((__force void __user *)to, from,
8713+ n - over) + over;
8714+ }
8715+ return n;
8716+}
8717+
8718+static inline unsigned long __must_check copy_to_user(void __user *to,
8719+ const void *from, unsigned long n)
8720+{
8721+ unsigned long over;
8722+
8723+ if ((long)n < 0)
8724+ return n;
8725+
8726+ if (access_ok(VERIFY_WRITE, to, n)) {
8727+ if (!__builtin_constant_p(n))
8728+ check_object_size(from, n, true);
8729+ return __copy_tofrom_user(to, (__force void __user *)from, n);
8730+ }
8731+ if ((unsigned long)to < TASK_SIZE) {
8732+ over = (unsigned long)to + n - TASK_SIZE;
8733+ if (!__builtin_constant_p(n))
8734+ check_object_size(from, n - over, true);
8735+ return __copy_tofrom_user(to, (__force void __user *)from,
8736+ n - over) + over;
8737+ }
8738+ return n;
8739+}
8740+
8741+#else /* __powerpc64__ */
8742+
8743+#define __copy_in_user(to, from, size) \
8744+ __copy_tofrom_user((to), (from), (size))
8745+
8746+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
8747+{
8748+ if ((long)n < 0 || n > INT_MAX)
8749+ return n;
8750+
8751+ if (!__builtin_constant_p(n))
8752+ check_object_size(to, n, false);
8753+
8754+ if (likely(access_ok(VERIFY_READ, from, n)))
8755+ n = __copy_from_user(to, from, n);
8756+ else
8757+ memset(to, 0, n);
8758+ return n;
8759+}
8760+
8761+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
8762+{
8763+ if ((long)n < 0 || n > INT_MAX)
8764+ return n;
8765+
8766+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
8767+ if (!__builtin_constant_p(n))
8768+ check_object_size(from, n, true);
8769+ n = __copy_to_user(to, from, n);
8770+ }
8771+ return n;
8772+}
8773+
8774+extern unsigned long copy_in_user(void __user *to, const void __user *from,
8775+ unsigned long n);
8776+
8777+#endif /* __powerpc64__ */
8778+
8779 extern unsigned long __clear_user(void __user *addr, unsigned long size);
8780
8781 static inline unsigned long clear_user(void __user *addr, unsigned long size)
8782diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
8783index 502cf69..822e63b 100644
8784--- a/arch/powerpc/kernel/Makefile
8785+++ b/arch/powerpc/kernel/Makefile
8786@@ -27,6 +27,8 @@ CFLAGS_REMOVE_ftrace.o = -pg -mno-sched-epilog
8787 CFLAGS_REMOVE_time.o = -pg -mno-sched-epilog
8788 endif
8789
8790+CFLAGS_REMOVE_prom_init.o += $(LATENT_ENTROPY_PLUGIN_CFLAGS)
8791+
8792 obj-y := cputable.o ptrace.o syscalls.o \
8793 irq.o align.o signal_32.o pmc.o vdso.o \
8794 process.o systbl.o idle.o \
8795diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
8796index 3e68d1c..72a5ee6 100644
8797--- a/arch/powerpc/kernel/exceptions-64e.S
8798+++ b/arch/powerpc/kernel/exceptions-64e.S
8799@@ -1010,6 +1010,7 @@ storage_fault_common:
8800 std r14,_DAR(r1)
8801 std r15,_DSISR(r1)
8802 addi r3,r1,STACK_FRAME_OVERHEAD
8803+ bl save_nvgprs
8804 mr r4,r14
8805 mr r5,r15
8806 ld r14,PACA_EXGEN+EX_R14(r13)
8807@@ -1018,8 +1019,7 @@ storage_fault_common:
8808 cmpdi r3,0
8809 bne- 1f
8810 b ret_from_except_lite
8811-1: bl save_nvgprs
8812- mr r5,r3
8813+1: mr r5,r3
8814 addi r3,r1,STACK_FRAME_OVERHEAD
8815 ld r4,_DAR(r1)
8816 bl bad_page_fault
8817diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
8818index 72e783e..fe058e2 100644
8819--- a/arch/powerpc/kernel/exceptions-64s.S
8820+++ b/arch/powerpc/kernel/exceptions-64s.S
8821@@ -1588,10 +1588,10 @@ handle_page_fault:
8822 11: ld r4,_DAR(r1)
8823 ld r5,_DSISR(r1)
8824 addi r3,r1,STACK_FRAME_OVERHEAD
8825+ bl save_nvgprs
8826 bl do_page_fault
8827 cmpdi r3,0
8828 beq+ 12f
8829- bl save_nvgprs
8830 mr r5,r3
8831 addi r3,r1,STACK_FRAME_OVERHEAD
8832 lwz r4,_DAR(r1)
8833diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
8834index c143835..5a9697f 100644
8835--- a/arch/powerpc/kernel/irq.c
8836+++ b/arch/powerpc/kernel/irq.c
8837@@ -461,6 +461,8 @@ void migrate_irqs(void)
8838 }
8839 #endif
8840
8841+extern void gr_handle_kernel_exploit(void);
8842+
8843 static inline void check_stack_overflow(void)
8844 {
8845 #ifdef CONFIG_DEBUG_STACKOVERFLOW
8846@@ -473,6 +475,7 @@ static inline void check_stack_overflow(void)
8847 pr_err("do_IRQ: stack overflow: %ld\n",
8848 sp - sizeof(struct thread_info));
8849 dump_stack();
8850+ gr_handle_kernel_exploit();
8851 }
8852 #endif
8853 }
8854diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
8855index c94d2e0..992a9ce 100644
8856--- a/arch/powerpc/kernel/module_32.c
8857+++ b/arch/powerpc/kernel/module_32.c
8858@@ -158,7 +158,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
8859 me->arch.core_plt_section = i;
8860 }
8861 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
8862- pr_err("Module doesn't contain .plt or .init.plt sections.\n");
8863+ pr_err("Module $s doesn't contain .plt or .init.plt sections.\n", me->name);
8864 return -ENOEXEC;
8865 }
8866
8867@@ -188,11 +188,16 @@ static uint32_t do_plt_call(void *location,
8868
8869 pr_debug("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
8870 /* Init, or core PLT? */
8871- if (location >= mod->module_core
8872- && location < mod->module_core + mod->core_size)
8873+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
8874+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
8875 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
8876- else
8877+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
8878+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
8879 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
8880+ else {
8881+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
8882+ return ~0UL;
8883+ }
8884
8885 /* Find this entry, or if that fails, the next avail. entry */
8886 while (entry->jump[0]) {
8887@@ -296,7 +301,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
8888 }
8889 #ifdef CONFIG_DYNAMIC_FTRACE
8890 module->arch.tramp =
8891- do_plt_call(module->module_core,
8892+ do_plt_call(module->module_core_rx,
8893 (unsigned long)ftrace_caller,
8894 sechdrs, module);
8895 #endif
8896diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
8897index 923cd2d..ae782a9 100644
8898--- a/arch/powerpc/kernel/process.c
8899+++ b/arch/powerpc/kernel/process.c
8900@@ -1040,8 +1040,8 @@ void show_regs(struct pt_regs * regs)
8901 * Lookup NIP late so we have the best change of getting the
8902 * above info out without failing
8903 */
8904- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
8905- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
8906+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
8907+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
8908 #endif
8909 show_stack(current, (unsigned long *) regs->gpr[1]);
8910 if (!user_mode(regs))
8911@@ -1560,10 +1560,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8912 newsp = stack[0];
8913 ip = stack[STACK_FRAME_LR_SAVE];
8914 if (!firstframe || ip != lr) {
8915- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
8916+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
8917 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
8918 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
8919- printk(" (%pS)",
8920+ printk(" (%pA)",
8921 (void *)current->ret_stack[curr_frame].ret);
8922 curr_frame--;
8923 }
8924@@ -1583,7 +1583,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
8925 struct pt_regs *regs = (struct pt_regs *)
8926 (sp + STACK_FRAME_OVERHEAD);
8927 lr = regs->link;
8928- printk("--- interrupt: %lx at %pS\n LR = %pS\n",
8929+ printk("--- interrupt: %lx at %pA\n LR = %pA\n",
8930 regs->trap, (void *)regs->nip, (void *)lr);
8931 firstframe = 1;
8932 }
8933@@ -1619,58 +1619,3 @@ void notrace __ppc64_runlatch_off(void)
8934 mtspr(SPRN_CTRLT, ctrl);
8935 }
8936 #endif /* CONFIG_PPC64 */
8937-
8938-unsigned long arch_align_stack(unsigned long sp)
8939-{
8940- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
8941- sp -= get_random_int() & ~PAGE_MASK;
8942- return sp & ~0xf;
8943-}
8944-
8945-static inline unsigned long brk_rnd(void)
8946-{
8947- unsigned long rnd = 0;
8948-
8949- /* 8MB for 32bit, 1GB for 64bit */
8950- if (is_32bit_task())
8951- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
8952- else
8953- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
8954-
8955- return rnd << PAGE_SHIFT;
8956-}
8957-
8958-unsigned long arch_randomize_brk(struct mm_struct *mm)
8959-{
8960- unsigned long base = mm->brk;
8961- unsigned long ret;
8962-
8963-#ifdef CONFIG_PPC_STD_MMU_64
8964- /*
8965- * If we are using 1TB segments and we are allowed to randomise
8966- * the heap, we can put it above 1TB so it is backed by a 1TB
8967- * segment. Otherwise the heap will be in the bottom 1TB
8968- * which always uses 256MB segments and this may result in a
8969- * performance penalty.
8970- */
8971- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
8972- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
8973-#endif
8974-
8975- ret = PAGE_ALIGN(base + brk_rnd());
8976-
8977- if (ret < mm->brk)
8978- return mm->brk;
8979-
8980- return ret;
8981-}
8982-
8983-unsigned long randomize_et_dyn(unsigned long base)
8984-{
8985- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
8986-
8987- if (ret < base)
8988- return base;
8989-
8990- return ret;
8991-}
8992diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
8993index f21897b..28c0428 100644
8994--- a/arch/powerpc/kernel/ptrace.c
8995+++ b/arch/powerpc/kernel/ptrace.c
8996@@ -1762,6 +1762,10 @@ long arch_ptrace(struct task_struct *child, long request,
8997 return ret;
8998 }
8999
9000+#ifdef CONFIG_GRKERNSEC_SETXID
9001+extern void gr_delayed_cred_worker(void);
9002+#endif
9003+
9004 /*
9005 * We must return the syscall number to actually look up in the table.
9006 * This can be -1L to skip running any syscall at all.
9007@@ -1774,6 +1778,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
9008
9009 secure_computing_strict(regs->gpr[0]);
9010
9011+#ifdef CONFIG_GRKERNSEC_SETXID
9012+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9013+ gr_delayed_cred_worker();
9014+#endif
9015+
9016 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
9017 tracehook_report_syscall_entry(regs))
9018 /*
9019@@ -1805,6 +1814,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
9020 {
9021 int step;
9022
9023+#ifdef CONFIG_GRKERNSEC_SETXID
9024+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
9025+ gr_delayed_cred_worker();
9026+#endif
9027+
9028 audit_syscall_exit(regs);
9029
9030 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
9031diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
9032index b171001..4ac7ac5 100644
9033--- a/arch/powerpc/kernel/signal_32.c
9034+++ b/arch/powerpc/kernel/signal_32.c
9035@@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
9036 /* Save user registers on the stack */
9037 frame = &rt_sf->uc.uc_mcontext;
9038 addr = frame;
9039- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
9040+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9041 sigret = 0;
9042 tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
9043 } else {
9044diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
9045index 2cb0c94..c0c0bc9 100644
9046--- a/arch/powerpc/kernel/signal_64.c
9047+++ b/arch/powerpc/kernel/signal_64.c
9048@@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
9049 current->thread.fp_state.fpscr = 0;
9050
9051 /* Set up to return from userspace. */
9052- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
9053+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
9054 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
9055 } else {
9056 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
9057diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
9058index 0dc43f9..a885d33 100644
9059--- a/arch/powerpc/kernel/traps.c
9060+++ b/arch/powerpc/kernel/traps.c
9061@@ -36,6 +36,7 @@
9062 #include <linux/debugfs.h>
9063 #include <linux/ratelimit.h>
9064 #include <linux/context_tracking.h>
9065+#include <linux/uaccess.h>
9066
9067 #include <asm/emulated_ops.h>
9068 #include <asm/pgtable.h>
9069@@ -142,6 +143,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
9070 return flags;
9071 }
9072
9073+extern void gr_handle_kernel_exploit(void);
9074+
9075 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9076 int signr)
9077 {
9078@@ -191,6 +194,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
9079 panic("Fatal exception in interrupt");
9080 if (panic_on_oops)
9081 panic("Fatal exception");
9082+
9083+ gr_handle_kernel_exploit();
9084+
9085 do_exit(signr);
9086 }
9087
9088@@ -1137,6 +1143,26 @@ void __kprobes program_check_exception(struct pt_regs *regs)
9089 enum ctx_state prev_state = exception_enter();
9090 unsigned int reason = get_reason(regs);
9091
9092+#ifdef CONFIG_PAX_REFCOUNT
9093+ unsigned int bkpt;
9094+ const struct exception_table_entry *entry;
9095+
9096+ if (reason & REASON_ILLEGAL) {
9097+ /* Check if PaX bad instruction */
9098+ if (!probe_kernel_address(regs->nip, bkpt) && bkpt == 0xc00b00) {
9099+ current->thread.trap_nr = 0;
9100+ pax_report_refcount_overflow(regs);
9101+ /* fixup_exception() for PowerPC does not exist, simulate its job */
9102+ if ((entry = search_exception_tables(regs->nip)) != NULL) {
9103+ regs->nip = entry->fixup;
9104+ return;
9105+ }
9106+ /* fixup_exception() could not handle */
9107+ goto bail;
9108+ }
9109+ }
9110+#endif
9111+
9112 /* We can now get here via a FP Unavailable exception if the core
9113 * has no FPU, in that case the reason flags will be 0 */
9114
9115diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
9116index f174351..5722009 100644
9117--- a/arch/powerpc/kernel/vdso.c
9118+++ b/arch/powerpc/kernel/vdso.c
9119@@ -35,6 +35,7 @@
9120 #include <asm/vdso.h>
9121 #include <asm/vdso_datapage.h>
9122 #include <asm/setup.h>
9123+#include <asm/mman.h>
9124
9125 #undef DEBUG
9126
9127@@ -221,7 +222,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9128 vdso_base = VDSO32_MBASE;
9129 #endif
9130
9131- current->mm->context.vdso_base = 0;
9132+ current->mm->context.vdso_base = ~0UL;
9133
9134 /* vDSO has a problem and was disabled, just don't "enable" it for the
9135 * process
9136@@ -241,7 +242,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
9137 vdso_base = get_unmapped_area(NULL, vdso_base,
9138 (vdso_pages << PAGE_SHIFT) +
9139 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
9140- 0, 0);
9141+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
9142 if (IS_ERR_VALUE(vdso_base)) {
9143 rc = vdso_base;
9144 goto fail_mmapsem;
9145diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
9146index c1f8f53..71a3b96 100644
9147--- a/arch/powerpc/kvm/powerpc.c
9148+++ b/arch/powerpc/kvm/powerpc.c
9149@@ -1409,7 +1409,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
9150 }
9151 EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
9152
9153-int kvm_arch_init(void *opaque)
9154+int kvm_arch_init(const void *opaque)
9155 {
9156 return 0;
9157 }
9158diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
9159index 5eea6f3..5d10396 100644
9160--- a/arch/powerpc/lib/usercopy_64.c
9161+++ b/arch/powerpc/lib/usercopy_64.c
9162@@ -9,22 +9,6 @@
9163 #include <linux/module.h>
9164 #include <asm/uaccess.h>
9165
9166-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
9167-{
9168- if (likely(access_ok(VERIFY_READ, from, n)))
9169- n = __copy_from_user(to, from, n);
9170- else
9171- memset(to, 0, n);
9172- return n;
9173-}
9174-
9175-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
9176-{
9177- if (likely(access_ok(VERIFY_WRITE, to, n)))
9178- n = __copy_to_user(to, from, n);
9179- return n;
9180-}
9181-
9182 unsigned long copy_in_user(void __user *to, const void __user *from,
9183 unsigned long n)
9184 {
9185@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
9186 return n;
9187 }
9188
9189-EXPORT_SYMBOL(copy_from_user);
9190-EXPORT_SYMBOL(copy_to_user);
9191 EXPORT_SYMBOL(copy_in_user);
9192
9193diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
9194index 08d659a..ab329f4 100644
9195--- a/arch/powerpc/mm/fault.c
9196+++ b/arch/powerpc/mm/fault.c
9197@@ -33,6 +33,10 @@
9198 #include <linux/ratelimit.h>
9199 #include <linux/context_tracking.h>
9200 #include <linux/hugetlb.h>
9201+#include <linux/slab.h>
9202+#include <linux/pagemap.h>
9203+#include <linux/compiler.h>
9204+#include <linux/unistd.h>
9205
9206 #include <asm/firmware.h>
9207 #include <asm/page.h>
9208@@ -69,6 +73,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
9209 }
9210 #endif
9211
9212+#ifdef CONFIG_PAX_PAGEEXEC
9213+/*
9214+ * PaX: decide what to do with offenders (regs->nip = fault address)
9215+ *
9216+ * returns 1 when task should be killed
9217+ */
9218+static int pax_handle_fetch_fault(struct pt_regs *regs)
9219+{
9220+ return 1;
9221+}
9222+
9223+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
9224+{
9225+ unsigned long i;
9226+
9227+ printk(KERN_ERR "PAX: bytes at PC: ");
9228+ for (i = 0; i < 5; i++) {
9229+ unsigned int c;
9230+ if (get_user(c, (unsigned int __user *)pc+i))
9231+ printk(KERN_CONT "???????? ");
9232+ else
9233+ printk(KERN_CONT "%08x ", c);
9234+ }
9235+ printk("\n");
9236+}
9237+#endif
9238+
9239 /*
9240 * Check whether the instruction at regs->nip is a store using
9241 * an update addressing form which will update r1.
9242@@ -228,7 +259,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
9243 * indicate errors in DSISR but can validly be set in SRR1.
9244 */
9245 if (trap == 0x400)
9246- error_code &= 0x48200000;
9247+ error_code &= 0x58200000;
9248 else
9249 is_write = error_code & DSISR_ISSTORE;
9250 #else
9251@@ -390,7 +421,7 @@ good_area:
9252 * "undefined". Of those that can be set, this is the only
9253 * one which seems bad.
9254 */
9255- if (error_code & 0x10000000)
9256+ if (error_code & DSISR_GUARDED)
9257 /* Guarded storage error. */
9258 goto bad_area;
9259 #endif /* CONFIG_8xx */
9260@@ -405,7 +436,7 @@ good_area:
9261 * processors use the same I/D cache coherency mechanism
9262 * as embedded.
9263 */
9264- if (error_code & DSISR_PROTFAULT)
9265+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
9266 goto bad_area;
9267 #endif /* CONFIG_PPC_STD_MMU */
9268
9269@@ -495,6 +526,23 @@ bad_area:
9270 bad_area_nosemaphore:
9271 /* User mode accesses cause a SIGSEGV */
9272 if (user_mode(regs)) {
9273+
9274+#ifdef CONFIG_PAX_PAGEEXEC
9275+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
9276+#ifdef CONFIG_PPC_STD_MMU
9277+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
9278+#else
9279+ if (is_exec && regs->nip == address) {
9280+#endif
9281+ switch (pax_handle_fetch_fault(regs)) {
9282+ }
9283+
9284+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
9285+ do_group_exit(SIGKILL);
9286+ }
9287+ }
9288+#endif
9289+
9290 _exception(SIGSEGV, regs, code, address);
9291 goto bail;
9292 }
9293diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
9294index cb8bdbe..cde4bc7 100644
9295--- a/arch/powerpc/mm/mmap.c
9296+++ b/arch/powerpc/mm/mmap.c
9297@@ -53,10 +53,14 @@ static inline int mmap_is_legacy(void)
9298 return sysctl_legacy_va_layout;
9299 }
9300
9301-static unsigned long mmap_rnd(void)
9302+static unsigned long mmap_rnd(struct mm_struct *mm)
9303 {
9304 unsigned long rnd = 0;
9305
9306+#ifdef CONFIG_PAX_RANDMMAP
9307+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9308+#endif
9309+
9310 if (current->flags & PF_RANDOMIZE) {
9311 /* 8MB for 32bit, 1GB for 64bit */
9312 if (is_32bit_task())
9313@@ -67,7 +71,7 @@ static unsigned long mmap_rnd(void)
9314 return rnd << PAGE_SHIFT;
9315 }
9316
9317-static inline unsigned long mmap_base(void)
9318+static inline unsigned long mmap_base(struct mm_struct *mm)
9319 {
9320 unsigned long gap = rlimit(RLIMIT_STACK);
9321
9322@@ -76,7 +80,7 @@ static inline unsigned long mmap_base(void)
9323 else if (gap > MAX_GAP)
9324 gap = MAX_GAP;
9325
9326- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
9327+ return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd(mm));
9328 }
9329
9330 /*
9331@@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9332 */
9333 if (mmap_is_legacy()) {
9334 mm->mmap_base = TASK_UNMAPPED_BASE;
9335+
9336+#ifdef CONFIG_PAX_RANDMMAP
9337+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9338+ mm->mmap_base += mm->delta_mmap;
9339+#endif
9340+
9341 mm->get_unmapped_area = arch_get_unmapped_area;
9342 } else {
9343- mm->mmap_base = mmap_base();
9344+ mm->mmap_base = mmap_base(mm);
9345+
9346+#ifdef CONFIG_PAX_RANDMMAP
9347+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9348+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9349+#endif
9350+
9351 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9352 }
9353 }
9354diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
9355index ded0ea1..f213a9b 100644
9356--- a/arch/powerpc/mm/slice.c
9357+++ b/arch/powerpc/mm/slice.c
9358@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
9359 if ((mm->task_size - len) < addr)
9360 return 0;
9361 vma = find_vma(mm, addr);
9362- return (!vma || (addr + len) <= vma->vm_start);
9363+ return check_heap_stack_gap(vma, addr, len, 0);
9364 }
9365
9366 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
9367@@ -277,6 +277,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm,
9368 info.align_offset = 0;
9369
9370 addr = TASK_UNMAPPED_BASE;
9371+
9372+#ifdef CONFIG_PAX_RANDMMAP
9373+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9374+ addr += mm->delta_mmap;
9375+#endif
9376+
9377 while (addr < TASK_SIZE) {
9378 info.low_limit = addr;
9379 if (!slice_scan_available(addr, available, 1, &addr))
9380@@ -410,6 +416,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
9381 if (fixed && addr > (mm->task_size - len))
9382 return -ENOMEM;
9383
9384+#ifdef CONFIG_PAX_RANDMMAP
9385+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
9386+ addr = 0;
9387+#endif
9388+
9389 /* If hint, make sure it matches our alignment restrictions */
9390 if (!fixed && addr) {
9391 addr = _ALIGN_UP(addr, 1ul << pshift);
9392diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9393index 4278acf..67fd0e6 100644
9394--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9395+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
9396@@ -400,8 +400,8 @@ static int scc_pciex_write_config(struct pci_bus *bus, unsigned int devfn,
9397 }
9398
9399 static struct pci_ops scc_pciex_pci_ops = {
9400- scc_pciex_read_config,
9401- scc_pciex_write_config,
9402+ .read = scc_pciex_read_config,
9403+ .write = scc_pciex_write_config,
9404 };
9405
9406 static void pciex_clear_intr_all(unsigned int __iomem *base)
9407diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
9408index d966bbe..372124a 100644
9409--- a/arch/powerpc/platforms/cell/spufs/file.c
9410+++ b/arch/powerpc/platforms/cell/spufs/file.c
9411@@ -280,9 +280,9 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
9412 return VM_FAULT_NOPAGE;
9413 }
9414
9415-static int spufs_mem_mmap_access(struct vm_area_struct *vma,
9416+static ssize_t spufs_mem_mmap_access(struct vm_area_struct *vma,
9417 unsigned long address,
9418- void *buf, int len, int write)
9419+ void *buf, size_t len, int write)
9420 {
9421 struct spu_context *ctx = vma->vm_file->private_data;
9422 unsigned long offset = address - vma->vm_start;
9423diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
9424index fa934fe..c296056 100644
9425--- a/arch/s390/include/asm/atomic.h
9426+++ b/arch/s390/include/asm/atomic.h
9427@@ -412,4 +412,14 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
9428 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
9429 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9430
9431+#define atomic64_read_unchecked(v) atomic64_read(v)
9432+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
9433+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
9434+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
9435+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
9436+#define atomic64_inc_unchecked(v) atomic64_inc(v)
9437+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
9438+#define atomic64_dec_unchecked(v) atomic64_dec(v)
9439+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
9440+
9441 #endif /* __ARCH_S390_ATOMIC__ */
9442diff --git a/arch/s390/include/asm/barrier.h b/arch/s390/include/asm/barrier.h
9443index b5dce65..8aca09a 100644
9444--- a/arch/s390/include/asm/barrier.h
9445+++ b/arch/s390/include/asm/barrier.h
9446@@ -39,7 +39,7 @@
9447 do { \
9448 compiletime_assert_atomic_type(*p); \
9449 barrier(); \
9450- ACCESS_ONCE(*p) = (v); \
9451+ ACCESS_ONCE_RW(*p) = (v); \
9452 } while (0)
9453
9454 #define smp_load_acquire(p) \
9455diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
9456index 4d7ccac..d03d0ad 100644
9457--- a/arch/s390/include/asm/cache.h
9458+++ b/arch/s390/include/asm/cache.h
9459@@ -9,8 +9,10 @@
9460 #ifndef __ARCH_S390_CACHE_H
9461 #define __ARCH_S390_CACHE_H
9462
9463-#define L1_CACHE_BYTES 256
9464+#include <linux/const.h>
9465+
9466 #define L1_CACHE_SHIFT 8
9467+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9468 #define NET_SKB_PAD 32
9469
9470 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9471diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
9472index f6e43d3..5f57681 100644
9473--- a/arch/s390/include/asm/elf.h
9474+++ b/arch/s390/include/asm/elf.h
9475@@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
9476 the loader. We need to make sure that it is out of the way of the program
9477 that it will "exec", and that there is sufficient room for the brk. */
9478
9479-extern unsigned long randomize_et_dyn(unsigned long base);
9480-#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
9481+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
9482+
9483+#ifdef CONFIG_PAX_ASLR
9484+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
9485+
9486+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9487+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
9488+#endif
9489
9490 /* This yields a mask that user programs can use to figure out what
9491 instruction set this CPU supports. */
9492@@ -223,9 +229,6 @@ struct linux_binprm;
9493 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
9494 int arch_setup_additional_pages(struct linux_binprm *, int);
9495
9496-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
9497-#define arch_randomize_brk arch_randomize_brk
9498-
9499 void *fill_cpu_elf_notes(void *ptr, struct save_area *sa, __vector128 *vxrs);
9500
9501 #endif
9502diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
9503index c4a93d6..4d2a9b4 100644
9504--- a/arch/s390/include/asm/exec.h
9505+++ b/arch/s390/include/asm/exec.h
9506@@ -7,6 +7,6 @@
9507 #ifndef __ASM_EXEC_H
9508 #define __ASM_EXEC_H
9509
9510-extern unsigned long arch_align_stack(unsigned long sp);
9511+#define arch_align_stack(x) ((x) & ~0xfUL)
9512
9513 #endif /* __ASM_EXEC_H */
9514diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
9515index cd4c68e..6764641 100644
9516--- a/arch/s390/include/asm/uaccess.h
9517+++ b/arch/s390/include/asm/uaccess.h
9518@@ -59,6 +59,7 @@ static inline int __range_ok(unsigned long addr, unsigned long size)
9519 __range_ok((unsigned long)(addr), (size)); \
9520 })
9521
9522+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
9523 #define access_ok(type, addr, size) __access_ok(addr, size)
9524
9525 /*
9526@@ -275,6 +276,10 @@ static inline unsigned long __must_check
9527 copy_to_user(void __user *to, const void *from, unsigned long n)
9528 {
9529 might_fault();
9530+
9531+ if ((long)n < 0)
9532+ return n;
9533+
9534 return __copy_to_user(to, from, n);
9535 }
9536
9537@@ -303,10 +308,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
9538 static inline unsigned long __must_check
9539 copy_from_user(void *to, const void __user *from, unsigned long n)
9540 {
9541- unsigned int sz = __compiletime_object_size(to);
9542+ size_t sz = __compiletime_object_size(to);
9543
9544 might_fault();
9545- if (unlikely(sz != -1 && sz < n)) {
9546+
9547+ if ((long)n < 0)
9548+ return n;
9549+
9550+ if (unlikely(sz != (size_t)-1 && sz < n)) {
9551 copy_from_user_overflow();
9552 return n;
9553 }
9554diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
9555index b89b591..fd9609d 100644
9556--- a/arch/s390/kernel/module.c
9557+++ b/arch/s390/kernel/module.c
9558@@ -169,11 +169,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
9559
9560 /* Increase core size by size of got & plt and set start
9561 offsets for got and plt. */
9562- me->core_size = ALIGN(me->core_size, 4);
9563- me->arch.got_offset = me->core_size;
9564- me->core_size += me->arch.got_size;
9565- me->arch.plt_offset = me->core_size;
9566- me->core_size += me->arch.plt_size;
9567+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
9568+ me->arch.got_offset = me->core_size_rw;
9569+ me->core_size_rw += me->arch.got_size;
9570+ me->arch.plt_offset = me->core_size_rx;
9571+ me->core_size_rx += me->arch.plt_size;
9572 return 0;
9573 }
9574
9575@@ -289,7 +289,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9576 if (info->got_initialized == 0) {
9577 Elf_Addr *gotent;
9578
9579- gotent = me->module_core + me->arch.got_offset +
9580+ gotent = me->module_core_rw + me->arch.got_offset +
9581 info->got_offset;
9582 *gotent = val;
9583 info->got_initialized = 1;
9584@@ -312,7 +312,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9585 rc = apply_rela_bits(loc, val, 0, 64, 0);
9586 else if (r_type == R_390_GOTENT ||
9587 r_type == R_390_GOTPLTENT) {
9588- val += (Elf_Addr) me->module_core - loc;
9589+ val += (Elf_Addr) me->module_core_rw - loc;
9590 rc = apply_rela_bits(loc, val, 1, 32, 1);
9591 }
9592 break;
9593@@ -325,7 +325,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9594 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
9595 if (info->plt_initialized == 0) {
9596 unsigned int *ip;
9597- ip = me->module_core + me->arch.plt_offset +
9598+ ip = me->module_core_rx + me->arch.plt_offset +
9599 info->plt_offset;
9600 #ifndef CONFIG_64BIT
9601 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
9602@@ -350,7 +350,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9603 val - loc + 0xffffUL < 0x1ffffeUL) ||
9604 (r_type == R_390_PLT32DBL &&
9605 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
9606- val = (Elf_Addr) me->module_core +
9607+ val = (Elf_Addr) me->module_core_rx +
9608 me->arch.plt_offset +
9609 info->plt_offset;
9610 val += rela->r_addend - loc;
9611@@ -372,7 +372,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9612 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
9613 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
9614 val = val + rela->r_addend -
9615- ((Elf_Addr) me->module_core + me->arch.got_offset);
9616+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
9617 if (r_type == R_390_GOTOFF16)
9618 rc = apply_rela_bits(loc, val, 0, 16, 0);
9619 else if (r_type == R_390_GOTOFF32)
9620@@ -382,7 +382,7 @@ static int apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
9621 break;
9622 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
9623 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
9624- val = (Elf_Addr) me->module_core + me->arch.got_offset +
9625+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
9626 rela->r_addend - loc;
9627 if (r_type == R_390_GOTPC)
9628 rc = apply_rela_bits(loc, val, 1, 32, 0);
9629diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
9630index ed84cc2..c05a9d2 100644
9631--- a/arch/s390/kernel/process.c
9632+++ b/arch/s390/kernel/process.c
9633@@ -218,37 +218,3 @@ unsigned long get_wchan(struct task_struct *p)
9634 }
9635 return 0;
9636 }
9637-
9638-unsigned long arch_align_stack(unsigned long sp)
9639-{
9640- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
9641- sp -= get_random_int() & ~PAGE_MASK;
9642- return sp & ~0xf;
9643-}
9644-
9645-static inline unsigned long brk_rnd(void)
9646-{
9647- /* 8MB for 32bit, 1GB for 64bit */
9648- if (is_32bit_task())
9649- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
9650- else
9651- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
9652-}
9653-
9654-unsigned long arch_randomize_brk(struct mm_struct *mm)
9655-{
9656- unsigned long ret;
9657-
9658- ret = PAGE_ALIGN(mm->brk + brk_rnd());
9659- return (ret > mm->brk) ? ret : mm->brk;
9660-}
9661-
9662-unsigned long randomize_et_dyn(unsigned long base)
9663-{
9664- unsigned long ret;
9665-
9666- if (!(current->flags & PF_RANDOMIZE))
9667- return base;
9668- ret = PAGE_ALIGN(base + brk_rnd());
9669- return (ret > base) ? ret : base;
9670-}
9671diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
9672index 9b436c2..54fbf0a 100644
9673--- a/arch/s390/mm/mmap.c
9674+++ b/arch/s390/mm/mmap.c
9675@@ -95,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9676 */
9677 if (mmap_is_legacy()) {
9678 mm->mmap_base = mmap_base_legacy();
9679+
9680+#ifdef CONFIG_PAX_RANDMMAP
9681+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9682+ mm->mmap_base += mm->delta_mmap;
9683+#endif
9684+
9685 mm->get_unmapped_area = arch_get_unmapped_area;
9686 } else {
9687 mm->mmap_base = mmap_base();
9688+
9689+#ifdef CONFIG_PAX_RANDMMAP
9690+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9691+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9692+#endif
9693+
9694 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9695 }
9696 }
9697@@ -170,9 +182,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9698 */
9699 if (mmap_is_legacy()) {
9700 mm->mmap_base = mmap_base_legacy();
9701+
9702+#ifdef CONFIG_PAX_RANDMMAP
9703+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9704+ mm->mmap_base += mm->delta_mmap;
9705+#endif
9706+
9707 mm->get_unmapped_area = s390_get_unmapped_area;
9708 } else {
9709 mm->mmap_base = mmap_base();
9710+
9711+#ifdef CONFIG_PAX_RANDMMAP
9712+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9713+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9714+#endif
9715+
9716 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9717 }
9718 }
9719diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9720index ae3d59f..f65f075 100644
9721--- a/arch/score/include/asm/cache.h
9722+++ b/arch/score/include/asm/cache.h
9723@@ -1,7 +1,9 @@
9724 #ifndef _ASM_SCORE_CACHE_H
9725 #define _ASM_SCORE_CACHE_H
9726
9727+#include <linux/const.h>
9728+
9729 #define L1_CACHE_SHIFT 4
9730-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9731+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9732
9733 #endif /* _ASM_SCORE_CACHE_H */
9734diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9735index f9f3cd5..58ff438 100644
9736--- a/arch/score/include/asm/exec.h
9737+++ b/arch/score/include/asm/exec.h
9738@@ -1,6 +1,6 @@
9739 #ifndef _ASM_SCORE_EXEC_H
9740 #define _ASM_SCORE_EXEC_H
9741
9742-extern unsigned long arch_align_stack(unsigned long sp);
9743+#define arch_align_stack(x) (x)
9744
9745 #endif /* _ASM_SCORE_EXEC_H */
9746diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9747index a1519ad3..e8ac1ff 100644
9748--- a/arch/score/kernel/process.c
9749+++ b/arch/score/kernel/process.c
9750@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9751
9752 return task_pt_regs(task)->cp0_epc;
9753 }
9754-
9755-unsigned long arch_align_stack(unsigned long sp)
9756-{
9757- return sp;
9758-}
9759diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9760index ef9e555..331bd29 100644
9761--- a/arch/sh/include/asm/cache.h
9762+++ b/arch/sh/include/asm/cache.h
9763@@ -9,10 +9,11 @@
9764 #define __ASM_SH_CACHE_H
9765 #ifdef __KERNEL__
9766
9767+#include <linux/const.h>
9768 #include <linux/init.h>
9769 #include <cpu/cache.h>
9770
9771-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9772+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9773
9774 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9775
9776diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9777index 6777177..cb5e44f 100644
9778--- a/arch/sh/mm/mmap.c
9779+++ b/arch/sh/mm/mmap.c
9780@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9781 struct mm_struct *mm = current->mm;
9782 struct vm_area_struct *vma;
9783 int do_colour_align;
9784+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9785 struct vm_unmapped_area_info info;
9786
9787 if (flags & MAP_FIXED) {
9788@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9789 if (filp || (flags & MAP_SHARED))
9790 do_colour_align = 1;
9791
9792+#ifdef CONFIG_PAX_RANDMMAP
9793+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9794+#endif
9795+
9796 if (addr) {
9797 if (do_colour_align)
9798 addr = COLOUR_ALIGN(addr, pgoff);
9799@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9800 addr = PAGE_ALIGN(addr);
9801
9802 vma = find_vma(mm, addr);
9803- if (TASK_SIZE - len >= addr &&
9804- (!vma || addr + len <= vma->vm_start))
9805+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9806 return addr;
9807 }
9808
9809 info.flags = 0;
9810 info.length = len;
9811- info.low_limit = TASK_UNMAPPED_BASE;
9812+ info.low_limit = mm->mmap_base;
9813 info.high_limit = TASK_SIZE;
9814 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9815 info.align_offset = pgoff << PAGE_SHIFT;
9816@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9817 struct mm_struct *mm = current->mm;
9818 unsigned long addr = addr0;
9819 int do_colour_align;
9820+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9821 struct vm_unmapped_area_info info;
9822
9823 if (flags & MAP_FIXED) {
9824@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9825 if (filp || (flags & MAP_SHARED))
9826 do_colour_align = 1;
9827
9828+#ifdef CONFIG_PAX_RANDMMAP
9829+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9830+#endif
9831+
9832 /* requesting a specific address */
9833 if (addr) {
9834 if (do_colour_align)
9835@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9836 addr = PAGE_ALIGN(addr);
9837
9838 vma = find_vma(mm, addr);
9839- if (TASK_SIZE - len >= addr &&
9840- (!vma || addr + len <= vma->vm_start))
9841+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9842 return addr;
9843 }
9844
9845@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9846 VM_BUG_ON(addr != -ENOMEM);
9847 info.flags = 0;
9848 info.low_limit = TASK_UNMAPPED_BASE;
9849+
9850+#ifdef CONFIG_PAX_RANDMMAP
9851+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9852+ info.low_limit += mm->delta_mmap;
9853+#endif
9854+
9855 info.high_limit = TASK_SIZE;
9856 addr = vm_unmapped_area(&info);
9857 }
9858diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9859index 4082749..fd97781 100644
9860--- a/arch/sparc/include/asm/atomic_64.h
9861+++ b/arch/sparc/include/asm/atomic_64.h
9862@@ -15,18 +15,38 @@
9863 #define ATOMIC64_INIT(i) { (i) }
9864
9865 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9866+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9867+{
9868+ return ACCESS_ONCE(v->counter);
9869+}
9870 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9871+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9872+{
9873+ return ACCESS_ONCE(v->counter);
9874+}
9875
9876 #define atomic_set(v, i) (((v)->counter) = i)
9877+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9878+{
9879+ v->counter = i;
9880+}
9881 #define atomic64_set(v, i) (((v)->counter) = i)
9882+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9883+{
9884+ v->counter = i;
9885+}
9886
9887-#define ATOMIC_OP(op) \
9888-void atomic_##op(int, atomic_t *); \
9889-void atomic64_##op(long, atomic64_t *);
9890+#define __ATOMIC_OP(op, suffix) \
9891+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9892+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9893
9894-#define ATOMIC_OP_RETURN(op) \
9895-int atomic_##op##_return(int, atomic_t *); \
9896-long atomic64_##op##_return(long, atomic64_t *);
9897+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9898+
9899+#define __ATOMIC_OP_RETURN(op, suffix) \
9900+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9901+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9902+
9903+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9904
9905 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9906
9907@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9908
9909 #undef ATOMIC_OPS
9910 #undef ATOMIC_OP_RETURN
9911+#undef __ATOMIC_OP_RETURN
9912 #undef ATOMIC_OP
9913+#undef __ATOMIC_OP
9914
9915 #define atomic_dec_return(v) atomic_sub_return(1, v)
9916 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9917
9918 #define atomic_inc_return(v) atomic_add_return(1, v)
9919+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9920+{
9921+ return atomic_add_return_unchecked(1, v);
9922+}
9923 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9924+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9925+{
9926+ return atomic64_add_return_unchecked(1, v);
9927+}
9928
9929 /*
9930 * atomic_inc_and_test - increment and test
9931@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9932 * other cases.
9933 */
9934 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9935+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9936+{
9937+ return atomic_inc_return_unchecked(v) == 0;
9938+}
9939 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9940
9941 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9942@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9943 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9944
9945 #define atomic_inc(v) atomic_add(1, v)
9946+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9947+{
9948+ atomic_add_unchecked(1, v);
9949+}
9950 #define atomic64_inc(v) atomic64_add(1, v)
9951+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9952+{
9953+ atomic64_add_unchecked(1, v);
9954+}
9955
9956 #define atomic_dec(v) atomic_sub(1, v)
9957+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9958+{
9959+ atomic_sub_unchecked(1, v);
9960+}
9961 #define atomic64_dec(v) atomic64_sub(1, v)
9962+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9963+{
9964+ atomic64_sub_unchecked(1, v);
9965+}
9966
9967 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
9968 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
9969
9970 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9971+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9972+{
9973+ return cmpxchg(&v->counter, old, new);
9974+}
9975 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9976+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9977+{
9978+ return xchg(&v->counter, new);
9979+}
9980
9981 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9982 {
9983- int c, old;
9984+ int c, old, new;
9985 c = atomic_read(v);
9986 for (;;) {
9987- if (unlikely(c == (u)))
9988+ if (unlikely(c == u))
9989 break;
9990- old = atomic_cmpxchg((v), c, c + (a));
9991+
9992+ asm volatile("addcc %2, %0, %0\n"
9993+
9994+#ifdef CONFIG_PAX_REFCOUNT
9995+ "tvs %%icc, 6\n"
9996+#endif
9997+
9998+ : "=r" (new)
9999+ : "0" (c), "ir" (a)
10000+ : "cc");
10001+
10002+ old = atomic_cmpxchg(v, c, new);
10003 if (likely(old == c))
10004 break;
10005 c = old;
10006@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
10007 #define atomic64_cmpxchg(v, o, n) \
10008 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
10009 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
10010+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10011+{
10012+ return xchg(&v->counter, new);
10013+}
10014
10015 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10016 {
10017- long c, old;
10018+ long c, old, new;
10019 c = atomic64_read(v);
10020 for (;;) {
10021- if (unlikely(c == (u)))
10022+ if (unlikely(c == u))
10023 break;
10024- old = atomic64_cmpxchg((v), c, c + (a));
10025+
10026+ asm volatile("addcc %2, %0, %0\n"
10027+
10028+#ifdef CONFIG_PAX_REFCOUNT
10029+ "tvs %%xcc, 6\n"
10030+#endif
10031+
10032+ : "=r" (new)
10033+ : "0" (c), "ir" (a)
10034+ : "cc");
10035+
10036+ old = atomic64_cmpxchg(v, c, new);
10037 if (likely(old == c))
10038 break;
10039 c = old;
10040 }
10041- return c != (u);
10042+ return c != u;
10043 }
10044
10045 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10046diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10047index 305dcc3..7835030 100644
10048--- a/arch/sparc/include/asm/barrier_64.h
10049+++ b/arch/sparc/include/asm/barrier_64.h
10050@@ -57,7 +57,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10051 do { \
10052 compiletime_assert_atomic_type(*p); \
10053 barrier(); \
10054- ACCESS_ONCE(*p) = (v); \
10055+ ACCESS_ONCE_RW(*p) = (v); \
10056 } while (0)
10057
10058 #define smp_load_acquire(p) \
10059diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10060index 5bb6991..5c2132e 100644
10061--- a/arch/sparc/include/asm/cache.h
10062+++ b/arch/sparc/include/asm/cache.h
10063@@ -7,10 +7,12 @@
10064 #ifndef _SPARC_CACHE_H
10065 #define _SPARC_CACHE_H
10066
10067+#include <linux/const.h>
10068+
10069 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10070
10071 #define L1_CACHE_SHIFT 5
10072-#define L1_CACHE_BYTES 32
10073+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10074
10075 #ifdef CONFIG_SPARC32
10076 #define SMP_CACHE_BYTES_SHIFT 5
10077diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10078index a24e41f..47677ff 100644
10079--- a/arch/sparc/include/asm/elf_32.h
10080+++ b/arch/sparc/include/asm/elf_32.h
10081@@ -114,6 +114,13 @@ typedef struct {
10082
10083 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10084
10085+#ifdef CONFIG_PAX_ASLR
10086+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10087+
10088+#define PAX_DELTA_MMAP_LEN 16
10089+#define PAX_DELTA_STACK_LEN 16
10090+#endif
10091+
10092 /* This yields a mask that user programs can use to figure out what
10093 instruction set this cpu supports. This can NOT be done in userspace
10094 on Sparc. */
10095diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10096index 370ca1e..d4f4a98 100644
10097--- a/arch/sparc/include/asm/elf_64.h
10098+++ b/arch/sparc/include/asm/elf_64.h
10099@@ -189,6 +189,13 @@ typedef struct {
10100 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10101 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10102
10103+#ifdef CONFIG_PAX_ASLR
10104+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10105+
10106+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10107+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10108+#endif
10109+
10110 extern unsigned long sparc64_elf_hwcap;
10111 #define ELF_HWCAP sparc64_elf_hwcap
10112
10113diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10114index a3890da..f6a408e 100644
10115--- a/arch/sparc/include/asm/pgalloc_32.h
10116+++ b/arch/sparc/include/asm/pgalloc_32.h
10117@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10118 }
10119
10120 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10121+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10122
10123 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10124 unsigned long address)
10125diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10126index 5e31871..13469c6 100644
10127--- a/arch/sparc/include/asm/pgalloc_64.h
10128+++ b/arch/sparc/include/asm/pgalloc_64.h
10129@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10130 }
10131
10132 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10133+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10134
10135 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10136 {
10137@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10138 }
10139
10140 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10141+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10142
10143 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10144 {
10145diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10146index 59ba6f6..4518128 100644
10147--- a/arch/sparc/include/asm/pgtable.h
10148+++ b/arch/sparc/include/asm/pgtable.h
10149@@ -5,4 +5,8 @@
10150 #else
10151 #include <asm/pgtable_32.h>
10152 #endif
10153+
10154+#define ktla_ktva(addr) (addr)
10155+#define ktva_ktla(addr) (addr)
10156+
10157 #endif
10158diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10159index b9b91ae..950b91e 100644
10160--- a/arch/sparc/include/asm/pgtable_32.h
10161+++ b/arch/sparc/include/asm/pgtable_32.h
10162@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10163 #define PAGE_SHARED SRMMU_PAGE_SHARED
10164 #define PAGE_COPY SRMMU_PAGE_COPY
10165 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10166+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10167+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10168+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10169 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10170
10171 /* Top-level page directory - dummy used by init-mm.
10172@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10173
10174 /* xwr */
10175 #define __P000 PAGE_NONE
10176-#define __P001 PAGE_READONLY
10177-#define __P010 PAGE_COPY
10178-#define __P011 PAGE_COPY
10179+#define __P001 PAGE_READONLY_NOEXEC
10180+#define __P010 PAGE_COPY_NOEXEC
10181+#define __P011 PAGE_COPY_NOEXEC
10182 #define __P100 PAGE_READONLY
10183 #define __P101 PAGE_READONLY
10184 #define __P110 PAGE_COPY
10185 #define __P111 PAGE_COPY
10186
10187 #define __S000 PAGE_NONE
10188-#define __S001 PAGE_READONLY
10189-#define __S010 PAGE_SHARED
10190-#define __S011 PAGE_SHARED
10191+#define __S001 PAGE_READONLY_NOEXEC
10192+#define __S010 PAGE_SHARED_NOEXEC
10193+#define __S011 PAGE_SHARED_NOEXEC
10194 #define __S100 PAGE_READONLY
10195 #define __S101 PAGE_READONLY
10196 #define __S110 PAGE_SHARED
10197diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10198index 79da178..c2eede8 100644
10199--- a/arch/sparc/include/asm/pgtsrmmu.h
10200+++ b/arch/sparc/include/asm/pgtsrmmu.h
10201@@ -115,6 +115,11 @@
10202 SRMMU_EXEC | SRMMU_REF)
10203 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10204 SRMMU_EXEC | SRMMU_REF)
10205+
10206+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10207+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10208+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10209+
10210 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10211 SRMMU_DIRTY | SRMMU_REF)
10212
10213diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10214index 29d64b1..4272fe8 100644
10215--- a/arch/sparc/include/asm/setup.h
10216+++ b/arch/sparc/include/asm/setup.h
10217@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10218 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10219
10220 /* init_64.c */
10221-extern atomic_t dcpage_flushes;
10222-extern atomic_t dcpage_flushes_xcall;
10223+extern atomic_unchecked_t dcpage_flushes;
10224+extern atomic_unchecked_t dcpage_flushes_xcall;
10225
10226 extern int sysctl_tsb_ratio;
10227 #endif
10228diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10229index 9689176..63c18ea 100644
10230--- a/arch/sparc/include/asm/spinlock_64.h
10231+++ b/arch/sparc/include/asm/spinlock_64.h
10232@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10233
10234 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10235
10236-static void inline arch_read_lock(arch_rwlock_t *lock)
10237+static inline void arch_read_lock(arch_rwlock_t *lock)
10238 {
10239 unsigned long tmp1, tmp2;
10240
10241 __asm__ __volatile__ (
10242 "1: ldsw [%2], %0\n"
10243 " brlz,pn %0, 2f\n"
10244-"4: add %0, 1, %1\n"
10245+"4: addcc %0, 1, %1\n"
10246+
10247+#ifdef CONFIG_PAX_REFCOUNT
10248+" tvs %%icc, 6\n"
10249+#endif
10250+
10251 " cas [%2], %0, %1\n"
10252 " cmp %0, %1\n"
10253 " bne,pn %%icc, 1b\n"
10254@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10255 " .previous"
10256 : "=&r" (tmp1), "=&r" (tmp2)
10257 : "r" (lock)
10258- : "memory");
10259+ : "memory", "cc");
10260 }
10261
10262-static int inline arch_read_trylock(arch_rwlock_t *lock)
10263+static inline int arch_read_trylock(arch_rwlock_t *lock)
10264 {
10265 int tmp1, tmp2;
10266
10267@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10268 "1: ldsw [%2], %0\n"
10269 " brlz,a,pn %0, 2f\n"
10270 " mov 0, %0\n"
10271-" add %0, 1, %1\n"
10272+" addcc %0, 1, %1\n"
10273+
10274+#ifdef CONFIG_PAX_REFCOUNT
10275+" tvs %%icc, 6\n"
10276+#endif
10277+
10278 " cas [%2], %0, %1\n"
10279 " cmp %0, %1\n"
10280 " bne,pn %%icc, 1b\n"
10281@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10282 return tmp1;
10283 }
10284
10285-static void inline arch_read_unlock(arch_rwlock_t *lock)
10286+static inline void arch_read_unlock(arch_rwlock_t *lock)
10287 {
10288 unsigned long tmp1, tmp2;
10289
10290 __asm__ __volatile__(
10291 "1: lduw [%2], %0\n"
10292-" sub %0, 1, %1\n"
10293+" subcc %0, 1, %1\n"
10294+
10295+#ifdef CONFIG_PAX_REFCOUNT
10296+" tvs %%icc, 6\n"
10297+#endif
10298+
10299 " cas [%2], %0, %1\n"
10300 " cmp %0, %1\n"
10301 " bne,pn %%xcc, 1b\n"
10302@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10303 : "memory");
10304 }
10305
10306-static void inline arch_write_lock(arch_rwlock_t *lock)
10307+static inline void arch_write_lock(arch_rwlock_t *lock)
10308 {
10309 unsigned long mask, tmp1, tmp2;
10310
10311@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10312 : "memory");
10313 }
10314
10315-static void inline arch_write_unlock(arch_rwlock_t *lock)
10316+static inline void arch_write_unlock(arch_rwlock_t *lock)
10317 {
10318 __asm__ __volatile__(
10319 " stw %%g0, [%0]"
10320@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10321 : "memory");
10322 }
10323
10324-static int inline arch_write_trylock(arch_rwlock_t *lock)
10325+static inline int arch_write_trylock(arch_rwlock_t *lock)
10326 {
10327 unsigned long mask, tmp1, tmp2, result;
10328
10329diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10330index 025c984..a216504 100644
10331--- a/arch/sparc/include/asm/thread_info_32.h
10332+++ b/arch/sparc/include/asm/thread_info_32.h
10333@@ -49,6 +49,8 @@ struct thread_info {
10334 unsigned long w_saved;
10335
10336 struct restart_block restart_block;
10337+
10338+ unsigned long lowest_stack;
10339 };
10340
10341 /*
10342diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10343index 798f027..b009941 100644
10344--- a/arch/sparc/include/asm/thread_info_64.h
10345+++ b/arch/sparc/include/asm/thread_info_64.h
10346@@ -63,6 +63,8 @@ struct thread_info {
10347 struct pt_regs *kern_una_regs;
10348 unsigned int kern_una_insn;
10349
10350+ unsigned long lowest_stack;
10351+
10352 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10353 __attribute__ ((aligned(64)));
10354 };
10355@@ -190,12 +192,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10356 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10357 /* flag bit 4 is available */
10358 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10359-/* flag bit 6 is available */
10360+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10361 #define TIF_32BIT 7 /* 32-bit binary */
10362 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10363 #define TIF_SECCOMP 9 /* secure computing */
10364 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10365 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10366+
10367 /* NOTE: Thread flags >= 12 should be ones we have no interest
10368 * in using in assembly, else we can't use the mask as
10369 * an immediate value in instructions such as andcc.
10370@@ -215,12 +218,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10371 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10372 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10373 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10374+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10375
10376 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10377 _TIF_DO_NOTIFY_RESUME_MASK | \
10378 _TIF_NEED_RESCHED)
10379 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10380
10381+#define _TIF_WORK_SYSCALL \
10382+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10383+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10384+
10385 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10386
10387 /*
10388diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10389index bd56c28..4b63d83 100644
10390--- a/arch/sparc/include/asm/uaccess.h
10391+++ b/arch/sparc/include/asm/uaccess.h
10392@@ -1,5 +1,6 @@
10393 #ifndef ___ASM_SPARC_UACCESS_H
10394 #define ___ASM_SPARC_UACCESS_H
10395+
10396 #if defined(__sparc__) && defined(__arch64__)
10397 #include <asm/uaccess_64.h>
10398 #else
10399diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10400index 9634d08..f55fe4f 100644
10401--- a/arch/sparc/include/asm/uaccess_32.h
10402+++ b/arch/sparc/include/asm/uaccess_32.h
10403@@ -250,27 +250,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10404
10405 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10406 {
10407- if (n && __access_ok((unsigned long) to, n))
10408+ if ((long)n < 0)
10409+ return n;
10410+
10411+ if (n && __access_ok((unsigned long) to, n)) {
10412+ if (!__builtin_constant_p(n))
10413+ check_object_size(from, n, true);
10414 return __copy_user(to, (__force void __user *) from, n);
10415- else
10416+ } else
10417 return n;
10418 }
10419
10420 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10421 {
10422+ if ((long)n < 0)
10423+ return n;
10424+
10425+ if (!__builtin_constant_p(n))
10426+ check_object_size(from, n, true);
10427+
10428 return __copy_user(to, (__force void __user *) from, n);
10429 }
10430
10431 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10432 {
10433- if (n && __access_ok((unsigned long) from, n))
10434+ if ((long)n < 0)
10435+ return n;
10436+
10437+ if (n && __access_ok((unsigned long) from, n)) {
10438+ if (!__builtin_constant_p(n))
10439+ check_object_size(to, n, false);
10440 return __copy_user((__force void __user *) to, from, n);
10441- else
10442+ } else
10443 return n;
10444 }
10445
10446 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10447 {
10448+ if ((long)n < 0)
10449+ return n;
10450+
10451 return __copy_user((__force void __user *) to, from, n);
10452 }
10453
10454diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10455index c990a5e..f17b9c1 100644
10456--- a/arch/sparc/include/asm/uaccess_64.h
10457+++ b/arch/sparc/include/asm/uaccess_64.h
10458@@ -10,6 +10,7 @@
10459 #include <linux/compiler.h>
10460 #include <linux/string.h>
10461 #include <linux/thread_info.h>
10462+#include <linux/kernel.h>
10463 #include <asm/asi.h>
10464 #include <asm/spitfire.h>
10465 #include <asm-generic/uaccess-unaligned.h>
10466@@ -214,8 +215,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10467 static inline unsigned long __must_check
10468 copy_from_user(void *to, const void __user *from, unsigned long size)
10469 {
10470- unsigned long ret = ___copy_from_user(to, from, size);
10471+ unsigned long ret;
10472
10473+ if ((long)size < 0 || size > INT_MAX)
10474+ return size;
10475+
10476+ if (!__builtin_constant_p(size))
10477+ check_object_size(to, size, false);
10478+
10479+ ret = ___copy_from_user(to, from, size);
10480 if (unlikely(ret))
10481 ret = copy_from_user_fixup(to, from, size);
10482
10483@@ -231,8 +239,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10484 static inline unsigned long __must_check
10485 copy_to_user(void __user *to, const void *from, unsigned long size)
10486 {
10487- unsigned long ret = ___copy_to_user(to, from, size);
10488+ unsigned long ret;
10489
10490+ if ((long)size < 0 || size > INT_MAX)
10491+ return size;
10492+
10493+ if (!__builtin_constant_p(size))
10494+ check_object_size(from, size, true);
10495+
10496+ ret = ___copy_to_user(to, from, size);
10497 if (unlikely(ret))
10498 ret = copy_to_user_fixup(to, from, size);
10499 return ret;
10500diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10501index 7cf9c6e..6206648 100644
10502--- a/arch/sparc/kernel/Makefile
10503+++ b/arch/sparc/kernel/Makefile
10504@@ -4,7 +4,7 @@
10505 #
10506
10507 asflags-y := -ansi
10508-ccflags-y := -Werror
10509+#ccflags-y := -Werror
10510
10511 extra-y := head_$(BITS).o
10512
10513diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10514index 50e7b62..79fae35 100644
10515--- a/arch/sparc/kernel/process_32.c
10516+++ b/arch/sparc/kernel/process_32.c
10517@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10518
10519 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10520 r->psr, r->pc, r->npc, r->y, print_tainted());
10521- printk("PC: <%pS>\n", (void *) r->pc);
10522+ printk("PC: <%pA>\n", (void *) r->pc);
10523 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10524 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10525 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10526 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10527 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10528 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10529- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10530+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10531
10532 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10533 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10534@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10535 rw = (struct reg_window32 *) fp;
10536 pc = rw->ins[7];
10537 printk("[%08lx : ", pc);
10538- printk("%pS ] ", (void *) pc);
10539+ printk("%pA ] ", (void *) pc);
10540 fp = rw->ins[6];
10541 } while (++count < 16);
10542 printk("\n");
10543diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10544index 0be7bf9..2b1cba8 100644
10545--- a/arch/sparc/kernel/process_64.c
10546+++ b/arch/sparc/kernel/process_64.c
10547@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10548 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10549 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10550 if (regs->tstate & TSTATE_PRIV)
10551- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10552+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10553 }
10554
10555 void show_regs(struct pt_regs *regs)
10556@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10557
10558 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10559 regs->tpc, regs->tnpc, regs->y, print_tainted());
10560- printk("TPC: <%pS>\n", (void *) regs->tpc);
10561+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10562 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10563 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10564 regs->u_regs[3]);
10565@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10566 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10567 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10568 regs->u_regs[15]);
10569- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10570+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10571 show_regwindow(regs);
10572 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10573 }
10574@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10575 ((tp && tp->task) ? tp->task->pid : -1));
10576
10577 if (gp->tstate & TSTATE_PRIV) {
10578- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10579+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10580 (void *) gp->tpc,
10581 (void *) gp->o7,
10582 (void *) gp->i7,
10583diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10584index 79cc0d1..ec62734 100644
10585--- a/arch/sparc/kernel/prom_common.c
10586+++ b/arch/sparc/kernel/prom_common.c
10587@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10588
10589 unsigned int prom_early_allocated __initdata;
10590
10591-static struct of_pdt_ops prom_sparc_ops __initdata = {
10592+static struct of_pdt_ops prom_sparc_ops __initconst = {
10593 .nextprop = prom_common_nextprop,
10594 .getproplen = prom_getproplen,
10595 .getproperty = prom_getproperty,
10596diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10597index 9ddc492..27a5619 100644
10598--- a/arch/sparc/kernel/ptrace_64.c
10599+++ b/arch/sparc/kernel/ptrace_64.c
10600@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10601 return ret;
10602 }
10603
10604+#ifdef CONFIG_GRKERNSEC_SETXID
10605+extern void gr_delayed_cred_worker(void);
10606+#endif
10607+
10608 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10609 {
10610 int ret = 0;
10611@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10612 if (test_thread_flag(TIF_NOHZ))
10613 user_exit();
10614
10615+#ifdef CONFIG_GRKERNSEC_SETXID
10616+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10617+ gr_delayed_cred_worker();
10618+#endif
10619+
10620 if (test_thread_flag(TIF_SYSCALL_TRACE))
10621 ret = tracehook_report_syscall_entry(regs);
10622
10623@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10624 if (test_thread_flag(TIF_NOHZ))
10625 user_exit();
10626
10627+#ifdef CONFIG_GRKERNSEC_SETXID
10628+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10629+ gr_delayed_cred_worker();
10630+#endif
10631+
10632 audit_syscall_exit(regs);
10633
10634 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10635diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10636index da6f1a7..e5dea8f 100644
10637--- a/arch/sparc/kernel/smp_64.c
10638+++ b/arch/sparc/kernel/smp_64.c
10639@@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10640 return;
10641
10642 #ifdef CONFIG_DEBUG_DCFLUSH
10643- atomic_inc(&dcpage_flushes);
10644+ atomic_inc_unchecked(&dcpage_flushes);
10645 #endif
10646
10647 this_cpu = get_cpu();
10648@@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10649 xcall_deliver(data0, __pa(pg_addr),
10650 (u64) pg_addr, cpumask_of(cpu));
10651 #ifdef CONFIG_DEBUG_DCFLUSH
10652- atomic_inc(&dcpage_flushes_xcall);
10653+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10654 #endif
10655 }
10656 }
10657@@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10658 preempt_disable();
10659
10660 #ifdef CONFIG_DEBUG_DCFLUSH
10661- atomic_inc(&dcpage_flushes);
10662+ atomic_inc_unchecked(&dcpage_flushes);
10663 #endif
10664 data0 = 0;
10665 pg_addr = page_address(page);
10666@@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10667 xcall_deliver(data0, __pa(pg_addr),
10668 (u64) pg_addr, cpu_online_mask);
10669 #ifdef CONFIG_DEBUG_DCFLUSH
10670- atomic_inc(&dcpage_flushes_xcall);
10671+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10672 #endif
10673 }
10674 __local_flush_dcache_page(page);
10675diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10676index 646988d..b88905f 100644
10677--- a/arch/sparc/kernel/sys_sparc_32.c
10678+++ b/arch/sparc/kernel/sys_sparc_32.c
10679@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10680 if (len > TASK_SIZE - PAGE_SIZE)
10681 return -ENOMEM;
10682 if (!addr)
10683- addr = TASK_UNMAPPED_BASE;
10684+ addr = current->mm->mmap_base;
10685
10686 info.flags = 0;
10687 info.length = len;
10688diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10689index c85403d..6af95c9 100644
10690--- a/arch/sparc/kernel/sys_sparc_64.c
10691+++ b/arch/sparc/kernel/sys_sparc_64.c
10692@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10693 struct vm_area_struct * vma;
10694 unsigned long task_size = TASK_SIZE;
10695 int do_color_align;
10696+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10697 struct vm_unmapped_area_info info;
10698
10699 if (flags & MAP_FIXED) {
10700 /* We do not accept a shared mapping if it would violate
10701 * cache aliasing constraints.
10702 */
10703- if ((flags & MAP_SHARED) &&
10704+ if ((filp || (flags & MAP_SHARED)) &&
10705 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10706 return -EINVAL;
10707 return addr;
10708@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10709 if (filp || (flags & MAP_SHARED))
10710 do_color_align = 1;
10711
10712+#ifdef CONFIG_PAX_RANDMMAP
10713+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10714+#endif
10715+
10716 if (addr) {
10717 if (do_color_align)
10718 addr = COLOR_ALIGN(addr, pgoff);
10719@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10720 addr = PAGE_ALIGN(addr);
10721
10722 vma = find_vma(mm, addr);
10723- if (task_size - len >= addr &&
10724- (!vma || addr + len <= vma->vm_start))
10725+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10726 return addr;
10727 }
10728
10729 info.flags = 0;
10730 info.length = len;
10731- info.low_limit = TASK_UNMAPPED_BASE;
10732+ info.low_limit = mm->mmap_base;
10733 info.high_limit = min(task_size, VA_EXCLUDE_START);
10734 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10735 info.align_offset = pgoff << PAGE_SHIFT;
10736+ info.threadstack_offset = offset;
10737 addr = vm_unmapped_area(&info);
10738
10739 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10740 VM_BUG_ON(addr != -ENOMEM);
10741 info.low_limit = VA_EXCLUDE_END;
10742+
10743+#ifdef CONFIG_PAX_RANDMMAP
10744+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10745+ info.low_limit += mm->delta_mmap;
10746+#endif
10747+
10748 info.high_limit = task_size;
10749 addr = vm_unmapped_area(&info);
10750 }
10751@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10752 unsigned long task_size = STACK_TOP32;
10753 unsigned long addr = addr0;
10754 int do_color_align;
10755+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10756 struct vm_unmapped_area_info info;
10757
10758 /* This should only ever run for 32-bit processes. */
10759@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10760 /* We do not accept a shared mapping if it would violate
10761 * cache aliasing constraints.
10762 */
10763- if ((flags & MAP_SHARED) &&
10764+ if ((filp || (flags & MAP_SHARED)) &&
10765 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10766 return -EINVAL;
10767 return addr;
10768@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10769 if (filp || (flags & MAP_SHARED))
10770 do_color_align = 1;
10771
10772+#ifdef CONFIG_PAX_RANDMMAP
10773+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10774+#endif
10775+
10776 /* requesting a specific address */
10777 if (addr) {
10778 if (do_color_align)
10779@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10780 addr = PAGE_ALIGN(addr);
10781
10782 vma = find_vma(mm, addr);
10783- if (task_size - len >= addr &&
10784- (!vma || addr + len <= vma->vm_start))
10785+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10786 return addr;
10787 }
10788
10789@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10790 info.high_limit = mm->mmap_base;
10791 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10792 info.align_offset = pgoff << PAGE_SHIFT;
10793+ info.threadstack_offset = offset;
10794 addr = vm_unmapped_area(&info);
10795
10796 /*
10797@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10798 VM_BUG_ON(addr != -ENOMEM);
10799 info.flags = 0;
10800 info.low_limit = TASK_UNMAPPED_BASE;
10801+
10802+#ifdef CONFIG_PAX_RANDMMAP
10803+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10804+ info.low_limit += mm->delta_mmap;
10805+#endif
10806+
10807 info.high_limit = STACK_TOP32;
10808 addr = vm_unmapped_area(&info);
10809 }
10810@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10811 EXPORT_SYMBOL(get_fb_unmapped_area);
10812
10813 /* Essentially the same as PowerPC. */
10814-static unsigned long mmap_rnd(void)
10815+static unsigned long mmap_rnd(struct mm_struct *mm)
10816 {
10817 unsigned long rnd = 0UL;
10818
10819+#ifdef CONFIG_PAX_RANDMMAP
10820+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10821+#endif
10822+
10823 if (current->flags & PF_RANDOMIZE) {
10824 unsigned long val = get_random_int();
10825 if (test_thread_flag(TIF_32BIT))
10826@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10827
10828 void arch_pick_mmap_layout(struct mm_struct *mm)
10829 {
10830- unsigned long random_factor = mmap_rnd();
10831+ unsigned long random_factor = mmap_rnd(mm);
10832 unsigned long gap;
10833
10834 /*
10835@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10836 gap == RLIM_INFINITY ||
10837 sysctl_legacy_va_layout) {
10838 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10839+
10840+#ifdef CONFIG_PAX_RANDMMAP
10841+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10842+ mm->mmap_base += mm->delta_mmap;
10843+#endif
10844+
10845 mm->get_unmapped_area = arch_get_unmapped_area;
10846 } else {
10847 /* We know it's 32-bit */
10848@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10849 gap = (task_size / 6 * 5);
10850
10851 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10852+
10853+#ifdef CONFIG_PAX_RANDMMAP
10854+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10855+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10856+#endif
10857+
10858 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10859 }
10860 }
10861diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10862index 33a17e7..d87fb1f 100644
10863--- a/arch/sparc/kernel/syscalls.S
10864+++ b/arch/sparc/kernel/syscalls.S
10865@@ -52,7 +52,7 @@ sys32_rt_sigreturn:
10866 #endif
10867 .align 32
10868 1: ldx [%g6 + TI_FLAGS], %l5
10869- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10870+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10871 be,pt %icc, rtrap
10872 nop
10873 call syscall_trace_leave
10874@@ -184,7 +184,7 @@ linux_sparc_syscall32:
10875
10876 srl %i3, 0, %o3 ! IEU0
10877 srl %i2, 0, %o2 ! IEU0 Group
10878- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10879+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10880 bne,pn %icc, linux_syscall_trace32 ! CTI
10881 mov %i0, %l5 ! IEU1
10882 5: call %l7 ! CTI Group brk forced
10883@@ -208,7 +208,7 @@ linux_sparc_syscall:
10884
10885 mov %i3, %o3 ! IEU1
10886 mov %i4, %o4 ! IEU0 Group
10887- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10888+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10889 bne,pn %icc, linux_syscall_trace ! CTI Group
10890 mov %i0, %l5 ! IEU0
10891 2: call %l7 ! CTI Group brk forced
10892@@ -223,7 +223,7 @@ ret_sys_call:
10893
10894 cmp %o0, -ERESTART_RESTARTBLOCK
10895 bgeu,pn %xcc, 1f
10896- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10897+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10898 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10899
10900 2:
10901diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10902index 6fd386c5..6907d81 100644
10903--- a/arch/sparc/kernel/traps_32.c
10904+++ b/arch/sparc/kernel/traps_32.c
10905@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10906 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10907 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10908
10909+extern void gr_handle_kernel_exploit(void);
10910+
10911 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10912 {
10913 static int die_counter;
10914@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10915 count++ < 30 &&
10916 (((unsigned long) rw) >= PAGE_OFFSET) &&
10917 !(((unsigned long) rw) & 0x7)) {
10918- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10919+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10920 (void *) rw->ins[7]);
10921 rw = (struct reg_window32 *)rw->ins[6];
10922 }
10923 }
10924 printk("Instruction DUMP:");
10925 instruction_dump ((unsigned long *) regs->pc);
10926- if(regs->psr & PSR_PS)
10927+ if(regs->psr & PSR_PS) {
10928+ gr_handle_kernel_exploit();
10929 do_exit(SIGKILL);
10930+ }
10931 do_exit(SIGSEGV);
10932 }
10933
10934diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10935index 981a769..d906eda 100644
10936--- a/arch/sparc/kernel/traps_64.c
10937+++ b/arch/sparc/kernel/traps_64.c
10938@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10939 i + 1,
10940 p->trapstack[i].tstate, p->trapstack[i].tpc,
10941 p->trapstack[i].tnpc, p->trapstack[i].tt);
10942- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10943+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10944 }
10945 }
10946
10947@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10948
10949 lvl -= 0x100;
10950 if (regs->tstate & TSTATE_PRIV) {
10951+
10952+#ifdef CONFIG_PAX_REFCOUNT
10953+ if (lvl == 6)
10954+ pax_report_refcount_overflow(regs);
10955+#endif
10956+
10957 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10958 die_if_kernel(buffer, regs);
10959 }
10960@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10961 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10962 {
10963 char buffer[32];
10964-
10965+
10966 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10967 0, lvl, SIGTRAP) == NOTIFY_STOP)
10968 return;
10969
10970+#ifdef CONFIG_PAX_REFCOUNT
10971+ if (lvl == 6)
10972+ pax_report_refcount_overflow(regs);
10973+#endif
10974+
10975 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10976
10977 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
10978@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
10979 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
10980 printk("%s" "ERROR(%d): ",
10981 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
10982- printk("TPC<%pS>\n", (void *) regs->tpc);
10983+ printk("TPC<%pA>\n", (void *) regs->tpc);
10984 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
10985 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
10986 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
10987@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10988 smp_processor_id(),
10989 (type & 0x1) ? 'I' : 'D',
10990 regs->tpc);
10991- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
10992+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
10993 panic("Irrecoverable Cheetah+ parity error.");
10994 }
10995
10996@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10997 smp_processor_id(),
10998 (type & 0x1) ? 'I' : 'D',
10999 regs->tpc);
11000- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11001+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11002 }
11003
11004 struct sun4v_error_entry {
11005@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11006 /*0x38*/u64 reserved_5;
11007 };
11008
11009-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11010-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11011+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11012+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11013
11014 static const char *sun4v_err_type_to_str(u8 type)
11015 {
11016@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11017 }
11018
11019 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11020- int cpu, const char *pfx, atomic_t *ocnt)
11021+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11022 {
11023 u64 *raw_ptr = (u64 *) ent;
11024 u32 attrs;
11025@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11026
11027 show_regs(regs);
11028
11029- if ((cnt = atomic_read(ocnt)) != 0) {
11030- atomic_set(ocnt, 0);
11031+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11032+ atomic_set_unchecked(ocnt, 0);
11033 wmb();
11034 printk("%s: Queue overflowed %d times.\n",
11035 pfx, cnt);
11036@@ -2048,7 +2059,7 @@ out:
11037 */
11038 void sun4v_resum_overflow(struct pt_regs *regs)
11039 {
11040- atomic_inc(&sun4v_resum_oflow_cnt);
11041+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11042 }
11043
11044 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11045@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11046 /* XXX Actually even this can make not that much sense. Perhaps
11047 * XXX we should just pull the plug and panic directly from here?
11048 */
11049- atomic_inc(&sun4v_nonresum_oflow_cnt);
11050+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11051 }
11052
11053 static void sun4v_tlb_error(struct pt_regs *regs)
11054@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11055
11056 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11057 regs->tpc, tl);
11058- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11059+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11060 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11061- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11062+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11063 (void *) regs->u_regs[UREG_I7]);
11064 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11065 "pte[%lx] error[%lx]\n",
11066@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11067
11068 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11069 regs->tpc, tl);
11070- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11071+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11072 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11073- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11074+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11075 (void *) regs->u_regs[UREG_I7]);
11076 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11077 "pte[%lx] error[%lx]\n",
11078@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11079 fp = (unsigned long)sf->fp + STACK_BIAS;
11080 }
11081
11082- printk(" [%016lx] %pS\n", pc, (void *) pc);
11083+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11084 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11085 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11086 int index = tsk->curr_ret_stack;
11087 if (tsk->ret_stack && index >= graph) {
11088 pc = tsk->ret_stack[index - graph].ret;
11089- printk(" [%016lx] %pS\n", pc, (void *) pc);
11090+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11091 graph++;
11092 }
11093 }
11094@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11095 return (struct reg_window *) (fp + STACK_BIAS);
11096 }
11097
11098+extern void gr_handle_kernel_exploit(void);
11099+
11100 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11101 {
11102 static int die_counter;
11103@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11104 while (rw &&
11105 count++ < 30 &&
11106 kstack_valid(tp, (unsigned long) rw)) {
11107- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11108+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11109 (void *) rw->ins[7]);
11110
11111 rw = kernel_stack_up(rw);
11112@@ -2427,8 +2440,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11113 }
11114 user_instruction_dump ((unsigned int __user *) regs->tpc);
11115 }
11116- if (regs->tstate & TSTATE_PRIV)
11117+ if (regs->tstate & TSTATE_PRIV) {
11118+ gr_handle_kernel_exploit();
11119 do_exit(SIGKILL);
11120+ }
11121 do_exit(SIGSEGV);
11122 }
11123 EXPORT_SYMBOL(die_if_kernel);
11124diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11125index 62098a8..547ab2c 100644
11126--- a/arch/sparc/kernel/unaligned_64.c
11127+++ b/arch/sparc/kernel/unaligned_64.c
11128@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11129 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11130
11131 if (__ratelimit(&ratelimit)) {
11132- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11133+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11134 regs->tpc, (void *) regs->tpc);
11135 }
11136 }
11137diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11138index 3269b02..64f5231 100644
11139--- a/arch/sparc/lib/Makefile
11140+++ b/arch/sparc/lib/Makefile
11141@@ -2,7 +2,7 @@
11142 #
11143
11144 asflags-y := -ansi -DST_DIV0=0x02
11145-ccflags-y := -Werror
11146+#ccflags-y := -Werror
11147
11148 lib-$(CONFIG_SPARC32) += ashrdi3.o
11149 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11150diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11151index 05dac43..76f8ed4 100644
11152--- a/arch/sparc/lib/atomic_64.S
11153+++ b/arch/sparc/lib/atomic_64.S
11154@@ -15,11 +15,22 @@
11155 * a value and does the barriers.
11156 */
11157
11158-#define ATOMIC_OP(op) \
11159-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11160+#ifdef CONFIG_PAX_REFCOUNT
11161+#define __REFCOUNT_OP(op) op##cc
11162+#define __OVERFLOW_IOP tvs %icc, 6;
11163+#define __OVERFLOW_XOP tvs %xcc, 6;
11164+#else
11165+#define __REFCOUNT_OP(op) op
11166+#define __OVERFLOW_IOP
11167+#define __OVERFLOW_XOP
11168+#endif
11169+
11170+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11171+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11172 BACKOFF_SETUP(%o2); \
11173 1: lduw [%o1], %g1; \
11174- op %g1, %o0, %g7; \
11175+ asm_op %g1, %o0, %g7; \
11176+ post_op \
11177 cas [%o1], %g1, %g7; \
11178 cmp %g1, %g7; \
11179 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11180@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11181 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11182 ENDPROC(atomic_##op); \
11183
11184-#define ATOMIC_OP_RETURN(op) \
11185-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11186+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11187+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11188+
11189+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11190+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11191 BACKOFF_SETUP(%o2); \
11192 1: lduw [%o1], %g1; \
11193- op %g1, %o0, %g7; \
11194+ asm_op %g1, %o0, %g7; \
11195+ post_op \
11196 cas [%o1], %g1, %g7; \
11197 cmp %g1, %g7; \
11198 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11199@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11200 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11201 ENDPROC(atomic_##op##_return);
11202
11203+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11204+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11205+
11206 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11207
11208 ATOMIC_OPS(add)
11209@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11210
11211 #undef ATOMIC_OPS
11212 #undef ATOMIC_OP_RETURN
11213+#undef __ATOMIC_OP_RETURN
11214 #undef ATOMIC_OP
11215+#undef __ATOMIC_OP
11216
11217-#define ATOMIC64_OP(op) \
11218-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11219+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11220+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11221 BACKOFF_SETUP(%o2); \
11222 1: ldx [%o1], %g1; \
11223- op %g1, %o0, %g7; \
11224+ asm_op %g1, %o0, %g7; \
11225+ post_op \
11226 casx [%o1], %g1, %g7; \
11227 cmp %g1, %g7; \
11228 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11229@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11230 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11231 ENDPROC(atomic64_##op); \
11232
11233-#define ATOMIC64_OP_RETURN(op) \
11234-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11235+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11236+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11237+
11238+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11239+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11240 BACKOFF_SETUP(%o2); \
11241 1: ldx [%o1], %g1; \
11242- op %g1, %o0, %g7; \
11243+ asm_op %g1, %o0, %g7; \
11244+ post_op \
11245 casx [%o1], %g1, %g7; \
11246 cmp %g1, %g7; \
11247 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11248@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11249 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11250 ENDPROC(atomic64_##op##_return);
11251
11252+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11253+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11254+
11255 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11256
11257 ATOMIC64_OPS(add)
11258@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11259
11260 #undef ATOMIC64_OPS
11261 #undef ATOMIC64_OP_RETURN
11262+#undef __ATOMIC64_OP_RETURN
11263 #undef ATOMIC64_OP
11264+#undef __ATOMIC64_OP
11265+#undef __OVERFLOW_XOP
11266+#undef __OVERFLOW_IOP
11267+#undef __REFCOUNT_OP
11268
11269 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11270 BACKOFF_SETUP(%o2)
11271diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11272index 1d649a9..fbc5bfc 100644
11273--- a/arch/sparc/lib/ksyms.c
11274+++ b/arch/sparc/lib/ksyms.c
11275@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11276 /* Atomic counter implementation. */
11277 #define ATOMIC_OP(op) \
11278 EXPORT_SYMBOL(atomic_##op); \
11279-EXPORT_SYMBOL(atomic64_##op);
11280+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11281+EXPORT_SYMBOL(atomic64_##op); \
11282+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11283
11284 #define ATOMIC_OP_RETURN(op) \
11285 EXPORT_SYMBOL(atomic_##op##_return); \
11286@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11287 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11288
11289 ATOMIC_OPS(add)
11290+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11291+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11292 ATOMIC_OPS(sub)
11293
11294 #undef ATOMIC_OPS
11295diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11296index 30c3ecc..736f015 100644
11297--- a/arch/sparc/mm/Makefile
11298+++ b/arch/sparc/mm/Makefile
11299@@ -2,7 +2,7 @@
11300 #
11301
11302 asflags-y := -ansi
11303-ccflags-y := -Werror
11304+#ccflags-y := -Werror
11305
11306 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11307 obj-y += fault_$(BITS).o
11308diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11309index 908e8c1..1524793 100644
11310--- a/arch/sparc/mm/fault_32.c
11311+++ b/arch/sparc/mm/fault_32.c
11312@@ -21,6 +21,9 @@
11313 #include <linux/perf_event.h>
11314 #include <linux/interrupt.h>
11315 #include <linux/kdebug.h>
11316+#include <linux/slab.h>
11317+#include <linux/pagemap.h>
11318+#include <linux/compiler.h>
11319
11320 #include <asm/page.h>
11321 #include <asm/pgtable.h>
11322@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11323 return safe_compute_effective_address(regs, insn);
11324 }
11325
11326+#ifdef CONFIG_PAX_PAGEEXEC
11327+#ifdef CONFIG_PAX_DLRESOLVE
11328+static void pax_emuplt_close(struct vm_area_struct *vma)
11329+{
11330+ vma->vm_mm->call_dl_resolve = 0UL;
11331+}
11332+
11333+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11334+{
11335+ unsigned int *kaddr;
11336+
11337+ vmf->page = alloc_page(GFP_HIGHUSER);
11338+ if (!vmf->page)
11339+ return VM_FAULT_OOM;
11340+
11341+ kaddr = kmap(vmf->page);
11342+ memset(kaddr, 0, PAGE_SIZE);
11343+ kaddr[0] = 0x9DE3BFA8U; /* save */
11344+ flush_dcache_page(vmf->page);
11345+ kunmap(vmf->page);
11346+ return VM_FAULT_MAJOR;
11347+}
11348+
11349+static const struct vm_operations_struct pax_vm_ops = {
11350+ .close = pax_emuplt_close,
11351+ .fault = pax_emuplt_fault
11352+};
11353+
11354+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11355+{
11356+ int ret;
11357+
11358+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11359+ vma->vm_mm = current->mm;
11360+ vma->vm_start = addr;
11361+ vma->vm_end = addr + PAGE_SIZE;
11362+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11363+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11364+ vma->vm_ops = &pax_vm_ops;
11365+
11366+ ret = insert_vm_struct(current->mm, vma);
11367+ if (ret)
11368+ return ret;
11369+
11370+ ++current->mm->total_vm;
11371+ return 0;
11372+}
11373+#endif
11374+
11375+/*
11376+ * PaX: decide what to do with offenders (regs->pc = fault address)
11377+ *
11378+ * returns 1 when task should be killed
11379+ * 2 when patched PLT trampoline was detected
11380+ * 3 when unpatched PLT trampoline was detected
11381+ */
11382+static int pax_handle_fetch_fault(struct pt_regs *regs)
11383+{
11384+
11385+#ifdef CONFIG_PAX_EMUPLT
11386+ int err;
11387+
11388+ do { /* PaX: patched PLT emulation #1 */
11389+ unsigned int sethi1, sethi2, jmpl;
11390+
11391+ err = get_user(sethi1, (unsigned int *)regs->pc);
11392+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11393+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11394+
11395+ if (err)
11396+ break;
11397+
11398+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11399+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11400+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11401+ {
11402+ unsigned int addr;
11403+
11404+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11405+ addr = regs->u_regs[UREG_G1];
11406+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11407+ regs->pc = addr;
11408+ regs->npc = addr+4;
11409+ return 2;
11410+ }
11411+ } while (0);
11412+
11413+ do { /* PaX: patched PLT emulation #2 */
11414+ unsigned int ba;
11415+
11416+ err = get_user(ba, (unsigned int *)regs->pc);
11417+
11418+ if (err)
11419+ break;
11420+
11421+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11422+ unsigned int addr;
11423+
11424+ if ((ba & 0xFFC00000U) == 0x30800000U)
11425+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11426+ else
11427+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11428+ regs->pc = addr;
11429+ regs->npc = addr+4;
11430+ return 2;
11431+ }
11432+ } while (0);
11433+
11434+ do { /* PaX: patched PLT emulation #3 */
11435+ unsigned int sethi, bajmpl, nop;
11436+
11437+ err = get_user(sethi, (unsigned int *)regs->pc);
11438+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11439+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11440+
11441+ if (err)
11442+ break;
11443+
11444+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11445+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11446+ nop == 0x01000000U)
11447+ {
11448+ unsigned int addr;
11449+
11450+ addr = (sethi & 0x003FFFFFU) << 10;
11451+ regs->u_regs[UREG_G1] = addr;
11452+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11453+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11454+ else
11455+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11456+ regs->pc = addr;
11457+ regs->npc = addr+4;
11458+ return 2;
11459+ }
11460+ } while (0);
11461+
11462+ do { /* PaX: unpatched PLT emulation step 1 */
11463+ unsigned int sethi, ba, nop;
11464+
11465+ err = get_user(sethi, (unsigned int *)regs->pc);
11466+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11467+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11468+
11469+ if (err)
11470+ break;
11471+
11472+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11473+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11474+ nop == 0x01000000U)
11475+ {
11476+ unsigned int addr, save, call;
11477+
11478+ if ((ba & 0xFFC00000U) == 0x30800000U)
11479+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11480+ else
11481+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11482+
11483+ err = get_user(save, (unsigned int *)addr);
11484+ err |= get_user(call, (unsigned int *)(addr+4));
11485+ err |= get_user(nop, (unsigned int *)(addr+8));
11486+ if (err)
11487+ break;
11488+
11489+#ifdef CONFIG_PAX_DLRESOLVE
11490+ if (save == 0x9DE3BFA8U &&
11491+ (call & 0xC0000000U) == 0x40000000U &&
11492+ nop == 0x01000000U)
11493+ {
11494+ struct vm_area_struct *vma;
11495+ unsigned long call_dl_resolve;
11496+
11497+ down_read(&current->mm->mmap_sem);
11498+ call_dl_resolve = current->mm->call_dl_resolve;
11499+ up_read(&current->mm->mmap_sem);
11500+ if (likely(call_dl_resolve))
11501+ goto emulate;
11502+
11503+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11504+
11505+ down_write(&current->mm->mmap_sem);
11506+ if (current->mm->call_dl_resolve) {
11507+ call_dl_resolve = current->mm->call_dl_resolve;
11508+ up_write(&current->mm->mmap_sem);
11509+ if (vma)
11510+ kmem_cache_free(vm_area_cachep, vma);
11511+ goto emulate;
11512+ }
11513+
11514+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11515+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11516+ up_write(&current->mm->mmap_sem);
11517+ if (vma)
11518+ kmem_cache_free(vm_area_cachep, vma);
11519+ return 1;
11520+ }
11521+
11522+ if (pax_insert_vma(vma, call_dl_resolve)) {
11523+ up_write(&current->mm->mmap_sem);
11524+ kmem_cache_free(vm_area_cachep, vma);
11525+ return 1;
11526+ }
11527+
11528+ current->mm->call_dl_resolve = call_dl_resolve;
11529+ up_write(&current->mm->mmap_sem);
11530+
11531+emulate:
11532+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11533+ regs->pc = call_dl_resolve;
11534+ regs->npc = addr+4;
11535+ return 3;
11536+ }
11537+#endif
11538+
11539+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11540+ if ((save & 0xFFC00000U) == 0x05000000U &&
11541+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11542+ nop == 0x01000000U)
11543+ {
11544+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11545+ regs->u_regs[UREG_G2] = addr + 4;
11546+ addr = (save & 0x003FFFFFU) << 10;
11547+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11548+ regs->pc = addr;
11549+ regs->npc = addr+4;
11550+ return 3;
11551+ }
11552+ }
11553+ } while (0);
11554+
11555+ do { /* PaX: unpatched PLT emulation step 2 */
11556+ unsigned int save, call, nop;
11557+
11558+ err = get_user(save, (unsigned int *)(regs->pc-4));
11559+ err |= get_user(call, (unsigned int *)regs->pc);
11560+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11561+ if (err)
11562+ break;
11563+
11564+ if (save == 0x9DE3BFA8U &&
11565+ (call & 0xC0000000U) == 0x40000000U &&
11566+ nop == 0x01000000U)
11567+ {
11568+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11569+
11570+ regs->u_regs[UREG_RETPC] = regs->pc;
11571+ regs->pc = dl_resolve;
11572+ regs->npc = dl_resolve+4;
11573+ return 3;
11574+ }
11575+ } while (0);
11576+#endif
11577+
11578+ return 1;
11579+}
11580+
11581+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11582+{
11583+ unsigned long i;
11584+
11585+ printk(KERN_ERR "PAX: bytes at PC: ");
11586+ for (i = 0; i < 8; i++) {
11587+ unsigned int c;
11588+ if (get_user(c, (unsigned int *)pc+i))
11589+ printk(KERN_CONT "???????? ");
11590+ else
11591+ printk(KERN_CONT "%08x ", c);
11592+ }
11593+ printk("\n");
11594+}
11595+#endif
11596+
11597 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11598 int text_fault)
11599 {
11600@@ -226,6 +500,24 @@ good_area:
11601 if (!(vma->vm_flags & VM_WRITE))
11602 goto bad_area;
11603 } else {
11604+
11605+#ifdef CONFIG_PAX_PAGEEXEC
11606+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11607+ up_read(&mm->mmap_sem);
11608+ switch (pax_handle_fetch_fault(regs)) {
11609+
11610+#ifdef CONFIG_PAX_EMUPLT
11611+ case 2:
11612+ case 3:
11613+ return;
11614+#endif
11615+
11616+ }
11617+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11618+ do_group_exit(SIGKILL);
11619+ }
11620+#endif
11621+
11622 /* Allow reads even for write-only mappings */
11623 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11624 goto bad_area;
11625diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11626index 18fcd71..e4fe821 100644
11627--- a/arch/sparc/mm/fault_64.c
11628+++ b/arch/sparc/mm/fault_64.c
11629@@ -22,6 +22,9 @@
11630 #include <linux/kdebug.h>
11631 #include <linux/percpu.h>
11632 #include <linux/context_tracking.h>
11633+#include <linux/slab.h>
11634+#include <linux/pagemap.h>
11635+#include <linux/compiler.h>
11636
11637 #include <asm/page.h>
11638 #include <asm/pgtable.h>
11639@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11640 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11641 regs->tpc);
11642 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11643- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11644+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11645 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11646 dump_stack();
11647 unhandled_fault(regs->tpc, current, regs);
11648@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11649 show_regs(regs);
11650 }
11651
11652+#ifdef CONFIG_PAX_PAGEEXEC
11653+#ifdef CONFIG_PAX_DLRESOLVE
11654+static void pax_emuplt_close(struct vm_area_struct *vma)
11655+{
11656+ vma->vm_mm->call_dl_resolve = 0UL;
11657+}
11658+
11659+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11660+{
11661+ unsigned int *kaddr;
11662+
11663+ vmf->page = alloc_page(GFP_HIGHUSER);
11664+ if (!vmf->page)
11665+ return VM_FAULT_OOM;
11666+
11667+ kaddr = kmap(vmf->page);
11668+ memset(kaddr, 0, PAGE_SIZE);
11669+ kaddr[0] = 0x9DE3BFA8U; /* save */
11670+ flush_dcache_page(vmf->page);
11671+ kunmap(vmf->page);
11672+ return VM_FAULT_MAJOR;
11673+}
11674+
11675+static const struct vm_operations_struct pax_vm_ops = {
11676+ .close = pax_emuplt_close,
11677+ .fault = pax_emuplt_fault
11678+};
11679+
11680+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11681+{
11682+ int ret;
11683+
11684+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11685+ vma->vm_mm = current->mm;
11686+ vma->vm_start = addr;
11687+ vma->vm_end = addr + PAGE_SIZE;
11688+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11689+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11690+ vma->vm_ops = &pax_vm_ops;
11691+
11692+ ret = insert_vm_struct(current->mm, vma);
11693+ if (ret)
11694+ return ret;
11695+
11696+ ++current->mm->total_vm;
11697+ return 0;
11698+}
11699+#endif
11700+
11701+/*
11702+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11703+ *
11704+ * returns 1 when task should be killed
11705+ * 2 when patched PLT trampoline was detected
11706+ * 3 when unpatched PLT trampoline was detected
11707+ */
11708+static int pax_handle_fetch_fault(struct pt_regs *regs)
11709+{
11710+
11711+#ifdef CONFIG_PAX_EMUPLT
11712+ int err;
11713+
11714+ do { /* PaX: patched PLT emulation #1 */
11715+ unsigned int sethi1, sethi2, jmpl;
11716+
11717+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11718+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11719+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11720+
11721+ if (err)
11722+ break;
11723+
11724+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11725+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11726+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11727+ {
11728+ unsigned long addr;
11729+
11730+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11731+ addr = regs->u_regs[UREG_G1];
11732+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11733+
11734+ if (test_thread_flag(TIF_32BIT))
11735+ addr &= 0xFFFFFFFFUL;
11736+
11737+ regs->tpc = addr;
11738+ regs->tnpc = addr+4;
11739+ return 2;
11740+ }
11741+ } while (0);
11742+
11743+ do { /* PaX: patched PLT emulation #2 */
11744+ unsigned int ba;
11745+
11746+ err = get_user(ba, (unsigned int *)regs->tpc);
11747+
11748+ if (err)
11749+ break;
11750+
11751+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11752+ unsigned long addr;
11753+
11754+ if ((ba & 0xFFC00000U) == 0x30800000U)
11755+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11756+ else
11757+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11758+
11759+ if (test_thread_flag(TIF_32BIT))
11760+ addr &= 0xFFFFFFFFUL;
11761+
11762+ regs->tpc = addr;
11763+ regs->tnpc = addr+4;
11764+ return 2;
11765+ }
11766+ } while (0);
11767+
11768+ do { /* PaX: patched PLT emulation #3 */
11769+ unsigned int sethi, bajmpl, nop;
11770+
11771+ err = get_user(sethi, (unsigned int *)regs->tpc);
11772+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11773+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11774+
11775+ if (err)
11776+ break;
11777+
11778+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11779+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11780+ nop == 0x01000000U)
11781+ {
11782+ unsigned long addr;
11783+
11784+ addr = (sethi & 0x003FFFFFU) << 10;
11785+ regs->u_regs[UREG_G1] = addr;
11786+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11787+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11788+ else
11789+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11790+
11791+ if (test_thread_flag(TIF_32BIT))
11792+ addr &= 0xFFFFFFFFUL;
11793+
11794+ regs->tpc = addr;
11795+ regs->tnpc = addr+4;
11796+ return 2;
11797+ }
11798+ } while (0);
11799+
11800+ do { /* PaX: patched PLT emulation #4 */
11801+ unsigned int sethi, mov1, call, mov2;
11802+
11803+ err = get_user(sethi, (unsigned int *)regs->tpc);
11804+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11805+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11806+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11807+
11808+ if (err)
11809+ break;
11810+
11811+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11812+ mov1 == 0x8210000FU &&
11813+ (call & 0xC0000000U) == 0x40000000U &&
11814+ mov2 == 0x9E100001U)
11815+ {
11816+ unsigned long addr;
11817+
11818+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11819+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11820+
11821+ if (test_thread_flag(TIF_32BIT))
11822+ addr &= 0xFFFFFFFFUL;
11823+
11824+ regs->tpc = addr;
11825+ regs->tnpc = addr+4;
11826+ return 2;
11827+ }
11828+ } while (0);
11829+
11830+ do { /* PaX: patched PLT emulation #5 */
11831+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11832+
11833+ err = get_user(sethi, (unsigned int *)regs->tpc);
11834+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11835+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11836+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11837+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11838+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11839+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11840+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11841+
11842+ if (err)
11843+ break;
11844+
11845+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11846+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11847+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11848+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11849+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11850+ sllx == 0x83287020U &&
11851+ jmpl == 0x81C04005U &&
11852+ nop == 0x01000000U)
11853+ {
11854+ unsigned long addr;
11855+
11856+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11857+ regs->u_regs[UREG_G1] <<= 32;
11858+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11859+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11860+ regs->tpc = addr;
11861+ regs->tnpc = addr+4;
11862+ return 2;
11863+ }
11864+ } while (0);
11865+
11866+ do { /* PaX: patched PLT emulation #6 */
11867+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11868+
11869+ err = get_user(sethi, (unsigned int *)regs->tpc);
11870+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11871+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11872+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11873+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11874+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11875+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11876+
11877+ if (err)
11878+ break;
11879+
11880+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11881+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11882+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11883+ sllx == 0x83287020U &&
11884+ (or & 0xFFFFE000U) == 0x8A116000U &&
11885+ jmpl == 0x81C04005U &&
11886+ nop == 0x01000000U)
11887+ {
11888+ unsigned long addr;
11889+
11890+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11891+ regs->u_regs[UREG_G1] <<= 32;
11892+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11893+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11894+ regs->tpc = addr;
11895+ regs->tnpc = addr+4;
11896+ return 2;
11897+ }
11898+ } while (0);
11899+
11900+ do { /* PaX: unpatched PLT emulation step 1 */
11901+ unsigned int sethi, ba, nop;
11902+
11903+ err = get_user(sethi, (unsigned int *)regs->tpc);
11904+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11905+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11906+
11907+ if (err)
11908+ break;
11909+
11910+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11911+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11912+ nop == 0x01000000U)
11913+ {
11914+ unsigned long addr;
11915+ unsigned int save, call;
11916+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11917+
11918+ if ((ba & 0xFFC00000U) == 0x30800000U)
11919+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11920+ else
11921+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11922+
11923+ if (test_thread_flag(TIF_32BIT))
11924+ addr &= 0xFFFFFFFFUL;
11925+
11926+ err = get_user(save, (unsigned int *)addr);
11927+ err |= get_user(call, (unsigned int *)(addr+4));
11928+ err |= get_user(nop, (unsigned int *)(addr+8));
11929+ if (err)
11930+ break;
11931+
11932+#ifdef CONFIG_PAX_DLRESOLVE
11933+ if (save == 0x9DE3BFA8U &&
11934+ (call & 0xC0000000U) == 0x40000000U &&
11935+ nop == 0x01000000U)
11936+ {
11937+ struct vm_area_struct *vma;
11938+ unsigned long call_dl_resolve;
11939+
11940+ down_read(&current->mm->mmap_sem);
11941+ call_dl_resolve = current->mm->call_dl_resolve;
11942+ up_read(&current->mm->mmap_sem);
11943+ if (likely(call_dl_resolve))
11944+ goto emulate;
11945+
11946+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11947+
11948+ down_write(&current->mm->mmap_sem);
11949+ if (current->mm->call_dl_resolve) {
11950+ call_dl_resolve = current->mm->call_dl_resolve;
11951+ up_write(&current->mm->mmap_sem);
11952+ if (vma)
11953+ kmem_cache_free(vm_area_cachep, vma);
11954+ goto emulate;
11955+ }
11956+
11957+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11958+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11959+ up_write(&current->mm->mmap_sem);
11960+ if (vma)
11961+ kmem_cache_free(vm_area_cachep, vma);
11962+ return 1;
11963+ }
11964+
11965+ if (pax_insert_vma(vma, call_dl_resolve)) {
11966+ up_write(&current->mm->mmap_sem);
11967+ kmem_cache_free(vm_area_cachep, vma);
11968+ return 1;
11969+ }
11970+
11971+ current->mm->call_dl_resolve = call_dl_resolve;
11972+ up_write(&current->mm->mmap_sem);
11973+
11974+emulate:
11975+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11976+ regs->tpc = call_dl_resolve;
11977+ regs->tnpc = addr+4;
11978+ return 3;
11979+ }
11980+#endif
11981+
11982+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11983+ if ((save & 0xFFC00000U) == 0x05000000U &&
11984+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11985+ nop == 0x01000000U)
11986+ {
11987+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11988+ regs->u_regs[UREG_G2] = addr + 4;
11989+ addr = (save & 0x003FFFFFU) << 10;
11990+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11991+
11992+ if (test_thread_flag(TIF_32BIT))
11993+ addr &= 0xFFFFFFFFUL;
11994+
11995+ regs->tpc = addr;
11996+ regs->tnpc = addr+4;
11997+ return 3;
11998+ }
11999+
12000+ /* PaX: 64-bit PLT stub */
12001+ err = get_user(sethi1, (unsigned int *)addr);
12002+ err |= get_user(sethi2, (unsigned int *)(addr+4));
12003+ err |= get_user(or1, (unsigned int *)(addr+8));
12004+ err |= get_user(or2, (unsigned int *)(addr+12));
12005+ err |= get_user(sllx, (unsigned int *)(addr+16));
12006+ err |= get_user(add, (unsigned int *)(addr+20));
12007+ err |= get_user(jmpl, (unsigned int *)(addr+24));
12008+ err |= get_user(nop, (unsigned int *)(addr+28));
12009+ if (err)
12010+ break;
12011+
12012+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12013+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12014+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12015+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12016+ sllx == 0x89293020U &&
12017+ add == 0x8A010005U &&
12018+ jmpl == 0x89C14000U &&
12019+ nop == 0x01000000U)
12020+ {
12021+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12022+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12023+ regs->u_regs[UREG_G4] <<= 32;
12024+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12025+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12026+ regs->u_regs[UREG_G4] = addr + 24;
12027+ addr = regs->u_regs[UREG_G5];
12028+ regs->tpc = addr;
12029+ regs->tnpc = addr+4;
12030+ return 3;
12031+ }
12032+ }
12033+ } while (0);
12034+
12035+#ifdef CONFIG_PAX_DLRESOLVE
12036+ do { /* PaX: unpatched PLT emulation step 2 */
12037+ unsigned int save, call, nop;
12038+
12039+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12040+ err |= get_user(call, (unsigned int *)regs->tpc);
12041+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12042+ if (err)
12043+ break;
12044+
12045+ if (save == 0x9DE3BFA8U &&
12046+ (call & 0xC0000000U) == 0x40000000U &&
12047+ nop == 0x01000000U)
12048+ {
12049+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12050+
12051+ if (test_thread_flag(TIF_32BIT))
12052+ dl_resolve &= 0xFFFFFFFFUL;
12053+
12054+ regs->u_regs[UREG_RETPC] = regs->tpc;
12055+ regs->tpc = dl_resolve;
12056+ regs->tnpc = dl_resolve+4;
12057+ return 3;
12058+ }
12059+ } while (0);
12060+#endif
12061+
12062+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12063+ unsigned int sethi, ba, nop;
12064+
12065+ err = get_user(sethi, (unsigned int *)regs->tpc);
12066+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12067+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12068+
12069+ if (err)
12070+ break;
12071+
12072+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12073+ (ba & 0xFFF00000U) == 0x30600000U &&
12074+ nop == 0x01000000U)
12075+ {
12076+ unsigned long addr;
12077+
12078+ addr = (sethi & 0x003FFFFFU) << 10;
12079+ regs->u_regs[UREG_G1] = addr;
12080+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12081+
12082+ if (test_thread_flag(TIF_32BIT))
12083+ addr &= 0xFFFFFFFFUL;
12084+
12085+ regs->tpc = addr;
12086+ regs->tnpc = addr+4;
12087+ return 2;
12088+ }
12089+ } while (0);
12090+
12091+#endif
12092+
12093+ return 1;
12094+}
12095+
12096+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12097+{
12098+ unsigned long i;
12099+
12100+ printk(KERN_ERR "PAX: bytes at PC: ");
12101+ for (i = 0; i < 8; i++) {
12102+ unsigned int c;
12103+ if (get_user(c, (unsigned int *)pc+i))
12104+ printk(KERN_CONT "???????? ");
12105+ else
12106+ printk(KERN_CONT "%08x ", c);
12107+ }
12108+ printk("\n");
12109+}
12110+#endif
12111+
12112 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12113 {
12114 enum ctx_state prev_state = exception_enter();
12115@@ -353,6 +816,29 @@ retry:
12116 if (!vma)
12117 goto bad_area;
12118
12119+#ifdef CONFIG_PAX_PAGEEXEC
12120+ /* PaX: detect ITLB misses on non-exec pages */
12121+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12122+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12123+ {
12124+ if (address != regs->tpc)
12125+ goto good_area;
12126+
12127+ up_read(&mm->mmap_sem);
12128+ switch (pax_handle_fetch_fault(regs)) {
12129+
12130+#ifdef CONFIG_PAX_EMUPLT
12131+ case 2:
12132+ case 3:
12133+ return;
12134+#endif
12135+
12136+ }
12137+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12138+ do_group_exit(SIGKILL);
12139+ }
12140+#endif
12141+
12142 /* Pure DTLB misses do not tell us whether the fault causing
12143 * load/store/atomic was a write or not, it only says that there
12144 * was no match. So in such a case we (carefully) read the
12145diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12146index d329537..2c3746a 100644
12147--- a/arch/sparc/mm/hugetlbpage.c
12148+++ b/arch/sparc/mm/hugetlbpage.c
12149@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12150 unsigned long addr,
12151 unsigned long len,
12152 unsigned long pgoff,
12153- unsigned long flags)
12154+ unsigned long flags,
12155+ unsigned long offset)
12156 {
12157+ struct mm_struct *mm = current->mm;
12158 unsigned long task_size = TASK_SIZE;
12159 struct vm_unmapped_area_info info;
12160
12161@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12162
12163 info.flags = 0;
12164 info.length = len;
12165- info.low_limit = TASK_UNMAPPED_BASE;
12166+ info.low_limit = mm->mmap_base;
12167 info.high_limit = min(task_size, VA_EXCLUDE_START);
12168 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12169 info.align_offset = 0;
12170+ info.threadstack_offset = offset;
12171 addr = vm_unmapped_area(&info);
12172
12173 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12174 VM_BUG_ON(addr != -ENOMEM);
12175 info.low_limit = VA_EXCLUDE_END;
12176+
12177+#ifdef CONFIG_PAX_RANDMMAP
12178+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12179+ info.low_limit += mm->delta_mmap;
12180+#endif
12181+
12182 info.high_limit = task_size;
12183 addr = vm_unmapped_area(&info);
12184 }
12185@@ -55,7 +64,8 @@ static unsigned long
12186 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12187 const unsigned long len,
12188 const unsigned long pgoff,
12189- const unsigned long flags)
12190+ const unsigned long flags,
12191+ const unsigned long offset)
12192 {
12193 struct mm_struct *mm = current->mm;
12194 unsigned long addr = addr0;
12195@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12196 info.high_limit = mm->mmap_base;
12197 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12198 info.align_offset = 0;
12199+ info.threadstack_offset = offset;
12200 addr = vm_unmapped_area(&info);
12201
12202 /*
12203@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12204 VM_BUG_ON(addr != -ENOMEM);
12205 info.flags = 0;
12206 info.low_limit = TASK_UNMAPPED_BASE;
12207+
12208+#ifdef CONFIG_PAX_RANDMMAP
12209+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12210+ info.low_limit += mm->delta_mmap;
12211+#endif
12212+
12213 info.high_limit = STACK_TOP32;
12214 addr = vm_unmapped_area(&info);
12215 }
12216@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12217 struct mm_struct *mm = current->mm;
12218 struct vm_area_struct *vma;
12219 unsigned long task_size = TASK_SIZE;
12220+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12221
12222 if (test_thread_flag(TIF_32BIT))
12223 task_size = STACK_TOP32;
12224@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12225 return addr;
12226 }
12227
12228+#ifdef CONFIG_PAX_RANDMMAP
12229+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12230+#endif
12231+
12232 if (addr) {
12233 addr = ALIGN(addr, HPAGE_SIZE);
12234 vma = find_vma(mm, addr);
12235- if (task_size - len >= addr &&
12236- (!vma || addr + len <= vma->vm_start))
12237+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12238 return addr;
12239 }
12240 if (mm->get_unmapped_area == arch_get_unmapped_area)
12241 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12242- pgoff, flags);
12243+ pgoff, flags, offset);
12244 else
12245 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12246- pgoff, flags);
12247+ pgoff, flags, offset);
12248 }
12249
12250 pte_t *huge_pte_alloc(struct mm_struct *mm,
12251diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12252index 2d91c62..17a8fff 100644
12253--- a/arch/sparc/mm/init_64.c
12254+++ b/arch/sparc/mm/init_64.c
12255@@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12256 int num_kernel_image_mappings;
12257
12258 #ifdef CONFIG_DEBUG_DCFLUSH
12259-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12260+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12261 #ifdef CONFIG_SMP
12262-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12263+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12264 #endif
12265 #endif
12266
12267@@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
12268 {
12269 BUG_ON(tlb_type == hypervisor);
12270 #ifdef CONFIG_DEBUG_DCFLUSH
12271- atomic_inc(&dcpage_flushes);
12272+ atomic_inc_unchecked(&dcpage_flushes);
12273 #endif
12274
12275 #ifdef DCACHE_ALIASING_POSSIBLE
12276@@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
12277
12278 #ifdef CONFIG_DEBUG_DCFLUSH
12279 seq_printf(m, "DCPageFlushes\t: %d\n",
12280- atomic_read(&dcpage_flushes));
12281+ atomic_read_unchecked(&dcpage_flushes));
12282 #ifdef CONFIG_SMP
12283 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12284- atomic_read(&dcpage_flushes_xcall));
12285+ atomic_read_unchecked(&dcpage_flushes_xcall));
12286 #endif /* CONFIG_SMP */
12287 #endif /* CONFIG_DEBUG_DCFLUSH */
12288 }
12289diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12290index 7cca418..53fc030 100644
12291--- a/arch/tile/Kconfig
12292+++ b/arch/tile/Kconfig
12293@@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
12294
12295 config KEXEC
12296 bool "kexec system call"
12297+ depends on !GRKERNSEC_KMEM
12298 ---help---
12299 kexec is a system call that implements the ability to shutdown your
12300 current kernel, and to start another kernel. It is like a reboot
12301diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12302index 7b11c5f..755a026 100644
12303--- a/arch/tile/include/asm/atomic_64.h
12304+++ b/arch/tile/include/asm/atomic_64.h
12305@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12306
12307 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12308
12309+#define atomic64_read_unchecked(v) atomic64_read(v)
12310+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12311+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12312+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12313+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12314+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12315+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12316+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12317+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12318+
12319 /* Define this to indicate that cmpxchg is an efficient operation. */
12320 #define __HAVE_ARCH_CMPXCHG
12321
12322diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12323index 6160761..00cac88 100644
12324--- a/arch/tile/include/asm/cache.h
12325+++ b/arch/tile/include/asm/cache.h
12326@@ -15,11 +15,12 @@
12327 #ifndef _ASM_TILE_CACHE_H
12328 #define _ASM_TILE_CACHE_H
12329
12330+#include <linux/const.h>
12331 #include <arch/chip.h>
12332
12333 /* bytes per L1 data cache line */
12334 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12335-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12336+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12337
12338 /* bytes per L2 cache line */
12339 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12340diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12341index b6cde32..c0cb736 100644
12342--- a/arch/tile/include/asm/uaccess.h
12343+++ b/arch/tile/include/asm/uaccess.h
12344@@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12345 const void __user *from,
12346 unsigned long n)
12347 {
12348- int sz = __compiletime_object_size(to);
12349+ size_t sz = __compiletime_object_size(to);
12350
12351- if (likely(sz == -1 || sz >= n))
12352+ if (likely(sz == (size_t)-1 || sz >= n))
12353 n = _copy_from_user(to, from, n);
12354 else
12355 copy_from_user_overflow();
12356diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12357index e514899..f8743c4 100644
12358--- a/arch/tile/mm/hugetlbpage.c
12359+++ b/arch/tile/mm/hugetlbpage.c
12360@@ -207,6 +207,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12361 info.high_limit = TASK_SIZE;
12362 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12363 info.align_offset = 0;
12364+ info.threadstack_offset = 0;
12365 return vm_unmapped_area(&info);
12366 }
12367
12368@@ -224,6 +225,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12369 info.high_limit = current->mm->mmap_base;
12370 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12371 info.align_offset = 0;
12372+ info.threadstack_offset = 0;
12373 addr = vm_unmapped_area(&info);
12374
12375 /*
12376diff --git a/arch/um/Makefile b/arch/um/Makefile
12377index e4b1a96..16162f8 100644
12378--- a/arch/um/Makefile
12379+++ b/arch/um/Makefile
12380@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12381 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12382 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12383
12384+ifdef CONSTIFY_PLUGIN
12385+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12386+endif
12387+
12388 #This will adjust *FLAGS accordingly to the platform.
12389 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12390
12391diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12392index 19e1bdd..3665b77 100644
12393--- a/arch/um/include/asm/cache.h
12394+++ b/arch/um/include/asm/cache.h
12395@@ -1,6 +1,7 @@
12396 #ifndef __UM_CACHE_H
12397 #define __UM_CACHE_H
12398
12399+#include <linux/const.h>
12400
12401 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12402 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12403@@ -12,6 +13,6 @@
12404 # define L1_CACHE_SHIFT 5
12405 #endif
12406
12407-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12408+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12409
12410 #endif
12411diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12412index 2e0a6b1..a64d0f5 100644
12413--- a/arch/um/include/asm/kmap_types.h
12414+++ b/arch/um/include/asm/kmap_types.h
12415@@ -8,6 +8,6 @@
12416
12417 /* No more #include "asm/arch/kmap_types.h" ! */
12418
12419-#define KM_TYPE_NR 14
12420+#define KM_TYPE_NR 15
12421
12422 #endif
12423diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12424index 71c5d13..4c7b9f1 100644
12425--- a/arch/um/include/asm/page.h
12426+++ b/arch/um/include/asm/page.h
12427@@ -14,6 +14,9 @@
12428 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12429 #define PAGE_MASK (~(PAGE_SIZE-1))
12430
12431+#define ktla_ktva(addr) (addr)
12432+#define ktva_ktla(addr) (addr)
12433+
12434 #ifndef __ASSEMBLY__
12435
12436 struct page;
12437diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12438index 0032f92..cd151e0 100644
12439--- a/arch/um/include/asm/pgtable-3level.h
12440+++ b/arch/um/include/asm/pgtable-3level.h
12441@@ -58,6 +58,7 @@
12442 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12443 #define pud_populate(mm, pud, pmd) \
12444 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12445+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12446
12447 #ifdef CONFIG_64BIT
12448 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12449diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12450index f17bca8..48adb87 100644
12451--- a/arch/um/kernel/process.c
12452+++ b/arch/um/kernel/process.c
12453@@ -356,22 +356,6 @@ int singlestepping(void * t)
12454 return 2;
12455 }
12456
12457-/*
12458- * Only x86 and x86_64 have an arch_align_stack().
12459- * All other arches have "#define arch_align_stack(x) (x)"
12460- * in their asm/exec.h
12461- * As this is included in UML from asm-um/system-generic.h,
12462- * we can use it to behave as the subarch does.
12463- */
12464-#ifndef arch_align_stack
12465-unsigned long arch_align_stack(unsigned long sp)
12466-{
12467- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12468- sp -= get_random_int() % 8192;
12469- return sp & ~0xf;
12470-}
12471-#endif
12472-
12473 unsigned long get_wchan(struct task_struct *p)
12474 {
12475 unsigned long stack_page, sp, ip;
12476diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12477index ad8f795..2c7eec6 100644
12478--- a/arch/unicore32/include/asm/cache.h
12479+++ b/arch/unicore32/include/asm/cache.h
12480@@ -12,8 +12,10 @@
12481 #ifndef __UNICORE_CACHE_H__
12482 #define __UNICORE_CACHE_H__
12483
12484-#define L1_CACHE_SHIFT (5)
12485-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12486+#include <linux/const.h>
12487+
12488+#define L1_CACHE_SHIFT 5
12489+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12490
12491 /*
12492 * Memory returned by kmalloc() may be used for DMA, so we must make
12493diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12494index 41a503c..cf98b04 100644
12495--- a/arch/x86/Kconfig
12496+++ b/arch/x86/Kconfig
12497@@ -129,7 +129,7 @@ config X86
12498 select RTC_LIB
12499 select HAVE_DEBUG_STACKOVERFLOW
12500 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12501- select HAVE_CC_STACKPROTECTOR
12502+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12503 select GENERIC_CPU_AUTOPROBE
12504 select HAVE_ARCH_AUDITSYSCALL
12505 select ARCH_SUPPORTS_ATOMIC_RMW
12506@@ -262,7 +262,7 @@ config X86_HT
12507
12508 config X86_32_LAZY_GS
12509 def_bool y
12510- depends on X86_32 && !CC_STACKPROTECTOR
12511+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12512
12513 config ARCH_HWEIGHT_CFLAGS
12514 string
12515@@ -600,6 +600,7 @@ config SCHED_OMIT_FRAME_POINTER
12516
12517 menuconfig HYPERVISOR_GUEST
12518 bool "Linux guest support"
12519+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12520 ---help---
12521 Say Y here to enable options for running Linux under various hyper-
12522 visors. This option enables basic hypervisor detection and platform
12523@@ -973,6 +974,7 @@ config VM86
12524
12525 config X86_16BIT
12526 bool "Enable support for 16-bit segments" if EXPERT
12527+ depends on !GRKERNSEC
12528 default y
12529 ---help---
12530 This option is required by programs like Wine to run 16-bit
12531@@ -1128,6 +1130,7 @@ choice
12532
12533 config NOHIGHMEM
12534 bool "off"
12535+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12536 ---help---
12537 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12538 However, the address space of 32-bit x86 processors is only 4
12539@@ -1164,6 +1167,7 @@ config NOHIGHMEM
12540
12541 config HIGHMEM4G
12542 bool "4GB"
12543+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12544 ---help---
12545 Select this if you have a 32-bit processor and between 1 and 4
12546 gigabytes of physical RAM.
12547@@ -1216,7 +1220,7 @@ config PAGE_OFFSET
12548 hex
12549 default 0xB0000000 if VMSPLIT_3G_OPT
12550 default 0x80000000 if VMSPLIT_2G
12551- default 0x78000000 if VMSPLIT_2G_OPT
12552+ default 0x70000000 if VMSPLIT_2G_OPT
12553 default 0x40000000 if VMSPLIT_1G
12554 default 0xC0000000
12555 depends on X86_32
12556@@ -1631,6 +1635,7 @@ source kernel/Kconfig.hz
12557
12558 config KEXEC
12559 bool "kexec system call"
12560+ depends on !GRKERNSEC_KMEM
12561 ---help---
12562 kexec is a system call that implements the ability to shutdown your
12563 current kernel, and to start another kernel. It is like a reboot
12564@@ -1816,7 +1821,9 @@ config X86_NEED_RELOCS
12565
12566 config PHYSICAL_ALIGN
12567 hex "Alignment value to which kernel should be aligned"
12568- default "0x200000"
12569+ default "0x1000000"
12570+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12571+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12572 range 0x2000 0x1000000 if X86_32
12573 range 0x200000 0x1000000 if X86_64
12574 ---help---
12575@@ -1899,6 +1906,7 @@ config COMPAT_VDSO
12576 def_bool n
12577 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12578 depends on X86_32 || IA32_EMULATION
12579+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12580 ---help---
12581 Certain buggy versions of glibc will crash if they are
12582 presented with a 32-bit vDSO that is not mapped at the address
12583diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12584index 6983314..54ad7e8 100644
12585--- a/arch/x86/Kconfig.cpu
12586+++ b/arch/x86/Kconfig.cpu
12587@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12588
12589 config X86_F00F_BUG
12590 def_bool y
12591- depends on M586MMX || M586TSC || M586 || M486
12592+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12593
12594 config X86_INVD_BUG
12595 def_bool y
12596@@ -327,7 +327,7 @@ config X86_INVD_BUG
12597
12598 config X86_ALIGNMENT_16
12599 def_bool y
12600- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12601+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12602
12603 config X86_INTEL_USERCOPY
12604 def_bool y
12605@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12606 # generates cmov.
12607 config X86_CMOV
12608 def_bool y
12609- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12610+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12611
12612 config X86_MINIMUM_CPU_FAMILY
12613 int
12614diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12615index 61bd2ad..50b625d 100644
12616--- a/arch/x86/Kconfig.debug
12617+++ b/arch/x86/Kconfig.debug
12618@@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12619 config DEBUG_RODATA
12620 bool "Write protect kernel read-only data structures"
12621 default y
12622- depends on DEBUG_KERNEL
12623+ depends on DEBUG_KERNEL && BROKEN
12624 ---help---
12625 Mark the kernel read-only data as write-protected in the pagetables,
12626 in order to catch accidental (and incorrect) writes to such const
12627@@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12628
12629 config DEBUG_SET_MODULE_RONX
12630 bool "Set loadable kernel module data as NX and text as RO"
12631- depends on MODULES
12632+ depends on MODULES && BROKEN
12633 ---help---
12634 This option helps catch unintended modifications to loadable
12635 kernel module's text and read-only data. It also prevents execution
12636diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12637index 920e616..ac3d4df 100644
12638--- a/arch/x86/Makefile
12639+++ b/arch/x86/Makefile
12640@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12641 # CPU-specific tuning. Anything which can be shared with UML should go here.
12642 include $(srctree)/arch/x86/Makefile_32.cpu
12643 KBUILD_CFLAGS += $(cflags-y)
12644-
12645- # temporary until string.h is fixed
12646- KBUILD_CFLAGS += -ffreestanding
12647 else
12648 BITS := 64
12649 UTS_MACHINE := x86_64
12650@@ -107,6 +104,9 @@ else
12651 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12652 endif
12653
12654+# temporary until string.h is fixed
12655+KBUILD_CFLAGS += -ffreestanding
12656+
12657 # Make sure compiler does not have buggy stack-protector support.
12658 ifdef CONFIG_CC_STACKPROTECTOR
12659 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12660@@ -180,6 +180,7 @@ archheaders:
12661 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12662
12663 archprepare:
12664+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12665 ifeq ($(CONFIG_KEXEC_FILE),y)
12666 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12667 endif
12668@@ -263,3 +264,9 @@ define archhelp
12669 echo ' FDARGS="..." arguments for the booted kernel'
12670 echo ' FDINITRD=file initrd for the booted kernel'
12671 endef
12672+
12673+define OLD_LD
12674+
12675+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12676+*** Please upgrade your binutils to 2.18 or newer
12677+endef
12678diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12679index 5b016e2..04ef69c 100644
12680--- a/arch/x86/boot/Makefile
12681+++ b/arch/x86/boot/Makefile
12682@@ -55,6 +55,9 @@ endif
12683 # ---------------------------------------------------------------------------
12684
12685 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12686+ifdef CONSTIFY_PLUGIN
12687+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12688+endif
12689 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12690 GCOV_PROFILE := n
12691
12692diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12693index 878e4b9..20537ab 100644
12694--- a/arch/x86/boot/bitops.h
12695+++ b/arch/x86/boot/bitops.h
12696@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12697 u8 v;
12698 const u32 *p = (const u32 *)addr;
12699
12700- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12701+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12702 return v;
12703 }
12704
12705@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12706
12707 static inline void set_bit(int nr, void *addr)
12708 {
12709- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12710+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12711 }
12712
12713 #endif /* BOOT_BITOPS_H */
12714diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12715index bd49ec6..94c7f58 100644
12716--- a/arch/x86/boot/boot.h
12717+++ b/arch/x86/boot/boot.h
12718@@ -84,7 +84,7 @@ static inline void io_delay(void)
12719 static inline u16 ds(void)
12720 {
12721 u16 seg;
12722- asm("movw %%ds,%0" : "=rm" (seg));
12723+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12724 return seg;
12725 }
12726
12727diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12728index 45abc36..97bea2d 100644
12729--- a/arch/x86/boot/compressed/Makefile
12730+++ b/arch/x86/boot/compressed/Makefile
12731@@ -16,6 +16,9 @@ KBUILD_CFLAGS += $(cflags-y)
12732 KBUILD_CFLAGS += -mno-mmx -mno-sse
12733 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12734 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12735+ifdef CONSTIFY_PLUGIN
12736+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12737+endif
12738
12739 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12740 GCOV_PROFILE := n
12741diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12742index a53440e..c3dbf1e 100644
12743--- a/arch/x86/boot/compressed/efi_stub_32.S
12744+++ b/arch/x86/boot/compressed/efi_stub_32.S
12745@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12746 * parameter 2, ..., param n. To make things easy, we save the return
12747 * address of efi_call_phys in a global variable.
12748 */
12749- popl %ecx
12750- movl %ecx, saved_return_addr(%edx)
12751- /* get the function pointer into ECX*/
12752- popl %ecx
12753- movl %ecx, efi_rt_function_ptr(%edx)
12754+ popl saved_return_addr(%edx)
12755+ popl efi_rt_function_ptr(%edx)
12756
12757 /*
12758 * 3. Call the physical function.
12759 */
12760- call *%ecx
12761+ call *efi_rt_function_ptr(%edx)
12762
12763 /*
12764 * 4. Balance the stack. And because EAX contain the return value,
12765@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12766 1: popl %edx
12767 subl $1b, %edx
12768
12769- movl efi_rt_function_ptr(%edx), %ecx
12770- pushl %ecx
12771+ pushl efi_rt_function_ptr(%edx)
12772
12773 /*
12774 * 10. Push the saved return address onto the stack and return.
12775 */
12776- movl saved_return_addr(%edx), %ecx
12777- pushl %ecx
12778- ret
12779+ jmpl *saved_return_addr(%edx)
12780 ENDPROC(efi_call_phys)
12781 .previous
12782
12783diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12784index 1d7fbbc..36ecd58 100644
12785--- a/arch/x86/boot/compressed/head_32.S
12786+++ b/arch/x86/boot/compressed/head_32.S
12787@@ -140,10 +140,10 @@ preferred_addr:
12788 addl %eax, %ebx
12789 notl %eax
12790 andl %eax, %ebx
12791- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12792+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12793 jge 1f
12794 #endif
12795- movl $LOAD_PHYSICAL_ADDR, %ebx
12796+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12797 1:
12798
12799 /* Target address to relocate to for decompression */
12800diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12801index 6b1766c..ad465c9 100644
12802--- a/arch/x86/boot/compressed/head_64.S
12803+++ b/arch/x86/boot/compressed/head_64.S
12804@@ -94,10 +94,10 @@ ENTRY(startup_32)
12805 addl %eax, %ebx
12806 notl %eax
12807 andl %eax, %ebx
12808- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12809+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12810 jge 1f
12811 #endif
12812- movl $LOAD_PHYSICAL_ADDR, %ebx
12813+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12814 1:
12815
12816 /* Target address to relocate to for decompression */
12817@@ -322,10 +322,10 @@ preferred_addr:
12818 addq %rax, %rbp
12819 notq %rax
12820 andq %rax, %rbp
12821- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12822+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12823 jge 1f
12824 #endif
12825- movq $LOAD_PHYSICAL_ADDR, %rbp
12826+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12827 1:
12828
12829 /* Target address to relocate to for decompression */
12830@@ -434,8 +434,8 @@ gdt:
12831 .long gdt
12832 .word 0
12833 .quad 0x0000000000000000 /* NULL descriptor */
12834- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12835- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12836+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12837+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12838 .quad 0x0080890000000000 /* TS descriptor */
12839 .quad 0x0000000000000000 /* TS continued */
12840 gdt_end:
12841diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12842index 30dd59a..cd9edc3 100644
12843--- a/arch/x86/boot/compressed/misc.c
12844+++ b/arch/x86/boot/compressed/misc.c
12845@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12846 * Calculate the delta between where vmlinux was linked to load
12847 * and where it was actually loaded.
12848 */
12849- delta = min_addr - LOAD_PHYSICAL_ADDR;
12850+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12851 if (!delta) {
12852 debug_putstr("No relocation needed... ");
12853 return;
12854@@ -312,7 +312,7 @@ static void parse_elf(void *output)
12855 Elf32_Ehdr ehdr;
12856 Elf32_Phdr *phdrs, *phdr;
12857 #endif
12858- void *dest;
12859+ void *dest, *prev;
12860 int i;
12861
12862 memcpy(&ehdr, output, sizeof(ehdr));
12863@@ -339,13 +339,16 @@ static void parse_elf(void *output)
12864 case PT_LOAD:
12865 #ifdef CONFIG_RELOCATABLE
12866 dest = output;
12867- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12868+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12869 #else
12870 dest = (void *)(phdr->p_paddr);
12871 #endif
12872 memcpy(dest,
12873 output + phdr->p_offset,
12874 phdr->p_filesz);
12875+ if (i)
12876+ memset(prev, 0xff, dest - prev);
12877+ prev = dest + phdr->p_filesz;
12878 break;
12879 default: /* Ignore other PT_* */ break;
12880 }
12881@@ -402,7 +405,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12882 error("Destination address too large");
12883 #endif
12884 #ifndef CONFIG_RELOCATABLE
12885- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12886+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12887 error("Wrong destination address");
12888 #endif
12889
12890diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12891index 1fd7d57..0f7d096 100644
12892--- a/arch/x86/boot/cpucheck.c
12893+++ b/arch/x86/boot/cpucheck.c
12894@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12895 u32 ecx = MSR_K7_HWCR;
12896 u32 eax, edx;
12897
12898- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12899+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12900 eax &= ~(1 << 15);
12901- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12902+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12903
12904 get_cpuflags(); /* Make sure it really did something */
12905 err = check_cpuflags();
12906@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12907 u32 ecx = MSR_VIA_FCR;
12908 u32 eax, edx;
12909
12910- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12911+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12912 eax |= (1<<1)|(1<<7);
12913- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12914+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12915
12916 set_bit(X86_FEATURE_CX8, cpu.flags);
12917 err = check_cpuflags();
12918@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12919 u32 eax, edx;
12920 u32 level = 1;
12921
12922- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12923- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12924- asm("cpuid"
12925+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12926+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12927+ asm volatile("cpuid"
12928 : "+a" (level), "=d" (cpu.flags[0])
12929 : : "ecx", "ebx");
12930- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12931+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12932
12933 err = check_cpuflags();
12934 } else if (err == 0x01 &&
12935diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12936index 16ef025..91e033b 100644
12937--- a/arch/x86/boot/header.S
12938+++ b/arch/x86/boot/header.S
12939@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12940 # single linked list of
12941 # struct setup_data
12942
12943-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12944+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12945
12946 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12947+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12948+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12949+#else
12950 #define VO_INIT_SIZE (VO__end - VO__text)
12951+#endif
12952 #if ZO_INIT_SIZE > VO_INIT_SIZE
12953 #define INIT_SIZE ZO_INIT_SIZE
12954 #else
12955diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12956index db75d07..8e6d0af 100644
12957--- a/arch/x86/boot/memory.c
12958+++ b/arch/x86/boot/memory.c
12959@@ -19,7 +19,7 @@
12960
12961 static int detect_memory_e820(void)
12962 {
12963- int count = 0;
12964+ unsigned int count = 0;
12965 struct biosregs ireg, oreg;
12966 struct e820entry *desc = boot_params.e820_map;
12967 static struct e820entry buf; /* static so it is zeroed */
12968diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
12969index ba3e100..6501b8f 100644
12970--- a/arch/x86/boot/video-vesa.c
12971+++ b/arch/x86/boot/video-vesa.c
12972@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
12973
12974 boot_params.screen_info.vesapm_seg = oreg.es;
12975 boot_params.screen_info.vesapm_off = oreg.di;
12976+ boot_params.screen_info.vesapm_size = oreg.cx;
12977 }
12978
12979 /*
12980diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
12981index 43eda28..5ab5fdb 100644
12982--- a/arch/x86/boot/video.c
12983+++ b/arch/x86/boot/video.c
12984@@ -96,7 +96,7 @@ static void store_mode_params(void)
12985 static unsigned int get_entry(void)
12986 {
12987 char entry_buf[4];
12988- int i, len = 0;
12989+ unsigned int i, len = 0;
12990 int key;
12991 unsigned int v;
12992
12993diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
12994index 9105655..41779c1 100644
12995--- a/arch/x86/crypto/aes-x86_64-asm_64.S
12996+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
12997@@ -8,6 +8,8 @@
12998 * including this sentence is retained in full.
12999 */
13000
13001+#include <asm/alternative-asm.h>
13002+
13003 .extern crypto_ft_tab
13004 .extern crypto_it_tab
13005 .extern crypto_fl_tab
13006@@ -70,6 +72,8 @@
13007 je B192; \
13008 leaq 32(r9),r9;
13009
13010+#define ret pax_force_retaddr; ret
13011+
13012 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13013 movq r1,r2; \
13014 movq r3,r4; \
13015diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13016index 477e9d7..c92c7d8 100644
13017--- a/arch/x86/crypto/aesni-intel_asm.S
13018+++ b/arch/x86/crypto/aesni-intel_asm.S
13019@@ -31,6 +31,7 @@
13020
13021 #include <linux/linkage.h>
13022 #include <asm/inst.h>
13023+#include <asm/alternative-asm.h>
13024
13025 #ifdef __x86_64__
13026 .data
13027@@ -205,7 +206,7 @@ enc: .octa 0x2
13028 * num_initial_blocks = b mod 4
13029 * encrypt the initial num_initial_blocks blocks and apply ghash on
13030 * the ciphertext
13031-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13032+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13033 * are clobbered
13034 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13035 */
13036@@ -214,8 +215,8 @@ enc: .octa 0x2
13037 .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13038 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13039 mov arg7, %r10 # %r10 = AAD
13040- mov arg8, %r12 # %r12 = aadLen
13041- mov %r12, %r11
13042+ mov arg8, %r15 # %r15 = aadLen
13043+ mov %r15, %r11
13044 pxor %xmm\i, %xmm\i
13045 _get_AAD_loop\num_initial_blocks\operation:
13046 movd (%r10), \TMP1
13047@@ -223,15 +224,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13048 psrldq $4, %xmm\i
13049 pxor \TMP1, %xmm\i
13050 add $4, %r10
13051- sub $4, %r12
13052+ sub $4, %r15
13053 jne _get_AAD_loop\num_initial_blocks\operation
13054 cmp $16, %r11
13055 je _get_AAD_loop2_done\num_initial_blocks\operation
13056- mov $16, %r12
13057+ mov $16, %r15
13058 _get_AAD_loop2\num_initial_blocks\operation:
13059 psrldq $4, %xmm\i
13060- sub $4, %r12
13061- cmp %r11, %r12
13062+ sub $4, %r15
13063+ cmp %r11, %r15
13064 jne _get_AAD_loop2\num_initial_blocks\operation
13065 _get_AAD_loop2_done\num_initial_blocks\operation:
13066 movdqa SHUF_MASK(%rip), %xmm14
13067@@ -443,7 +444,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13068 * num_initial_blocks = b mod 4
13069 * encrypt the initial num_initial_blocks blocks and apply ghash on
13070 * the ciphertext
13071-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13072+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13073 * are clobbered
13074 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13075 */
13076@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13077 .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
13078 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13079 mov arg7, %r10 # %r10 = AAD
13080- mov arg8, %r12 # %r12 = aadLen
13081- mov %r12, %r11
13082+ mov arg8, %r15 # %r15 = aadLen
13083+ mov %r15, %r11
13084 pxor %xmm\i, %xmm\i
13085 _get_AAD_loop\num_initial_blocks\operation:
13086 movd (%r10), \TMP1
13087@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13088 psrldq $4, %xmm\i
13089 pxor \TMP1, %xmm\i
13090 add $4, %r10
13091- sub $4, %r12
13092+ sub $4, %r15
13093 jne _get_AAD_loop\num_initial_blocks\operation
13094 cmp $16, %r11
13095 je _get_AAD_loop2_done\num_initial_blocks\operation
13096- mov $16, %r12
13097+ mov $16, %r15
13098 _get_AAD_loop2\num_initial_blocks\operation:
13099 psrldq $4, %xmm\i
13100- sub $4, %r12
13101- cmp %r11, %r12
13102+ sub $4, %r15
13103+ cmp %r11, %r15
13104 jne _get_AAD_loop2\num_initial_blocks\operation
13105 _get_AAD_loop2_done\num_initial_blocks\operation:
13106 movdqa SHUF_MASK(%rip), %xmm14
13107@@ -1269,7 +1270,7 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
13108 *
13109 *****************************************************************************/
13110 ENTRY(aesni_gcm_dec)
13111- push %r12
13112+ push %r15
13113 push %r13
13114 push %r14
13115 mov %rsp, %r14
13116@@ -1279,8 +1280,8 @@ ENTRY(aesni_gcm_dec)
13117 */
13118 sub $VARIABLE_OFFSET, %rsp
13119 and $~63, %rsp # align rsp to 64 bytes
13120- mov %arg6, %r12
13121- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13122+ mov %arg6, %r15
13123+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13124 movdqa SHUF_MASK(%rip), %xmm2
13125 PSHUFB_XMM %xmm2, %xmm13
13126
13127@@ -1308,10 +1309,10 @@ ENTRY(aesni_gcm_dec)
13128 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13129 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13130 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13131- mov %r13, %r12
13132- and $(3<<4), %r12
13133+ mov %r13, %r15
13134+ and $(3<<4), %r15
13135 jz _initial_num_blocks_is_0_decrypt
13136- cmp $(2<<4), %r12
13137+ cmp $(2<<4), %r15
13138 jb _initial_num_blocks_is_1_decrypt
13139 je _initial_num_blocks_is_2_decrypt
13140 _initial_num_blocks_is_3_decrypt:
13141@@ -1361,16 +1362,16 @@ _zero_cipher_left_decrypt:
13142 sub $16, %r11
13143 add %r13, %r11
13144 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13145- lea SHIFT_MASK+16(%rip), %r12
13146- sub %r13, %r12
13147+ lea SHIFT_MASK+16(%rip), %r15
13148+ sub %r13, %r15
13149 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13150 # (%r13 is the number of bytes in plaintext mod 16)
13151- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13152+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13153 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13154
13155 movdqa %xmm1, %xmm2
13156 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13157- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13158+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13159 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13160 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13161 pand %xmm1, %xmm2
13162@@ -1399,9 +1400,9 @@ _less_than_8_bytes_left_decrypt:
13163 sub $1, %r13
13164 jne _less_than_8_bytes_left_decrypt
13165 _multiple_of_16_bytes_decrypt:
13166- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13167- shl $3, %r12 # convert into number of bits
13168- movd %r12d, %xmm15 # len(A) in %xmm15
13169+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13170+ shl $3, %r15 # convert into number of bits
13171+ movd %r15d, %xmm15 # len(A) in %xmm15
13172 shl $3, %arg4 # len(C) in bits (*128)
13173 MOVQ_R64_XMM %arg4, %xmm1
13174 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13175@@ -1440,7 +1441,8 @@ _return_T_done_decrypt:
13176 mov %r14, %rsp
13177 pop %r14
13178 pop %r13
13179- pop %r12
13180+ pop %r15
13181+ pax_force_retaddr
13182 ret
13183 ENDPROC(aesni_gcm_dec)
13184
13185@@ -1529,7 +1531,7 @@ ENDPROC(aesni_gcm_dec)
13186 * poly = x^128 + x^127 + x^126 + x^121 + 1
13187 ***************************************************************************/
13188 ENTRY(aesni_gcm_enc)
13189- push %r12
13190+ push %r15
13191 push %r13
13192 push %r14
13193 mov %rsp, %r14
13194@@ -1539,8 +1541,8 @@ ENTRY(aesni_gcm_enc)
13195 #
13196 sub $VARIABLE_OFFSET, %rsp
13197 and $~63, %rsp
13198- mov %arg6, %r12
13199- movdqu (%r12), %xmm13
13200+ mov %arg6, %r15
13201+ movdqu (%r15), %xmm13
13202 movdqa SHUF_MASK(%rip), %xmm2
13203 PSHUFB_XMM %xmm2, %xmm13
13204
13205@@ -1564,13 +1566,13 @@ ENTRY(aesni_gcm_enc)
13206 movdqa %xmm13, HashKey(%rsp)
13207 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13208 and $-16, %r13
13209- mov %r13, %r12
13210+ mov %r13, %r15
13211
13212 # Encrypt first few blocks
13213
13214- and $(3<<4), %r12
13215+ and $(3<<4), %r15
13216 jz _initial_num_blocks_is_0_encrypt
13217- cmp $(2<<4), %r12
13218+ cmp $(2<<4), %r15
13219 jb _initial_num_blocks_is_1_encrypt
13220 je _initial_num_blocks_is_2_encrypt
13221 _initial_num_blocks_is_3_encrypt:
13222@@ -1623,14 +1625,14 @@ _zero_cipher_left_encrypt:
13223 sub $16, %r11
13224 add %r13, %r11
13225 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13226- lea SHIFT_MASK+16(%rip), %r12
13227- sub %r13, %r12
13228+ lea SHIFT_MASK+16(%rip), %r15
13229+ sub %r13, %r15
13230 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13231 # (%r13 is the number of bytes in plaintext mod 16)
13232- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13233+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13234 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13235 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13236- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13237+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13238 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13239 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13240 movdqa SHUF_MASK(%rip), %xmm10
13241@@ -1663,9 +1665,9 @@ _less_than_8_bytes_left_encrypt:
13242 sub $1, %r13
13243 jne _less_than_8_bytes_left_encrypt
13244 _multiple_of_16_bytes_encrypt:
13245- mov arg8, %r12 # %r12 = addLen (number of bytes)
13246- shl $3, %r12
13247- movd %r12d, %xmm15 # len(A) in %xmm15
13248+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13249+ shl $3, %r15
13250+ movd %r15d, %xmm15 # len(A) in %xmm15
13251 shl $3, %arg4 # len(C) in bits (*128)
13252 MOVQ_R64_XMM %arg4, %xmm1
13253 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13254@@ -1704,7 +1706,8 @@ _return_T_done_encrypt:
13255 mov %r14, %rsp
13256 pop %r14
13257 pop %r13
13258- pop %r12
13259+ pop %r15
13260+ pax_force_retaddr
13261 ret
13262 ENDPROC(aesni_gcm_enc)
13263
13264@@ -1722,6 +1725,7 @@ _key_expansion_256a:
13265 pxor %xmm1, %xmm0
13266 movaps %xmm0, (TKEYP)
13267 add $0x10, TKEYP
13268+ pax_force_retaddr
13269 ret
13270 ENDPROC(_key_expansion_128)
13271 ENDPROC(_key_expansion_256a)
13272@@ -1748,6 +1752,7 @@ _key_expansion_192a:
13273 shufps $0b01001110, %xmm2, %xmm1
13274 movaps %xmm1, 0x10(TKEYP)
13275 add $0x20, TKEYP
13276+ pax_force_retaddr
13277 ret
13278 ENDPROC(_key_expansion_192a)
13279
13280@@ -1768,6 +1773,7 @@ _key_expansion_192b:
13281
13282 movaps %xmm0, (TKEYP)
13283 add $0x10, TKEYP
13284+ pax_force_retaddr
13285 ret
13286 ENDPROC(_key_expansion_192b)
13287
13288@@ -1781,6 +1787,7 @@ _key_expansion_256b:
13289 pxor %xmm1, %xmm2
13290 movaps %xmm2, (TKEYP)
13291 add $0x10, TKEYP
13292+ pax_force_retaddr
13293 ret
13294 ENDPROC(_key_expansion_256b)
13295
13296@@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
13297 #ifndef __x86_64__
13298 popl KEYP
13299 #endif
13300+ pax_force_retaddr
13301 ret
13302 ENDPROC(aesni_set_key)
13303
13304@@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
13305 popl KLEN
13306 popl KEYP
13307 #endif
13308+ pax_force_retaddr
13309 ret
13310 ENDPROC(aesni_enc)
13311
13312@@ -1974,6 +1983,7 @@ _aesni_enc1:
13313 AESENC KEY STATE
13314 movaps 0x70(TKEYP), KEY
13315 AESENCLAST KEY STATE
13316+ pax_force_retaddr
13317 ret
13318 ENDPROC(_aesni_enc1)
13319
13320@@ -2083,6 +2093,7 @@ _aesni_enc4:
13321 AESENCLAST KEY STATE2
13322 AESENCLAST KEY STATE3
13323 AESENCLAST KEY STATE4
13324+ pax_force_retaddr
13325 ret
13326 ENDPROC(_aesni_enc4)
13327
13328@@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
13329 popl KLEN
13330 popl KEYP
13331 #endif
13332+ pax_force_retaddr
13333 ret
13334 ENDPROC(aesni_dec)
13335
13336@@ -2164,6 +2176,7 @@ _aesni_dec1:
13337 AESDEC KEY STATE
13338 movaps 0x70(TKEYP), KEY
13339 AESDECLAST KEY STATE
13340+ pax_force_retaddr
13341 ret
13342 ENDPROC(_aesni_dec1)
13343
13344@@ -2273,6 +2286,7 @@ _aesni_dec4:
13345 AESDECLAST KEY STATE2
13346 AESDECLAST KEY STATE3
13347 AESDECLAST KEY STATE4
13348+ pax_force_retaddr
13349 ret
13350 ENDPROC(_aesni_dec4)
13351
13352@@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
13353 popl KEYP
13354 popl LEN
13355 #endif
13356+ pax_force_retaddr
13357 ret
13358 ENDPROC(aesni_ecb_enc)
13359
13360@@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
13361 popl KEYP
13362 popl LEN
13363 #endif
13364+ pax_force_retaddr
13365 ret
13366 ENDPROC(aesni_ecb_dec)
13367
13368@@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
13369 popl LEN
13370 popl IVP
13371 #endif
13372+ pax_force_retaddr
13373 ret
13374 ENDPROC(aesni_cbc_enc)
13375
13376@@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
13377 popl LEN
13378 popl IVP
13379 #endif
13380+ pax_force_retaddr
13381 ret
13382 ENDPROC(aesni_cbc_dec)
13383
13384@@ -2550,6 +2568,7 @@ _aesni_inc_init:
13385 mov $1, TCTR_LOW
13386 MOVQ_R64_XMM TCTR_LOW INC
13387 MOVQ_R64_XMM CTR TCTR_LOW
13388+ pax_force_retaddr
13389 ret
13390 ENDPROC(_aesni_inc_init)
13391
13392@@ -2579,6 +2598,7 @@ _aesni_inc:
13393 .Linc_low:
13394 movaps CTR, IV
13395 PSHUFB_XMM BSWAP_MASK IV
13396+ pax_force_retaddr
13397 ret
13398 ENDPROC(_aesni_inc)
13399
13400@@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
13401 .Lctr_enc_ret:
13402 movups IV, (IVP)
13403 .Lctr_enc_just_ret:
13404+ pax_force_retaddr
13405 ret
13406 ENDPROC(aesni_ctr_enc)
13407
13408@@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
13409 pxor INC, STATE4
13410 movdqu STATE4, 0x70(OUTP)
13411
13412+ pax_force_retaddr
13413 ret
13414 ENDPROC(aesni_xts_crypt8)
13415
13416diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13417index 246c670..466e2d6 100644
13418--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13419+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13420@@ -21,6 +21,7 @@
13421 */
13422
13423 #include <linux/linkage.h>
13424+#include <asm/alternative-asm.h>
13425
13426 .file "blowfish-x86_64-asm.S"
13427 .text
13428@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13429 jnz .L__enc_xor;
13430
13431 write_block();
13432+ pax_force_retaddr
13433 ret;
13434 .L__enc_xor:
13435 xor_block();
13436+ pax_force_retaddr
13437 ret;
13438 ENDPROC(__blowfish_enc_blk)
13439
13440@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13441
13442 movq %r11, %rbp;
13443
13444+ pax_force_retaddr
13445 ret;
13446 ENDPROC(blowfish_dec_blk)
13447
13448@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13449
13450 popq %rbx;
13451 popq %rbp;
13452+ pax_force_retaddr
13453 ret;
13454
13455 .L__enc_xor4:
13456@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13457
13458 popq %rbx;
13459 popq %rbp;
13460+ pax_force_retaddr
13461 ret;
13462 ENDPROC(__blowfish_enc_blk_4way)
13463
13464@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13465 popq %rbx;
13466 popq %rbp;
13467
13468+ pax_force_retaddr
13469 ret;
13470 ENDPROC(blowfish_dec_blk_4way)
13471diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13472index ce71f92..1dce7ec 100644
13473--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13474+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13475@@ -16,6 +16,7 @@
13476 */
13477
13478 #include <linux/linkage.h>
13479+#include <asm/alternative-asm.h>
13480
13481 #define CAMELLIA_TABLE_BYTE_LEN 272
13482
13483@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13484 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13485 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13486 %rcx, (%r9));
13487+ pax_force_retaddr
13488 ret;
13489 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13490
13491@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13492 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13493 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13494 %rax, (%r9));
13495+ pax_force_retaddr
13496 ret;
13497 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13498
13499@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13500 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13501 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13502
13503+ pax_force_retaddr
13504 ret;
13505
13506 .align 8
13507@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13508 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13509 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13510
13511+ pax_force_retaddr
13512 ret;
13513
13514 .align 8
13515@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13516 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13517 %xmm8, %rsi);
13518
13519+ pax_force_retaddr
13520 ret;
13521 ENDPROC(camellia_ecb_enc_16way)
13522
13523@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13524 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13525 %xmm8, %rsi);
13526
13527+ pax_force_retaddr
13528 ret;
13529 ENDPROC(camellia_ecb_dec_16way)
13530
13531@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13532 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13533 %xmm8, %rsi);
13534
13535+ pax_force_retaddr
13536 ret;
13537 ENDPROC(camellia_cbc_dec_16way)
13538
13539@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13540 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13541 %xmm8, %rsi);
13542
13543+ pax_force_retaddr
13544 ret;
13545 ENDPROC(camellia_ctr_16way)
13546
13547@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13548 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13549 %xmm8, %rsi);
13550
13551+ pax_force_retaddr
13552 ret;
13553 ENDPROC(camellia_xts_crypt_16way)
13554
13555diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13556index 0e0b886..5a3123c 100644
13557--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13558+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13559@@ -11,6 +11,7 @@
13560 */
13561
13562 #include <linux/linkage.h>
13563+#include <asm/alternative-asm.h>
13564
13565 #define CAMELLIA_TABLE_BYTE_LEN 272
13566
13567@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13568 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13569 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13570 %rcx, (%r9));
13571+ pax_force_retaddr
13572 ret;
13573 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13574
13575@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13576 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13577 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13578 %rax, (%r9));
13579+ pax_force_retaddr
13580 ret;
13581 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13582
13583@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13584 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13585 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13586
13587+ pax_force_retaddr
13588 ret;
13589
13590 .align 8
13591@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13592 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13593 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13594
13595+ pax_force_retaddr
13596 ret;
13597
13598 .align 8
13599@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13600
13601 vzeroupper;
13602
13603+ pax_force_retaddr
13604 ret;
13605 ENDPROC(camellia_ecb_enc_32way)
13606
13607@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13608
13609 vzeroupper;
13610
13611+ pax_force_retaddr
13612 ret;
13613 ENDPROC(camellia_ecb_dec_32way)
13614
13615@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13616
13617 vzeroupper;
13618
13619+ pax_force_retaddr
13620 ret;
13621 ENDPROC(camellia_cbc_dec_32way)
13622
13623@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13624
13625 vzeroupper;
13626
13627+ pax_force_retaddr
13628 ret;
13629 ENDPROC(camellia_ctr_32way)
13630
13631@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13632
13633 vzeroupper;
13634
13635+ pax_force_retaddr
13636 ret;
13637 ENDPROC(camellia_xts_crypt_32way)
13638
13639diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13640index 310319c..db3d7b5 100644
13641--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13642+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13643@@ -21,6 +21,7 @@
13644 */
13645
13646 #include <linux/linkage.h>
13647+#include <asm/alternative-asm.h>
13648
13649 .file "camellia-x86_64-asm_64.S"
13650 .text
13651@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13652 enc_outunpack(mov, RT1);
13653
13654 movq RRBP, %rbp;
13655+ pax_force_retaddr
13656 ret;
13657
13658 .L__enc_xor:
13659 enc_outunpack(xor, RT1);
13660
13661 movq RRBP, %rbp;
13662+ pax_force_retaddr
13663 ret;
13664 ENDPROC(__camellia_enc_blk)
13665
13666@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13667 dec_outunpack();
13668
13669 movq RRBP, %rbp;
13670+ pax_force_retaddr
13671 ret;
13672 ENDPROC(camellia_dec_blk)
13673
13674@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13675
13676 movq RRBP, %rbp;
13677 popq %rbx;
13678+ pax_force_retaddr
13679 ret;
13680
13681 .L__enc2_xor:
13682@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13683
13684 movq RRBP, %rbp;
13685 popq %rbx;
13686+ pax_force_retaddr
13687 ret;
13688 ENDPROC(__camellia_enc_blk_2way)
13689
13690@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13691
13692 movq RRBP, %rbp;
13693 movq RXOR, %rbx;
13694+ pax_force_retaddr
13695 ret;
13696 ENDPROC(camellia_dec_blk_2way)
13697diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13698index c35fd5d..2d8c7db 100644
13699--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13700+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13701@@ -24,6 +24,7 @@
13702 */
13703
13704 #include <linux/linkage.h>
13705+#include <asm/alternative-asm.h>
13706
13707 .file "cast5-avx-x86_64-asm_64.S"
13708
13709@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13710 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13711 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13712
13713+ pax_force_retaddr
13714 ret;
13715 ENDPROC(__cast5_enc_blk16)
13716
13717@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13718 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13719 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13720
13721+ pax_force_retaddr
13722 ret;
13723
13724 .L__skip_dec:
13725@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13726 vmovdqu RR4, (6*4*4)(%r11);
13727 vmovdqu RL4, (7*4*4)(%r11);
13728
13729+ pax_force_retaddr
13730 ret;
13731 ENDPROC(cast5_ecb_enc_16way)
13732
13733@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13734 vmovdqu RR4, (6*4*4)(%r11);
13735 vmovdqu RL4, (7*4*4)(%r11);
13736
13737+ pax_force_retaddr
13738 ret;
13739 ENDPROC(cast5_ecb_dec_16way)
13740
13741@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13742 * %rdx: src
13743 */
13744
13745- pushq %r12;
13746+ pushq %r14;
13747
13748 movq %rsi, %r11;
13749- movq %rdx, %r12;
13750+ movq %rdx, %r14;
13751
13752 vmovdqu (0*16)(%rdx), RL1;
13753 vmovdqu (1*16)(%rdx), RR1;
13754@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13755 call __cast5_dec_blk16;
13756
13757 /* xor with src */
13758- vmovq (%r12), RX;
13759+ vmovq (%r14), RX;
13760 vpshufd $0x4f, RX, RX;
13761 vpxor RX, RR1, RR1;
13762- vpxor 0*16+8(%r12), RL1, RL1;
13763- vpxor 1*16+8(%r12), RR2, RR2;
13764- vpxor 2*16+8(%r12), RL2, RL2;
13765- vpxor 3*16+8(%r12), RR3, RR3;
13766- vpxor 4*16+8(%r12), RL3, RL3;
13767- vpxor 5*16+8(%r12), RR4, RR4;
13768- vpxor 6*16+8(%r12), RL4, RL4;
13769+ vpxor 0*16+8(%r14), RL1, RL1;
13770+ vpxor 1*16+8(%r14), RR2, RR2;
13771+ vpxor 2*16+8(%r14), RL2, RL2;
13772+ vpxor 3*16+8(%r14), RR3, RR3;
13773+ vpxor 4*16+8(%r14), RL3, RL3;
13774+ vpxor 5*16+8(%r14), RR4, RR4;
13775+ vpxor 6*16+8(%r14), RL4, RL4;
13776
13777 vmovdqu RR1, (0*16)(%r11);
13778 vmovdqu RL1, (1*16)(%r11);
13779@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13780 vmovdqu RR4, (6*16)(%r11);
13781 vmovdqu RL4, (7*16)(%r11);
13782
13783- popq %r12;
13784+ popq %r14;
13785
13786+ pax_force_retaddr
13787 ret;
13788 ENDPROC(cast5_cbc_dec_16way)
13789
13790@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13791 * %rcx: iv (big endian, 64bit)
13792 */
13793
13794- pushq %r12;
13795+ pushq %r14;
13796
13797 movq %rsi, %r11;
13798- movq %rdx, %r12;
13799+ movq %rdx, %r14;
13800
13801 vpcmpeqd RTMP, RTMP, RTMP;
13802 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13803@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13804 call __cast5_enc_blk16;
13805
13806 /* dst = src ^ iv */
13807- vpxor (0*16)(%r12), RR1, RR1;
13808- vpxor (1*16)(%r12), RL1, RL1;
13809- vpxor (2*16)(%r12), RR2, RR2;
13810- vpxor (3*16)(%r12), RL2, RL2;
13811- vpxor (4*16)(%r12), RR3, RR3;
13812- vpxor (5*16)(%r12), RL3, RL3;
13813- vpxor (6*16)(%r12), RR4, RR4;
13814- vpxor (7*16)(%r12), RL4, RL4;
13815+ vpxor (0*16)(%r14), RR1, RR1;
13816+ vpxor (1*16)(%r14), RL1, RL1;
13817+ vpxor (2*16)(%r14), RR2, RR2;
13818+ vpxor (3*16)(%r14), RL2, RL2;
13819+ vpxor (4*16)(%r14), RR3, RR3;
13820+ vpxor (5*16)(%r14), RL3, RL3;
13821+ vpxor (6*16)(%r14), RR4, RR4;
13822+ vpxor (7*16)(%r14), RL4, RL4;
13823 vmovdqu RR1, (0*16)(%r11);
13824 vmovdqu RL1, (1*16)(%r11);
13825 vmovdqu RR2, (2*16)(%r11);
13826@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13827 vmovdqu RR4, (6*16)(%r11);
13828 vmovdqu RL4, (7*16)(%r11);
13829
13830- popq %r12;
13831+ popq %r14;
13832
13833+ pax_force_retaddr
13834 ret;
13835 ENDPROC(cast5_ctr_16way)
13836diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13837index e3531f8..e123f35 100644
13838--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13839+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13840@@ -24,6 +24,7 @@
13841 */
13842
13843 #include <linux/linkage.h>
13844+#include <asm/alternative-asm.h>
13845 #include "glue_helper-asm-avx.S"
13846
13847 .file "cast6-avx-x86_64-asm_64.S"
13848@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13849 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13850 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13851
13852+ pax_force_retaddr
13853 ret;
13854 ENDPROC(__cast6_enc_blk8)
13855
13856@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13857 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13858 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13859
13860+ pax_force_retaddr
13861 ret;
13862 ENDPROC(__cast6_dec_blk8)
13863
13864@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13865
13866 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13867
13868+ pax_force_retaddr
13869 ret;
13870 ENDPROC(cast6_ecb_enc_8way)
13871
13872@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13873
13874 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13875
13876+ pax_force_retaddr
13877 ret;
13878 ENDPROC(cast6_ecb_dec_8way)
13879
13880@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13881 * %rdx: src
13882 */
13883
13884- pushq %r12;
13885+ pushq %r14;
13886
13887 movq %rsi, %r11;
13888- movq %rdx, %r12;
13889+ movq %rdx, %r14;
13890
13891 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13892
13893 call __cast6_dec_blk8;
13894
13895- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13896+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13897
13898- popq %r12;
13899+ popq %r14;
13900
13901+ pax_force_retaddr
13902 ret;
13903 ENDPROC(cast6_cbc_dec_8way)
13904
13905@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13906 * %rcx: iv (little endian, 128bit)
13907 */
13908
13909- pushq %r12;
13910+ pushq %r14;
13911
13912 movq %rsi, %r11;
13913- movq %rdx, %r12;
13914+ movq %rdx, %r14;
13915
13916 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13917 RD2, RX, RKR, RKM);
13918
13919 call __cast6_enc_blk8;
13920
13921- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13922+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13923
13924- popq %r12;
13925+ popq %r14;
13926
13927+ pax_force_retaddr
13928 ret;
13929 ENDPROC(cast6_ctr_8way)
13930
13931@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13932 /* dst <= regs xor IVs(in dst) */
13933 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13934
13935+ pax_force_retaddr
13936 ret;
13937 ENDPROC(cast6_xts_enc_8way)
13938
13939@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13940 /* dst <= regs xor IVs(in dst) */
13941 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13942
13943+ pax_force_retaddr
13944 ret;
13945 ENDPROC(cast6_xts_dec_8way)
13946diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13947index 26d49eb..c0a8c84 100644
13948--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13949+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13950@@ -45,6 +45,7 @@
13951
13952 #include <asm/inst.h>
13953 #include <linux/linkage.h>
13954+#include <asm/alternative-asm.h>
13955
13956 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13957
13958@@ -309,6 +310,7 @@ do_return:
13959 popq %rsi
13960 popq %rdi
13961 popq %rbx
13962+ pax_force_retaddr
13963 ret
13964
13965 ################################################################
13966diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13967index 5d1e007..098cb4f 100644
13968--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
13969+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13970@@ -18,6 +18,7 @@
13971
13972 #include <linux/linkage.h>
13973 #include <asm/inst.h>
13974+#include <asm/alternative-asm.h>
13975
13976 .data
13977
13978@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
13979 psrlq $1, T2
13980 pxor T2, T1
13981 pxor T1, DATA
13982+ pax_force_retaddr
13983 ret
13984 ENDPROC(__clmul_gf128mul_ble)
13985
13986@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
13987 call __clmul_gf128mul_ble
13988 PSHUFB_XMM BSWAP DATA
13989 movups DATA, (%rdi)
13990+ pax_force_retaddr
13991 ret
13992 ENDPROC(clmul_ghash_mul)
13993
13994@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
13995 PSHUFB_XMM BSWAP DATA
13996 movups DATA, (%rdi)
13997 .Lupdate_just_ret:
13998+ pax_force_retaddr
13999 ret
14000 ENDPROC(clmul_ghash_update)
14001diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14002index 9279e0b..c4b3d2c 100644
14003--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14004+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14005@@ -1,4 +1,5 @@
14006 #include <linux/linkage.h>
14007+#include <asm/alternative-asm.h>
14008
14009 # enter salsa20_encrypt_bytes
14010 ENTRY(salsa20_encrypt_bytes)
14011@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14012 add %r11,%rsp
14013 mov %rdi,%rax
14014 mov %rsi,%rdx
14015+ pax_force_retaddr
14016 ret
14017 # bytesatleast65:
14018 ._bytesatleast65:
14019@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14020 add %r11,%rsp
14021 mov %rdi,%rax
14022 mov %rsi,%rdx
14023+ pax_force_retaddr
14024 ret
14025 ENDPROC(salsa20_keysetup)
14026
14027@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14028 add %r11,%rsp
14029 mov %rdi,%rax
14030 mov %rsi,%rdx
14031+ pax_force_retaddr
14032 ret
14033 ENDPROC(salsa20_ivsetup)
14034diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14035index 2f202f4..d9164d6 100644
14036--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14037+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14038@@ -24,6 +24,7 @@
14039 */
14040
14041 #include <linux/linkage.h>
14042+#include <asm/alternative-asm.h>
14043 #include "glue_helper-asm-avx.S"
14044
14045 .file "serpent-avx-x86_64-asm_64.S"
14046@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14047 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14048 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14049
14050+ pax_force_retaddr
14051 ret;
14052 ENDPROC(__serpent_enc_blk8_avx)
14053
14054@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14055 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14056 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14057
14058+ pax_force_retaddr
14059 ret;
14060 ENDPROC(__serpent_dec_blk8_avx)
14061
14062@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14063
14064 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14065
14066+ pax_force_retaddr
14067 ret;
14068 ENDPROC(serpent_ecb_enc_8way_avx)
14069
14070@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14071
14072 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14073
14074+ pax_force_retaddr
14075 ret;
14076 ENDPROC(serpent_ecb_dec_8way_avx)
14077
14078@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14079
14080 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14081
14082+ pax_force_retaddr
14083 ret;
14084 ENDPROC(serpent_cbc_dec_8way_avx)
14085
14086@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14087
14088 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14089
14090+ pax_force_retaddr
14091 ret;
14092 ENDPROC(serpent_ctr_8way_avx)
14093
14094@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14095 /* dst <= regs xor IVs(in dst) */
14096 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14097
14098+ pax_force_retaddr
14099 ret;
14100 ENDPROC(serpent_xts_enc_8way_avx)
14101
14102@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14103 /* dst <= regs xor IVs(in dst) */
14104 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14105
14106+ pax_force_retaddr
14107 ret;
14108 ENDPROC(serpent_xts_dec_8way_avx)
14109diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14110index b222085..abd483c 100644
14111--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14112+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14113@@ -15,6 +15,7 @@
14114 */
14115
14116 #include <linux/linkage.h>
14117+#include <asm/alternative-asm.h>
14118 #include "glue_helper-asm-avx2.S"
14119
14120 .file "serpent-avx2-asm_64.S"
14121@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14122 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14123 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14124
14125+ pax_force_retaddr
14126 ret;
14127 ENDPROC(__serpent_enc_blk16)
14128
14129@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14130 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14131 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14132
14133+ pax_force_retaddr
14134 ret;
14135 ENDPROC(__serpent_dec_blk16)
14136
14137@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14138
14139 vzeroupper;
14140
14141+ pax_force_retaddr
14142 ret;
14143 ENDPROC(serpent_ecb_enc_16way)
14144
14145@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14146
14147 vzeroupper;
14148
14149+ pax_force_retaddr
14150 ret;
14151 ENDPROC(serpent_ecb_dec_16way)
14152
14153@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14154
14155 vzeroupper;
14156
14157+ pax_force_retaddr
14158 ret;
14159 ENDPROC(serpent_cbc_dec_16way)
14160
14161@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14162
14163 vzeroupper;
14164
14165+ pax_force_retaddr
14166 ret;
14167 ENDPROC(serpent_ctr_16way)
14168
14169@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14170
14171 vzeroupper;
14172
14173+ pax_force_retaddr
14174 ret;
14175 ENDPROC(serpent_xts_enc_16way)
14176
14177@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14178
14179 vzeroupper;
14180
14181+ pax_force_retaddr
14182 ret;
14183 ENDPROC(serpent_xts_dec_16way)
14184diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14185index acc066c..1559cc4 100644
14186--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14187+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14188@@ -25,6 +25,7 @@
14189 */
14190
14191 #include <linux/linkage.h>
14192+#include <asm/alternative-asm.h>
14193
14194 .file "serpent-sse2-x86_64-asm_64.S"
14195 .text
14196@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14197 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14198 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14199
14200+ pax_force_retaddr
14201 ret;
14202
14203 .L__enc_xor8:
14204 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14205 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14206
14207+ pax_force_retaddr
14208 ret;
14209 ENDPROC(__serpent_enc_blk_8way)
14210
14211@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14212 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14213 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14214
14215+ pax_force_retaddr
14216 ret;
14217 ENDPROC(serpent_dec_blk_8way)
14218diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14219index a410950..9dfe7ad 100644
14220--- a/arch/x86/crypto/sha1_ssse3_asm.S
14221+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14222@@ -29,6 +29,7 @@
14223 */
14224
14225 #include <linux/linkage.h>
14226+#include <asm/alternative-asm.h>
14227
14228 #define CTX %rdi // arg1
14229 #define BUF %rsi // arg2
14230@@ -75,9 +76,9 @@
14231
14232 push %rbx
14233 push %rbp
14234- push %r12
14235+ push %r14
14236
14237- mov %rsp, %r12
14238+ mov %rsp, %r14
14239 sub $64, %rsp # allocate workspace
14240 and $~15, %rsp # align stack
14241
14242@@ -99,11 +100,12 @@
14243 xor %rax, %rax
14244 rep stosq
14245
14246- mov %r12, %rsp # deallocate workspace
14247+ mov %r14, %rsp # deallocate workspace
14248
14249- pop %r12
14250+ pop %r14
14251 pop %rbp
14252 pop %rbx
14253+ pax_force_retaddr
14254 ret
14255
14256 ENDPROC(\name)
14257diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14258index 642f156..51a513c 100644
14259--- a/arch/x86/crypto/sha256-avx-asm.S
14260+++ b/arch/x86/crypto/sha256-avx-asm.S
14261@@ -49,6 +49,7 @@
14262
14263 #ifdef CONFIG_AS_AVX
14264 #include <linux/linkage.h>
14265+#include <asm/alternative-asm.h>
14266
14267 ## assume buffers not aligned
14268 #define VMOVDQ vmovdqu
14269@@ -460,6 +461,7 @@ done_hash:
14270 popq %r13
14271 popq %rbp
14272 popq %rbx
14273+ pax_force_retaddr
14274 ret
14275 ENDPROC(sha256_transform_avx)
14276
14277diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14278index 9e86944..3795e6a 100644
14279--- a/arch/x86/crypto/sha256-avx2-asm.S
14280+++ b/arch/x86/crypto/sha256-avx2-asm.S
14281@@ -50,6 +50,7 @@
14282
14283 #ifdef CONFIG_AS_AVX2
14284 #include <linux/linkage.h>
14285+#include <asm/alternative-asm.h>
14286
14287 ## assume buffers not aligned
14288 #define VMOVDQ vmovdqu
14289@@ -720,6 +721,7 @@ done_hash:
14290 popq %r12
14291 popq %rbp
14292 popq %rbx
14293+ pax_force_retaddr
14294 ret
14295 ENDPROC(sha256_transform_rorx)
14296
14297diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14298index f833b74..8c62a9e 100644
14299--- a/arch/x86/crypto/sha256-ssse3-asm.S
14300+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14301@@ -47,6 +47,7 @@
14302 ########################################################################
14303
14304 #include <linux/linkage.h>
14305+#include <asm/alternative-asm.h>
14306
14307 ## assume buffers not aligned
14308 #define MOVDQ movdqu
14309@@ -471,6 +472,7 @@ done_hash:
14310 popq %rbp
14311 popq %rbx
14312
14313+ pax_force_retaddr
14314 ret
14315 ENDPROC(sha256_transform_ssse3)
14316
14317diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14318index 974dde9..a823ff9 100644
14319--- a/arch/x86/crypto/sha512-avx-asm.S
14320+++ b/arch/x86/crypto/sha512-avx-asm.S
14321@@ -49,6 +49,7 @@
14322
14323 #ifdef CONFIG_AS_AVX
14324 #include <linux/linkage.h>
14325+#include <asm/alternative-asm.h>
14326
14327 .text
14328
14329@@ -364,6 +365,7 @@ updateblock:
14330 mov frame_RSPSAVE(%rsp), %rsp
14331
14332 nowork:
14333+ pax_force_retaddr
14334 ret
14335 ENDPROC(sha512_transform_avx)
14336
14337diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14338index 568b961..ed20c37 100644
14339--- a/arch/x86/crypto/sha512-avx2-asm.S
14340+++ b/arch/x86/crypto/sha512-avx2-asm.S
14341@@ -51,6 +51,7 @@
14342
14343 #ifdef CONFIG_AS_AVX2
14344 #include <linux/linkage.h>
14345+#include <asm/alternative-asm.h>
14346
14347 .text
14348
14349@@ -678,6 +679,7 @@ done_hash:
14350
14351 # Restore Stack Pointer
14352 mov frame_RSPSAVE(%rsp), %rsp
14353+ pax_force_retaddr
14354 ret
14355 ENDPROC(sha512_transform_rorx)
14356
14357diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14358index fb56855..6edd768 100644
14359--- a/arch/x86/crypto/sha512-ssse3-asm.S
14360+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14361@@ -48,6 +48,7 @@
14362 ########################################################################
14363
14364 #include <linux/linkage.h>
14365+#include <asm/alternative-asm.h>
14366
14367 .text
14368
14369@@ -363,6 +364,7 @@ updateblock:
14370 mov frame_RSPSAVE(%rsp), %rsp
14371
14372 nowork:
14373+ pax_force_retaddr
14374 ret
14375 ENDPROC(sha512_transform_ssse3)
14376
14377diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14378index 0505813..b067311 100644
14379--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14380+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14381@@ -24,6 +24,7 @@
14382 */
14383
14384 #include <linux/linkage.h>
14385+#include <asm/alternative-asm.h>
14386 #include "glue_helper-asm-avx.S"
14387
14388 .file "twofish-avx-x86_64-asm_64.S"
14389@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14390 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14391 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14392
14393+ pax_force_retaddr
14394 ret;
14395 ENDPROC(__twofish_enc_blk8)
14396
14397@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14398 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14399 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14400
14401+ pax_force_retaddr
14402 ret;
14403 ENDPROC(__twofish_dec_blk8)
14404
14405@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14406
14407 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14408
14409+ pax_force_retaddr
14410 ret;
14411 ENDPROC(twofish_ecb_enc_8way)
14412
14413@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14414
14415 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14416
14417+ pax_force_retaddr
14418 ret;
14419 ENDPROC(twofish_ecb_dec_8way)
14420
14421@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14422 * %rdx: src
14423 */
14424
14425- pushq %r12;
14426+ pushq %r14;
14427
14428 movq %rsi, %r11;
14429- movq %rdx, %r12;
14430+ movq %rdx, %r14;
14431
14432 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14433
14434 call __twofish_dec_blk8;
14435
14436- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14437+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14438
14439- popq %r12;
14440+ popq %r14;
14441
14442+ pax_force_retaddr
14443 ret;
14444 ENDPROC(twofish_cbc_dec_8way)
14445
14446@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14447 * %rcx: iv (little endian, 128bit)
14448 */
14449
14450- pushq %r12;
14451+ pushq %r14;
14452
14453 movq %rsi, %r11;
14454- movq %rdx, %r12;
14455+ movq %rdx, %r14;
14456
14457 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14458 RD2, RX0, RX1, RY0);
14459
14460 call __twofish_enc_blk8;
14461
14462- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14463+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14464
14465- popq %r12;
14466+ popq %r14;
14467
14468+ pax_force_retaddr
14469 ret;
14470 ENDPROC(twofish_ctr_8way)
14471
14472@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14473 /* dst <= regs xor IVs(in dst) */
14474 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14475
14476+ pax_force_retaddr
14477 ret;
14478 ENDPROC(twofish_xts_enc_8way)
14479
14480@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14481 /* dst <= regs xor IVs(in dst) */
14482 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14483
14484+ pax_force_retaddr
14485 ret;
14486 ENDPROC(twofish_xts_dec_8way)
14487diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14488index 1c3b7ce..02f578d 100644
14489--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14490+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14491@@ -21,6 +21,7 @@
14492 */
14493
14494 #include <linux/linkage.h>
14495+#include <asm/alternative-asm.h>
14496
14497 .file "twofish-x86_64-asm-3way.S"
14498 .text
14499@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14500 popq %r13;
14501 popq %r14;
14502 popq %r15;
14503+ pax_force_retaddr
14504 ret;
14505
14506 .L__enc_xor3:
14507@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14508 popq %r13;
14509 popq %r14;
14510 popq %r15;
14511+ pax_force_retaddr
14512 ret;
14513 ENDPROC(__twofish_enc_blk_3way)
14514
14515@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14516 popq %r13;
14517 popq %r14;
14518 popq %r15;
14519+ pax_force_retaddr
14520 ret;
14521 ENDPROC(twofish_dec_blk_3way)
14522diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14523index a039d21..524b8b2 100644
14524--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14525+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14526@@ -22,6 +22,7 @@
14527
14528 #include <linux/linkage.h>
14529 #include <asm/asm-offsets.h>
14530+#include <asm/alternative-asm.h>
14531
14532 #define a_offset 0
14533 #define b_offset 4
14534@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14535
14536 popq R1
14537 movq $1,%rax
14538+ pax_force_retaddr
14539 ret
14540 ENDPROC(twofish_enc_blk)
14541
14542@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14543
14544 popq R1
14545 movq $1,%rax
14546+ pax_force_retaddr
14547 ret
14548 ENDPROC(twofish_dec_blk)
14549diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14550index df91466..74b31cb 100644
14551--- a/arch/x86/ia32/ia32_aout.c
14552+++ b/arch/x86/ia32/ia32_aout.c
14553@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14554 unsigned long dump_start, dump_size;
14555 struct user32 dump;
14556
14557+ memset(&dump, 0, sizeof(dump));
14558+
14559 fs = get_fs();
14560 set_fs(KERNEL_DS);
14561 has_dumped = 1;
14562diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14563index f9e181a..300544c 100644
14564--- a/arch/x86/ia32/ia32_signal.c
14565+++ b/arch/x86/ia32/ia32_signal.c
14566@@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14567 if (__get_user(set.sig[0], &frame->sc.oldmask)
14568 || (_COMPAT_NSIG_WORDS > 1
14569 && __copy_from_user((((char *) &set.sig) + 4),
14570- &frame->extramask,
14571+ frame->extramask,
14572 sizeof(frame->extramask))))
14573 goto badframe;
14574
14575@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14576 sp -= frame_size;
14577 /* Align the stack pointer according to the i386 ABI,
14578 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14579- sp = ((sp + 4) & -16ul) - 4;
14580+ sp = ((sp - 12) & -16ul) - 4;
14581 return (void __user *) sp;
14582 }
14583
14584@@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14585 } else {
14586 /* Return stub is in 32bit vsyscall page */
14587 if (current->mm->context.vdso)
14588- restorer = current->mm->context.vdso +
14589- selected_vdso32->sym___kernel_sigreturn;
14590+ restorer = (void __force_user *)(current->mm->context.vdso +
14591+ selected_vdso32->sym___kernel_sigreturn);
14592 else
14593- restorer = &frame->retcode;
14594+ restorer = frame->retcode;
14595 }
14596
14597 put_user_try {
14598@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14599 * These are actually not used anymore, but left because some
14600 * gdb versions depend on them as a marker.
14601 */
14602- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14603+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14604 } put_user_catch(err);
14605
14606 if (err)
14607@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14608 0xb8,
14609 __NR_ia32_rt_sigreturn,
14610 0x80cd,
14611- 0,
14612+ 0
14613 };
14614
14615 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14616@@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14617
14618 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14619 restorer = ksig->ka.sa.sa_restorer;
14620+ else if (current->mm->context.vdso)
14621+ /* Return stub is in 32bit vsyscall page */
14622+ restorer = (void __force_user *)(current->mm->context.vdso +
14623+ selected_vdso32->sym___kernel_rt_sigreturn);
14624 else
14625- restorer = current->mm->context.vdso +
14626- selected_vdso32->sym___kernel_rt_sigreturn;
14627+ restorer = frame->retcode;
14628 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14629
14630 /*
14631 * Not actually used anymore, but left because some gdb
14632 * versions need it.
14633 */
14634- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14635+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14636 } put_user_catch(err);
14637
14638 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14639diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14640index ffe7122..899bad3 100644
14641--- a/arch/x86/ia32/ia32entry.S
14642+++ b/arch/x86/ia32/ia32entry.S
14643@@ -15,8 +15,10 @@
14644 #include <asm/irqflags.h>
14645 #include <asm/asm.h>
14646 #include <asm/smap.h>
14647+#include <asm/pgtable.h>
14648 #include <linux/linkage.h>
14649 #include <linux/err.h>
14650+#include <asm/alternative-asm.h>
14651
14652 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14653 #include <linux/elf-em.h>
14654@@ -62,12 +64,12 @@
14655 */
14656 .macro LOAD_ARGS32 offset, _r9=0
14657 .if \_r9
14658- movl \offset+16(%rsp),%r9d
14659+ movl \offset+R9(%rsp),%r9d
14660 .endif
14661- movl \offset+40(%rsp),%ecx
14662- movl \offset+48(%rsp),%edx
14663- movl \offset+56(%rsp),%esi
14664- movl \offset+64(%rsp),%edi
14665+ movl \offset+RCX(%rsp),%ecx
14666+ movl \offset+RDX(%rsp),%edx
14667+ movl \offset+RSI(%rsp),%esi
14668+ movl \offset+RDI(%rsp),%edi
14669 movl %eax,%eax /* zero extension */
14670 .endm
14671
14672@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14673 ENDPROC(native_irq_enable_sysexit)
14674 #endif
14675
14676+ .macro pax_enter_kernel_user
14677+ pax_set_fptr_mask
14678+#ifdef CONFIG_PAX_MEMORY_UDEREF
14679+ call pax_enter_kernel_user
14680+#endif
14681+ .endm
14682+
14683+ .macro pax_exit_kernel_user
14684+#ifdef CONFIG_PAX_MEMORY_UDEREF
14685+ call pax_exit_kernel_user
14686+#endif
14687+#ifdef CONFIG_PAX_RANDKSTACK
14688+ pushq %rax
14689+ pushq %r11
14690+ call pax_randomize_kstack
14691+ popq %r11
14692+ popq %rax
14693+#endif
14694+ .endm
14695+
14696+ .macro pax_erase_kstack
14697+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14698+ call pax_erase_kstack
14699+#endif
14700+ .endm
14701+
14702 /*
14703 * 32bit SYSENTER instruction entry.
14704 *
14705@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14706 CFI_REGISTER rsp,rbp
14707 SWAPGS_UNSAFE_STACK
14708 movq PER_CPU_VAR(kernel_stack), %rsp
14709- addq $(KERNEL_STACK_OFFSET),%rsp
14710- /*
14711- * No need to follow this irqs on/off section: the syscall
14712- * disabled irqs, here we enable it straight after entry:
14713- */
14714- ENABLE_INTERRUPTS(CLBR_NONE)
14715 movl %ebp,%ebp /* zero extension */
14716 pushq_cfi $__USER32_DS
14717 /*CFI_REL_OFFSET ss,0*/
14718@@ -135,23 +157,46 @@ ENTRY(ia32_sysenter_target)
14719 CFI_REL_OFFSET rsp,0
14720 pushfq_cfi
14721 /*CFI_REL_OFFSET rflags,0*/
14722- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14723- CFI_REGISTER rip,r10
14724+ orl $X86_EFLAGS_IF,(%rsp)
14725+ GET_THREAD_INFO(%r11)
14726+ movl TI_sysenter_return(%r11), %r11d
14727+ CFI_REGISTER rip,r11
14728 pushq_cfi $__USER32_CS
14729 /*CFI_REL_OFFSET cs,0*/
14730 movl %eax, %eax
14731- pushq_cfi %r10
14732+ pushq_cfi %r11
14733 CFI_REL_OFFSET rip,0
14734 pushq_cfi %rax
14735 cld
14736 SAVE_ARGS 0,1,0
14737+ pax_enter_kernel_user
14738+
14739+#ifdef CONFIG_PAX_RANDKSTACK
14740+ pax_erase_kstack
14741+#endif
14742+
14743+ /*
14744+ * No need to follow this irqs on/off section: the syscall
14745+ * disabled irqs, here we enable it straight after entry:
14746+ */
14747+ ENABLE_INTERRUPTS(CLBR_NONE)
14748 /* no need to do an access_ok check here because rbp has been
14749 32bit zero extended */
14750+
14751+#ifdef CONFIG_PAX_MEMORY_UDEREF
14752+ addq pax_user_shadow_base,%rbp
14753+ ASM_PAX_OPEN_USERLAND
14754+#endif
14755+
14756 ASM_STAC
14757 1: movl (%rbp),%ebp
14758 _ASM_EXTABLE(1b,ia32_badarg)
14759 ASM_CLAC
14760
14761+#ifdef CONFIG_PAX_MEMORY_UDEREF
14762+ ASM_PAX_CLOSE_USERLAND
14763+#endif
14764+
14765 /*
14766 * Sysenter doesn't filter flags, so we need to clear NT
14767 * ourselves. To save a few cycles, we can check whether
14768@@ -161,8 +206,9 @@ ENTRY(ia32_sysenter_target)
14769 jnz sysenter_fix_flags
14770 sysenter_flags_fixed:
14771
14772- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14773- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14774+ GET_THREAD_INFO(%r11)
14775+ orl $TS_COMPAT,TI_status(%r11)
14776+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14777 CFI_REMEMBER_STATE
14778 jnz sysenter_tracesys
14779 cmpq $(IA32_NR_syscalls-1),%rax
14780@@ -172,15 +218,18 @@ sysenter_do_call:
14781 sysenter_dispatch:
14782 call *ia32_sys_call_table(,%rax,8)
14783 movq %rax,RAX-ARGOFFSET(%rsp)
14784+ GET_THREAD_INFO(%r11)
14785 DISABLE_INTERRUPTS(CLBR_NONE)
14786 TRACE_IRQS_OFF
14787- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14788+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14789 jnz sysexit_audit
14790 sysexit_from_sys_call:
14791- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14792+ pax_exit_kernel_user
14793+ pax_erase_kstack
14794+ andl $~TS_COMPAT,TI_status(%r11)
14795 /* clear IF, that popfq doesn't enable interrupts early */
14796- andl $~0x200,EFLAGS-R11(%rsp)
14797- movl RIP-R11(%rsp),%edx /* User %eip */
14798+ andl $~X86_EFLAGS_IF,EFLAGS(%rsp)
14799+ movl RIP(%rsp),%edx /* User %eip */
14800 CFI_REGISTER rip,rdx
14801 RESTORE_ARGS 0,24,0,0,0,0
14802 xorq %r8,%r8
14803@@ -205,6 +254,9 @@ sysexit_from_sys_call:
14804 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14805 movl %eax,%edi /* 1st arg: syscall number */
14806 call __audit_syscall_entry
14807+
14808+ pax_erase_kstack
14809+
14810 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14811 cmpq $(IA32_NR_syscalls-1),%rax
14812 ja ia32_badsys
14813@@ -216,7 +268,7 @@ sysexit_from_sys_call:
14814 .endm
14815
14816 .macro auditsys_exit exit
14817- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14818+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14819 jnz ia32_ret_from_sys_call
14820 TRACE_IRQS_ON
14821 ENABLE_INTERRUPTS(CLBR_NONE)
14822@@ -227,11 +279,12 @@ sysexit_from_sys_call:
14823 1: setbe %al /* 1 if error, 0 if not */
14824 movzbl %al,%edi /* zero-extend that into %edi */
14825 call __audit_syscall_exit
14826+ GET_THREAD_INFO(%r11)
14827 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14828 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14829 DISABLE_INTERRUPTS(CLBR_NONE)
14830 TRACE_IRQS_OFF
14831- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14832+ testl %edi,TI_flags(%r11)
14833 jz \exit
14834 CLEAR_RREGS -ARGOFFSET
14835 jmp int_with_check
14836@@ -253,7 +306,7 @@ sysenter_fix_flags:
14837
14838 sysenter_tracesys:
14839 #ifdef CONFIG_AUDITSYSCALL
14840- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14841+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14842 jz sysenter_auditsys
14843 #endif
14844 SAVE_REST
14845@@ -265,6 +318,9 @@ sysenter_tracesys:
14846 RESTORE_REST
14847 cmpq $(IA32_NR_syscalls-1),%rax
14848 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14849+
14850+ pax_erase_kstack
14851+
14852 jmp sysenter_do_call
14853 CFI_ENDPROC
14854 ENDPROC(ia32_sysenter_target)
14855@@ -292,19 +348,25 @@ ENDPROC(ia32_sysenter_target)
14856 ENTRY(ia32_cstar_target)
14857 CFI_STARTPROC32 simple
14858 CFI_SIGNAL_FRAME
14859- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14860+ CFI_DEF_CFA rsp,0
14861 CFI_REGISTER rip,rcx
14862 /*CFI_REGISTER rflags,r11*/
14863 SWAPGS_UNSAFE_STACK
14864 movl %esp,%r8d
14865 CFI_REGISTER rsp,r8
14866 movq PER_CPU_VAR(kernel_stack),%rsp
14867+ SAVE_ARGS 8*6,0,0
14868+ pax_enter_kernel_user
14869+
14870+#ifdef CONFIG_PAX_RANDKSTACK
14871+ pax_erase_kstack
14872+#endif
14873+
14874 /*
14875 * No need to follow this irqs on/off section: the syscall
14876 * disabled irqs and here we enable it straight after entry:
14877 */
14878 ENABLE_INTERRUPTS(CLBR_NONE)
14879- SAVE_ARGS 8,0,0
14880 movl %eax,%eax /* zero extension */
14881 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14882 movq %rcx,RIP-ARGOFFSET(%rsp)
14883@@ -320,12 +382,25 @@ ENTRY(ia32_cstar_target)
14884 /* no need to do an access_ok check here because r8 has been
14885 32bit zero extended */
14886 /* hardware stack frame is complete now */
14887+
14888+#ifdef CONFIG_PAX_MEMORY_UDEREF
14889+ ASM_PAX_OPEN_USERLAND
14890+ movq pax_user_shadow_base,%r8
14891+ addq RSP-ARGOFFSET(%rsp),%r8
14892+#endif
14893+
14894 ASM_STAC
14895 1: movl (%r8),%r9d
14896 _ASM_EXTABLE(1b,ia32_badarg)
14897 ASM_CLAC
14898- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14899- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14900+
14901+#ifdef CONFIG_PAX_MEMORY_UDEREF
14902+ ASM_PAX_CLOSE_USERLAND
14903+#endif
14904+
14905+ GET_THREAD_INFO(%r11)
14906+ orl $TS_COMPAT,TI_status(%r11)
14907+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14908 CFI_REMEMBER_STATE
14909 jnz cstar_tracesys
14910 cmpq $IA32_NR_syscalls-1,%rax
14911@@ -335,13 +410,16 @@ cstar_do_call:
14912 cstar_dispatch:
14913 call *ia32_sys_call_table(,%rax,8)
14914 movq %rax,RAX-ARGOFFSET(%rsp)
14915+ GET_THREAD_INFO(%r11)
14916 DISABLE_INTERRUPTS(CLBR_NONE)
14917 TRACE_IRQS_OFF
14918- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14919+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14920 jnz sysretl_audit
14921 sysretl_from_sys_call:
14922- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14923- RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14924+ pax_exit_kernel_user
14925+ pax_erase_kstack
14926+ andl $~TS_COMPAT,TI_status(%r11)
14927+ RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14928 movl RIP-ARGOFFSET(%rsp),%ecx
14929 CFI_REGISTER rip,rcx
14930 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14931@@ -368,7 +446,7 @@ sysretl_audit:
14932
14933 cstar_tracesys:
14934 #ifdef CONFIG_AUDITSYSCALL
14935- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14936+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14937 jz cstar_auditsys
14938 #endif
14939 xchgl %r9d,%ebp
14940@@ -382,11 +460,19 @@ cstar_tracesys:
14941 xchgl %ebp,%r9d
14942 cmpq $(IA32_NR_syscalls-1),%rax
14943 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14944+
14945+ pax_erase_kstack
14946+
14947 jmp cstar_do_call
14948 END(ia32_cstar_target)
14949
14950 ia32_badarg:
14951 ASM_CLAC
14952+
14953+#ifdef CONFIG_PAX_MEMORY_UDEREF
14954+ ASM_PAX_CLOSE_USERLAND
14955+#endif
14956+
14957 movq $-EFAULT,%rax
14958 jmp ia32_sysret
14959 CFI_ENDPROC
14960@@ -423,19 +509,26 @@ ENTRY(ia32_syscall)
14961 CFI_REL_OFFSET rip,RIP-RIP
14962 PARAVIRT_ADJUST_EXCEPTION_FRAME
14963 SWAPGS
14964- /*
14965- * No need to follow this irqs on/off section: the syscall
14966- * disabled irqs and here we enable it straight after entry:
14967- */
14968- ENABLE_INTERRUPTS(CLBR_NONE)
14969 movl %eax,%eax
14970 pushq_cfi %rax
14971 cld
14972 /* note the registers are not zero extended to the sf.
14973 this could be a problem. */
14974 SAVE_ARGS 0,1,0
14975- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14976- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14977+ pax_enter_kernel_user
14978+
14979+#ifdef CONFIG_PAX_RANDKSTACK
14980+ pax_erase_kstack
14981+#endif
14982+
14983+ /*
14984+ * No need to follow this irqs on/off section: the syscall
14985+ * disabled irqs and here we enable it straight after entry:
14986+ */
14987+ ENABLE_INTERRUPTS(CLBR_NONE)
14988+ GET_THREAD_INFO(%r11)
14989+ orl $TS_COMPAT,TI_status(%r11)
14990+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14991 jnz ia32_tracesys
14992 cmpq $(IA32_NR_syscalls-1),%rax
14993 ja ia32_badsys
14994@@ -458,6 +551,9 @@ ia32_tracesys:
14995 RESTORE_REST
14996 cmpq $(IA32_NR_syscalls-1),%rax
14997 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
14998+
14999+ pax_erase_kstack
15000+
15001 jmp ia32_do_call
15002 END(ia32_syscall)
15003
15004diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15005index 8e0ceec..af13504 100644
15006--- a/arch/x86/ia32/sys_ia32.c
15007+++ b/arch/x86/ia32/sys_ia32.c
15008@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15009 */
15010 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15011 {
15012- typeof(ubuf->st_uid) uid = 0;
15013- typeof(ubuf->st_gid) gid = 0;
15014+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15015+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15016 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15017 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15018 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15019diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15020index 372231c..51b537d 100644
15021--- a/arch/x86/include/asm/alternative-asm.h
15022+++ b/arch/x86/include/asm/alternative-asm.h
15023@@ -18,6 +18,45 @@
15024 .endm
15025 #endif
15026
15027+#ifdef KERNEXEC_PLUGIN
15028+ .macro pax_force_retaddr_bts rip=0
15029+ btsq $63,\rip(%rsp)
15030+ .endm
15031+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15032+ .macro pax_force_retaddr rip=0, reload=0
15033+ btsq $63,\rip(%rsp)
15034+ .endm
15035+ .macro pax_force_fptr ptr
15036+ btsq $63,\ptr
15037+ .endm
15038+ .macro pax_set_fptr_mask
15039+ .endm
15040+#endif
15041+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15042+ .macro pax_force_retaddr rip=0, reload=0
15043+ .if \reload
15044+ pax_set_fptr_mask
15045+ .endif
15046+ orq %r12,\rip(%rsp)
15047+ .endm
15048+ .macro pax_force_fptr ptr
15049+ orq %r12,\ptr
15050+ .endm
15051+ .macro pax_set_fptr_mask
15052+ movabs $0x8000000000000000,%r12
15053+ .endm
15054+#endif
15055+#else
15056+ .macro pax_force_retaddr rip=0, reload=0
15057+ .endm
15058+ .macro pax_force_fptr ptr
15059+ .endm
15060+ .macro pax_force_retaddr_bts rip=0
15061+ .endm
15062+ .macro pax_set_fptr_mask
15063+ .endm
15064+#endif
15065+
15066 .macro altinstruction_entry orig alt feature orig_len alt_len
15067 .long \orig - .
15068 .long \alt - .
15069diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15070index 473bdbe..b1e3377 100644
15071--- a/arch/x86/include/asm/alternative.h
15072+++ b/arch/x86/include/asm/alternative.h
15073@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15074 ".pushsection .discard,\"aw\",@progbits\n" \
15075 DISCARD_ENTRY(1) \
15076 ".popsection\n" \
15077- ".pushsection .altinstr_replacement, \"ax\"\n" \
15078+ ".pushsection .altinstr_replacement, \"a\"\n" \
15079 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15080 ".popsection"
15081
15082@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15083 DISCARD_ENTRY(1) \
15084 DISCARD_ENTRY(2) \
15085 ".popsection\n" \
15086- ".pushsection .altinstr_replacement, \"ax\"\n" \
15087+ ".pushsection .altinstr_replacement, \"a\"\n" \
15088 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15089 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15090 ".popsection"
15091diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15092index 465b309..ab7e51f 100644
15093--- a/arch/x86/include/asm/apic.h
15094+++ b/arch/x86/include/asm/apic.h
15095@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15096
15097 #ifdef CONFIG_X86_LOCAL_APIC
15098
15099-extern unsigned int apic_verbosity;
15100+extern int apic_verbosity;
15101 extern int local_apic_timer_c2_ok;
15102
15103 extern int disable_apic;
15104diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15105index 20370c6..a2eb9b0 100644
15106--- a/arch/x86/include/asm/apm.h
15107+++ b/arch/x86/include/asm/apm.h
15108@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15109 __asm__ __volatile__(APM_DO_ZERO_SEGS
15110 "pushl %%edi\n\t"
15111 "pushl %%ebp\n\t"
15112- "lcall *%%cs:apm_bios_entry\n\t"
15113+ "lcall *%%ss:apm_bios_entry\n\t"
15114 "setc %%al\n\t"
15115 "popl %%ebp\n\t"
15116 "popl %%edi\n\t"
15117@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15118 __asm__ __volatile__(APM_DO_ZERO_SEGS
15119 "pushl %%edi\n\t"
15120 "pushl %%ebp\n\t"
15121- "lcall *%%cs:apm_bios_entry\n\t"
15122+ "lcall *%%ss:apm_bios_entry\n\t"
15123 "setc %%bl\n\t"
15124 "popl %%ebp\n\t"
15125 "popl %%edi\n\t"
15126diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15127index 5e5cd12..3d18208 100644
15128--- a/arch/x86/include/asm/atomic.h
15129+++ b/arch/x86/include/asm/atomic.h
15130@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15131 }
15132
15133 /**
15134+ * atomic_read_unchecked - read atomic variable
15135+ * @v: pointer of type atomic_unchecked_t
15136+ *
15137+ * Atomically reads the value of @v.
15138+ */
15139+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15140+{
15141+ return ACCESS_ONCE((v)->counter);
15142+}
15143+
15144+/**
15145 * atomic_set - set atomic variable
15146 * @v: pointer of type atomic_t
15147 * @i: required value
15148@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15149 }
15150
15151 /**
15152+ * atomic_set_unchecked - set atomic variable
15153+ * @v: pointer of type atomic_unchecked_t
15154+ * @i: required value
15155+ *
15156+ * Atomically sets the value of @v to @i.
15157+ */
15158+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15159+{
15160+ v->counter = i;
15161+}
15162+
15163+/**
15164 * atomic_add - add integer to atomic variable
15165 * @i: integer value to add
15166 * @v: pointer of type atomic_t
15167@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15168 */
15169 static inline void atomic_add(int i, atomic_t *v)
15170 {
15171- asm volatile(LOCK_PREFIX "addl %1,%0"
15172+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15173+
15174+#ifdef CONFIG_PAX_REFCOUNT
15175+ "jno 0f\n"
15176+ LOCK_PREFIX "subl %1,%0\n"
15177+ "int $4\n0:\n"
15178+ _ASM_EXTABLE(0b, 0b)
15179+#endif
15180+
15181+ : "+m" (v->counter)
15182+ : "ir" (i));
15183+}
15184+
15185+/**
15186+ * atomic_add_unchecked - add integer to atomic variable
15187+ * @i: integer value to add
15188+ * @v: pointer of type atomic_unchecked_t
15189+ *
15190+ * Atomically adds @i to @v.
15191+ */
15192+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15193+{
15194+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15195 : "+m" (v->counter)
15196 : "ir" (i));
15197 }
15198@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15199 */
15200 static inline void atomic_sub(int i, atomic_t *v)
15201 {
15202- asm volatile(LOCK_PREFIX "subl %1,%0"
15203+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15204+
15205+#ifdef CONFIG_PAX_REFCOUNT
15206+ "jno 0f\n"
15207+ LOCK_PREFIX "addl %1,%0\n"
15208+ "int $4\n0:\n"
15209+ _ASM_EXTABLE(0b, 0b)
15210+#endif
15211+
15212+ : "+m" (v->counter)
15213+ : "ir" (i));
15214+}
15215+
15216+/**
15217+ * atomic_sub_unchecked - subtract integer from atomic variable
15218+ * @i: integer value to subtract
15219+ * @v: pointer of type atomic_unchecked_t
15220+ *
15221+ * Atomically subtracts @i from @v.
15222+ */
15223+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15224+{
15225+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15226 : "+m" (v->counter)
15227 : "ir" (i));
15228 }
15229@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15230 */
15231 static inline int atomic_sub_and_test(int i, atomic_t *v)
15232 {
15233- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15234+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15235 }
15236
15237 /**
15238@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15239 */
15240 static inline void atomic_inc(atomic_t *v)
15241 {
15242- asm volatile(LOCK_PREFIX "incl %0"
15243+ asm volatile(LOCK_PREFIX "incl %0\n"
15244+
15245+#ifdef CONFIG_PAX_REFCOUNT
15246+ "jno 0f\n"
15247+ LOCK_PREFIX "decl %0\n"
15248+ "int $4\n0:\n"
15249+ _ASM_EXTABLE(0b, 0b)
15250+#endif
15251+
15252+ : "+m" (v->counter));
15253+}
15254+
15255+/**
15256+ * atomic_inc_unchecked - increment atomic variable
15257+ * @v: pointer of type atomic_unchecked_t
15258+ *
15259+ * Atomically increments @v by 1.
15260+ */
15261+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15262+{
15263+ asm volatile(LOCK_PREFIX "incl %0\n"
15264 : "+m" (v->counter));
15265 }
15266
15267@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15268 */
15269 static inline void atomic_dec(atomic_t *v)
15270 {
15271- asm volatile(LOCK_PREFIX "decl %0"
15272+ asm volatile(LOCK_PREFIX "decl %0\n"
15273+
15274+#ifdef CONFIG_PAX_REFCOUNT
15275+ "jno 0f\n"
15276+ LOCK_PREFIX "incl %0\n"
15277+ "int $4\n0:\n"
15278+ _ASM_EXTABLE(0b, 0b)
15279+#endif
15280+
15281+ : "+m" (v->counter));
15282+}
15283+
15284+/**
15285+ * atomic_dec_unchecked - decrement atomic variable
15286+ * @v: pointer of type atomic_unchecked_t
15287+ *
15288+ * Atomically decrements @v by 1.
15289+ */
15290+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15291+{
15292+ asm volatile(LOCK_PREFIX "decl %0\n"
15293 : "+m" (v->counter));
15294 }
15295
15296@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15297 */
15298 static inline int atomic_dec_and_test(atomic_t *v)
15299 {
15300- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15301+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15302 }
15303
15304 /**
15305@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15306 */
15307 static inline int atomic_inc_and_test(atomic_t *v)
15308 {
15309- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15310+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15311+}
15312+
15313+/**
15314+ * atomic_inc_and_test_unchecked - increment and test
15315+ * @v: pointer of type atomic_unchecked_t
15316+ *
15317+ * Atomically increments @v by 1
15318+ * and returns true if the result is zero, or false for all
15319+ * other cases.
15320+ */
15321+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15322+{
15323+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15324 }
15325
15326 /**
15327@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15328 */
15329 static inline int atomic_add_negative(int i, atomic_t *v)
15330 {
15331- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15332+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15333 }
15334
15335 /**
15336@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15337 *
15338 * Atomically adds @i to @v and returns @i + @v
15339 */
15340-static inline int atomic_add_return(int i, atomic_t *v)
15341+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15342+{
15343+ return i + xadd_check_overflow(&v->counter, i);
15344+}
15345+
15346+/**
15347+ * atomic_add_return_unchecked - add integer and return
15348+ * @i: integer value to add
15349+ * @v: pointer of type atomic_unchecked_t
15350+ *
15351+ * Atomically adds @i to @v and returns @i + @v
15352+ */
15353+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15354 {
15355 return i + xadd(&v->counter, i);
15356 }
15357@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15358 *
15359 * Atomically subtracts @i from @v and returns @v - @i
15360 */
15361-static inline int atomic_sub_return(int i, atomic_t *v)
15362+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15363 {
15364 return atomic_add_return(-i, v);
15365 }
15366
15367 #define atomic_inc_return(v) (atomic_add_return(1, v))
15368+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15369+{
15370+ return atomic_add_return_unchecked(1, v);
15371+}
15372 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15373
15374-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15375+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15376+{
15377+ return cmpxchg(&v->counter, old, new);
15378+}
15379+
15380+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15381 {
15382 return cmpxchg(&v->counter, old, new);
15383 }
15384@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15385 return xchg(&v->counter, new);
15386 }
15387
15388+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15389+{
15390+ return xchg(&v->counter, new);
15391+}
15392+
15393 /**
15394 * __atomic_add_unless - add unless the number is already a given value
15395 * @v: pointer of type atomic_t
15396@@ -191,14 +337,27 @@ static inline int atomic_xchg(atomic_t *v, int new)
15397 * Atomically adds @a to @v, so long as @v was not already @u.
15398 * Returns the old value of @v.
15399 */
15400-static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15401+static inline int __intentional_overflow(-1) __atomic_add_unless(atomic_t *v, int a, int u)
15402 {
15403- int c, old;
15404+ int c, old, new;
15405 c = atomic_read(v);
15406 for (;;) {
15407- if (unlikely(c == (u)))
15408+ if (unlikely(c == u))
15409 break;
15410- old = atomic_cmpxchg((v), c, c + (a));
15411+
15412+ asm volatile("addl %2,%0\n"
15413+
15414+#ifdef CONFIG_PAX_REFCOUNT
15415+ "jno 0f\n"
15416+ "subl %2,%0\n"
15417+ "int $4\n0:\n"
15418+ _ASM_EXTABLE(0b, 0b)
15419+#endif
15420+
15421+ : "=r" (new)
15422+ : "0" (c), "ir" (a));
15423+
15424+ old = atomic_cmpxchg(v, c, new);
15425 if (likely(old == c))
15426 break;
15427 c = old;
15428@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15429 }
15430
15431 /**
15432+ * atomic_inc_not_zero_hint - increment if not null
15433+ * @v: pointer of type atomic_t
15434+ * @hint: probable value of the atomic before the increment
15435+ *
15436+ * This version of atomic_inc_not_zero() gives a hint of probable
15437+ * value of the atomic. This helps processor to not read the memory
15438+ * before doing the atomic read/modify/write cycle, lowering
15439+ * number of bus transactions on some arches.
15440+ *
15441+ * Returns: 0 if increment was not done, 1 otherwise.
15442+ */
15443+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15444+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15445+{
15446+ int val, c = hint, new;
15447+
15448+ /* sanity test, should be removed by compiler if hint is a constant */
15449+ if (!hint)
15450+ return __atomic_add_unless(v, 1, 0);
15451+
15452+ do {
15453+ asm volatile("incl %0\n"
15454+
15455+#ifdef CONFIG_PAX_REFCOUNT
15456+ "jno 0f\n"
15457+ "decl %0\n"
15458+ "int $4\n0:\n"
15459+ _ASM_EXTABLE(0b, 0b)
15460+#endif
15461+
15462+ : "=r" (new)
15463+ : "0" (c));
15464+
15465+ val = atomic_cmpxchg(v, c, new);
15466+ if (val == c)
15467+ return 1;
15468+ c = val;
15469+ } while (c);
15470+
15471+ return 0;
15472+}
15473+
15474+/**
15475 * atomic_inc_short - increment of a short integer
15476 * @v: pointer to type int
15477 *
15478@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15479 }
15480
15481 /* These are x86-specific, used by some header files */
15482-#define atomic_clear_mask(mask, addr) \
15483- asm volatile(LOCK_PREFIX "andl %0,%1" \
15484- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15485+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15486+{
15487+ asm volatile(LOCK_PREFIX "andl %1,%0"
15488+ : "+m" (v->counter)
15489+ : "r" (~(mask))
15490+ : "memory");
15491+}
15492
15493-#define atomic_set_mask(mask, addr) \
15494- asm volatile(LOCK_PREFIX "orl %0,%1" \
15495- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15496- : "memory")
15497+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15498+{
15499+ asm volatile(LOCK_PREFIX "andl %1,%0"
15500+ : "+m" (v->counter)
15501+ : "r" (~(mask))
15502+ : "memory");
15503+}
15504+
15505+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15506+{
15507+ asm volatile(LOCK_PREFIX "orl %1,%0"
15508+ : "+m" (v->counter)
15509+ : "r" (mask)
15510+ : "memory");
15511+}
15512+
15513+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15514+{
15515+ asm volatile(LOCK_PREFIX "orl %1,%0"
15516+ : "+m" (v->counter)
15517+ : "r" (mask)
15518+ : "memory");
15519+}
15520
15521 #ifdef CONFIG_X86_32
15522 # include <asm/atomic64_32.h>
15523diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15524index b154de7..bf18a5a 100644
15525--- a/arch/x86/include/asm/atomic64_32.h
15526+++ b/arch/x86/include/asm/atomic64_32.h
15527@@ -12,6 +12,14 @@ typedef struct {
15528 u64 __aligned(8) counter;
15529 } atomic64_t;
15530
15531+#ifdef CONFIG_PAX_REFCOUNT
15532+typedef struct {
15533+ u64 __aligned(8) counter;
15534+} atomic64_unchecked_t;
15535+#else
15536+typedef atomic64_t atomic64_unchecked_t;
15537+#endif
15538+
15539 #define ATOMIC64_INIT(val) { (val) }
15540
15541 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15542@@ -37,21 +45,31 @@ typedef struct {
15543 ATOMIC64_DECL_ONE(sym##_386)
15544
15545 ATOMIC64_DECL_ONE(add_386);
15546+ATOMIC64_DECL_ONE(add_unchecked_386);
15547 ATOMIC64_DECL_ONE(sub_386);
15548+ATOMIC64_DECL_ONE(sub_unchecked_386);
15549 ATOMIC64_DECL_ONE(inc_386);
15550+ATOMIC64_DECL_ONE(inc_unchecked_386);
15551 ATOMIC64_DECL_ONE(dec_386);
15552+ATOMIC64_DECL_ONE(dec_unchecked_386);
15553 #endif
15554
15555 #define alternative_atomic64(f, out, in...) \
15556 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15557
15558 ATOMIC64_DECL(read);
15559+ATOMIC64_DECL(read_unchecked);
15560 ATOMIC64_DECL(set);
15561+ATOMIC64_DECL(set_unchecked);
15562 ATOMIC64_DECL(xchg);
15563 ATOMIC64_DECL(add_return);
15564+ATOMIC64_DECL(add_return_unchecked);
15565 ATOMIC64_DECL(sub_return);
15566+ATOMIC64_DECL(sub_return_unchecked);
15567 ATOMIC64_DECL(inc_return);
15568+ATOMIC64_DECL(inc_return_unchecked);
15569 ATOMIC64_DECL(dec_return);
15570+ATOMIC64_DECL(dec_return_unchecked);
15571 ATOMIC64_DECL(dec_if_positive);
15572 ATOMIC64_DECL(inc_not_zero);
15573 ATOMIC64_DECL(add_unless);
15574@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15575 }
15576
15577 /**
15578+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15579+ * @p: pointer to type atomic64_unchecked_t
15580+ * @o: expected value
15581+ * @n: new value
15582+ *
15583+ * Atomically sets @v to @n if it was equal to @o and returns
15584+ * the old value.
15585+ */
15586+
15587+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15588+{
15589+ return cmpxchg64(&v->counter, o, n);
15590+}
15591+
15592+/**
15593 * atomic64_xchg - xchg atomic64 variable
15594 * @v: pointer to type atomic64_t
15595 * @n: value to assign
15596@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15597 }
15598
15599 /**
15600+ * atomic64_set_unchecked - set atomic64 variable
15601+ * @v: pointer to type atomic64_unchecked_t
15602+ * @n: value to assign
15603+ *
15604+ * Atomically sets the value of @v to @n.
15605+ */
15606+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15607+{
15608+ unsigned high = (unsigned)(i >> 32);
15609+ unsigned low = (unsigned)i;
15610+ alternative_atomic64(set, /* no output */,
15611+ "S" (v), "b" (low), "c" (high)
15612+ : "eax", "edx", "memory");
15613+}
15614+
15615+/**
15616 * atomic64_read - read atomic64 variable
15617 * @v: pointer to type atomic64_t
15618 *
15619@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15620 }
15621
15622 /**
15623+ * atomic64_read_unchecked - read atomic64 variable
15624+ * @v: pointer to type atomic64_unchecked_t
15625+ *
15626+ * Atomically reads the value of @v and returns it.
15627+ */
15628+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15629+{
15630+ long long r;
15631+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15632+ return r;
15633+ }
15634+
15635+/**
15636 * atomic64_add_return - add and return
15637 * @i: integer value to add
15638 * @v: pointer to type atomic64_t
15639@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15640 return i;
15641 }
15642
15643+/**
15644+ * atomic64_add_return_unchecked - add and return
15645+ * @i: integer value to add
15646+ * @v: pointer to type atomic64_unchecked_t
15647+ *
15648+ * Atomically adds @i to @v and returns @i + *@v
15649+ */
15650+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15651+{
15652+ alternative_atomic64(add_return_unchecked,
15653+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15654+ ASM_NO_INPUT_CLOBBER("memory"));
15655+ return i;
15656+}
15657+
15658 /*
15659 * Other variants with different arithmetic operators:
15660 */
15661@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15662 return a;
15663 }
15664
15665+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15666+{
15667+ long long a;
15668+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15669+ "S" (v) : "memory", "ecx");
15670+ return a;
15671+}
15672+
15673 static inline long long atomic64_dec_return(atomic64_t *v)
15674 {
15675 long long a;
15676@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15677 }
15678
15679 /**
15680+ * atomic64_add_unchecked - add integer to atomic64 variable
15681+ * @i: integer value to add
15682+ * @v: pointer to type atomic64_unchecked_t
15683+ *
15684+ * Atomically adds @i to @v.
15685+ */
15686+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15687+{
15688+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15689+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15690+ ASM_NO_INPUT_CLOBBER("memory"));
15691+ return i;
15692+}
15693+
15694+/**
15695 * atomic64_sub - subtract the atomic64 variable
15696 * @i: integer value to subtract
15697 * @v: pointer to type atomic64_t
15698diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15699index f8d273e..02f39f3 100644
15700--- a/arch/x86/include/asm/atomic64_64.h
15701+++ b/arch/x86/include/asm/atomic64_64.h
15702@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15703 }
15704
15705 /**
15706+ * atomic64_read_unchecked - read atomic64 variable
15707+ * @v: pointer of type atomic64_unchecked_t
15708+ *
15709+ * Atomically reads the value of @v.
15710+ * Doesn't imply a read memory barrier.
15711+ */
15712+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15713+{
15714+ return ACCESS_ONCE((v)->counter);
15715+}
15716+
15717+/**
15718 * atomic64_set - set atomic64 variable
15719 * @v: pointer to type atomic64_t
15720 * @i: required value
15721@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15722 }
15723
15724 /**
15725+ * atomic64_set_unchecked - set atomic64 variable
15726+ * @v: pointer to type atomic64_unchecked_t
15727+ * @i: required value
15728+ *
15729+ * Atomically sets the value of @v to @i.
15730+ */
15731+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15732+{
15733+ v->counter = i;
15734+}
15735+
15736+/**
15737 * atomic64_add - add integer to atomic64 variable
15738 * @i: integer value to add
15739 * @v: pointer to type atomic64_t
15740@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15741 */
15742 static inline void atomic64_add(long i, atomic64_t *v)
15743 {
15744+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15745+
15746+#ifdef CONFIG_PAX_REFCOUNT
15747+ "jno 0f\n"
15748+ LOCK_PREFIX "subq %1,%0\n"
15749+ "int $4\n0:\n"
15750+ _ASM_EXTABLE(0b, 0b)
15751+#endif
15752+
15753+ : "=m" (v->counter)
15754+ : "er" (i), "m" (v->counter));
15755+}
15756+
15757+/**
15758+ * atomic64_add_unchecked - add integer to atomic64 variable
15759+ * @i: integer value to add
15760+ * @v: pointer to type atomic64_unchecked_t
15761+ *
15762+ * Atomically adds @i to @v.
15763+ */
15764+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15765+{
15766 asm volatile(LOCK_PREFIX "addq %1,%0"
15767 : "=m" (v->counter)
15768 : "er" (i), "m" (v->counter));
15769@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15770 */
15771 static inline void atomic64_sub(long i, atomic64_t *v)
15772 {
15773- asm volatile(LOCK_PREFIX "subq %1,%0"
15774+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15775+
15776+#ifdef CONFIG_PAX_REFCOUNT
15777+ "jno 0f\n"
15778+ LOCK_PREFIX "addq %1,%0\n"
15779+ "int $4\n0:\n"
15780+ _ASM_EXTABLE(0b, 0b)
15781+#endif
15782+
15783+ : "=m" (v->counter)
15784+ : "er" (i), "m" (v->counter));
15785+}
15786+
15787+/**
15788+ * atomic64_sub_unchecked - subtract the atomic64 variable
15789+ * @i: integer value to subtract
15790+ * @v: pointer to type atomic64_unchecked_t
15791+ *
15792+ * Atomically subtracts @i from @v.
15793+ */
15794+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15795+{
15796+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15797 : "=m" (v->counter)
15798 : "er" (i), "m" (v->counter));
15799 }
15800@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15801 */
15802 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15803 {
15804- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15805+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15806 }
15807
15808 /**
15809@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15810 */
15811 static inline void atomic64_inc(atomic64_t *v)
15812 {
15813+ asm volatile(LOCK_PREFIX "incq %0\n"
15814+
15815+#ifdef CONFIG_PAX_REFCOUNT
15816+ "jno 0f\n"
15817+ LOCK_PREFIX "decq %0\n"
15818+ "int $4\n0:\n"
15819+ _ASM_EXTABLE(0b, 0b)
15820+#endif
15821+
15822+ : "=m" (v->counter)
15823+ : "m" (v->counter));
15824+}
15825+
15826+/**
15827+ * atomic64_inc_unchecked - increment atomic64 variable
15828+ * @v: pointer to type atomic64_unchecked_t
15829+ *
15830+ * Atomically increments @v by 1.
15831+ */
15832+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15833+{
15834 asm volatile(LOCK_PREFIX "incq %0"
15835 : "=m" (v->counter)
15836 : "m" (v->counter));
15837@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15838 */
15839 static inline void atomic64_dec(atomic64_t *v)
15840 {
15841- asm volatile(LOCK_PREFIX "decq %0"
15842+ asm volatile(LOCK_PREFIX "decq %0\n"
15843+
15844+#ifdef CONFIG_PAX_REFCOUNT
15845+ "jno 0f\n"
15846+ LOCK_PREFIX "incq %0\n"
15847+ "int $4\n0:\n"
15848+ _ASM_EXTABLE(0b, 0b)
15849+#endif
15850+
15851+ : "=m" (v->counter)
15852+ : "m" (v->counter));
15853+}
15854+
15855+/**
15856+ * atomic64_dec_unchecked - decrement atomic64 variable
15857+ * @v: pointer to type atomic64_t
15858+ *
15859+ * Atomically decrements @v by 1.
15860+ */
15861+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15862+{
15863+ asm volatile(LOCK_PREFIX "decq %0\n"
15864 : "=m" (v->counter)
15865 : "m" (v->counter));
15866 }
15867@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15868 */
15869 static inline int atomic64_dec_and_test(atomic64_t *v)
15870 {
15871- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15872+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15873 }
15874
15875 /**
15876@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15877 */
15878 static inline int atomic64_inc_and_test(atomic64_t *v)
15879 {
15880- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15881+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15882 }
15883
15884 /**
15885@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15886 */
15887 static inline int atomic64_add_negative(long i, atomic64_t *v)
15888 {
15889- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15890+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15891 }
15892
15893 /**
15894@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15895 */
15896 static inline long atomic64_add_return(long i, atomic64_t *v)
15897 {
15898+ return i + xadd_check_overflow(&v->counter, i);
15899+}
15900+
15901+/**
15902+ * atomic64_add_return_unchecked - add and return
15903+ * @i: integer value to add
15904+ * @v: pointer to type atomic64_unchecked_t
15905+ *
15906+ * Atomically adds @i to @v and returns @i + @v
15907+ */
15908+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15909+{
15910 return i + xadd(&v->counter, i);
15911 }
15912
15913@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15914 }
15915
15916 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15917+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15918+{
15919+ return atomic64_add_return_unchecked(1, v);
15920+}
15921 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15922
15923 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15924@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15925 return cmpxchg(&v->counter, old, new);
15926 }
15927
15928+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15929+{
15930+ return cmpxchg(&v->counter, old, new);
15931+}
15932+
15933 static inline long atomic64_xchg(atomic64_t *v, long new)
15934 {
15935 return xchg(&v->counter, new);
15936@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15937 */
15938 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15939 {
15940- long c, old;
15941+ long c, old, new;
15942 c = atomic64_read(v);
15943 for (;;) {
15944- if (unlikely(c == (u)))
15945+ if (unlikely(c == u))
15946 break;
15947- old = atomic64_cmpxchg((v), c, c + (a));
15948+
15949+ asm volatile("add %2,%0\n"
15950+
15951+#ifdef CONFIG_PAX_REFCOUNT
15952+ "jno 0f\n"
15953+ "sub %2,%0\n"
15954+ "int $4\n0:\n"
15955+ _ASM_EXTABLE(0b, 0b)
15956+#endif
15957+
15958+ : "=r" (new)
15959+ : "0" (c), "ir" (a));
15960+
15961+ old = atomic64_cmpxchg(v, c, new);
15962 if (likely(old == c))
15963 break;
15964 c = old;
15965 }
15966- return c != (u);
15967+ return c != u;
15968 }
15969
15970 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
15971diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
15972index 0f4460b..fa1ee19 100644
15973--- a/arch/x86/include/asm/barrier.h
15974+++ b/arch/x86/include/asm/barrier.h
15975@@ -107,7 +107,7 @@
15976 do { \
15977 compiletime_assert_atomic_type(*p); \
15978 smp_mb(); \
15979- ACCESS_ONCE(*p) = (v); \
15980+ ACCESS_ONCE_RW(*p) = (v); \
15981 } while (0)
15982
15983 #define smp_load_acquire(p) \
15984@@ -124,7 +124,7 @@ do { \
15985 do { \
15986 compiletime_assert_atomic_type(*p); \
15987 barrier(); \
15988- ACCESS_ONCE(*p) = (v); \
15989+ ACCESS_ONCE_RW(*p) = (v); \
15990 } while (0)
15991
15992 #define smp_load_acquire(p) \
15993diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
15994index cfe3b95..d01b118 100644
15995--- a/arch/x86/include/asm/bitops.h
15996+++ b/arch/x86/include/asm/bitops.h
15997@@ -50,7 +50,7 @@
15998 * a mask operation on a byte.
15999 */
16000 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16001-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16002+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16003 #define CONST_MASK(nr) (1 << ((nr) & 7))
16004
16005 /**
16006@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16007 */
16008 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16009 {
16010- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16011+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16012 }
16013
16014 /**
16015@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16016 */
16017 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16018 {
16019- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16020+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16021 }
16022
16023 /**
16024@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16025 */
16026 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16027 {
16028- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16029+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16030 }
16031
16032 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16033@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16034 *
16035 * Undefined if no bit exists, so code should check against 0 first.
16036 */
16037-static inline unsigned long __ffs(unsigned long word)
16038+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16039 {
16040 asm("rep; bsf %1,%0"
16041 : "=r" (word)
16042@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16043 *
16044 * Undefined if no zero exists, so code should check against ~0UL first.
16045 */
16046-static inline unsigned long ffz(unsigned long word)
16047+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16048 {
16049 asm("rep; bsf %1,%0"
16050 : "=r" (word)
16051@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16052 *
16053 * Undefined if no set bit exists, so code should check against 0 first.
16054 */
16055-static inline unsigned long __fls(unsigned long word)
16056+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16057 {
16058 asm("bsr %1,%0"
16059 : "=r" (word)
16060@@ -434,7 +434,7 @@ static inline int ffs(int x)
16061 * set bit if value is nonzero. The last (most significant) bit is
16062 * at position 32.
16063 */
16064-static inline int fls(int x)
16065+static inline int __intentional_overflow(-1) fls(int x)
16066 {
16067 int r;
16068
16069@@ -476,7 +476,7 @@ static inline int fls(int x)
16070 * at position 64.
16071 */
16072 #ifdef CONFIG_X86_64
16073-static __always_inline int fls64(__u64 x)
16074+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16075 {
16076 int bitpos = -1;
16077 /*
16078diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16079index 4fa687a..60f2d39 100644
16080--- a/arch/x86/include/asm/boot.h
16081+++ b/arch/x86/include/asm/boot.h
16082@@ -6,10 +6,15 @@
16083 #include <uapi/asm/boot.h>
16084
16085 /* Physical address where kernel should be loaded. */
16086-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16087+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16088 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16089 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16090
16091+#ifndef __ASSEMBLY__
16092+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16093+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16094+#endif
16095+
16096 /* Minimum kernel alignment, as a power of two */
16097 #ifdef CONFIG_X86_64
16098 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16099diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16100index 48f99f1..d78ebf9 100644
16101--- a/arch/x86/include/asm/cache.h
16102+++ b/arch/x86/include/asm/cache.h
16103@@ -5,12 +5,13 @@
16104
16105 /* L1 cache line size */
16106 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16107-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16108+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16109
16110 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16111+#define __read_only __attribute__((__section__(".data..read_only")))
16112
16113 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16114-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16115+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16116
16117 #ifdef CONFIG_X86_VSMP
16118 #ifdef CONFIG_SMP
16119diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
16120index 9863ee3..4a1f8e1 100644
16121--- a/arch/x86/include/asm/cacheflush.h
16122+++ b/arch/x86/include/asm/cacheflush.h
16123@@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
16124 unsigned long pg_flags = pg->flags & _PGMT_MASK;
16125
16126 if (pg_flags == _PGMT_DEFAULT)
16127- return -1;
16128+ return ~0UL;
16129 else if (pg_flags == _PGMT_WC)
16130 return _PAGE_CACHE_WC;
16131 else if (pg_flags == _PGMT_UC_MINUS)
16132diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16133index 76659b6..6e0b30a 100644
16134--- a/arch/x86/include/asm/calling.h
16135+++ b/arch/x86/include/asm/calling.h
16136@@ -82,107 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
16137 #define RSP 152
16138 #define SS 160
16139
16140-#define ARGOFFSET R11
16141-#define SWFRAME ORIG_RAX
16142+#define ARGOFFSET R15
16143
16144 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
16145- subq $9*8+\addskip, %rsp
16146- CFI_ADJUST_CFA_OFFSET 9*8+\addskip
16147- movq_cfi rdi, 8*8
16148- movq_cfi rsi, 7*8
16149- movq_cfi rdx, 6*8
16150+ subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
16151+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
16152+ movq_cfi rdi, RDI
16153+ movq_cfi rsi, RSI
16154+ movq_cfi rdx, RDX
16155
16156 .if \save_rcx
16157- movq_cfi rcx, 5*8
16158+ movq_cfi rcx, RCX
16159 .endif
16160
16161 .if \rax_enosys
16162- movq $-ENOSYS, 4*8(%rsp)
16163+ movq $-ENOSYS, RAX(%rsp)
16164 .else
16165- movq_cfi rax, 4*8
16166+ movq_cfi rax, RAX
16167 .endif
16168
16169 .if \save_r891011
16170- movq_cfi r8, 3*8
16171- movq_cfi r9, 2*8
16172- movq_cfi r10, 1*8
16173- movq_cfi r11, 0*8
16174+ movq_cfi r8, R8
16175+ movq_cfi r9, R9
16176+ movq_cfi r10, R10
16177+ movq_cfi r11, R11
16178 .endif
16179
16180+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16181+ movq_cfi r12, R12
16182+#endif
16183+
16184 .endm
16185
16186-#define ARG_SKIP (9*8)
16187+#define ARG_SKIP ORIG_RAX
16188
16189 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
16190 rstor_r8910=1, rstor_rdx=1
16191+
16192+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16193+ movq_cfi_restore R12, r12
16194+#endif
16195+
16196 .if \rstor_r11
16197- movq_cfi_restore 0*8, r11
16198+ movq_cfi_restore R11, r11
16199 .endif
16200
16201 .if \rstor_r8910
16202- movq_cfi_restore 1*8, r10
16203- movq_cfi_restore 2*8, r9
16204- movq_cfi_restore 3*8, r8
16205+ movq_cfi_restore R10, r10
16206+ movq_cfi_restore R9, r9
16207+ movq_cfi_restore R8, r8
16208 .endif
16209
16210 .if \rstor_rax
16211- movq_cfi_restore 4*8, rax
16212+ movq_cfi_restore RAX, rax
16213 .endif
16214
16215 .if \rstor_rcx
16216- movq_cfi_restore 5*8, rcx
16217+ movq_cfi_restore RCX, rcx
16218 .endif
16219
16220 .if \rstor_rdx
16221- movq_cfi_restore 6*8, rdx
16222+ movq_cfi_restore RDX, rdx
16223 .endif
16224
16225- movq_cfi_restore 7*8, rsi
16226- movq_cfi_restore 8*8, rdi
16227+ movq_cfi_restore RSI, rsi
16228+ movq_cfi_restore RDI, rdi
16229
16230- .if ARG_SKIP+\addskip > 0
16231- addq $ARG_SKIP+\addskip, %rsp
16232- CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
16233+ .if ORIG_RAX+\addskip > 0
16234+ addq $ORIG_RAX+\addskip, %rsp
16235+ CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
16236 .endif
16237 .endm
16238
16239- .macro LOAD_ARGS offset, skiprax=0
16240- movq \offset(%rsp), %r11
16241- movq \offset+8(%rsp), %r10
16242- movq \offset+16(%rsp), %r9
16243- movq \offset+24(%rsp), %r8
16244- movq \offset+40(%rsp), %rcx
16245- movq \offset+48(%rsp), %rdx
16246- movq \offset+56(%rsp), %rsi
16247- movq \offset+64(%rsp), %rdi
16248+ .macro LOAD_ARGS skiprax=0
16249+ movq R11(%rsp), %r11
16250+ movq R10(%rsp), %r10
16251+ movq R9(%rsp), %r9
16252+ movq R8(%rsp), %r8
16253+ movq RCX(%rsp), %rcx
16254+ movq RDX(%rsp), %rdx
16255+ movq RSI(%rsp), %rsi
16256+ movq RDI(%rsp), %rdi
16257 .if \skiprax
16258 .else
16259- movq \offset+72(%rsp), %rax
16260+ movq RAX(%rsp), %rax
16261 .endif
16262 .endm
16263
16264-#define REST_SKIP (6*8)
16265-
16266 .macro SAVE_REST
16267- subq $REST_SKIP, %rsp
16268- CFI_ADJUST_CFA_OFFSET REST_SKIP
16269- movq_cfi rbx, 5*8
16270- movq_cfi rbp, 4*8
16271- movq_cfi r12, 3*8
16272- movq_cfi r13, 2*8
16273- movq_cfi r14, 1*8
16274- movq_cfi r15, 0*8
16275+ movq_cfi rbx, RBX
16276+ movq_cfi rbp, RBP
16277+
16278+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16279+ movq_cfi r12, R12
16280+#endif
16281+
16282+ movq_cfi r13, R13
16283+ movq_cfi r14, R14
16284+ movq_cfi r15, R15
16285 .endm
16286
16287 .macro RESTORE_REST
16288- movq_cfi_restore 0*8, r15
16289- movq_cfi_restore 1*8, r14
16290- movq_cfi_restore 2*8, r13
16291- movq_cfi_restore 3*8, r12
16292- movq_cfi_restore 4*8, rbp
16293- movq_cfi_restore 5*8, rbx
16294- addq $REST_SKIP, %rsp
16295- CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16296+ movq_cfi_restore R15, r15
16297+ movq_cfi_restore R14, r14
16298+ movq_cfi_restore R13, r13
16299+
16300+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16301+ movq_cfi_restore R12, r12
16302+#endif
16303+
16304+ movq_cfi_restore RBP, rbp
16305+ movq_cfi_restore RBX, rbx
16306 .endm
16307
16308 .macro SAVE_ALL
16309diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16310index f50de69..2b0a458 100644
16311--- a/arch/x86/include/asm/checksum_32.h
16312+++ b/arch/x86/include/asm/checksum_32.h
16313@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16314 int len, __wsum sum,
16315 int *src_err_ptr, int *dst_err_ptr);
16316
16317+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16318+ int len, __wsum sum,
16319+ int *src_err_ptr, int *dst_err_ptr);
16320+
16321+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16322+ int len, __wsum sum,
16323+ int *src_err_ptr, int *dst_err_ptr);
16324+
16325 /*
16326 * Note: when you get a NULL pointer exception here this means someone
16327 * passed in an incorrect kernel address to one of these functions.
16328@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16329
16330 might_sleep();
16331 stac();
16332- ret = csum_partial_copy_generic((__force void *)src, dst,
16333+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16334 len, sum, err_ptr, NULL);
16335 clac();
16336
16337@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16338 might_sleep();
16339 if (access_ok(VERIFY_WRITE, dst, len)) {
16340 stac();
16341- ret = csum_partial_copy_generic(src, (__force void *)dst,
16342+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16343 len, sum, NULL, err_ptr);
16344 clac();
16345 return ret;
16346diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16347index 99c105d7..2f667ac 100644
16348--- a/arch/x86/include/asm/cmpxchg.h
16349+++ b/arch/x86/include/asm/cmpxchg.h
16350@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16351 __compiletime_error("Bad argument size for cmpxchg");
16352 extern void __xadd_wrong_size(void)
16353 __compiletime_error("Bad argument size for xadd");
16354+extern void __xadd_check_overflow_wrong_size(void)
16355+ __compiletime_error("Bad argument size for xadd_check_overflow");
16356 extern void __add_wrong_size(void)
16357 __compiletime_error("Bad argument size for add");
16358+extern void __add_check_overflow_wrong_size(void)
16359+ __compiletime_error("Bad argument size for add_check_overflow");
16360
16361 /*
16362 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16363@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16364 __ret; \
16365 })
16366
16367+#ifdef CONFIG_PAX_REFCOUNT
16368+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16369+ ({ \
16370+ __typeof__ (*(ptr)) __ret = (arg); \
16371+ switch (sizeof(*(ptr))) { \
16372+ case __X86_CASE_L: \
16373+ asm volatile (lock #op "l %0, %1\n" \
16374+ "jno 0f\n" \
16375+ "mov %0,%1\n" \
16376+ "int $4\n0:\n" \
16377+ _ASM_EXTABLE(0b, 0b) \
16378+ : "+r" (__ret), "+m" (*(ptr)) \
16379+ : : "memory", "cc"); \
16380+ break; \
16381+ case __X86_CASE_Q: \
16382+ asm volatile (lock #op "q %q0, %1\n" \
16383+ "jno 0f\n" \
16384+ "mov %0,%1\n" \
16385+ "int $4\n0:\n" \
16386+ _ASM_EXTABLE(0b, 0b) \
16387+ : "+r" (__ret), "+m" (*(ptr)) \
16388+ : : "memory", "cc"); \
16389+ break; \
16390+ default: \
16391+ __ ## op ## _check_overflow_wrong_size(); \
16392+ } \
16393+ __ret; \
16394+ })
16395+#else
16396+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16397+#endif
16398+
16399 /*
16400 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16401 * Since this is generally used to protect other memory information, we
16402@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16403 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16404 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16405
16406+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16407+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16408+
16409 #define __add(ptr, inc, lock) \
16410 ({ \
16411 __typeof__ (*(ptr)) __ret = (inc); \
16412diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16413index 59c6c40..5e0b22c 100644
16414--- a/arch/x86/include/asm/compat.h
16415+++ b/arch/x86/include/asm/compat.h
16416@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16417 typedef u32 compat_uint_t;
16418 typedef u32 compat_ulong_t;
16419 typedef u64 __attribute__((aligned(4))) compat_u64;
16420-typedef u32 compat_uptr_t;
16421+typedef u32 __user compat_uptr_t;
16422
16423 struct compat_timespec {
16424 compat_time_t tv_sec;
16425diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16426index 0bb1335..8f1aec7 100644
16427--- a/arch/x86/include/asm/cpufeature.h
16428+++ b/arch/x86/include/asm/cpufeature.h
16429@@ -207,7 +207,7 @@
16430 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16431 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16432 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16433-
16434+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16435
16436 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16437 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16438@@ -215,7 +215,7 @@
16439 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16440 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16441 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16442-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16443+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16444 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16445 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16446 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16447@@ -383,6 +383,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16448 #define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16)
16449 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16450 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16451+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16452
16453 #if __GNUC__ >= 4
16454 extern void warn_pre_alternatives(void);
16455@@ -434,7 +435,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16456
16457 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16458 t_warn:
16459- warn_pre_alternatives();
16460+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16461+ warn_pre_alternatives();
16462 return false;
16463 #endif
16464
16465@@ -454,7 +456,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16466 ".section .discard,\"aw\",@progbits\n"
16467 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16468 ".previous\n"
16469- ".section .altinstr_replacement,\"ax\"\n"
16470+ ".section .altinstr_replacement,\"a\"\n"
16471 "3: movb $1,%0\n"
16472 "4:\n"
16473 ".previous\n"
16474@@ -491,7 +493,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16475 " .byte 2b - 1b\n" /* src len */
16476 " .byte 4f - 3f\n" /* repl len */
16477 ".previous\n"
16478- ".section .altinstr_replacement,\"ax\"\n"
16479+ ".section .altinstr_replacement,\"a\"\n"
16480 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16481 "4:\n"
16482 ".previous\n"
16483@@ -524,7 +526,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16484 ".section .discard,\"aw\",@progbits\n"
16485 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16486 ".previous\n"
16487- ".section .altinstr_replacement,\"ax\"\n"
16488+ ".section .altinstr_replacement,\"a\"\n"
16489 "3: movb $0,%0\n"
16490 "4:\n"
16491 ".previous\n"
16492@@ -538,7 +540,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16493 ".section .discard,\"aw\",@progbits\n"
16494 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16495 ".previous\n"
16496- ".section .altinstr_replacement,\"ax\"\n"
16497+ ".section .altinstr_replacement,\"a\"\n"
16498 "5: movb $1,%0\n"
16499 "6:\n"
16500 ".previous\n"
16501diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16502index 50d033a..37deb26 100644
16503--- a/arch/x86/include/asm/desc.h
16504+++ b/arch/x86/include/asm/desc.h
16505@@ -4,6 +4,7 @@
16506 #include <asm/desc_defs.h>
16507 #include <asm/ldt.h>
16508 #include <asm/mmu.h>
16509+#include <asm/pgtable.h>
16510
16511 #include <linux/smp.h>
16512 #include <linux/percpu.h>
16513@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16514
16515 desc->type = (info->read_exec_only ^ 1) << 1;
16516 desc->type |= info->contents << 2;
16517+ desc->type |= info->seg_not_present ^ 1;
16518
16519 desc->s = 1;
16520 desc->dpl = 0x3;
16521@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16522 }
16523
16524 extern struct desc_ptr idt_descr;
16525-extern gate_desc idt_table[];
16526-extern struct desc_ptr debug_idt_descr;
16527-extern gate_desc debug_idt_table[];
16528-
16529-struct gdt_page {
16530- struct desc_struct gdt[GDT_ENTRIES];
16531-} __attribute__((aligned(PAGE_SIZE)));
16532-
16533-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16534+extern gate_desc idt_table[IDT_ENTRIES];
16535+extern const struct desc_ptr debug_idt_descr;
16536+extern gate_desc debug_idt_table[IDT_ENTRIES];
16537
16538+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16539 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16540 {
16541- return per_cpu(gdt_page, cpu).gdt;
16542+ return cpu_gdt_table[cpu];
16543 }
16544
16545 #ifdef CONFIG_X86_64
16546@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16547 unsigned long base, unsigned dpl, unsigned flags,
16548 unsigned short seg)
16549 {
16550- gate->a = (seg << 16) | (base & 0xffff);
16551- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16552+ gate->gate.offset_low = base;
16553+ gate->gate.seg = seg;
16554+ gate->gate.reserved = 0;
16555+ gate->gate.type = type;
16556+ gate->gate.s = 0;
16557+ gate->gate.dpl = dpl;
16558+ gate->gate.p = 1;
16559+ gate->gate.offset_high = base >> 16;
16560 }
16561
16562 #endif
16563@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16564
16565 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16566 {
16567+ pax_open_kernel();
16568 memcpy(&idt[entry], gate, sizeof(*gate));
16569+ pax_close_kernel();
16570 }
16571
16572 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16573 {
16574+ pax_open_kernel();
16575 memcpy(&ldt[entry], desc, 8);
16576+ pax_close_kernel();
16577 }
16578
16579 static inline void
16580@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16581 default: size = sizeof(*gdt); break;
16582 }
16583
16584+ pax_open_kernel();
16585 memcpy(&gdt[entry], desc, size);
16586+ pax_close_kernel();
16587 }
16588
16589 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16590@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16591
16592 static inline void native_load_tr_desc(void)
16593 {
16594+ pax_open_kernel();
16595 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16596+ pax_close_kernel();
16597 }
16598
16599 static inline void native_load_gdt(const struct desc_ptr *dtr)
16600@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16601 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16602 unsigned int i;
16603
16604+ pax_open_kernel();
16605 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16606 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16607+ pax_close_kernel();
16608 }
16609
16610 #define _LDT_empty(info) \
16611@@ -287,7 +300,7 @@ static inline void load_LDT(mm_context_t *pc)
16612 preempt_enable();
16613 }
16614
16615-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16616+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16617 {
16618 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16619 }
16620@@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16621 }
16622
16623 #ifdef CONFIG_X86_64
16624-static inline void set_nmi_gate(int gate, void *addr)
16625+static inline void set_nmi_gate(int gate, const void *addr)
16626 {
16627 gate_desc s;
16628
16629@@ -321,14 +334,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16630 #endif
16631
16632 #ifdef CONFIG_TRACING
16633-extern struct desc_ptr trace_idt_descr;
16634-extern gate_desc trace_idt_table[];
16635+extern const struct desc_ptr trace_idt_descr;
16636+extern gate_desc trace_idt_table[IDT_ENTRIES];
16637 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16638 {
16639 write_idt_entry(trace_idt_table, entry, gate);
16640 }
16641
16642-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16643+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16644 unsigned dpl, unsigned ist, unsigned seg)
16645 {
16646 gate_desc s;
16647@@ -348,7 +361,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16648 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16649 #endif
16650
16651-static inline void _set_gate(int gate, unsigned type, void *addr,
16652+static inline void _set_gate(int gate, unsigned type, const void *addr,
16653 unsigned dpl, unsigned ist, unsigned seg)
16654 {
16655 gate_desc s;
16656@@ -371,9 +384,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16657 #define set_intr_gate(n, addr) \
16658 do { \
16659 BUG_ON((unsigned)n > 0xFF); \
16660- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16661+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16662 __KERNEL_CS); \
16663- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16664+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16665 0, 0, __KERNEL_CS); \
16666 } while (0)
16667
16668@@ -401,19 +414,19 @@ static inline void alloc_system_vector(int vector)
16669 /*
16670 * This routine sets up an interrupt gate at directory privilege level 3.
16671 */
16672-static inline void set_system_intr_gate(unsigned int n, void *addr)
16673+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16674 {
16675 BUG_ON((unsigned)n > 0xFF);
16676 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16677 }
16678
16679-static inline void set_system_trap_gate(unsigned int n, void *addr)
16680+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16681 {
16682 BUG_ON((unsigned)n > 0xFF);
16683 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16684 }
16685
16686-static inline void set_trap_gate(unsigned int n, void *addr)
16687+static inline void set_trap_gate(unsigned int n, const void *addr)
16688 {
16689 BUG_ON((unsigned)n > 0xFF);
16690 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16691@@ -422,16 +435,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16692 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16693 {
16694 BUG_ON((unsigned)n > 0xFF);
16695- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16696+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16697 }
16698
16699-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16700+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16701 {
16702 BUG_ON((unsigned)n > 0xFF);
16703 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16704 }
16705
16706-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16707+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16708 {
16709 BUG_ON((unsigned)n > 0xFF);
16710 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16711@@ -503,4 +516,17 @@ static inline void load_current_idt(void)
16712 else
16713 load_idt((const struct desc_ptr *)&idt_descr);
16714 }
16715+
16716+#ifdef CONFIG_X86_32
16717+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16718+{
16719+ struct desc_struct d;
16720+
16721+ if (likely(limit))
16722+ limit = (limit - 1UL) >> PAGE_SHIFT;
16723+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16724+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16725+}
16726+#endif
16727+
16728 #endif /* _ASM_X86_DESC_H */
16729diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16730index 278441f..b95a174 100644
16731--- a/arch/x86/include/asm/desc_defs.h
16732+++ b/arch/x86/include/asm/desc_defs.h
16733@@ -31,6 +31,12 @@ struct desc_struct {
16734 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16735 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16736 };
16737+ struct {
16738+ u16 offset_low;
16739+ u16 seg;
16740+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16741+ unsigned offset_high: 16;
16742+ } gate;
16743 };
16744 } __attribute__((packed));
16745
16746diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16747index ced283a..ffe04cc 100644
16748--- a/arch/x86/include/asm/div64.h
16749+++ b/arch/x86/include/asm/div64.h
16750@@ -39,7 +39,7 @@
16751 __mod; \
16752 })
16753
16754-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16755+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16756 {
16757 union {
16758 u64 v64;
16759diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16760index ca3347a..1a5082a 100644
16761--- a/arch/x86/include/asm/elf.h
16762+++ b/arch/x86/include/asm/elf.h
16763@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16764
16765 #include <asm/vdso.h>
16766
16767-#ifdef CONFIG_X86_64
16768-extern unsigned int vdso64_enabled;
16769-#endif
16770 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16771 extern unsigned int vdso32_enabled;
16772 #endif
16773@@ -249,7 +246,25 @@ extern int force_personality32;
16774 the loader. We need to make sure that it is out of the way of the program
16775 that it will "exec", and that there is sufficient room for the brk. */
16776
16777+#ifdef CONFIG_PAX_SEGMEXEC
16778+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16779+#else
16780 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16781+#endif
16782+
16783+#ifdef CONFIG_PAX_ASLR
16784+#ifdef CONFIG_X86_32
16785+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16786+
16787+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16788+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16789+#else
16790+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16791+
16792+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16793+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16794+#endif
16795+#endif
16796
16797 /* This yields a mask that user programs can use to figure out what
16798 instruction set this CPU supports. This could be done in user space,
16799@@ -298,17 +313,13 @@ do { \
16800
16801 #define ARCH_DLINFO \
16802 do { \
16803- if (vdso64_enabled) \
16804- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16805- (unsigned long __force)current->mm->context.vdso); \
16806+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16807 } while (0)
16808
16809 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16810 #define ARCH_DLINFO_X32 \
16811 do { \
16812- if (vdso64_enabled) \
16813- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16814- (unsigned long __force)current->mm->context.vdso); \
16815+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16816 } while (0)
16817
16818 #define AT_SYSINFO 32
16819@@ -323,10 +334,10 @@ else \
16820
16821 #endif /* !CONFIG_X86_32 */
16822
16823-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16824+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16825
16826 #define VDSO_ENTRY \
16827- ((unsigned long)current->mm->context.vdso + \
16828+ (current->mm->context.vdso + \
16829 selected_vdso32->sym___kernel_vsyscall)
16830
16831 struct linux_binprm;
16832@@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
16833 int uses_interp);
16834 #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
16835
16836-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16837-#define arch_randomize_brk arch_randomize_brk
16838-
16839 /*
16840 * True on X86_32 or when emulating IA32 on X86_64
16841 */
16842diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16843index 77a99ac..39ff7f5 100644
16844--- a/arch/x86/include/asm/emergency-restart.h
16845+++ b/arch/x86/include/asm/emergency-restart.h
16846@@ -1,6 +1,6 @@
16847 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16848 #define _ASM_X86_EMERGENCY_RESTART_H
16849
16850-extern void machine_emergency_restart(void);
16851+extern void machine_emergency_restart(void) __noreturn;
16852
16853 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16854diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16855index 1c7eefe..d0e4702 100644
16856--- a/arch/x86/include/asm/floppy.h
16857+++ b/arch/x86/include/asm/floppy.h
16858@@ -229,18 +229,18 @@ static struct fd_routine_l {
16859 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16860 } fd_routine[] = {
16861 {
16862- request_dma,
16863- free_dma,
16864- get_dma_residue,
16865- dma_mem_alloc,
16866- hard_dma_setup
16867+ ._request_dma = request_dma,
16868+ ._free_dma = free_dma,
16869+ ._get_dma_residue = get_dma_residue,
16870+ ._dma_mem_alloc = dma_mem_alloc,
16871+ ._dma_setup = hard_dma_setup
16872 },
16873 {
16874- vdma_request_dma,
16875- vdma_nop,
16876- vdma_get_dma_residue,
16877- vdma_mem_alloc,
16878- vdma_dma_setup
16879+ ._request_dma = vdma_request_dma,
16880+ ._free_dma = vdma_nop,
16881+ ._get_dma_residue = vdma_get_dma_residue,
16882+ ._dma_mem_alloc = vdma_mem_alloc,
16883+ ._dma_setup = vdma_dma_setup
16884 }
16885 };
16886
16887diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16888index e97622f..d0ba77a 100644
16889--- a/arch/x86/include/asm/fpu-internal.h
16890+++ b/arch/x86/include/asm/fpu-internal.h
16891@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16892 #define user_insn(insn, output, input...) \
16893 ({ \
16894 int err; \
16895+ pax_open_userland(); \
16896 asm volatile(ASM_STAC "\n" \
16897- "1:" #insn "\n\t" \
16898+ "1:" \
16899+ __copyuser_seg \
16900+ #insn "\n\t" \
16901 "2: " ASM_CLAC "\n" \
16902 ".section .fixup,\"ax\"\n" \
16903 "3: movl $-1,%[err]\n" \
16904@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16905 _ASM_EXTABLE(1b, 3b) \
16906 : [err] "=r" (err), output \
16907 : "0"(0), input); \
16908+ pax_close_userland(); \
16909 err; \
16910 })
16911
16912@@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16913 "fnclex\n\t"
16914 "emms\n\t"
16915 "fildl %P[addr]" /* set F?P to defined value */
16916- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16917+ : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16918 }
16919
16920 return fpu_restore_checking(&tsk->thread.fpu);
16921diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16922index b4c1f54..e290c08 100644
16923--- a/arch/x86/include/asm/futex.h
16924+++ b/arch/x86/include/asm/futex.h
16925@@ -12,6 +12,7 @@
16926 #include <asm/smap.h>
16927
16928 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16929+ typecheck(u32 __user *, uaddr); \
16930 asm volatile("\t" ASM_STAC "\n" \
16931 "1:\t" insn "\n" \
16932 "2:\t" ASM_CLAC "\n" \
16933@@ -20,15 +21,16 @@
16934 "\tjmp\t2b\n" \
16935 "\t.previous\n" \
16936 _ASM_EXTABLE(1b, 3b) \
16937- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16938+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16939 : "i" (-EFAULT), "0" (oparg), "1" (0))
16940
16941 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16942+ typecheck(u32 __user *, uaddr); \
16943 asm volatile("\t" ASM_STAC "\n" \
16944 "1:\tmovl %2, %0\n" \
16945 "\tmovl\t%0, %3\n" \
16946 "\t" insn "\n" \
16947- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16948+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16949 "\tjnz\t1b\n" \
16950 "3:\t" ASM_CLAC "\n" \
16951 "\t.section .fixup,\"ax\"\n" \
16952@@ -38,7 +40,7 @@
16953 _ASM_EXTABLE(1b, 4b) \
16954 _ASM_EXTABLE(2b, 4b) \
16955 : "=&a" (oldval), "=&r" (ret), \
16956- "+m" (*uaddr), "=&r" (tem) \
16957+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16958 : "r" (oparg), "i" (-EFAULT), "1" (0))
16959
16960 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16961@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16962
16963 pagefault_disable();
16964
16965+ pax_open_userland();
16966 switch (op) {
16967 case FUTEX_OP_SET:
16968- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16969+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16970 break;
16971 case FUTEX_OP_ADD:
16972- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
16973+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
16974 uaddr, oparg);
16975 break;
16976 case FUTEX_OP_OR:
16977@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16978 default:
16979 ret = -ENOSYS;
16980 }
16981+ pax_close_userland();
16982
16983 pagefault_enable();
16984
16985diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
16986index 4615906..788c817 100644
16987--- a/arch/x86/include/asm/hw_irq.h
16988+++ b/arch/x86/include/asm/hw_irq.h
16989@@ -164,8 +164,8 @@ extern void setup_ioapic_dest(void);
16990 extern void enable_IO_APIC(void);
16991
16992 /* Statistics */
16993-extern atomic_t irq_err_count;
16994-extern atomic_t irq_mis_count;
16995+extern atomic_unchecked_t irq_err_count;
16996+extern atomic_unchecked_t irq_mis_count;
16997
16998 /* EISA */
16999 extern void eisa_set_level_irq(unsigned int irq);
17000diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17001index ccffa53..3c90c87 100644
17002--- a/arch/x86/include/asm/i8259.h
17003+++ b/arch/x86/include/asm/i8259.h
17004@@ -62,7 +62,7 @@ struct legacy_pic {
17005 void (*init)(int auto_eoi);
17006 int (*irq_pending)(unsigned int irq);
17007 void (*make_irq)(unsigned int irq);
17008-};
17009+} __do_const;
17010
17011 extern struct legacy_pic *legacy_pic;
17012 extern struct legacy_pic null_legacy_pic;
17013diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17014index b8237d8..3e8864e 100644
17015--- a/arch/x86/include/asm/io.h
17016+++ b/arch/x86/include/asm/io.h
17017@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17018 "m" (*(volatile type __force *)addr) barrier); }
17019
17020 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17021-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17022-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17023+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17024+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17025
17026 build_mmio_read(__readb, "b", unsigned char, "=q", )
17027-build_mmio_read(__readw, "w", unsigned short, "=r", )
17028-build_mmio_read(__readl, "l", unsigned int, "=r", )
17029+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17030+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17031
17032 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17033 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17034@@ -109,7 +109,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17035 * this function
17036 */
17037
17038-static inline phys_addr_t virt_to_phys(volatile void *address)
17039+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17040 {
17041 return __pa(address);
17042 }
17043@@ -185,7 +185,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17044 return ioremap_nocache(offset, size);
17045 }
17046
17047-extern void iounmap(volatile void __iomem *addr);
17048+extern void iounmap(const volatile void __iomem *addr);
17049
17050 extern void set_iounmap_nonlazy(void);
17051
17052@@ -195,6 +195,17 @@ extern void set_iounmap_nonlazy(void);
17053
17054 #include <linux/vmalloc.h>
17055
17056+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17057+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17058+{
17059+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17060+}
17061+
17062+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17063+{
17064+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17065+}
17066+
17067 /*
17068 * Convert a virtual cached pointer to an uncached pointer
17069 */
17070diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17071index 0a8b519..80e7d5b 100644
17072--- a/arch/x86/include/asm/irqflags.h
17073+++ b/arch/x86/include/asm/irqflags.h
17074@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17075 sti; \
17076 sysexit
17077
17078+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17079+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17080+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17081+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17082+
17083 #else
17084 #define INTERRUPT_RETURN iret
17085 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17086diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17087index 4421b5d..8543006 100644
17088--- a/arch/x86/include/asm/kprobes.h
17089+++ b/arch/x86/include/asm/kprobes.h
17090@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17091 #define RELATIVEJUMP_SIZE 5
17092 #define RELATIVECALL_OPCODE 0xe8
17093 #define RELATIVE_ADDR_SIZE 4
17094-#define MAX_STACK_SIZE 64
17095-#define MIN_STACK_SIZE(ADDR) \
17096- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17097- THREAD_SIZE - (unsigned long)(ADDR))) \
17098- ? (MAX_STACK_SIZE) \
17099- : (((unsigned long)current_thread_info()) + \
17100- THREAD_SIZE - (unsigned long)(ADDR)))
17101+#define MAX_STACK_SIZE 64UL
17102+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17103
17104 #define flush_insn_slot(p) do { } while (0)
17105
17106diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
17107index 6ed0c30..74fb6c3 100644
17108--- a/arch/x86/include/asm/kvm_host.h
17109+++ b/arch/x86/include/asm/kvm_host.h
17110@@ -51,6 +51,7 @@
17111 | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG))
17112
17113 #define CR3_L_MODE_RESERVED_BITS 0xFFFFFF0000000000ULL
17114+#define CR3_PCID_INVD (1UL << 63)
17115 #define CR4_RESERVED_BITS \
17116 (~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\
17117 | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE \
17118diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17119index 4ad6560..75c7bdd 100644
17120--- a/arch/x86/include/asm/local.h
17121+++ b/arch/x86/include/asm/local.h
17122@@ -10,33 +10,97 @@ typedef struct {
17123 atomic_long_t a;
17124 } local_t;
17125
17126+typedef struct {
17127+ atomic_long_unchecked_t a;
17128+} local_unchecked_t;
17129+
17130 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17131
17132 #define local_read(l) atomic_long_read(&(l)->a)
17133+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17134 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17135+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17136
17137 static inline void local_inc(local_t *l)
17138 {
17139- asm volatile(_ASM_INC "%0"
17140+ asm volatile(_ASM_INC "%0\n"
17141+
17142+#ifdef CONFIG_PAX_REFCOUNT
17143+ "jno 0f\n"
17144+ _ASM_DEC "%0\n"
17145+ "int $4\n0:\n"
17146+ _ASM_EXTABLE(0b, 0b)
17147+#endif
17148+
17149+ : "+m" (l->a.counter));
17150+}
17151+
17152+static inline void local_inc_unchecked(local_unchecked_t *l)
17153+{
17154+ asm volatile(_ASM_INC "%0\n"
17155 : "+m" (l->a.counter));
17156 }
17157
17158 static inline void local_dec(local_t *l)
17159 {
17160- asm volatile(_ASM_DEC "%0"
17161+ asm volatile(_ASM_DEC "%0\n"
17162+
17163+#ifdef CONFIG_PAX_REFCOUNT
17164+ "jno 0f\n"
17165+ _ASM_INC "%0\n"
17166+ "int $4\n0:\n"
17167+ _ASM_EXTABLE(0b, 0b)
17168+#endif
17169+
17170+ : "+m" (l->a.counter));
17171+}
17172+
17173+static inline void local_dec_unchecked(local_unchecked_t *l)
17174+{
17175+ asm volatile(_ASM_DEC "%0\n"
17176 : "+m" (l->a.counter));
17177 }
17178
17179 static inline void local_add(long i, local_t *l)
17180 {
17181- asm volatile(_ASM_ADD "%1,%0"
17182+ asm volatile(_ASM_ADD "%1,%0\n"
17183+
17184+#ifdef CONFIG_PAX_REFCOUNT
17185+ "jno 0f\n"
17186+ _ASM_SUB "%1,%0\n"
17187+ "int $4\n0:\n"
17188+ _ASM_EXTABLE(0b, 0b)
17189+#endif
17190+
17191+ : "+m" (l->a.counter)
17192+ : "ir" (i));
17193+}
17194+
17195+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17196+{
17197+ asm volatile(_ASM_ADD "%1,%0\n"
17198 : "+m" (l->a.counter)
17199 : "ir" (i));
17200 }
17201
17202 static inline void local_sub(long i, local_t *l)
17203 {
17204- asm volatile(_ASM_SUB "%1,%0"
17205+ asm volatile(_ASM_SUB "%1,%0\n"
17206+
17207+#ifdef CONFIG_PAX_REFCOUNT
17208+ "jno 0f\n"
17209+ _ASM_ADD "%1,%0\n"
17210+ "int $4\n0:\n"
17211+ _ASM_EXTABLE(0b, 0b)
17212+#endif
17213+
17214+ : "+m" (l->a.counter)
17215+ : "ir" (i));
17216+}
17217+
17218+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17219+{
17220+ asm volatile(_ASM_SUB "%1,%0\n"
17221 : "+m" (l->a.counter)
17222 : "ir" (i));
17223 }
17224@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17225 */
17226 static inline int local_sub_and_test(long i, local_t *l)
17227 {
17228- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17229+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17230 }
17231
17232 /**
17233@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17234 */
17235 static inline int local_dec_and_test(local_t *l)
17236 {
17237- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17238+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17239 }
17240
17241 /**
17242@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17243 */
17244 static inline int local_inc_and_test(local_t *l)
17245 {
17246- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17247+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17248 }
17249
17250 /**
17251@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17252 */
17253 static inline int local_add_negative(long i, local_t *l)
17254 {
17255- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17256+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17257 }
17258
17259 /**
17260@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17261 static inline long local_add_return(long i, local_t *l)
17262 {
17263 long __i = i;
17264+ asm volatile(_ASM_XADD "%0, %1\n"
17265+
17266+#ifdef CONFIG_PAX_REFCOUNT
17267+ "jno 0f\n"
17268+ _ASM_MOV "%0,%1\n"
17269+ "int $4\n0:\n"
17270+ _ASM_EXTABLE(0b, 0b)
17271+#endif
17272+
17273+ : "+r" (i), "+m" (l->a.counter)
17274+ : : "memory");
17275+ return i + __i;
17276+}
17277+
17278+/**
17279+ * local_add_return_unchecked - add and return
17280+ * @i: integer value to add
17281+ * @l: pointer to type local_unchecked_t
17282+ *
17283+ * Atomically adds @i to @l and returns @i + @l
17284+ */
17285+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17286+{
17287+ long __i = i;
17288 asm volatile(_ASM_XADD "%0, %1;"
17289 : "+r" (i), "+m" (l->a.counter)
17290 : : "memory");
17291@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17292
17293 #define local_cmpxchg(l, o, n) \
17294 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17295+#define local_cmpxchg_unchecked(l, o, n) \
17296+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17297 /* Always has a lock prefix */
17298 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17299
17300diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17301new file mode 100644
17302index 0000000..2bfd3ba
17303--- /dev/null
17304+++ b/arch/x86/include/asm/mman.h
17305@@ -0,0 +1,15 @@
17306+#ifndef _X86_MMAN_H
17307+#define _X86_MMAN_H
17308+
17309+#include <uapi/asm/mman.h>
17310+
17311+#ifdef __KERNEL__
17312+#ifndef __ASSEMBLY__
17313+#ifdef CONFIG_X86_32
17314+#define arch_mmap_check i386_mmap_check
17315+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17316+#endif
17317+#endif
17318+#endif
17319+
17320+#endif /* X86_MMAN_H */
17321diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17322index 876e74e..e20bfb1 100644
17323--- a/arch/x86/include/asm/mmu.h
17324+++ b/arch/x86/include/asm/mmu.h
17325@@ -9,7 +9,7 @@
17326 * we put the segment information here.
17327 */
17328 typedef struct {
17329- void *ldt;
17330+ struct desc_struct *ldt;
17331 int size;
17332
17333 #ifdef CONFIG_X86_64
17334@@ -18,7 +18,19 @@ typedef struct {
17335 #endif
17336
17337 struct mutex lock;
17338- void __user *vdso;
17339+ unsigned long vdso;
17340+
17341+#ifdef CONFIG_X86_32
17342+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17343+ unsigned long user_cs_base;
17344+ unsigned long user_cs_limit;
17345+
17346+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17347+ cpumask_t cpu_user_cs_mask;
17348+#endif
17349+
17350+#endif
17351+#endif
17352 } mm_context_t;
17353
17354 #ifdef CONFIG_SMP
17355diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17356index 166af2a..648c200 100644
17357--- a/arch/x86/include/asm/mmu_context.h
17358+++ b/arch/x86/include/asm/mmu_context.h
17359@@ -28,6 +28,20 @@ void destroy_context(struct mm_struct *mm);
17360
17361 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17362 {
17363+
17364+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17365+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
17366+ unsigned int i;
17367+ pgd_t *pgd;
17368+
17369+ pax_open_kernel();
17370+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17371+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17372+ set_pgd_batched(pgd+i, native_make_pgd(0));
17373+ pax_close_kernel();
17374+ }
17375+#endif
17376+
17377 #ifdef CONFIG_SMP
17378 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17379 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17380@@ -38,16 +52,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17381 struct task_struct *tsk)
17382 {
17383 unsigned cpu = smp_processor_id();
17384+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17385+ int tlbstate = TLBSTATE_OK;
17386+#endif
17387
17388 if (likely(prev != next)) {
17389 #ifdef CONFIG_SMP
17390+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17391+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17392+#endif
17393 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17394 this_cpu_write(cpu_tlbstate.active_mm, next);
17395 #endif
17396 cpumask_set_cpu(cpu, mm_cpumask(next));
17397
17398 /* Re-load page tables */
17399+#ifdef CONFIG_PAX_PER_CPU_PGD
17400+ pax_open_kernel();
17401+
17402+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17403+ if (static_cpu_has(X86_FEATURE_PCID))
17404+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17405+ else
17406+#endif
17407+
17408+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17409+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17410+ pax_close_kernel();
17411+ 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));
17412+
17413+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17414+ if (static_cpu_has(X86_FEATURE_PCID)) {
17415+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17416+ u64 descriptor[2];
17417+ descriptor[0] = PCID_USER;
17418+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17419+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17420+ descriptor[0] = PCID_KERNEL;
17421+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17422+ }
17423+ } else {
17424+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17425+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17426+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17427+ else
17428+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17429+ }
17430+ } else
17431+#endif
17432+
17433+ load_cr3(get_cpu_pgd(cpu, kernel));
17434+#else
17435 load_cr3(next->pgd);
17436+#endif
17437 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17438
17439 /* Stop flush ipis for the previous mm */
17440@@ -56,9 +113,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17441 /* Load the LDT, if the LDT is different: */
17442 if (unlikely(prev->context.ldt != next->context.ldt))
17443 load_LDT_nolock(&next->context);
17444+
17445+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17446+ if (!(__supported_pte_mask & _PAGE_NX)) {
17447+ smp_mb__before_atomic();
17448+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17449+ smp_mb__after_atomic();
17450+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17451+ }
17452+#endif
17453+
17454+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17455+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17456+ prev->context.user_cs_limit != next->context.user_cs_limit))
17457+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17458+#ifdef CONFIG_SMP
17459+ else if (unlikely(tlbstate != TLBSTATE_OK))
17460+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17461+#endif
17462+#endif
17463+
17464 }
17465+ else {
17466+
17467+#ifdef CONFIG_PAX_PER_CPU_PGD
17468+ pax_open_kernel();
17469+
17470+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17471+ if (static_cpu_has(X86_FEATURE_PCID))
17472+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17473+ else
17474+#endif
17475+
17476+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17477+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17478+ pax_close_kernel();
17479+ 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));
17480+
17481+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17482+ if (static_cpu_has(X86_FEATURE_PCID)) {
17483+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17484+ u64 descriptor[2];
17485+ descriptor[0] = PCID_USER;
17486+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17487+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17488+ descriptor[0] = PCID_KERNEL;
17489+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17490+ }
17491+ } else {
17492+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17493+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17494+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17495+ else
17496+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17497+ }
17498+ } else
17499+#endif
17500+
17501+ load_cr3(get_cpu_pgd(cpu, kernel));
17502+#endif
17503+
17504 #ifdef CONFIG_SMP
17505- else {
17506 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17507 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17508
17509@@ -75,12 +190,29 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17510 * tlb flush IPI delivery. We must reload CR3
17511 * to make sure to use no freed page tables.
17512 */
17513+
17514+#ifndef CONFIG_PAX_PER_CPU_PGD
17515 load_cr3(next->pgd);
17516 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17517+#endif
17518+
17519 load_LDT_nolock(&next->context);
17520+
17521+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17522+ if (!(__supported_pte_mask & _PAGE_NX))
17523+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17524+#endif
17525+
17526+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17527+#ifdef CONFIG_PAX_PAGEEXEC
17528+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17529+#endif
17530+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17531+#endif
17532+
17533 }
17534+#endif
17535 }
17536-#endif
17537 }
17538
17539 #define activate_mm(prev, next) \
17540diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17541index e3b7819..b257c64 100644
17542--- a/arch/x86/include/asm/module.h
17543+++ b/arch/x86/include/asm/module.h
17544@@ -5,6 +5,7 @@
17545
17546 #ifdef CONFIG_X86_64
17547 /* X86_64 does not define MODULE_PROC_FAMILY */
17548+#define MODULE_PROC_FAMILY ""
17549 #elif defined CONFIG_M486
17550 #define MODULE_PROC_FAMILY "486 "
17551 #elif defined CONFIG_M586
17552@@ -57,8 +58,20 @@
17553 #error unknown processor family
17554 #endif
17555
17556-#ifdef CONFIG_X86_32
17557-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17558+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17559+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17560+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17561+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17562+#else
17563+#define MODULE_PAX_KERNEXEC ""
17564 #endif
17565
17566+#ifdef CONFIG_PAX_MEMORY_UDEREF
17567+#define MODULE_PAX_UDEREF "UDEREF "
17568+#else
17569+#define MODULE_PAX_UDEREF ""
17570+#endif
17571+
17572+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17573+
17574 #endif /* _ASM_X86_MODULE_H */
17575diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17576index 5f2fc44..106caa6 100644
17577--- a/arch/x86/include/asm/nmi.h
17578+++ b/arch/x86/include/asm/nmi.h
17579@@ -36,26 +36,35 @@ enum {
17580
17581 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17582
17583+struct nmiaction;
17584+
17585+struct nmiwork {
17586+ const struct nmiaction *action;
17587+ u64 max_duration;
17588+ struct irq_work irq_work;
17589+};
17590+
17591 struct nmiaction {
17592 struct list_head list;
17593 nmi_handler_t handler;
17594- u64 max_duration;
17595- struct irq_work irq_work;
17596 unsigned long flags;
17597 const char *name;
17598-};
17599+ struct nmiwork *work;
17600+} __do_const;
17601
17602 #define register_nmi_handler(t, fn, fg, n, init...) \
17603 ({ \
17604- static struct nmiaction init fn##_na = { \
17605+ static struct nmiwork fn##_nw; \
17606+ static const struct nmiaction init fn##_na = { \
17607 .handler = (fn), \
17608 .name = (n), \
17609 .flags = (fg), \
17610+ .work = &fn##_nw, \
17611 }; \
17612 __register_nmi_handler((t), &fn##_na); \
17613 })
17614
17615-int __register_nmi_handler(unsigned int, struct nmiaction *);
17616+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17617
17618 void unregister_nmi_handler(unsigned int, const char *);
17619
17620diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17621index 802dde3..9183e68 100644
17622--- a/arch/x86/include/asm/page.h
17623+++ b/arch/x86/include/asm/page.h
17624@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17625 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17626
17627 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17628+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17629
17630 #define __boot_va(x) __va(x)
17631 #define __boot_pa(x) __pa(x)
17632@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17633 * virt_to_page(kaddr) returns a valid pointer if and only if
17634 * virt_addr_valid(kaddr) returns true.
17635 */
17636-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17637 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17638 extern bool __virt_addr_valid(unsigned long kaddr);
17639 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17640
17641+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17642+#define virt_to_page(kaddr) \
17643+ ({ \
17644+ const void *__kaddr = (const void *)(kaddr); \
17645+ BUG_ON(!virt_addr_valid(__kaddr)); \
17646+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17647+ })
17648+#else
17649+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17650+#endif
17651+
17652 #endif /* __ASSEMBLY__ */
17653
17654 #include <asm-generic/memory_model.h>
17655diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17656index f408caf..4a0455e 100644
17657--- a/arch/x86/include/asm/page_64.h
17658+++ b/arch/x86/include/asm/page_64.h
17659@@ -7,9 +7,9 @@
17660
17661 /* duplicated to the one in bootmem.h */
17662 extern unsigned long max_pfn;
17663-extern unsigned long phys_base;
17664+extern const unsigned long phys_base;
17665
17666-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17667+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17668 {
17669 unsigned long y = x - __START_KERNEL_map;
17670
17671diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17672index cd6e1610..70f4418 100644
17673--- a/arch/x86/include/asm/paravirt.h
17674+++ b/arch/x86/include/asm/paravirt.h
17675@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17676 return (pmd_t) { ret };
17677 }
17678
17679-static inline pmdval_t pmd_val(pmd_t pmd)
17680+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17681 {
17682 pmdval_t ret;
17683
17684@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17685 val);
17686 }
17687
17688+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17689+{
17690+ pgdval_t val = native_pgd_val(pgd);
17691+
17692+ if (sizeof(pgdval_t) > sizeof(long))
17693+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17694+ val, (u64)val >> 32);
17695+ else
17696+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17697+ val);
17698+}
17699+
17700 static inline void pgd_clear(pgd_t *pgdp)
17701 {
17702 set_pgd(pgdp, __pgd(0));
17703@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17704 pv_mmu_ops.set_fixmap(idx, phys, flags);
17705 }
17706
17707+#ifdef CONFIG_PAX_KERNEXEC
17708+static inline unsigned long pax_open_kernel(void)
17709+{
17710+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17711+}
17712+
17713+static inline unsigned long pax_close_kernel(void)
17714+{
17715+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17716+}
17717+#else
17718+static inline unsigned long pax_open_kernel(void) { return 0; }
17719+static inline unsigned long pax_close_kernel(void) { return 0; }
17720+#endif
17721+
17722 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17723
17724 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17725@@ -906,7 +933,7 @@ extern void default_banner(void);
17726
17727 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17728 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17729-#define PARA_INDIRECT(addr) *%cs:addr
17730+#define PARA_INDIRECT(addr) *%ss:addr
17731 #endif
17732
17733 #define INTERRUPT_RETURN \
17734@@ -981,6 +1008,21 @@ extern void default_banner(void);
17735 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17736 CLBR_NONE, \
17737 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17738+
17739+#define GET_CR0_INTO_RDI \
17740+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17741+ mov %rax,%rdi
17742+
17743+#define SET_RDI_INTO_CR0 \
17744+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17745+
17746+#define GET_CR3_INTO_RDI \
17747+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17748+ mov %rax,%rdi
17749+
17750+#define SET_RDI_INTO_CR3 \
17751+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17752+
17753 #endif /* CONFIG_X86_32 */
17754
17755 #endif /* __ASSEMBLY__ */
17756diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17757index 7549b8b..f0edfda 100644
17758--- a/arch/x86/include/asm/paravirt_types.h
17759+++ b/arch/x86/include/asm/paravirt_types.h
17760@@ -84,7 +84,7 @@ struct pv_init_ops {
17761 */
17762 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17763 unsigned long addr, unsigned len);
17764-};
17765+} __no_const __no_randomize_layout;
17766
17767
17768 struct pv_lazy_ops {
17769@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17770 void (*enter)(void);
17771 void (*leave)(void);
17772 void (*flush)(void);
17773-};
17774+} __no_randomize_layout;
17775
17776 struct pv_time_ops {
17777 unsigned long long (*sched_clock)(void);
17778 unsigned long long (*steal_clock)(int cpu);
17779 unsigned long (*get_tsc_khz)(void);
17780-};
17781+} __no_const __no_randomize_layout;
17782
17783 struct pv_cpu_ops {
17784 /* hooks for various privileged instructions */
17785@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17786
17787 void (*start_context_switch)(struct task_struct *prev);
17788 void (*end_context_switch)(struct task_struct *next);
17789-};
17790+} __no_const __no_randomize_layout;
17791
17792 struct pv_irq_ops {
17793 /*
17794@@ -215,7 +215,7 @@ struct pv_irq_ops {
17795 #ifdef CONFIG_X86_64
17796 void (*adjust_exception_frame)(void);
17797 #endif
17798-};
17799+} __no_randomize_layout;
17800
17801 struct pv_apic_ops {
17802 #ifdef CONFIG_X86_LOCAL_APIC
17803@@ -223,7 +223,7 @@ struct pv_apic_ops {
17804 unsigned long start_eip,
17805 unsigned long start_esp);
17806 #endif
17807-};
17808+} __no_const __no_randomize_layout;
17809
17810 struct pv_mmu_ops {
17811 unsigned long (*read_cr2)(void);
17812@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17813 struct paravirt_callee_save make_pud;
17814
17815 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17816+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17817 #endif /* PAGETABLE_LEVELS == 4 */
17818 #endif /* PAGETABLE_LEVELS >= 3 */
17819
17820@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17821 an mfn. We can tell which is which from the index. */
17822 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17823 phys_addr_t phys, pgprot_t flags);
17824-};
17825+
17826+#ifdef CONFIG_PAX_KERNEXEC
17827+ unsigned long (*pax_open_kernel)(void);
17828+ unsigned long (*pax_close_kernel)(void);
17829+#endif
17830+
17831+} __no_randomize_layout;
17832
17833 struct arch_spinlock;
17834 #ifdef CONFIG_SMP
17835@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17836 struct pv_lock_ops {
17837 struct paravirt_callee_save lock_spinning;
17838 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17839-};
17840+} __no_randomize_layout;
17841
17842 /* This contains all the paravirt structures: we get a convenient
17843 * number for each function using the offset which we use to indicate
17844- * what to patch. */
17845+ * what to patch.
17846+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17847+ */
17848+
17849 struct paravirt_patch_template {
17850 struct pv_init_ops pv_init_ops;
17851 struct pv_time_ops pv_time_ops;
17852@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17853 struct pv_apic_ops pv_apic_ops;
17854 struct pv_mmu_ops pv_mmu_ops;
17855 struct pv_lock_ops pv_lock_ops;
17856-};
17857+} __no_randomize_layout;
17858
17859 extern struct pv_info pv_info;
17860 extern struct pv_init_ops pv_init_ops;
17861diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17862index c4412e9..90e88c5 100644
17863--- a/arch/x86/include/asm/pgalloc.h
17864+++ b/arch/x86/include/asm/pgalloc.h
17865@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17866 pmd_t *pmd, pte_t *pte)
17867 {
17868 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17869+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17870+}
17871+
17872+static inline void pmd_populate_user(struct mm_struct *mm,
17873+ pmd_t *pmd, pte_t *pte)
17874+{
17875+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17876 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17877 }
17878
17879@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17880
17881 #ifdef CONFIG_X86_PAE
17882 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17883+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17884+{
17885+ pud_populate(mm, pudp, pmd);
17886+}
17887 #else /* !CONFIG_X86_PAE */
17888 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17889 {
17890 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17891 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17892 }
17893+
17894+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17895+{
17896+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17897+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17898+}
17899 #endif /* CONFIG_X86_PAE */
17900
17901 #if PAGETABLE_LEVELS > 3
17902@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17903 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17904 }
17905
17906+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17907+{
17908+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17909+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17910+}
17911+
17912 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17913 {
17914 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17915diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17916index 206a87f..1623b06 100644
17917--- a/arch/x86/include/asm/pgtable-2level.h
17918+++ b/arch/x86/include/asm/pgtable-2level.h
17919@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17920
17921 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17922 {
17923+ pax_open_kernel();
17924 *pmdp = pmd;
17925+ pax_close_kernel();
17926 }
17927
17928 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17929diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17930index 81bb91b..9392125 100644
17931--- a/arch/x86/include/asm/pgtable-3level.h
17932+++ b/arch/x86/include/asm/pgtable-3level.h
17933@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17934
17935 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17936 {
17937+ pax_open_kernel();
17938 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17939+ pax_close_kernel();
17940 }
17941
17942 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17943 {
17944+ pax_open_kernel();
17945 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17946+ pax_close_kernel();
17947 }
17948
17949 /*
17950diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17951index aa97a07..5c53c32 100644
17952--- a/arch/x86/include/asm/pgtable.h
17953+++ b/arch/x86/include/asm/pgtable.h
17954@@ -46,6 +46,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17955
17956 #ifndef __PAGETABLE_PUD_FOLDED
17957 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
17958+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
17959 #define pgd_clear(pgd) native_pgd_clear(pgd)
17960 #endif
17961
17962@@ -83,12 +84,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17963
17964 #define arch_end_context_switch(prev) do {} while(0)
17965
17966+#define pax_open_kernel() native_pax_open_kernel()
17967+#define pax_close_kernel() native_pax_close_kernel()
17968 #endif /* CONFIG_PARAVIRT */
17969
17970+#define __HAVE_ARCH_PAX_OPEN_KERNEL
17971+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
17972+
17973+#ifdef CONFIG_PAX_KERNEXEC
17974+static inline unsigned long native_pax_open_kernel(void)
17975+{
17976+ unsigned long cr0;
17977+
17978+ preempt_disable();
17979+ barrier();
17980+ cr0 = read_cr0() ^ X86_CR0_WP;
17981+ BUG_ON(cr0 & X86_CR0_WP);
17982+ write_cr0(cr0);
17983+ barrier();
17984+ return cr0 ^ X86_CR0_WP;
17985+}
17986+
17987+static inline unsigned long native_pax_close_kernel(void)
17988+{
17989+ unsigned long cr0;
17990+
17991+ barrier();
17992+ cr0 = read_cr0() ^ X86_CR0_WP;
17993+ BUG_ON(!(cr0 & X86_CR0_WP));
17994+ write_cr0(cr0);
17995+ barrier();
17996+ preempt_enable_no_resched();
17997+ return cr0 ^ X86_CR0_WP;
17998+}
17999+#else
18000+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18001+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18002+#endif
18003+
18004 /*
18005 * The following only work if pte_present() is true.
18006 * Undefined behaviour if not..
18007 */
18008+static inline int pte_user(pte_t pte)
18009+{
18010+ return pte_val(pte) & _PAGE_USER;
18011+}
18012+
18013 static inline int pte_dirty(pte_t pte)
18014 {
18015 return pte_flags(pte) & _PAGE_DIRTY;
18016@@ -155,6 +197,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18017 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18018 }
18019
18020+static inline unsigned long pgd_pfn(pgd_t pgd)
18021+{
18022+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18023+}
18024+
18025 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18026
18027 static inline int pmd_large(pmd_t pte)
18028@@ -208,9 +255,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18029 return pte_clear_flags(pte, _PAGE_RW);
18030 }
18031
18032+static inline pte_t pte_mkread(pte_t pte)
18033+{
18034+ return __pte(pte_val(pte) | _PAGE_USER);
18035+}
18036+
18037 static inline pte_t pte_mkexec(pte_t pte)
18038 {
18039- return pte_clear_flags(pte, _PAGE_NX);
18040+#ifdef CONFIG_X86_PAE
18041+ if (__supported_pte_mask & _PAGE_NX)
18042+ return pte_clear_flags(pte, _PAGE_NX);
18043+ else
18044+#endif
18045+ return pte_set_flags(pte, _PAGE_USER);
18046+}
18047+
18048+static inline pte_t pte_exprotect(pte_t pte)
18049+{
18050+#ifdef CONFIG_X86_PAE
18051+ if (__supported_pte_mask & _PAGE_NX)
18052+ return pte_set_flags(pte, _PAGE_NX);
18053+ else
18054+#endif
18055+ return pte_clear_flags(pte, _PAGE_USER);
18056 }
18057
18058 static inline pte_t pte_mkdirty(pte_t pte)
18059@@ -440,6 +507,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18060 #endif
18061
18062 #ifndef __ASSEMBLY__
18063+
18064+#ifdef CONFIG_PAX_PER_CPU_PGD
18065+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18066+enum cpu_pgd_type {kernel = 0, user = 1};
18067+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18068+{
18069+ return cpu_pgd[cpu][type];
18070+}
18071+#endif
18072+
18073 #include <linux/mm_types.h>
18074 #include <linux/mmdebug.h>
18075 #include <linux/log2.h>
18076@@ -586,7 +663,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18077 * Currently stuck as a macro due to indirect forward reference to
18078 * linux/mmzone.h's __section_mem_map_addr() definition:
18079 */
18080-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18081+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18082
18083 /* Find an entry in the second-level page table.. */
18084 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18085@@ -626,7 +703,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18086 * Currently stuck as a macro due to indirect forward reference to
18087 * linux/mmzone.h's __section_mem_map_addr() definition:
18088 */
18089-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18090+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18091
18092 /* to find an entry in a page-table-directory. */
18093 static inline unsigned long pud_index(unsigned long address)
18094@@ -641,7 +718,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18095
18096 static inline int pgd_bad(pgd_t pgd)
18097 {
18098- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18099+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18100 }
18101
18102 static inline int pgd_none(pgd_t pgd)
18103@@ -664,7 +741,12 @@ static inline int pgd_none(pgd_t pgd)
18104 * pgd_offset() returns a (pgd_t *)
18105 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18106 */
18107-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18108+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18109+
18110+#ifdef CONFIG_PAX_PER_CPU_PGD
18111+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18112+#endif
18113+
18114 /*
18115 * a shortcut which implies the use of the kernel's pgd, instead
18116 * of a process's
18117@@ -675,6 +757,23 @@ static inline int pgd_none(pgd_t pgd)
18118 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18119 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18120
18121+#ifdef CONFIG_X86_32
18122+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18123+#else
18124+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18125+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18126+
18127+#ifdef CONFIG_PAX_MEMORY_UDEREF
18128+#ifdef __ASSEMBLY__
18129+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18130+#else
18131+extern unsigned long pax_user_shadow_base;
18132+extern pgdval_t clone_pgd_mask;
18133+#endif
18134+#endif
18135+
18136+#endif
18137+
18138 #ifndef __ASSEMBLY__
18139
18140 extern int direct_gbpages;
18141@@ -841,11 +940,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18142 * dst and src can be on the same page, but the range must not overlap,
18143 * and must not cross a page boundary.
18144 */
18145-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18146+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18147 {
18148- memcpy(dst, src, count * sizeof(pgd_t));
18149+ pax_open_kernel();
18150+ while (count--)
18151+ *dst++ = *src++;
18152+ pax_close_kernel();
18153 }
18154
18155+#ifdef CONFIG_PAX_PER_CPU_PGD
18156+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18157+#endif
18158+
18159+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18160+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18161+#else
18162+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18163+#endif
18164+
18165 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18166 static inline int page_level_shift(enum pg_level level)
18167 {
18168diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18169index b6c0b40..3535d47 100644
18170--- a/arch/x86/include/asm/pgtable_32.h
18171+++ b/arch/x86/include/asm/pgtable_32.h
18172@@ -25,9 +25,6 @@
18173 struct mm_struct;
18174 struct vm_area_struct;
18175
18176-extern pgd_t swapper_pg_dir[1024];
18177-extern pgd_t initial_page_table[1024];
18178-
18179 static inline void pgtable_cache_init(void) { }
18180 static inline void check_pgt_cache(void) { }
18181 void paging_init(void);
18182@@ -45,6 +42,12 @@ void paging_init(void);
18183 # include <asm/pgtable-2level.h>
18184 #endif
18185
18186+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18187+extern pgd_t initial_page_table[PTRS_PER_PGD];
18188+#ifdef CONFIG_X86_PAE
18189+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18190+#endif
18191+
18192 #if defined(CONFIG_HIGHPTE)
18193 #define pte_offset_map(dir, address) \
18194 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18195@@ -59,12 +62,17 @@ void paging_init(void);
18196 /* Clear a kernel PTE and flush it from the TLB */
18197 #define kpte_clear_flush(ptep, vaddr) \
18198 do { \
18199+ pax_open_kernel(); \
18200 pte_clear(&init_mm, (vaddr), (ptep)); \
18201+ pax_close_kernel(); \
18202 __flush_tlb_one((vaddr)); \
18203 } while (0)
18204
18205 #endif /* !__ASSEMBLY__ */
18206
18207+#define HAVE_ARCH_UNMAPPED_AREA
18208+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18209+
18210 /*
18211 * kern_addr_valid() is (1) for FLATMEM and (0) for
18212 * SPARSEMEM and DISCONTIGMEM
18213diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18214index ed5903b..c7fe163 100644
18215--- a/arch/x86/include/asm/pgtable_32_types.h
18216+++ b/arch/x86/include/asm/pgtable_32_types.h
18217@@ -8,7 +8,7 @@
18218 */
18219 #ifdef CONFIG_X86_PAE
18220 # include <asm/pgtable-3level_types.h>
18221-# define PMD_SIZE (1UL << PMD_SHIFT)
18222+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18223 # define PMD_MASK (~(PMD_SIZE - 1))
18224 #else
18225 # include <asm/pgtable-2level_types.h>
18226@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18227 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18228 #endif
18229
18230+#ifdef CONFIG_PAX_KERNEXEC
18231+#ifndef __ASSEMBLY__
18232+extern unsigned char MODULES_EXEC_VADDR[];
18233+extern unsigned char MODULES_EXEC_END[];
18234+#endif
18235+#include <asm/boot.h>
18236+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18237+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18238+#else
18239+#define ktla_ktva(addr) (addr)
18240+#define ktva_ktla(addr) (addr)
18241+#endif
18242+
18243 #define MODULES_VADDR VMALLOC_START
18244 #define MODULES_END VMALLOC_END
18245 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18246diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18247index 4572b2f..4430113 100644
18248--- a/arch/x86/include/asm/pgtable_64.h
18249+++ b/arch/x86/include/asm/pgtable_64.h
18250@@ -16,11 +16,16 @@
18251
18252 extern pud_t level3_kernel_pgt[512];
18253 extern pud_t level3_ident_pgt[512];
18254+extern pud_t level3_vmalloc_start_pgt[512];
18255+extern pud_t level3_vmalloc_end_pgt[512];
18256+extern pud_t level3_vmemmap_pgt[512];
18257+extern pud_t level2_vmemmap_pgt[512];
18258 extern pmd_t level2_kernel_pgt[512];
18259 extern pmd_t level2_fixmap_pgt[512];
18260-extern pmd_t level2_ident_pgt[512];
18261+extern pmd_t level2_ident_pgt[512*2];
18262 extern pte_t level1_fixmap_pgt[512];
18263-extern pgd_t init_level4_pgt[];
18264+extern pte_t level1_vsyscall_pgt[512];
18265+extern pgd_t init_level4_pgt[512];
18266
18267 #define swapper_pg_dir init_level4_pgt
18268
18269@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18270
18271 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18272 {
18273+ pax_open_kernel();
18274 *pmdp = pmd;
18275+ pax_close_kernel();
18276 }
18277
18278 static inline void native_pmd_clear(pmd_t *pmd)
18279@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18280
18281 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18282 {
18283+ pax_open_kernel();
18284 *pudp = pud;
18285+ pax_close_kernel();
18286 }
18287
18288 static inline void native_pud_clear(pud_t *pud)
18289@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18290
18291 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18292 {
18293+ pax_open_kernel();
18294+ *pgdp = pgd;
18295+ pax_close_kernel();
18296+}
18297+
18298+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18299+{
18300 *pgdp = pgd;
18301 }
18302
18303diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18304index 7166e25..baaa6fe 100644
18305--- a/arch/x86/include/asm/pgtable_64_types.h
18306+++ b/arch/x86/include/asm/pgtable_64_types.h
18307@@ -61,9 +61,14 @@ typedef struct { pteval_t pte; } pte_t;
18308 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18309 #define MODULES_END _AC(0xffffffffff000000, UL)
18310 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18311+#define MODULES_EXEC_VADDR MODULES_VADDR
18312+#define MODULES_EXEC_END MODULES_END
18313 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18314 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18315
18316+#define ktla_ktva(addr) (addr)
18317+#define ktva_ktla(addr) (addr)
18318+
18319 #define EARLY_DYNAMIC_PAGE_TABLES 64
18320
18321 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18322diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18323index 0778964..0e94758 100644
18324--- a/arch/x86/include/asm/pgtable_types.h
18325+++ b/arch/x86/include/asm/pgtable_types.h
18326@@ -110,8 +110,10 @@
18327
18328 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18329 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18330-#else
18331+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18332 #define _PAGE_NX (_AT(pteval_t, 0))
18333+#else
18334+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18335 #endif
18336
18337 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
18338@@ -150,6 +152,9 @@
18339 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18340 _PAGE_ACCESSED)
18341
18342+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18343+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18344+
18345 #define __PAGE_KERNEL_EXEC \
18346 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18347 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18348@@ -160,7 +165,7 @@
18349 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
18350 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
18351 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
18352-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18353+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18354 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18355 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
18356 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18357@@ -217,7 +222,7 @@
18358 #ifdef CONFIG_X86_64
18359 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18360 #else
18361-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18362+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18363 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18364 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18365 #endif
18366@@ -256,7 +261,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18367 {
18368 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18369 }
18370+#endif
18371
18372+#if PAGETABLE_LEVELS == 3
18373+#include <asm-generic/pgtable-nopud.h>
18374+#endif
18375+
18376+#if PAGETABLE_LEVELS == 2
18377+#include <asm-generic/pgtable-nopmd.h>
18378+#endif
18379+
18380+#ifndef __ASSEMBLY__
18381 #if PAGETABLE_LEVELS > 3
18382 typedef struct { pudval_t pud; } pud_t;
18383
18384@@ -270,8 +285,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18385 return pud.pud;
18386 }
18387 #else
18388-#include <asm-generic/pgtable-nopud.h>
18389-
18390 static inline pudval_t native_pud_val(pud_t pud)
18391 {
18392 return native_pgd_val(pud.pgd);
18393@@ -291,8 +304,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18394 return pmd.pmd;
18395 }
18396 #else
18397-#include <asm-generic/pgtable-nopmd.h>
18398-
18399 static inline pmdval_t native_pmd_val(pmd_t pmd)
18400 {
18401 return native_pgd_val(pmd.pud.pgd);
18402@@ -346,7 +357,6 @@ typedef struct page *pgtable_t;
18403
18404 extern pteval_t __supported_pte_mask;
18405 extern void set_nx(void);
18406-extern int nx_enabled;
18407
18408 #define pgprot_writecombine pgprot_writecombine
18409 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18410diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18411index 4008734..48f0d81 100644
18412--- a/arch/x86/include/asm/preempt.h
18413+++ b/arch/x86/include/asm/preempt.h
18414@@ -87,7 +87,7 @@ static __always_inline void __preempt_count_sub(int val)
18415 */
18416 static __always_inline bool __preempt_count_dec_and_test(void)
18417 {
18418- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18419+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18420 }
18421
18422 /*
18423diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18424index eb71ec7..f06532a 100644
18425--- a/arch/x86/include/asm/processor.h
18426+++ b/arch/x86/include/asm/processor.h
18427@@ -127,7 +127,7 @@ struct cpuinfo_x86 {
18428 /* Index into per_cpu list: */
18429 u16 cpu_index;
18430 u32 microcode;
18431-} __attribute__((__aligned__(SMP_CACHE_BYTES)));
18432+} __attribute__((__aligned__(SMP_CACHE_BYTES))) __randomize_layout;
18433
18434 #define X86_VENDOR_INTEL 0
18435 #define X86_VENDOR_CYRIX 1
18436@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18437 : "memory");
18438 }
18439
18440+/* invpcid (%rdx),%rax */
18441+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18442+
18443+#define INVPCID_SINGLE_ADDRESS 0UL
18444+#define INVPCID_SINGLE_CONTEXT 1UL
18445+#define INVPCID_ALL_GLOBAL 2UL
18446+#define INVPCID_ALL_NONGLOBAL 3UL
18447+
18448+#define PCID_KERNEL 0UL
18449+#define PCID_USER 1UL
18450+#define PCID_NOFLUSH (1UL << 63)
18451+
18452 static inline void load_cr3(pgd_t *pgdir)
18453 {
18454- write_cr3(__pa(pgdir));
18455+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18456 }
18457
18458 #ifdef CONFIG_X86_32
18459@@ -282,7 +294,7 @@ struct tss_struct {
18460
18461 } ____cacheline_aligned;
18462
18463-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18464+extern struct tss_struct init_tss[NR_CPUS];
18465
18466 /*
18467 * Save the original ist values for checking stack pointers during debugging
18468@@ -478,6 +490,7 @@ struct thread_struct {
18469 unsigned short ds;
18470 unsigned short fsindex;
18471 unsigned short gsindex;
18472+ unsigned short ss;
18473 #endif
18474 #ifdef CONFIG_X86_32
18475 unsigned long ip;
18476@@ -587,29 +600,8 @@ static inline void load_sp0(struct tss_struct *tss,
18477 extern unsigned long mmu_cr4_features;
18478 extern u32 *trampoline_cr4_features;
18479
18480-static inline void set_in_cr4(unsigned long mask)
18481-{
18482- unsigned long cr4;
18483-
18484- mmu_cr4_features |= mask;
18485- if (trampoline_cr4_features)
18486- *trampoline_cr4_features = mmu_cr4_features;
18487- cr4 = read_cr4();
18488- cr4 |= mask;
18489- write_cr4(cr4);
18490-}
18491-
18492-static inline void clear_in_cr4(unsigned long mask)
18493-{
18494- unsigned long cr4;
18495-
18496- mmu_cr4_features &= ~mask;
18497- if (trampoline_cr4_features)
18498- *trampoline_cr4_features = mmu_cr4_features;
18499- cr4 = read_cr4();
18500- cr4 &= ~mask;
18501- write_cr4(cr4);
18502-}
18503+extern void set_in_cr4(unsigned long mask);
18504+extern void clear_in_cr4(unsigned long mask);
18505
18506 typedef struct {
18507 unsigned long seg;
18508@@ -837,11 +829,18 @@ static inline void spin_lock_prefetch(const void *x)
18509 */
18510 #define TASK_SIZE PAGE_OFFSET
18511 #define TASK_SIZE_MAX TASK_SIZE
18512+
18513+#ifdef CONFIG_PAX_SEGMEXEC
18514+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18515+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18516+#else
18517 #define STACK_TOP TASK_SIZE
18518-#define STACK_TOP_MAX STACK_TOP
18519+#endif
18520+
18521+#define STACK_TOP_MAX TASK_SIZE
18522
18523 #define INIT_THREAD { \
18524- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18525+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18526 .vm86_info = NULL, \
18527 .sysenter_cs = __KERNEL_CS, \
18528 .io_bitmap_ptr = NULL, \
18529@@ -855,7 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
18530 */
18531 #define INIT_TSS { \
18532 .x86_tss = { \
18533- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18534+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18535 .ss0 = __KERNEL_DS, \
18536 .ss1 = __KERNEL_CS, \
18537 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18538@@ -866,11 +865,7 @@ static inline void spin_lock_prefetch(const void *x)
18539 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18540
18541 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18542-#define KSTK_TOP(info) \
18543-({ \
18544- unsigned long *__ptr = (unsigned long *)(info); \
18545- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18546-})
18547+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18548
18549 /*
18550 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18551@@ -885,7 +880,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18552 #define task_pt_regs(task) \
18553 ({ \
18554 struct pt_regs *__regs__; \
18555- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18556+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18557 __regs__ - 1; \
18558 })
18559
18560@@ -895,13 +890,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18561 /*
18562 * User space process size. 47bits minus one guard page.
18563 */
18564-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18565+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18566
18567 /* This decides where the kernel will search for a free chunk of vm
18568 * space during mmap's.
18569 */
18570 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18571- 0xc0000000 : 0xFFFFe000)
18572+ 0xc0000000 : 0xFFFFf000)
18573
18574 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18575 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18576@@ -912,11 +907,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18577 #define STACK_TOP_MAX TASK_SIZE_MAX
18578
18579 #define INIT_THREAD { \
18580- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18581+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18582 }
18583
18584 #define INIT_TSS { \
18585- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18586+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18587 }
18588
18589 /*
18590@@ -944,6 +939,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18591 */
18592 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18593
18594+#ifdef CONFIG_PAX_SEGMEXEC
18595+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18596+#endif
18597+
18598 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18599
18600 /* Get/set a process' ability to use the timestamp counter instruction */
18601@@ -970,7 +969,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18602 return 0;
18603 }
18604
18605-extern unsigned long arch_align_stack(unsigned long sp);
18606+#define arch_align_stack(x) ((x) & ~0xfUL)
18607 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18608
18609 void default_idle(void);
18610@@ -980,6 +979,6 @@ bool xen_set_default_idle(void);
18611 #define xen_set_default_idle 0
18612 #endif
18613
18614-void stop_this_cpu(void *dummy);
18615+void stop_this_cpu(void *dummy) __noreturn;
18616 void df_debug(struct pt_regs *regs, long error_code);
18617 #endif /* _ASM_X86_PROCESSOR_H */
18618diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18619index 86fc2bb..bd5049a 100644
18620--- a/arch/x86/include/asm/ptrace.h
18621+++ b/arch/x86/include/asm/ptrace.h
18622@@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18623 }
18624
18625 /*
18626- * user_mode_vm(regs) determines whether a register set came from user mode.
18627+ * user_mode(regs) determines whether a register set came from user mode.
18628 * This is true if V8086 mode was enabled OR if the register set was from
18629 * protected mode with RPL-3 CS value. This tricky test checks that with
18630 * one comparison. Many places in the kernel can bypass this full check
18631- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18632+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18633+ * be used.
18634 */
18635-static inline int user_mode(struct pt_regs *regs)
18636+static inline int user_mode_novm(struct pt_regs *regs)
18637 {
18638 #ifdef CONFIG_X86_32
18639 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18640 #else
18641- return !!(regs->cs & 3);
18642+ return !!(regs->cs & SEGMENT_RPL_MASK);
18643 #endif
18644 }
18645
18646-static inline int user_mode_vm(struct pt_regs *regs)
18647+static inline int user_mode(struct pt_regs *regs)
18648 {
18649 #ifdef CONFIG_X86_32
18650 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18651 USER_RPL;
18652 #else
18653- return user_mode(regs);
18654+ return user_mode_novm(regs);
18655 #endif
18656 }
18657
18658@@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18659 #ifdef CONFIG_X86_64
18660 static inline bool user_64bit_mode(struct pt_regs *regs)
18661 {
18662+ unsigned long cs = regs->cs & 0xffff;
18663 #ifndef CONFIG_PARAVIRT
18664 /*
18665 * On non-paravirt systems, this is the only long mode CPL 3
18666 * selector. We do not allow long mode selectors in the LDT.
18667 */
18668- return regs->cs == __USER_CS;
18669+ return cs == __USER_CS;
18670 #else
18671 /* Headers are too twisted for this to go in paravirt.h. */
18672- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18673+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18674 #endif
18675 }
18676
18677@@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18678 * Traps from the kernel do not save sp and ss.
18679 * Use the helper function to retrieve sp.
18680 */
18681- if (offset == offsetof(struct pt_regs, sp) &&
18682- regs->cs == __KERNEL_CS)
18683- return kernel_stack_pointer(regs);
18684+ if (offset == offsetof(struct pt_regs, sp)) {
18685+ unsigned long cs = regs->cs & 0xffff;
18686+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18687+ return kernel_stack_pointer(regs);
18688+ }
18689 #endif
18690 return *(unsigned long *)((unsigned long)regs + offset);
18691 }
18692diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18693index ae0e241..e80b10b 100644
18694--- a/arch/x86/include/asm/qrwlock.h
18695+++ b/arch/x86/include/asm/qrwlock.h
18696@@ -7,8 +7,8 @@
18697 #define queue_write_unlock queue_write_unlock
18698 static inline void queue_write_unlock(struct qrwlock *lock)
18699 {
18700- barrier();
18701- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18702+ barrier();
18703+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18704 }
18705 #endif
18706
18707diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18708index 9c6b890..5305f53 100644
18709--- a/arch/x86/include/asm/realmode.h
18710+++ b/arch/x86/include/asm/realmode.h
18711@@ -22,16 +22,14 @@ struct real_mode_header {
18712 #endif
18713 /* APM/BIOS reboot */
18714 u32 machine_real_restart_asm;
18715-#ifdef CONFIG_X86_64
18716 u32 machine_real_restart_seg;
18717-#endif
18718 };
18719
18720 /* This must match data at trampoline_32/64.S */
18721 struct trampoline_header {
18722 #ifdef CONFIG_X86_32
18723 u32 start;
18724- u16 gdt_pad;
18725+ u16 boot_cs;
18726 u16 gdt_limit;
18727 u32 gdt_base;
18728 #else
18729diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18730index a82c4f1..ac45053 100644
18731--- a/arch/x86/include/asm/reboot.h
18732+++ b/arch/x86/include/asm/reboot.h
18733@@ -6,13 +6,13 @@
18734 struct pt_regs;
18735
18736 struct machine_ops {
18737- void (*restart)(char *cmd);
18738- void (*halt)(void);
18739- void (*power_off)(void);
18740+ void (* __noreturn restart)(char *cmd);
18741+ void (* __noreturn halt)(void);
18742+ void (* __noreturn power_off)(void);
18743 void (*shutdown)(void);
18744 void (*crash_shutdown)(struct pt_regs *);
18745- void (*emergency_restart)(void);
18746-};
18747+ void (* __noreturn emergency_restart)(void);
18748+} __no_const;
18749
18750 extern struct machine_ops machine_ops;
18751
18752diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18753index 8f7866a..e442f20 100644
18754--- a/arch/x86/include/asm/rmwcc.h
18755+++ b/arch/x86/include/asm/rmwcc.h
18756@@ -3,7 +3,34 @@
18757
18758 #ifdef CC_HAVE_ASM_GOTO
18759
18760-#define __GEN_RMWcc(fullop, var, cc, ...) \
18761+#ifdef CONFIG_PAX_REFCOUNT
18762+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18763+do { \
18764+ asm_volatile_goto (fullop \
18765+ ";jno 0f\n" \
18766+ fullantiop \
18767+ ";int $4\n0:\n" \
18768+ _ASM_EXTABLE(0b, 0b) \
18769+ ";j" cc " %l[cc_label]" \
18770+ : : "m" (var), ## __VA_ARGS__ \
18771+ : "memory" : cc_label); \
18772+ return 0; \
18773+cc_label: \
18774+ return 1; \
18775+} while (0)
18776+#else
18777+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18778+do { \
18779+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18780+ : : "m" (var), ## __VA_ARGS__ \
18781+ : "memory" : cc_label); \
18782+ return 0; \
18783+cc_label: \
18784+ return 1; \
18785+} while (0)
18786+#endif
18787+
18788+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18789 do { \
18790 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18791 : : "m" (var), ## __VA_ARGS__ \
18792@@ -13,15 +40,46 @@ cc_label: \
18793 return 1; \
18794 } while (0)
18795
18796-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18797- __GEN_RMWcc(op " " arg0, var, cc)
18798+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18799+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18800
18801-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18802- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18803+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18804+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18805+
18806+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18807+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18808+
18809+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18810+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18811
18812 #else /* !CC_HAVE_ASM_GOTO */
18813
18814-#define __GEN_RMWcc(fullop, var, cc, ...) \
18815+#ifdef CONFIG_PAX_REFCOUNT
18816+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18817+do { \
18818+ char c; \
18819+ asm volatile (fullop \
18820+ ";jno 0f\n" \
18821+ fullantiop \
18822+ ";int $4\n0:\n" \
18823+ _ASM_EXTABLE(0b, 0b) \
18824+ "; set" cc " %1" \
18825+ : "+m" (var), "=qm" (c) \
18826+ : __VA_ARGS__ : "memory"); \
18827+ return c != 0; \
18828+} while (0)
18829+#else
18830+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18831+do { \
18832+ char c; \
18833+ asm volatile (fullop "; set" cc " %1" \
18834+ : "+m" (var), "=qm" (c) \
18835+ : __VA_ARGS__ : "memory"); \
18836+ return c != 0; \
18837+} while (0)
18838+#endif
18839+
18840+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18841 do { \
18842 char c; \
18843 asm volatile (fullop "; set" cc " %1" \
18844@@ -30,11 +88,17 @@ do { \
18845 return c != 0; \
18846 } while (0)
18847
18848-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18849- __GEN_RMWcc(op " " arg0, var, cc)
18850+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18851+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18852+
18853+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18854+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18855+
18856+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18857+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18858
18859-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18860- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18861+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18862+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18863
18864 #endif /* CC_HAVE_ASM_GOTO */
18865
18866diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18867index cad82c9..2e5c5c1 100644
18868--- a/arch/x86/include/asm/rwsem.h
18869+++ b/arch/x86/include/asm/rwsem.h
18870@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18871 {
18872 asm volatile("# beginning down_read\n\t"
18873 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18874+
18875+#ifdef CONFIG_PAX_REFCOUNT
18876+ "jno 0f\n"
18877+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18878+ "int $4\n0:\n"
18879+ _ASM_EXTABLE(0b, 0b)
18880+#endif
18881+
18882 /* adds 0x00000001 */
18883 " jns 1f\n"
18884 " call call_rwsem_down_read_failed\n"
18885@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18886 "1:\n\t"
18887 " mov %1,%2\n\t"
18888 " add %3,%2\n\t"
18889+
18890+#ifdef CONFIG_PAX_REFCOUNT
18891+ "jno 0f\n"
18892+ "sub %3,%2\n"
18893+ "int $4\n0:\n"
18894+ _ASM_EXTABLE(0b, 0b)
18895+#endif
18896+
18897 " jle 2f\n\t"
18898 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18899 " jnz 1b\n\t"
18900@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18901 long tmp;
18902 asm volatile("# beginning down_write\n\t"
18903 LOCK_PREFIX " xadd %1,(%2)\n\t"
18904+
18905+#ifdef CONFIG_PAX_REFCOUNT
18906+ "jno 0f\n"
18907+ "mov %1,(%2)\n"
18908+ "int $4\n0:\n"
18909+ _ASM_EXTABLE(0b, 0b)
18910+#endif
18911+
18912 /* adds 0xffff0001, returns the old value */
18913 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18914 /* was the active mask 0 before? */
18915@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18916 long tmp;
18917 asm volatile("# beginning __up_read\n\t"
18918 LOCK_PREFIX " xadd %1,(%2)\n\t"
18919+
18920+#ifdef CONFIG_PAX_REFCOUNT
18921+ "jno 0f\n"
18922+ "mov %1,(%2)\n"
18923+ "int $4\n0:\n"
18924+ _ASM_EXTABLE(0b, 0b)
18925+#endif
18926+
18927 /* subtracts 1, returns the old value */
18928 " jns 1f\n\t"
18929 " call call_rwsem_wake\n" /* expects old value in %edx */
18930@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18931 long tmp;
18932 asm volatile("# beginning __up_write\n\t"
18933 LOCK_PREFIX " xadd %1,(%2)\n\t"
18934+
18935+#ifdef CONFIG_PAX_REFCOUNT
18936+ "jno 0f\n"
18937+ "mov %1,(%2)\n"
18938+ "int $4\n0:\n"
18939+ _ASM_EXTABLE(0b, 0b)
18940+#endif
18941+
18942 /* subtracts 0xffff0001, returns the old value */
18943 " jns 1f\n\t"
18944 " call call_rwsem_wake\n" /* expects old value in %edx */
18945@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18946 {
18947 asm volatile("# beginning __downgrade_write\n\t"
18948 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18949+
18950+#ifdef CONFIG_PAX_REFCOUNT
18951+ "jno 0f\n"
18952+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18953+ "int $4\n0:\n"
18954+ _ASM_EXTABLE(0b, 0b)
18955+#endif
18956+
18957 /*
18958 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18959 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18960@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18961 */
18962 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18963 {
18964- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18965+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18966+
18967+#ifdef CONFIG_PAX_REFCOUNT
18968+ "jno 0f\n"
18969+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
18970+ "int $4\n0:\n"
18971+ _ASM_EXTABLE(0b, 0b)
18972+#endif
18973+
18974 : "+m" (sem->count)
18975 : "er" (delta));
18976 }
18977@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18978 */
18979 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18980 {
18981- return delta + xadd(&sem->count, delta);
18982+ return delta + xadd_check_overflow(&sem->count, delta);
18983 }
18984
18985 #endif /* __KERNEL__ */
18986diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18987index 6f1c3a8..7744f19 100644
18988--- a/arch/x86/include/asm/segment.h
18989+++ b/arch/x86/include/asm/segment.h
18990@@ -64,10 +64,15 @@
18991 * 26 - ESPFIX small SS
18992 * 27 - per-cpu [ offset to per-cpu data area ]
18993 * 28 - stack_canary-20 [ for stack protector ]
18994- * 29 - unused
18995- * 30 - unused
18996+ * 29 - PCI BIOS CS
18997+ * 30 - PCI BIOS DS
18998 * 31 - TSS for double fault handler
18999 */
19000+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
19001+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
19002+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
19003+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
19004+
19005 #define GDT_ENTRY_TLS_MIN 6
19006 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
19007
19008@@ -79,6 +84,8 @@
19009
19010 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
19011
19012+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
19013+
19014 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
19015
19016 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
19017@@ -104,6 +111,12 @@
19018 #define __KERNEL_STACK_CANARY 0
19019 #endif
19020
19021+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
19022+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
19023+
19024+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
19025+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19026+
19027 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19028
19029 /*
19030@@ -141,7 +154,7 @@
19031 */
19032
19033 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
19034-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
19035+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19036
19037
19038 #else
19039@@ -165,6 +178,8 @@
19040 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
19041 #define __USER32_DS __USER_DS
19042
19043+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19044+
19045 #define GDT_ENTRY_TSS 8 /* needs two entries */
19046 #define GDT_ENTRY_LDT 10 /* needs two entries */
19047 #define GDT_ENTRY_TLS_MIN 12
19048@@ -173,6 +188,8 @@
19049 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
19050 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
19051
19052+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19053+
19054 /* TLS indexes for 64bit - hardcoded in arch_prctl */
19055 #define FS_TLS 0
19056 #define GS_TLS 1
19057@@ -180,12 +197,14 @@
19058 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
19059 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
19060
19061-#define GDT_ENTRIES 16
19062+#define GDT_ENTRIES 17
19063
19064 #endif
19065
19066 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19067+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19068 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19069+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19070 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
19071 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
19072 #ifndef CONFIG_PARAVIRT
19073@@ -268,7 +287,7 @@ static inline unsigned long get_limit(unsigned long segment)
19074 {
19075 unsigned long __limit;
19076 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
19077- return __limit + 1;
19078+ return __limit;
19079 }
19080
19081 #endif /* !__ASSEMBLY__ */
19082diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19083index 8d3120f..352b440 100644
19084--- a/arch/x86/include/asm/smap.h
19085+++ b/arch/x86/include/asm/smap.h
19086@@ -25,11 +25,40 @@
19087
19088 #include <asm/alternative-asm.h>
19089
19090+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19091+#define ASM_PAX_OPEN_USERLAND \
19092+ 661: jmp 663f; \
19093+ .pushsection .altinstr_replacement, "a" ; \
19094+ 662: pushq %rax; nop; \
19095+ .popsection ; \
19096+ .pushsection .altinstructions, "a" ; \
19097+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19098+ .popsection ; \
19099+ call __pax_open_userland; \
19100+ popq %rax; \
19101+ 663:
19102+
19103+#define ASM_PAX_CLOSE_USERLAND \
19104+ 661: jmp 663f; \
19105+ .pushsection .altinstr_replacement, "a" ; \
19106+ 662: pushq %rax; nop; \
19107+ .popsection; \
19108+ .pushsection .altinstructions, "a" ; \
19109+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19110+ .popsection; \
19111+ call __pax_close_userland; \
19112+ popq %rax; \
19113+ 663:
19114+#else
19115+#define ASM_PAX_OPEN_USERLAND
19116+#define ASM_PAX_CLOSE_USERLAND
19117+#endif
19118+
19119 #ifdef CONFIG_X86_SMAP
19120
19121 #define ASM_CLAC \
19122 661: ASM_NOP3 ; \
19123- .pushsection .altinstr_replacement, "ax" ; \
19124+ .pushsection .altinstr_replacement, "a" ; \
19125 662: __ASM_CLAC ; \
19126 .popsection ; \
19127 .pushsection .altinstructions, "a" ; \
19128@@ -38,7 +67,7 @@
19129
19130 #define ASM_STAC \
19131 661: ASM_NOP3 ; \
19132- .pushsection .altinstr_replacement, "ax" ; \
19133+ .pushsection .altinstr_replacement, "a" ; \
19134 662: __ASM_STAC ; \
19135 .popsection ; \
19136 .pushsection .altinstructions, "a" ; \
19137@@ -56,6 +85,37 @@
19138
19139 #include <asm/alternative.h>
19140
19141+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19142+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19143+
19144+extern void __pax_open_userland(void);
19145+static __always_inline unsigned long pax_open_userland(void)
19146+{
19147+
19148+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19149+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
19150+ :
19151+ : [open] "i" (__pax_open_userland)
19152+ : "memory", "rax");
19153+#endif
19154+
19155+ return 0;
19156+}
19157+
19158+extern void __pax_close_userland(void);
19159+static __always_inline unsigned long pax_close_userland(void)
19160+{
19161+
19162+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19163+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
19164+ :
19165+ : [close] "i" (__pax_close_userland)
19166+ : "memory", "rax");
19167+#endif
19168+
19169+ return 0;
19170+}
19171+
19172 #ifdef CONFIG_X86_SMAP
19173
19174 static __always_inline void clac(void)
19175diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19176index 8cd1cc3..827e09e 100644
19177--- a/arch/x86/include/asm/smp.h
19178+++ b/arch/x86/include/asm/smp.h
19179@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19180 /* cpus sharing the last level cache: */
19181 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19182 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19183-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19184+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19185
19186 static inline struct cpumask *cpu_sibling_mask(int cpu)
19187 {
19188@@ -78,7 +78,7 @@ struct smp_ops {
19189
19190 void (*send_call_func_ipi)(const struct cpumask *mask);
19191 void (*send_call_func_single_ipi)(int cpu);
19192-};
19193+} __no_const;
19194
19195 /* Globals due to paravirt */
19196 extern void set_cpu_sibling_map(int cpu);
19197@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
19198 extern int safe_smp_processor_id(void);
19199
19200 #elif defined(CONFIG_X86_64_SMP)
19201-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19202-
19203-#define stack_smp_processor_id() \
19204-({ \
19205- struct thread_info *ti; \
19206- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19207- ti->cpu; \
19208-})
19209+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19210+#define stack_smp_processor_id() raw_smp_processor_id()
19211 #define safe_smp_processor_id() smp_processor_id()
19212
19213 #endif
19214diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19215index 6a99859..03cb807 100644
19216--- a/arch/x86/include/asm/stackprotector.h
19217+++ b/arch/x86/include/asm/stackprotector.h
19218@@ -47,7 +47,7 @@
19219 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19220 */
19221 #define GDT_STACK_CANARY_INIT \
19222- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19223+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19224
19225 /*
19226 * Initialize the stackprotector canary value.
19227@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19228
19229 static inline void load_stack_canary_segment(void)
19230 {
19231-#ifdef CONFIG_X86_32
19232+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19233 asm volatile ("mov %0, %%gs" : : "r" (0));
19234 #endif
19235 }
19236diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19237index 70bbe39..4ae2bd4 100644
19238--- a/arch/x86/include/asm/stacktrace.h
19239+++ b/arch/x86/include/asm/stacktrace.h
19240@@ -11,28 +11,20 @@
19241
19242 extern int kstack_depth_to_print;
19243
19244-struct thread_info;
19245+struct task_struct;
19246 struct stacktrace_ops;
19247
19248-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19249- unsigned long *stack,
19250- unsigned long bp,
19251- const struct stacktrace_ops *ops,
19252- void *data,
19253- unsigned long *end,
19254- int *graph);
19255+typedef unsigned long walk_stack_t(struct task_struct *task,
19256+ void *stack_start,
19257+ unsigned long *stack,
19258+ unsigned long bp,
19259+ const struct stacktrace_ops *ops,
19260+ void *data,
19261+ unsigned long *end,
19262+ int *graph);
19263
19264-extern unsigned long
19265-print_context_stack(struct thread_info *tinfo,
19266- unsigned long *stack, unsigned long bp,
19267- const struct stacktrace_ops *ops, void *data,
19268- unsigned long *end, int *graph);
19269-
19270-extern unsigned long
19271-print_context_stack_bp(struct thread_info *tinfo,
19272- unsigned long *stack, unsigned long bp,
19273- const struct stacktrace_ops *ops, void *data,
19274- unsigned long *end, int *graph);
19275+extern walk_stack_t print_context_stack;
19276+extern walk_stack_t print_context_stack_bp;
19277
19278 /* Generic stack tracer with callbacks */
19279
19280@@ -40,7 +32,7 @@ struct stacktrace_ops {
19281 void (*address)(void *data, unsigned long address, int reliable);
19282 /* On negative return stop dumping */
19283 int (*stack)(void *data, char *name);
19284- walk_stack_t walk_stack;
19285+ walk_stack_t *walk_stack;
19286 };
19287
19288 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19289diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19290index d7f3b3b..3cc39f1 100644
19291--- a/arch/x86/include/asm/switch_to.h
19292+++ b/arch/x86/include/asm/switch_to.h
19293@@ -108,7 +108,7 @@ do { \
19294 "call __switch_to\n\t" \
19295 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19296 __switch_canary \
19297- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19298+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19299 "movq %%rax,%%rdi\n\t" \
19300 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19301 "jnz ret_from_fork\n\t" \
19302@@ -119,7 +119,7 @@ do { \
19303 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19304 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19305 [_tif_fork] "i" (_TIF_FORK), \
19306- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19307+ [thread_info] "m" (current_tinfo), \
19308 [current_task] "m" (current_task) \
19309 __switch_canary_iparam \
19310 : "memory", "cc" __EXTRA_CLOBBER)
19311diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19312index 547e344..6be1175 100644
19313--- a/arch/x86/include/asm/thread_info.h
19314+++ b/arch/x86/include/asm/thread_info.h
19315@@ -24,7 +24,6 @@ struct exec_domain;
19316 #include <linux/atomic.h>
19317
19318 struct thread_info {
19319- struct task_struct *task; /* main task structure */
19320 struct exec_domain *exec_domain; /* execution domain */
19321 __u32 flags; /* low level flags */
19322 __u32 status; /* thread synchronous flags */
19323@@ -33,13 +32,13 @@ struct thread_info {
19324 mm_segment_t addr_limit;
19325 struct restart_block restart_block;
19326 void __user *sysenter_return;
19327+ unsigned long lowest_stack;
19328 unsigned int sig_on_uaccess_error:1;
19329 unsigned int uaccess_err:1; /* uaccess failed */
19330 };
19331
19332-#define INIT_THREAD_INFO(tsk) \
19333+#define INIT_THREAD_INFO \
19334 { \
19335- .task = &tsk, \
19336 .exec_domain = &default_exec_domain, \
19337 .flags = 0, \
19338 .cpu = 0, \
19339@@ -50,7 +49,7 @@ struct thread_info {
19340 }, \
19341 }
19342
19343-#define init_thread_info (init_thread_union.thread_info)
19344+#define init_thread_info (init_thread_union.stack)
19345 #define init_stack (init_thread_union.stack)
19346
19347 #else /* !__ASSEMBLY__ */
19348@@ -91,6 +90,7 @@ struct thread_info {
19349 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19350 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19351 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19352+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19353
19354 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19355 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19356@@ -115,17 +115,18 @@ struct thread_info {
19357 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19358 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19359 #define _TIF_X32 (1 << TIF_X32)
19360+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19361
19362 /* work to do in syscall_trace_enter() */
19363 #define _TIF_WORK_SYSCALL_ENTRY \
19364 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19365 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19366- _TIF_NOHZ)
19367+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19368
19369 /* work to do in syscall_trace_leave() */
19370 #define _TIF_WORK_SYSCALL_EXIT \
19371 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19372- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19373+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19374
19375 /* work to do on interrupt/exception return */
19376 #define _TIF_WORK_MASK \
19377@@ -136,7 +137,7 @@ struct thread_info {
19378 /* work to do on any return to user space */
19379 #define _TIF_ALLWORK_MASK \
19380 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19381- _TIF_NOHZ)
19382+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19383
19384 /* Only used for 64 bit */
19385 #define _TIF_DO_NOTIFY_MASK \
19386@@ -151,7 +152,6 @@ struct thread_info {
19387 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19388
19389 #define STACK_WARN (THREAD_SIZE/8)
19390-#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19391
19392 /*
19393 * macros/functions for gaining access to the thread information structure
19394@@ -162,26 +162,18 @@ struct thread_info {
19395
19396 DECLARE_PER_CPU(unsigned long, kernel_stack);
19397
19398+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19399+
19400 static inline struct thread_info *current_thread_info(void)
19401 {
19402- struct thread_info *ti;
19403- ti = (void *)(this_cpu_read_stable(kernel_stack) +
19404- KERNEL_STACK_OFFSET - THREAD_SIZE);
19405- return ti;
19406+ return this_cpu_read_stable(current_tinfo);
19407 }
19408
19409 #else /* !__ASSEMBLY__ */
19410
19411 /* how to get the thread information struct from ASM */
19412 #define GET_THREAD_INFO(reg) \
19413- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19414- _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19415-
19416-/*
19417- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19418- * a certain register (to be used in assembler memory operands).
19419- */
19420-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19421+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19422
19423 #endif
19424
19425@@ -237,5 +229,12 @@ static inline bool is_ia32_task(void)
19426 extern void arch_task_cache_init(void);
19427 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19428 extern void arch_release_task_struct(struct task_struct *tsk);
19429+
19430+#define __HAVE_THREAD_FUNCTIONS
19431+#define task_thread_info(task) (&(task)->tinfo)
19432+#define task_stack_page(task) ((task)->stack)
19433+#define setup_thread_stack(p, org) do {} while (0)
19434+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19435+
19436 #endif
19437 #endif /* _ASM_X86_THREAD_INFO_H */
19438diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19439index 04905bf..1178cdf 100644
19440--- a/arch/x86/include/asm/tlbflush.h
19441+++ b/arch/x86/include/asm/tlbflush.h
19442@@ -17,18 +17,44 @@
19443
19444 static inline void __native_flush_tlb(void)
19445 {
19446+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19447+ u64 descriptor[2];
19448+
19449+ descriptor[0] = PCID_KERNEL;
19450+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19451+ return;
19452+ }
19453+
19454+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19455+ if (static_cpu_has(X86_FEATURE_PCID)) {
19456+ unsigned int cpu = raw_get_cpu();
19457+
19458+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19459+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19460+ raw_put_cpu_no_resched();
19461+ return;
19462+ }
19463+#endif
19464+
19465 native_write_cr3(native_read_cr3());
19466 }
19467
19468 static inline void __native_flush_tlb_global_irq_disabled(void)
19469 {
19470- unsigned long cr4;
19471+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19472+ u64 descriptor[2];
19473
19474- cr4 = native_read_cr4();
19475- /* clear PGE */
19476- native_write_cr4(cr4 & ~X86_CR4_PGE);
19477- /* write old PGE again and flush TLBs */
19478- native_write_cr4(cr4);
19479+ descriptor[0] = PCID_KERNEL;
19480+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19481+ } else {
19482+ unsigned long cr4;
19483+
19484+ cr4 = native_read_cr4();
19485+ /* clear PGE */
19486+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19487+ /* write old PGE again and flush TLBs */
19488+ native_write_cr4(cr4);
19489+ }
19490 }
19491
19492 static inline void __native_flush_tlb_global(void)
19493@@ -49,6 +75,41 @@ static inline void __native_flush_tlb_global(void)
19494
19495 static inline void __native_flush_tlb_single(unsigned long addr)
19496 {
19497+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19498+ u64 descriptor[2];
19499+
19500+ descriptor[0] = PCID_KERNEL;
19501+ descriptor[1] = addr;
19502+
19503+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19504+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19505+ if (addr < TASK_SIZE_MAX)
19506+ descriptor[1] += pax_user_shadow_base;
19507+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19508+ }
19509+
19510+ descriptor[0] = PCID_USER;
19511+ descriptor[1] = addr;
19512+#endif
19513+
19514+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19515+ return;
19516+ }
19517+
19518+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19519+ if (static_cpu_has(X86_FEATURE_PCID)) {
19520+ unsigned int cpu = raw_get_cpu();
19521+
19522+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19523+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19524+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19525+ raw_put_cpu_no_resched();
19526+
19527+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19528+ addr += pax_user_shadow_base;
19529+ }
19530+#endif
19531+
19532 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19533 }
19534
19535diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19536index 0d592e0..526f797 100644
19537--- a/arch/x86/include/asm/uaccess.h
19538+++ b/arch/x86/include/asm/uaccess.h
19539@@ -7,6 +7,7 @@
19540 #include <linux/compiler.h>
19541 #include <linux/thread_info.h>
19542 #include <linux/string.h>
19543+#include <linux/spinlock.h>
19544 #include <asm/asm.h>
19545 #include <asm/page.h>
19546 #include <asm/smap.h>
19547@@ -29,7 +30,12 @@
19548
19549 #define get_ds() (KERNEL_DS)
19550 #define get_fs() (current_thread_info()->addr_limit)
19551+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19552+void __set_fs(mm_segment_t x);
19553+void set_fs(mm_segment_t x);
19554+#else
19555 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19556+#endif
19557
19558 #define segment_eq(a, b) ((a).seg == (b).seg)
19559
19560@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19561 * checks that the pointer is in the user space range - after calling
19562 * this function, memory access functions may still return -EFAULT.
19563 */
19564-#define access_ok(type, addr, size) \
19565- likely(!__range_not_ok(addr, size, user_addr_max()))
19566+extern int _cond_resched(void);
19567+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19568+#define access_ok(type, addr, size) \
19569+({ \
19570+ unsigned long __size = size; \
19571+ unsigned long __addr = (unsigned long)addr; \
19572+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19573+ if (__ret_ao && __size) { \
19574+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19575+ unsigned long __end_ao = __addr + __size - 1; \
19576+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19577+ while (__addr_ao <= __end_ao) { \
19578+ char __c_ao; \
19579+ __addr_ao += PAGE_SIZE; \
19580+ if (__size > PAGE_SIZE) \
19581+ _cond_resched(); \
19582+ if (__get_user(__c_ao, (char __user *)__addr)) \
19583+ break; \
19584+ if (type != VERIFY_WRITE) { \
19585+ __addr = __addr_ao; \
19586+ continue; \
19587+ } \
19588+ if (__put_user(__c_ao, (char __user *)__addr)) \
19589+ break; \
19590+ __addr = __addr_ao; \
19591+ } \
19592+ } \
19593+ } \
19594+ __ret_ao; \
19595+})
19596
19597 /*
19598 * The exception table consists of pairs of addresses relative to the
19599@@ -176,10 +210,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19600 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19601 __chk_user_ptr(ptr); \
19602 might_fault(); \
19603+ pax_open_userland(); \
19604 asm volatile("call __get_user_%P3" \
19605 : "=a" (__ret_gu), "=r" (__val_gu) \
19606 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19607 (x) = (__typeof__(*(ptr))) __val_gu; \
19608+ pax_close_userland(); \
19609 __ret_gu; \
19610 })
19611
19612@@ -187,13 +223,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19613 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19614 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19615
19616-
19617+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19618+#define __copyuser_seg "gs;"
19619+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19620+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19621+#else
19622+#define __copyuser_seg
19623+#define __COPYUSER_SET_ES
19624+#define __COPYUSER_RESTORE_ES
19625+#endif
19626
19627 #ifdef CONFIG_X86_32
19628 #define __put_user_asm_u64(x, addr, err, errret) \
19629 asm volatile(ASM_STAC "\n" \
19630- "1: movl %%eax,0(%2)\n" \
19631- "2: movl %%edx,4(%2)\n" \
19632+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19633+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19634 "3: " ASM_CLAC "\n" \
19635 ".section .fixup,\"ax\"\n" \
19636 "4: movl %3,%0\n" \
19637@@ -206,8 +250,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19638
19639 #define __put_user_asm_ex_u64(x, addr) \
19640 asm volatile(ASM_STAC "\n" \
19641- "1: movl %%eax,0(%1)\n" \
19642- "2: movl %%edx,4(%1)\n" \
19643+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19644+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19645 "3: " ASM_CLAC "\n" \
19646 _ASM_EXTABLE_EX(1b, 2b) \
19647 _ASM_EXTABLE_EX(2b, 3b) \
19648@@ -257,7 +301,8 @@ extern void __put_user_8(void);
19649 __typeof__(*(ptr)) __pu_val; \
19650 __chk_user_ptr(ptr); \
19651 might_fault(); \
19652- __pu_val = x; \
19653+ __pu_val = (x); \
19654+ pax_open_userland(); \
19655 switch (sizeof(*(ptr))) { \
19656 case 1: \
19657 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19658@@ -275,6 +320,7 @@ extern void __put_user_8(void);
19659 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19660 break; \
19661 } \
19662+ pax_close_userland(); \
19663 __ret_pu; \
19664 })
19665
19666@@ -355,8 +401,10 @@ do { \
19667 } while (0)
19668
19669 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19670+do { \
19671+ pax_open_userland(); \
19672 asm volatile(ASM_STAC "\n" \
19673- "1: mov"itype" %2,%"rtype"1\n" \
19674+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19675 "2: " ASM_CLAC "\n" \
19676 ".section .fixup,\"ax\"\n" \
19677 "3: mov %3,%0\n" \
19678@@ -364,8 +412,10 @@ do { \
19679 " jmp 2b\n" \
19680 ".previous\n" \
19681 _ASM_EXTABLE(1b, 3b) \
19682- : "=r" (err), ltype(x) \
19683- : "m" (__m(addr)), "i" (errret), "0" (err))
19684+ : "=r" (err), ltype (x) \
19685+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19686+ pax_close_userland(); \
19687+} while (0)
19688
19689 #define __get_user_size_ex(x, ptr, size) \
19690 do { \
19691@@ -389,7 +439,7 @@ do { \
19692 } while (0)
19693
19694 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19695- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19696+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19697 "2:\n" \
19698 _ASM_EXTABLE_EX(1b, 2b) \
19699 : ltype(x) : "m" (__m(addr)))
19700@@ -406,13 +456,24 @@ do { \
19701 int __gu_err; \
19702 unsigned long __gu_val; \
19703 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19704- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19705+ (x) = (__typeof__(*(ptr)))__gu_val; \
19706 __gu_err; \
19707 })
19708
19709 /* FIXME: this hack is definitely wrong -AK */
19710 struct __large_struct { unsigned long buf[100]; };
19711-#define __m(x) (*(struct __large_struct __user *)(x))
19712+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19713+#define ____m(x) \
19714+({ \
19715+ unsigned long ____x = (unsigned long)(x); \
19716+ if (____x < pax_user_shadow_base) \
19717+ ____x += pax_user_shadow_base; \
19718+ (typeof(x))____x; \
19719+})
19720+#else
19721+#define ____m(x) (x)
19722+#endif
19723+#define __m(x) (*(struct __large_struct __user *)____m(x))
19724
19725 /*
19726 * Tell gcc we read from memory instead of writing: this is because
19727@@ -420,8 +481,10 @@ struct __large_struct { unsigned long buf[100]; };
19728 * aliasing issues.
19729 */
19730 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19731+do { \
19732+ pax_open_userland(); \
19733 asm volatile(ASM_STAC "\n" \
19734- "1: mov"itype" %"rtype"1,%2\n" \
19735+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19736 "2: " ASM_CLAC "\n" \
19737 ".section .fixup,\"ax\"\n" \
19738 "3: mov %3,%0\n" \
19739@@ -429,10 +492,12 @@ struct __large_struct { unsigned long buf[100]; };
19740 ".previous\n" \
19741 _ASM_EXTABLE(1b, 3b) \
19742 : "=r"(err) \
19743- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19744+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19745+ pax_close_userland(); \
19746+} while (0)
19747
19748 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19749- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19750+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19751 "2:\n" \
19752 _ASM_EXTABLE_EX(1b, 2b) \
19753 : : ltype(x), "m" (__m(addr)))
19754@@ -442,11 +507,13 @@ struct __large_struct { unsigned long buf[100]; };
19755 */
19756 #define uaccess_try do { \
19757 current_thread_info()->uaccess_err = 0; \
19758+ pax_open_userland(); \
19759 stac(); \
19760 barrier();
19761
19762 #define uaccess_catch(err) \
19763 clac(); \
19764+ pax_close_userland(); \
19765 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19766 } while (0)
19767
19768@@ -471,8 +538,12 @@ struct __large_struct { unsigned long buf[100]; };
19769 * On error, the variable @x is set to zero.
19770 */
19771
19772+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19773+#define __get_user(x, ptr) get_user((x), (ptr))
19774+#else
19775 #define __get_user(x, ptr) \
19776 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19777+#endif
19778
19779 /**
19780 * __put_user: - Write a simple value into user space, with less checking.
19781@@ -494,8 +565,12 @@ struct __large_struct { unsigned long buf[100]; };
19782 * Returns zero on success, or -EFAULT on error.
19783 */
19784
19785+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19786+#define __put_user(x, ptr) put_user((x), (ptr))
19787+#else
19788 #define __put_user(x, ptr) \
19789 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19790+#endif
19791
19792 #define __get_user_unaligned __get_user
19793 #define __put_user_unaligned __put_user
19794@@ -513,7 +588,7 @@ struct __large_struct { unsigned long buf[100]; };
19795 #define get_user_ex(x, ptr) do { \
19796 unsigned long __gue_val; \
19797 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19798- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19799+ (x) = (__typeof__(*(ptr)))__gue_val; \
19800 } while (0)
19801
19802 #define put_user_try uaccess_try
19803@@ -542,18 +617,19 @@ extern void __cmpxchg_wrong_size(void)
19804 __typeof__(ptr) __uval = (uval); \
19805 __typeof__(*(ptr)) __old = (old); \
19806 __typeof__(*(ptr)) __new = (new); \
19807+ pax_open_userland(); \
19808 switch (size) { \
19809 case 1: \
19810 { \
19811 asm volatile("\t" ASM_STAC "\n" \
19812- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19813+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19814 "2:\t" ASM_CLAC "\n" \
19815 "\t.section .fixup, \"ax\"\n" \
19816 "3:\tmov %3, %0\n" \
19817 "\tjmp 2b\n" \
19818 "\t.previous\n" \
19819 _ASM_EXTABLE(1b, 3b) \
19820- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19821+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19822 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19823 : "memory" \
19824 ); \
19825@@ -562,14 +638,14 @@ extern void __cmpxchg_wrong_size(void)
19826 case 2: \
19827 { \
19828 asm volatile("\t" ASM_STAC "\n" \
19829- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19830+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19831 "2:\t" ASM_CLAC "\n" \
19832 "\t.section .fixup, \"ax\"\n" \
19833 "3:\tmov %3, %0\n" \
19834 "\tjmp 2b\n" \
19835 "\t.previous\n" \
19836 _ASM_EXTABLE(1b, 3b) \
19837- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19838+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19839 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19840 : "memory" \
19841 ); \
19842@@ -578,14 +654,14 @@ extern void __cmpxchg_wrong_size(void)
19843 case 4: \
19844 { \
19845 asm volatile("\t" ASM_STAC "\n" \
19846- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19847+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19848 "2:\t" ASM_CLAC "\n" \
19849 "\t.section .fixup, \"ax\"\n" \
19850 "3:\tmov %3, %0\n" \
19851 "\tjmp 2b\n" \
19852 "\t.previous\n" \
19853 _ASM_EXTABLE(1b, 3b) \
19854- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19855+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19856 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19857 : "memory" \
19858 ); \
19859@@ -597,14 +673,14 @@ extern void __cmpxchg_wrong_size(void)
19860 __cmpxchg_wrong_size(); \
19861 \
19862 asm volatile("\t" ASM_STAC "\n" \
19863- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19864+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19865 "2:\t" ASM_CLAC "\n" \
19866 "\t.section .fixup, \"ax\"\n" \
19867 "3:\tmov %3, %0\n" \
19868 "\tjmp 2b\n" \
19869 "\t.previous\n" \
19870 _ASM_EXTABLE(1b, 3b) \
19871- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19872+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19873 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19874 : "memory" \
19875 ); \
19876@@ -613,6 +689,7 @@ extern void __cmpxchg_wrong_size(void)
19877 default: \
19878 __cmpxchg_wrong_size(); \
19879 } \
19880+ pax_close_userland(); \
19881 *__uval = __old; \
19882 __ret; \
19883 })
19884@@ -636,17 +713,6 @@ extern struct movsl_mask {
19885
19886 #define ARCH_HAS_NOCACHE_UACCESS 1
19887
19888-#ifdef CONFIG_X86_32
19889-# include <asm/uaccess_32.h>
19890-#else
19891-# include <asm/uaccess_64.h>
19892-#endif
19893-
19894-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19895- unsigned n);
19896-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19897- unsigned n);
19898-
19899 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19900 # define copy_user_diag __compiletime_error
19901 #else
19902@@ -656,7 +722,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19903 extern void copy_user_diag("copy_from_user() buffer size is too small")
19904 copy_from_user_overflow(void);
19905 extern void copy_user_diag("copy_to_user() buffer size is too small")
19906-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19907+copy_to_user_overflow(void);
19908
19909 #undef copy_user_diag
19910
19911@@ -669,7 +735,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19912
19913 extern void
19914 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19915-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19916+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19917 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19918
19919 #else
19920@@ -684,10 +750,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19921
19922 #endif
19923
19924+#ifdef CONFIG_X86_32
19925+# include <asm/uaccess_32.h>
19926+#else
19927+# include <asm/uaccess_64.h>
19928+#endif
19929+
19930 static inline unsigned long __must_check
19931 copy_from_user(void *to, const void __user *from, unsigned long n)
19932 {
19933- int sz = __compiletime_object_size(to);
19934+ size_t sz = __compiletime_object_size(to);
19935
19936 might_fault();
19937
19938@@ -709,12 +781,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19939 * case, and do only runtime checking for non-constant sizes.
19940 */
19941
19942- if (likely(sz < 0 || sz >= n))
19943- n = _copy_from_user(to, from, n);
19944- else if(__builtin_constant_p(n))
19945- copy_from_user_overflow();
19946- else
19947- __copy_from_user_overflow(sz, n);
19948+ if (likely(sz != (size_t)-1 && sz < n)) {
19949+ if(__builtin_constant_p(n))
19950+ copy_from_user_overflow();
19951+ else
19952+ __copy_from_user_overflow(sz, n);
19953+ } else if (access_ok(VERIFY_READ, from, n))
19954+ n = __copy_from_user(to, from, n);
19955+ else if ((long)n > 0)
19956+ memset(to, 0, n);
19957
19958 return n;
19959 }
19960@@ -722,17 +797,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19961 static inline unsigned long __must_check
19962 copy_to_user(void __user *to, const void *from, unsigned long n)
19963 {
19964- int sz = __compiletime_object_size(from);
19965+ size_t sz = __compiletime_object_size(from);
19966
19967 might_fault();
19968
19969 /* See the comment in copy_from_user() above. */
19970- if (likely(sz < 0 || sz >= n))
19971- n = _copy_to_user(to, from, n);
19972- else if(__builtin_constant_p(n))
19973- copy_to_user_overflow();
19974- else
19975- __copy_to_user_overflow(sz, n);
19976+ if (likely(sz != (size_t)-1 && sz < n)) {
19977+ if(__builtin_constant_p(n))
19978+ copy_to_user_overflow();
19979+ else
19980+ __copy_to_user_overflow(sz, n);
19981+ } else if (access_ok(VERIFY_WRITE, to, n))
19982+ n = __copy_to_user(to, from, n);
19983
19984 return n;
19985 }
19986diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
19987index 3c03a5d..1071638 100644
19988--- a/arch/x86/include/asm/uaccess_32.h
19989+++ b/arch/x86/include/asm/uaccess_32.h
19990@@ -43,6 +43,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
19991 static __always_inline unsigned long __must_check
19992 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
19993 {
19994+ if ((long)n < 0)
19995+ return n;
19996+
19997+ check_object_size(from, n, true);
19998+
19999 if (__builtin_constant_p(n)) {
20000 unsigned long ret;
20001
20002@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20003 __copy_to_user(void __user *to, const void *from, unsigned long n)
20004 {
20005 might_fault();
20006+
20007 return __copy_to_user_inatomic(to, from, n);
20008 }
20009
20010 static __always_inline unsigned long
20011 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20012 {
20013+ if ((long)n < 0)
20014+ return n;
20015+
20016 /* Avoid zeroing the tail if the copy fails..
20017 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20018 * but as the zeroing behaviour is only significant when n is not
20019@@ -137,6 +146,12 @@ static __always_inline unsigned long
20020 __copy_from_user(void *to, const void __user *from, unsigned long n)
20021 {
20022 might_fault();
20023+
20024+ if ((long)n < 0)
20025+ return n;
20026+
20027+ check_object_size(to, n, false);
20028+
20029 if (__builtin_constant_p(n)) {
20030 unsigned long ret;
20031
20032@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20033 const void __user *from, unsigned long n)
20034 {
20035 might_fault();
20036+
20037+ if ((long)n < 0)
20038+ return n;
20039+
20040 if (__builtin_constant_p(n)) {
20041 unsigned long ret;
20042
20043@@ -181,7 +200,10 @@ static __always_inline unsigned long
20044 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20045 unsigned long n)
20046 {
20047- return __copy_from_user_ll_nocache_nozero(to, from, n);
20048+ if ((long)n < 0)
20049+ return n;
20050+
20051+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20052 }
20053
20054 #endif /* _ASM_X86_UACCESS_32_H */
20055diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20056index 12a26b9..206c200 100644
20057--- a/arch/x86/include/asm/uaccess_64.h
20058+++ b/arch/x86/include/asm/uaccess_64.h
20059@@ -10,6 +10,9 @@
20060 #include <asm/alternative.h>
20061 #include <asm/cpufeature.h>
20062 #include <asm/page.h>
20063+#include <asm/pgtable.h>
20064+
20065+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20066
20067 /*
20068 * Copy To/From Userspace
20069@@ -17,14 +20,14 @@
20070
20071 /* Handles exceptions in both to and from, but doesn't do access_ok */
20072 __must_check unsigned long
20073-copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
20074+copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
20075 __must_check unsigned long
20076-copy_user_generic_string(void *to, const void *from, unsigned len);
20077+copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
20078 __must_check unsigned long
20079-copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20080+copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
20081
20082 static __always_inline __must_check unsigned long
20083-copy_user_generic(void *to, const void *from, unsigned len)
20084+copy_user_generic(void *to, const void *from, unsigned long len)
20085 {
20086 unsigned ret;
20087
20088@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20089 }
20090
20091 __must_check unsigned long
20092-copy_in_user(void __user *to, const void __user *from, unsigned len);
20093+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20094
20095 static __always_inline __must_check
20096-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20097+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20098 {
20099- int ret = 0;
20100+ size_t sz = __compiletime_object_size(dst);
20101+ unsigned ret = 0;
20102+
20103+ if (size > INT_MAX)
20104+ return size;
20105+
20106+ check_object_size(dst, size, false);
20107+
20108+#ifdef CONFIG_PAX_MEMORY_UDEREF
20109+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20110+ return size;
20111+#endif
20112+
20113+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20114+ if(__builtin_constant_p(size))
20115+ copy_from_user_overflow();
20116+ else
20117+ __copy_from_user_overflow(sz, size);
20118+ return size;
20119+ }
20120
20121 if (!__builtin_constant_p(size))
20122- return copy_user_generic(dst, (__force void *)src, size);
20123+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20124 switch (size) {
20125- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20126+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20127 ret, "b", "b", "=q", 1);
20128 return ret;
20129- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20130+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20131 ret, "w", "w", "=r", 2);
20132 return ret;
20133- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20134+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20135 ret, "l", "k", "=r", 4);
20136 return ret;
20137- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20138+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20139 ret, "q", "", "=r", 8);
20140 return ret;
20141 case 10:
20142- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20143+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20144 ret, "q", "", "=r", 10);
20145 if (unlikely(ret))
20146 return ret;
20147 __get_user_asm(*(u16 *)(8 + (char *)dst),
20148- (u16 __user *)(8 + (char __user *)src),
20149+ (const u16 __user *)(8 + (const char __user *)src),
20150 ret, "w", "w", "=r", 2);
20151 return ret;
20152 case 16:
20153- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20154+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20155 ret, "q", "", "=r", 16);
20156 if (unlikely(ret))
20157 return ret;
20158 __get_user_asm(*(u64 *)(8 + (char *)dst),
20159- (u64 __user *)(8 + (char __user *)src),
20160+ (const u64 __user *)(8 + (const char __user *)src),
20161 ret, "q", "", "=r", 8);
20162 return ret;
20163 default:
20164- return copy_user_generic(dst, (__force void *)src, size);
20165+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20166 }
20167 }
20168
20169 static __always_inline __must_check
20170-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20171+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20172 {
20173 might_fault();
20174 return __copy_from_user_nocheck(dst, src, size);
20175 }
20176
20177 static __always_inline __must_check
20178-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20179+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20180 {
20181- int ret = 0;
20182+ size_t sz = __compiletime_object_size(src);
20183+ unsigned ret = 0;
20184+
20185+ if (size > INT_MAX)
20186+ return size;
20187+
20188+ check_object_size(src, size, true);
20189+
20190+#ifdef CONFIG_PAX_MEMORY_UDEREF
20191+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20192+ return size;
20193+#endif
20194+
20195+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20196+ if(__builtin_constant_p(size))
20197+ copy_to_user_overflow();
20198+ else
20199+ __copy_to_user_overflow(sz, size);
20200+ return size;
20201+ }
20202
20203 if (!__builtin_constant_p(size))
20204- return copy_user_generic((__force void *)dst, src, size);
20205+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20206 switch (size) {
20207- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20208+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20209 ret, "b", "b", "iq", 1);
20210 return ret;
20211- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20212+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20213 ret, "w", "w", "ir", 2);
20214 return ret;
20215- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20216+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20217 ret, "l", "k", "ir", 4);
20218 return ret;
20219- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20220+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20221 ret, "q", "", "er", 8);
20222 return ret;
20223 case 10:
20224- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20225+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20226 ret, "q", "", "er", 10);
20227 if (unlikely(ret))
20228 return ret;
20229 asm("":::"memory");
20230- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20231+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20232 ret, "w", "w", "ir", 2);
20233 return ret;
20234 case 16:
20235- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20236+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20237 ret, "q", "", "er", 16);
20238 if (unlikely(ret))
20239 return ret;
20240 asm("":::"memory");
20241- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20242+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20243 ret, "q", "", "er", 8);
20244 return ret;
20245 default:
20246- return copy_user_generic((__force void *)dst, src, size);
20247+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20248 }
20249 }
20250
20251 static __always_inline __must_check
20252-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20253+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20254 {
20255 might_fault();
20256 return __copy_to_user_nocheck(dst, src, size);
20257 }
20258
20259 static __always_inline __must_check
20260-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20261+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20262 {
20263- int ret = 0;
20264+ unsigned ret = 0;
20265
20266 might_fault();
20267+
20268+ if (size > INT_MAX)
20269+ return size;
20270+
20271+#ifdef CONFIG_PAX_MEMORY_UDEREF
20272+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20273+ return size;
20274+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20275+ return size;
20276+#endif
20277+
20278 if (!__builtin_constant_p(size))
20279- return copy_user_generic((__force void *)dst,
20280- (__force void *)src, size);
20281+ return copy_user_generic((__force_kernel void *)____m(dst),
20282+ (__force_kernel const void *)____m(src), size);
20283 switch (size) {
20284 case 1: {
20285 u8 tmp;
20286- __get_user_asm(tmp, (u8 __user *)src,
20287+ __get_user_asm(tmp, (const u8 __user *)src,
20288 ret, "b", "b", "=q", 1);
20289 if (likely(!ret))
20290 __put_user_asm(tmp, (u8 __user *)dst,
20291@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20292 }
20293 case 2: {
20294 u16 tmp;
20295- __get_user_asm(tmp, (u16 __user *)src,
20296+ __get_user_asm(tmp, (const u16 __user *)src,
20297 ret, "w", "w", "=r", 2);
20298 if (likely(!ret))
20299 __put_user_asm(tmp, (u16 __user *)dst,
20300@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20301
20302 case 4: {
20303 u32 tmp;
20304- __get_user_asm(tmp, (u32 __user *)src,
20305+ __get_user_asm(tmp, (const u32 __user *)src,
20306 ret, "l", "k", "=r", 4);
20307 if (likely(!ret))
20308 __put_user_asm(tmp, (u32 __user *)dst,
20309@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20310 }
20311 case 8: {
20312 u64 tmp;
20313- __get_user_asm(tmp, (u64 __user *)src,
20314+ __get_user_asm(tmp, (const u64 __user *)src,
20315 ret, "q", "", "=r", 8);
20316 if (likely(!ret))
20317 __put_user_asm(tmp, (u64 __user *)dst,
20318@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20319 return ret;
20320 }
20321 default:
20322- return copy_user_generic((__force void *)dst,
20323- (__force void *)src, size);
20324+ return copy_user_generic((__force_kernel void *)____m(dst),
20325+ (__force_kernel const void *)____m(src), size);
20326 }
20327 }
20328
20329-static __must_check __always_inline int
20330-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20331+static __must_check __always_inline unsigned long
20332+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20333 {
20334 return __copy_from_user_nocheck(dst, src, size);
20335 }
20336
20337-static __must_check __always_inline int
20338-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20339+static __must_check __always_inline unsigned long
20340+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20341 {
20342 return __copy_to_user_nocheck(dst, src, size);
20343 }
20344
20345-extern long __copy_user_nocache(void *dst, const void __user *src,
20346- unsigned size, int zerorest);
20347+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20348+ unsigned long size, int zerorest);
20349
20350-static inline int
20351-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20352+static inline unsigned long
20353+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20354 {
20355 might_fault();
20356+
20357+ if (size > INT_MAX)
20358+ return size;
20359+
20360+#ifdef CONFIG_PAX_MEMORY_UDEREF
20361+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20362+ return size;
20363+#endif
20364+
20365 return __copy_user_nocache(dst, src, size, 1);
20366 }
20367
20368-static inline int
20369+static inline unsigned long
20370 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20371- unsigned size)
20372+ unsigned long size)
20373 {
20374+ if (size > INT_MAX)
20375+ return size;
20376+
20377+#ifdef CONFIG_PAX_MEMORY_UDEREF
20378+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20379+ return size;
20380+#endif
20381+
20382 return __copy_user_nocache(dst, src, size, 0);
20383 }
20384
20385 unsigned long
20386-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
20387+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
20388
20389 #endif /* _ASM_X86_UACCESS_64_H */
20390diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20391index 5b238981..77fdd78 100644
20392--- a/arch/x86/include/asm/word-at-a-time.h
20393+++ b/arch/x86/include/asm/word-at-a-time.h
20394@@ -11,7 +11,7 @@
20395 * and shift, for example.
20396 */
20397 struct word_at_a_time {
20398- const unsigned long one_bits, high_bits;
20399+ unsigned long one_bits, high_bits;
20400 };
20401
20402 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20403diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20404index e45e4da..44e8572 100644
20405--- a/arch/x86/include/asm/x86_init.h
20406+++ b/arch/x86/include/asm/x86_init.h
20407@@ -129,7 +129,7 @@ struct x86_init_ops {
20408 struct x86_init_timers timers;
20409 struct x86_init_iommu iommu;
20410 struct x86_init_pci pci;
20411-};
20412+} __no_const;
20413
20414 /**
20415 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20416@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20417 void (*setup_percpu_clockev)(void);
20418 void (*early_percpu_clock_init)(void);
20419 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20420-};
20421+} __no_const;
20422
20423 struct timespec;
20424
20425@@ -168,7 +168,7 @@ struct x86_platform_ops {
20426 void (*save_sched_clock_state)(void);
20427 void (*restore_sched_clock_state)(void);
20428 void (*apic_post_init)(void);
20429-};
20430+} __no_const;
20431
20432 struct pci_dev;
20433 struct msi_msg;
20434@@ -185,7 +185,7 @@ struct x86_msi_ops {
20435 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20436 u32 (*msi_mask_irq)(struct msi_desc *desc, u32 mask, u32 flag);
20437 u32 (*msix_mask_irq)(struct msi_desc *desc, u32 flag);
20438-};
20439+} __no_const;
20440
20441 struct IO_APIC_route_entry;
20442 struct io_apic_irq_attr;
20443@@ -206,7 +206,7 @@ struct x86_io_apic_ops {
20444 unsigned int destination, int vector,
20445 struct io_apic_irq_attr *attr);
20446 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20447-};
20448+} __no_const;
20449
20450 extern struct x86_init_ops x86_init;
20451 extern struct x86_cpuinit_ops x86_cpuinit;
20452diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20453index c949923..c22bfa4 100644
20454--- a/arch/x86/include/asm/xen/page.h
20455+++ b/arch/x86/include/asm/xen/page.h
20456@@ -63,7 +63,7 @@ extern int m2p_remove_override(struct page *page,
20457 extern struct page *m2p_find_override(unsigned long mfn);
20458 extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
20459
20460-static inline unsigned long pfn_to_mfn(unsigned long pfn)
20461+static inline unsigned long __intentional_overflow(-1) pfn_to_mfn(unsigned long pfn)
20462 {
20463 unsigned long mfn;
20464
20465diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20466index 7e7a79a..0824666 100644
20467--- a/arch/x86/include/asm/xsave.h
20468+++ b/arch/x86/include/asm/xsave.h
20469@@ -228,12 +228,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20470 if (unlikely(err))
20471 return -EFAULT;
20472
20473+ pax_open_userland();
20474 __asm__ __volatile__(ASM_STAC "\n"
20475- "1:"XSAVE"\n"
20476+ "1:"
20477+ __copyuser_seg
20478+ XSAVE"\n"
20479 "2: " ASM_CLAC "\n"
20480 xstate_fault
20481 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20482 : "memory");
20483+ pax_close_userland();
20484 return err;
20485 }
20486
20487@@ -243,16 +247,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20488 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20489 {
20490 int err = 0;
20491- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20492+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20493 u32 lmask = mask;
20494 u32 hmask = mask >> 32;
20495
20496+ pax_open_userland();
20497 __asm__ __volatile__(ASM_STAC "\n"
20498- "1:"XRSTOR"\n"
20499+ "1:"
20500+ __copyuser_seg
20501+ XRSTOR"\n"
20502 "2: " ASM_CLAC "\n"
20503 xstate_fault
20504 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20505 : "memory"); /* memory required? */
20506+ pax_close_userland();
20507 return err;
20508 }
20509
20510diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20511index d993e33..8db1b18 100644
20512--- a/arch/x86/include/uapi/asm/e820.h
20513+++ b/arch/x86/include/uapi/asm/e820.h
20514@@ -58,7 +58,7 @@ struct e820map {
20515 #define ISA_START_ADDRESS 0xa0000
20516 #define ISA_END_ADDRESS 0x100000
20517
20518-#define BIOS_BEGIN 0x000a0000
20519+#define BIOS_BEGIN 0x000c0000
20520 #define BIOS_END 0x00100000
20521
20522 #define BIOS_ROM_BASE 0xffe00000
20523diff --git a/arch/x86/include/uapi/asm/ldt.h b/arch/x86/include/uapi/asm/ldt.h
20524index 46727eb..6e1aaf7 100644
20525--- a/arch/x86/include/uapi/asm/ldt.h
20526+++ b/arch/x86/include/uapi/asm/ldt.h
20527@@ -28,6 +28,13 @@ struct user_desc {
20528 unsigned int seg_not_present:1;
20529 unsigned int useable:1;
20530 #ifdef __x86_64__
20531+ /*
20532+ * Because this bit is not present in 32-bit user code, user
20533+ * programs can pass uninitialized values here. Therefore, in
20534+ * any context in which a user_desc comes from a 32-bit program,
20535+ * the kernel must act as though lm == 0, regardless of the
20536+ * actual value.
20537+ */
20538 unsigned int lm:1;
20539 #endif
20540 };
20541diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20542index 7b0a55a..ad115bf 100644
20543--- a/arch/x86/include/uapi/asm/ptrace-abi.h
20544+++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20545@@ -49,7 +49,6 @@
20546 #define EFLAGS 144
20547 #define RSP 152
20548 #define SS 160
20549-#define ARGOFFSET R11
20550 #endif /* __ASSEMBLY__ */
20551
20552 /* top of stack page */
20553diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20554index 8f1e774..9b4c381 100644
20555--- a/arch/x86/kernel/Makefile
20556+++ b/arch/x86/kernel/Makefile
20557@@ -24,7 +24,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20558 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20559 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20560 obj-y += probe_roms.o
20561-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20562+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20563 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20564 obj-$(CONFIG_X86_64) += mcount_64.o
20565 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20566diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20567index a142e77..6222cdd 100644
20568--- a/arch/x86/kernel/acpi/boot.c
20569+++ b/arch/x86/kernel/acpi/boot.c
20570@@ -1276,7 +1276,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
20571 * If your system is blacklisted here, but you find that acpi=force
20572 * works for you, please contact linux-acpi@vger.kernel.org
20573 */
20574-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20575+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20576 /*
20577 * Boxes that need ACPI disabled
20578 */
20579@@ -1351,7 +1351,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20580 };
20581
20582 /* second table for DMI checks that should run after early-quirks */
20583-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20584+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20585 /*
20586 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20587 * which includes some code which overrides all temperature
20588diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20589index 3136820..e2c6577 100644
20590--- a/arch/x86/kernel/acpi/sleep.c
20591+++ b/arch/x86/kernel/acpi/sleep.c
20592@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20593 #else /* CONFIG_64BIT */
20594 #ifdef CONFIG_SMP
20595 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20596+
20597+ pax_open_kernel();
20598 early_gdt_descr.address =
20599 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20600+ pax_close_kernel();
20601+
20602 initial_gs = per_cpu_offset(smp_processor_id());
20603 #endif
20604 initial_code = (unsigned long)wakeup_long64;
20605diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20606index 665c6b7..eae4d56 100644
20607--- a/arch/x86/kernel/acpi/wakeup_32.S
20608+++ b/arch/x86/kernel/acpi/wakeup_32.S
20609@@ -29,13 +29,11 @@ wakeup_pmode_return:
20610 # and restore the stack ... but you need gdt for this to work
20611 movl saved_context_esp, %esp
20612
20613- movl %cs:saved_magic, %eax
20614- cmpl $0x12345678, %eax
20615+ cmpl $0x12345678, saved_magic
20616 jne bogus_magic
20617
20618 # jump to place where we left off
20619- movl saved_eip, %eax
20620- jmp *%eax
20621+ jmp *(saved_eip)
20622
20623 bogus_magic:
20624 jmp bogus_magic
20625diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20626index 703130f..27a155d 100644
20627--- a/arch/x86/kernel/alternative.c
20628+++ b/arch/x86/kernel/alternative.c
20629@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20630 */
20631 for (a = start; a < end; a++) {
20632 instr = (u8 *)&a->instr_offset + a->instr_offset;
20633+
20634+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20635+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20636+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20637+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20638+#endif
20639+
20640 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20641 BUG_ON(a->replacementlen > a->instrlen);
20642 BUG_ON(a->instrlen > sizeof(insnbuf));
20643@@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20644 add_nops(insnbuf + a->replacementlen,
20645 a->instrlen - a->replacementlen);
20646
20647+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20648+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20649+ instr = ktva_ktla(instr);
20650+#endif
20651+
20652 text_poke_early(instr, insnbuf, a->instrlen);
20653 }
20654 }
20655@@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20656 for (poff = start; poff < end; poff++) {
20657 u8 *ptr = (u8 *)poff + *poff;
20658
20659+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20660+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20661+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20662+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20663+#endif
20664+
20665 if (!*poff || ptr < text || ptr >= text_end)
20666 continue;
20667 /* turn DS segment override prefix into lock prefix */
20668- if (*ptr == 0x3e)
20669+ if (*ktla_ktva(ptr) == 0x3e)
20670 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20671 }
20672 mutex_unlock(&text_mutex);
20673@@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20674 for (poff = start; poff < end; poff++) {
20675 u8 *ptr = (u8 *)poff + *poff;
20676
20677+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20678+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20679+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20680+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20681+#endif
20682+
20683 if (!*poff || ptr < text || ptr >= text_end)
20684 continue;
20685 /* turn lock prefix into DS segment override prefix */
20686- if (*ptr == 0xf0)
20687+ if (*ktla_ktva(ptr) == 0xf0)
20688 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20689 }
20690 mutex_unlock(&text_mutex);
20691@@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20692
20693 BUG_ON(p->len > MAX_PATCH_LEN);
20694 /* prep the buffer with the original instructions */
20695- memcpy(insnbuf, p->instr, p->len);
20696+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20697 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20698 (unsigned long)p->instr, p->len);
20699
20700@@ -504,7 +528,7 @@ void __init alternative_instructions(void)
20701 if (!uniproc_patched || num_possible_cpus() == 1)
20702 free_init_pages("SMP alternatives",
20703 (unsigned long)__smp_locks,
20704- (unsigned long)__smp_locks_end);
20705+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20706 #endif
20707
20708 apply_paravirt(__parainstructions, __parainstructions_end);
20709@@ -524,13 +548,17 @@ void __init alternative_instructions(void)
20710 * instructions. And on the local CPU you need to be protected again NMI or MCE
20711 * handlers seeing an inconsistent instruction while you patch.
20712 */
20713-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20714+void *__kprobes text_poke_early(void *addr, const void *opcode,
20715 size_t len)
20716 {
20717 unsigned long flags;
20718 local_irq_save(flags);
20719- memcpy(addr, opcode, len);
20720+
20721+ pax_open_kernel();
20722+ memcpy(ktla_ktva(addr), opcode, len);
20723 sync_core();
20724+ pax_close_kernel();
20725+
20726 local_irq_restore(flags);
20727 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20728 that causes hangs on some VIA CPUs. */
20729@@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20730 */
20731 void *text_poke(void *addr, const void *opcode, size_t len)
20732 {
20733- unsigned long flags;
20734- char *vaddr;
20735+ unsigned char *vaddr = ktla_ktva(addr);
20736 struct page *pages[2];
20737- int i;
20738+ size_t i;
20739
20740 if (!core_kernel_text((unsigned long)addr)) {
20741- pages[0] = vmalloc_to_page(addr);
20742- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20743+ pages[0] = vmalloc_to_page(vaddr);
20744+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20745 } else {
20746- pages[0] = virt_to_page(addr);
20747+ pages[0] = virt_to_page(vaddr);
20748 WARN_ON(!PageReserved(pages[0]));
20749- pages[1] = virt_to_page(addr + PAGE_SIZE);
20750+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20751 }
20752 BUG_ON(!pages[0]);
20753- local_irq_save(flags);
20754- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20755- if (pages[1])
20756- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20757- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20758- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20759- clear_fixmap(FIX_TEXT_POKE0);
20760- if (pages[1])
20761- clear_fixmap(FIX_TEXT_POKE1);
20762- local_flush_tlb();
20763- sync_core();
20764- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20765- that causes hangs on some VIA CPUs. */
20766+ text_poke_early(addr, opcode, len);
20767 for (i = 0; i < len; i++)
20768- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20769- local_irq_restore(flags);
20770+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20771 return addr;
20772 }
20773
20774@@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
20775 if (likely(!bp_patching_in_progress))
20776 return 0;
20777
20778- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20779+ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20780 return 0;
20781
20782 /* set up the specified breakpoint handler */
20783@@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
20784 */
20785 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20786 {
20787- unsigned char int3 = 0xcc;
20788+ const unsigned char int3 = 0xcc;
20789
20790 bp_int3_handler = handler;
20791 bp_int3_addr = (u8 *)addr + sizeof(int3);
20792diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20793index ba6cc04..06fd971 100644
20794--- a/arch/x86/kernel/apic/apic.c
20795+++ b/arch/x86/kernel/apic/apic.c
20796@@ -201,7 +201,7 @@ int first_system_vector = 0xfe;
20797 /*
20798 * Debug level, exported for io_apic.c
20799 */
20800-unsigned int apic_verbosity;
20801+int apic_verbosity;
20802
20803 int pic_mode;
20804
20805@@ -1989,7 +1989,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20806 apic_write(APIC_ESR, 0);
20807 v = apic_read(APIC_ESR);
20808 ack_APIC_irq();
20809- atomic_inc(&irq_err_count);
20810+ atomic_inc_unchecked(&irq_err_count);
20811
20812 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20813 smp_processor_id(), v);
20814diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20815index de918c4..32eed23 100644
20816--- a/arch/x86/kernel/apic/apic_flat_64.c
20817+++ b/arch/x86/kernel/apic/apic_flat_64.c
20818@@ -154,7 +154,7 @@ static int flat_probe(void)
20819 return 1;
20820 }
20821
20822-static struct apic apic_flat = {
20823+static struct apic apic_flat __read_only = {
20824 .name = "flat",
20825 .probe = flat_probe,
20826 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20827@@ -260,7 +260,7 @@ static int physflat_probe(void)
20828 return 0;
20829 }
20830
20831-static struct apic apic_physflat = {
20832+static struct apic apic_physflat __read_only = {
20833
20834 .name = "physical flat",
20835 .probe = physflat_probe,
20836diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20837index b205cdb..d8503ff 100644
20838--- a/arch/x86/kernel/apic/apic_noop.c
20839+++ b/arch/x86/kernel/apic/apic_noop.c
20840@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20841 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20842 }
20843
20844-struct apic apic_noop = {
20845+struct apic apic_noop __read_only = {
20846 .name = "noop",
20847 .probe = noop_probe,
20848 .acpi_madt_oem_check = NULL,
20849diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20850index c4a8d63..fe893ac 100644
20851--- a/arch/x86/kernel/apic/bigsmp_32.c
20852+++ b/arch/x86/kernel/apic/bigsmp_32.c
20853@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20854 return dmi_bigsmp;
20855 }
20856
20857-static struct apic apic_bigsmp = {
20858+static struct apic apic_bigsmp __read_only = {
20859
20860 .name = "bigsmp",
20861 .probe = probe_bigsmp,
20862diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20863index 1183d54..6158e47 100644
20864--- a/arch/x86/kernel/apic/io_apic.c
20865+++ b/arch/x86/kernel/apic/io_apic.c
20866@@ -1230,7 +1230,7 @@ out:
20867 }
20868 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
20869
20870-void lock_vector_lock(void)
20871+void lock_vector_lock(void) __acquires(vector_lock)
20872 {
20873 /* Used to the online set of cpus does not change
20874 * during assign_irq_vector.
20875@@ -1238,7 +1238,7 @@ void lock_vector_lock(void)
20876 raw_spin_lock(&vector_lock);
20877 }
20878
20879-void unlock_vector_lock(void)
20880+void unlock_vector_lock(void) __releases(vector_lock)
20881 {
20882 raw_spin_unlock(&vector_lock);
20883 }
20884@@ -2465,7 +2465,7 @@ static void ack_apic_edge(struct irq_data *data)
20885 ack_APIC_irq();
20886 }
20887
20888-atomic_t irq_mis_count;
20889+atomic_unchecked_t irq_mis_count;
20890
20891 #ifdef CONFIG_GENERIC_PENDING_IRQ
20892 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20893@@ -2606,7 +2606,7 @@ static void ack_apic_level(struct irq_data *data)
20894 * at the cpu.
20895 */
20896 if (!(v & (1 << (i & 0x1f)))) {
20897- atomic_inc(&irq_mis_count);
20898+ atomic_inc_unchecked(&irq_mis_count);
20899
20900 eoi_ioapic_irq(irq, cfg);
20901 }
20902diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20903index bda4886..f9c7195 100644
20904--- a/arch/x86/kernel/apic/probe_32.c
20905+++ b/arch/x86/kernel/apic/probe_32.c
20906@@ -72,7 +72,7 @@ static int probe_default(void)
20907 return 1;
20908 }
20909
20910-static struct apic apic_default = {
20911+static struct apic apic_default __read_only = {
20912
20913 .name = "default",
20914 .probe = probe_default,
20915diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20916index e658f21..b695a1a 100644
20917--- a/arch/x86/kernel/apic/x2apic_cluster.c
20918+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20919@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20920 return notifier_from_errno(err);
20921 }
20922
20923-static struct notifier_block __refdata x2apic_cpu_notifier = {
20924+static struct notifier_block x2apic_cpu_notifier = {
20925 .notifier_call = update_clusterinfo,
20926 };
20927
20928@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20929 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20930 }
20931
20932-static struct apic apic_x2apic_cluster = {
20933+static struct apic apic_x2apic_cluster __read_only = {
20934
20935 .name = "cluster x2apic",
20936 .probe = x2apic_cluster_probe,
20937diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20938index 6fae733..5ca17af 100644
20939--- a/arch/x86/kernel/apic/x2apic_phys.c
20940+++ b/arch/x86/kernel/apic/x2apic_phys.c
20941@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20942 return apic == &apic_x2apic_phys;
20943 }
20944
20945-static struct apic apic_x2apic_phys = {
20946+static struct apic apic_x2apic_phys __read_only = {
20947
20948 .name = "physical x2apic",
20949 .probe = x2apic_phys_probe,
20950diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20951index 8e9dcfd..c61b3e4 100644
20952--- a/arch/x86/kernel/apic/x2apic_uv_x.c
20953+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20954@@ -348,7 +348,7 @@ static int uv_probe(void)
20955 return apic == &apic_x2apic_uv_x;
20956 }
20957
20958-static struct apic __refdata apic_x2apic_uv_x = {
20959+static struct apic apic_x2apic_uv_x __read_only = {
20960
20961 .name = "UV large system",
20962 .probe = uv_probe,
20963diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20964index 5848744..56cb598 100644
20965--- a/arch/x86/kernel/apm_32.c
20966+++ b/arch/x86/kernel/apm_32.c
20967@@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
20968 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20969 * even though they are called in protected mode.
20970 */
20971-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20972+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
20973 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
20974
20975 static const char driver_version[] = "1.16ac"; /* no spaces */
20976@@ -611,7 +611,10 @@ static long __apm_bios_call(void *_call)
20977 BUG_ON(cpu != 0);
20978 gdt = get_cpu_gdt_table(cpu);
20979 save_desc_40 = gdt[0x40 / 8];
20980+
20981+ pax_open_kernel();
20982 gdt[0x40 / 8] = bad_bios_desc;
20983+ pax_close_kernel();
20984
20985 apm_irq_save(flags);
20986 APM_DO_SAVE_SEGS;
20987@@ -620,7 +623,11 @@ static long __apm_bios_call(void *_call)
20988 &call->esi);
20989 APM_DO_RESTORE_SEGS;
20990 apm_irq_restore(flags);
20991+
20992+ pax_open_kernel();
20993 gdt[0x40 / 8] = save_desc_40;
20994+ pax_close_kernel();
20995+
20996 put_cpu();
20997
20998 return call->eax & 0xff;
20999@@ -687,7 +694,10 @@ static long __apm_bios_call_simple(void *_call)
21000 BUG_ON(cpu != 0);
21001 gdt = get_cpu_gdt_table(cpu);
21002 save_desc_40 = gdt[0x40 / 8];
21003+
21004+ pax_open_kernel();
21005 gdt[0x40 / 8] = bad_bios_desc;
21006+ pax_close_kernel();
21007
21008 apm_irq_save(flags);
21009 APM_DO_SAVE_SEGS;
21010@@ -695,7 +705,11 @@ static long __apm_bios_call_simple(void *_call)
21011 &call->eax);
21012 APM_DO_RESTORE_SEGS;
21013 apm_irq_restore(flags);
21014+
21015+ pax_open_kernel();
21016 gdt[0x40 / 8] = save_desc_40;
21017+ pax_close_kernel();
21018+
21019 put_cpu();
21020 return error;
21021 }
21022@@ -2350,12 +2364,15 @@ static int __init apm_init(void)
21023 * code to that CPU.
21024 */
21025 gdt = get_cpu_gdt_table(0);
21026+
21027+ pax_open_kernel();
21028 set_desc_base(&gdt[APM_CS >> 3],
21029 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21030 set_desc_base(&gdt[APM_CS_16 >> 3],
21031 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21032 set_desc_base(&gdt[APM_DS >> 3],
21033 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21034+ pax_close_kernel();
21035
21036 proc_create("apm", 0, NULL, &apm_file_ops);
21037
21038diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21039index 9f6b934..cf5ffb3 100644
21040--- a/arch/x86/kernel/asm-offsets.c
21041+++ b/arch/x86/kernel/asm-offsets.c
21042@@ -32,6 +32,8 @@ void common(void) {
21043 OFFSET(TI_flags, thread_info, flags);
21044 OFFSET(TI_status, thread_info, status);
21045 OFFSET(TI_addr_limit, thread_info, addr_limit);
21046+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21047+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21048
21049 BLANK();
21050 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21051@@ -52,8 +54,26 @@ void common(void) {
21052 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21053 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21054 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21055+
21056+#ifdef CONFIG_PAX_KERNEXEC
21057+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21058 #endif
21059
21060+#ifdef CONFIG_PAX_MEMORY_UDEREF
21061+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21062+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21063+#ifdef CONFIG_X86_64
21064+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21065+#endif
21066+#endif
21067+
21068+#endif
21069+
21070+ BLANK();
21071+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21072+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21073+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21074+
21075 #ifdef CONFIG_XEN
21076 BLANK();
21077 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21078diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21079index e7c798b..2b2019b 100644
21080--- a/arch/x86/kernel/asm-offsets_64.c
21081+++ b/arch/x86/kernel/asm-offsets_64.c
21082@@ -77,6 +77,7 @@ int main(void)
21083 BLANK();
21084 #undef ENTRY
21085
21086+ DEFINE(TSS_size, sizeof(struct tss_struct));
21087 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21088 BLANK();
21089
21090diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21091index e27b49d..85b106c 100644
21092--- a/arch/x86/kernel/cpu/Makefile
21093+++ b/arch/x86/kernel/cpu/Makefile
21094@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21095 CFLAGS_REMOVE_perf_event.o = -pg
21096 endif
21097
21098-# Make sure load_percpu_segment has no stackprotector
21099-nostackp := $(call cc-option, -fno-stack-protector)
21100-CFLAGS_common.o := $(nostackp)
21101-
21102 obj-y := intel_cacheinfo.o scattered.o topology.o
21103 obj-y += common.o
21104 obj-y += rdrand.o
21105diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21106index 813d29d..6e542d4 100644
21107--- a/arch/x86/kernel/cpu/amd.c
21108+++ b/arch/x86/kernel/cpu/amd.c
21109@@ -718,7 +718,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21110 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21111 {
21112 /* AMD errata T13 (order #21922) */
21113- if ((c->x86 == 6)) {
21114+ if (c->x86 == 6) {
21115 /* Duron Rev A0 */
21116 if (c->x86_model == 3 && c->x86_mask == 0)
21117 size = 64;
21118diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21119index cfa9b5b..19b5084 100644
21120--- a/arch/x86/kernel/cpu/common.c
21121+++ b/arch/x86/kernel/cpu/common.c
21122@@ -90,60 +90,6 @@ static const struct cpu_dev default_cpu = {
21123
21124 static const struct cpu_dev *this_cpu = &default_cpu;
21125
21126-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21127-#ifdef CONFIG_X86_64
21128- /*
21129- * We need valid kernel segments for data and code in long mode too
21130- * IRET will check the segment types kkeil 2000/10/28
21131- * Also sysret mandates a special GDT layout
21132- *
21133- * TLS descriptors are currently at a different place compared to i386.
21134- * Hopefully nobody expects them at a fixed place (Wine?)
21135- */
21136- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21137- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21138- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21139- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21140- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21141- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21142-#else
21143- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21144- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21145- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21146- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21147- /*
21148- * Segments used for calling PnP BIOS have byte granularity.
21149- * They code segments and data segments have fixed 64k limits,
21150- * the transfer segment sizes are set at run time.
21151- */
21152- /* 32-bit code */
21153- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21154- /* 16-bit code */
21155- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21156- /* 16-bit data */
21157- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21158- /* 16-bit data */
21159- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21160- /* 16-bit data */
21161- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21162- /*
21163- * The APM segments have byte granularity and their bases
21164- * are set at run time. All have 64k limits.
21165- */
21166- /* 32-bit code */
21167- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21168- /* 16-bit code */
21169- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21170- /* data */
21171- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21172-
21173- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21174- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21175- GDT_STACK_CANARY_INIT
21176-#endif
21177-} };
21178-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21179-
21180 static int __init x86_xsave_setup(char *s)
21181 {
21182 if (strlen(s))
21183@@ -305,6 +251,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21184 }
21185 }
21186
21187+#ifdef CONFIG_X86_64
21188+static __init int setup_disable_pcid(char *arg)
21189+{
21190+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21191+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21192+
21193+#ifdef CONFIG_PAX_MEMORY_UDEREF
21194+ if (clone_pgd_mask != ~(pgdval_t)0UL)
21195+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21196+#endif
21197+
21198+ return 1;
21199+}
21200+__setup("nopcid", setup_disable_pcid);
21201+
21202+static void setup_pcid(struct cpuinfo_x86 *c)
21203+{
21204+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21205+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21206+
21207+#ifdef CONFIG_PAX_MEMORY_UDEREF
21208+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
21209+ pax_open_kernel();
21210+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21211+ pax_close_kernel();
21212+ printk("PAX: slow and weak UDEREF enabled\n");
21213+ } else
21214+ printk("PAX: UDEREF disabled\n");
21215+#endif
21216+
21217+ return;
21218+ }
21219+
21220+ printk("PAX: PCID detected\n");
21221+ set_in_cr4(X86_CR4_PCIDE);
21222+
21223+#ifdef CONFIG_PAX_MEMORY_UDEREF
21224+ pax_open_kernel();
21225+ clone_pgd_mask = ~(pgdval_t)0UL;
21226+ pax_close_kernel();
21227+ if (pax_user_shadow_base)
21228+ printk("PAX: weak UDEREF enabled\n");
21229+ else {
21230+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21231+ printk("PAX: strong UDEREF enabled\n");
21232+ }
21233+#endif
21234+
21235+ if (cpu_has(c, X86_FEATURE_INVPCID))
21236+ printk("PAX: INVPCID detected\n");
21237+}
21238+#endif
21239+
21240 /*
21241 * Some CPU features depend on higher CPUID levels, which may not always
21242 * be available due to CPUID level capping or broken virtualization
21243@@ -405,7 +404,7 @@ void switch_to_new_gdt(int cpu)
21244 {
21245 struct desc_ptr gdt_descr;
21246
21247- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21248+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21249 gdt_descr.size = GDT_SIZE - 1;
21250 load_gdt(&gdt_descr);
21251 /* Reload the per-cpu base */
21252@@ -895,6 +894,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21253 setup_smep(c);
21254 setup_smap(c);
21255
21256+#ifdef CONFIG_X86_64
21257+ setup_pcid(c);
21258+#endif
21259+
21260 /*
21261 * The vendor-specific functions might have changed features.
21262 * Now we do "generic changes."
21263@@ -903,6 +906,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21264 /* Filter out anything that depends on CPUID levels we don't have */
21265 filter_cpuid_features(c, true);
21266
21267+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
21268+ setup_clear_cpu_cap(X86_FEATURE_SEP);
21269+#endif
21270+
21271 /* If the model name is still unset, do table lookup. */
21272 if (!c->x86_model_id[0]) {
21273 const char *p;
21274@@ -985,7 +992,7 @@ static void syscall32_cpu_init(void)
21275 void enable_sep_cpu(void)
21276 {
21277 int cpu = get_cpu();
21278- struct tss_struct *tss = &per_cpu(init_tss, cpu);
21279+ struct tss_struct *tss = init_tss + cpu;
21280
21281 if (!boot_cpu_has(X86_FEATURE_SEP)) {
21282 put_cpu();
21283@@ -1125,14 +1132,16 @@ static __init int setup_disablecpuid(char *arg)
21284 }
21285 __setup("clearcpuid=", setup_disablecpuid);
21286
21287+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21288+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21289+
21290 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21291- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21292+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21293 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21294
21295 #ifdef CONFIG_X86_64
21296-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21297-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21298- (unsigned long) debug_idt_table };
21299+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21300+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21301
21302 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21303 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21304@@ -1309,7 +1318,7 @@ void cpu_init(void)
21305 */
21306 load_ucode_ap();
21307
21308- t = &per_cpu(init_tss, cpu);
21309+ t = init_tss + cpu;
21310 oist = &per_cpu(orig_ist, cpu);
21311
21312 #ifdef CONFIG_NUMA
21313@@ -1341,7 +1350,6 @@ void cpu_init(void)
21314 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21315 barrier();
21316
21317- x86_configure_nx();
21318 enable_x2apic();
21319
21320 /*
21321@@ -1393,7 +1401,7 @@ void cpu_init(void)
21322 {
21323 int cpu = smp_processor_id();
21324 struct task_struct *curr = current;
21325- struct tss_struct *t = &per_cpu(init_tss, cpu);
21326+ struct tss_struct *t = init_tss + cpu;
21327 struct thread_struct *thread = &curr->thread;
21328
21329 wait_for_master_cpu(cpu);
21330diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21331index c703507..28535e3 100644
21332--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21333+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21334@@ -1026,6 +1026,22 @@ static struct attribute *default_attrs[] = {
21335 };
21336
21337 #ifdef CONFIG_AMD_NB
21338+static struct attribute *default_attrs_amd_nb[] = {
21339+ &type.attr,
21340+ &level.attr,
21341+ &coherency_line_size.attr,
21342+ &physical_line_partition.attr,
21343+ &ways_of_associativity.attr,
21344+ &number_of_sets.attr,
21345+ &size.attr,
21346+ &shared_cpu_map.attr,
21347+ &shared_cpu_list.attr,
21348+ NULL,
21349+ NULL,
21350+ NULL,
21351+ NULL
21352+};
21353+
21354 static struct attribute **amd_l3_attrs(void)
21355 {
21356 static struct attribute **attrs;
21357@@ -1036,18 +1052,7 @@ static struct attribute **amd_l3_attrs(void)
21358
21359 n = ARRAY_SIZE(default_attrs);
21360
21361- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21362- n += 2;
21363-
21364- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21365- n += 1;
21366-
21367- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21368- if (attrs == NULL)
21369- return attrs = default_attrs;
21370-
21371- for (n = 0; default_attrs[n]; n++)
21372- attrs[n] = default_attrs[n];
21373+ attrs = default_attrs_amd_nb;
21374
21375 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21376 attrs[n++] = &cache_disable_0.attr;
21377@@ -1098,6 +1103,13 @@ static struct kobj_type ktype_cache = {
21378 .default_attrs = default_attrs,
21379 };
21380
21381+#ifdef CONFIG_AMD_NB
21382+static struct kobj_type ktype_cache_amd_nb = {
21383+ .sysfs_ops = &sysfs_ops,
21384+ .default_attrs = default_attrs_amd_nb,
21385+};
21386+#endif
21387+
21388 static struct kobj_type ktype_percpu_entry = {
21389 .sysfs_ops = &sysfs_ops,
21390 };
21391@@ -1163,20 +1175,26 @@ static int cache_add_dev(struct device *dev)
21392 return retval;
21393 }
21394
21395+#ifdef CONFIG_AMD_NB
21396+ amd_l3_attrs();
21397+#endif
21398+
21399 for (i = 0; i < num_cache_leaves; i++) {
21400+ struct kobj_type *ktype;
21401+
21402 this_object = INDEX_KOBJECT_PTR(cpu, i);
21403 this_object->cpu = cpu;
21404 this_object->index = i;
21405
21406 this_leaf = CPUID4_INFO_IDX(cpu, i);
21407
21408- ktype_cache.default_attrs = default_attrs;
21409+ ktype = &ktype_cache;
21410 #ifdef CONFIG_AMD_NB
21411 if (this_leaf->base.nb)
21412- ktype_cache.default_attrs = amd_l3_attrs();
21413+ ktype = &ktype_cache_amd_nb;
21414 #endif
21415 retval = kobject_init_and_add(&(this_object->kobj),
21416- &ktype_cache,
21417+ ktype,
21418 per_cpu(ici_cache_kobject, cpu),
21419 "index%1lu", i);
21420 if (unlikely(retval)) {
21421diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21422index 61a9668ce..b446a37 100644
21423--- a/arch/x86/kernel/cpu/mcheck/mce.c
21424+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21425@@ -45,6 +45,7 @@
21426 #include <asm/processor.h>
21427 #include <asm/mce.h>
21428 #include <asm/msr.h>
21429+#include <asm/local.h>
21430
21431 #include "mce-internal.h"
21432
21433@@ -259,7 +260,7 @@ static void print_mce(struct mce *m)
21434 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21435 m->cs, m->ip);
21436
21437- if (m->cs == __KERNEL_CS)
21438+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21439 print_symbol("{%s}", m->ip);
21440 pr_cont("\n");
21441 }
21442@@ -292,10 +293,10 @@ static void print_mce(struct mce *m)
21443
21444 #define PANIC_TIMEOUT 5 /* 5 seconds */
21445
21446-static atomic_t mce_paniced;
21447+static atomic_unchecked_t mce_paniced;
21448
21449 static int fake_panic;
21450-static atomic_t mce_fake_paniced;
21451+static atomic_unchecked_t mce_fake_paniced;
21452
21453 /* Panic in progress. Enable interrupts and wait for final IPI */
21454 static void wait_for_panic(void)
21455@@ -319,7 +320,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21456 /*
21457 * Make sure only one CPU runs in machine check panic
21458 */
21459- if (atomic_inc_return(&mce_paniced) > 1)
21460+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
21461 wait_for_panic();
21462 barrier();
21463
21464@@ -327,7 +328,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21465 console_verbose();
21466 } else {
21467 /* Don't log too much for fake panic */
21468- if (atomic_inc_return(&mce_fake_paniced) > 1)
21469+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
21470 return;
21471 }
21472 /* First print corrected ones that are still unlogged */
21473@@ -366,7 +367,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
21474 if (!fake_panic) {
21475 if (panic_timeout == 0)
21476 panic_timeout = mca_cfg.panic_timeout;
21477- panic(msg);
21478+ panic("%s", msg);
21479 } else
21480 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21481 }
21482@@ -697,7 +698,7 @@ static int mce_timed_out(u64 *t)
21483 * might have been modified by someone else.
21484 */
21485 rmb();
21486- if (atomic_read(&mce_paniced))
21487+ if (atomic_read_unchecked(&mce_paniced))
21488 wait_for_panic();
21489 if (!mca_cfg.monarch_timeout)
21490 goto out;
21491@@ -1674,7 +1675,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21492 }
21493
21494 /* Call the installed machine check handler for this CPU setup. */
21495-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21496+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21497 unexpected_machine_check;
21498
21499 /*
21500@@ -1697,7 +1698,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21501 return;
21502 }
21503
21504+ pax_open_kernel();
21505 machine_check_vector = do_machine_check;
21506+ pax_close_kernel();
21507
21508 __mcheck_cpu_init_generic();
21509 __mcheck_cpu_init_vendor(c);
21510@@ -1711,7 +1714,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21511 */
21512
21513 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21514-static int mce_chrdev_open_count; /* #times opened */
21515+static local_t mce_chrdev_open_count; /* #times opened */
21516 static int mce_chrdev_open_exclu; /* already open exclusive? */
21517
21518 static int mce_chrdev_open(struct inode *inode, struct file *file)
21519@@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21520 spin_lock(&mce_chrdev_state_lock);
21521
21522 if (mce_chrdev_open_exclu ||
21523- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21524+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21525 spin_unlock(&mce_chrdev_state_lock);
21526
21527 return -EBUSY;
21528@@ -1727,7 +1730,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21529
21530 if (file->f_flags & O_EXCL)
21531 mce_chrdev_open_exclu = 1;
21532- mce_chrdev_open_count++;
21533+ local_inc(&mce_chrdev_open_count);
21534
21535 spin_unlock(&mce_chrdev_state_lock);
21536
21537@@ -1738,7 +1741,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21538 {
21539 spin_lock(&mce_chrdev_state_lock);
21540
21541- mce_chrdev_open_count--;
21542+ local_dec(&mce_chrdev_open_count);
21543 mce_chrdev_open_exclu = 0;
21544
21545 spin_unlock(&mce_chrdev_state_lock);
21546@@ -2413,7 +2416,7 @@ static __init void mce_init_banks(void)
21547
21548 for (i = 0; i < mca_cfg.banks; i++) {
21549 struct mce_bank *b = &mce_banks[i];
21550- struct device_attribute *a = &b->attr;
21551+ device_attribute_no_const *a = &b->attr;
21552
21553 sysfs_attr_init(&a->attr);
21554 a->attr.name = b->attrname;
21555@@ -2520,7 +2523,7 @@ struct dentry *mce_get_debugfs_dir(void)
21556 static void mce_reset(void)
21557 {
21558 cpu_missing = 0;
21559- atomic_set(&mce_fake_paniced, 0);
21560+ atomic_set_unchecked(&mce_fake_paniced, 0);
21561 atomic_set(&mce_executing, 0);
21562 atomic_set(&mce_callin, 0);
21563 atomic_set(&global_nwo, 0);
21564diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21565index a304298..49b6d06 100644
21566--- a/arch/x86/kernel/cpu/mcheck/p5.c
21567+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21568@@ -10,6 +10,7 @@
21569 #include <asm/processor.h>
21570 #include <asm/mce.h>
21571 #include <asm/msr.h>
21572+#include <asm/pgtable.h>
21573
21574 /* By default disabled */
21575 int mce_p5_enabled __read_mostly;
21576@@ -48,7 +49,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21577 if (!cpu_has(c, X86_FEATURE_MCE))
21578 return;
21579
21580+ pax_open_kernel();
21581 machine_check_vector = pentium_machine_check;
21582+ pax_close_kernel();
21583 /* Make sure the vector pointer is visible before we enable MCEs: */
21584 wmb();
21585
21586diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21587index 7dc5564..1273569 100644
21588--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21589+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21590@@ -9,6 +9,7 @@
21591 #include <asm/processor.h>
21592 #include <asm/mce.h>
21593 #include <asm/msr.h>
21594+#include <asm/pgtable.h>
21595
21596 /* Machine check handler for WinChip C6: */
21597 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21598@@ -22,7 +23,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21599 {
21600 u32 lo, hi;
21601
21602+ pax_open_kernel();
21603 machine_check_vector = winchip_machine_check;
21604+ pax_close_kernel();
21605 /* Make sure the vector pointer is visible before we enable MCEs: */
21606 wmb();
21607
21608diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21609index 08fe6e8..35885b0 100644
21610--- a/arch/x86/kernel/cpu/microcode/core.c
21611+++ b/arch/x86/kernel/cpu/microcode/core.c
21612@@ -526,7 +526,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21613 return NOTIFY_OK;
21614 }
21615
21616-static struct notifier_block __refdata mc_cpu_notifier = {
21617+static struct notifier_block mc_cpu_notifier = {
21618 .notifier_call = mc_cpu_callback,
21619 };
21620
21621diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21622index c6826d1..ad18e14a 100644
21623--- a/arch/x86/kernel/cpu/microcode/intel.c
21624+++ b/arch/x86/kernel/cpu/microcode/intel.c
21625@@ -293,13 +293,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21626
21627 static int get_ucode_user(void *to, const void *from, size_t n)
21628 {
21629- return copy_from_user(to, from, n);
21630+ return copy_from_user(to, (const void __force_user *)from, n);
21631 }
21632
21633 static enum ucode_state
21634 request_microcode_user(int cpu, const void __user *buf, size_t size)
21635 {
21636- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21637+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21638 }
21639
21640 static void microcode_fini_cpu(int cpu)
21641diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21642index ea5f363..cb0e905 100644
21643--- a/arch/x86/kernel/cpu/mtrr/main.c
21644+++ b/arch/x86/kernel/cpu/mtrr/main.c
21645@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21646 u64 size_or_mask, size_and_mask;
21647 static bool mtrr_aps_delayed_init;
21648
21649-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21650+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21651
21652 const struct mtrr_ops *mtrr_if;
21653
21654diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21655index df5e41f..816c719 100644
21656--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21657+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21658@@ -25,7 +25,7 @@ struct mtrr_ops {
21659 int (*validate_add_page)(unsigned long base, unsigned long size,
21660 unsigned int type);
21661 int (*have_wrcomb)(void);
21662-};
21663+} __do_const;
21664
21665 extern int generic_get_free_region(unsigned long base, unsigned long size,
21666 int replace_reg);
21667diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21668index 143e5f5..5825081 100644
21669--- a/arch/x86/kernel/cpu/perf_event.c
21670+++ b/arch/x86/kernel/cpu/perf_event.c
21671@@ -1374,7 +1374,7 @@ static void __init pmu_check_apic(void)
21672
21673 }
21674
21675-static struct attribute_group x86_pmu_format_group = {
21676+static attribute_group_no_const x86_pmu_format_group = {
21677 .name = "format",
21678 .attrs = NULL,
21679 };
21680@@ -1473,7 +1473,7 @@ static struct attribute *events_attr[] = {
21681 NULL,
21682 };
21683
21684-static struct attribute_group x86_pmu_events_group = {
21685+static attribute_group_no_const x86_pmu_events_group = {
21686 .name = "events",
21687 .attrs = events_attr,
21688 };
21689@@ -1997,7 +1997,7 @@ static unsigned long get_segment_base(unsigned int segment)
21690 if (idx > GDT_ENTRIES)
21691 return 0;
21692
21693- desc = raw_cpu_ptr(gdt_page.gdt);
21694+ desc = get_cpu_gdt_table(smp_processor_id());
21695 }
21696
21697 return get_desc_base(desc + idx);
21698@@ -2087,7 +2087,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21699 break;
21700
21701 perf_callchain_store(entry, frame.return_address);
21702- fp = frame.next_frame;
21703+ fp = (const void __force_user *)frame.next_frame;
21704 }
21705 }
21706
21707diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21708index 639d128..e92d7e5 100644
21709--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21710+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21711@@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21712 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21713 {
21714 struct attribute **attrs;
21715- struct attribute_group *attr_group;
21716+ attribute_group_no_const *attr_group;
21717 int i = 0, j;
21718
21719 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21720diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21721index 944bf01..4a4392f 100644
21722--- a/arch/x86/kernel/cpu/perf_event_intel.c
21723+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21724@@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
21725 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21726
21727 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21728- u64 capabilities;
21729+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21730
21731- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21732- x86_pmu.intel_cap.capabilities = capabilities;
21733+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21734+ x86_pmu.intel_cap.capabilities = capabilities;
21735 }
21736
21737 intel_ds_init();
21738diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21739index d64f275..26522ff 100644
21740--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21741+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21742@@ -449,7 +449,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21743 NULL,
21744 };
21745
21746-static struct attribute_group rapl_pmu_events_group = {
21747+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21748 .name = "events",
21749 .attrs = NULL, /* patched at runtime */
21750 };
21751diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21752index 9762dbd..53d5d21 100644
21753--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21754+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21755@@ -721,7 +721,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21756 static int __init uncore_type_init(struct intel_uncore_type *type)
21757 {
21758 struct intel_uncore_pmu *pmus;
21759- struct attribute_group *attr_group;
21760+ attribute_group_no_const *attr_group;
21761 struct attribute **attrs;
21762 int i, j;
21763
21764diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21765index 18eb78b..18747cc 100644
21766--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21767+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21768@@ -114,7 +114,7 @@ struct intel_uncore_box {
21769 struct uncore_event_desc {
21770 struct kobj_attribute attr;
21771 const char *config;
21772-};
21773+} __do_const;
21774
21775 ssize_t uncore_event_show(struct kobject *kobj,
21776 struct kobj_attribute *attr, char *buf);
21777diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21778index 3225ae6c..ee3c6db 100644
21779--- a/arch/x86/kernel/cpuid.c
21780+++ b/arch/x86/kernel/cpuid.c
21781@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21782 return notifier_from_errno(err);
21783 }
21784
21785-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21786+static struct notifier_block cpuid_class_cpu_notifier =
21787 {
21788 .notifier_call = cpuid_class_cpu_callback,
21789 };
21790diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21791index f5ab56d..d3b201a 100644
21792--- a/arch/x86/kernel/crash.c
21793+++ b/arch/x86/kernel/crash.c
21794@@ -104,7 +104,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21795 #ifdef CONFIG_X86_32
21796 struct pt_regs fixed_regs;
21797
21798- if (!user_mode_vm(regs)) {
21799+ if (!user_mode(regs)) {
21800 crash_fixup_ss_esp(&fixed_regs, regs);
21801 regs = &fixed_regs;
21802 }
21803diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21804index afa64ad..dce67dd 100644
21805--- a/arch/x86/kernel/crash_dump_64.c
21806+++ b/arch/x86/kernel/crash_dump_64.c
21807@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21808 return -ENOMEM;
21809
21810 if (userbuf) {
21811- if (copy_to_user(buf, vaddr + offset, csize)) {
21812+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21813 iounmap(vaddr);
21814 return -EFAULT;
21815 }
21816diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21817index f6dfd93..892ade4 100644
21818--- a/arch/x86/kernel/doublefault.c
21819+++ b/arch/x86/kernel/doublefault.c
21820@@ -12,7 +12,7 @@
21821
21822 #define DOUBLEFAULT_STACKSIZE (1024)
21823 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21824-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21825+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21826
21827 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21828
21829@@ -22,7 +22,7 @@ static void doublefault_fn(void)
21830 unsigned long gdt, tss;
21831
21832 native_store_gdt(&gdt_desc);
21833- gdt = gdt_desc.address;
21834+ gdt = (unsigned long)gdt_desc.address;
21835
21836 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21837
21838@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21839 /* 0x2 bit is always set */
21840 .flags = X86_EFLAGS_SF | 0x2,
21841 .sp = STACK_START,
21842- .es = __USER_DS,
21843+ .es = __KERNEL_DS,
21844 .cs = __KERNEL_CS,
21845 .ss = __KERNEL_DS,
21846- .ds = __USER_DS,
21847+ .ds = __KERNEL_DS,
21848 .fs = __KERNEL_PERCPU,
21849
21850 .__cr3 = __pa_nodebug(swapper_pg_dir),
21851diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21852index b74ebc7..2c95874 100644
21853--- a/arch/x86/kernel/dumpstack.c
21854+++ b/arch/x86/kernel/dumpstack.c
21855@@ -2,6 +2,9 @@
21856 * Copyright (C) 1991, 1992 Linus Torvalds
21857 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21858 */
21859+#ifdef CONFIG_GRKERNSEC_HIDESYM
21860+#define __INCLUDED_BY_HIDESYM 1
21861+#endif
21862 #include <linux/kallsyms.h>
21863 #include <linux/kprobes.h>
21864 #include <linux/uaccess.h>
21865@@ -33,23 +36,21 @@ static void printk_stack_address(unsigned long address, int reliable)
21866
21867 void printk_address(unsigned long address)
21868 {
21869- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21870+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21871 }
21872
21873 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21874 static void
21875 print_ftrace_graph_addr(unsigned long addr, void *data,
21876 const struct stacktrace_ops *ops,
21877- struct thread_info *tinfo, int *graph)
21878+ struct task_struct *task, int *graph)
21879 {
21880- struct task_struct *task;
21881 unsigned long ret_addr;
21882 int index;
21883
21884 if (addr != (unsigned long)return_to_handler)
21885 return;
21886
21887- task = tinfo->task;
21888 index = task->curr_ret_stack;
21889
21890 if (!task->ret_stack || index < *graph)
21891@@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21892 static inline void
21893 print_ftrace_graph_addr(unsigned long addr, void *data,
21894 const struct stacktrace_ops *ops,
21895- struct thread_info *tinfo, int *graph)
21896+ struct task_struct *task, int *graph)
21897 { }
21898 #endif
21899
21900@@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21901 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21902 */
21903
21904-static inline int valid_stack_ptr(struct thread_info *tinfo,
21905- void *p, unsigned int size, void *end)
21906+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21907 {
21908- void *t = tinfo;
21909 if (end) {
21910 if (p < end && p >= (end-THREAD_SIZE))
21911 return 1;
21912@@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21913 }
21914
21915 unsigned long
21916-print_context_stack(struct thread_info *tinfo,
21917+print_context_stack(struct task_struct *task, void *stack_start,
21918 unsigned long *stack, unsigned long bp,
21919 const struct stacktrace_ops *ops, void *data,
21920 unsigned long *end, int *graph)
21921 {
21922 struct stack_frame *frame = (struct stack_frame *)bp;
21923
21924- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21925+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21926 unsigned long addr;
21927
21928 addr = *stack;
21929@@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21930 } else {
21931 ops->address(data, addr, 0);
21932 }
21933- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21934+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21935 }
21936 stack++;
21937 }
21938@@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21939 EXPORT_SYMBOL_GPL(print_context_stack);
21940
21941 unsigned long
21942-print_context_stack_bp(struct thread_info *tinfo,
21943+print_context_stack_bp(struct task_struct *task, void *stack_start,
21944 unsigned long *stack, unsigned long bp,
21945 const struct stacktrace_ops *ops, void *data,
21946 unsigned long *end, int *graph)
21947@@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21948 struct stack_frame *frame = (struct stack_frame *)bp;
21949 unsigned long *ret_addr = &frame->return_address;
21950
21951- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21952+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21953 unsigned long addr = *ret_addr;
21954
21955 if (!__kernel_text_address(addr))
21956@@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21957 ops->address(data, addr, 1);
21958 frame = frame->next_frame;
21959 ret_addr = &frame->return_address;
21960- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21961+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21962 }
21963
21964 return (unsigned long)frame;
21965@@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
21966 static void print_trace_address(void *data, unsigned long addr, int reliable)
21967 {
21968 touch_nmi_watchdog();
21969- printk(data);
21970+ printk("%s", (char *)data);
21971 printk_stack_address(addr, reliable);
21972 }
21973
21974@@ -225,6 +224,8 @@ unsigned long oops_begin(void)
21975 EXPORT_SYMBOL_GPL(oops_begin);
21976 NOKPROBE_SYMBOL(oops_begin);
21977
21978+extern void gr_handle_kernel_exploit(void);
21979+
21980 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
21981 {
21982 if (regs && kexec_should_crash(current))
21983@@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
21984 panic("Fatal exception in interrupt");
21985 if (panic_on_oops)
21986 panic("Fatal exception");
21987- do_exit(signr);
21988+
21989+ gr_handle_kernel_exploit();
21990+
21991+ do_group_exit(signr);
21992 }
21993 NOKPROBE_SYMBOL(oops_end);
21994
21995@@ -275,7 +279,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
21996 print_modules();
21997 show_regs(regs);
21998 #ifdef CONFIG_X86_32
21999- if (user_mode_vm(regs)) {
22000+ if (user_mode(regs)) {
22001 sp = regs->sp;
22002 ss = regs->ss & 0xffff;
22003 } else {
22004@@ -304,7 +308,7 @@ void die(const char *str, struct pt_regs *regs, long err)
22005 unsigned long flags = oops_begin();
22006 int sig = SIGSEGV;
22007
22008- if (!user_mode_vm(regs))
22009+ if (!user_mode(regs))
22010 report_bug(regs->ip, regs);
22011
22012 if (__die(str, regs, err))
22013diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22014index 5abd4cd..c65733b 100644
22015--- a/arch/x86/kernel/dumpstack_32.c
22016+++ b/arch/x86/kernel/dumpstack_32.c
22017@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22018 bp = stack_frame(task, regs);
22019
22020 for (;;) {
22021- struct thread_info *context;
22022+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22023 void *end_stack;
22024
22025 end_stack = is_hardirq_stack(stack, cpu);
22026 if (!end_stack)
22027 end_stack = is_softirq_stack(stack, cpu);
22028
22029- context = task_thread_info(task);
22030- bp = ops->walk_stack(context, stack, bp, ops, data,
22031+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22032 end_stack, &graph);
22033
22034 /* Stop if not on irq stack */
22035@@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
22036 int i;
22037
22038 show_regs_print_info(KERN_EMERG);
22039- __show_regs(regs, !user_mode_vm(regs));
22040+ __show_regs(regs, !user_mode(regs));
22041
22042 /*
22043 * When in-kernel, we also print out the stack and code at the
22044 * time of the fault..
22045 */
22046- if (!user_mode_vm(regs)) {
22047+ if (!user_mode(regs)) {
22048 unsigned int code_prologue = code_bytes * 43 / 64;
22049 unsigned int code_len = code_bytes;
22050 unsigned char c;
22051 u8 *ip;
22052+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22053
22054 pr_emerg("Stack:\n");
22055 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22056
22057 pr_emerg("Code:");
22058
22059- ip = (u8 *)regs->ip - code_prologue;
22060+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22061 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22062 /* try starting at IP */
22063- ip = (u8 *)regs->ip;
22064+ ip = (u8 *)regs->ip + cs_base;
22065 code_len = code_len - code_prologue + 1;
22066 }
22067 for (i = 0; i < code_len; i++, ip++) {
22068@@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
22069 pr_cont(" Bad EIP value.");
22070 break;
22071 }
22072- if (ip == (u8 *)regs->ip)
22073+ if (ip == (u8 *)regs->ip + cs_base)
22074 pr_cont(" <%02x>", c);
22075 else
22076 pr_cont(" %02x", c);
22077@@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
22078 {
22079 unsigned short ud2;
22080
22081+ ip = ktla_ktva(ip);
22082 if (ip < PAGE_OFFSET)
22083 return 0;
22084 if (probe_kernel_address((unsigned short *)ip, ud2))
22085@@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
22086
22087 return ud2 == 0x0b0f;
22088 }
22089+
22090+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22091+void pax_check_alloca(unsigned long size)
22092+{
22093+ unsigned long sp = (unsigned long)&sp, stack_left;
22094+
22095+ /* all kernel stacks are of the same size */
22096+ stack_left = sp & (THREAD_SIZE - 1);
22097+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22098+}
22099+EXPORT_SYMBOL(pax_check_alloca);
22100+#endif
22101diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22102index ff86f19..a20c62c 100644
22103--- a/arch/x86/kernel/dumpstack_64.c
22104+++ b/arch/x86/kernel/dumpstack_64.c
22105@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22106 const struct stacktrace_ops *ops, void *data)
22107 {
22108 const unsigned cpu = get_cpu();
22109- struct thread_info *tinfo;
22110 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22111 unsigned long dummy;
22112 unsigned used = 0;
22113 int graph = 0;
22114 int done = 0;
22115+ void *stack_start;
22116
22117 if (!task)
22118 task = current;
22119@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22120 * current stack address. If the stacks consist of nested
22121 * exceptions
22122 */
22123- tinfo = task_thread_info(task);
22124 while (!done) {
22125 unsigned long *stack_end;
22126 enum stack_type stype;
22127@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22128 if (ops->stack(data, id) < 0)
22129 break;
22130
22131- bp = ops->walk_stack(tinfo, stack, bp, ops,
22132+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22133 data, stack_end, &graph);
22134 ops->stack(data, "<EOE>");
22135 /*
22136@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22137 * second-to-last pointer (index -2 to end) in the
22138 * exception stack:
22139 */
22140+ if ((u16)stack_end[-1] != __KERNEL_DS)
22141+ goto out;
22142 stack = (unsigned long *) stack_end[-2];
22143 done = 0;
22144 break;
22145@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22146
22147 if (ops->stack(data, "IRQ") < 0)
22148 break;
22149- bp = ops->walk_stack(tinfo, stack, bp,
22150+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22151 ops, data, stack_end, &graph);
22152 /*
22153 * We link to the next stack (which would be
22154@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22155 /*
22156 * This handles the process stack:
22157 */
22158- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22159+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22160+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22161+out:
22162 put_cpu();
22163 }
22164 EXPORT_SYMBOL(dump_trace);
22165@@ -349,3 +352,50 @@ int is_valid_bugaddr(unsigned long ip)
22166
22167 return ud2 == 0x0b0f;
22168 }
22169+
22170+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22171+void pax_check_alloca(unsigned long size)
22172+{
22173+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22174+ unsigned cpu, used;
22175+ char *id;
22176+
22177+ /* check the process stack first */
22178+ stack_start = (unsigned long)task_stack_page(current);
22179+ stack_end = stack_start + THREAD_SIZE;
22180+ if (likely(stack_start <= sp && sp < stack_end)) {
22181+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22182+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22183+ return;
22184+ }
22185+
22186+ cpu = get_cpu();
22187+
22188+ /* check the irq stacks */
22189+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22190+ stack_start = stack_end - IRQ_STACK_SIZE;
22191+ if (stack_start <= sp && sp < stack_end) {
22192+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22193+ put_cpu();
22194+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22195+ return;
22196+ }
22197+
22198+ /* check the exception stacks */
22199+ used = 0;
22200+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22201+ stack_start = stack_end - EXCEPTION_STKSZ;
22202+ if (stack_end && stack_start <= sp && sp < stack_end) {
22203+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22204+ put_cpu();
22205+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22206+ return;
22207+ }
22208+
22209+ put_cpu();
22210+
22211+ /* unknown stack */
22212+ BUG();
22213+}
22214+EXPORT_SYMBOL(pax_check_alloca);
22215+#endif
22216diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22217index 49f8864..1cc6d07 100644
22218--- a/arch/x86/kernel/e820.c
22219+++ b/arch/x86/kernel/e820.c
22220@@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22221
22222 static void early_panic(char *msg)
22223 {
22224- early_printk(msg);
22225- panic(msg);
22226+ early_printk("%s", msg);
22227+ panic("%s", msg);
22228 }
22229
22230 static int userdef __initdata;
22231diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22232index 01d1c18..8073693 100644
22233--- a/arch/x86/kernel/early_printk.c
22234+++ b/arch/x86/kernel/early_printk.c
22235@@ -7,6 +7,7 @@
22236 #include <linux/pci_regs.h>
22237 #include <linux/pci_ids.h>
22238 #include <linux/errno.h>
22239+#include <linux/sched.h>
22240 #include <asm/io.h>
22241 #include <asm/processor.h>
22242 #include <asm/fcntl.h>
22243diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22244index 344b63f..ccdac7a 100644
22245--- a/arch/x86/kernel/entry_32.S
22246+++ b/arch/x86/kernel/entry_32.S
22247@@ -177,13 +177,153 @@
22248 /*CFI_REL_OFFSET gs, PT_GS*/
22249 .endm
22250 .macro SET_KERNEL_GS reg
22251+
22252+#ifdef CONFIG_CC_STACKPROTECTOR
22253 movl $(__KERNEL_STACK_CANARY), \reg
22254+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22255+ movl $(__USER_DS), \reg
22256+#else
22257+ xorl \reg, \reg
22258+#endif
22259+
22260 movl \reg, %gs
22261 .endm
22262
22263 #endif /* CONFIG_X86_32_LAZY_GS */
22264
22265-.macro SAVE_ALL
22266+.macro pax_enter_kernel
22267+#ifdef CONFIG_PAX_KERNEXEC
22268+ call pax_enter_kernel
22269+#endif
22270+.endm
22271+
22272+.macro pax_exit_kernel
22273+#ifdef CONFIG_PAX_KERNEXEC
22274+ call pax_exit_kernel
22275+#endif
22276+.endm
22277+
22278+#ifdef CONFIG_PAX_KERNEXEC
22279+ENTRY(pax_enter_kernel)
22280+#ifdef CONFIG_PARAVIRT
22281+ pushl %eax
22282+ pushl %ecx
22283+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22284+ mov %eax, %esi
22285+#else
22286+ mov %cr0, %esi
22287+#endif
22288+ bts $16, %esi
22289+ jnc 1f
22290+ mov %cs, %esi
22291+ cmp $__KERNEL_CS, %esi
22292+ jz 3f
22293+ ljmp $__KERNEL_CS, $3f
22294+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22295+2:
22296+#ifdef CONFIG_PARAVIRT
22297+ mov %esi, %eax
22298+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22299+#else
22300+ mov %esi, %cr0
22301+#endif
22302+3:
22303+#ifdef CONFIG_PARAVIRT
22304+ popl %ecx
22305+ popl %eax
22306+#endif
22307+ ret
22308+ENDPROC(pax_enter_kernel)
22309+
22310+ENTRY(pax_exit_kernel)
22311+#ifdef CONFIG_PARAVIRT
22312+ pushl %eax
22313+ pushl %ecx
22314+#endif
22315+ mov %cs, %esi
22316+ cmp $__KERNEXEC_KERNEL_CS, %esi
22317+ jnz 2f
22318+#ifdef CONFIG_PARAVIRT
22319+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22320+ mov %eax, %esi
22321+#else
22322+ mov %cr0, %esi
22323+#endif
22324+ btr $16, %esi
22325+ ljmp $__KERNEL_CS, $1f
22326+1:
22327+#ifdef CONFIG_PARAVIRT
22328+ mov %esi, %eax
22329+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22330+#else
22331+ mov %esi, %cr0
22332+#endif
22333+2:
22334+#ifdef CONFIG_PARAVIRT
22335+ popl %ecx
22336+ popl %eax
22337+#endif
22338+ ret
22339+ENDPROC(pax_exit_kernel)
22340+#endif
22341+
22342+ .macro pax_erase_kstack
22343+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22344+ call pax_erase_kstack
22345+#endif
22346+ .endm
22347+
22348+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22349+/*
22350+ * ebp: thread_info
22351+ */
22352+ENTRY(pax_erase_kstack)
22353+ pushl %edi
22354+ pushl %ecx
22355+ pushl %eax
22356+
22357+ mov TI_lowest_stack(%ebp), %edi
22358+ mov $-0xBEEF, %eax
22359+ std
22360+
22361+1: mov %edi, %ecx
22362+ and $THREAD_SIZE_asm - 1, %ecx
22363+ shr $2, %ecx
22364+ repne scasl
22365+ jecxz 2f
22366+
22367+ cmp $2*16, %ecx
22368+ jc 2f
22369+
22370+ mov $2*16, %ecx
22371+ repe scasl
22372+ jecxz 2f
22373+ jne 1b
22374+
22375+2: cld
22376+ mov %esp, %ecx
22377+ sub %edi, %ecx
22378+
22379+ cmp $THREAD_SIZE_asm, %ecx
22380+ jb 3f
22381+ ud2
22382+3:
22383+
22384+ shr $2, %ecx
22385+ rep stosl
22386+
22387+ mov TI_task_thread_sp0(%ebp), %edi
22388+ sub $128, %edi
22389+ mov %edi, TI_lowest_stack(%ebp)
22390+
22391+ popl %eax
22392+ popl %ecx
22393+ popl %edi
22394+ ret
22395+ENDPROC(pax_erase_kstack)
22396+#endif
22397+
22398+.macro __SAVE_ALL _DS
22399 cld
22400 PUSH_GS
22401 pushl_cfi %fs
22402@@ -206,7 +346,7 @@
22403 CFI_REL_OFFSET ecx, 0
22404 pushl_cfi %ebx
22405 CFI_REL_OFFSET ebx, 0
22406- movl $(__USER_DS), %edx
22407+ movl $\_DS, %edx
22408 movl %edx, %ds
22409 movl %edx, %es
22410 movl $(__KERNEL_PERCPU), %edx
22411@@ -214,6 +354,15 @@
22412 SET_KERNEL_GS %edx
22413 .endm
22414
22415+.macro SAVE_ALL
22416+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22417+ __SAVE_ALL __KERNEL_DS
22418+ pax_enter_kernel
22419+#else
22420+ __SAVE_ALL __USER_DS
22421+#endif
22422+.endm
22423+
22424 .macro RESTORE_INT_REGS
22425 popl_cfi %ebx
22426 CFI_RESTORE ebx
22427@@ -297,7 +446,7 @@ ENTRY(ret_from_fork)
22428 popfl_cfi
22429 jmp syscall_exit
22430 CFI_ENDPROC
22431-END(ret_from_fork)
22432+ENDPROC(ret_from_fork)
22433
22434 ENTRY(ret_from_kernel_thread)
22435 CFI_STARTPROC
22436@@ -340,7 +489,15 @@ ret_from_intr:
22437 andl $SEGMENT_RPL_MASK, %eax
22438 #endif
22439 cmpl $USER_RPL, %eax
22440+
22441+#ifdef CONFIG_PAX_KERNEXEC
22442+ jae resume_userspace
22443+
22444+ pax_exit_kernel
22445+ jmp resume_kernel
22446+#else
22447 jb resume_kernel # not returning to v8086 or userspace
22448+#endif
22449
22450 ENTRY(resume_userspace)
22451 LOCKDEP_SYS_EXIT
22452@@ -352,8 +509,8 @@ ENTRY(resume_userspace)
22453 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22454 # int/exception return?
22455 jne work_pending
22456- jmp restore_all
22457-END(ret_from_exception)
22458+ jmp restore_all_pax
22459+ENDPROC(ret_from_exception)
22460
22461 #ifdef CONFIG_PREEMPT
22462 ENTRY(resume_kernel)
22463@@ -365,7 +522,7 @@ need_resched:
22464 jz restore_all
22465 call preempt_schedule_irq
22466 jmp need_resched
22467-END(resume_kernel)
22468+ENDPROC(resume_kernel)
22469 #endif
22470 CFI_ENDPROC
22471
22472@@ -395,30 +552,45 @@ sysenter_past_esp:
22473 /*CFI_REL_OFFSET cs, 0*/
22474 /*
22475 * Push current_thread_info()->sysenter_return to the stack.
22476- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22477- * pushed above; +8 corresponds to copy_thread's esp0 setting.
22478 */
22479- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22480+ pushl_cfi $0
22481 CFI_REL_OFFSET eip, 0
22482
22483 pushl_cfi %eax
22484 SAVE_ALL
22485+ GET_THREAD_INFO(%ebp)
22486+ movl TI_sysenter_return(%ebp),%ebp
22487+ movl %ebp,PT_EIP(%esp)
22488 ENABLE_INTERRUPTS(CLBR_NONE)
22489
22490 /*
22491 * Load the potential sixth argument from user stack.
22492 * Careful about security.
22493 */
22494+ movl PT_OLDESP(%esp),%ebp
22495+
22496+#ifdef CONFIG_PAX_MEMORY_UDEREF
22497+ mov PT_OLDSS(%esp),%ds
22498+1: movl %ds:(%ebp),%ebp
22499+ push %ss
22500+ pop %ds
22501+#else
22502 cmpl $__PAGE_OFFSET-3,%ebp
22503 jae syscall_fault
22504 ASM_STAC
22505 1: movl (%ebp),%ebp
22506 ASM_CLAC
22507+#endif
22508+
22509 movl %ebp,PT_EBP(%esp)
22510 _ASM_EXTABLE(1b,syscall_fault)
22511
22512 GET_THREAD_INFO(%ebp)
22513
22514+#ifdef CONFIG_PAX_RANDKSTACK
22515+ pax_erase_kstack
22516+#endif
22517+
22518 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22519 jnz sysenter_audit
22520 sysenter_do_call:
22521@@ -434,12 +606,24 @@ sysenter_after_call:
22522 testl $_TIF_ALLWORK_MASK, %ecx
22523 jne sysexit_audit
22524 sysenter_exit:
22525+
22526+#ifdef CONFIG_PAX_RANDKSTACK
22527+ pushl_cfi %eax
22528+ movl %esp, %eax
22529+ call pax_randomize_kstack
22530+ popl_cfi %eax
22531+#endif
22532+
22533+ pax_erase_kstack
22534+
22535 /* if something modifies registers it must also disable sysexit */
22536 movl PT_EIP(%esp), %edx
22537 movl PT_OLDESP(%esp), %ecx
22538 xorl %ebp,%ebp
22539 TRACE_IRQS_ON
22540 1: mov PT_FS(%esp), %fs
22541+2: mov PT_DS(%esp), %ds
22542+3: mov PT_ES(%esp), %es
22543 PTGS_TO_GS
22544 ENABLE_INTERRUPTS_SYSEXIT
22545
22546@@ -453,6 +637,9 @@ sysenter_audit:
22547 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22548 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22549 call __audit_syscall_entry
22550+
22551+ pax_erase_kstack
22552+
22553 popl_cfi %ecx /* get that remapped edx off the stack */
22554 popl_cfi %ecx /* get that remapped esi off the stack */
22555 movl PT_EAX(%esp),%eax /* reload syscall number */
22556@@ -479,10 +666,16 @@ sysexit_audit:
22557
22558 CFI_ENDPROC
22559 .pushsection .fixup,"ax"
22560-2: movl $0,PT_FS(%esp)
22561+4: movl $0,PT_FS(%esp)
22562+ jmp 1b
22563+5: movl $0,PT_DS(%esp)
22564+ jmp 1b
22565+6: movl $0,PT_ES(%esp)
22566 jmp 1b
22567 .popsection
22568- _ASM_EXTABLE(1b,2b)
22569+ _ASM_EXTABLE(1b,4b)
22570+ _ASM_EXTABLE(2b,5b)
22571+ _ASM_EXTABLE(3b,6b)
22572 PTGS_TO_GS_EX
22573 ENDPROC(ia32_sysenter_target)
22574
22575@@ -493,6 +686,11 @@ ENTRY(system_call)
22576 pushl_cfi %eax # save orig_eax
22577 SAVE_ALL
22578 GET_THREAD_INFO(%ebp)
22579+
22580+#ifdef CONFIG_PAX_RANDKSTACK
22581+ pax_erase_kstack
22582+#endif
22583+
22584 # system call tracing in operation / emulation
22585 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22586 jnz syscall_trace_entry
22587@@ -512,6 +710,15 @@ syscall_exit:
22588 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22589 jne syscall_exit_work
22590
22591+restore_all_pax:
22592+
22593+#ifdef CONFIG_PAX_RANDKSTACK
22594+ movl %esp, %eax
22595+ call pax_randomize_kstack
22596+#endif
22597+
22598+ pax_erase_kstack
22599+
22600 restore_all:
22601 TRACE_IRQS_IRET
22602 restore_all_notrace:
22603@@ -566,14 +773,34 @@ ldt_ss:
22604 * compensating for the offset by changing to the ESPFIX segment with
22605 * a base address that matches for the difference.
22606 */
22607-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22608+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22609 mov %esp, %edx /* load kernel esp */
22610 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22611 mov %dx, %ax /* eax: new kernel esp */
22612 sub %eax, %edx /* offset (low word is 0) */
22613+#ifdef CONFIG_SMP
22614+ movl PER_CPU_VAR(cpu_number), %ebx
22615+ shll $PAGE_SHIFT_asm, %ebx
22616+ addl $cpu_gdt_table, %ebx
22617+#else
22618+ movl $cpu_gdt_table, %ebx
22619+#endif
22620 shr $16, %edx
22621- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22622- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22623+
22624+#ifdef CONFIG_PAX_KERNEXEC
22625+ mov %cr0, %esi
22626+ btr $16, %esi
22627+ mov %esi, %cr0
22628+#endif
22629+
22630+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22631+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22632+
22633+#ifdef CONFIG_PAX_KERNEXEC
22634+ bts $16, %esi
22635+ mov %esi, %cr0
22636+#endif
22637+
22638 pushl_cfi $__ESPFIX_SS
22639 pushl_cfi %eax /* new kernel esp */
22640 /* Disable interrupts, but do not irqtrace this section: we
22641@@ -603,20 +830,18 @@ work_resched:
22642 movl TI_flags(%ebp), %ecx
22643 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22644 # than syscall tracing?
22645- jz restore_all
22646+ jz restore_all_pax
22647 testb $_TIF_NEED_RESCHED, %cl
22648 jnz work_resched
22649
22650 work_notifysig: # deal with pending signals and
22651 # notify-resume requests
22652+ movl %esp, %eax
22653 #ifdef CONFIG_VM86
22654 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22655- movl %esp, %eax
22656 jne work_notifysig_v86 # returning to kernel-space or
22657 # vm86-space
22658 1:
22659-#else
22660- movl %esp, %eax
22661 #endif
22662 TRACE_IRQS_ON
22663 ENABLE_INTERRUPTS(CLBR_NONE)
22664@@ -637,7 +862,7 @@ work_notifysig_v86:
22665 movl %eax, %esp
22666 jmp 1b
22667 #endif
22668-END(work_pending)
22669+ENDPROC(work_pending)
22670
22671 # perform syscall exit tracing
22672 ALIGN
22673@@ -645,11 +870,14 @@ syscall_trace_entry:
22674 movl $-ENOSYS,PT_EAX(%esp)
22675 movl %esp, %eax
22676 call syscall_trace_enter
22677+
22678+ pax_erase_kstack
22679+
22680 /* What it returned is what we'll actually use. */
22681 cmpl $(NR_syscalls), %eax
22682 jnae syscall_call
22683 jmp syscall_exit
22684-END(syscall_trace_entry)
22685+ENDPROC(syscall_trace_entry)
22686
22687 # perform syscall exit tracing
22688 ALIGN
22689@@ -662,26 +890,30 @@ syscall_exit_work:
22690 movl %esp, %eax
22691 call syscall_trace_leave
22692 jmp resume_userspace
22693-END(syscall_exit_work)
22694+ENDPROC(syscall_exit_work)
22695 CFI_ENDPROC
22696
22697 RING0_INT_FRAME # can't unwind into user space anyway
22698 syscall_fault:
22699+#ifdef CONFIG_PAX_MEMORY_UDEREF
22700+ push %ss
22701+ pop %ds
22702+#endif
22703 ASM_CLAC
22704 GET_THREAD_INFO(%ebp)
22705 movl $-EFAULT,PT_EAX(%esp)
22706 jmp resume_userspace
22707-END(syscall_fault)
22708+ENDPROC(syscall_fault)
22709
22710 syscall_badsys:
22711 movl $-ENOSYS,%eax
22712 jmp syscall_after_call
22713-END(syscall_badsys)
22714+ENDPROC(syscall_badsys)
22715
22716 sysenter_badsys:
22717 movl $-ENOSYS,%eax
22718 jmp sysenter_after_call
22719-END(sysenter_badsys)
22720+ENDPROC(sysenter_badsys)
22721 CFI_ENDPROC
22722
22723 .macro FIXUP_ESPFIX_STACK
22724@@ -694,8 +926,15 @@ END(sysenter_badsys)
22725 */
22726 #ifdef CONFIG_X86_ESPFIX32
22727 /* fixup the stack */
22728- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22729- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22730+#ifdef CONFIG_SMP
22731+ movl PER_CPU_VAR(cpu_number), %ebx
22732+ shll $PAGE_SHIFT_asm, %ebx
22733+ addl $cpu_gdt_table, %ebx
22734+#else
22735+ movl $cpu_gdt_table, %ebx
22736+#endif
22737+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22738+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22739 shl $16, %eax
22740 addl %esp, %eax /* the adjusted stack pointer */
22741 pushl_cfi $__KERNEL_DS
22742@@ -751,7 +990,7 @@ vector=vector+1
22743 .endr
22744 2: jmp common_interrupt
22745 .endr
22746-END(irq_entries_start)
22747+ENDPROC(irq_entries_start)
22748
22749 .previous
22750 END(interrupt)
22751@@ -808,7 +1047,7 @@ ENTRY(coprocessor_error)
22752 pushl_cfi $do_coprocessor_error
22753 jmp error_code
22754 CFI_ENDPROC
22755-END(coprocessor_error)
22756+ENDPROC(coprocessor_error)
22757
22758 ENTRY(simd_coprocessor_error)
22759 RING0_INT_FRAME
22760@@ -821,7 +1060,7 @@ ENTRY(simd_coprocessor_error)
22761 .section .altinstructions,"a"
22762 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22763 .previous
22764-.section .altinstr_replacement,"ax"
22765+.section .altinstr_replacement,"a"
22766 663: pushl $do_simd_coprocessor_error
22767 664:
22768 .previous
22769@@ -830,7 +1069,7 @@ ENTRY(simd_coprocessor_error)
22770 #endif
22771 jmp error_code
22772 CFI_ENDPROC
22773-END(simd_coprocessor_error)
22774+ENDPROC(simd_coprocessor_error)
22775
22776 ENTRY(device_not_available)
22777 RING0_INT_FRAME
22778@@ -839,18 +1078,18 @@ ENTRY(device_not_available)
22779 pushl_cfi $do_device_not_available
22780 jmp error_code
22781 CFI_ENDPROC
22782-END(device_not_available)
22783+ENDPROC(device_not_available)
22784
22785 #ifdef CONFIG_PARAVIRT
22786 ENTRY(native_iret)
22787 iret
22788 _ASM_EXTABLE(native_iret, iret_exc)
22789-END(native_iret)
22790+ENDPROC(native_iret)
22791
22792 ENTRY(native_irq_enable_sysexit)
22793 sti
22794 sysexit
22795-END(native_irq_enable_sysexit)
22796+ENDPROC(native_irq_enable_sysexit)
22797 #endif
22798
22799 ENTRY(overflow)
22800@@ -860,7 +1099,7 @@ ENTRY(overflow)
22801 pushl_cfi $do_overflow
22802 jmp error_code
22803 CFI_ENDPROC
22804-END(overflow)
22805+ENDPROC(overflow)
22806
22807 ENTRY(bounds)
22808 RING0_INT_FRAME
22809@@ -869,7 +1108,7 @@ ENTRY(bounds)
22810 pushl_cfi $do_bounds
22811 jmp error_code
22812 CFI_ENDPROC
22813-END(bounds)
22814+ENDPROC(bounds)
22815
22816 ENTRY(invalid_op)
22817 RING0_INT_FRAME
22818@@ -878,7 +1117,7 @@ ENTRY(invalid_op)
22819 pushl_cfi $do_invalid_op
22820 jmp error_code
22821 CFI_ENDPROC
22822-END(invalid_op)
22823+ENDPROC(invalid_op)
22824
22825 ENTRY(coprocessor_segment_overrun)
22826 RING0_INT_FRAME
22827@@ -887,7 +1126,7 @@ ENTRY(coprocessor_segment_overrun)
22828 pushl_cfi $do_coprocessor_segment_overrun
22829 jmp error_code
22830 CFI_ENDPROC
22831-END(coprocessor_segment_overrun)
22832+ENDPROC(coprocessor_segment_overrun)
22833
22834 ENTRY(invalid_TSS)
22835 RING0_EC_FRAME
22836@@ -895,7 +1134,7 @@ ENTRY(invalid_TSS)
22837 pushl_cfi $do_invalid_TSS
22838 jmp error_code
22839 CFI_ENDPROC
22840-END(invalid_TSS)
22841+ENDPROC(invalid_TSS)
22842
22843 ENTRY(segment_not_present)
22844 RING0_EC_FRAME
22845@@ -903,7 +1142,7 @@ ENTRY(segment_not_present)
22846 pushl_cfi $do_segment_not_present
22847 jmp error_code
22848 CFI_ENDPROC
22849-END(segment_not_present)
22850+ENDPROC(segment_not_present)
22851
22852 ENTRY(stack_segment)
22853 RING0_EC_FRAME
22854@@ -911,7 +1150,7 @@ ENTRY(stack_segment)
22855 pushl_cfi $do_stack_segment
22856 jmp error_code
22857 CFI_ENDPROC
22858-END(stack_segment)
22859+ENDPROC(stack_segment)
22860
22861 ENTRY(alignment_check)
22862 RING0_EC_FRAME
22863@@ -919,7 +1158,7 @@ ENTRY(alignment_check)
22864 pushl_cfi $do_alignment_check
22865 jmp error_code
22866 CFI_ENDPROC
22867-END(alignment_check)
22868+ENDPROC(alignment_check)
22869
22870 ENTRY(divide_error)
22871 RING0_INT_FRAME
22872@@ -928,7 +1167,7 @@ ENTRY(divide_error)
22873 pushl_cfi $do_divide_error
22874 jmp error_code
22875 CFI_ENDPROC
22876-END(divide_error)
22877+ENDPROC(divide_error)
22878
22879 #ifdef CONFIG_X86_MCE
22880 ENTRY(machine_check)
22881@@ -938,7 +1177,7 @@ ENTRY(machine_check)
22882 pushl_cfi machine_check_vector
22883 jmp error_code
22884 CFI_ENDPROC
22885-END(machine_check)
22886+ENDPROC(machine_check)
22887 #endif
22888
22889 ENTRY(spurious_interrupt_bug)
22890@@ -948,7 +1187,7 @@ ENTRY(spurious_interrupt_bug)
22891 pushl_cfi $do_spurious_interrupt_bug
22892 jmp error_code
22893 CFI_ENDPROC
22894-END(spurious_interrupt_bug)
22895+ENDPROC(spurious_interrupt_bug)
22896
22897 #ifdef CONFIG_XEN
22898 /* Xen doesn't set %esp to be precisely what the normal sysenter
22899@@ -1054,7 +1293,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22900
22901 ENTRY(mcount)
22902 ret
22903-END(mcount)
22904+ENDPROC(mcount)
22905
22906 ENTRY(ftrace_caller)
22907 pushl %eax
22908@@ -1084,7 +1323,7 @@ ftrace_graph_call:
22909 .globl ftrace_stub
22910 ftrace_stub:
22911 ret
22912-END(ftrace_caller)
22913+ENDPROC(ftrace_caller)
22914
22915 ENTRY(ftrace_regs_caller)
22916 pushf /* push flags before compare (in cs location) */
22917@@ -1182,7 +1421,7 @@ trace:
22918 popl %ecx
22919 popl %eax
22920 jmp ftrace_stub
22921-END(mcount)
22922+ENDPROC(mcount)
22923 #endif /* CONFIG_DYNAMIC_FTRACE */
22924 #endif /* CONFIG_FUNCTION_TRACER */
22925
22926@@ -1200,7 +1439,7 @@ ENTRY(ftrace_graph_caller)
22927 popl %ecx
22928 popl %eax
22929 ret
22930-END(ftrace_graph_caller)
22931+ENDPROC(ftrace_graph_caller)
22932
22933 .globl return_to_handler
22934 return_to_handler:
22935@@ -1261,15 +1500,18 @@ error_code:
22936 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22937 REG_TO_PTGS %ecx
22938 SET_KERNEL_GS %ecx
22939- movl $(__USER_DS), %ecx
22940+ movl $(__KERNEL_DS), %ecx
22941 movl %ecx, %ds
22942 movl %ecx, %es
22943+
22944+ pax_enter_kernel
22945+
22946 TRACE_IRQS_OFF
22947 movl %esp,%eax # pt_regs pointer
22948 call *%edi
22949 jmp ret_from_exception
22950 CFI_ENDPROC
22951-END(page_fault)
22952+ENDPROC(page_fault)
22953
22954 /*
22955 * Debug traps and NMI can happen at the one SYSENTER instruction
22956@@ -1312,7 +1554,7 @@ debug_stack_correct:
22957 call do_debug
22958 jmp ret_from_exception
22959 CFI_ENDPROC
22960-END(debug)
22961+ENDPROC(debug)
22962
22963 /*
22964 * NMI is doubly nasty. It can happen _while_ we're handling
22965@@ -1352,6 +1594,9 @@ nmi_stack_correct:
22966 xorl %edx,%edx # zero error code
22967 movl %esp,%eax # pt_regs pointer
22968 call do_nmi
22969+
22970+ pax_exit_kernel
22971+
22972 jmp restore_all_notrace
22973 CFI_ENDPROC
22974
22975@@ -1389,13 +1634,16 @@ nmi_espfix_stack:
22976 FIXUP_ESPFIX_STACK # %eax == %esp
22977 xorl %edx,%edx # zero error code
22978 call do_nmi
22979+
22980+ pax_exit_kernel
22981+
22982 RESTORE_REGS
22983 lss 12+4(%esp), %esp # back to espfix stack
22984 CFI_ADJUST_CFA_OFFSET -24
22985 jmp irq_return
22986 #endif
22987 CFI_ENDPROC
22988-END(nmi)
22989+ENDPROC(nmi)
22990
22991 ENTRY(int3)
22992 RING0_INT_FRAME
22993@@ -1408,14 +1656,14 @@ ENTRY(int3)
22994 call do_int3
22995 jmp ret_from_exception
22996 CFI_ENDPROC
22997-END(int3)
22998+ENDPROC(int3)
22999
23000 ENTRY(general_protection)
23001 RING0_EC_FRAME
23002 pushl_cfi $do_general_protection
23003 jmp error_code
23004 CFI_ENDPROC
23005-END(general_protection)
23006+ENDPROC(general_protection)
23007
23008 #ifdef CONFIG_KVM_GUEST
23009 ENTRY(async_page_fault)
23010@@ -1424,6 +1672,6 @@ ENTRY(async_page_fault)
23011 pushl_cfi $do_async_page_fault
23012 jmp error_code
23013 CFI_ENDPROC
23014-END(async_page_fault)
23015+ENDPROC(async_page_fault)
23016 #endif
23017
23018diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23019index c0226ab..b1d8cdd 100644
23020--- a/arch/x86/kernel/entry_64.S
23021+++ b/arch/x86/kernel/entry_64.S
23022@@ -59,6 +59,8 @@
23023 #include <asm/smap.h>
23024 #include <asm/pgtable_types.h>
23025 #include <linux/err.h>
23026+#include <asm/pgtable.h>
23027+#include <asm/alternative-asm.h>
23028
23029 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23030 #include <linux/elf-em.h>
23031@@ -81,6 +83,430 @@ ENTRY(native_usergs_sysret64)
23032 ENDPROC(native_usergs_sysret64)
23033 #endif /* CONFIG_PARAVIRT */
23034
23035+ .macro ljmpq sel, off
23036+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23037+ .byte 0x48; ljmp *1234f(%rip)
23038+ .pushsection .rodata
23039+ .align 16
23040+ 1234: .quad \off; .word \sel
23041+ .popsection
23042+#else
23043+ pushq $\sel
23044+ pushq $\off
23045+ lretq
23046+#endif
23047+ .endm
23048+
23049+ .macro pax_enter_kernel
23050+ pax_set_fptr_mask
23051+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23052+ call pax_enter_kernel
23053+#endif
23054+ .endm
23055+
23056+ .macro pax_exit_kernel
23057+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23058+ call pax_exit_kernel
23059+#endif
23060+
23061+ .endm
23062+
23063+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23064+ENTRY(pax_enter_kernel)
23065+ pushq %rdi
23066+
23067+#ifdef CONFIG_PARAVIRT
23068+ PV_SAVE_REGS(CLBR_RDI)
23069+#endif
23070+
23071+#ifdef CONFIG_PAX_KERNEXEC
23072+ GET_CR0_INTO_RDI
23073+ bts $16,%rdi
23074+ jnc 3f
23075+ mov %cs,%edi
23076+ cmp $__KERNEL_CS,%edi
23077+ jnz 2f
23078+1:
23079+#endif
23080+
23081+#ifdef CONFIG_PAX_MEMORY_UDEREF
23082+ 661: jmp 111f
23083+ .pushsection .altinstr_replacement, "a"
23084+ 662: ASM_NOP2
23085+ .popsection
23086+ .pushsection .altinstructions, "a"
23087+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23088+ .popsection
23089+ GET_CR3_INTO_RDI
23090+ cmp $0,%dil
23091+ jnz 112f
23092+ mov $__KERNEL_DS,%edi
23093+ mov %edi,%ss
23094+ jmp 111f
23095+112: cmp $1,%dil
23096+ jz 113f
23097+ ud2
23098+113: sub $4097,%rdi
23099+ bts $63,%rdi
23100+ SET_RDI_INTO_CR3
23101+ mov $__UDEREF_KERNEL_DS,%edi
23102+ mov %edi,%ss
23103+111:
23104+#endif
23105+
23106+#ifdef CONFIG_PARAVIRT
23107+ PV_RESTORE_REGS(CLBR_RDI)
23108+#endif
23109+
23110+ popq %rdi
23111+ pax_force_retaddr
23112+ retq
23113+
23114+#ifdef CONFIG_PAX_KERNEXEC
23115+2: ljmpq __KERNEL_CS,1b
23116+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23117+4: SET_RDI_INTO_CR0
23118+ jmp 1b
23119+#endif
23120+ENDPROC(pax_enter_kernel)
23121+
23122+ENTRY(pax_exit_kernel)
23123+ pushq %rdi
23124+
23125+#ifdef CONFIG_PARAVIRT
23126+ PV_SAVE_REGS(CLBR_RDI)
23127+#endif
23128+
23129+#ifdef CONFIG_PAX_KERNEXEC
23130+ mov %cs,%rdi
23131+ cmp $__KERNEXEC_KERNEL_CS,%edi
23132+ jz 2f
23133+ GET_CR0_INTO_RDI
23134+ bts $16,%rdi
23135+ jnc 4f
23136+1:
23137+#endif
23138+
23139+#ifdef CONFIG_PAX_MEMORY_UDEREF
23140+ 661: jmp 111f
23141+ .pushsection .altinstr_replacement, "a"
23142+ 662: ASM_NOP2
23143+ .popsection
23144+ .pushsection .altinstructions, "a"
23145+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23146+ .popsection
23147+ mov %ss,%edi
23148+ cmp $__UDEREF_KERNEL_DS,%edi
23149+ jnz 111f
23150+ GET_CR3_INTO_RDI
23151+ cmp $0,%dil
23152+ jz 112f
23153+ ud2
23154+112: add $4097,%rdi
23155+ bts $63,%rdi
23156+ SET_RDI_INTO_CR3
23157+ mov $__KERNEL_DS,%edi
23158+ mov %edi,%ss
23159+111:
23160+#endif
23161+
23162+#ifdef CONFIG_PARAVIRT
23163+ PV_RESTORE_REGS(CLBR_RDI);
23164+#endif
23165+
23166+ popq %rdi
23167+ pax_force_retaddr
23168+ retq
23169+
23170+#ifdef CONFIG_PAX_KERNEXEC
23171+2: GET_CR0_INTO_RDI
23172+ btr $16,%rdi
23173+ jnc 4f
23174+ ljmpq __KERNEL_CS,3f
23175+3: SET_RDI_INTO_CR0
23176+ jmp 1b
23177+4: ud2
23178+ jmp 4b
23179+#endif
23180+ENDPROC(pax_exit_kernel)
23181+#endif
23182+
23183+ .macro pax_enter_kernel_user
23184+ pax_set_fptr_mask
23185+#ifdef CONFIG_PAX_MEMORY_UDEREF
23186+ call pax_enter_kernel_user
23187+#endif
23188+ .endm
23189+
23190+ .macro pax_exit_kernel_user
23191+#ifdef CONFIG_PAX_MEMORY_UDEREF
23192+ call pax_exit_kernel_user
23193+#endif
23194+#ifdef CONFIG_PAX_RANDKSTACK
23195+ pushq %rax
23196+ pushq %r11
23197+ call pax_randomize_kstack
23198+ popq %r11
23199+ popq %rax
23200+#endif
23201+ .endm
23202+
23203+#ifdef CONFIG_PAX_MEMORY_UDEREF
23204+ENTRY(pax_enter_kernel_user)
23205+ pushq %rdi
23206+ pushq %rbx
23207+
23208+#ifdef CONFIG_PARAVIRT
23209+ PV_SAVE_REGS(CLBR_RDI)
23210+#endif
23211+
23212+ 661: jmp 111f
23213+ .pushsection .altinstr_replacement, "a"
23214+ 662: ASM_NOP2
23215+ .popsection
23216+ .pushsection .altinstructions, "a"
23217+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23218+ .popsection
23219+ GET_CR3_INTO_RDI
23220+ cmp $1,%dil
23221+ jnz 4f
23222+ sub $4097,%rdi
23223+ bts $63,%rdi
23224+ SET_RDI_INTO_CR3
23225+ jmp 3f
23226+111:
23227+
23228+ GET_CR3_INTO_RDI
23229+ mov %rdi,%rbx
23230+ add $__START_KERNEL_map,%rbx
23231+ sub phys_base(%rip),%rbx
23232+
23233+#ifdef CONFIG_PARAVIRT
23234+ cmpl $0, pv_info+PARAVIRT_enabled
23235+ jz 1f
23236+ pushq %rdi
23237+ i = 0
23238+ .rept USER_PGD_PTRS
23239+ mov i*8(%rbx),%rsi
23240+ mov $0,%sil
23241+ lea i*8(%rbx),%rdi
23242+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23243+ i = i + 1
23244+ .endr
23245+ popq %rdi
23246+ jmp 2f
23247+1:
23248+#endif
23249+
23250+ i = 0
23251+ .rept USER_PGD_PTRS
23252+ movb $0,i*8(%rbx)
23253+ i = i + 1
23254+ .endr
23255+
23256+2: SET_RDI_INTO_CR3
23257+
23258+#ifdef CONFIG_PAX_KERNEXEC
23259+ GET_CR0_INTO_RDI
23260+ bts $16,%rdi
23261+ SET_RDI_INTO_CR0
23262+#endif
23263+
23264+3:
23265+
23266+#ifdef CONFIG_PARAVIRT
23267+ PV_RESTORE_REGS(CLBR_RDI)
23268+#endif
23269+
23270+ popq %rbx
23271+ popq %rdi
23272+ pax_force_retaddr
23273+ retq
23274+4: ud2
23275+ENDPROC(pax_enter_kernel_user)
23276+
23277+ENTRY(pax_exit_kernel_user)
23278+ pushq %rdi
23279+ pushq %rbx
23280+
23281+#ifdef CONFIG_PARAVIRT
23282+ PV_SAVE_REGS(CLBR_RDI)
23283+#endif
23284+
23285+ GET_CR3_INTO_RDI
23286+ 661: jmp 1f
23287+ .pushsection .altinstr_replacement, "a"
23288+ 662: ASM_NOP2
23289+ .popsection
23290+ .pushsection .altinstructions, "a"
23291+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23292+ .popsection
23293+ cmp $0,%dil
23294+ jnz 3f
23295+ add $4097,%rdi
23296+ bts $63,%rdi
23297+ SET_RDI_INTO_CR3
23298+ jmp 2f
23299+1:
23300+
23301+ mov %rdi,%rbx
23302+
23303+#ifdef CONFIG_PAX_KERNEXEC
23304+ GET_CR0_INTO_RDI
23305+ btr $16,%rdi
23306+ jnc 3f
23307+ SET_RDI_INTO_CR0
23308+#endif
23309+
23310+ add $__START_KERNEL_map,%rbx
23311+ sub phys_base(%rip),%rbx
23312+
23313+#ifdef CONFIG_PARAVIRT
23314+ cmpl $0, pv_info+PARAVIRT_enabled
23315+ jz 1f
23316+ i = 0
23317+ .rept USER_PGD_PTRS
23318+ mov i*8(%rbx),%rsi
23319+ mov $0x67,%sil
23320+ lea i*8(%rbx),%rdi
23321+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23322+ i = i + 1
23323+ .endr
23324+ jmp 2f
23325+1:
23326+#endif
23327+
23328+ i = 0
23329+ .rept USER_PGD_PTRS
23330+ movb $0x67,i*8(%rbx)
23331+ i = i + 1
23332+ .endr
23333+2:
23334+
23335+#ifdef CONFIG_PARAVIRT
23336+ PV_RESTORE_REGS(CLBR_RDI)
23337+#endif
23338+
23339+ popq %rbx
23340+ popq %rdi
23341+ pax_force_retaddr
23342+ retq
23343+3: ud2
23344+ENDPROC(pax_exit_kernel_user)
23345+#endif
23346+
23347+ .macro pax_enter_kernel_nmi
23348+ pax_set_fptr_mask
23349+
23350+#ifdef CONFIG_PAX_KERNEXEC
23351+ GET_CR0_INTO_RDI
23352+ bts $16,%rdi
23353+ jc 110f
23354+ SET_RDI_INTO_CR0
23355+ or $2,%ebx
23356+110:
23357+#endif
23358+
23359+#ifdef CONFIG_PAX_MEMORY_UDEREF
23360+ 661: jmp 111f
23361+ .pushsection .altinstr_replacement, "a"
23362+ 662: ASM_NOP2
23363+ .popsection
23364+ .pushsection .altinstructions, "a"
23365+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23366+ .popsection
23367+ GET_CR3_INTO_RDI
23368+ cmp $0,%dil
23369+ jz 111f
23370+ sub $4097,%rdi
23371+ or $4,%ebx
23372+ bts $63,%rdi
23373+ SET_RDI_INTO_CR3
23374+ mov $__UDEREF_KERNEL_DS,%edi
23375+ mov %edi,%ss
23376+111:
23377+#endif
23378+ .endm
23379+
23380+ .macro pax_exit_kernel_nmi
23381+#ifdef CONFIG_PAX_KERNEXEC
23382+ btr $1,%ebx
23383+ jnc 110f
23384+ GET_CR0_INTO_RDI
23385+ btr $16,%rdi
23386+ SET_RDI_INTO_CR0
23387+110:
23388+#endif
23389+
23390+#ifdef CONFIG_PAX_MEMORY_UDEREF
23391+ btr $2,%ebx
23392+ jnc 111f
23393+ GET_CR3_INTO_RDI
23394+ add $4097,%rdi
23395+ bts $63,%rdi
23396+ SET_RDI_INTO_CR3
23397+ mov $__KERNEL_DS,%edi
23398+ mov %edi,%ss
23399+111:
23400+#endif
23401+ .endm
23402+
23403+ .macro pax_erase_kstack
23404+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23405+ call pax_erase_kstack
23406+#endif
23407+ .endm
23408+
23409+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23410+ENTRY(pax_erase_kstack)
23411+ pushq %rdi
23412+ pushq %rcx
23413+ pushq %rax
23414+ pushq %r11
23415+
23416+ GET_THREAD_INFO(%r11)
23417+ mov TI_lowest_stack(%r11), %rdi
23418+ mov $-0xBEEF, %rax
23419+ std
23420+
23421+1: mov %edi, %ecx
23422+ and $THREAD_SIZE_asm - 1, %ecx
23423+ shr $3, %ecx
23424+ repne scasq
23425+ jecxz 2f
23426+
23427+ cmp $2*8, %ecx
23428+ jc 2f
23429+
23430+ mov $2*8, %ecx
23431+ repe scasq
23432+ jecxz 2f
23433+ jne 1b
23434+
23435+2: cld
23436+ mov %esp, %ecx
23437+ sub %edi, %ecx
23438+
23439+ cmp $THREAD_SIZE_asm, %rcx
23440+ jb 3f
23441+ ud2
23442+3:
23443+
23444+ shr $3, %ecx
23445+ rep stosq
23446+
23447+ mov TI_task_thread_sp0(%r11), %rdi
23448+ sub $256, %rdi
23449+ mov %rdi, TI_lowest_stack(%r11)
23450+
23451+ popq %r11
23452+ popq %rax
23453+ popq %rcx
23454+ popq %rdi
23455+ pax_force_retaddr
23456+ ret
23457+ENDPROC(pax_erase_kstack)
23458+#endif
23459
23460 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23461 #ifdef CONFIG_TRACE_IRQFLAGS
23462@@ -117,7 +543,7 @@ ENDPROC(native_usergs_sysret64)
23463 .endm
23464
23465 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23466- bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23467+ bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23468 jnc 1f
23469 TRACE_IRQS_ON_DEBUG
23470 1:
23471@@ -155,27 +581,6 @@ ENDPROC(native_usergs_sysret64)
23472 movq \tmp,R11+\offset(%rsp)
23473 .endm
23474
23475- .macro FAKE_STACK_FRAME child_rip
23476- /* push in order ss, rsp, eflags, cs, rip */
23477- xorl %eax, %eax
23478- pushq_cfi $__KERNEL_DS /* ss */
23479- /*CFI_REL_OFFSET ss,0*/
23480- pushq_cfi %rax /* rsp */
23481- CFI_REL_OFFSET rsp,0
23482- pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
23483- /*CFI_REL_OFFSET rflags,0*/
23484- pushq_cfi $__KERNEL_CS /* cs */
23485- /*CFI_REL_OFFSET cs,0*/
23486- pushq_cfi \child_rip /* rip */
23487- CFI_REL_OFFSET rip,0
23488- pushq_cfi %rax /* orig rax */
23489- .endm
23490-
23491- .macro UNFAKE_STACK_FRAME
23492- addq $8*6, %rsp
23493- CFI_ADJUST_CFA_OFFSET -(6*8)
23494- .endm
23495-
23496 /*
23497 * initial frame state for interrupts (and exceptions without error code)
23498 */
23499@@ -241,25 +646,26 @@ ENDPROC(native_usergs_sysret64)
23500 /* save partial stack frame */
23501 .macro SAVE_ARGS_IRQ
23502 cld
23503- /* start from rbp in pt_regs and jump over */
23504- movq_cfi rdi, (RDI-RBP)
23505- movq_cfi rsi, (RSI-RBP)
23506- movq_cfi rdx, (RDX-RBP)
23507- movq_cfi rcx, (RCX-RBP)
23508- movq_cfi rax, (RAX-RBP)
23509- movq_cfi r8, (R8-RBP)
23510- movq_cfi r9, (R9-RBP)
23511- movq_cfi r10, (R10-RBP)
23512- movq_cfi r11, (R11-RBP)
23513+ /* start from r15 in pt_regs and jump over */
23514+ movq_cfi rdi, RDI
23515+ movq_cfi rsi, RSI
23516+ movq_cfi rdx, RDX
23517+ movq_cfi rcx, RCX
23518+ movq_cfi rax, RAX
23519+ movq_cfi r8, R8
23520+ movq_cfi r9, R9
23521+ movq_cfi r10, R10
23522+ movq_cfi r11, R11
23523+ movq_cfi r12, R12
23524
23525 /* Save rbp so that we can unwind from get_irq_regs() */
23526- movq_cfi rbp, 0
23527+ movq_cfi rbp, RBP
23528
23529 /* Save previous stack value */
23530 movq %rsp, %rsi
23531
23532- leaq -RBP(%rsp),%rdi /* arg1 for handler */
23533- testl $3, CS-RBP(%rsi)
23534+ movq %rsp,%rdi /* arg1 for handler */
23535+ testb $3, CS(%rsi)
23536 je 1f
23537 SWAPGS
23538 /*
23539@@ -279,6 +685,18 @@ ENDPROC(native_usergs_sysret64)
23540 0x06 /* DW_OP_deref */, \
23541 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23542 0x22 /* DW_OP_plus */
23543+
23544+#ifdef CONFIG_PAX_MEMORY_UDEREF
23545+ testb $3, CS(%rdi)
23546+ jnz 1f
23547+ pax_enter_kernel
23548+ jmp 2f
23549+1: pax_enter_kernel_user
23550+2:
23551+#else
23552+ pax_enter_kernel
23553+#endif
23554+
23555 /* We entered an interrupt context - irqs are off: */
23556 TRACE_IRQS_OFF
23557 .endm
23558@@ -308,9 +726,52 @@ ENTRY(save_paranoid)
23559 js 1f /* negative -> in kernel */
23560 SWAPGS
23561 xorl %ebx,%ebx
23562-1: ret
23563+1:
23564+#ifdef CONFIG_PAX_MEMORY_UDEREF
23565+ testb $3, CS+8(%rsp)
23566+ jnz 1f
23567+ pax_enter_kernel
23568+ jmp 2f
23569+1: pax_enter_kernel_user
23570+2:
23571+#else
23572+ pax_enter_kernel
23573+#endif
23574+ pax_force_retaddr
23575+ ret
23576 CFI_ENDPROC
23577-END(save_paranoid)
23578+ENDPROC(save_paranoid)
23579+
23580+ENTRY(save_paranoid_nmi)
23581+ XCPT_FRAME 1 RDI+8
23582+ cld
23583+ movq_cfi rdi, RDI+8
23584+ movq_cfi rsi, RSI+8
23585+ movq_cfi rdx, RDX+8
23586+ movq_cfi rcx, RCX+8
23587+ movq_cfi rax, RAX+8
23588+ movq_cfi r8, R8+8
23589+ movq_cfi r9, R9+8
23590+ movq_cfi r10, R10+8
23591+ movq_cfi r11, R11+8
23592+ movq_cfi rbx, RBX+8
23593+ movq_cfi rbp, RBP+8
23594+ movq_cfi r12, R12+8
23595+ movq_cfi r13, R13+8
23596+ movq_cfi r14, R14+8
23597+ movq_cfi r15, R15+8
23598+ movl $1,%ebx
23599+ movl $MSR_GS_BASE,%ecx
23600+ rdmsr
23601+ testl %edx,%edx
23602+ js 1f /* negative -> in kernel */
23603+ SWAPGS
23604+ xorl %ebx,%ebx
23605+1: pax_enter_kernel_nmi
23606+ pax_force_retaddr
23607+ ret
23608+ CFI_ENDPROC
23609+ENDPROC(save_paranoid_nmi)
23610
23611 /*
23612 * A newly forked process directly context switches into this address.
23613@@ -331,7 +792,7 @@ ENTRY(ret_from_fork)
23614
23615 RESTORE_REST
23616
23617- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23618+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23619 jz 1f
23620
23621 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
23622@@ -341,15 +802,13 @@ ENTRY(ret_from_fork)
23623 jmp ret_from_sys_call # go to the SYSRET fastpath
23624
23625 1:
23626- subq $REST_SKIP, %rsp # leave space for volatiles
23627- CFI_ADJUST_CFA_OFFSET REST_SKIP
23628 movq %rbp, %rdi
23629 call *%rbx
23630 movl $0, RAX(%rsp)
23631 RESTORE_REST
23632 jmp int_ret_from_sys_call
23633 CFI_ENDPROC
23634-END(ret_from_fork)
23635+ENDPROC(ret_from_fork)
23636
23637 /*
23638 * System call entry. Up to 6 arguments in registers are supported.
23639@@ -386,7 +845,7 @@ END(ret_from_fork)
23640 ENTRY(system_call)
23641 CFI_STARTPROC simple
23642 CFI_SIGNAL_FRAME
23643- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23644+ CFI_DEF_CFA rsp,0
23645 CFI_REGISTER rip,rcx
23646 /*CFI_REGISTER rflags,r11*/
23647 SWAPGS_UNSAFE_STACK
23648@@ -399,16 +858,23 @@ GLOBAL(system_call_after_swapgs)
23649
23650 movq %rsp,PER_CPU_VAR(old_rsp)
23651 movq PER_CPU_VAR(kernel_stack),%rsp
23652+ SAVE_ARGS 8*6, 0, rax_enosys=1
23653+ pax_enter_kernel_user
23654+
23655+#ifdef CONFIG_PAX_RANDKSTACK
23656+ pax_erase_kstack
23657+#endif
23658+
23659 /*
23660 * No need to follow this irqs off/on section - it's straight
23661 * and short:
23662 */
23663 ENABLE_INTERRUPTS(CLBR_NONE)
23664- SAVE_ARGS 8, 0, rax_enosys=1
23665 movq_cfi rax,(ORIG_RAX-ARGOFFSET)
23666 movq %rcx,RIP-ARGOFFSET(%rsp)
23667 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23668- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23669+ GET_THREAD_INFO(%rcx)
23670+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23671 jnz tracesys
23672 system_call_fastpath:
23673 #if __SYSCALL_MASK == ~0
23674@@ -432,10 +898,13 @@ sysret_check:
23675 LOCKDEP_SYS_EXIT
23676 DISABLE_INTERRUPTS(CLBR_NONE)
23677 TRACE_IRQS_OFF
23678- movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
23679+ GET_THREAD_INFO(%rcx)
23680+ movl TI_flags(%rcx),%edx
23681 andl %edi,%edx
23682 jnz sysret_careful
23683 CFI_REMEMBER_STATE
23684+ pax_exit_kernel_user
23685+ pax_erase_kstack
23686 /*
23687 * sysretq will re-enable interrupts:
23688 */
23689@@ -494,11 +963,14 @@ sysret_audit:
23690
23691 /* Do syscall tracing */
23692 tracesys:
23693- leaq -REST_SKIP(%rsp), %rdi
23694+ movq %rsp, %rdi
23695 movq $AUDIT_ARCH_X86_64, %rsi
23696 call syscall_trace_enter_phase1
23697 test %rax, %rax
23698 jnz tracesys_phase2 /* if needed, run the slow path */
23699+
23700+ pax_erase_kstack
23701+
23702 LOAD_ARGS 0 /* else restore clobbered regs */
23703 jmp system_call_fastpath /* and return to the fast path */
23704
23705@@ -510,12 +982,14 @@ tracesys_phase2:
23706 movq %rax,%rdx
23707 call syscall_trace_enter_phase2
23708
23709+ pax_erase_kstack
23710+
23711 /*
23712 * Reload arg registers from stack in case ptrace changed them.
23713 * We don't reload %rax because syscall_trace_entry_phase2() returned
23714 * the value it wants us to use in the table lookup.
23715 */
23716- LOAD_ARGS ARGOFFSET, 1
23717+ LOAD_ARGS 1
23718 RESTORE_REST
23719 #if __SYSCALL_MASK == ~0
23720 cmpq $__NR_syscall_max,%rax
23721@@ -545,7 +1019,9 @@ GLOBAL(int_with_check)
23722 andl %edi,%edx
23723 jnz int_careful
23724 andl $~TS_COMPAT,TI_status(%rcx)
23725- jmp retint_swapgs
23726+ pax_exit_kernel_user
23727+ pax_erase_kstack
23728+ jmp retint_swapgs_pax
23729
23730 /* Either reschedule or signal or syscall exit tracking needed. */
23731 /* First do a reschedule test. */
23732@@ -591,7 +1067,7 @@ int_restore_rest:
23733 TRACE_IRQS_OFF
23734 jmp int_with_check
23735 CFI_ENDPROC
23736-END(system_call)
23737+ENDPROC(system_call)
23738
23739 .macro FORK_LIKE func
23740 ENTRY(stub_\func)
23741@@ -604,9 +1080,10 @@ ENTRY(stub_\func)
23742 DEFAULT_FRAME 0 8 /* offset 8: return address */
23743 call sys_\func
23744 RESTORE_TOP_OF_STACK %r11, 8
23745- ret $REST_SKIP /* pop extended registers */
23746+ pax_force_retaddr
23747+ ret
23748 CFI_ENDPROC
23749-END(stub_\func)
23750+ENDPROC(stub_\func)
23751 .endm
23752
23753 .macro FIXED_FRAME label,func
23754@@ -616,9 +1093,10 @@ ENTRY(\label)
23755 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23756 call \func
23757 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23758+ pax_force_retaddr
23759 ret
23760 CFI_ENDPROC
23761-END(\label)
23762+ENDPROC(\label)
23763 .endm
23764
23765 FORK_LIKE clone
23766@@ -626,19 +1104,6 @@ END(\label)
23767 FORK_LIKE vfork
23768 FIXED_FRAME stub_iopl, sys_iopl
23769
23770-ENTRY(ptregscall_common)
23771- DEFAULT_FRAME 1 8 /* offset 8: return address */
23772- RESTORE_TOP_OF_STACK %r11, 8
23773- movq_cfi_restore R15+8, r15
23774- movq_cfi_restore R14+8, r14
23775- movq_cfi_restore R13+8, r13
23776- movq_cfi_restore R12+8, r12
23777- movq_cfi_restore RBP+8, rbp
23778- movq_cfi_restore RBX+8, rbx
23779- ret $REST_SKIP /* pop extended registers */
23780- CFI_ENDPROC
23781-END(ptregscall_common)
23782-
23783 ENTRY(stub_execve)
23784 CFI_STARTPROC
23785 addq $8, %rsp
23786@@ -650,7 +1115,7 @@ ENTRY(stub_execve)
23787 RESTORE_REST
23788 jmp int_ret_from_sys_call
23789 CFI_ENDPROC
23790-END(stub_execve)
23791+ENDPROC(stub_execve)
23792
23793 /*
23794 * sigreturn is special because it needs to restore all registers on return.
23795@@ -667,7 +1132,7 @@ ENTRY(stub_rt_sigreturn)
23796 RESTORE_REST
23797 jmp int_ret_from_sys_call
23798 CFI_ENDPROC
23799-END(stub_rt_sigreturn)
23800+ENDPROC(stub_rt_sigreturn)
23801
23802 #ifdef CONFIG_X86_X32_ABI
23803 ENTRY(stub_x32_rt_sigreturn)
23804@@ -681,7 +1146,7 @@ ENTRY(stub_x32_rt_sigreturn)
23805 RESTORE_REST
23806 jmp int_ret_from_sys_call
23807 CFI_ENDPROC
23808-END(stub_x32_rt_sigreturn)
23809+ENDPROC(stub_x32_rt_sigreturn)
23810
23811 ENTRY(stub_x32_execve)
23812 CFI_STARTPROC
23813@@ -695,7 +1160,7 @@ ENTRY(stub_x32_execve)
23814 RESTORE_REST
23815 jmp int_ret_from_sys_call
23816 CFI_ENDPROC
23817-END(stub_x32_execve)
23818+ENDPROC(stub_x32_execve)
23819
23820 #endif
23821
23822@@ -732,7 +1197,7 @@ vector=vector+1
23823 2: jmp common_interrupt
23824 .endr
23825 CFI_ENDPROC
23826-END(irq_entries_start)
23827+ENDPROC(irq_entries_start)
23828
23829 .previous
23830 END(interrupt)
23831@@ -749,8 +1214,8 @@ END(interrupt)
23832 /* 0(%rsp): ~(interrupt number) */
23833 .macro interrupt func
23834 /* reserve pt_regs for scratch regs and rbp */
23835- subq $ORIG_RAX-RBP, %rsp
23836- CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23837+ subq $ORIG_RAX, %rsp
23838+ CFI_ADJUST_CFA_OFFSET ORIG_RAX
23839 SAVE_ARGS_IRQ
23840 call \func
23841 .endm
23842@@ -773,14 +1238,14 @@ ret_from_intr:
23843
23844 /* Restore saved previous stack */
23845 popq %rsi
23846- CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23847- leaq ARGOFFSET-RBP(%rsi), %rsp
23848+ CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23849+ movq %rsi, %rsp
23850 CFI_DEF_CFA_REGISTER rsp
23851- CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23852+ CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23853
23854 exit_intr:
23855 GET_THREAD_INFO(%rcx)
23856- testl $3,CS-ARGOFFSET(%rsp)
23857+ testb $3,CS-ARGOFFSET(%rsp)
23858 je retint_kernel
23859
23860 /* Interrupt came from user space */
23861@@ -802,12 +1267,35 @@ retint_swapgs: /* return to user-space */
23862 * The iretq could re-enable interrupts:
23863 */
23864 DISABLE_INTERRUPTS(CLBR_ANY)
23865+ pax_exit_kernel_user
23866+retint_swapgs_pax:
23867 TRACE_IRQS_IRETQ
23868 SWAPGS
23869 jmp restore_args
23870
23871 retint_restore_args: /* return to kernel space */
23872 DISABLE_INTERRUPTS(CLBR_ANY)
23873+ pax_exit_kernel
23874+
23875+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23876+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23877+ * namely calling EFI runtime services with a phys mapping. We're
23878+ * starting off with NOPs and patch in the real instrumentation
23879+ * (BTS/OR) before starting any userland process; even before starting
23880+ * up the APs.
23881+ */
23882+ .pushsection .altinstr_replacement, "a"
23883+ 601: pax_force_retaddr (RIP-ARGOFFSET)
23884+ 602:
23885+ .popsection
23886+ 603: .fill 602b-601b, 1, 0x90
23887+ .pushsection .altinstructions, "a"
23888+ altinstruction_entry 603b, 601b, X86_FEATURE_ALWAYS, 602b-601b, 602b-601b
23889+ .popsection
23890+#else
23891+ pax_force_retaddr (RIP-ARGOFFSET)
23892+#endif
23893+
23894 /*
23895 * The iretq could re-enable interrupts:
23896 */
23897@@ -907,7 +1395,7 @@ ENTRY(retint_kernel)
23898 jmp exit_intr
23899 #endif
23900 CFI_ENDPROC
23901-END(common_interrupt)
23902+ENDPROC(common_interrupt)
23903
23904 /*
23905 * APIC interrupts.
23906@@ -921,7 +1409,7 @@ ENTRY(\sym)
23907 interrupt \do_sym
23908 jmp ret_from_intr
23909 CFI_ENDPROC
23910-END(\sym)
23911+ENDPROC(\sym)
23912 .endm
23913
23914 #ifdef CONFIG_TRACING
23915@@ -994,7 +1482,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23916 /*
23917 * Exception entry points.
23918 */
23919-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23920+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23921
23922 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23923 ENTRY(\sym)
23924@@ -1045,6 +1533,12 @@ ENTRY(\sym)
23925 .endif
23926
23927 .if \shift_ist != -1
23928+#ifdef CONFIG_SMP
23929+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23930+ lea init_tss(%r13), %r13
23931+#else
23932+ lea init_tss(%rip), %r13
23933+#endif
23934 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
23935 .endif
23936
23937@@ -1061,7 +1555,7 @@ ENTRY(\sym)
23938 .endif
23939
23940 CFI_ENDPROC
23941-END(\sym)
23942+ENDPROC(\sym)
23943 .endm
23944
23945 #ifdef CONFIG_TRACING
23946@@ -1102,9 +1596,10 @@ gs_change:
23947 2: mfence /* workaround */
23948 SWAPGS
23949 popfq_cfi
23950+ pax_force_retaddr
23951 ret
23952 CFI_ENDPROC
23953-END(native_load_gs_index)
23954+ENDPROC(native_load_gs_index)
23955
23956 _ASM_EXTABLE(gs_change,bad_gs)
23957 .section .fixup,"ax"
23958@@ -1132,9 +1627,10 @@ ENTRY(do_softirq_own_stack)
23959 CFI_DEF_CFA_REGISTER rsp
23960 CFI_ADJUST_CFA_OFFSET -8
23961 decl PER_CPU_VAR(irq_count)
23962+ pax_force_retaddr
23963 ret
23964 CFI_ENDPROC
23965-END(do_softirq_own_stack)
23966+ENDPROC(do_softirq_own_stack)
23967
23968 #ifdef CONFIG_XEN
23969 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
23970@@ -1172,7 +1668,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
23971 decl PER_CPU_VAR(irq_count)
23972 jmp error_exit
23973 CFI_ENDPROC
23974-END(xen_do_hypervisor_callback)
23975+ENDPROC(xen_do_hypervisor_callback)
23976
23977 /*
23978 * Hypervisor uses this for application faults while it executes.
23979@@ -1231,7 +1727,7 @@ ENTRY(xen_failsafe_callback)
23980 SAVE_ALL
23981 jmp error_exit
23982 CFI_ENDPROC
23983-END(xen_failsafe_callback)
23984+ENDPROC(xen_failsafe_callback)
23985
23986 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
23987 xen_hvm_callback_vector xen_evtchn_do_upcall
23988@@ -1278,18 +1774,33 @@ ENTRY(paranoid_exit)
23989 DEFAULT_FRAME
23990 DISABLE_INTERRUPTS(CLBR_NONE)
23991 TRACE_IRQS_OFF_DEBUG
23992- testl %ebx,%ebx /* swapgs needed? */
23993+ testl $1,%ebx /* swapgs needed? */
23994 jnz paranoid_restore
23995- testl $3,CS(%rsp)
23996+ testb $3,CS(%rsp)
23997 jnz paranoid_userspace
23998+#ifdef CONFIG_PAX_MEMORY_UDEREF
23999+ pax_exit_kernel
24000+ TRACE_IRQS_IRETQ 0
24001+ SWAPGS_UNSAFE_STACK
24002+ RESTORE_ALL 8
24003+ pax_force_retaddr_bts
24004+ jmp irq_return
24005+#endif
24006 paranoid_swapgs:
24007+#ifdef CONFIG_PAX_MEMORY_UDEREF
24008+ pax_exit_kernel_user
24009+#else
24010+ pax_exit_kernel
24011+#endif
24012 TRACE_IRQS_IRETQ 0
24013 SWAPGS_UNSAFE_STACK
24014 RESTORE_ALL 8
24015 jmp irq_return
24016 paranoid_restore:
24017+ pax_exit_kernel
24018 TRACE_IRQS_IRETQ_DEBUG 0
24019 RESTORE_ALL 8
24020+ pax_force_retaddr_bts
24021 jmp irq_return
24022 paranoid_userspace:
24023 GET_THREAD_INFO(%rcx)
24024@@ -1318,7 +1829,7 @@ paranoid_schedule:
24025 TRACE_IRQS_OFF
24026 jmp paranoid_userspace
24027 CFI_ENDPROC
24028-END(paranoid_exit)
24029+ENDPROC(paranoid_exit)
24030
24031 /*
24032 * Exception entry point. This expects an error code/orig_rax on the stack.
24033@@ -1345,12 +1856,23 @@ ENTRY(error_entry)
24034 movq %r14, R14+8(%rsp)
24035 movq %r15, R15+8(%rsp)
24036 xorl %ebx,%ebx
24037- testl $3,CS+8(%rsp)
24038+ testb $3,CS+8(%rsp)
24039 je error_kernelspace
24040 error_swapgs:
24041 SWAPGS
24042 error_sti:
24043+#ifdef CONFIG_PAX_MEMORY_UDEREF
24044+ testb $3, CS+8(%rsp)
24045+ jnz 1f
24046+ pax_enter_kernel
24047+ jmp 2f
24048+1: pax_enter_kernel_user
24049+2:
24050+#else
24051+ pax_enter_kernel
24052+#endif
24053 TRACE_IRQS_OFF
24054+ pax_force_retaddr
24055 ret
24056
24057 /*
24058@@ -1385,7 +1907,7 @@ error_bad_iret:
24059 decl %ebx /* Return to usergs */
24060 jmp error_sti
24061 CFI_ENDPROC
24062-END(error_entry)
24063+ENDPROC(error_entry)
24064
24065
24066 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
24067@@ -1396,7 +1918,7 @@ ENTRY(error_exit)
24068 DISABLE_INTERRUPTS(CLBR_NONE)
24069 TRACE_IRQS_OFF
24070 GET_THREAD_INFO(%rcx)
24071- testl %eax,%eax
24072+ testl $1,%eax
24073 jne retint_kernel
24074 LOCKDEP_SYS_EXIT_IRQ
24075 movl TI_flags(%rcx),%edx
24076@@ -1405,7 +1927,7 @@ ENTRY(error_exit)
24077 jnz retint_careful
24078 jmp retint_swapgs
24079 CFI_ENDPROC
24080-END(error_exit)
24081+ENDPROC(error_exit)
24082
24083 /*
24084 * Test if a given stack is an NMI stack or not.
24085@@ -1463,9 +1985,11 @@ ENTRY(nmi)
24086 * If %cs was not the kernel segment, then the NMI triggered in user
24087 * space, which means it is definitely not nested.
24088 */
24089+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
24090+ je 1f
24091 cmpl $__KERNEL_CS, 16(%rsp)
24092 jne first_nmi
24093-
24094+1:
24095 /*
24096 * Check the special variable on the stack to see if NMIs are
24097 * executing.
24098@@ -1499,8 +2023,7 @@ nested_nmi:
24099
24100 1:
24101 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24102- leaq -1*8(%rsp), %rdx
24103- movq %rdx, %rsp
24104+ subq $8, %rsp
24105 CFI_ADJUST_CFA_OFFSET 1*8
24106 leaq -10*8(%rsp), %rdx
24107 pushq_cfi $__KERNEL_DS
24108@@ -1518,6 +2041,7 @@ nested_nmi_out:
24109 CFI_RESTORE rdx
24110
24111 /* No need to check faults here */
24112+# pax_force_retaddr_bts
24113 INTERRUPT_RETURN
24114
24115 CFI_RESTORE_STATE
24116@@ -1614,13 +2138,13 @@ end_repeat_nmi:
24117 subq $ORIG_RAX-R15, %rsp
24118 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
24119 /*
24120- * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
24121+ * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
24122 * as we should not be calling schedule in NMI context.
24123 * Even with normal interrupts enabled. An NMI should not be
24124 * setting NEED_RESCHED or anything that normal interrupts and
24125 * exceptions might do.
24126 */
24127- call save_paranoid
24128+ call save_paranoid_nmi
24129 DEFAULT_FRAME 0
24130
24131 /*
24132@@ -1630,9 +2154,9 @@ end_repeat_nmi:
24133 * NMI itself takes a page fault, the page fault that was preempted
24134 * will read the information from the NMI page fault and not the
24135 * origin fault. Save it off and restore it if it changes.
24136- * Use the r12 callee-saved register.
24137+ * Use the r13 callee-saved register.
24138 */
24139- movq %cr2, %r12
24140+ movq %cr2, %r13
24141
24142 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24143 movq %rsp,%rdi
24144@@ -1641,29 +2165,34 @@ end_repeat_nmi:
24145
24146 /* Did the NMI take a page fault? Restore cr2 if it did */
24147 movq %cr2, %rcx
24148- cmpq %rcx, %r12
24149+ cmpq %rcx, %r13
24150 je 1f
24151- movq %r12, %cr2
24152+ movq %r13, %cr2
24153 1:
24154
24155- testl %ebx,%ebx /* swapgs needed? */
24156+ testl $1,%ebx /* swapgs needed? */
24157 jnz nmi_restore
24158 nmi_swapgs:
24159 SWAPGS_UNSAFE_STACK
24160 nmi_restore:
24161+ pax_exit_kernel_nmi
24162 /* Pop the extra iret frame at once */
24163 RESTORE_ALL 6*8
24164+ testb $3, 8(%rsp)
24165+ jnz 1f
24166+ pax_force_retaddr_bts
24167+1:
24168
24169 /* Clear the NMI executing stack variable */
24170 movq $0, 5*8(%rsp)
24171 jmp irq_return
24172 CFI_ENDPROC
24173-END(nmi)
24174+ENDPROC(nmi)
24175
24176 ENTRY(ignore_sysret)
24177 CFI_STARTPROC
24178 mov $-ENOSYS,%eax
24179 sysret
24180 CFI_ENDPROC
24181-END(ignore_sysret)
24182+ENDPROC(ignore_sysret)
24183
24184diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24185index 94d857f..5bce89c 100644
24186--- a/arch/x86/kernel/espfix_64.c
24187+++ b/arch/x86/kernel/espfix_64.c
24188@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24189 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24190 static void *espfix_pages[ESPFIX_MAX_PAGES];
24191
24192-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24193- __aligned(PAGE_SIZE);
24194+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24195
24196 static unsigned int page_random, slot_random;
24197
24198@@ -122,14 +121,17 @@ static void init_espfix_random(void)
24199 void __init init_espfix_bsp(void)
24200 {
24201 pgd_t *pgd_p;
24202- pteval_t ptemask;
24203-
24204- ptemask = __supported_pte_mask;
24205+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24206
24207 /* Install the espfix pud into the kernel page directory */
24208- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24209+ pgd_p = &init_level4_pgt[index];
24210 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24211
24212+#ifdef CONFIG_PAX_PER_CPU_PGD
24213+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24214+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24215+#endif
24216+
24217 /* Randomize the locations */
24218 init_espfix_random();
24219
24220@@ -197,7 +199,7 @@ void init_espfix_ap(void)
24221 set_pte(&pte_p[n*PTE_STRIDE], pte);
24222
24223 /* Job is done for this CPU and any CPU which shares this page */
24224- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24225+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24226
24227 unlock_done:
24228 mutex_unlock(&espfix_init_mutex);
24229diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24230index 3386dc9..28bdf81 100644
24231--- a/arch/x86/kernel/ftrace.c
24232+++ b/arch/x86/kernel/ftrace.c
24233@@ -88,7 +88,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24234 * kernel identity mapping to modify code.
24235 */
24236 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24237- ip = (unsigned long)__va(__pa_symbol(ip));
24238+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24239
24240 return ip;
24241 }
24242@@ -104,6 +104,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24243 {
24244 unsigned char replaced[MCOUNT_INSN_SIZE];
24245
24246+ ip = ktla_ktva(ip);
24247+
24248 /*
24249 * Note: Due to modules and __init, code can
24250 * disappear and change, we need to protect against faulting
24251@@ -229,7 +231,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24252 unsigned char old[MCOUNT_INSN_SIZE];
24253 int ret;
24254
24255- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24256+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24257
24258 ftrace_update_func = ip;
24259 /* Make sure the breakpoints see the ftrace_update_func update */
24260@@ -310,7 +312,7 @@ static int add_break(unsigned long ip, const char *old)
24261 unsigned char replaced[MCOUNT_INSN_SIZE];
24262 unsigned char brk = BREAKPOINT_INSTRUCTION;
24263
24264- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24265+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24266 return -EFAULT;
24267
24268 /* Make sure it is what we expect it to be */
24269diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24270index eda1a86..8f6df48 100644
24271--- a/arch/x86/kernel/head64.c
24272+++ b/arch/x86/kernel/head64.c
24273@@ -67,12 +67,12 @@ again:
24274 pgd = *pgd_p;
24275
24276 /*
24277- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24278- * critical -- __PAGE_OFFSET would point us back into the dynamic
24279+ * The use of __early_va rather than __va here is critical:
24280+ * __va would point us back into the dynamic
24281 * range and we might end up looping forever...
24282 */
24283 if (pgd)
24284- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24285+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24286 else {
24287 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24288 reset_early_page_tables();
24289@@ -82,13 +82,13 @@ again:
24290 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24291 for (i = 0; i < PTRS_PER_PUD; i++)
24292 pud_p[i] = 0;
24293- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24294+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24295 }
24296 pud_p += pud_index(address);
24297 pud = *pud_p;
24298
24299 if (pud)
24300- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24301+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24302 else {
24303 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24304 reset_early_page_tables();
24305@@ -98,7 +98,7 @@ again:
24306 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24307 for (i = 0; i < PTRS_PER_PMD; i++)
24308 pmd_p[i] = 0;
24309- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24310+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24311 }
24312 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24313 pmd_p[pmd_index(address)] = pmd;
24314@@ -175,7 +175,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24315 if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
24316 early_printk("Kernel alive\n");
24317
24318- clear_page(init_level4_pgt);
24319 /* set init_level4_pgt kernel high mapping*/
24320 init_level4_pgt[511] = early_level4_pgt[511];
24321
24322diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24323index f36bd42..0ab4474 100644
24324--- a/arch/x86/kernel/head_32.S
24325+++ b/arch/x86/kernel/head_32.S
24326@@ -26,6 +26,12 @@
24327 /* Physical address */
24328 #define pa(X) ((X) - __PAGE_OFFSET)
24329
24330+#ifdef CONFIG_PAX_KERNEXEC
24331+#define ta(X) (X)
24332+#else
24333+#define ta(X) ((X) - __PAGE_OFFSET)
24334+#endif
24335+
24336 /*
24337 * References to members of the new_cpu_data structure.
24338 */
24339@@ -55,11 +61,7 @@
24340 * and small than max_low_pfn, otherwise will waste some page table entries
24341 */
24342
24343-#if PTRS_PER_PMD > 1
24344-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24345-#else
24346-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24347-#endif
24348+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24349
24350 /* Number of possible pages in the lowmem region */
24351 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24352@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24353 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24354
24355 /*
24356+ * Real beginning of normal "text" segment
24357+ */
24358+ENTRY(stext)
24359+ENTRY(_stext)
24360+
24361+/*
24362 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24363 * %esi points to the real-mode code as a 32-bit pointer.
24364 * CS and DS must be 4 GB flat segments, but we don't depend on
24365@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24366 * can.
24367 */
24368 __HEAD
24369+
24370+#ifdef CONFIG_PAX_KERNEXEC
24371+ jmp startup_32
24372+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24373+.fill PAGE_SIZE-5,1,0xcc
24374+#endif
24375+
24376 ENTRY(startup_32)
24377 movl pa(stack_start),%ecx
24378
24379@@ -106,6 +121,59 @@ ENTRY(startup_32)
24380 2:
24381 leal -__PAGE_OFFSET(%ecx),%esp
24382
24383+#ifdef CONFIG_SMP
24384+ movl $pa(cpu_gdt_table),%edi
24385+ movl $__per_cpu_load,%eax
24386+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24387+ rorl $16,%eax
24388+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24389+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24390+ movl $__per_cpu_end - 1,%eax
24391+ subl $__per_cpu_start,%eax
24392+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24393+#endif
24394+
24395+#ifdef CONFIG_PAX_MEMORY_UDEREF
24396+ movl $NR_CPUS,%ecx
24397+ movl $pa(cpu_gdt_table),%edi
24398+1:
24399+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24400+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24401+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24402+ addl $PAGE_SIZE_asm,%edi
24403+ loop 1b
24404+#endif
24405+
24406+#ifdef CONFIG_PAX_KERNEXEC
24407+ movl $pa(boot_gdt),%edi
24408+ movl $__LOAD_PHYSICAL_ADDR,%eax
24409+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24410+ rorl $16,%eax
24411+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24412+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24413+ rorl $16,%eax
24414+
24415+ ljmp $(__BOOT_CS),$1f
24416+1:
24417+
24418+ movl $NR_CPUS,%ecx
24419+ movl $pa(cpu_gdt_table),%edi
24420+ addl $__PAGE_OFFSET,%eax
24421+1:
24422+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24423+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24424+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24425+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24426+ rorl $16,%eax
24427+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24428+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24429+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24430+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24431+ rorl $16,%eax
24432+ addl $PAGE_SIZE_asm,%edi
24433+ loop 1b
24434+#endif
24435+
24436 /*
24437 * Clear BSS first so that there are no surprises...
24438 */
24439@@ -201,8 +269,11 @@ ENTRY(startup_32)
24440 movl %eax, pa(max_pfn_mapped)
24441
24442 /* Do early initialization of the fixmap area */
24443- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24444- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24445+#ifdef CONFIG_COMPAT_VDSO
24446+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24447+#else
24448+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24449+#endif
24450 #else /* Not PAE */
24451
24452 page_pde_offset = (__PAGE_OFFSET >> 20);
24453@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24454 movl %eax, pa(max_pfn_mapped)
24455
24456 /* Do early initialization of the fixmap area */
24457- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24458- movl %eax,pa(initial_page_table+0xffc)
24459+#ifdef CONFIG_COMPAT_VDSO
24460+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24461+#else
24462+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24463+#endif
24464 #endif
24465
24466 #ifdef CONFIG_PARAVIRT
24467@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24468 cmpl $num_subarch_entries, %eax
24469 jae bad_subarch
24470
24471- movl pa(subarch_entries)(,%eax,4), %eax
24472- subl $__PAGE_OFFSET, %eax
24473- jmp *%eax
24474+ jmp *pa(subarch_entries)(,%eax,4)
24475
24476 bad_subarch:
24477 WEAK(lguest_entry)
24478@@ -261,10 +333,10 @@ WEAK(xen_entry)
24479 __INITDATA
24480
24481 subarch_entries:
24482- .long default_entry /* normal x86/PC */
24483- .long lguest_entry /* lguest hypervisor */
24484- .long xen_entry /* Xen hypervisor */
24485- .long default_entry /* Moorestown MID */
24486+ .long ta(default_entry) /* normal x86/PC */
24487+ .long ta(lguest_entry) /* lguest hypervisor */
24488+ .long ta(xen_entry) /* Xen hypervisor */
24489+ .long ta(default_entry) /* Moorestown MID */
24490 num_subarch_entries = (. - subarch_entries) / 4
24491 .previous
24492 #else
24493@@ -354,6 +426,7 @@ default_entry:
24494 movl pa(mmu_cr4_features),%eax
24495 movl %eax,%cr4
24496
24497+#ifdef CONFIG_X86_PAE
24498 testb $X86_CR4_PAE, %al # check if PAE is enabled
24499 jz enable_paging
24500
24501@@ -382,6 +455,9 @@ default_entry:
24502 /* Make changes effective */
24503 wrmsr
24504
24505+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24506+#endif
24507+
24508 enable_paging:
24509
24510 /*
24511@@ -449,14 +525,20 @@ is486:
24512 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24513 movl %eax,%ss # after changing gdt.
24514
24515- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24516+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24517 movl %eax,%ds
24518 movl %eax,%es
24519
24520 movl $(__KERNEL_PERCPU), %eax
24521 movl %eax,%fs # set this cpu's percpu
24522
24523+#ifdef CONFIG_CC_STACKPROTECTOR
24524 movl $(__KERNEL_STACK_CANARY),%eax
24525+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24526+ movl $(__USER_DS),%eax
24527+#else
24528+ xorl %eax,%eax
24529+#endif
24530 movl %eax,%gs
24531
24532 xorl %eax,%eax # Clear LDT
24533@@ -512,8 +594,11 @@ setup_once:
24534 * relocation. Manually set base address in stack canary
24535 * segment descriptor.
24536 */
24537- movl $gdt_page,%eax
24538+ movl $cpu_gdt_table,%eax
24539 movl $stack_canary,%ecx
24540+#ifdef CONFIG_SMP
24541+ addl $__per_cpu_load,%ecx
24542+#endif
24543 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24544 shrl $16, %ecx
24545 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24546@@ -548,7 +633,7 @@ ENTRY(early_idt_handler)
24547 cmpl $2,(%esp) # X86_TRAP_NMI
24548 je is_nmi # Ignore NMI
24549
24550- cmpl $2,%ss:early_recursion_flag
24551+ cmpl $1,%ss:early_recursion_flag
24552 je hlt_loop
24553 incl %ss:early_recursion_flag
24554
24555@@ -586,8 +671,8 @@ ENTRY(early_idt_handler)
24556 pushl (20+6*4)(%esp) /* trapno */
24557 pushl $fault_msg
24558 call printk
24559-#endif
24560 call dump_stack
24561+#endif
24562 hlt_loop:
24563 hlt
24564 jmp hlt_loop
24565@@ -607,8 +692,11 @@ ENDPROC(early_idt_handler)
24566 /* This is the default interrupt "handler" :-) */
24567 ALIGN
24568 ignore_int:
24569- cld
24570 #ifdef CONFIG_PRINTK
24571+ cmpl $2,%ss:early_recursion_flag
24572+ je hlt_loop
24573+ incl %ss:early_recursion_flag
24574+ cld
24575 pushl %eax
24576 pushl %ecx
24577 pushl %edx
24578@@ -617,9 +705,6 @@ ignore_int:
24579 movl $(__KERNEL_DS),%eax
24580 movl %eax,%ds
24581 movl %eax,%es
24582- cmpl $2,early_recursion_flag
24583- je hlt_loop
24584- incl early_recursion_flag
24585 pushl 16(%esp)
24586 pushl 24(%esp)
24587 pushl 32(%esp)
24588@@ -653,29 +738,34 @@ ENTRY(setup_once_ref)
24589 /*
24590 * BSS section
24591 */
24592-__PAGE_ALIGNED_BSS
24593- .align PAGE_SIZE
24594 #ifdef CONFIG_X86_PAE
24595+.section .initial_pg_pmd,"a",@progbits
24596 initial_pg_pmd:
24597 .fill 1024*KPMDS,4,0
24598 #else
24599+.section .initial_page_table,"a",@progbits
24600 ENTRY(initial_page_table)
24601 .fill 1024,4,0
24602 #endif
24603+.section .initial_pg_fixmap,"a",@progbits
24604 initial_pg_fixmap:
24605 .fill 1024,4,0
24606+.section .empty_zero_page,"a",@progbits
24607 ENTRY(empty_zero_page)
24608 .fill 4096,1,0
24609+.section .swapper_pg_dir,"a",@progbits
24610 ENTRY(swapper_pg_dir)
24611+#ifdef CONFIG_X86_PAE
24612+ .fill 4,8,0
24613+#else
24614 .fill 1024,4,0
24615+#endif
24616
24617 /*
24618 * This starts the data section.
24619 */
24620 #ifdef CONFIG_X86_PAE
24621-__PAGE_ALIGNED_DATA
24622- /* Page-aligned for the benefit of paravirt? */
24623- .align PAGE_SIZE
24624+.section .initial_page_table,"a",@progbits
24625 ENTRY(initial_page_table)
24626 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24627 # if KPMDS == 3
24628@@ -694,12 +784,20 @@ ENTRY(initial_page_table)
24629 # error "Kernel PMDs should be 1, 2 or 3"
24630 # endif
24631 .align PAGE_SIZE /* needs to be page-sized too */
24632+
24633+#ifdef CONFIG_PAX_PER_CPU_PGD
24634+ENTRY(cpu_pgd)
24635+ .rept 2*NR_CPUS
24636+ .fill 4,8,0
24637+ .endr
24638+#endif
24639+
24640 #endif
24641
24642 .data
24643 .balign 4
24644 ENTRY(stack_start)
24645- .long init_thread_union+THREAD_SIZE
24646+ .long init_thread_union+THREAD_SIZE-8
24647
24648 __INITRODATA
24649 int_msg:
24650@@ -727,7 +825,7 @@ fault_msg:
24651 * segment size, and 32-bit linear address value:
24652 */
24653
24654- .data
24655+.section .rodata,"a",@progbits
24656 .globl boot_gdt_descr
24657 .globl idt_descr
24658
24659@@ -736,7 +834,7 @@ fault_msg:
24660 .word 0 # 32 bit align gdt_desc.address
24661 boot_gdt_descr:
24662 .word __BOOT_DS+7
24663- .long boot_gdt - __PAGE_OFFSET
24664+ .long pa(boot_gdt)
24665
24666 .word 0 # 32-bit align idt_desc.address
24667 idt_descr:
24668@@ -747,7 +845,7 @@ idt_descr:
24669 .word 0 # 32 bit align gdt_desc.address
24670 ENTRY(early_gdt_descr)
24671 .word GDT_ENTRIES*8-1
24672- .long gdt_page /* Overwritten for secondary CPUs */
24673+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24674
24675 /*
24676 * The boot_gdt must mirror the equivalent in setup.S and is
24677@@ -756,5 +854,65 @@ ENTRY(early_gdt_descr)
24678 .align L1_CACHE_BYTES
24679 ENTRY(boot_gdt)
24680 .fill GDT_ENTRY_BOOT_CS,8,0
24681- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24682- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24683+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24684+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24685+
24686+ .align PAGE_SIZE_asm
24687+ENTRY(cpu_gdt_table)
24688+ .rept NR_CPUS
24689+ .quad 0x0000000000000000 /* NULL descriptor */
24690+ .quad 0x0000000000000000 /* 0x0b reserved */
24691+ .quad 0x0000000000000000 /* 0x13 reserved */
24692+ .quad 0x0000000000000000 /* 0x1b reserved */
24693+
24694+#ifdef CONFIG_PAX_KERNEXEC
24695+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24696+#else
24697+ .quad 0x0000000000000000 /* 0x20 unused */
24698+#endif
24699+
24700+ .quad 0x0000000000000000 /* 0x28 unused */
24701+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24702+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24703+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24704+ .quad 0x0000000000000000 /* 0x4b reserved */
24705+ .quad 0x0000000000000000 /* 0x53 reserved */
24706+ .quad 0x0000000000000000 /* 0x5b reserved */
24707+
24708+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24709+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24710+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24711+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24712+
24713+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24714+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24715+
24716+ /*
24717+ * Segments used for calling PnP BIOS have byte granularity.
24718+ * The code segments and data segments have fixed 64k limits,
24719+ * the transfer segment sizes are set at run time.
24720+ */
24721+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24722+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24723+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24724+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24725+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24726+
24727+ /*
24728+ * The APM segments have byte granularity and their bases
24729+ * are set at run time. All have 64k limits.
24730+ */
24731+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24732+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24733+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24734+
24735+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24736+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24737+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24738+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24739+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24740+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24741+
24742+ /* Be sure this is zeroed to avoid false validations in Xen */
24743+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24744+ .endr
24745diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24746index a468c0a..8b5a879 100644
24747--- a/arch/x86/kernel/head_64.S
24748+++ b/arch/x86/kernel/head_64.S
24749@@ -20,6 +20,8 @@
24750 #include <asm/processor-flags.h>
24751 #include <asm/percpu.h>
24752 #include <asm/nops.h>
24753+#include <asm/cpufeature.h>
24754+#include <asm/alternative-asm.h>
24755
24756 #ifdef CONFIG_PARAVIRT
24757 #include <asm/asm-offsets.h>
24758@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24759 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24760 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24761 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24762+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24763+L3_VMALLOC_START = pud_index(VMALLOC_START)
24764+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24765+L3_VMALLOC_END = pud_index(VMALLOC_END)
24766+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24767+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24768
24769 .text
24770 __HEAD
24771@@ -89,11 +97,24 @@ startup_64:
24772 * Fixup the physical addresses in the page table
24773 */
24774 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24775+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24776+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24777+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24778+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24779+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24780
24781- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24782- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24783+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24784+#ifndef CONFIG_XEN
24785+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24786+#endif
24787+
24788+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24789+
24790+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24791+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24792
24793 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24794+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24795
24796 /*
24797 * Set up the identity mapping for the switchover. These
24798@@ -174,11 +195,12 @@ ENTRY(secondary_startup_64)
24799 * after the boot processor executes this code.
24800 */
24801
24802+ orq $-1, %rbp
24803 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24804 1:
24805
24806- /* Enable PAE mode and PGE */
24807- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24808+ /* Enable PAE mode and PSE/PGE */
24809+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24810 movq %rcx, %cr4
24811
24812 /* Setup early boot stage 4 level pagetables. */
24813@@ -199,10 +221,19 @@ ENTRY(secondary_startup_64)
24814 movl $MSR_EFER, %ecx
24815 rdmsr
24816 btsl $_EFER_SCE, %eax /* Enable System Call */
24817- btl $20,%edi /* No Execute supported? */
24818+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24819 jnc 1f
24820 btsl $_EFER_NX, %eax
24821+ cmpq $-1, %rbp
24822+ je 1f
24823 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24824+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24825+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24826+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24827+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24828+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24829+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24830+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24831 1: wrmsr /* Make changes effective */
24832
24833 /* Setup cr0 */
24834@@ -282,6 +313,7 @@ ENTRY(secondary_startup_64)
24835 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24836 * address given in m16:64.
24837 */
24838+ pax_set_fptr_mask
24839 movq initial_code(%rip),%rax
24840 pushq $0 # fake return address to stop unwinder
24841 pushq $__KERNEL_CS # set correct cs
24842@@ -313,7 +345,7 @@ ENDPROC(start_cpu0)
24843 .quad INIT_PER_CPU_VAR(irq_stack_union)
24844
24845 GLOBAL(stack_start)
24846- .quad init_thread_union+THREAD_SIZE-8
24847+ .quad init_thread_union+THREAD_SIZE-16
24848 .word 0
24849 __FINITDATA
24850
24851@@ -391,7 +423,7 @@ ENTRY(early_idt_handler)
24852 call dump_stack
24853 #ifdef CONFIG_KALLSYMS
24854 leaq early_idt_ripmsg(%rip),%rdi
24855- movq 40(%rsp),%rsi # %rip again
24856+ movq 88(%rsp),%rsi # %rip again
24857 call __print_symbol
24858 #endif
24859 #endif /* EARLY_PRINTK */
24860@@ -420,6 +452,7 @@ ENDPROC(early_idt_handler)
24861 early_recursion_flag:
24862 .long 0
24863
24864+ .section .rodata,"a",@progbits
24865 #ifdef CONFIG_EARLY_PRINTK
24866 early_idt_msg:
24867 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24868@@ -447,29 +480,52 @@ NEXT_PAGE(early_level4_pgt)
24869 NEXT_PAGE(early_dynamic_pgts)
24870 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24871
24872- .data
24873+ .section .rodata,"a",@progbits
24874
24875-#ifndef CONFIG_XEN
24876 NEXT_PAGE(init_level4_pgt)
24877- .fill 512,8,0
24878-#else
24879-NEXT_PAGE(init_level4_pgt)
24880- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24881 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24882 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24883+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
24884+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24885+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
24886+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24887+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24888+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24889 .org init_level4_pgt + L4_START_KERNEL*8, 0
24890 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24891 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24892
24893+#ifdef CONFIG_PAX_PER_CPU_PGD
24894+NEXT_PAGE(cpu_pgd)
24895+ .rept 2*NR_CPUS
24896+ .fill 512,8,0
24897+ .endr
24898+#endif
24899+
24900 NEXT_PAGE(level3_ident_pgt)
24901 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24902+#ifdef CONFIG_XEN
24903 .fill 511, 8, 0
24904+#else
24905+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24906+ .fill 510,8,0
24907+#endif
24908+
24909+NEXT_PAGE(level3_vmalloc_start_pgt)
24910+ .fill 512,8,0
24911+
24912+NEXT_PAGE(level3_vmalloc_end_pgt)
24913+ .fill 512,8,0
24914+
24915+NEXT_PAGE(level3_vmemmap_pgt)
24916+ .fill L3_VMEMMAP_START,8,0
24917+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24918+
24919 NEXT_PAGE(level2_ident_pgt)
24920- /* Since I easily can, map the first 1G.
24921+ /* Since I easily can, map the first 2G.
24922 * Don't set NX because code runs from these pages.
24923 */
24924- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
24925-#endif
24926+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
24927
24928 NEXT_PAGE(level3_kernel_pgt)
24929 .fill L3_START_KERNEL,8,0
24930@@ -477,6 +533,9 @@ NEXT_PAGE(level3_kernel_pgt)
24931 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
24932 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24933
24934+NEXT_PAGE(level2_vmemmap_pgt)
24935+ .fill 512,8,0
24936+
24937 NEXT_PAGE(level2_kernel_pgt)
24938 /*
24939 * 512 MB kernel mapping. We spend a full page on this pagetable
24940@@ -494,28 +553,64 @@ NEXT_PAGE(level2_kernel_pgt)
24941 NEXT_PAGE(level2_fixmap_pgt)
24942 .fill 506,8,0
24943 .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24944- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
24945- .fill 5,8,0
24946+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24947+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
24948+ .fill 4,8,0
24949
24950 NEXT_PAGE(level1_fixmap_pgt)
24951 .fill 512,8,0
24952
24953+NEXT_PAGE(level1_vsyscall_pgt)
24954+ .fill 512,8,0
24955+
24956 #undef PMDS
24957
24958- .data
24959+ .align PAGE_SIZE
24960+ENTRY(cpu_gdt_table)
24961+ .rept NR_CPUS
24962+ .quad 0x0000000000000000 /* NULL descriptor */
24963+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
24964+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
24965+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
24966+ .quad 0x00cffb000000ffff /* __USER32_CS */
24967+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
24968+ .quad 0x00affb000000ffff /* __USER_CS */
24969+
24970+#ifdef CONFIG_PAX_KERNEXEC
24971+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
24972+#else
24973+ .quad 0x0 /* unused */
24974+#endif
24975+
24976+ .quad 0,0 /* TSS */
24977+ .quad 0,0 /* LDT */
24978+ .quad 0,0,0 /* three TLS descriptors */
24979+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
24980+ /* asm/segment.h:GDT_ENTRIES must match this */
24981+
24982+#ifdef CONFIG_PAX_MEMORY_UDEREF
24983+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
24984+#else
24985+ .quad 0x0 /* unused */
24986+#endif
24987+
24988+ /* zero the remaining page */
24989+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
24990+ .endr
24991+
24992 .align 16
24993 .globl early_gdt_descr
24994 early_gdt_descr:
24995 .word GDT_ENTRIES*8-1
24996 early_gdt_descr_base:
24997- .quad INIT_PER_CPU_VAR(gdt_page)
24998+ .quad cpu_gdt_table
24999
25000 ENTRY(phys_base)
25001 /* This must match the first entry in level2_kernel_pgt */
25002 .quad 0x0000000000000000
25003
25004 #include "../../x86/xen/xen-head.S"
25005-
25006- __PAGE_ALIGNED_BSS
25007+
25008+ .section .rodata,"a",@progbits
25009 NEXT_PAGE(empty_zero_page)
25010 .skip PAGE_SIZE
25011diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25012index 05fd74f..c3548b1 100644
25013--- a/arch/x86/kernel/i386_ksyms_32.c
25014+++ b/arch/x86/kernel/i386_ksyms_32.c
25015@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25016 EXPORT_SYMBOL(cmpxchg8b_emu);
25017 #endif
25018
25019+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25020+
25021 /* Networking helper routines. */
25022 EXPORT_SYMBOL(csum_partial_copy_generic);
25023+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25024+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25025
25026 EXPORT_SYMBOL(__get_user_1);
25027 EXPORT_SYMBOL(__get_user_2);
25028@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25029 EXPORT_SYMBOL(___preempt_schedule_context);
25030 #endif
25031 #endif
25032+
25033+#ifdef CONFIG_PAX_KERNEXEC
25034+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25035+#endif
25036+
25037+#ifdef CONFIG_PAX_PER_CPU_PGD
25038+EXPORT_SYMBOL(cpu_pgd);
25039+#endif
25040diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
25041index a9a4229..6f4d476 100644
25042--- a/arch/x86/kernel/i387.c
25043+++ b/arch/x86/kernel/i387.c
25044@@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
25045 static inline bool interrupted_user_mode(void)
25046 {
25047 struct pt_regs *regs = get_irq_regs();
25048- return regs && user_mode_vm(regs);
25049+ return regs && user_mode(regs);
25050 }
25051
25052 /*
25053diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25054index e7cc537..67d7372 100644
25055--- a/arch/x86/kernel/i8259.c
25056+++ b/arch/x86/kernel/i8259.c
25057@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25058 static void make_8259A_irq(unsigned int irq)
25059 {
25060 disable_irq_nosync(irq);
25061- io_apic_irqs &= ~(1<<irq);
25062+ io_apic_irqs &= ~(1UL<<irq);
25063 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25064 enable_irq(irq);
25065 }
25066@@ -208,7 +208,7 @@ spurious_8259A_irq:
25067 "spurious 8259A interrupt: IRQ%d.\n", irq);
25068 spurious_irq_mask |= irqmask;
25069 }
25070- atomic_inc(&irq_err_count);
25071+ atomic_inc_unchecked(&irq_err_count);
25072 /*
25073 * Theoretically we do not have to handle this IRQ,
25074 * but in Linux this does not cause problems and is
25075@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25076 /* (slave's support for AEOI in flat mode is to be investigated) */
25077 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25078
25079+ pax_open_kernel();
25080 if (auto_eoi)
25081 /*
25082 * In AEOI mode we just have to mask the interrupt
25083 * when acking.
25084 */
25085- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25086+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25087 else
25088- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25089+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25090+ pax_close_kernel();
25091
25092 udelay(100); /* wait for 8259A to initialize */
25093
25094diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25095index a979b5b..1d6db75 100644
25096--- a/arch/x86/kernel/io_delay.c
25097+++ b/arch/x86/kernel/io_delay.c
25098@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25099 * Quirk table for systems that misbehave (lock up, etc.) if port
25100 * 0x80 is used:
25101 */
25102-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25103+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25104 {
25105 .callback = dmi_io_delay_0xed_port,
25106 .ident = "Compaq Presario V6000",
25107diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25108index 4ddaf66..49d5c18 100644
25109--- a/arch/x86/kernel/ioport.c
25110+++ b/arch/x86/kernel/ioport.c
25111@@ -6,6 +6,7 @@
25112 #include <linux/sched.h>
25113 #include <linux/kernel.h>
25114 #include <linux/capability.h>
25115+#include <linux/security.h>
25116 #include <linux/errno.h>
25117 #include <linux/types.h>
25118 #include <linux/ioport.h>
25119@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25120 return -EINVAL;
25121 if (turn_on && !capable(CAP_SYS_RAWIO))
25122 return -EPERM;
25123+#ifdef CONFIG_GRKERNSEC_IO
25124+ if (turn_on && grsec_disable_privio) {
25125+ gr_handle_ioperm();
25126+ return -ENODEV;
25127+ }
25128+#endif
25129
25130 /*
25131 * If it's the first ioperm() call in this thread's lifetime, set the
25132@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25133 * because the ->io_bitmap_max value must match the bitmap
25134 * contents:
25135 */
25136- tss = &per_cpu(init_tss, get_cpu());
25137+ tss = init_tss + get_cpu();
25138
25139 if (turn_on)
25140 bitmap_clear(t->io_bitmap_ptr, from, num);
25141@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25142 if (level > old) {
25143 if (!capable(CAP_SYS_RAWIO))
25144 return -EPERM;
25145+#ifdef CONFIG_GRKERNSEC_IO
25146+ if (grsec_disable_privio) {
25147+ gr_handle_iopl();
25148+ return -ENODEV;
25149+ }
25150+#endif
25151 }
25152 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25153 t->iopl = level << 12;
25154diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25155index 922d285..6d20692 100644
25156--- a/arch/x86/kernel/irq.c
25157+++ b/arch/x86/kernel/irq.c
25158@@ -22,7 +22,7 @@
25159 #define CREATE_TRACE_POINTS
25160 #include <asm/trace/irq_vectors.h>
25161
25162-atomic_t irq_err_count;
25163+atomic_unchecked_t irq_err_count;
25164
25165 /* Function pointer for generic interrupt vector handling */
25166 void (*x86_platform_ipi_callback)(void) = NULL;
25167@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25168 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25169 seq_printf(p, " Hypervisor callback interrupts\n");
25170 #endif
25171- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25172+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25173 #if defined(CONFIG_X86_IO_APIC)
25174- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25175+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25176 #endif
25177 return 0;
25178 }
25179@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25180
25181 u64 arch_irq_stat(void)
25182 {
25183- u64 sum = atomic_read(&irq_err_count);
25184+ u64 sum = atomic_read_unchecked(&irq_err_count);
25185 return sum;
25186 }
25187
25188diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25189index 63ce838..2ea3e06 100644
25190--- a/arch/x86/kernel/irq_32.c
25191+++ b/arch/x86/kernel/irq_32.c
25192@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25193
25194 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25195
25196+extern void gr_handle_kernel_exploit(void);
25197+
25198 int sysctl_panic_on_stackoverflow __read_mostly;
25199
25200 /* Debugging check for stack overflow: is there less than 1KB free? */
25201@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25202 __asm__ __volatile__("andl %%esp,%0" :
25203 "=r" (sp) : "0" (THREAD_SIZE - 1));
25204
25205- return sp < (sizeof(struct thread_info) + STACK_WARN);
25206+ return sp < STACK_WARN;
25207 }
25208
25209 static void print_stack_overflow(void)
25210 {
25211 printk(KERN_WARNING "low stack detected by irq handler\n");
25212 dump_stack();
25213+ gr_handle_kernel_exploit();
25214 if (sysctl_panic_on_stackoverflow)
25215 panic("low stack detected by irq handler - check messages\n");
25216 }
25217@@ -84,10 +87,9 @@ static inline void *current_stack(void)
25218 static inline int
25219 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25220 {
25221- struct irq_stack *curstk, *irqstk;
25222+ struct irq_stack *irqstk;
25223 u32 *isp, *prev_esp, arg1, arg2;
25224
25225- curstk = (struct irq_stack *) current_stack();
25226 irqstk = __this_cpu_read(hardirq_stack);
25227
25228 /*
25229@@ -96,15 +98,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25230 * handler) we can't do that and just have to keep using the
25231 * current stack (which is the irq stack already after all)
25232 */
25233- if (unlikely(curstk == irqstk))
25234+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25235 return 0;
25236
25237- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25238+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25239
25240 /* Save the next esp at the bottom of the stack */
25241 prev_esp = (u32 *)irqstk;
25242 *prev_esp = current_stack_pointer;
25243
25244+#ifdef CONFIG_PAX_MEMORY_UDEREF
25245+ __set_fs(MAKE_MM_SEG(0));
25246+#endif
25247+
25248 if (unlikely(overflow))
25249 call_on_stack(print_stack_overflow, isp);
25250
25251@@ -115,6 +121,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25252 : "0" (irq), "1" (desc), "2" (isp),
25253 "D" (desc->handle_irq)
25254 : "memory", "cc", "ecx");
25255+
25256+#ifdef CONFIG_PAX_MEMORY_UDEREF
25257+ __set_fs(current_thread_info()->addr_limit);
25258+#endif
25259+
25260 return 1;
25261 }
25262
25263@@ -123,32 +134,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25264 */
25265 void irq_ctx_init(int cpu)
25266 {
25267- struct irq_stack *irqstk;
25268-
25269 if (per_cpu(hardirq_stack, cpu))
25270 return;
25271
25272- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25273- THREADINFO_GFP,
25274- THREAD_SIZE_ORDER));
25275- per_cpu(hardirq_stack, cpu) = irqstk;
25276-
25277- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25278- THREADINFO_GFP,
25279- THREAD_SIZE_ORDER));
25280- per_cpu(softirq_stack, cpu) = irqstk;
25281-
25282- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25283- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25284+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25285+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25286 }
25287
25288 void do_softirq_own_stack(void)
25289 {
25290- struct thread_info *curstk;
25291 struct irq_stack *irqstk;
25292 u32 *isp, *prev_esp;
25293
25294- curstk = current_stack();
25295 irqstk = __this_cpu_read(softirq_stack);
25296
25297 /* build the stack frame on the softirq stack */
25298@@ -158,7 +155,16 @@ void do_softirq_own_stack(void)
25299 prev_esp = (u32 *)irqstk;
25300 *prev_esp = current_stack_pointer;
25301
25302+#ifdef CONFIG_PAX_MEMORY_UDEREF
25303+ __set_fs(MAKE_MM_SEG(0));
25304+#endif
25305+
25306 call_on_stack(__do_softirq, isp);
25307+
25308+#ifdef CONFIG_PAX_MEMORY_UDEREF
25309+ __set_fs(current_thread_info()->addr_limit);
25310+#endif
25311+
25312 }
25313
25314 bool handle_irq(unsigned irq, struct pt_regs *regs)
25315@@ -172,7 +178,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25316 if (unlikely(!desc))
25317 return false;
25318
25319- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25320+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25321 if (unlikely(overflow))
25322 print_stack_overflow();
25323 desc->handle_irq(irq, desc);
25324diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25325index e4b503d..824fce8 100644
25326--- a/arch/x86/kernel/irq_64.c
25327+++ b/arch/x86/kernel/irq_64.c
25328@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25329 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25330 EXPORT_PER_CPU_SYMBOL(irq_regs);
25331
25332+extern void gr_handle_kernel_exploit(void);
25333+
25334 int sysctl_panic_on_stackoverflow;
25335
25336 /*
25337@@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25338 u64 estack_top, estack_bottom;
25339 u64 curbase = (u64)task_stack_page(current);
25340
25341- if (user_mode_vm(regs))
25342+ if (user_mode(regs))
25343 return;
25344
25345 if (regs->sp >= curbase + sizeof(struct thread_info) +
25346@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25347 irq_stack_top, irq_stack_bottom,
25348 estack_top, estack_bottom);
25349
25350+ gr_handle_kernel_exploit();
25351+
25352 if (sysctl_panic_on_stackoverflow)
25353 panic("low stack detected by irq handler - check messages\n");
25354 #endif
25355diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25356index 26d5a55..a01160a 100644
25357--- a/arch/x86/kernel/jump_label.c
25358+++ b/arch/x86/kernel/jump_label.c
25359@@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25360 * Jump label is enabled for the first time.
25361 * So we expect a default_nop...
25362 */
25363- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25364+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25365 != 0))
25366 bug_at((void *)entry->code, __LINE__);
25367 } else {
25368@@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25369 * ...otherwise expect an ideal_nop. Otherwise
25370 * something went horribly wrong.
25371 */
25372- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25373+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25374 != 0))
25375 bug_at((void *)entry->code, __LINE__);
25376 }
25377@@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25378 * are converting the default nop to the ideal nop.
25379 */
25380 if (init) {
25381- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25382+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25383 bug_at((void *)entry->code, __LINE__);
25384 } else {
25385 code.jump = 0xe9;
25386 code.offset = entry->target -
25387 (entry->code + JUMP_LABEL_NOP_SIZE);
25388- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25389+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25390 bug_at((void *)entry->code, __LINE__);
25391 }
25392 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25393diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25394index 7ec1d5f..5a7d130 100644
25395--- a/arch/x86/kernel/kgdb.c
25396+++ b/arch/x86/kernel/kgdb.c
25397@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25398 #ifdef CONFIG_X86_32
25399 switch (regno) {
25400 case GDB_SS:
25401- if (!user_mode_vm(regs))
25402+ if (!user_mode(regs))
25403 *(unsigned long *)mem = __KERNEL_DS;
25404 break;
25405 case GDB_SP:
25406- if (!user_mode_vm(regs))
25407+ if (!user_mode(regs))
25408 *(unsigned long *)mem = kernel_stack_pointer(regs);
25409 break;
25410 case GDB_GS:
25411@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25412 bp->attr.bp_addr = breakinfo[breakno].addr;
25413 bp->attr.bp_len = breakinfo[breakno].len;
25414 bp->attr.bp_type = breakinfo[breakno].type;
25415- info->address = breakinfo[breakno].addr;
25416+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25417+ info->address = ktla_ktva(breakinfo[breakno].addr);
25418+ else
25419+ info->address = breakinfo[breakno].addr;
25420 info->len = breakinfo[breakno].len;
25421 info->type = breakinfo[breakno].type;
25422 val = arch_install_hw_breakpoint(bp);
25423@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25424 case 'k':
25425 /* clear the trace bit */
25426 linux_regs->flags &= ~X86_EFLAGS_TF;
25427- atomic_set(&kgdb_cpu_doing_single_step, -1);
25428+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25429
25430 /* set the trace bit if we're stepping */
25431 if (remcomInBuffer[0] == 's') {
25432 linux_regs->flags |= X86_EFLAGS_TF;
25433- atomic_set(&kgdb_cpu_doing_single_step,
25434+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25435 raw_smp_processor_id());
25436 }
25437
25438@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25439
25440 switch (cmd) {
25441 case DIE_DEBUG:
25442- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25443+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25444 if (user_mode(regs))
25445 return single_step_cont(regs, args);
25446 break;
25447@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25448 #endif /* CONFIG_DEBUG_RODATA */
25449
25450 bpt->type = BP_BREAKPOINT;
25451- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25452+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25453 BREAK_INSTR_SIZE);
25454 if (err)
25455 return err;
25456- err = probe_kernel_write((char *)bpt->bpt_addr,
25457+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25458 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25459 #ifdef CONFIG_DEBUG_RODATA
25460 if (!err)
25461@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25462 return -EBUSY;
25463 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25464 BREAK_INSTR_SIZE);
25465- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25466+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25467 if (err)
25468 return err;
25469 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25470@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25471 if (mutex_is_locked(&text_mutex))
25472 goto knl_write;
25473 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25474- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25475+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25476 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25477 goto knl_write;
25478 return err;
25479 knl_write:
25480 #endif /* CONFIG_DEBUG_RODATA */
25481- return probe_kernel_write((char *)bpt->bpt_addr,
25482+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25483 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25484 }
25485
25486diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25487index 67e6d19..731ed28 100644
25488--- a/arch/x86/kernel/kprobes/core.c
25489+++ b/arch/x86/kernel/kprobes/core.c
25490@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25491 s32 raddr;
25492 } __packed *insn;
25493
25494- insn = (struct __arch_relative_insn *)from;
25495+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25496+
25497+ pax_open_kernel();
25498 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25499 insn->op = op;
25500+ pax_close_kernel();
25501 }
25502
25503 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25504@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25505 kprobe_opcode_t opcode;
25506 kprobe_opcode_t *orig_opcodes = opcodes;
25507
25508- if (search_exception_tables((unsigned long)opcodes))
25509+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25510 return 0; /* Page fault may occur on this address. */
25511
25512 retry:
25513@@ -242,9 +245,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25514 * for the first byte, we can recover the original instruction
25515 * from it and kp->opcode.
25516 */
25517- memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25518+ memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25519 buf[0] = kp->opcode;
25520- return (unsigned long)buf;
25521+ return ktva_ktla((unsigned long)buf);
25522 }
25523
25524 /*
25525@@ -336,7 +339,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25526 /* Another subsystem puts a breakpoint, failed to recover */
25527 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25528 return 0;
25529+ pax_open_kernel();
25530 memcpy(dest, insn.kaddr, insn.length);
25531+ pax_close_kernel();
25532
25533 #ifdef CONFIG_X86_64
25534 if (insn_rip_relative(&insn)) {
25535@@ -363,7 +368,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25536 return 0;
25537 }
25538 disp = (u8 *) dest + insn_offset_displacement(&insn);
25539+ pax_open_kernel();
25540 *(s32 *) disp = (s32) newdisp;
25541+ pax_close_kernel();
25542 }
25543 #endif
25544 return insn.length;
25545@@ -505,7 +512,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25546 * nor set current_kprobe, because it doesn't use single
25547 * stepping.
25548 */
25549- regs->ip = (unsigned long)p->ainsn.insn;
25550+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25551 preempt_enable_no_resched();
25552 return;
25553 }
25554@@ -522,9 +529,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25555 regs->flags &= ~X86_EFLAGS_IF;
25556 /* single step inline if the instruction is an int3 */
25557 if (p->opcode == BREAKPOINT_INSTRUCTION)
25558- regs->ip = (unsigned long)p->addr;
25559+ regs->ip = ktla_ktva((unsigned long)p->addr);
25560 else
25561- regs->ip = (unsigned long)p->ainsn.insn;
25562+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25563 }
25564 NOKPROBE_SYMBOL(setup_singlestep);
25565
25566@@ -574,7 +581,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25567 struct kprobe *p;
25568 struct kprobe_ctlblk *kcb;
25569
25570- if (user_mode_vm(regs))
25571+ if (user_mode(regs))
25572 return 0;
25573
25574 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
25575@@ -609,7 +616,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25576 setup_singlestep(p, regs, kcb, 0);
25577 return 1;
25578 }
25579- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25580+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25581 /*
25582 * The breakpoint instruction was removed right
25583 * after we hit it. Another cpu has removed
25584@@ -656,6 +663,9 @@ static void __used kretprobe_trampoline_holder(void)
25585 " movq %rax, 152(%rsp)\n"
25586 RESTORE_REGS_STRING
25587 " popfq\n"
25588+#ifdef KERNEXEC_PLUGIN
25589+ " btsq $63,(%rsp)\n"
25590+#endif
25591 #else
25592 " pushf\n"
25593 SAVE_REGS_STRING
25594@@ -796,7 +806,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25595 struct kprobe_ctlblk *kcb)
25596 {
25597 unsigned long *tos = stack_addr(regs);
25598- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25599+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25600 unsigned long orig_ip = (unsigned long)p->addr;
25601 kprobe_opcode_t *insn = p->ainsn.insn;
25602
25603@@ -979,7 +989,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
25604 struct die_args *args = data;
25605 int ret = NOTIFY_DONE;
25606
25607- if (args->regs && user_mode_vm(args->regs))
25608+ if (args->regs && user_mode(args->regs))
25609 return ret;
25610
25611 if (val == DIE_GPF) {
25612diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25613index f1314d0..15f3154 100644
25614--- a/arch/x86/kernel/kprobes/opt.c
25615+++ b/arch/x86/kernel/kprobes/opt.c
25616@@ -79,6 +79,7 @@ found:
25617 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25618 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25619 {
25620+ pax_open_kernel();
25621 #ifdef CONFIG_X86_64
25622 *addr++ = 0x48;
25623 *addr++ = 0xbf;
25624@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25625 *addr++ = 0xb8;
25626 #endif
25627 *(unsigned long *)addr = val;
25628+ pax_close_kernel();
25629 }
25630
25631 asm (
25632@@ -337,7 +339,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25633 * Verify if the address gap is in 2GB range, because this uses
25634 * a relative jump.
25635 */
25636- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25637+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25638 if (abs(rel) > 0x7fffffff) {
25639 __arch_remove_optimized_kprobe(op, 0);
25640 return -ERANGE;
25641@@ -354,16 +356,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
25642 op->optinsn.size = ret;
25643
25644 /* Copy arch-dep-instance from template */
25645- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25646+ pax_open_kernel();
25647+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25648+ pax_close_kernel();
25649
25650 /* Set probe information */
25651 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25652
25653 /* Set probe function call */
25654- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25655+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25656
25657 /* Set returning jmp instruction at the tail of out-of-line buffer */
25658- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25659+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25660 (u8 *)op->kp.addr + op->optinsn.size);
25661
25662 flush_icache_range((unsigned long) buf,
25663@@ -388,7 +392,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25664 WARN_ON(kprobe_disabled(&op->kp));
25665
25666 /* Backup instructions which will be replaced by jump address */
25667- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25668+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25669 RELATIVE_ADDR_SIZE);
25670
25671 insn_buf[0] = RELATIVEJUMP_OPCODE;
25672@@ -436,7 +440,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25673 /* This kprobe is really able to run optimized path. */
25674 op = container_of(p, struct optimized_kprobe, kp);
25675 /* Detour through copied instructions */
25676- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25677+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25678 if (!reenter)
25679 reset_current_kprobe();
25680 preempt_enable_no_resched();
25681diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25682index c2bedae..25e7ab60 100644
25683--- a/arch/x86/kernel/ksysfs.c
25684+++ b/arch/x86/kernel/ksysfs.c
25685@@ -184,7 +184,7 @@ out:
25686
25687 static struct kobj_attribute type_attr = __ATTR_RO(type);
25688
25689-static struct bin_attribute data_attr = {
25690+static bin_attribute_no_const data_attr __read_only = {
25691 .attr = {
25692 .name = "data",
25693 .mode = S_IRUGO,
25694diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
25695index f6945bef..94f6434 100644
25696--- a/arch/x86/kernel/kvm.c
25697+++ b/arch/x86/kernel/kvm.c
25698@@ -283,7 +283,14 @@ NOKPROBE_SYMBOL(do_async_page_fault);
25699 static void __init paravirt_ops_setup(void)
25700 {
25701 pv_info.name = "KVM";
25702- pv_info.paravirt_enabled = 1;
25703+
25704+ /*
25705+ * KVM isn't paravirt in the sense of paravirt_enabled. A KVM
25706+ * guest kernel works like a bare metal kernel with additional
25707+ * features, and paravirt_enabled is about features that are
25708+ * missing.
25709+ */
25710+ pv_info.paravirt_enabled = 0;
25711
25712 if (kvm_para_has_feature(KVM_FEATURE_NOP_IO_DELAY))
25713 pv_cpu_ops.io_delay = kvm_io_delay;
25714diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
25715index d9156ce..a2de9bc 100644
25716--- a/arch/x86/kernel/kvmclock.c
25717+++ b/arch/x86/kernel/kvmclock.c
25718@@ -263,7 +263,6 @@ void __init kvmclock_init(void)
25719 #endif
25720 kvm_get_preset_lpj();
25721 clocksource_register_hz(&kvm_clock, NSEC_PER_SEC);
25722- pv_info.paravirt_enabled = 1;
25723 pv_info.name = "KVM";
25724
25725 if (kvm_para_has_feature(KVM_FEATURE_CLOCKSOURCE_STABLE_BIT))
25726diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25727index c37886d..d851d32 100644
25728--- a/arch/x86/kernel/ldt.c
25729+++ b/arch/x86/kernel/ldt.c
25730@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25731 if (reload) {
25732 #ifdef CONFIG_SMP
25733 preempt_disable();
25734- load_LDT(pc);
25735+ load_LDT_nolock(pc);
25736 if (!cpumask_equal(mm_cpumask(current->mm),
25737 cpumask_of(smp_processor_id())))
25738 smp_call_function(flush_ldt, current->mm, 1);
25739 preempt_enable();
25740 #else
25741- load_LDT(pc);
25742+ load_LDT_nolock(pc);
25743 #endif
25744 }
25745 if (oldsize) {
25746@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25747 return err;
25748
25749 for (i = 0; i < old->size; i++)
25750- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25751+ write_ldt_entry(new->ldt, i, old->ldt + i);
25752 return 0;
25753 }
25754
25755@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25756 retval = copy_ldt(&mm->context, &old_mm->context);
25757 mutex_unlock(&old_mm->context.lock);
25758 }
25759+
25760+ if (tsk == current) {
25761+ mm->context.vdso = 0;
25762+
25763+#ifdef CONFIG_X86_32
25764+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25765+ mm->context.user_cs_base = 0UL;
25766+ mm->context.user_cs_limit = ~0UL;
25767+
25768+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25769+ cpus_clear(mm->context.cpu_user_cs_mask);
25770+#endif
25771+
25772+#endif
25773+#endif
25774+
25775+ }
25776+
25777 return retval;
25778 }
25779
25780@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25781 }
25782 }
25783
25784+#ifdef CONFIG_PAX_SEGMEXEC
25785+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25786+ error = -EINVAL;
25787+ goto out_unlock;
25788+ }
25789+#endif
25790+
25791 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25792 error = -EINVAL;
25793 goto out_unlock;
25794diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25795index 72e8e31..f2f1605 100644
25796--- a/arch/x86/kernel/machine_kexec_32.c
25797+++ b/arch/x86/kernel/machine_kexec_32.c
25798@@ -25,7 +25,7 @@
25799 #include <asm/cacheflush.h>
25800 #include <asm/debugreg.h>
25801
25802-static void set_idt(void *newidt, __u16 limit)
25803+static void set_idt(struct desc_struct *newidt, __u16 limit)
25804 {
25805 struct desc_ptr curidt;
25806
25807@@ -37,7 +37,7 @@ static void set_idt(void *newidt, __u16 limit)
25808 }
25809
25810
25811-static void set_gdt(void *newgdt, __u16 limit)
25812+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25813 {
25814 struct desc_ptr curgdt;
25815
25816@@ -215,7 +215,7 @@ void machine_kexec(struct kimage *image)
25817 }
25818
25819 control_page = page_address(image->control_code_page);
25820- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25821+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25822
25823 relocate_kernel_ptr = control_page;
25824 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25825diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25826index c73aecf..4c63630 100644
25827--- a/arch/x86/kernel/mcount_64.S
25828+++ b/arch/x86/kernel/mcount_64.S
25829@@ -7,7 +7,7 @@
25830 #include <linux/linkage.h>
25831 #include <asm/ptrace.h>
25832 #include <asm/ftrace.h>
25833-
25834+#include <asm/alternative-asm.h>
25835
25836 .code64
25837 .section .entry.text, "ax"
25838@@ -24,8 +24,9 @@
25839 #ifdef CONFIG_DYNAMIC_FTRACE
25840
25841 ENTRY(function_hook)
25842+ pax_force_retaddr
25843 retq
25844-END(function_hook)
25845+ENDPROC(function_hook)
25846
25847 /* skip is set if stack has been adjusted */
25848 .macro ftrace_caller_setup skip=0
25849@@ -62,8 +63,9 @@ GLOBAL(ftrace_graph_call)
25850 #endif
25851
25852 GLOBAL(ftrace_stub)
25853+ pax_force_retaddr
25854 retq
25855-END(ftrace_caller)
25856+ENDPROC(ftrace_caller)
25857
25858 ENTRY(ftrace_regs_caller)
25859 /* Save the current flags before compare (in SS location)*/
25860@@ -127,7 +129,7 @@ GLOBAL(ftrace_regs_call)
25861 popfq
25862 jmp ftrace_stub
25863
25864-END(ftrace_regs_caller)
25865+ENDPROC(ftrace_regs_caller)
25866
25867
25868 #else /* ! CONFIG_DYNAMIC_FTRACE */
25869@@ -145,6 +147,7 @@ ENTRY(function_hook)
25870 #endif
25871
25872 GLOBAL(ftrace_stub)
25873+ pax_force_retaddr
25874 retq
25875
25876 trace:
25877@@ -158,12 +161,13 @@ trace:
25878 #endif
25879 subq $MCOUNT_INSN_SIZE, %rdi
25880
25881+ pax_force_fptr ftrace_trace_function
25882 call *ftrace_trace_function
25883
25884 MCOUNT_RESTORE_FRAME
25885
25886 jmp ftrace_stub
25887-END(function_hook)
25888+ENDPROC(function_hook)
25889 #endif /* CONFIG_DYNAMIC_FTRACE */
25890 #endif /* CONFIG_FUNCTION_TRACER */
25891
25892@@ -185,8 +189,9 @@ ENTRY(ftrace_graph_caller)
25893
25894 MCOUNT_RESTORE_FRAME
25895
25896+ pax_force_retaddr
25897 retq
25898-END(ftrace_graph_caller)
25899+ENDPROC(ftrace_graph_caller)
25900
25901 GLOBAL(return_to_handler)
25902 subq $24, %rsp
25903@@ -202,5 +207,7 @@ GLOBAL(return_to_handler)
25904 movq 8(%rsp), %rdx
25905 movq (%rsp), %rax
25906 addq $24, %rsp
25907+ pax_force_fptr %rdi
25908 jmp *%rdi
25909+ENDPROC(return_to_handler)
25910 #endif
25911diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25912index e69f988..da078ea 100644
25913--- a/arch/x86/kernel/module.c
25914+++ b/arch/x86/kernel/module.c
25915@@ -81,17 +81,62 @@ static unsigned long int get_module_load_offset(void)
25916 }
25917 #endif
25918
25919-void *module_alloc(unsigned long size)
25920+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
25921 {
25922- if (PAGE_ALIGN(size) > MODULES_LEN)
25923+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
25924 return NULL;
25925 return __vmalloc_node_range(size, 1,
25926 MODULES_VADDR + get_module_load_offset(),
25927- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
25928- PAGE_KERNEL_EXEC, NUMA_NO_NODE,
25929+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
25930+ prot, NUMA_NO_NODE,
25931 __builtin_return_address(0));
25932 }
25933
25934+void *module_alloc(unsigned long size)
25935+{
25936+
25937+#ifdef CONFIG_PAX_KERNEXEC
25938+ return __module_alloc(size, PAGE_KERNEL);
25939+#else
25940+ return __module_alloc(size, PAGE_KERNEL_EXEC);
25941+#endif
25942+
25943+}
25944+
25945+#ifdef CONFIG_PAX_KERNEXEC
25946+#ifdef CONFIG_X86_32
25947+void *module_alloc_exec(unsigned long size)
25948+{
25949+ struct vm_struct *area;
25950+
25951+ if (size == 0)
25952+ return NULL;
25953+
25954+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
25955+return area ? area->addr : NULL;
25956+}
25957+EXPORT_SYMBOL(module_alloc_exec);
25958+
25959+void module_free_exec(struct module *mod, void *module_region)
25960+{
25961+ vunmap(module_region);
25962+}
25963+EXPORT_SYMBOL(module_free_exec);
25964+#else
25965+void module_free_exec(struct module *mod, void *module_region)
25966+{
25967+ module_free(mod, module_region);
25968+}
25969+EXPORT_SYMBOL(module_free_exec);
25970+
25971+void *module_alloc_exec(unsigned long size)
25972+{
25973+ return __module_alloc(size, PAGE_KERNEL_RX);
25974+}
25975+EXPORT_SYMBOL(module_alloc_exec);
25976+#endif
25977+#endif
25978+
25979 #ifdef CONFIG_X86_32
25980 int apply_relocate(Elf32_Shdr *sechdrs,
25981 const char *strtab,
25982@@ -102,14 +147,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
25983 unsigned int i;
25984 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
25985 Elf32_Sym *sym;
25986- uint32_t *location;
25987+ uint32_t *plocation, location;
25988
25989 DEBUGP("Applying relocate section %u to %u\n",
25990 relsec, sechdrs[relsec].sh_info);
25991 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
25992 /* This is where to make the change */
25993- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
25994- + rel[i].r_offset;
25995+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
25996+ location = (uint32_t)plocation;
25997+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
25998+ plocation = ktla_ktva((void *)plocation);
25999 /* This is the symbol it is referring to. Note that all
26000 undefined symbols have been resolved. */
26001 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26002@@ -118,11 +165,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26003 switch (ELF32_R_TYPE(rel[i].r_info)) {
26004 case R_386_32:
26005 /* We add the value into the location given */
26006- *location += sym->st_value;
26007+ pax_open_kernel();
26008+ *plocation += sym->st_value;
26009+ pax_close_kernel();
26010 break;
26011 case R_386_PC32:
26012 /* Add the value, subtract its position */
26013- *location += sym->st_value - (uint32_t)location;
26014+ pax_open_kernel();
26015+ *plocation += sym->st_value - location;
26016+ pax_close_kernel();
26017 break;
26018 default:
26019 pr_err("%s: Unknown relocation: %u\n",
26020@@ -167,21 +218,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26021 case R_X86_64_NONE:
26022 break;
26023 case R_X86_64_64:
26024+ pax_open_kernel();
26025 *(u64 *)loc = val;
26026+ pax_close_kernel();
26027 break;
26028 case R_X86_64_32:
26029+ pax_open_kernel();
26030 *(u32 *)loc = val;
26031+ pax_close_kernel();
26032 if (val != *(u32 *)loc)
26033 goto overflow;
26034 break;
26035 case R_X86_64_32S:
26036+ pax_open_kernel();
26037 *(s32 *)loc = val;
26038+ pax_close_kernel();
26039 if ((s64)val != *(s32 *)loc)
26040 goto overflow;
26041 break;
26042 case R_X86_64_PC32:
26043 val -= (u64)loc;
26044+ pax_open_kernel();
26045 *(u32 *)loc = val;
26046+ pax_close_kernel();
26047+
26048 #if 0
26049 if ((s64)val != *(s32 *)loc)
26050 goto overflow;
26051diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26052index c9603ac..9f88728 100644
26053--- a/arch/x86/kernel/msr.c
26054+++ b/arch/x86/kernel/msr.c
26055@@ -37,6 +37,7 @@
26056 #include <linux/notifier.h>
26057 #include <linux/uaccess.h>
26058 #include <linux/gfp.h>
26059+#include <linux/grsecurity.h>
26060
26061 #include <asm/processor.h>
26062 #include <asm/msr.h>
26063@@ -103,6 +104,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26064 int err = 0;
26065 ssize_t bytes = 0;
26066
26067+#ifdef CONFIG_GRKERNSEC_KMEM
26068+ gr_handle_msr_write();
26069+ return -EPERM;
26070+#endif
26071+
26072 if (count % 8)
26073 return -EINVAL; /* Invalid chunk size */
26074
26075@@ -150,6 +156,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26076 err = -EBADF;
26077 break;
26078 }
26079+#ifdef CONFIG_GRKERNSEC_KMEM
26080+ gr_handle_msr_write();
26081+ return -EPERM;
26082+#endif
26083 if (copy_from_user(&regs, uregs, sizeof regs)) {
26084 err = -EFAULT;
26085 break;
26086@@ -233,7 +243,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26087 return notifier_from_errno(err);
26088 }
26089
26090-static struct notifier_block __refdata msr_class_cpu_notifier = {
26091+static struct notifier_block msr_class_cpu_notifier = {
26092 .notifier_call = msr_class_cpu_callback,
26093 };
26094
26095diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26096index c3e985d..110a36a 100644
26097--- a/arch/x86/kernel/nmi.c
26098+++ b/arch/x86/kernel/nmi.c
26099@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26100
26101 static void nmi_max_handler(struct irq_work *w)
26102 {
26103- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26104+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26105 int remainder_ns, decimal_msecs;
26106- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26107+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26108
26109 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26110 decimal_msecs = remainder_ns / 1000;
26111
26112 printk_ratelimited(KERN_INFO
26113 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26114- a->handler, whole_msecs, decimal_msecs);
26115+ n->action->handler, whole_msecs, decimal_msecs);
26116 }
26117
26118 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26119@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26120 delta = sched_clock() - delta;
26121 trace_nmi_handler(a->handler, (int)delta, thishandled);
26122
26123- if (delta < nmi_longest_ns || delta < a->max_duration)
26124+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26125 continue;
26126
26127- a->max_duration = delta;
26128- irq_work_queue(&a->irq_work);
26129+ a->work->max_duration = delta;
26130+ irq_work_queue(&a->work->irq_work);
26131 }
26132
26133 rcu_read_unlock();
26134@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26135 }
26136 NOKPROBE_SYMBOL(nmi_handle);
26137
26138-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26139+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26140 {
26141 struct nmi_desc *desc = nmi_to_desc(type);
26142 unsigned long flags;
26143@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26144 if (!action->handler)
26145 return -EINVAL;
26146
26147- init_irq_work(&action->irq_work, nmi_max_handler);
26148+ action->work->action = action;
26149+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26150
26151 spin_lock_irqsave(&desc->lock, flags);
26152
26153@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26154 * event confuses some handlers (kdump uses this flag)
26155 */
26156 if (action->flags & NMI_FLAG_FIRST)
26157- list_add_rcu(&action->list, &desc->head);
26158+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26159 else
26160- list_add_tail_rcu(&action->list, &desc->head);
26161+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26162
26163 spin_unlock_irqrestore(&desc->lock, flags);
26164 return 0;
26165@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26166 if (!strcmp(n->name, name)) {
26167 WARN(in_nmi(),
26168 "Trying to free NMI (%s) from NMI context!\n", n->name);
26169- list_del_rcu(&n->list);
26170+ pax_list_del_rcu((struct list_head *)&n->list);
26171 break;
26172 }
26173 }
26174@@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
26175 dotraplinkage notrace void
26176 do_nmi(struct pt_regs *regs, long error_code)
26177 {
26178+
26179+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26180+ if (!user_mode(regs)) {
26181+ unsigned long cs = regs->cs & 0xFFFF;
26182+ unsigned long ip = ktva_ktla(regs->ip);
26183+
26184+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26185+ regs->ip = ip;
26186+ }
26187+#endif
26188+
26189 nmi_nesting_preprocess(regs);
26190
26191 nmi_enter();
26192diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26193index 6d9582e..f746287 100644
26194--- a/arch/x86/kernel/nmi_selftest.c
26195+++ b/arch/x86/kernel/nmi_selftest.c
26196@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26197 {
26198 /* trap all the unknown NMIs we may generate */
26199 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26200- __initdata);
26201+ __initconst);
26202 }
26203
26204 static void __init cleanup_nmi_testsuite(void)
26205@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26206 unsigned long timeout;
26207
26208 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26209- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26210+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26211 nmi_fail = FAILURE;
26212 return;
26213 }
26214diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26215index bbb6c73..24a58ef 100644
26216--- a/arch/x86/kernel/paravirt-spinlocks.c
26217+++ b/arch/x86/kernel/paravirt-spinlocks.c
26218@@ -8,7 +8,7 @@
26219
26220 #include <asm/paravirt.h>
26221
26222-struct pv_lock_ops pv_lock_ops = {
26223+struct pv_lock_ops pv_lock_ops __read_only = {
26224 #ifdef CONFIG_SMP
26225 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26226 .unlock_kick = paravirt_nop,
26227diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26228index 548d25f..f8fb99c 100644
26229--- a/arch/x86/kernel/paravirt.c
26230+++ b/arch/x86/kernel/paravirt.c
26231@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26232 {
26233 return x;
26234 }
26235+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26236+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26237+#endif
26238
26239 void __init default_banner(void)
26240 {
26241@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26242
26243 if (opfunc == NULL)
26244 /* If there's no function, patch it with a ud2a (BUG) */
26245- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26246- else if (opfunc == _paravirt_nop)
26247+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26248+ else if (opfunc == (void *)_paravirt_nop)
26249 /* If the operation is a nop, then nop the callsite */
26250 ret = paravirt_patch_nop();
26251
26252 /* identity functions just return their single argument */
26253- else if (opfunc == _paravirt_ident_32)
26254+ else if (opfunc == (void *)_paravirt_ident_32)
26255 ret = paravirt_patch_ident_32(insnbuf, len);
26256- else if (opfunc == _paravirt_ident_64)
26257+ else if (opfunc == (void *)_paravirt_ident_64)
26258 ret = paravirt_patch_ident_64(insnbuf, len);
26259+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26260+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26261+ ret = paravirt_patch_ident_64(insnbuf, len);
26262+#endif
26263
26264 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26265 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26266@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26267 if (insn_len > len || start == NULL)
26268 insn_len = len;
26269 else
26270- memcpy(insnbuf, start, insn_len);
26271+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26272
26273 return insn_len;
26274 }
26275@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26276 return this_cpu_read(paravirt_lazy_mode);
26277 }
26278
26279-struct pv_info pv_info = {
26280+struct pv_info pv_info __read_only = {
26281 .name = "bare hardware",
26282 .paravirt_enabled = 0,
26283 .kernel_rpl = 0,
26284@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26285 #endif
26286 };
26287
26288-struct pv_init_ops pv_init_ops = {
26289+struct pv_init_ops pv_init_ops __read_only = {
26290 .patch = native_patch,
26291 };
26292
26293-struct pv_time_ops pv_time_ops = {
26294+struct pv_time_ops pv_time_ops __read_only = {
26295 .sched_clock = native_sched_clock,
26296 .steal_clock = native_steal_clock,
26297 };
26298
26299-__visible struct pv_irq_ops pv_irq_ops = {
26300+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26301 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26302 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26303 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26304@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26305 #endif
26306 };
26307
26308-__visible struct pv_cpu_ops pv_cpu_ops = {
26309+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26310 .cpuid = native_cpuid,
26311 .get_debugreg = native_get_debugreg,
26312 .set_debugreg = native_set_debugreg,
26313@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26314 NOKPROBE_SYMBOL(native_set_debugreg);
26315 NOKPROBE_SYMBOL(native_load_idt);
26316
26317-struct pv_apic_ops pv_apic_ops = {
26318+struct pv_apic_ops pv_apic_ops __read_only= {
26319 #ifdef CONFIG_X86_LOCAL_APIC
26320 .startup_ipi_hook = paravirt_nop,
26321 #endif
26322 };
26323
26324-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26325+#ifdef CONFIG_X86_32
26326+#ifdef CONFIG_X86_PAE
26327+/* 64-bit pagetable entries */
26328+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26329+#else
26330 /* 32-bit pagetable entries */
26331 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26332+#endif
26333 #else
26334 /* 64-bit pagetable entries */
26335 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26336 #endif
26337
26338-struct pv_mmu_ops pv_mmu_ops = {
26339+struct pv_mmu_ops pv_mmu_ops __read_only = {
26340
26341 .read_cr2 = native_read_cr2,
26342 .write_cr2 = native_write_cr2,
26343@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26344 .make_pud = PTE_IDENT,
26345
26346 .set_pgd = native_set_pgd,
26347+ .set_pgd_batched = native_set_pgd_batched,
26348 #endif
26349 #endif /* PAGETABLE_LEVELS >= 3 */
26350
26351@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26352 },
26353
26354 .set_fixmap = native_set_fixmap,
26355+
26356+#ifdef CONFIG_PAX_KERNEXEC
26357+ .pax_open_kernel = native_pax_open_kernel,
26358+ .pax_close_kernel = native_pax_close_kernel,
26359+#endif
26360+
26361 };
26362
26363 EXPORT_SYMBOL_GPL(pv_time_ops);
26364diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26365index a1da673..2c72d5b 100644
26366--- a/arch/x86/kernel/paravirt_patch_64.c
26367+++ b/arch/x86/kernel/paravirt_patch_64.c
26368@@ -9,7 +9,9 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26369 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26370 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26371 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26372+#ifndef CONFIG_PAX_MEMORY_UDEREF
26373 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26374+#endif
26375 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26376 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26377
26378@@ -57,7 +59,9 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26379 PATCH_SITE(pv_mmu_ops, read_cr3);
26380 PATCH_SITE(pv_mmu_ops, write_cr3);
26381 PATCH_SITE(pv_cpu_ops, clts);
26382+#ifndef CONFIG_PAX_MEMORY_UDEREF
26383 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26384+#endif
26385 PATCH_SITE(pv_cpu_ops, wbinvd);
26386
26387 patch_site:
26388diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26389index 0497f71..7186c0d 100644
26390--- a/arch/x86/kernel/pci-calgary_64.c
26391+++ b/arch/x86/kernel/pci-calgary_64.c
26392@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26393 tce_space = be64_to_cpu(readq(target));
26394 tce_space = tce_space & TAR_SW_BITS;
26395
26396- tce_space = tce_space & (~specified_table_size);
26397+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26398 info->tce_space = (u64 *)__va(tce_space);
26399 }
26400 }
26401diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26402index 35ccf75..7a15747 100644
26403--- a/arch/x86/kernel/pci-iommu_table.c
26404+++ b/arch/x86/kernel/pci-iommu_table.c
26405@@ -2,7 +2,7 @@
26406 #include <asm/iommu_table.h>
26407 #include <linux/string.h>
26408 #include <linux/kallsyms.h>
26409-
26410+#include <linux/sched.h>
26411
26412 #define DEBUG 1
26413
26414diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26415index 77dd0ad..9ec4723 100644
26416--- a/arch/x86/kernel/pci-swiotlb.c
26417+++ b/arch/x86/kernel/pci-swiotlb.c
26418@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26419 struct dma_attrs *attrs)
26420 {
26421 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26422- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26423+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26424 else
26425 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26426 }
26427diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26428index e127dda..94e384d 100644
26429--- a/arch/x86/kernel/process.c
26430+++ b/arch/x86/kernel/process.c
26431@@ -36,7 +36,8 @@
26432 * section. Since TSS's are completely CPU-local, we want them
26433 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26434 */
26435-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26436+struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26437+EXPORT_SYMBOL(init_tss);
26438
26439 #ifdef CONFIG_X86_64
26440 static DEFINE_PER_CPU(unsigned char, is_idle);
26441@@ -94,7 +95,7 @@ void arch_task_cache_init(void)
26442 task_xstate_cachep =
26443 kmem_cache_create("task_xstate", xstate_size,
26444 __alignof__(union thread_xstate),
26445- SLAB_PANIC | SLAB_NOTRACK, NULL);
26446+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26447 setup_xstate_comp();
26448 }
26449
26450@@ -108,7 +109,7 @@ void exit_thread(void)
26451 unsigned long *bp = t->io_bitmap_ptr;
26452
26453 if (bp) {
26454- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26455+ struct tss_struct *tss = init_tss + get_cpu();
26456
26457 t->io_bitmap_ptr = NULL;
26458 clear_thread_flag(TIF_IO_BITMAP);
26459@@ -128,6 +129,9 @@ void flush_thread(void)
26460 {
26461 struct task_struct *tsk = current;
26462
26463+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26464+ loadsegment(gs, 0);
26465+#endif
26466 flush_ptrace_hw_breakpoint(tsk);
26467 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26468 drop_init_fpu(tsk);
26469@@ -274,7 +278,7 @@ static void __exit_idle(void)
26470 void exit_idle(void)
26471 {
26472 /* idle loop has pid 0 */
26473- if (current->pid)
26474+ if (task_pid_nr(current))
26475 return;
26476 __exit_idle();
26477 }
26478@@ -327,7 +331,7 @@ bool xen_set_default_idle(void)
26479 return ret;
26480 }
26481 #endif
26482-void stop_this_cpu(void *dummy)
26483+__noreturn void stop_this_cpu(void *dummy)
26484 {
26485 local_irq_disable();
26486 /*
26487@@ -456,16 +460,37 @@ static int __init idle_setup(char *str)
26488 }
26489 early_param("idle", idle_setup);
26490
26491-unsigned long arch_align_stack(unsigned long sp)
26492+#ifdef CONFIG_PAX_RANDKSTACK
26493+void pax_randomize_kstack(struct pt_regs *regs)
26494 {
26495- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26496- sp -= get_random_int() % 8192;
26497- return sp & ~0xf;
26498-}
26499+ struct thread_struct *thread = &current->thread;
26500+ unsigned long time;
26501
26502-unsigned long arch_randomize_brk(struct mm_struct *mm)
26503-{
26504- unsigned long range_end = mm->brk + 0x02000000;
26505- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26506-}
26507+ if (!randomize_va_space)
26508+ return;
26509+
26510+ if (v8086_mode(regs))
26511+ return;
26512
26513+ rdtscl(time);
26514+
26515+ /* P4 seems to return a 0 LSB, ignore it */
26516+#ifdef CONFIG_MPENTIUM4
26517+ time &= 0x3EUL;
26518+ time <<= 2;
26519+#elif defined(CONFIG_X86_64)
26520+ time &= 0xFUL;
26521+ time <<= 4;
26522+#else
26523+ time &= 0x1FUL;
26524+ time <<= 3;
26525+#endif
26526+
26527+ thread->sp0 ^= time;
26528+ load_sp0(init_tss + smp_processor_id(), thread);
26529+
26530+#ifdef CONFIG_X86_64
26531+ this_cpu_write(kernel_stack, thread->sp0);
26532+#endif
26533+}
26534+#endif
26535diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26536index 8f3ebfe..e6ced5a 100644
26537--- a/arch/x86/kernel/process_32.c
26538+++ b/arch/x86/kernel/process_32.c
26539@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26540 unsigned long thread_saved_pc(struct task_struct *tsk)
26541 {
26542 return ((unsigned long *)tsk->thread.sp)[3];
26543+//XXX return tsk->thread.eip;
26544 }
26545
26546 void __show_regs(struct pt_regs *regs, int all)
26547@@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26548 unsigned long sp;
26549 unsigned short ss, gs;
26550
26551- if (user_mode_vm(regs)) {
26552+ if (user_mode(regs)) {
26553 sp = regs->sp;
26554 ss = regs->ss & 0xffff;
26555- gs = get_user_gs(regs);
26556 } else {
26557 sp = kernel_stack_pointer(regs);
26558 savesegment(ss, ss);
26559- savesegment(gs, gs);
26560 }
26561+ gs = get_user_gs(regs);
26562
26563 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26564 (u16)regs->cs, regs->ip, regs->flags,
26565- smp_processor_id());
26566+ raw_smp_processor_id());
26567 print_symbol("EIP is at %s\n", regs->ip);
26568
26569 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26570@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26571 int copy_thread(unsigned long clone_flags, unsigned long sp,
26572 unsigned long arg, struct task_struct *p)
26573 {
26574- struct pt_regs *childregs = task_pt_regs(p);
26575+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26576 struct task_struct *tsk;
26577 int err;
26578
26579 p->thread.sp = (unsigned long) childregs;
26580 p->thread.sp0 = (unsigned long) (childregs+1);
26581+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
26582 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26583
26584 if (unlikely(p->flags & PF_KTHREAD)) {
26585 /* kernel thread */
26586 memset(childregs, 0, sizeof(struct pt_regs));
26587 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26588- task_user_gs(p) = __KERNEL_STACK_CANARY;
26589- childregs->ds = __USER_DS;
26590- childregs->es = __USER_DS;
26591+ savesegment(gs, childregs->gs);
26592+ childregs->ds = __KERNEL_DS;
26593+ childregs->es = __KERNEL_DS;
26594 childregs->fs = __KERNEL_PERCPU;
26595 childregs->bx = sp; /* function */
26596 childregs->bp = arg;
26597@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26598 struct thread_struct *prev = &prev_p->thread,
26599 *next = &next_p->thread;
26600 int cpu = smp_processor_id();
26601- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26602+ struct tss_struct *tss = init_tss + cpu;
26603 fpu_switch_t fpu;
26604
26605 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26606@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26607 */
26608 lazy_save_gs(prev->gs);
26609
26610+#ifdef CONFIG_PAX_MEMORY_UDEREF
26611+ __set_fs(task_thread_info(next_p)->addr_limit);
26612+#endif
26613+
26614 /*
26615 * Load the per-thread Thread-Local Storage descriptor.
26616 */
26617@@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26618 */
26619 arch_end_context_switch(next_p);
26620
26621- this_cpu_write(kernel_stack,
26622- (unsigned long)task_stack_page(next_p) +
26623- THREAD_SIZE - KERNEL_STACK_OFFSET);
26624+ this_cpu_write(current_task, next_p);
26625+ this_cpu_write(current_tinfo, &next_p->tinfo);
26626+ this_cpu_write(kernel_stack, next->sp0);
26627
26628 /*
26629 * Restore %gs if needed (which is common)
26630@@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26631
26632 switch_fpu_finish(next_p, fpu);
26633
26634- this_cpu_write(current_task, next_p);
26635-
26636 return prev_p;
26637 }
26638
26639@@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
26640 } while (count++ < 16);
26641 return 0;
26642 }
26643-
26644diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26645index 3ed4a68..ee8f337 100644
26646--- a/arch/x86/kernel/process_64.c
26647+++ b/arch/x86/kernel/process_64.c
26648@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26649 struct pt_regs *childregs;
26650 struct task_struct *me = current;
26651
26652- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26653+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26654 childregs = task_pt_regs(p);
26655 p->thread.sp = (unsigned long) childregs;
26656 p->thread.usersp = me->thread.usersp;
26657+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
26658 set_tsk_thread_flag(p, TIF_FORK);
26659 p->thread.io_bitmap_ptr = NULL;
26660
26661@@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26662 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26663 savesegment(es, p->thread.es);
26664 savesegment(ds, p->thread.ds);
26665+ savesegment(ss, p->thread.ss);
26666+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26667 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26668
26669 if (unlikely(p->flags & PF_KTHREAD)) {
26670@@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26671 struct thread_struct *prev = &prev_p->thread;
26672 struct thread_struct *next = &next_p->thread;
26673 int cpu = smp_processor_id();
26674- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26675+ struct tss_struct *tss = init_tss + cpu;
26676 unsigned fsindex, gsindex;
26677 fpu_switch_t fpu;
26678
26679@@ -300,6 +303,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26680 if (unlikely(next->ds | prev->ds))
26681 loadsegment(ds, next->ds);
26682
26683+ savesegment(ss, prev->ss);
26684+ if (unlikely(next->ss != prev->ss))
26685+ loadsegment(ss, next->ss);
26686
26687 /* We must save %fs and %gs before load_TLS() because
26688 * %fs and %gs may be cleared by load_TLS().
26689@@ -359,6 +365,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26690 prev->usersp = this_cpu_read(old_rsp);
26691 this_cpu_write(old_rsp, next->usersp);
26692 this_cpu_write(current_task, next_p);
26693+ this_cpu_write(current_tinfo, &next_p->tinfo);
26694
26695 /*
26696 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26697@@ -368,9 +375,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26698 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26699 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26700
26701- this_cpu_write(kernel_stack,
26702- (unsigned long)task_stack_page(next_p) +
26703- THREAD_SIZE - KERNEL_STACK_OFFSET);
26704+ this_cpu_write(kernel_stack, next->sp0);
26705
26706 /*
26707 * Now maybe reload the debug registers and handle I/O bitmaps
26708@@ -440,12 +445,11 @@ unsigned long get_wchan(struct task_struct *p)
26709 if (!p || p == current || p->state == TASK_RUNNING)
26710 return 0;
26711 stack = (unsigned long)task_stack_page(p);
26712- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26713+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26714 return 0;
26715 fp = *(u64 *)(p->thread.sp);
26716 do {
26717- if (fp < (unsigned long)stack ||
26718- fp >= (unsigned long)stack+THREAD_SIZE)
26719+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26720 return 0;
26721 ip = *(u64 *)(fp+8);
26722 if (!in_sched_functions(ip))
26723diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26724index e510618..5165ac0 100644
26725--- a/arch/x86/kernel/ptrace.c
26726+++ b/arch/x86/kernel/ptrace.c
26727@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26728 unsigned long sp = (unsigned long)&regs->sp;
26729 u32 *prev_esp;
26730
26731- if (context == (sp & ~(THREAD_SIZE - 1)))
26732+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26733 return sp;
26734
26735- prev_esp = (u32 *)(context);
26736+ prev_esp = *(u32 **)(context);
26737 if (prev_esp)
26738 return (unsigned long)prev_esp;
26739
26740@@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26741 if (child->thread.gs != value)
26742 return do_arch_prctl(child, ARCH_SET_GS, value);
26743 return 0;
26744+
26745+ case offsetof(struct user_regs_struct,ip):
26746+ /*
26747+ * Protect against any attempt to set ip to an
26748+ * impossible address. There are dragons lurking if the
26749+ * address is noncanonical. (This explicitly allows
26750+ * setting ip to TASK_SIZE_MAX, because user code can do
26751+ * that all by itself by running off the end of its
26752+ * address space.
26753+ */
26754+ if (value > TASK_SIZE_MAX)
26755+ return -EIO;
26756+ break;
26757+
26758 #endif
26759 }
26760
26761@@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26762 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26763 {
26764 int i;
26765- int dr7 = 0;
26766+ unsigned long dr7 = 0;
26767 struct arch_hw_breakpoint *info;
26768
26769 for (i = 0; i < HBP_NUM; i++) {
26770@@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26771 unsigned long addr, unsigned long data)
26772 {
26773 int ret;
26774- unsigned long __user *datap = (unsigned long __user *)data;
26775+ unsigned long __user *datap = (__force unsigned long __user *)data;
26776
26777 switch (request) {
26778 /* read the word at location addr in the USER area. */
26779@@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26780 if ((int) addr < 0)
26781 return -EIO;
26782 ret = do_get_thread_area(child, addr,
26783- (struct user_desc __user *)data);
26784+ (__force struct user_desc __user *) data);
26785 break;
26786
26787 case PTRACE_SET_THREAD_AREA:
26788 if ((int) addr < 0)
26789 return -EIO;
26790 ret = do_set_thread_area(child, addr,
26791- (struct user_desc __user *)data, 0);
26792+ (__force struct user_desc __user *) data, 0);
26793 break;
26794 #endif
26795
26796@@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26797
26798 #ifdef CONFIG_X86_64
26799
26800-static struct user_regset x86_64_regsets[] __read_mostly = {
26801+static user_regset_no_const x86_64_regsets[] __read_only = {
26802 [REGSET_GENERAL] = {
26803 .core_note_type = NT_PRSTATUS,
26804 .n = sizeof(struct user_regs_struct) / sizeof(long),
26805@@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26806 #endif /* CONFIG_X86_64 */
26807
26808 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26809-static struct user_regset x86_32_regsets[] __read_mostly = {
26810+static user_regset_no_const x86_32_regsets[] __read_only = {
26811 [REGSET_GENERAL] = {
26812 .core_note_type = NT_PRSTATUS,
26813 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26814@@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26815 */
26816 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26817
26818-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26819+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26820 {
26821 #ifdef CONFIG_X86_64
26822 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26823@@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26824 memset(info, 0, sizeof(*info));
26825 info->si_signo = SIGTRAP;
26826 info->si_code = si_code;
26827- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26828+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26829 }
26830
26831 void user_single_step_siginfo(struct task_struct *tsk,
26832@@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26833 }
26834 }
26835
26836+#ifdef CONFIG_GRKERNSEC_SETXID
26837+extern void gr_delayed_cred_worker(void);
26838+#endif
26839+
26840 /*
26841 * We can return 0 to resume the syscall or anything else to go to phase
26842 * 2. If we resume the syscall, we need to put something appropriate in
26843@@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26844
26845 BUG_ON(regs != task_pt_regs(current));
26846
26847+#ifdef CONFIG_GRKERNSEC_SETXID
26848+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26849+ gr_delayed_cred_worker();
26850+#endif
26851+
26852 /*
26853 * If we stepped into a sysenter/syscall insn, it trapped in
26854 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26855@@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26856 */
26857 user_exit();
26858
26859+#ifdef CONFIG_GRKERNSEC_SETXID
26860+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26861+ gr_delayed_cred_worker();
26862+#endif
26863+
26864 audit_syscall_exit(regs);
26865
26866 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26867diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26868index 2f355d2..e75ed0a 100644
26869--- a/arch/x86/kernel/pvclock.c
26870+++ b/arch/x86/kernel/pvclock.c
26871@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26872 reset_hung_task_detector();
26873 }
26874
26875-static atomic64_t last_value = ATOMIC64_INIT(0);
26876+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26877
26878 void pvclock_resume(void)
26879 {
26880- atomic64_set(&last_value, 0);
26881+ atomic64_set_unchecked(&last_value, 0);
26882 }
26883
26884 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26885@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26886 * updating at the same time, and one of them could be slightly behind,
26887 * making the assumption that last_value always go forward fail to hold.
26888 */
26889- last = atomic64_read(&last_value);
26890+ last = atomic64_read_unchecked(&last_value);
26891 do {
26892 if (ret < last)
26893 return last;
26894- last = atomic64_cmpxchg(&last_value, last, ret);
26895+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
26896 } while (unlikely(last != ret));
26897
26898 return ret;
26899diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
26900index 17962e6..47f55db 100644
26901--- a/arch/x86/kernel/reboot.c
26902+++ b/arch/x86/kernel/reboot.c
26903@@ -69,6 +69,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
26904
26905 void __noreturn machine_real_restart(unsigned int type)
26906 {
26907+
26908+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
26909+ struct desc_struct *gdt;
26910+#endif
26911+
26912 local_irq_disable();
26913
26914 /*
26915@@ -96,7 +101,29 @@ void __noreturn machine_real_restart(unsigned int type)
26916
26917 /* Jump to the identity-mapped low memory code */
26918 #ifdef CONFIG_X86_32
26919- asm volatile("jmpl *%0" : :
26920+
26921+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
26922+ gdt = get_cpu_gdt_table(smp_processor_id());
26923+ pax_open_kernel();
26924+#ifdef CONFIG_PAX_MEMORY_UDEREF
26925+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
26926+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
26927+ loadsegment(ds, __KERNEL_DS);
26928+ loadsegment(es, __KERNEL_DS);
26929+ loadsegment(ss, __KERNEL_DS);
26930+#endif
26931+#ifdef CONFIG_PAX_KERNEXEC
26932+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
26933+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
26934+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
26935+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
26936+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
26937+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
26938+#endif
26939+ pax_close_kernel();
26940+#endif
26941+
26942+ asm volatile("ljmpl *%0" : :
26943 "rm" (real_mode_header->machine_real_restart_asm),
26944 "a" (type));
26945 #else
26946@@ -500,7 +527,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
26947 * This means that this function can never return, it can misbehave
26948 * by not rebooting properly and hanging.
26949 */
26950-static void native_machine_emergency_restart(void)
26951+static void __noreturn native_machine_emergency_restart(void)
26952 {
26953 int i;
26954 int attempt = 0;
26955@@ -620,13 +647,13 @@ void native_machine_shutdown(void)
26956 #endif
26957 }
26958
26959-static void __machine_emergency_restart(int emergency)
26960+static void __noreturn __machine_emergency_restart(int emergency)
26961 {
26962 reboot_emergency = emergency;
26963 machine_ops.emergency_restart();
26964 }
26965
26966-static void native_machine_restart(char *__unused)
26967+static void __noreturn native_machine_restart(char *__unused)
26968 {
26969 pr_notice("machine restart\n");
26970
26971@@ -635,7 +662,7 @@ static void native_machine_restart(char *__unused)
26972 __machine_emergency_restart(0);
26973 }
26974
26975-static void native_machine_halt(void)
26976+static void __noreturn native_machine_halt(void)
26977 {
26978 /* Stop other cpus and apics */
26979 machine_shutdown();
26980@@ -645,7 +672,7 @@ static void native_machine_halt(void)
26981 stop_this_cpu(NULL);
26982 }
26983
26984-static void native_machine_power_off(void)
26985+static void __noreturn native_machine_power_off(void)
26986 {
26987 if (pm_power_off) {
26988 if (!reboot_force)
26989@@ -654,9 +681,10 @@ static void native_machine_power_off(void)
26990 }
26991 /* A fallback in case there is no PM info available */
26992 tboot_shutdown(TB_SHUTDOWN_HALT);
26993+ unreachable();
26994 }
26995
26996-struct machine_ops machine_ops = {
26997+struct machine_ops machine_ops __read_only = {
26998 .power_off = native_machine_power_off,
26999 .shutdown = native_machine_shutdown,
27000 .emergency_restart = native_machine_emergency_restart,
27001diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27002index c8e41e9..64049ef 100644
27003--- a/arch/x86/kernel/reboot_fixups_32.c
27004+++ b/arch/x86/kernel/reboot_fixups_32.c
27005@@ -57,7 +57,7 @@ struct device_fixup {
27006 unsigned int vendor;
27007 unsigned int device;
27008 void (*reboot_fixup)(struct pci_dev *);
27009-};
27010+} __do_const;
27011
27012 /*
27013 * PCI ids solely used for fixups_table go here
27014diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27015index 3fd2c69..a444264 100644
27016--- a/arch/x86/kernel/relocate_kernel_64.S
27017+++ b/arch/x86/kernel/relocate_kernel_64.S
27018@@ -96,8 +96,7 @@ relocate_kernel:
27019
27020 /* jump to identity mapped page */
27021 addq $(identity_mapped - relocate_kernel), %r8
27022- pushq %r8
27023- ret
27024+ jmp *%r8
27025
27026 identity_mapped:
27027 /* set return address to 0 if not preserving context */
27028diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27029index ab08aa2..6d74a3a 100644
27030--- a/arch/x86/kernel/setup.c
27031+++ b/arch/x86/kernel/setup.c
27032@@ -110,6 +110,7 @@
27033 #include <asm/mce.h>
27034 #include <asm/alternative.h>
27035 #include <asm/prom.h>
27036+#include <asm/boot.h>
27037
27038 /*
27039 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27040@@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
27041 #endif
27042
27043
27044-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27045-__visible unsigned long mmu_cr4_features;
27046+#ifdef CONFIG_X86_64
27047+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27048+#elif defined(CONFIG_X86_PAE)
27049+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27050 #else
27051-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27052+__visible unsigned long mmu_cr4_features __read_only;
27053 #endif
27054
27055+void set_in_cr4(unsigned long mask)
27056+{
27057+ unsigned long cr4 = read_cr4();
27058+
27059+ if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
27060+ return;
27061+
27062+ pax_open_kernel();
27063+ mmu_cr4_features |= mask;
27064+ pax_close_kernel();
27065+
27066+ if (trampoline_cr4_features)
27067+ *trampoline_cr4_features = mmu_cr4_features;
27068+ cr4 |= mask;
27069+ write_cr4(cr4);
27070+}
27071+EXPORT_SYMBOL(set_in_cr4);
27072+
27073+void clear_in_cr4(unsigned long mask)
27074+{
27075+ unsigned long cr4 = read_cr4();
27076+
27077+ if (!(cr4 & mask) && cr4 == mmu_cr4_features)
27078+ return;
27079+
27080+ pax_open_kernel();
27081+ mmu_cr4_features &= ~mask;
27082+ pax_close_kernel();
27083+
27084+ if (trampoline_cr4_features)
27085+ *trampoline_cr4_features = mmu_cr4_features;
27086+ cr4 &= ~mask;
27087+ write_cr4(cr4);
27088+}
27089+EXPORT_SYMBOL(clear_in_cr4);
27090+
27091 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27092 int bootloader_type, bootloader_version;
27093
27094@@ -772,7 +811,7 @@ static void __init trim_bios_range(void)
27095 * area (640->1Mb) as ram even though it is not.
27096 * take them out.
27097 */
27098- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27099+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27100
27101 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27102 }
27103@@ -780,7 +819,7 @@ static void __init trim_bios_range(void)
27104 /* called before trim_bios_range() to spare extra sanitize */
27105 static void __init e820_add_kernel_range(void)
27106 {
27107- u64 start = __pa_symbol(_text);
27108+ u64 start = __pa_symbol(ktla_ktva(_text));
27109 u64 size = __pa_symbol(_end) - start;
27110
27111 /*
27112@@ -856,8 +895,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27113
27114 void __init setup_arch(char **cmdline_p)
27115 {
27116+#ifdef CONFIG_X86_32
27117+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27118+#else
27119 memblock_reserve(__pa_symbol(_text),
27120 (unsigned long)__bss_stop - (unsigned long)_text);
27121+#endif
27122
27123 early_reserve_initrd();
27124
27125@@ -955,14 +998,14 @@ void __init setup_arch(char **cmdline_p)
27126
27127 if (!boot_params.hdr.root_flags)
27128 root_mountflags &= ~MS_RDONLY;
27129- init_mm.start_code = (unsigned long) _text;
27130- init_mm.end_code = (unsigned long) _etext;
27131+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27132+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27133 init_mm.end_data = (unsigned long) _edata;
27134 init_mm.brk = _brk_end;
27135
27136- code_resource.start = __pa_symbol(_text);
27137- code_resource.end = __pa_symbol(_etext)-1;
27138- data_resource.start = __pa_symbol(_etext);
27139+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27140+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27141+ data_resource.start = __pa_symbol(_sdata);
27142 data_resource.end = __pa_symbol(_edata)-1;
27143 bss_resource.start = __pa_symbol(__bss_start);
27144 bss_resource.end = __pa_symbol(__bss_stop)-1;
27145diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27146index 5cdff03..80fa283 100644
27147--- a/arch/x86/kernel/setup_percpu.c
27148+++ b/arch/x86/kernel/setup_percpu.c
27149@@ -21,19 +21,17 @@
27150 #include <asm/cpu.h>
27151 #include <asm/stackprotector.h>
27152
27153-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27154+#ifdef CONFIG_SMP
27155+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27156 EXPORT_PER_CPU_SYMBOL(cpu_number);
27157+#endif
27158
27159-#ifdef CONFIG_X86_64
27160 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27161-#else
27162-#define BOOT_PERCPU_OFFSET 0
27163-#endif
27164
27165 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27166 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27167
27168-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27169+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27170 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27171 };
27172 EXPORT_SYMBOL(__per_cpu_offset);
27173@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27174 {
27175 #ifdef CONFIG_NEED_MULTIPLE_NODES
27176 pg_data_t *last = NULL;
27177- unsigned int cpu;
27178+ int cpu;
27179
27180 for_each_possible_cpu(cpu) {
27181 int node = early_cpu_to_node(cpu);
27182@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27183 {
27184 #ifdef CONFIG_X86_32
27185 struct desc_struct gdt;
27186+ unsigned long base = per_cpu_offset(cpu);
27187
27188- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27189- 0x2 | DESCTYPE_S, 0x8);
27190- gdt.s = 1;
27191+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27192+ 0x83 | DESCTYPE_S, 0xC);
27193 write_gdt_entry(get_cpu_gdt_table(cpu),
27194 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27195 #endif
27196@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27197 /* alrighty, percpu areas up and running */
27198 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27199 for_each_possible_cpu(cpu) {
27200+#ifdef CONFIG_CC_STACKPROTECTOR
27201+#ifdef CONFIG_X86_32
27202+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27203+#endif
27204+#endif
27205 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27206 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27207 per_cpu(cpu_number, cpu) = cpu;
27208@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27209 */
27210 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27211 #endif
27212+#ifdef CONFIG_CC_STACKPROTECTOR
27213+#ifdef CONFIG_X86_32
27214+ if (!cpu)
27215+ per_cpu(stack_canary.canary, cpu) = canary;
27216+#endif
27217+#endif
27218 /*
27219 * Up to this point, the boot CPU has been using .init.data
27220 * area. Reload any changed state for the boot CPU.
27221diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27222index ed37a76..39f936e 100644
27223--- a/arch/x86/kernel/signal.c
27224+++ b/arch/x86/kernel/signal.c
27225@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
27226 * Align the stack pointer according to the i386 ABI,
27227 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27228 */
27229- sp = ((sp + 4) & -16ul) - 4;
27230+ sp = ((sp - 12) & -16ul) - 4;
27231 #else /* !CONFIG_X86_32 */
27232 sp = round_down(sp, 16) - 8;
27233 #endif
27234@@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27235 }
27236
27237 if (current->mm->context.vdso)
27238- restorer = current->mm->context.vdso +
27239- selected_vdso32->sym___kernel_sigreturn;
27240+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27241 else
27242- restorer = &frame->retcode;
27243+ restorer = (void __user *)&frame->retcode;
27244 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27245 restorer = ksig->ka.sa.sa_restorer;
27246
27247@@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27248 * reasons and because gdb uses it as a signature to notice
27249 * signal handler stack frames.
27250 */
27251- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27252+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27253
27254 if (err)
27255 return -EFAULT;
27256@@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27257 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27258
27259 /* Set up to return from userspace. */
27260- restorer = current->mm->context.vdso +
27261- selected_vdso32->sym___kernel_rt_sigreturn;
27262+ if (current->mm->context.vdso)
27263+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27264+ else
27265+ restorer = (void __user *)&frame->retcode;
27266 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27267 restorer = ksig->ka.sa.sa_restorer;
27268 put_user_ex(restorer, &frame->pretcode);
27269@@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27270 * reasons and because gdb uses it as a signature to notice
27271 * signal handler stack frames.
27272 */
27273- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27274+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27275 } put_user_catch(err);
27276
27277 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27278@@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27279 {
27280 int usig = signr_convert(ksig->sig);
27281 sigset_t *set = sigmask_to_save();
27282- compat_sigset_t *cset = (compat_sigset_t *) set;
27283+ sigset_t sigcopy;
27284+ compat_sigset_t *cset;
27285+
27286+ sigcopy = *set;
27287+
27288+ cset = (compat_sigset_t *) &sigcopy;
27289
27290 /* Set up the stack frame */
27291 if (is_ia32_frame()) {
27292@@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27293 } else if (is_x32_frame()) {
27294 return x32_setup_rt_frame(ksig, cset, regs);
27295 } else {
27296- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27297+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27298 }
27299 }
27300
27301diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27302index be8e1bd..a3d93fa 100644
27303--- a/arch/x86/kernel/smp.c
27304+++ b/arch/x86/kernel/smp.c
27305@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27306
27307 __setup("nonmi_ipi", nonmi_ipi_setup);
27308
27309-struct smp_ops smp_ops = {
27310+struct smp_ops smp_ops __read_only = {
27311 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27312 .smp_prepare_cpus = native_smp_prepare_cpus,
27313 .smp_cpus_done = native_smp_cpus_done,
27314diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27315index 668d8f2..84a9d54 100644
27316--- a/arch/x86/kernel/smpboot.c
27317+++ b/arch/x86/kernel/smpboot.c
27318@@ -194,14 +194,17 @@ static void notrace start_secondary(void *unused)
27319
27320 enable_start_cpu0 = 0;
27321
27322-#ifdef CONFIG_X86_32
27323+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27324+ barrier();
27325+
27326 /* switch away from the initial page table */
27327+#ifdef CONFIG_PAX_PER_CPU_PGD
27328+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27329+#else
27330 load_cr3(swapper_pg_dir);
27331+#endif
27332 __flush_tlb_all();
27333-#endif
27334
27335- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27336- barrier();
27337 /*
27338 * Check TSC synchronization with the BP:
27339 */
27340@@ -765,8 +768,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27341 alternatives_enable_smp();
27342
27343 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27344- (THREAD_SIZE + task_stack_page(idle))) - 1);
27345+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27346 per_cpu(current_task, cpu) = idle;
27347+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27348
27349 #ifdef CONFIG_X86_32
27350 /* Stack for startup_32 can be just as for start_secondary onwards */
27351@@ -775,10 +779,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27352 clear_tsk_thread_flag(idle, TIF_FORK);
27353 initial_gs = per_cpu_offset(cpu);
27354 #endif
27355- per_cpu(kernel_stack, cpu) =
27356- (unsigned long)task_stack_page(idle) -
27357- KERNEL_STACK_OFFSET + THREAD_SIZE;
27358+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27359+ pax_open_kernel();
27360 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27361+ pax_close_kernel();
27362 initial_code = (unsigned long)start_secondary;
27363 stack_start = idle->thread.sp;
27364
27365@@ -918,6 +922,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27366 /* the FPU context is blank, nobody can own it */
27367 __cpu_disable_lazy_restore(cpu);
27368
27369+#ifdef CONFIG_PAX_PER_CPU_PGD
27370+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27371+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27372+ KERNEL_PGD_PTRS);
27373+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27374+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27375+ KERNEL_PGD_PTRS);
27376+#endif
27377+
27378 err = do_boot_cpu(apicid, cpu, tidle);
27379 if (err) {
27380 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27381diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27382index 9b4d51d..5d28b58 100644
27383--- a/arch/x86/kernel/step.c
27384+++ b/arch/x86/kernel/step.c
27385@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27386 struct desc_struct *desc;
27387 unsigned long base;
27388
27389- seg &= ~7UL;
27390+ seg >>= 3;
27391
27392 mutex_lock(&child->mm->context.lock);
27393- if (unlikely((seg >> 3) >= child->mm->context.size))
27394+ if (unlikely(seg >= child->mm->context.size))
27395 addr = -1L; /* bogus selector, access would fault */
27396 else {
27397 desc = child->mm->context.ldt + seg;
27398@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27399 addr += base;
27400 }
27401 mutex_unlock(&child->mm->context.lock);
27402- }
27403+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27404+ addr = ktla_ktva(addr);
27405
27406 return addr;
27407 }
27408@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27409 unsigned char opcode[15];
27410 unsigned long addr = convert_ip_to_linear(child, regs);
27411
27412+ if (addr == -EINVAL)
27413+ return 0;
27414+
27415 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27416 for (i = 0; i < copied; i++) {
27417 switch (opcode[i]) {
27418diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27419new file mode 100644
27420index 0000000..5877189
27421--- /dev/null
27422+++ b/arch/x86/kernel/sys_i386_32.c
27423@@ -0,0 +1,189 @@
27424+/*
27425+ * This file contains various random system calls that
27426+ * have a non-standard calling sequence on the Linux/i386
27427+ * platform.
27428+ */
27429+
27430+#include <linux/errno.h>
27431+#include <linux/sched.h>
27432+#include <linux/mm.h>
27433+#include <linux/fs.h>
27434+#include <linux/smp.h>
27435+#include <linux/sem.h>
27436+#include <linux/msg.h>
27437+#include <linux/shm.h>
27438+#include <linux/stat.h>
27439+#include <linux/syscalls.h>
27440+#include <linux/mman.h>
27441+#include <linux/file.h>
27442+#include <linux/utsname.h>
27443+#include <linux/ipc.h>
27444+#include <linux/elf.h>
27445+
27446+#include <linux/uaccess.h>
27447+#include <linux/unistd.h>
27448+
27449+#include <asm/syscalls.h>
27450+
27451+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27452+{
27453+ unsigned long pax_task_size = TASK_SIZE;
27454+
27455+#ifdef CONFIG_PAX_SEGMEXEC
27456+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27457+ pax_task_size = SEGMEXEC_TASK_SIZE;
27458+#endif
27459+
27460+ if (flags & MAP_FIXED)
27461+ if (len > pax_task_size || addr > pax_task_size - len)
27462+ return -EINVAL;
27463+
27464+ return 0;
27465+}
27466+
27467+/*
27468+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27469+ */
27470+static unsigned long get_align_mask(void)
27471+{
27472+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27473+ return 0;
27474+
27475+ if (!(current->flags & PF_RANDOMIZE))
27476+ return 0;
27477+
27478+ return va_align.mask;
27479+}
27480+
27481+unsigned long
27482+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27483+ unsigned long len, unsigned long pgoff, unsigned long flags)
27484+{
27485+ struct mm_struct *mm = current->mm;
27486+ struct vm_area_struct *vma;
27487+ unsigned long pax_task_size = TASK_SIZE;
27488+ struct vm_unmapped_area_info info;
27489+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27490+
27491+#ifdef CONFIG_PAX_SEGMEXEC
27492+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27493+ pax_task_size = SEGMEXEC_TASK_SIZE;
27494+#endif
27495+
27496+ pax_task_size -= PAGE_SIZE;
27497+
27498+ if (len > pax_task_size)
27499+ return -ENOMEM;
27500+
27501+ if (flags & MAP_FIXED)
27502+ return addr;
27503+
27504+#ifdef CONFIG_PAX_RANDMMAP
27505+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27506+#endif
27507+
27508+ if (addr) {
27509+ addr = PAGE_ALIGN(addr);
27510+ if (pax_task_size - len >= addr) {
27511+ vma = find_vma(mm, addr);
27512+ if (check_heap_stack_gap(vma, addr, len, offset))
27513+ return addr;
27514+ }
27515+ }
27516+
27517+ info.flags = 0;
27518+ info.length = len;
27519+ info.align_mask = filp ? get_align_mask() : 0;
27520+ info.align_offset = pgoff << PAGE_SHIFT;
27521+ info.threadstack_offset = offset;
27522+
27523+#ifdef CONFIG_PAX_PAGEEXEC
27524+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27525+ info.low_limit = 0x00110000UL;
27526+ info.high_limit = mm->start_code;
27527+
27528+#ifdef CONFIG_PAX_RANDMMAP
27529+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27530+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27531+#endif
27532+
27533+ if (info.low_limit < info.high_limit) {
27534+ addr = vm_unmapped_area(&info);
27535+ if (!IS_ERR_VALUE(addr))
27536+ return addr;
27537+ }
27538+ } else
27539+#endif
27540+
27541+ info.low_limit = mm->mmap_base;
27542+ info.high_limit = pax_task_size;
27543+
27544+ return vm_unmapped_area(&info);
27545+}
27546+
27547+unsigned long
27548+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27549+ const unsigned long len, const unsigned long pgoff,
27550+ const unsigned long flags)
27551+{
27552+ struct vm_area_struct *vma;
27553+ struct mm_struct *mm = current->mm;
27554+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27555+ struct vm_unmapped_area_info info;
27556+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27557+
27558+#ifdef CONFIG_PAX_SEGMEXEC
27559+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27560+ pax_task_size = SEGMEXEC_TASK_SIZE;
27561+#endif
27562+
27563+ pax_task_size -= PAGE_SIZE;
27564+
27565+ /* requested length too big for entire address space */
27566+ if (len > pax_task_size)
27567+ return -ENOMEM;
27568+
27569+ if (flags & MAP_FIXED)
27570+ return addr;
27571+
27572+#ifdef CONFIG_PAX_PAGEEXEC
27573+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27574+ goto bottomup;
27575+#endif
27576+
27577+#ifdef CONFIG_PAX_RANDMMAP
27578+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27579+#endif
27580+
27581+ /* requesting a specific address */
27582+ if (addr) {
27583+ addr = PAGE_ALIGN(addr);
27584+ if (pax_task_size - len >= addr) {
27585+ vma = find_vma(mm, addr);
27586+ if (check_heap_stack_gap(vma, addr, len, offset))
27587+ return addr;
27588+ }
27589+ }
27590+
27591+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27592+ info.length = len;
27593+ info.low_limit = PAGE_SIZE;
27594+ info.high_limit = mm->mmap_base;
27595+ info.align_mask = filp ? get_align_mask() : 0;
27596+ info.align_offset = pgoff << PAGE_SHIFT;
27597+ info.threadstack_offset = offset;
27598+
27599+ addr = vm_unmapped_area(&info);
27600+ if (!(addr & ~PAGE_MASK))
27601+ return addr;
27602+ VM_BUG_ON(addr != -ENOMEM);
27603+
27604+bottomup:
27605+ /*
27606+ * A failed mmap() very likely causes application failure,
27607+ * so fall back to the bottom-up function here. This scenario
27608+ * can happen with large stack limits and large mmap()
27609+ * allocations.
27610+ */
27611+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27612+}
27613diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27614index 30277e2..5664a29 100644
27615--- a/arch/x86/kernel/sys_x86_64.c
27616+++ b/arch/x86/kernel/sys_x86_64.c
27617@@ -81,8 +81,8 @@ out:
27618 return error;
27619 }
27620
27621-static void find_start_end(unsigned long flags, unsigned long *begin,
27622- unsigned long *end)
27623+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27624+ unsigned long *begin, unsigned long *end)
27625 {
27626 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27627 unsigned long new_begin;
27628@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27629 *begin = new_begin;
27630 }
27631 } else {
27632- *begin = current->mm->mmap_legacy_base;
27633+ *begin = mm->mmap_legacy_base;
27634 *end = TASK_SIZE;
27635 }
27636 }
27637@@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27638 struct vm_area_struct *vma;
27639 struct vm_unmapped_area_info info;
27640 unsigned long begin, end;
27641+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27642
27643 if (flags & MAP_FIXED)
27644 return addr;
27645
27646- find_start_end(flags, &begin, &end);
27647+ find_start_end(mm, flags, &begin, &end);
27648
27649 if (len > end)
27650 return -ENOMEM;
27651
27652+#ifdef CONFIG_PAX_RANDMMAP
27653+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27654+#endif
27655+
27656 if (addr) {
27657 addr = PAGE_ALIGN(addr);
27658 vma = find_vma(mm, addr);
27659- if (end - len >= addr &&
27660- (!vma || addr + len <= vma->vm_start))
27661+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27662 return addr;
27663 }
27664
27665@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27666 info.high_limit = end;
27667 info.align_mask = filp ? get_align_mask() : 0;
27668 info.align_offset = pgoff << PAGE_SHIFT;
27669+ info.threadstack_offset = offset;
27670 return vm_unmapped_area(&info);
27671 }
27672
27673@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27674 struct mm_struct *mm = current->mm;
27675 unsigned long addr = addr0;
27676 struct vm_unmapped_area_info info;
27677+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27678
27679 /* requested length too big for entire address space */
27680 if (len > TASK_SIZE)
27681@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27682 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27683 goto bottomup;
27684
27685+#ifdef CONFIG_PAX_RANDMMAP
27686+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27687+#endif
27688+
27689 /* requesting a specific address */
27690 if (addr) {
27691 addr = PAGE_ALIGN(addr);
27692 vma = find_vma(mm, addr);
27693- if (TASK_SIZE - len >= addr &&
27694- (!vma || addr + len <= vma->vm_start))
27695+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27696 return addr;
27697 }
27698
27699@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27700 info.high_limit = mm->mmap_base;
27701 info.align_mask = filp ? get_align_mask() : 0;
27702 info.align_offset = pgoff << PAGE_SHIFT;
27703+ info.threadstack_offset = offset;
27704 addr = vm_unmapped_area(&info);
27705 if (!(addr & ~PAGE_MASK))
27706 return addr;
27707diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27708index 91a4496..bb87552 100644
27709--- a/arch/x86/kernel/tboot.c
27710+++ b/arch/x86/kernel/tboot.c
27711@@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
27712
27713 void tboot_shutdown(u32 shutdown_type)
27714 {
27715- void (*shutdown)(void);
27716+ void (* __noreturn shutdown)(void);
27717
27718 if (!tboot_enabled())
27719 return;
27720@@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
27721
27722 switch_to_tboot_pt();
27723
27724- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27725+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27726 shutdown();
27727
27728 /* should not reach here */
27729@@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27730 return -ENODEV;
27731 }
27732
27733-static atomic_t ap_wfs_count;
27734+static atomic_unchecked_t ap_wfs_count;
27735
27736 static int tboot_wait_for_aps(int num_aps)
27737 {
27738@@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27739 {
27740 switch (action) {
27741 case CPU_DYING:
27742- atomic_inc(&ap_wfs_count);
27743+ atomic_inc_unchecked(&ap_wfs_count);
27744 if (num_online_cpus() == 1)
27745- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27746+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27747 return NOTIFY_BAD;
27748 break;
27749 }
27750@@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
27751
27752 tboot_create_trampoline();
27753
27754- atomic_set(&ap_wfs_count, 0);
27755+ atomic_set_unchecked(&ap_wfs_count, 0);
27756 register_hotcpu_notifier(&tboot_cpu_notifier);
27757
27758 #ifdef CONFIG_DEBUG_FS
27759diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27760index 0fa2960..91eabbe 100644
27761--- a/arch/x86/kernel/time.c
27762+++ b/arch/x86/kernel/time.c
27763@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27764 {
27765 unsigned long pc = instruction_pointer(regs);
27766
27767- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27768+ if (!user_mode(regs) && in_lock_functions(pc)) {
27769 #ifdef CONFIG_FRAME_POINTER
27770- return *(unsigned long *)(regs->bp + sizeof(long));
27771+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27772 #else
27773 unsigned long *sp =
27774 (unsigned long *)kernel_stack_pointer(regs);
27775@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27776 * or above a saved flags. Eflags has bits 22-31 zero,
27777 * kernel addresses don't.
27778 */
27779+
27780+#ifdef CONFIG_PAX_KERNEXEC
27781+ return ktla_ktva(sp[0]);
27782+#else
27783 if (sp[0] >> 22)
27784 return sp[0];
27785 if (sp[1] >> 22)
27786 return sp[1];
27787 #endif
27788+
27789+#endif
27790 }
27791 return pc;
27792 }
27793diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27794index f7fec09..d0f623f 100644
27795--- a/arch/x86/kernel/tls.c
27796+++ b/arch/x86/kernel/tls.c
27797@@ -27,6 +27,37 @@ static int get_free_idx(void)
27798 return -ESRCH;
27799 }
27800
27801+static bool tls_desc_okay(const struct user_desc *info)
27802+{
27803+ if (LDT_empty(info))
27804+ return true;
27805+
27806+ /*
27807+ * espfix is required for 16-bit data segments, but espfix
27808+ * only works for LDT segments.
27809+ */
27810+ if (!info->seg_32bit)
27811+ return false;
27812+
27813+ /* Only allow data segments in the TLS array. */
27814+ if (info->contents > 1)
27815+ return false;
27816+
27817+ /*
27818+ * Non-present segments with DPL 3 present an interesting attack
27819+ * surface. The kernel should handle such segments correctly,
27820+ * but TLS is very difficult to protect in a sandbox, so prevent
27821+ * such segments from being created.
27822+ *
27823+ * If userspace needs to remove a TLS entry, it can still delete
27824+ * it outright.
27825+ */
27826+ if (info->seg_not_present)
27827+ return false;
27828+
27829+ return true;
27830+}
27831+
27832 static void set_tls_desc(struct task_struct *p, int idx,
27833 const struct user_desc *info, int n)
27834 {
27835@@ -66,6 +97,9 @@ int do_set_thread_area(struct task_struct *p, int idx,
27836 if (copy_from_user(&info, u_info, sizeof(info)))
27837 return -EFAULT;
27838
27839+ if (!tls_desc_okay(&info))
27840+ return -EINVAL;
27841+
27842 if (idx == -1)
27843 idx = info.entry_number;
27844
27845@@ -84,6 +118,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27846 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27847 return -EINVAL;
27848
27849+#ifdef CONFIG_PAX_SEGMEXEC
27850+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27851+ return -EINVAL;
27852+#endif
27853+
27854 set_tls_desc(p, idx, &info, 1);
27855
27856 return 0;
27857@@ -192,6 +231,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27858 {
27859 struct user_desc infobuf[GDT_ENTRY_TLS_ENTRIES];
27860 const struct user_desc *info;
27861+ int i;
27862
27863 if (pos >= GDT_ENTRY_TLS_ENTRIES * sizeof(struct user_desc) ||
27864 (pos % sizeof(struct user_desc)) != 0 ||
27865@@ -200,11 +240,15 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27866
27867 if (kbuf)
27868 info = kbuf;
27869- else if (__copy_from_user(infobuf, ubuf, count))
27870+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27871 return -EFAULT;
27872 else
27873 info = infobuf;
27874
27875+ for (i = 0; i < count / sizeof(struct user_desc); i++)
27876+ if (!tls_desc_okay(info + i))
27877+ return -EINVAL;
27878+
27879 set_tls_desc(target,
27880 GDT_ENTRY_TLS_MIN + (pos / sizeof(struct user_desc)),
27881 info, count / sizeof(struct user_desc));
27882diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27883index 1c113db..287b42e 100644
27884--- a/arch/x86/kernel/tracepoint.c
27885+++ b/arch/x86/kernel/tracepoint.c
27886@@ -9,11 +9,11 @@
27887 #include <linux/atomic.h>
27888
27889 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27890-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27891+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27892 (unsigned long) trace_idt_table };
27893
27894 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27895-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27896+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27897
27898 static int trace_irq_vector_refcount;
27899 static DEFINE_MUTEX(irq_vector_mutex);
27900diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27901index de801f2..f189dcf 100644
27902--- a/arch/x86/kernel/traps.c
27903+++ b/arch/x86/kernel/traps.c
27904@@ -67,7 +67,7 @@
27905 #include <asm/proto.h>
27906
27907 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27908-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27909+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27910 #else
27911 #include <asm/processor-flags.h>
27912 #include <asm/setup.h>
27913@@ -76,7 +76,7 @@ asmlinkage int system_call(void);
27914 #endif
27915
27916 /* Must be page-aligned because the real IDT is used in a fixmap. */
27917-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27918+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27919
27920 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27921 EXPORT_SYMBOL_GPL(used_vectors);
27922@@ -108,11 +108,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
27923 }
27924
27925 static nokprobe_inline int
27926-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27927+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27928 struct pt_regs *regs, long error_code)
27929 {
27930 #ifdef CONFIG_X86_32
27931- if (regs->flags & X86_VM_MASK) {
27932+ if (v8086_mode(regs)) {
27933 /*
27934 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27935 * On nmi (interrupt 2), do_trap should not be called.
27936@@ -125,12 +125,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27937 return -1;
27938 }
27939 #endif
27940- if (!user_mode(regs)) {
27941+ if (!user_mode_novm(regs)) {
27942 if (!fixup_exception(regs)) {
27943 tsk->thread.error_code = error_code;
27944 tsk->thread.trap_nr = trapnr;
27945+
27946+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27947+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27948+ str = "PAX: suspicious stack segment fault";
27949+#endif
27950+
27951 die(str, regs, error_code);
27952 }
27953+
27954+#ifdef CONFIG_PAX_REFCOUNT
27955+ if (trapnr == X86_TRAP_OF)
27956+ pax_report_refcount_overflow(regs);
27957+#endif
27958+
27959 return 0;
27960 }
27961
27962@@ -169,7 +181,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
27963 }
27964
27965 static void
27966-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27967+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
27968 long error_code, siginfo_t *info)
27969 {
27970 struct task_struct *tsk = current;
27971@@ -193,7 +205,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27972 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
27973 printk_ratelimit()) {
27974 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
27975- tsk->comm, tsk->pid, str,
27976+ tsk->comm, task_pid_nr(tsk), str,
27977 regs->ip, regs->sp, error_code);
27978 print_vma_addr(" in ", regs->ip);
27979 pr_cont("\n");
27980@@ -274,6 +286,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
27981 tsk->thread.error_code = error_code;
27982 tsk->thread.trap_nr = X86_TRAP_DF;
27983
27984+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
27985+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
27986+ die("grsec: kernel stack overflow detected", regs, error_code);
27987+#endif
27988+
27989 #ifdef CONFIG_DOUBLEFAULT
27990 df_debug(regs, error_code);
27991 #endif
27992@@ -296,7 +313,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
27993 conditional_sti(regs);
27994
27995 #ifdef CONFIG_X86_32
27996- if (regs->flags & X86_VM_MASK) {
27997+ if (v8086_mode(regs)) {
27998 local_irq_enable();
27999 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
28000 goto exit;
28001@@ -304,18 +321,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
28002 #endif
28003
28004 tsk = current;
28005- if (!user_mode(regs)) {
28006+ if (!user_mode_novm(regs)) {
28007 if (fixup_exception(regs))
28008 goto exit;
28009
28010 tsk->thread.error_code = error_code;
28011 tsk->thread.trap_nr = X86_TRAP_GP;
28012 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28013- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28014+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28015+
28016+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28017+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28018+ die("PAX: suspicious general protection fault", regs, error_code);
28019+ else
28020+#endif
28021+
28022 die("general protection fault", regs, error_code);
28023+ }
28024 goto exit;
28025 }
28026
28027+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28028+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28029+ struct mm_struct *mm = tsk->mm;
28030+ unsigned long limit;
28031+
28032+ down_write(&mm->mmap_sem);
28033+ limit = mm->context.user_cs_limit;
28034+ if (limit < TASK_SIZE) {
28035+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28036+ up_write(&mm->mmap_sem);
28037+ return;
28038+ }
28039+ up_write(&mm->mmap_sem);
28040+ }
28041+#endif
28042+
28043 tsk->thread.error_code = error_code;
28044 tsk->thread.trap_nr = X86_TRAP_GP;
28045
28046@@ -433,7 +474,7 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28047 /* Copy the remainder of the stack from the current stack. */
28048 memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
28049
28050- BUG_ON(!user_mode_vm(&new_stack->regs));
28051+ BUG_ON(!user_mode(&new_stack->regs));
28052 return new_stack;
28053 }
28054 #endif
28055@@ -518,7 +559,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28056 /* It's safe to allow irq's after DR6 has been saved */
28057 preempt_conditional_sti(regs);
28058
28059- if (regs->flags & X86_VM_MASK) {
28060+ if (v8086_mode(regs)) {
28061 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
28062 X86_TRAP_DB);
28063 preempt_conditional_cli(regs);
28064@@ -533,7 +574,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28065 * We already checked v86 mode above, so we can check for kernel mode
28066 * by just checking the CPL of CS.
28067 */
28068- if ((dr6 & DR_STEP) && !user_mode(regs)) {
28069+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
28070 tsk->thread.debugreg6 &= ~DR_STEP;
28071 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
28072 regs->flags &= ~X86_EFLAGS_TF;
28073@@ -566,7 +607,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
28074 return;
28075 conditional_sti(regs);
28076
28077- if (!user_mode_vm(regs))
28078+ if (!user_mode(regs))
28079 {
28080 if (!fixup_exception(regs)) {
28081 task->thread.error_code = error_code;
28082diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28083index b7e50bb..f4a93ae 100644
28084--- a/arch/x86/kernel/tsc.c
28085+++ b/arch/x86/kernel/tsc.c
28086@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28087 */
28088 smp_wmb();
28089
28090- ACCESS_ONCE(c2n->head) = data;
28091+ ACCESS_ONCE_RW(c2n->head) = data;
28092 }
28093
28094 /*
28095diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28096index 5d1cbfe..2a21feb 100644
28097--- a/arch/x86/kernel/uprobes.c
28098+++ b/arch/x86/kernel/uprobes.c
28099@@ -845,7 +845,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
28100 int ret = NOTIFY_DONE;
28101
28102 /* We are only interested in userspace traps */
28103- if (regs && !user_mode_vm(regs))
28104+ if (regs && !user_mode(regs))
28105 return NOTIFY_DONE;
28106
28107 switch (val) {
28108@@ -919,7 +919,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28109
28110 if (nleft != rasize) {
28111 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28112- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28113+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28114
28115 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28116 }
28117diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28118index b9242ba..50c5edd 100644
28119--- a/arch/x86/kernel/verify_cpu.S
28120+++ b/arch/x86/kernel/verify_cpu.S
28121@@ -20,6 +20,7 @@
28122 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28123 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28124 * arch/x86/kernel/head_32.S: processor startup
28125+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28126 *
28127 * verify_cpu, returns the status of longmode and SSE in register %eax.
28128 * 0: Success 1: Failure
28129diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28130index e8edcf5..27f9344 100644
28131--- a/arch/x86/kernel/vm86_32.c
28132+++ b/arch/x86/kernel/vm86_32.c
28133@@ -44,6 +44,7 @@
28134 #include <linux/ptrace.h>
28135 #include <linux/audit.h>
28136 #include <linux/stddef.h>
28137+#include <linux/grsecurity.h>
28138
28139 #include <asm/uaccess.h>
28140 #include <asm/io.h>
28141@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28142 do_exit(SIGSEGV);
28143 }
28144
28145- tss = &per_cpu(init_tss, get_cpu());
28146+ tss = init_tss + get_cpu();
28147 current->thread.sp0 = current->thread.saved_sp0;
28148 current->thread.sysenter_cs = __KERNEL_CS;
28149 load_sp0(tss, &current->thread);
28150@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28151
28152 if (tsk->thread.saved_sp0)
28153 return -EPERM;
28154+
28155+#ifdef CONFIG_GRKERNSEC_VM86
28156+ if (!capable(CAP_SYS_RAWIO)) {
28157+ gr_handle_vm86();
28158+ return -EPERM;
28159+ }
28160+#endif
28161+
28162 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28163 offsetof(struct kernel_vm86_struct, vm86plus) -
28164 sizeof(info.regs));
28165@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28166 int tmp;
28167 struct vm86plus_struct __user *v86;
28168
28169+#ifdef CONFIG_GRKERNSEC_VM86
28170+ if (!capable(CAP_SYS_RAWIO)) {
28171+ gr_handle_vm86();
28172+ return -EPERM;
28173+ }
28174+#endif
28175+
28176 tsk = current;
28177 switch (cmd) {
28178 case VM86_REQUEST_IRQ:
28179@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28180 tsk->thread.saved_fs = info->regs32->fs;
28181 tsk->thread.saved_gs = get_user_gs(info->regs32);
28182
28183- tss = &per_cpu(init_tss, get_cpu());
28184+ tss = init_tss + get_cpu();
28185 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28186 if (cpu_has_sep)
28187 tsk->thread.sysenter_cs = 0;
28188@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28189 goto cannot_handle;
28190 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28191 goto cannot_handle;
28192- intr_ptr = (unsigned long __user *) (i << 2);
28193+ intr_ptr = (__force unsigned long __user *) (i << 2);
28194 if (get_user(segoffs, intr_ptr))
28195 goto cannot_handle;
28196 if ((segoffs >> 16) == BIOSSEG)
28197diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28198index 49edf2d..c0d1362 100644
28199--- a/arch/x86/kernel/vmlinux.lds.S
28200+++ b/arch/x86/kernel/vmlinux.lds.S
28201@@ -26,6 +26,13 @@
28202 #include <asm/page_types.h>
28203 #include <asm/cache.h>
28204 #include <asm/boot.h>
28205+#include <asm/segment.h>
28206+
28207+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28208+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28209+#else
28210+#define __KERNEL_TEXT_OFFSET 0
28211+#endif
28212
28213 #undef i386 /* in case the preprocessor is a 32bit one */
28214
28215@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28216
28217 PHDRS {
28218 text PT_LOAD FLAGS(5); /* R_E */
28219+#ifdef CONFIG_X86_32
28220+ module PT_LOAD FLAGS(5); /* R_E */
28221+#endif
28222+#ifdef CONFIG_XEN
28223+ rodata PT_LOAD FLAGS(5); /* R_E */
28224+#else
28225+ rodata PT_LOAD FLAGS(4); /* R__ */
28226+#endif
28227 data PT_LOAD FLAGS(6); /* RW_ */
28228-#ifdef CONFIG_X86_64
28229+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28230 #ifdef CONFIG_SMP
28231 percpu PT_LOAD FLAGS(6); /* RW_ */
28232 #endif
28233+ text.init PT_LOAD FLAGS(5); /* R_E */
28234+ text.exit PT_LOAD FLAGS(5); /* R_E */
28235 init PT_LOAD FLAGS(7); /* RWE */
28236-#endif
28237 note PT_NOTE FLAGS(0); /* ___ */
28238 }
28239
28240 SECTIONS
28241 {
28242 #ifdef CONFIG_X86_32
28243- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28244- phys_startup_32 = startup_32 - LOAD_OFFSET;
28245+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28246 #else
28247- . = __START_KERNEL;
28248- phys_startup_64 = startup_64 - LOAD_OFFSET;
28249+ . = __START_KERNEL;
28250 #endif
28251
28252 /* Text and read-only data */
28253- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28254- _text = .;
28255+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28256 /* bootstrapping code */
28257+#ifdef CONFIG_X86_32
28258+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28259+#else
28260+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28261+#endif
28262+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28263+ _text = .;
28264 HEAD_TEXT
28265 . = ALIGN(8);
28266 _stext = .;
28267@@ -104,13 +124,47 @@ SECTIONS
28268 IRQENTRY_TEXT
28269 *(.fixup)
28270 *(.gnu.warning)
28271- /* End of text section */
28272- _etext = .;
28273 } :text = 0x9090
28274
28275- NOTES :text :note
28276+ . += __KERNEL_TEXT_OFFSET;
28277
28278- EXCEPTION_TABLE(16) :text = 0x9090
28279+#ifdef CONFIG_X86_32
28280+ . = ALIGN(PAGE_SIZE);
28281+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28282+
28283+#ifdef CONFIG_PAX_KERNEXEC
28284+ MODULES_EXEC_VADDR = .;
28285+ BYTE(0)
28286+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28287+ . = ALIGN(HPAGE_SIZE) - 1;
28288+ MODULES_EXEC_END = .;
28289+#endif
28290+
28291+ } :module
28292+#endif
28293+
28294+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28295+ /* End of text section */
28296+ BYTE(0)
28297+ _etext = . - __KERNEL_TEXT_OFFSET;
28298+ }
28299+
28300+#ifdef CONFIG_X86_32
28301+ . = ALIGN(PAGE_SIZE);
28302+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28303+ . = ALIGN(PAGE_SIZE);
28304+ *(.empty_zero_page)
28305+ *(.initial_pg_fixmap)
28306+ *(.initial_pg_pmd)
28307+ *(.initial_page_table)
28308+ *(.swapper_pg_dir)
28309+ } :rodata
28310+#endif
28311+
28312+ . = ALIGN(PAGE_SIZE);
28313+ NOTES :rodata :note
28314+
28315+ EXCEPTION_TABLE(16) :rodata
28316
28317 #if defined(CONFIG_DEBUG_RODATA)
28318 /* .text should occupy whole number of pages */
28319@@ -122,16 +176,20 @@ SECTIONS
28320
28321 /* Data */
28322 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28323+
28324+#ifdef CONFIG_PAX_KERNEXEC
28325+ . = ALIGN(HPAGE_SIZE);
28326+#else
28327+ . = ALIGN(PAGE_SIZE);
28328+#endif
28329+
28330 /* Start of data section */
28331 _sdata = .;
28332
28333 /* init_task */
28334 INIT_TASK_DATA(THREAD_SIZE)
28335
28336-#ifdef CONFIG_X86_32
28337- /* 32 bit has nosave before _edata */
28338 NOSAVE_DATA
28339-#endif
28340
28341 PAGE_ALIGNED_DATA(PAGE_SIZE)
28342
28343@@ -174,12 +232,19 @@ SECTIONS
28344 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28345
28346 /* Init code and data - will be freed after init */
28347- . = ALIGN(PAGE_SIZE);
28348 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28349+ BYTE(0)
28350+
28351+#ifdef CONFIG_PAX_KERNEXEC
28352+ . = ALIGN(HPAGE_SIZE);
28353+#else
28354+ . = ALIGN(PAGE_SIZE);
28355+#endif
28356+
28357 __init_begin = .; /* paired with __init_end */
28358- }
28359+ } :init.begin
28360
28361-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28362+#ifdef CONFIG_SMP
28363 /*
28364 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28365 * output PHDR, so the next output section - .init.text - should
28366@@ -188,12 +253,27 @@ SECTIONS
28367 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
28368 #endif
28369
28370- INIT_TEXT_SECTION(PAGE_SIZE)
28371-#ifdef CONFIG_X86_64
28372- :init
28373-#endif
28374+ . = ALIGN(PAGE_SIZE);
28375+ init_begin = .;
28376+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28377+ VMLINUX_SYMBOL(_sinittext) = .;
28378+ INIT_TEXT
28379+ VMLINUX_SYMBOL(_einittext) = .;
28380+ . = ALIGN(PAGE_SIZE);
28381+ } :text.init
28382
28383- INIT_DATA_SECTION(16)
28384+ /*
28385+ * .exit.text is discard at runtime, not link time, to deal with
28386+ * references from .altinstructions and .eh_frame
28387+ */
28388+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28389+ EXIT_TEXT
28390+ . = ALIGN(16);
28391+ } :text.exit
28392+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28393+
28394+ . = ALIGN(PAGE_SIZE);
28395+ INIT_DATA_SECTION(16) :init
28396
28397 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28398 __x86_cpu_dev_start = .;
28399@@ -264,19 +344,12 @@ SECTIONS
28400 }
28401
28402 . = ALIGN(8);
28403- /*
28404- * .exit.text is discard at runtime, not link time, to deal with
28405- * references from .altinstructions and .eh_frame
28406- */
28407- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28408- EXIT_TEXT
28409- }
28410
28411 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28412 EXIT_DATA
28413 }
28414
28415-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28416+#ifndef CONFIG_SMP
28417 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28418 #endif
28419
28420@@ -295,16 +368,10 @@ SECTIONS
28421 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28422 __smp_locks = .;
28423 *(.smp_locks)
28424- . = ALIGN(PAGE_SIZE);
28425 __smp_locks_end = .;
28426+ . = ALIGN(PAGE_SIZE);
28427 }
28428
28429-#ifdef CONFIG_X86_64
28430- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28431- NOSAVE_DATA
28432- }
28433-#endif
28434-
28435 /* BSS */
28436 . = ALIGN(PAGE_SIZE);
28437 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28438@@ -320,6 +387,7 @@ SECTIONS
28439 __brk_base = .;
28440 . += 64 * 1024; /* 64k alignment slop space */
28441 *(.brk_reservation) /* areas brk users have reserved */
28442+ . = ALIGN(HPAGE_SIZE);
28443 __brk_limit = .;
28444 }
28445
28446@@ -346,13 +414,12 @@ SECTIONS
28447 * for the boot processor.
28448 */
28449 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28450-INIT_PER_CPU(gdt_page);
28451 INIT_PER_CPU(irq_stack_union);
28452
28453 /*
28454 * Build-time check on the image size:
28455 */
28456-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28457+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28458 "kernel image bigger than KERNEL_IMAGE_SIZE");
28459
28460 #ifdef CONFIG_SMP
28461diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28462index 957779f..74e405c 100644
28463--- a/arch/x86/kernel/vsyscall_64.c
28464+++ b/arch/x86/kernel/vsyscall_64.c
28465@@ -54,15 +54,13 @@
28466
28467 DEFINE_VVAR(int, vgetcpu_mode);
28468
28469-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28470+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28471
28472 static int __init vsyscall_setup(char *str)
28473 {
28474 if (str) {
28475 if (!strcmp("emulate", str))
28476 vsyscall_mode = EMULATE;
28477- else if (!strcmp("native", str))
28478- vsyscall_mode = NATIVE;
28479 else if (!strcmp("none", str))
28480 vsyscall_mode = NONE;
28481 else
28482@@ -279,8 +277,7 @@ do_ret:
28483 return true;
28484
28485 sigsegv:
28486- force_sig(SIGSEGV, current);
28487- return true;
28488+ do_group_exit(SIGKILL);
28489 }
28490
28491 /*
28492@@ -331,10 +328,7 @@ void __init map_vsyscall(void)
28493 extern char __vsyscall_page;
28494 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28495
28496- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28497- vsyscall_mode == NATIVE
28498- ? PAGE_KERNEL_VSYSCALL
28499- : PAGE_KERNEL_VVAR);
28500+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28501 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28502 (unsigned long)VSYSCALL_ADDR);
28503 }
28504diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28505index 04068192..4d75aa6 100644
28506--- a/arch/x86/kernel/x8664_ksyms_64.c
28507+++ b/arch/x86/kernel/x8664_ksyms_64.c
28508@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28509 EXPORT_SYMBOL(copy_user_generic_unrolled);
28510 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28511 EXPORT_SYMBOL(__copy_user_nocache);
28512-EXPORT_SYMBOL(_copy_from_user);
28513-EXPORT_SYMBOL(_copy_to_user);
28514
28515 EXPORT_SYMBOL(copy_page);
28516 EXPORT_SYMBOL(clear_page);
28517@@ -73,3 +71,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28518 EXPORT_SYMBOL(___preempt_schedule_context);
28519 #endif
28520 #endif
28521+
28522+#ifdef CONFIG_PAX_PER_CPU_PGD
28523+EXPORT_SYMBOL(cpu_pgd);
28524+#endif
28525diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28526index e48b674..a451dd9 100644
28527--- a/arch/x86/kernel/x86_init.c
28528+++ b/arch/x86/kernel/x86_init.c
28529@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28530 static void default_nmi_init(void) { };
28531 static int default_i8042_detect(void) { return 1; };
28532
28533-struct x86_platform_ops x86_platform = {
28534+struct x86_platform_ops x86_platform __read_only = {
28535 .calibrate_tsc = native_calibrate_tsc,
28536 .get_wallclock = mach_get_cmos_time,
28537 .set_wallclock = mach_set_rtc_mmss,
28538@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28539 EXPORT_SYMBOL_GPL(x86_platform);
28540
28541 #if defined(CONFIG_PCI_MSI)
28542-struct x86_msi_ops x86_msi = {
28543+struct x86_msi_ops x86_msi __read_only = {
28544 .setup_msi_irqs = native_setup_msi_irqs,
28545 .compose_msi_msg = native_compose_msi_msg,
28546 .teardown_msi_irq = native_teardown_msi_irq,
28547@@ -150,7 +150,7 @@ u32 arch_msix_mask_irq(struct msi_desc *desc, u32 flag)
28548 }
28549 #endif
28550
28551-struct x86_io_apic_ops x86_io_apic_ops = {
28552+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28553 .init = native_io_apic_init_mappings,
28554 .read = native_io_apic_read,
28555 .write = native_io_apic_write,
28556diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28557index 4c540c4..0b985b0 100644
28558--- a/arch/x86/kernel/xsave.c
28559+++ b/arch/x86/kernel/xsave.c
28560@@ -167,18 +167,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28561
28562 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28563 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28564- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28565+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28566
28567 if (!use_xsave())
28568 return err;
28569
28570- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28571+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28572
28573 /*
28574 * Read the xstate_bv which we copied (directly from the cpu or
28575 * from the state in task struct) to the user buffers.
28576 */
28577- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28578+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28579
28580 /*
28581 * For legacy compatible, we always set FP/SSE bits in the bit
28582@@ -193,7 +193,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28583 */
28584 xstate_bv |= XSTATE_FPSSE;
28585
28586- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28587+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28588
28589 return err;
28590 }
28591@@ -202,6 +202,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28592 {
28593 int err;
28594
28595+ buf = (struct xsave_struct __user *)____m(buf);
28596 if (use_xsave())
28597 err = xsave_user(buf);
28598 else if (use_fxsr())
28599@@ -312,6 +313,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28600 */
28601 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28602 {
28603+ buf = (void __user *)____m(buf);
28604 if (use_xsave()) {
28605 if ((unsigned long)buf % 64 || fx_only) {
28606 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28607diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28608index 976e3a5..8bb998c 100644
28609--- a/arch/x86/kvm/cpuid.c
28610+++ b/arch/x86/kvm/cpuid.c
28611@@ -175,15 +175,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28612 struct kvm_cpuid2 *cpuid,
28613 struct kvm_cpuid_entry2 __user *entries)
28614 {
28615- int r;
28616+ int r, i;
28617
28618 r = -E2BIG;
28619 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28620 goto out;
28621 r = -EFAULT;
28622- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28623- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28624+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28625 goto out;
28626+ for (i = 0; i < cpuid->nent; ++i) {
28627+ struct kvm_cpuid_entry2 cpuid_entry;
28628+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28629+ goto out;
28630+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28631+ }
28632 vcpu->arch.cpuid_nent = cpuid->nent;
28633 kvm_apic_set_version(vcpu);
28634 kvm_x86_ops->cpuid_update(vcpu);
28635@@ -196,15 +201,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28636 struct kvm_cpuid2 *cpuid,
28637 struct kvm_cpuid_entry2 __user *entries)
28638 {
28639- int r;
28640+ int r, i;
28641
28642 r = -E2BIG;
28643 if (cpuid->nent < vcpu->arch.cpuid_nent)
28644 goto out;
28645 r = -EFAULT;
28646- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28647- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28648+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28649 goto out;
28650+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28651+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28652+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28653+ goto out;
28654+ }
28655 return 0;
28656
28657 out:
28658diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28659index 9f8a2fa..565eb4f 100644
28660--- a/arch/x86/kvm/emulate.c
28661+++ b/arch/x86/kvm/emulate.c
28662@@ -3554,7 +3554,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28663
28664 ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
28665 if (efer & EFER_LMA)
28666- rsvd = CR3_L_MODE_RESERVED_BITS;
28667+ rsvd = CR3_L_MODE_RESERVED_BITS & ~CR3_PCID_INVD;
28668
28669 if (new_val & rsvd)
28670 return emulate_gp(ctxt, 0);
28671diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28672index b8345dd..f225d71 100644
28673--- a/arch/x86/kvm/lapic.c
28674+++ b/arch/x86/kvm/lapic.c
28675@@ -55,7 +55,7 @@
28676 #define APIC_BUS_CYCLE_NS 1
28677
28678 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28679-#define apic_debug(fmt, arg...)
28680+#define apic_debug(fmt, arg...) do {} while (0)
28681
28682 #define APIC_LVT_NUM 6
28683 /* 14 is the version for Xeon and Pentium 8.4.8*/
28684diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28685index fd49c86..77e1aa0 100644
28686--- a/arch/x86/kvm/paging_tmpl.h
28687+++ b/arch/x86/kvm/paging_tmpl.h
28688@@ -343,7 +343,7 @@ retry_walk:
28689 if (unlikely(kvm_is_error_hva(host_addr)))
28690 goto error;
28691
28692- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28693+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28694 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28695 goto error;
28696 walker->ptep_user[walker->level - 1] = ptep_user;
28697diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28698index 7527cef..c63a838e 100644
28699--- a/arch/x86/kvm/svm.c
28700+++ b/arch/x86/kvm/svm.c
28701@@ -3564,7 +3564,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28702 int cpu = raw_smp_processor_id();
28703
28704 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28705+
28706+ pax_open_kernel();
28707 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28708+ pax_close_kernel();
28709+
28710 load_TR_desc();
28711 }
28712
28713@@ -3965,6 +3969,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28714 #endif
28715 #endif
28716
28717+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28718+ __set_fs(current_thread_info()->addr_limit);
28719+#endif
28720+
28721 reload_tss(vcpu);
28722
28723 local_irq_disable();
28724diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28725index 3e556c6..08bbf7f 100644
28726--- a/arch/x86/kvm/vmx.c
28727+++ b/arch/x86/kvm/vmx.c
28728@@ -1366,12 +1366,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28729 #endif
28730 }
28731
28732-static void vmcs_clear_bits(unsigned long field, u32 mask)
28733+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28734 {
28735 vmcs_writel(field, vmcs_readl(field) & ~mask);
28736 }
28737
28738-static void vmcs_set_bits(unsigned long field, u32 mask)
28739+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28740 {
28741 vmcs_writel(field, vmcs_readl(field) | mask);
28742 }
28743@@ -1631,7 +1631,11 @@ static void reload_tss(void)
28744 struct desc_struct *descs;
28745
28746 descs = (void *)gdt->address;
28747+
28748+ pax_open_kernel();
28749 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28750+ pax_close_kernel();
28751+
28752 load_TR_desc();
28753 }
28754
28755@@ -1859,6 +1863,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28756 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28757 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28758
28759+#ifdef CONFIG_PAX_PER_CPU_PGD
28760+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28761+#endif
28762+
28763 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28764 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28765 vmx->loaded_vmcs->cpu = cpu;
28766@@ -2148,7 +2156,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28767 * reads and returns guest's timestamp counter "register"
28768 * guest_tsc = host_tsc + tsc_offset -- 21.3
28769 */
28770-static u64 guest_read_tsc(void)
28771+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28772 {
28773 u64 host_tsc, tsc_offset;
28774
28775@@ -3146,11 +3154,16 @@ static __init int hardware_setup(void)
28776 * page upon invalidation. No need to do anything if the
28777 * processor does not have the APIC_ACCESS_ADDR VMCS field.
28778 */
28779- kvm_x86_ops->set_apic_access_page_addr = NULL;
28780+ pax_open_kernel();
28781+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28782+ pax_close_kernel();
28783 }
28784
28785- if (!cpu_has_vmx_tpr_shadow())
28786- kvm_x86_ops->update_cr8_intercept = NULL;
28787+ if (!cpu_has_vmx_tpr_shadow()) {
28788+ pax_open_kernel();
28789+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28790+ pax_close_kernel();
28791+ }
28792
28793 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28794 kvm_disable_largepages();
28795@@ -3161,13 +3174,15 @@ static __init int hardware_setup(void)
28796 if (!cpu_has_vmx_apicv())
28797 enable_apicv = 0;
28798
28799+ pax_open_kernel();
28800 if (enable_apicv)
28801- kvm_x86_ops->update_cr8_intercept = NULL;
28802+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28803 else {
28804- kvm_x86_ops->hwapic_irr_update = NULL;
28805- kvm_x86_ops->deliver_posted_interrupt = NULL;
28806- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28807+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28808+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28809+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28810 }
28811+ pax_close_kernel();
28812
28813 if (nested)
28814 nested_vmx_setup_ctls_msrs();
28815@@ -4274,7 +4289,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28816 unsigned long cr4;
28817
28818 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28819+
28820+#ifndef CONFIG_PAX_PER_CPU_PGD
28821 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28822+#endif
28823
28824 /* Save the most likely value for this task's CR4 in the VMCS. */
28825 cr4 = read_cr4();
28826@@ -4301,7 +4319,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28827 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28828 vmx->host_idt_base = dt.address;
28829
28830- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28831+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28832
28833 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28834 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28835@@ -7622,6 +7640,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28836 "jmp 2f \n\t"
28837 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28838 "2: "
28839+
28840+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28841+ "ljmp %[cs],$3f\n\t"
28842+ "3: "
28843+#endif
28844+
28845 /* Save guest registers, load host registers, keep flags */
28846 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28847 "pop %0 \n\t"
28848@@ -7674,6 +7698,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28849 #endif
28850 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28851 [wordsize]"i"(sizeof(ulong))
28852+
28853+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28854+ ,[cs]"i"(__KERNEL_CS)
28855+#endif
28856+
28857 : "cc", "memory"
28858 #ifdef CONFIG_X86_64
28859 , "rax", "rbx", "rdi", "rsi"
28860@@ -7687,7 +7716,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28861 if (debugctlmsr)
28862 update_debugctlmsr(debugctlmsr);
28863
28864-#ifndef CONFIG_X86_64
28865+#ifdef CONFIG_X86_32
28866 /*
28867 * The sysexit path does not restore ds/es, so we must set them to
28868 * a reasonable value ourselves.
28869@@ -7696,8 +7725,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28870 * may be executed in interrupt context, which saves and restore segments
28871 * around it, nullifying its effect.
28872 */
28873- loadsegment(ds, __USER_DS);
28874- loadsegment(es, __USER_DS);
28875+ loadsegment(ds, __KERNEL_DS);
28876+ loadsegment(es, __KERNEL_DS);
28877+ loadsegment(ss, __KERNEL_DS);
28878+
28879+#ifdef CONFIG_PAX_KERNEXEC
28880+ loadsegment(fs, __KERNEL_PERCPU);
28881+#endif
28882+
28883+#ifdef CONFIG_PAX_MEMORY_UDEREF
28884+ __set_fs(current_thread_info()->addr_limit);
28885+#endif
28886+
28887 #endif
28888
28889 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28890diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28891index 0033df3..db6236d 100644
28892--- a/arch/x86/kvm/x86.c
28893+++ b/arch/x86/kvm/x86.c
28894@@ -732,6 +732,8 @@ EXPORT_SYMBOL_GPL(kvm_set_cr4);
28895
28896 int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
28897 {
28898+ cr3 &= ~CR3_PCID_INVD;
28899+
28900 if (cr3 == kvm_read_cr3(vcpu) && !pdptrs_changed(vcpu)) {
28901 kvm_mmu_sync_roots(vcpu);
28902 kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu);
28903@@ -1878,8 +1880,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28904 {
28905 struct kvm *kvm = vcpu->kvm;
28906 int lm = is_long_mode(vcpu);
28907- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28908- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28909+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28910+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28911 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28912 : kvm->arch.xen_hvm_config.blob_size_32;
28913 u32 page_num = data & ~PAGE_MASK;
28914@@ -2806,6 +2808,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28915 if (n < msr_list.nmsrs)
28916 goto out;
28917 r = -EFAULT;
28918+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28919+ goto out;
28920 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28921 num_msrs_to_save * sizeof(u32)))
28922 goto out;
28923@@ -5670,7 +5674,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28924 };
28925 #endif
28926
28927-int kvm_arch_init(void *opaque)
28928+int kvm_arch_init(const void *opaque)
28929 {
28930 int r;
28931 struct kvm_x86_ops *ops = opaque;
28932diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28933index aae9413..d11e829 100644
28934--- a/arch/x86/lguest/boot.c
28935+++ b/arch/x86/lguest/boot.c
28936@@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
28937 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
28938 * Launcher to reboot us.
28939 */
28940-static void lguest_restart(char *reason)
28941+static __noreturn void lguest_restart(char *reason)
28942 {
28943 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
28944+ BUG();
28945 }
28946
28947 /*G:050
28948diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
28949index 00933d5..3a64af9 100644
28950--- a/arch/x86/lib/atomic64_386_32.S
28951+++ b/arch/x86/lib/atomic64_386_32.S
28952@@ -48,6 +48,10 @@ BEGIN(read)
28953 movl (v), %eax
28954 movl 4(v), %edx
28955 RET_ENDP
28956+BEGIN(read_unchecked)
28957+ movl (v), %eax
28958+ movl 4(v), %edx
28959+RET_ENDP
28960 #undef v
28961
28962 #define v %esi
28963@@ -55,6 +59,10 @@ BEGIN(set)
28964 movl %ebx, (v)
28965 movl %ecx, 4(v)
28966 RET_ENDP
28967+BEGIN(set_unchecked)
28968+ movl %ebx, (v)
28969+ movl %ecx, 4(v)
28970+RET_ENDP
28971 #undef v
28972
28973 #define v %esi
28974@@ -70,6 +78,20 @@ RET_ENDP
28975 BEGIN(add)
28976 addl %eax, (v)
28977 adcl %edx, 4(v)
28978+
28979+#ifdef CONFIG_PAX_REFCOUNT
28980+ jno 0f
28981+ subl %eax, (v)
28982+ sbbl %edx, 4(v)
28983+ int $4
28984+0:
28985+ _ASM_EXTABLE(0b, 0b)
28986+#endif
28987+
28988+RET_ENDP
28989+BEGIN(add_unchecked)
28990+ addl %eax, (v)
28991+ adcl %edx, 4(v)
28992 RET_ENDP
28993 #undef v
28994
28995@@ -77,6 +99,24 @@ RET_ENDP
28996 BEGIN(add_return)
28997 addl (v), %eax
28998 adcl 4(v), %edx
28999+
29000+#ifdef CONFIG_PAX_REFCOUNT
29001+ into
29002+1234:
29003+ _ASM_EXTABLE(1234b, 2f)
29004+#endif
29005+
29006+ movl %eax, (v)
29007+ movl %edx, 4(v)
29008+
29009+#ifdef CONFIG_PAX_REFCOUNT
29010+2:
29011+#endif
29012+
29013+RET_ENDP
29014+BEGIN(add_return_unchecked)
29015+ addl (v), %eax
29016+ adcl 4(v), %edx
29017 movl %eax, (v)
29018 movl %edx, 4(v)
29019 RET_ENDP
29020@@ -86,6 +126,20 @@ RET_ENDP
29021 BEGIN(sub)
29022 subl %eax, (v)
29023 sbbl %edx, 4(v)
29024+
29025+#ifdef CONFIG_PAX_REFCOUNT
29026+ jno 0f
29027+ addl %eax, (v)
29028+ adcl %edx, 4(v)
29029+ int $4
29030+0:
29031+ _ASM_EXTABLE(0b, 0b)
29032+#endif
29033+
29034+RET_ENDP
29035+BEGIN(sub_unchecked)
29036+ subl %eax, (v)
29037+ sbbl %edx, 4(v)
29038 RET_ENDP
29039 #undef v
29040
29041@@ -96,6 +150,27 @@ BEGIN(sub_return)
29042 sbbl $0, %edx
29043 addl (v), %eax
29044 adcl 4(v), %edx
29045+
29046+#ifdef CONFIG_PAX_REFCOUNT
29047+ into
29048+1234:
29049+ _ASM_EXTABLE(1234b, 2f)
29050+#endif
29051+
29052+ movl %eax, (v)
29053+ movl %edx, 4(v)
29054+
29055+#ifdef CONFIG_PAX_REFCOUNT
29056+2:
29057+#endif
29058+
29059+RET_ENDP
29060+BEGIN(sub_return_unchecked)
29061+ negl %edx
29062+ negl %eax
29063+ sbbl $0, %edx
29064+ addl (v), %eax
29065+ adcl 4(v), %edx
29066 movl %eax, (v)
29067 movl %edx, 4(v)
29068 RET_ENDP
29069@@ -105,6 +180,20 @@ RET_ENDP
29070 BEGIN(inc)
29071 addl $1, (v)
29072 adcl $0, 4(v)
29073+
29074+#ifdef CONFIG_PAX_REFCOUNT
29075+ jno 0f
29076+ subl $1, (v)
29077+ sbbl $0, 4(v)
29078+ int $4
29079+0:
29080+ _ASM_EXTABLE(0b, 0b)
29081+#endif
29082+
29083+RET_ENDP
29084+BEGIN(inc_unchecked)
29085+ addl $1, (v)
29086+ adcl $0, 4(v)
29087 RET_ENDP
29088 #undef v
29089
29090@@ -114,6 +203,26 @@ BEGIN(inc_return)
29091 movl 4(v), %edx
29092 addl $1, %eax
29093 adcl $0, %edx
29094+
29095+#ifdef CONFIG_PAX_REFCOUNT
29096+ into
29097+1234:
29098+ _ASM_EXTABLE(1234b, 2f)
29099+#endif
29100+
29101+ movl %eax, (v)
29102+ movl %edx, 4(v)
29103+
29104+#ifdef CONFIG_PAX_REFCOUNT
29105+2:
29106+#endif
29107+
29108+RET_ENDP
29109+BEGIN(inc_return_unchecked)
29110+ movl (v), %eax
29111+ movl 4(v), %edx
29112+ addl $1, %eax
29113+ adcl $0, %edx
29114 movl %eax, (v)
29115 movl %edx, 4(v)
29116 RET_ENDP
29117@@ -123,6 +232,20 @@ RET_ENDP
29118 BEGIN(dec)
29119 subl $1, (v)
29120 sbbl $0, 4(v)
29121+
29122+#ifdef CONFIG_PAX_REFCOUNT
29123+ jno 0f
29124+ addl $1, (v)
29125+ adcl $0, 4(v)
29126+ int $4
29127+0:
29128+ _ASM_EXTABLE(0b, 0b)
29129+#endif
29130+
29131+RET_ENDP
29132+BEGIN(dec_unchecked)
29133+ subl $1, (v)
29134+ sbbl $0, 4(v)
29135 RET_ENDP
29136 #undef v
29137
29138@@ -132,6 +255,26 @@ BEGIN(dec_return)
29139 movl 4(v), %edx
29140 subl $1, %eax
29141 sbbl $0, %edx
29142+
29143+#ifdef CONFIG_PAX_REFCOUNT
29144+ into
29145+1234:
29146+ _ASM_EXTABLE(1234b, 2f)
29147+#endif
29148+
29149+ movl %eax, (v)
29150+ movl %edx, 4(v)
29151+
29152+#ifdef CONFIG_PAX_REFCOUNT
29153+2:
29154+#endif
29155+
29156+RET_ENDP
29157+BEGIN(dec_return_unchecked)
29158+ movl (v), %eax
29159+ movl 4(v), %edx
29160+ subl $1, %eax
29161+ sbbl $0, %edx
29162 movl %eax, (v)
29163 movl %edx, 4(v)
29164 RET_ENDP
29165@@ -143,6 +286,13 @@ BEGIN(add_unless)
29166 adcl %edx, %edi
29167 addl (v), %eax
29168 adcl 4(v), %edx
29169+
29170+#ifdef CONFIG_PAX_REFCOUNT
29171+ into
29172+1234:
29173+ _ASM_EXTABLE(1234b, 2f)
29174+#endif
29175+
29176 cmpl %eax, %ecx
29177 je 3f
29178 1:
29179@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29180 1:
29181 addl $1, %eax
29182 adcl $0, %edx
29183+
29184+#ifdef CONFIG_PAX_REFCOUNT
29185+ into
29186+1234:
29187+ _ASM_EXTABLE(1234b, 2f)
29188+#endif
29189+
29190 movl %eax, (v)
29191 movl %edx, 4(v)
29192 movl $1, %eax
29193@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29194 movl 4(v), %edx
29195 subl $1, %eax
29196 sbbl $0, %edx
29197+
29198+#ifdef CONFIG_PAX_REFCOUNT
29199+ into
29200+1234:
29201+ _ASM_EXTABLE(1234b, 1f)
29202+#endif
29203+
29204 js 1f
29205 movl %eax, (v)
29206 movl %edx, 4(v)
29207diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29208index f5cc9eb..51fa319 100644
29209--- a/arch/x86/lib/atomic64_cx8_32.S
29210+++ b/arch/x86/lib/atomic64_cx8_32.S
29211@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
29212 CFI_STARTPROC
29213
29214 read64 %ecx
29215+ pax_force_retaddr
29216 ret
29217 CFI_ENDPROC
29218 ENDPROC(atomic64_read_cx8)
29219
29220+ENTRY(atomic64_read_unchecked_cx8)
29221+ CFI_STARTPROC
29222+
29223+ read64 %ecx
29224+ pax_force_retaddr
29225+ ret
29226+ CFI_ENDPROC
29227+ENDPROC(atomic64_read_unchecked_cx8)
29228+
29229 ENTRY(atomic64_set_cx8)
29230 CFI_STARTPROC
29231
29232@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
29233 cmpxchg8b (%esi)
29234 jne 1b
29235
29236+ pax_force_retaddr
29237 ret
29238 CFI_ENDPROC
29239 ENDPROC(atomic64_set_cx8)
29240
29241+ENTRY(atomic64_set_unchecked_cx8)
29242+ CFI_STARTPROC
29243+
29244+1:
29245+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29246+ * are atomic on 586 and newer */
29247+ cmpxchg8b (%esi)
29248+ jne 1b
29249+
29250+ pax_force_retaddr
29251+ ret
29252+ CFI_ENDPROC
29253+ENDPROC(atomic64_set_unchecked_cx8)
29254+
29255 ENTRY(atomic64_xchg_cx8)
29256 CFI_STARTPROC
29257
29258@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
29259 cmpxchg8b (%esi)
29260 jne 1b
29261
29262+ pax_force_retaddr
29263 ret
29264 CFI_ENDPROC
29265 ENDPROC(atomic64_xchg_cx8)
29266
29267-.macro addsub_return func ins insc
29268-ENTRY(atomic64_\func\()_return_cx8)
29269+.macro addsub_return func ins insc unchecked=""
29270+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29271 CFI_STARTPROC
29272 SAVE ebp
29273 SAVE ebx
29274@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29275 movl %edx, %ecx
29276 \ins\()l %esi, %ebx
29277 \insc\()l %edi, %ecx
29278+
29279+.ifb \unchecked
29280+#ifdef CONFIG_PAX_REFCOUNT
29281+ into
29282+2:
29283+ _ASM_EXTABLE(2b, 3f)
29284+#endif
29285+.endif
29286+
29287 LOCK_PREFIX
29288 cmpxchg8b (%ebp)
29289 jne 1b
29290-
29291-10:
29292 movl %ebx, %eax
29293 movl %ecx, %edx
29294+
29295+.ifb \unchecked
29296+#ifdef CONFIG_PAX_REFCOUNT
29297+3:
29298+#endif
29299+.endif
29300+
29301 RESTORE edi
29302 RESTORE esi
29303 RESTORE ebx
29304 RESTORE ebp
29305+ pax_force_retaddr
29306 ret
29307 CFI_ENDPROC
29308-ENDPROC(atomic64_\func\()_return_cx8)
29309+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29310 .endm
29311
29312 addsub_return add add adc
29313 addsub_return sub sub sbb
29314+addsub_return add add adc _unchecked
29315+addsub_return sub sub sbb _unchecked
29316
29317-.macro incdec_return func ins insc
29318-ENTRY(atomic64_\func\()_return_cx8)
29319+.macro incdec_return func ins insc unchecked=""
29320+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29321 CFI_STARTPROC
29322 SAVE ebx
29323
29324@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
29325 movl %edx, %ecx
29326 \ins\()l $1, %ebx
29327 \insc\()l $0, %ecx
29328+
29329+.ifb \unchecked
29330+#ifdef CONFIG_PAX_REFCOUNT
29331+ into
29332+2:
29333+ _ASM_EXTABLE(2b, 3f)
29334+#endif
29335+.endif
29336+
29337 LOCK_PREFIX
29338 cmpxchg8b (%esi)
29339 jne 1b
29340
29341-10:
29342 movl %ebx, %eax
29343 movl %ecx, %edx
29344+
29345+.ifb \unchecked
29346+#ifdef CONFIG_PAX_REFCOUNT
29347+3:
29348+#endif
29349+.endif
29350+
29351 RESTORE ebx
29352+ pax_force_retaddr
29353 ret
29354 CFI_ENDPROC
29355-ENDPROC(atomic64_\func\()_return_cx8)
29356+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29357 .endm
29358
29359 incdec_return inc add adc
29360 incdec_return dec sub sbb
29361+incdec_return inc add adc _unchecked
29362+incdec_return dec sub sbb _unchecked
29363
29364 ENTRY(atomic64_dec_if_positive_cx8)
29365 CFI_STARTPROC
29366@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29367 movl %edx, %ecx
29368 subl $1, %ebx
29369 sbb $0, %ecx
29370+
29371+#ifdef CONFIG_PAX_REFCOUNT
29372+ into
29373+1234:
29374+ _ASM_EXTABLE(1234b, 2f)
29375+#endif
29376+
29377 js 2f
29378 LOCK_PREFIX
29379 cmpxchg8b (%esi)
29380@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29381 movl %ebx, %eax
29382 movl %ecx, %edx
29383 RESTORE ebx
29384+ pax_force_retaddr
29385 ret
29386 CFI_ENDPROC
29387 ENDPROC(atomic64_dec_if_positive_cx8)
29388@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
29389 movl %edx, %ecx
29390 addl %ebp, %ebx
29391 adcl %edi, %ecx
29392+
29393+#ifdef CONFIG_PAX_REFCOUNT
29394+ into
29395+1234:
29396+ _ASM_EXTABLE(1234b, 3f)
29397+#endif
29398+
29399 LOCK_PREFIX
29400 cmpxchg8b (%esi)
29401 jne 1b
29402@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
29403 CFI_ADJUST_CFA_OFFSET -8
29404 RESTORE ebx
29405 RESTORE ebp
29406+ pax_force_retaddr
29407 ret
29408 4:
29409 cmpl %edx, 4(%esp)
29410@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29411 xorl %ecx, %ecx
29412 addl $1, %ebx
29413 adcl %edx, %ecx
29414+
29415+#ifdef CONFIG_PAX_REFCOUNT
29416+ into
29417+1234:
29418+ _ASM_EXTABLE(1234b, 3f)
29419+#endif
29420+
29421 LOCK_PREFIX
29422 cmpxchg8b (%esi)
29423 jne 1b
29424@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29425 movl $1, %eax
29426 3:
29427 RESTORE ebx
29428+ pax_force_retaddr
29429 ret
29430 CFI_ENDPROC
29431 ENDPROC(atomic64_inc_not_zero_cx8)
29432diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29433index e78b8eee..7e173a8 100644
29434--- a/arch/x86/lib/checksum_32.S
29435+++ b/arch/x86/lib/checksum_32.S
29436@@ -29,7 +29,8 @@
29437 #include <asm/dwarf2.h>
29438 #include <asm/errno.h>
29439 #include <asm/asm.h>
29440-
29441+#include <asm/segment.h>
29442+
29443 /*
29444 * computes a partial checksum, e.g. for TCP/UDP fragments
29445 */
29446@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29447
29448 #define ARGBASE 16
29449 #define FP 12
29450-
29451-ENTRY(csum_partial_copy_generic)
29452+
29453+ENTRY(csum_partial_copy_generic_to_user)
29454 CFI_STARTPROC
29455+
29456+#ifdef CONFIG_PAX_MEMORY_UDEREF
29457+ pushl_cfi %gs
29458+ popl_cfi %es
29459+ jmp csum_partial_copy_generic
29460+#endif
29461+
29462+ENTRY(csum_partial_copy_generic_from_user)
29463+
29464+#ifdef CONFIG_PAX_MEMORY_UDEREF
29465+ pushl_cfi %gs
29466+ popl_cfi %ds
29467+#endif
29468+
29469+ENTRY(csum_partial_copy_generic)
29470 subl $4,%esp
29471 CFI_ADJUST_CFA_OFFSET 4
29472 pushl_cfi %edi
29473@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29474 jmp 4f
29475 SRC(1: movw (%esi), %bx )
29476 addl $2, %esi
29477-DST( movw %bx, (%edi) )
29478+DST( movw %bx, %es:(%edi) )
29479 addl $2, %edi
29480 addw %bx, %ax
29481 adcl $0, %eax
29482@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29483 SRC(1: movl (%esi), %ebx )
29484 SRC( movl 4(%esi), %edx )
29485 adcl %ebx, %eax
29486-DST( movl %ebx, (%edi) )
29487+DST( movl %ebx, %es:(%edi) )
29488 adcl %edx, %eax
29489-DST( movl %edx, 4(%edi) )
29490+DST( movl %edx, %es:4(%edi) )
29491
29492 SRC( movl 8(%esi), %ebx )
29493 SRC( movl 12(%esi), %edx )
29494 adcl %ebx, %eax
29495-DST( movl %ebx, 8(%edi) )
29496+DST( movl %ebx, %es:8(%edi) )
29497 adcl %edx, %eax
29498-DST( movl %edx, 12(%edi) )
29499+DST( movl %edx, %es:12(%edi) )
29500
29501 SRC( movl 16(%esi), %ebx )
29502 SRC( movl 20(%esi), %edx )
29503 adcl %ebx, %eax
29504-DST( movl %ebx, 16(%edi) )
29505+DST( movl %ebx, %es:16(%edi) )
29506 adcl %edx, %eax
29507-DST( movl %edx, 20(%edi) )
29508+DST( movl %edx, %es:20(%edi) )
29509
29510 SRC( movl 24(%esi), %ebx )
29511 SRC( movl 28(%esi), %edx )
29512 adcl %ebx, %eax
29513-DST( movl %ebx, 24(%edi) )
29514+DST( movl %ebx, %es:24(%edi) )
29515 adcl %edx, %eax
29516-DST( movl %edx, 28(%edi) )
29517+DST( movl %edx, %es:28(%edi) )
29518
29519 lea 32(%esi), %esi
29520 lea 32(%edi), %edi
29521@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29522 shrl $2, %edx # This clears CF
29523 SRC(3: movl (%esi), %ebx )
29524 adcl %ebx, %eax
29525-DST( movl %ebx, (%edi) )
29526+DST( movl %ebx, %es:(%edi) )
29527 lea 4(%esi), %esi
29528 lea 4(%edi), %edi
29529 dec %edx
29530@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29531 jb 5f
29532 SRC( movw (%esi), %cx )
29533 leal 2(%esi), %esi
29534-DST( movw %cx, (%edi) )
29535+DST( movw %cx, %es:(%edi) )
29536 leal 2(%edi), %edi
29537 je 6f
29538 shll $16,%ecx
29539 SRC(5: movb (%esi), %cl )
29540-DST( movb %cl, (%edi) )
29541+DST( movb %cl, %es:(%edi) )
29542 6: addl %ecx, %eax
29543 adcl $0, %eax
29544 7:
29545@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29546
29547 6001:
29548 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29549- movl $-EFAULT, (%ebx)
29550+ movl $-EFAULT, %ss:(%ebx)
29551
29552 # zero the complete destination - computing the rest
29553 # is too much work
29554@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29555
29556 6002:
29557 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29558- movl $-EFAULT,(%ebx)
29559+ movl $-EFAULT,%ss:(%ebx)
29560 jmp 5000b
29561
29562 .previous
29563
29564+ pushl_cfi %ss
29565+ popl_cfi %ds
29566+ pushl_cfi %ss
29567+ popl_cfi %es
29568 popl_cfi %ebx
29569 CFI_RESTORE ebx
29570 popl_cfi %esi
29571@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29572 popl_cfi %ecx # equivalent to addl $4,%esp
29573 ret
29574 CFI_ENDPROC
29575-ENDPROC(csum_partial_copy_generic)
29576+ENDPROC(csum_partial_copy_generic_to_user)
29577
29578 #else
29579
29580 /* Version for PentiumII/PPro */
29581
29582 #define ROUND1(x) \
29583+ nop; nop; nop; \
29584 SRC(movl x(%esi), %ebx ) ; \
29585 addl %ebx, %eax ; \
29586- DST(movl %ebx, x(%edi) ) ;
29587+ DST(movl %ebx, %es:x(%edi)) ;
29588
29589 #define ROUND(x) \
29590+ nop; nop; nop; \
29591 SRC(movl x(%esi), %ebx ) ; \
29592 adcl %ebx, %eax ; \
29593- DST(movl %ebx, x(%edi) ) ;
29594+ DST(movl %ebx, %es:x(%edi)) ;
29595
29596 #define ARGBASE 12
29597-
29598-ENTRY(csum_partial_copy_generic)
29599+
29600+ENTRY(csum_partial_copy_generic_to_user)
29601 CFI_STARTPROC
29602+
29603+#ifdef CONFIG_PAX_MEMORY_UDEREF
29604+ pushl_cfi %gs
29605+ popl_cfi %es
29606+ jmp csum_partial_copy_generic
29607+#endif
29608+
29609+ENTRY(csum_partial_copy_generic_from_user)
29610+
29611+#ifdef CONFIG_PAX_MEMORY_UDEREF
29612+ pushl_cfi %gs
29613+ popl_cfi %ds
29614+#endif
29615+
29616+ENTRY(csum_partial_copy_generic)
29617 pushl_cfi %ebx
29618 CFI_REL_OFFSET ebx, 0
29619 pushl_cfi %edi
29620@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29621 subl %ebx, %edi
29622 lea -1(%esi),%edx
29623 andl $-32,%edx
29624- lea 3f(%ebx,%ebx), %ebx
29625+ lea 3f(%ebx,%ebx,2), %ebx
29626 testl %esi, %esi
29627 jmp *%ebx
29628 1: addl $64,%esi
29629@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29630 jb 5f
29631 SRC( movw (%esi), %dx )
29632 leal 2(%esi), %esi
29633-DST( movw %dx, (%edi) )
29634+DST( movw %dx, %es:(%edi) )
29635 leal 2(%edi), %edi
29636 je 6f
29637 shll $16,%edx
29638 5:
29639 SRC( movb (%esi), %dl )
29640-DST( movb %dl, (%edi) )
29641+DST( movb %dl, %es:(%edi) )
29642 6: addl %edx, %eax
29643 adcl $0, %eax
29644 7:
29645 .section .fixup, "ax"
29646 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29647- movl $-EFAULT, (%ebx)
29648+ movl $-EFAULT, %ss:(%ebx)
29649 # zero the complete destination (computing the rest is too much work)
29650 movl ARGBASE+8(%esp),%edi # dst
29651 movl ARGBASE+12(%esp),%ecx # len
29652@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29653 rep; stosb
29654 jmp 7b
29655 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29656- movl $-EFAULT, (%ebx)
29657+ movl $-EFAULT, %ss:(%ebx)
29658 jmp 7b
29659 .previous
29660
29661+#ifdef CONFIG_PAX_MEMORY_UDEREF
29662+ pushl_cfi %ss
29663+ popl_cfi %ds
29664+ pushl_cfi %ss
29665+ popl_cfi %es
29666+#endif
29667+
29668 popl_cfi %esi
29669 CFI_RESTORE esi
29670 popl_cfi %edi
29671@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29672 CFI_RESTORE ebx
29673 ret
29674 CFI_ENDPROC
29675-ENDPROC(csum_partial_copy_generic)
29676+ENDPROC(csum_partial_copy_generic_to_user)
29677
29678 #undef ROUND
29679 #undef ROUND1
29680diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29681index f2145cf..cea889d 100644
29682--- a/arch/x86/lib/clear_page_64.S
29683+++ b/arch/x86/lib/clear_page_64.S
29684@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29685 movl $4096/8,%ecx
29686 xorl %eax,%eax
29687 rep stosq
29688+ pax_force_retaddr
29689 ret
29690 CFI_ENDPROC
29691 ENDPROC(clear_page_c)
29692@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29693 movl $4096,%ecx
29694 xorl %eax,%eax
29695 rep stosb
29696+ pax_force_retaddr
29697 ret
29698 CFI_ENDPROC
29699 ENDPROC(clear_page_c_e)
29700@@ -43,6 +45,7 @@ ENTRY(clear_page)
29701 leaq 64(%rdi),%rdi
29702 jnz .Lloop
29703 nop
29704+ pax_force_retaddr
29705 ret
29706 CFI_ENDPROC
29707 .Lclear_page_end:
29708@@ -58,7 +61,7 @@ ENDPROC(clear_page)
29709
29710 #include <asm/cpufeature.h>
29711
29712- .section .altinstr_replacement,"ax"
29713+ .section .altinstr_replacement,"a"
29714 1: .byte 0xeb /* jmp <disp8> */
29715 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29716 2: .byte 0xeb /* jmp <disp8> */
29717diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29718index 40a1725..5d12ac4 100644
29719--- a/arch/x86/lib/cmpxchg16b_emu.S
29720+++ b/arch/x86/lib/cmpxchg16b_emu.S
29721@@ -8,6 +8,7 @@
29722 #include <linux/linkage.h>
29723 #include <asm/dwarf2.h>
29724 #include <asm/percpu.h>
29725+#include <asm/alternative-asm.h>
29726
29727 .text
29728
29729@@ -46,12 +47,14 @@ CFI_STARTPROC
29730 CFI_REMEMBER_STATE
29731 popfq_cfi
29732 mov $1, %al
29733+ pax_force_retaddr
29734 ret
29735
29736 CFI_RESTORE_STATE
29737 .Lnot_same:
29738 popfq_cfi
29739 xor %al,%al
29740+ pax_force_retaddr
29741 ret
29742
29743 CFI_ENDPROC
29744diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29745index 176cca6..e0d658e 100644
29746--- a/arch/x86/lib/copy_page_64.S
29747+++ b/arch/x86/lib/copy_page_64.S
29748@@ -9,6 +9,7 @@ copy_page_rep:
29749 CFI_STARTPROC
29750 movl $4096/8, %ecx
29751 rep movsq
29752+ pax_force_retaddr
29753 ret
29754 CFI_ENDPROC
29755 ENDPROC(copy_page_rep)
29756@@ -24,8 +25,8 @@ ENTRY(copy_page)
29757 CFI_ADJUST_CFA_OFFSET 2*8
29758 movq %rbx, (%rsp)
29759 CFI_REL_OFFSET rbx, 0
29760- movq %r12, 1*8(%rsp)
29761- CFI_REL_OFFSET r12, 1*8
29762+ movq %r13, 1*8(%rsp)
29763+ CFI_REL_OFFSET r13, 1*8
29764
29765 movl $(4096/64)-5, %ecx
29766 .p2align 4
29767@@ -38,7 +39,7 @@ ENTRY(copy_page)
29768 movq 0x8*4(%rsi), %r9
29769 movq 0x8*5(%rsi), %r10
29770 movq 0x8*6(%rsi), %r11
29771- movq 0x8*7(%rsi), %r12
29772+ movq 0x8*7(%rsi), %r13
29773
29774 prefetcht0 5*64(%rsi)
29775
29776@@ -49,7 +50,7 @@ ENTRY(copy_page)
29777 movq %r9, 0x8*4(%rdi)
29778 movq %r10, 0x8*5(%rdi)
29779 movq %r11, 0x8*6(%rdi)
29780- movq %r12, 0x8*7(%rdi)
29781+ movq %r13, 0x8*7(%rdi)
29782
29783 leaq 64 (%rsi), %rsi
29784 leaq 64 (%rdi), %rdi
29785@@ -68,7 +69,7 @@ ENTRY(copy_page)
29786 movq 0x8*4(%rsi), %r9
29787 movq 0x8*5(%rsi), %r10
29788 movq 0x8*6(%rsi), %r11
29789- movq 0x8*7(%rsi), %r12
29790+ movq 0x8*7(%rsi), %r13
29791
29792 movq %rax, 0x8*0(%rdi)
29793 movq %rbx, 0x8*1(%rdi)
29794@@ -77,7 +78,7 @@ ENTRY(copy_page)
29795 movq %r9, 0x8*4(%rdi)
29796 movq %r10, 0x8*5(%rdi)
29797 movq %r11, 0x8*6(%rdi)
29798- movq %r12, 0x8*7(%rdi)
29799+ movq %r13, 0x8*7(%rdi)
29800
29801 leaq 64(%rdi), %rdi
29802 leaq 64(%rsi), %rsi
29803@@ -85,10 +86,11 @@ ENTRY(copy_page)
29804
29805 movq (%rsp), %rbx
29806 CFI_RESTORE rbx
29807- movq 1*8(%rsp), %r12
29808- CFI_RESTORE r12
29809+ movq 1*8(%rsp), %r13
29810+ CFI_RESTORE r13
29811 addq $2*8, %rsp
29812 CFI_ADJUST_CFA_OFFSET -2*8
29813+ pax_force_retaddr
29814 ret
29815 .Lcopy_page_end:
29816 CFI_ENDPROC
29817@@ -99,7 +101,7 @@ ENDPROC(copy_page)
29818
29819 #include <asm/cpufeature.h>
29820
29821- .section .altinstr_replacement,"ax"
29822+ .section .altinstr_replacement,"a"
29823 1: .byte 0xeb /* jmp <disp8> */
29824 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29825 2:
29826diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29827index dee945d..a84067b 100644
29828--- a/arch/x86/lib/copy_user_64.S
29829+++ b/arch/x86/lib/copy_user_64.S
29830@@ -18,31 +18,7 @@
29831 #include <asm/alternative-asm.h>
29832 #include <asm/asm.h>
29833 #include <asm/smap.h>
29834-
29835-/*
29836- * By placing feature2 after feature1 in altinstructions section, we logically
29837- * implement:
29838- * If CPU has feature2, jmp to alt2 is used
29839- * else if CPU has feature1, jmp to alt1 is used
29840- * else jmp to orig is used.
29841- */
29842- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29843-0:
29844- .byte 0xe9 /* 32bit jump */
29845- .long \orig-1f /* by default jump to orig */
29846-1:
29847- .section .altinstr_replacement,"ax"
29848-2: .byte 0xe9 /* near jump with 32bit immediate */
29849- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29850-3: .byte 0xe9 /* near jump with 32bit immediate */
29851- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29852- .previous
29853-
29854- .section .altinstructions,"a"
29855- altinstruction_entry 0b,2b,\feature1,5,5
29856- altinstruction_entry 0b,3b,\feature2,5,5
29857- .previous
29858- .endm
29859+#include <asm/pgtable.h>
29860
29861 .macro ALIGN_DESTINATION
29862 #ifdef FIX_ALIGNMENT
29863@@ -70,52 +46,6 @@
29864 #endif
29865 .endm
29866
29867-/* Standard copy_to_user with segment limit checking */
29868-ENTRY(_copy_to_user)
29869- CFI_STARTPROC
29870- GET_THREAD_INFO(%rax)
29871- movq %rdi,%rcx
29872- addq %rdx,%rcx
29873- jc bad_to_user
29874- cmpq TI_addr_limit(%rax),%rcx
29875- ja bad_to_user
29876- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29877- copy_user_generic_unrolled,copy_user_generic_string, \
29878- copy_user_enhanced_fast_string
29879- CFI_ENDPROC
29880-ENDPROC(_copy_to_user)
29881-
29882-/* Standard copy_from_user with segment limit checking */
29883-ENTRY(_copy_from_user)
29884- CFI_STARTPROC
29885- GET_THREAD_INFO(%rax)
29886- movq %rsi,%rcx
29887- addq %rdx,%rcx
29888- jc bad_from_user
29889- cmpq TI_addr_limit(%rax),%rcx
29890- ja bad_from_user
29891- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29892- copy_user_generic_unrolled,copy_user_generic_string, \
29893- copy_user_enhanced_fast_string
29894- CFI_ENDPROC
29895-ENDPROC(_copy_from_user)
29896-
29897- .section .fixup,"ax"
29898- /* must zero dest */
29899-ENTRY(bad_from_user)
29900-bad_from_user:
29901- CFI_STARTPROC
29902- movl %edx,%ecx
29903- xorl %eax,%eax
29904- rep
29905- stosb
29906-bad_to_user:
29907- movl %edx,%eax
29908- ret
29909- CFI_ENDPROC
29910-ENDPROC(bad_from_user)
29911- .previous
29912-
29913 /*
29914 * copy_user_generic_unrolled - memory copy with exception handling.
29915 * This version is for CPUs like P4 that don't have efficient micro
29916@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
29917 */
29918 ENTRY(copy_user_generic_unrolled)
29919 CFI_STARTPROC
29920+ ASM_PAX_OPEN_USERLAND
29921 ASM_STAC
29922 cmpl $8,%edx
29923 jb 20f /* less then 8 bytes, go to byte copy loop */
29924@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
29925 jnz 21b
29926 23: xor %eax,%eax
29927 ASM_CLAC
29928+ ASM_PAX_CLOSE_USERLAND
29929+ pax_force_retaddr
29930 ret
29931
29932 .section .fixup,"ax"
29933@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
29934 */
29935 ENTRY(copy_user_generic_string)
29936 CFI_STARTPROC
29937+ ASM_PAX_OPEN_USERLAND
29938 ASM_STAC
29939 cmpl $8,%edx
29940 jb 2f /* less than 8 bytes, go to byte copy loop */
29941@@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
29942 movsb
29943 xorl %eax,%eax
29944 ASM_CLAC
29945+ ASM_PAX_CLOSE_USERLAND
29946+ pax_force_retaddr
29947 ret
29948
29949 .section .fixup,"ax"
29950@@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
29951 */
29952 ENTRY(copy_user_enhanced_fast_string)
29953 CFI_STARTPROC
29954+ ASM_PAX_OPEN_USERLAND
29955 ASM_STAC
29956 movl %edx,%ecx
29957 1: rep
29958 movsb
29959 xorl %eax,%eax
29960 ASM_CLAC
29961+ ASM_PAX_CLOSE_USERLAND
29962+ pax_force_retaddr
29963 ret
29964
29965 .section .fixup,"ax"
29966diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
29967index 6a4f43c..c70fb52 100644
29968--- a/arch/x86/lib/copy_user_nocache_64.S
29969+++ b/arch/x86/lib/copy_user_nocache_64.S
29970@@ -8,6 +8,7 @@
29971
29972 #include <linux/linkage.h>
29973 #include <asm/dwarf2.h>
29974+#include <asm/alternative-asm.h>
29975
29976 #define FIX_ALIGNMENT 1
29977
29978@@ -16,6 +17,7 @@
29979 #include <asm/thread_info.h>
29980 #include <asm/asm.h>
29981 #include <asm/smap.h>
29982+#include <asm/pgtable.h>
29983
29984 .macro ALIGN_DESTINATION
29985 #ifdef FIX_ALIGNMENT
29986@@ -49,6 +51,16 @@
29987 */
29988 ENTRY(__copy_user_nocache)
29989 CFI_STARTPROC
29990+
29991+#ifdef CONFIG_PAX_MEMORY_UDEREF
29992+ mov pax_user_shadow_base,%rcx
29993+ cmp %rcx,%rsi
29994+ jae 1f
29995+ add %rcx,%rsi
29996+1:
29997+#endif
29998+
29999+ ASM_PAX_OPEN_USERLAND
30000 ASM_STAC
30001 cmpl $8,%edx
30002 jb 20f /* less then 8 bytes, go to byte copy loop */
30003@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
30004 jnz 21b
30005 23: xorl %eax,%eax
30006 ASM_CLAC
30007+ ASM_PAX_CLOSE_USERLAND
30008 sfence
30009+ pax_force_retaddr
30010 ret
30011
30012 .section .fixup,"ax"
30013diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
30014index 2419d5f..fe52d0e 100644
30015--- a/arch/x86/lib/csum-copy_64.S
30016+++ b/arch/x86/lib/csum-copy_64.S
30017@@ -9,6 +9,7 @@
30018 #include <asm/dwarf2.h>
30019 #include <asm/errno.h>
30020 #include <asm/asm.h>
30021+#include <asm/alternative-asm.h>
30022
30023 /*
30024 * Checksum copy with exception handling.
30025@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30026 CFI_ADJUST_CFA_OFFSET 7*8
30027 movq %rbx, 2*8(%rsp)
30028 CFI_REL_OFFSET rbx, 2*8
30029- movq %r12, 3*8(%rsp)
30030- CFI_REL_OFFSET r12, 3*8
30031+ movq %r15, 3*8(%rsp)
30032+ CFI_REL_OFFSET r15, 3*8
30033 movq %r14, 4*8(%rsp)
30034 CFI_REL_OFFSET r14, 4*8
30035 movq %r13, 5*8(%rsp)
30036@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30037 movl %edx, %ecx
30038
30039 xorl %r9d, %r9d
30040- movq %rcx, %r12
30041+ movq %rcx, %r15
30042
30043- shrq $6, %r12
30044+ shrq $6, %r15
30045 jz .Lhandle_tail /* < 64 */
30046
30047 clc
30048
30049 /* main loop. clear in 64 byte blocks */
30050 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30051- /* r11: temp3, rdx: temp4, r12 loopcnt */
30052+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30053 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30054 .p2align 4
30055 .Lloop:
30056@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30057 adcq %r14, %rax
30058 adcq %r13, %rax
30059
30060- decl %r12d
30061+ decl %r15d
30062
30063 dest
30064 movq %rbx, (%rsi)
30065@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30066 .Lende:
30067 movq 2*8(%rsp), %rbx
30068 CFI_RESTORE rbx
30069- movq 3*8(%rsp), %r12
30070- CFI_RESTORE r12
30071+ movq 3*8(%rsp), %r15
30072+ CFI_RESTORE r15
30073 movq 4*8(%rsp), %r14
30074 CFI_RESTORE r14
30075 movq 5*8(%rsp), %r13
30076@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30077 CFI_RESTORE rbp
30078 addq $7*8, %rsp
30079 CFI_ADJUST_CFA_OFFSET -7*8
30080+ pax_force_retaddr
30081 ret
30082 CFI_RESTORE_STATE
30083
30084diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30085index 1318f75..44c30fd 100644
30086--- a/arch/x86/lib/csum-wrappers_64.c
30087+++ b/arch/x86/lib/csum-wrappers_64.c
30088@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30089 len -= 2;
30090 }
30091 }
30092+ pax_open_userland();
30093 stac();
30094- isum = csum_partial_copy_generic((__force const void *)src,
30095+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30096 dst, len, isum, errp, NULL);
30097 clac();
30098+ pax_close_userland();
30099 if (unlikely(*errp))
30100 goto out_err;
30101
30102@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30103 }
30104
30105 *errp = 0;
30106+ pax_open_userland();
30107 stac();
30108- ret = csum_partial_copy_generic(src, (void __force *)dst,
30109+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30110 len, isum, NULL, errp);
30111 clac();
30112+ pax_close_userland();
30113 return ret;
30114 }
30115 EXPORT_SYMBOL(csum_partial_copy_to_user);
30116diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30117index a451235..1daa956 100644
30118--- a/arch/x86/lib/getuser.S
30119+++ b/arch/x86/lib/getuser.S
30120@@ -33,17 +33,40 @@
30121 #include <asm/thread_info.h>
30122 #include <asm/asm.h>
30123 #include <asm/smap.h>
30124+#include <asm/segment.h>
30125+#include <asm/pgtable.h>
30126+#include <asm/alternative-asm.h>
30127+
30128+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30129+#define __copyuser_seg gs;
30130+#else
30131+#define __copyuser_seg
30132+#endif
30133
30134 .text
30135 ENTRY(__get_user_1)
30136 CFI_STARTPROC
30137+
30138+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30139 GET_THREAD_INFO(%_ASM_DX)
30140 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30141 jae bad_get_user
30142 ASM_STAC
30143-1: movzbl (%_ASM_AX),%edx
30144+
30145+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30146+ mov pax_user_shadow_base,%_ASM_DX
30147+ cmp %_ASM_DX,%_ASM_AX
30148+ jae 1234f
30149+ add %_ASM_DX,%_ASM_AX
30150+1234:
30151+#endif
30152+
30153+#endif
30154+
30155+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30156 xor %eax,%eax
30157 ASM_CLAC
30158+ pax_force_retaddr
30159 ret
30160 CFI_ENDPROC
30161 ENDPROC(__get_user_1)
30162@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30163 ENTRY(__get_user_2)
30164 CFI_STARTPROC
30165 add $1,%_ASM_AX
30166+
30167+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30168 jc bad_get_user
30169 GET_THREAD_INFO(%_ASM_DX)
30170 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30171 jae bad_get_user
30172 ASM_STAC
30173-2: movzwl -1(%_ASM_AX),%edx
30174+
30175+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30176+ mov pax_user_shadow_base,%_ASM_DX
30177+ cmp %_ASM_DX,%_ASM_AX
30178+ jae 1234f
30179+ add %_ASM_DX,%_ASM_AX
30180+1234:
30181+#endif
30182+
30183+#endif
30184+
30185+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30186 xor %eax,%eax
30187 ASM_CLAC
30188+ pax_force_retaddr
30189 ret
30190 CFI_ENDPROC
30191 ENDPROC(__get_user_2)
30192@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30193 ENTRY(__get_user_4)
30194 CFI_STARTPROC
30195 add $3,%_ASM_AX
30196+
30197+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30198 jc bad_get_user
30199 GET_THREAD_INFO(%_ASM_DX)
30200 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30201 jae bad_get_user
30202 ASM_STAC
30203-3: movl -3(%_ASM_AX),%edx
30204+
30205+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30206+ mov pax_user_shadow_base,%_ASM_DX
30207+ cmp %_ASM_DX,%_ASM_AX
30208+ jae 1234f
30209+ add %_ASM_DX,%_ASM_AX
30210+1234:
30211+#endif
30212+
30213+#endif
30214+
30215+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30216 xor %eax,%eax
30217 ASM_CLAC
30218+ pax_force_retaddr
30219 ret
30220 CFI_ENDPROC
30221 ENDPROC(__get_user_4)
30222@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30223 GET_THREAD_INFO(%_ASM_DX)
30224 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30225 jae bad_get_user
30226+
30227+#ifdef CONFIG_PAX_MEMORY_UDEREF
30228+ mov pax_user_shadow_base,%_ASM_DX
30229+ cmp %_ASM_DX,%_ASM_AX
30230+ jae 1234f
30231+ add %_ASM_DX,%_ASM_AX
30232+1234:
30233+#endif
30234+
30235 ASM_STAC
30236 4: movq -7(%_ASM_AX),%rdx
30237 xor %eax,%eax
30238 ASM_CLAC
30239+ pax_force_retaddr
30240 ret
30241 #else
30242 add $7,%_ASM_AX
30243@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30244 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30245 jae bad_get_user_8
30246 ASM_STAC
30247-4: movl -7(%_ASM_AX),%edx
30248-5: movl -3(%_ASM_AX),%ecx
30249+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30250+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30251 xor %eax,%eax
30252 ASM_CLAC
30253+ pax_force_retaddr
30254 ret
30255 #endif
30256 CFI_ENDPROC
30257@@ -113,6 +175,7 @@ bad_get_user:
30258 xor %edx,%edx
30259 mov $(-EFAULT),%_ASM_AX
30260 ASM_CLAC
30261+ pax_force_retaddr
30262 ret
30263 CFI_ENDPROC
30264 END(bad_get_user)
30265@@ -124,6 +187,7 @@ bad_get_user_8:
30266 xor %ecx,%ecx
30267 mov $(-EFAULT),%_ASM_AX
30268 ASM_CLAC
30269+ pax_force_retaddr
30270 ret
30271 CFI_ENDPROC
30272 END(bad_get_user_8)
30273diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30274index 54fcffe..7be149e 100644
30275--- a/arch/x86/lib/insn.c
30276+++ b/arch/x86/lib/insn.c
30277@@ -20,8 +20,10 @@
30278
30279 #ifdef __KERNEL__
30280 #include <linux/string.h>
30281+#include <asm/pgtable_types.h>
30282 #else
30283 #include <string.h>
30284+#define ktla_ktva(addr) addr
30285 #endif
30286 #include <asm/inat.h>
30287 #include <asm/insn.h>
30288@@ -53,8 +55,8 @@
30289 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
30290 {
30291 memset(insn, 0, sizeof(*insn));
30292- insn->kaddr = kaddr;
30293- insn->next_byte = kaddr;
30294+ insn->kaddr = ktla_ktva(kaddr);
30295+ insn->next_byte = ktla_ktva(kaddr);
30296 insn->x86_64 = x86_64 ? 1 : 0;
30297 insn->opnd_bytes = 4;
30298 if (x86_64)
30299diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30300index 05a95e7..326f2fa 100644
30301--- a/arch/x86/lib/iomap_copy_64.S
30302+++ b/arch/x86/lib/iomap_copy_64.S
30303@@ -17,6 +17,7 @@
30304
30305 #include <linux/linkage.h>
30306 #include <asm/dwarf2.h>
30307+#include <asm/alternative-asm.h>
30308
30309 /*
30310 * override generic version in lib/iomap_copy.c
30311@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30312 CFI_STARTPROC
30313 movl %edx,%ecx
30314 rep movsd
30315+ pax_force_retaddr
30316 ret
30317 CFI_ENDPROC
30318 ENDPROC(__iowrite32_copy)
30319diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30320index 56313a3..0db417e 100644
30321--- a/arch/x86/lib/memcpy_64.S
30322+++ b/arch/x86/lib/memcpy_64.S
30323@@ -24,7 +24,7 @@
30324 * This gets patched over the unrolled variant (below) via the
30325 * alternative instructions framework:
30326 */
30327- .section .altinstr_replacement, "ax", @progbits
30328+ .section .altinstr_replacement, "a", @progbits
30329 .Lmemcpy_c:
30330 movq %rdi, %rax
30331 movq %rdx, %rcx
30332@@ -33,6 +33,7 @@
30333 rep movsq
30334 movl %edx, %ecx
30335 rep movsb
30336+ pax_force_retaddr
30337 ret
30338 .Lmemcpy_e:
30339 .previous
30340@@ -44,11 +45,12 @@
30341 * This gets patched over the unrolled variant (below) via the
30342 * alternative instructions framework:
30343 */
30344- .section .altinstr_replacement, "ax", @progbits
30345+ .section .altinstr_replacement, "a", @progbits
30346 .Lmemcpy_c_e:
30347 movq %rdi, %rax
30348 movq %rdx, %rcx
30349 rep movsb
30350+ pax_force_retaddr
30351 ret
30352 .Lmemcpy_e_e:
30353 .previous
30354@@ -136,6 +138,7 @@ ENTRY(memcpy)
30355 movq %r9, 1*8(%rdi)
30356 movq %r10, -2*8(%rdi, %rdx)
30357 movq %r11, -1*8(%rdi, %rdx)
30358+ pax_force_retaddr
30359 retq
30360 .p2align 4
30361 .Lless_16bytes:
30362@@ -148,6 +151,7 @@ ENTRY(memcpy)
30363 movq -1*8(%rsi, %rdx), %r9
30364 movq %r8, 0*8(%rdi)
30365 movq %r9, -1*8(%rdi, %rdx)
30366+ pax_force_retaddr
30367 retq
30368 .p2align 4
30369 .Lless_8bytes:
30370@@ -161,6 +165,7 @@ ENTRY(memcpy)
30371 movl -4(%rsi, %rdx), %r8d
30372 movl %ecx, (%rdi)
30373 movl %r8d, -4(%rdi, %rdx)
30374+ pax_force_retaddr
30375 retq
30376 .p2align 4
30377 .Lless_3bytes:
30378@@ -179,6 +184,7 @@ ENTRY(memcpy)
30379 movb %cl, (%rdi)
30380
30381 .Lend:
30382+ pax_force_retaddr
30383 retq
30384 CFI_ENDPROC
30385 ENDPROC(memcpy)
30386diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30387index 65268a6..dd1de11 100644
30388--- a/arch/x86/lib/memmove_64.S
30389+++ b/arch/x86/lib/memmove_64.S
30390@@ -202,14 +202,16 @@ ENTRY(memmove)
30391 movb (%rsi), %r11b
30392 movb %r11b, (%rdi)
30393 13:
30394+ pax_force_retaddr
30395 retq
30396 CFI_ENDPROC
30397
30398- .section .altinstr_replacement,"ax"
30399+ .section .altinstr_replacement,"a"
30400 .Lmemmove_begin_forward_efs:
30401 /* Forward moving data. */
30402 movq %rdx, %rcx
30403 rep movsb
30404+ pax_force_retaddr
30405 retq
30406 .Lmemmove_end_forward_efs:
30407 .previous
30408diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30409index 2dcb380..2eb79fe 100644
30410--- a/arch/x86/lib/memset_64.S
30411+++ b/arch/x86/lib/memset_64.S
30412@@ -16,7 +16,7 @@
30413 *
30414 * rax original destination
30415 */
30416- .section .altinstr_replacement, "ax", @progbits
30417+ .section .altinstr_replacement, "a", @progbits
30418 .Lmemset_c:
30419 movq %rdi,%r9
30420 movq %rdx,%rcx
30421@@ -30,6 +30,7 @@
30422 movl %edx,%ecx
30423 rep stosb
30424 movq %r9,%rax
30425+ pax_force_retaddr
30426 ret
30427 .Lmemset_e:
30428 .previous
30429@@ -45,13 +46,14 @@
30430 *
30431 * rax original destination
30432 */
30433- .section .altinstr_replacement, "ax", @progbits
30434+ .section .altinstr_replacement, "a", @progbits
30435 .Lmemset_c_e:
30436 movq %rdi,%r9
30437 movb %sil,%al
30438 movq %rdx,%rcx
30439 rep stosb
30440 movq %r9,%rax
30441+ pax_force_retaddr
30442 ret
30443 .Lmemset_e_e:
30444 .previous
30445@@ -118,6 +120,7 @@ ENTRY(__memset)
30446
30447 .Lende:
30448 movq %r10,%rax
30449+ pax_force_retaddr
30450 ret
30451
30452 CFI_RESTORE_STATE
30453diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30454index c9f2d9b..e7fd2c0 100644
30455--- a/arch/x86/lib/mmx_32.c
30456+++ b/arch/x86/lib/mmx_32.c
30457@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30458 {
30459 void *p;
30460 int i;
30461+ unsigned long cr0;
30462
30463 if (unlikely(in_interrupt()))
30464 return __memcpy(to, from, len);
30465@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30466 kernel_fpu_begin();
30467
30468 __asm__ __volatile__ (
30469- "1: prefetch (%0)\n" /* This set is 28 bytes */
30470- " prefetch 64(%0)\n"
30471- " prefetch 128(%0)\n"
30472- " prefetch 192(%0)\n"
30473- " prefetch 256(%0)\n"
30474+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30475+ " prefetch 64(%1)\n"
30476+ " prefetch 128(%1)\n"
30477+ " prefetch 192(%1)\n"
30478+ " prefetch 256(%1)\n"
30479 "2: \n"
30480 ".section .fixup, \"ax\"\n"
30481- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30482+ "3: \n"
30483+
30484+#ifdef CONFIG_PAX_KERNEXEC
30485+ " movl %%cr0, %0\n"
30486+ " movl %0, %%eax\n"
30487+ " andl $0xFFFEFFFF, %%eax\n"
30488+ " movl %%eax, %%cr0\n"
30489+#endif
30490+
30491+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30492+
30493+#ifdef CONFIG_PAX_KERNEXEC
30494+ " movl %0, %%cr0\n"
30495+#endif
30496+
30497 " jmp 2b\n"
30498 ".previous\n"
30499 _ASM_EXTABLE(1b, 3b)
30500- : : "r" (from));
30501+ : "=&r" (cr0) : "r" (from) : "ax");
30502
30503 for ( ; i > 5; i--) {
30504 __asm__ __volatile__ (
30505- "1: prefetch 320(%0)\n"
30506- "2: movq (%0), %%mm0\n"
30507- " movq 8(%0), %%mm1\n"
30508- " movq 16(%0), %%mm2\n"
30509- " movq 24(%0), %%mm3\n"
30510- " movq %%mm0, (%1)\n"
30511- " movq %%mm1, 8(%1)\n"
30512- " movq %%mm2, 16(%1)\n"
30513- " movq %%mm3, 24(%1)\n"
30514- " movq 32(%0), %%mm0\n"
30515- " movq 40(%0), %%mm1\n"
30516- " movq 48(%0), %%mm2\n"
30517- " movq 56(%0), %%mm3\n"
30518- " movq %%mm0, 32(%1)\n"
30519- " movq %%mm1, 40(%1)\n"
30520- " movq %%mm2, 48(%1)\n"
30521- " movq %%mm3, 56(%1)\n"
30522+ "1: prefetch 320(%1)\n"
30523+ "2: movq (%1), %%mm0\n"
30524+ " movq 8(%1), %%mm1\n"
30525+ " movq 16(%1), %%mm2\n"
30526+ " movq 24(%1), %%mm3\n"
30527+ " movq %%mm0, (%2)\n"
30528+ " movq %%mm1, 8(%2)\n"
30529+ " movq %%mm2, 16(%2)\n"
30530+ " movq %%mm3, 24(%2)\n"
30531+ " movq 32(%1), %%mm0\n"
30532+ " movq 40(%1), %%mm1\n"
30533+ " movq 48(%1), %%mm2\n"
30534+ " movq 56(%1), %%mm3\n"
30535+ " movq %%mm0, 32(%2)\n"
30536+ " movq %%mm1, 40(%2)\n"
30537+ " movq %%mm2, 48(%2)\n"
30538+ " movq %%mm3, 56(%2)\n"
30539 ".section .fixup, \"ax\"\n"
30540- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30541+ "3:\n"
30542+
30543+#ifdef CONFIG_PAX_KERNEXEC
30544+ " movl %%cr0, %0\n"
30545+ " movl %0, %%eax\n"
30546+ " andl $0xFFFEFFFF, %%eax\n"
30547+ " movl %%eax, %%cr0\n"
30548+#endif
30549+
30550+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30551+
30552+#ifdef CONFIG_PAX_KERNEXEC
30553+ " movl %0, %%cr0\n"
30554+#endif
30555+
30556 " jmp 2b\n"
30557 ".previous\n"
30558 _ASM_EXTABLE(1b, 3b)
30559- : : "r" (from), "r" (to) : "memory");
30560+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30561
30562 from += 64;
30563 to += 64;
30564@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30565 static void fast_copy_page(void *to, void *from)
30566 {
30567 int i;
30568+ unsigned long cr0;
30569
30570 kernel_fpu_begin();
30571
30572@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30573 * but that is for later. -AV
30574 */
30575 __asm__ __volatile__(
30576- "1: prefetch (%0)\n"
30577- " prefetch 64(%0)\n"
30578- " prefetch 128(%0)\n"
30579- " prefetch 192(%0)\n"
30580- " prefetch 256(%0)\n"
30581+ "1: prefetch (%1)\n"
30582+ " prefetch 64(%1)\n"
30583+ " prefetch 128(%1)\n"
30584+ " prefetch 192(%1)\n"
30585+ " prefetch 256(%1)\n"
30586 "2: \n"
30587 ".section .fixup, \"ax\"\n"
30588- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30589+ "3: \n"
30590+
30591+#ifdef CONFIG_PAX_KERNEXEC
30592+ " movl %%cr0, %0\n"
30593+ " movl %0, %%eax\n"
30594+ " andl $0xFFFEFFFF, %%eax\n"
30595+ " movl %%eax, %%cr0\n"
30596+#endif
30597+
30598+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30599+
30600+#ifdef CONFIG_PAX_KERNEXEC
30601+ " movl %0, %%cr0\n"
30602+#endif
30603+
30604 " jmp 2b\n"
30605 ".previous\n"
30606- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30607+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30608
30609 for (i = 0; i < (4096-320)/64; i++) {
30610 __asm__ __volatile__ (
30611- "1: prefetch 320(%0)\n"
30612- "2: movq (%0), %%mm0\n"
30613- " movntq %%mm0, (%1)\n"
30614- " movq 8(%0), %%mm1\n"
30615- " movntq %%mm1, 8(%1)\n"
30616- " movq 16(%0), %%mm2\n"
30617- " movntq %%mm2, 16(%1)\n"
30618- " movq 24(%0), %%mm3\n"
30619- " movntq %%mm3, 24(%1)\n"
30620- " movq 32(%0), %%mm4\n"
30621- " movntq %%mm4, 32(%1)\n"
30622- " movq 40(%0), %%mm5\n"
30623- " movntq %%mm5, 40(%1)\n"
30624- " movq 48(%0), %%mm6\n"
30625- " movntq %%mm6, 48(%1)\n"
30626- " movq 56(%0), %%mm7\n"
30627- " movntq %%mm7, 56(%1)\n"
30628+ "1: prefetch 320(%1)\n"
30629+ "2: movq (%1), %%mm0\n"
30630+ " movntq %%mm0, (%2)\n"
30631+ " movq 8(%1), %%mm1\n"
30632+ " movntq %%mm1, 8(%2)\n"
30633+ " movq 16(%1), %%mm2\n"
30634+ " movntq %%mm2, 16(%2)\n"
30635+ " movq 24(%1), %%mm3\n"
30636+ " movntq %%mm3, 24(%2)\n"
30637+ " movq 32(%1), %%mm4\n"
30638+ " movntq %%mm4, 32(%2)\n"
30639+ " movq 40(%1), %%mm5\n"
30640+ " movntq %%mm5, 40(%2)\n"
30641+ " movq 48(%1), %%mm6\n"
30642+ " movntq %%mm6, 48(%2)\n"
30643+ " movq 56(%1), %%mm7\n"
30644+ " movntq %%mm7, 56(%2)\n"
30645 ".section .fixup, \"ax\"\n"
30646- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30647+ "3:\n"
30648+
30649+#ifdef CONFIG_PAX_KERNEXEC
30650+ " movl %%cr0, %0\n"
30651+ " movl %0, %%eax\n"
30652+ " andl $0xFFFEFFFF, %%eax\n"
30653+ " movl %%eax, %%cr0\n"
30654+#endif
30655+
30656+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30657+
30658+#ifdef CONFIG_PAX_KERNEXEC
30659+ " movl %0, %%cr0\n"
30660+#endif
30661+
30662 " jmp 2b\n"
30663 ".previous\n"
30664- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
30665+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30666
30667 from += 64;
30668 to += 64;
30669@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30670 static void fast_copy_page(void *to, void *from)
30671 {
30672 int i;
30673+ unsigned long cr0;
30674
30675 kernel_fpu_begin();
30676
30677 __asm__ __volatile__ (
30678- "1: prefetch (%0)\n"
30679- " prefetch 64(%0)\n"
30680- " prefetch 128(%0)\n"
30681- " prefetch 192(%0)\n"
30682- " prefetch 256(%0)\n"
30683+ "1: prefetch (%1)\n"
30684+ " prefetch 64(%1)\n"
30685+ " prefetch 128(%1)\n"
30686+ " prefetch 192(%1)\n"
30687+ " prefetch 256(%1)\n"
30688 "2: \n"
30689 ".section .fixup, \"ax\"\n"
30690- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30691+ "3: \n"
30692+
30693+#ifdef CONFIG_PAX_KERNEXEC
30694+ " movl %%cr0, %0\n"
30695+ " movl %0, %%eax\n"
30696+ " andl $0xFFFEFFFF, %%eax\n"
30697+ " movl %%eax, %%cr0\n"
30698+#endif
30699+
30700+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30701+
30702+#ifdef CONFIG_PAX_KERNEXEC
30703+ " movl %0, %%cr0\n"
30704+#endif
30705+
30706 " jmp 2b\n"
30707 ".previous\n"
30708- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30709+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30710
30711 for (i = 0; i < 4096/64; i++) {
30712 __asm__ __volatile__ (
30713- "1: prefetch 320(%0)\n"
30714- "2: movq (%0), %%mm0\n"
30715- " movq 8(%0), %%mm1\n"
30716- " movq 16(%0), %%mm2\n"
30717- " movq 24(%0), %%mm3\n"
30718- " movq %%mm0, (%1)\n"
30719- " movq %%mm1, 8(%1)\n"
30720- " movq %%mm2, 16(%1)\n"
30721- " movq %%mm3, 24(%1)\n"
30722- " movq 32(%0), %%mm0\n"
30723- " movq 40(%0), %%mm1\n"
30724- " movq 48(%0), %%mm2\n"
30725- " movq 56(%0), %%mm3\n"
30726- " movq %%mm0, 32(%1)\n"
30727- " movq %%mm1, 40(%1)\n"
30728- " movq %%mm2, 48(%1)\n"
30729- " movq %%mm3, 56(%1)\n"
30730+ "1: prefetch 320(%1)\n"
30731+ "2: movq (%1), %%mm0\n"
30732+ " movq 8(%1), %%mm1\n"
30733+ " movq 16(%1), %%mm2\n"
30734+ " movq 24(%1), %%mm3\n"
30735+ " movq %%mm0, (%2)\n"
30736+ " movq %%mm1, 8(%2)\n"
30737+ " movq %%mm2, 16(%2)\n"
30738+ " movq %%mm3, 24(%2)\n"
30739+ " movq 32(%1), %%mm0\n"
30740+ " movq 40(%1), %%mm1\n"
30741+ " movq 48(%1), %%mm2\n"
30742+ " movq 56(%1), %%mm3\n"
30743+ " movq %%mm0, 32(%2)\n"
30744+ " movq %%mm1, 40(%2)\n"
30745+ " movq %%mm2, 48(%2)\n"
30746+ " movq %%mm3, 56(%2)\n"
30747 ".section .fixup, \"ax\"\n"
30748- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30749+ "3:\n"
30750+
30751+#ifdef CONFIG_PAX_KERNEXEC
30752+ " movl %%cr0, %0\n"
30753+ " movl %0, %%eax\n"
30754+ " andl $0xFFFEFFFF, %%eax\n"
30755+ " movl %%eax, %%cr0\n"
30756+#endif
30757+
30758+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30759+
30760+#ifdef CONFIG_PAX_KERNEXEC
30761+ " movl %0, %%cr0\n"
30762+#endif
30763+
30764 " jmp 2b\n"
30765 ".previous\n"
30766 _ASM_EXTABLE(1b, 3b)
30767- : : "r" (from), "r" (to) : "memory");
30768+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30769
30770 from += 64;
30771 to += 64;
30772diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30773index f6d13ee..d789440 100644
30774--- a/arch/x86/lib/msr-reg.S
30775+++ b/arch/x86/lib/msr-reg.S
30776@@ -3,6 +3,7 @@
30777 #include <asm/dwarf2.h>
30778 #include <asm/asm.h>
30779 #include <asm/msr.h>
30780+#include <asm/alternative-asm.h>
30781
30782 #ifdef CONFIG_X86_64
30783 /*
30784@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30785 movl %edi, 28(%r10)
30786 popq_cfi %rbp
30787 popq_cfi %rbx
30788+ pax_force_retaddr
30789 ret
30790 3:
30791 CFI_RESTORE_STATE
30792diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30793index fc6ba17..d4d989d 100644
30794--- a/arch/x86/lib/putuser.S
30795+++ b/arch/x86/lib/putuser.S
30796@@ -16,7 +16,9 @@
30797 #include <asm/errno.h>
30798 #include <asm/asm.h>
30799 #include <asm/smap.h>
30800-
30801+#include <asm/segment.h>
30802+#include <asm/pgtable.h>
30803+#include <asm/alternative-asm.h>
30804
30805 /*
30806 * __put_user_X
30807@@ -30,57 +32,125 @@
30808 * as they get called from within inline assembly.
30809 */
30810
30811-#define ENTER CFI_STARTPROC ; \
30812- GET_THREAD_INFO(%_ASM_BX)
30813-#define EXIT ASM_CLAC ; \
30814- ret ; \
30815+#define ENTER CFI_STARTPROC
30816+#define EXIT ASM_CLAC ; \
30817+ pax_force_retaddr ; \
30818+ ret ; \
30819 CFI_ENDPROC
30820
30821+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30822+#define _DEST %_ASM_CX,%_ASM_BX
30823+#else
30824+#define _DEST %_ASM_CX
30825+#endif
30826+
30827+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30828+#define __copyuser_seg gs;
30829+#else
30830+#define __copyuser_seg
30831+#endif
30832+
30833 .text
30834 ENTRY(__put_user_1)
30835 ENTER
30836+
30837+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30838+ GET_THREAD_INFO(%_ASM_BX)
30839 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30840 jae bad_put_user
30841 ASM_STAC
30842-1: movb %al,(%_ASM_CX)
30843+
30844+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30845+ mov pax_user_shadow_base,%_ASM_BX
30846+ cmp %_ASM_BX,%_ASM_CX
30847+ jb 1234f
30848+ xor %ebx,%ebx
30849+1234:
30850+#endif
30851+
30852+#endif
30853+
30854+1: __copyuser_seg movb %al,(_DEST)
30855 xor %eax,%eax
30856 EXIT
30857 ENDPROC(__put_user_1)
30858
30859 ENTRY(__put_user_2)
30860 ENTER
30861+
30862+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30863+ GET_THREAD_INFO(%_ASM_BX)
30864 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30865 sub $1,%_ASM_BX
30866 cmp %_ASM_BX,%_ASM_CX
30867 jae bad_put_user
30868 ASM_STAC
30869-2: movw %ax,(%_ASM_CX)
30870+
30871+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30872+ mov pax_user_shadow_base,%_ASM_BX
30873+ cmp %_ASM_BX,%_ASM_CX
30874+ jb 1234f
30875+ xor %ebx,%ebx
30876+1234:
30877+#endif
30878+
30879+#endif
30880+
30881+2: __copyuser_seg movw %ax,(_DEST)
30882 xor %eax,%eax
30883 EXIT
30884 ENDPROC(__put_user_2)
30885
30886 ENTRY(__put_user_4)
30887 ENTER
30888+
30889+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30890+ GET_THREAD_INFO(%_ASM_BX)
30891 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30892 sub $3,%_ASM_BX
30893 cmp %_ASM_BX,%_ASM_CX
30894 jae bad_put_user
30895 ASM_STAC
30896-3: movl %eax,(%_ASM_CX)
30897+
30898+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30899+ mov pax_user_shadow_base,%_ASM_BX
30900+ cmp %_ASM_BX,%_ASM_CX
30901+ jb 1234f
30902+ xor %ebx,%ebx
30903+1234:
30904+#endif
30905+
30906+#endif
30907+
30908+3: __copyuser_seg movl %eax,(_DEST)
30909 xor %eax,%eax
30910 EXIT
30911 ENDPROC(__put_user_4)
30912
30913 ENTRY(__put_user_8)
30914 ENTER
30915+
30916+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30917+ GET_THREAD_INFO(%_ASM_BX)
30918 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30919 sub $7,%_ASM_BX
30920 cmp %_ASM_BX,%_ASM_CX
30921 jae bad_put_user
30922 ASM_STAC
30923-4: mov %_ASM_AX,(%_ASM_CX)
30924+
30925+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30926+ mov pax_user_shadow_base,%_ASM_BX
30927+ cmp %_ASM_BX,%_ASM_CX
30928+ jb 1234f
30929+ xor %ebx,%ebx
30930+1234:
30931+#endif
30932+
30933+#endif
30934+
30935+4: __copyuser_seg mov %_ASM_AX,(_DEST)
30936 #ifdef CONFIG_X86_32
30937-5: movl %edx,4(%_ASM_CX)
30938+5: __copyuser_seg movl %edx,4(_DEST)
30939 #endif
30940 xor %eax,%eax
30941 EXIT
30942diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30943index 5dff5f0..cadebf4 100644
30944--- a/arch/x86/lib/rwsem.S
30945+++ b/arch/x86/lib/rwsem.S
30946@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
30947 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30948 CFI_RESTORE __ASM_REG(dx)
30949 restore_common_regs
30950+ pax_force_retaddr
30951 ret
30952 CFI_ENDPROC
30953 ENDPROC(call_rwsem_down_read_failed)
30954@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
30955 movq %rax,%rdi
30956 call rwsem_down_write_failed
30957 restore_common_regs
30958+ pax_force_retaddr
30959 ret
30960 CFI_ENDPROC
30961 ENDPROC(call_rwsem_down_write_failed)
30962@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
30963 movq %rax,%rdi
30964 call rwsem_wake
30965 restore_common_regs
30966-1: ret
30967+1: pax_force_retaddr
30968+ ret
30969 CFI_ENDPROC
30970 ENDPROC(call_rwsem_wake)
30971
30972@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
30973 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30974 CFI_RESTORE __ASM_REG(dx)
30975 restore_common_regs
30976+ pax_force_retaddr
30977 ret
30978 CFI_ENDPROC
30979 ENDPROC(call_rwsem_downgrade_wake)
30980diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
30981index b30b5eb..2b57052 100644
30982--- a/arch/x86/lib/thunk_64.S
30983+++ b/arch/x86/lib/thunk_64.S
30984@@ -9,6 +9,7 @@
30985 #include <asm/dwarf2.h>
30986 #include <asm/calling.h>
30987 #include <asm/asm.h>
30988+#include <asm/alternative-asm.h>
30989
30990 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
30991 .macro THUNK name, func, put_ret_addr_in_rdi=0
30992@@ -16,11 +17,11 @@
30993 \name:
30994 CFI_STARTPROC
30995
30996- /* this one pushes 9 elems, the next one would be %rIP */
30997- SAVE_ARGS
30998+ /* this one pushes 15+1 elems, the next one would be %rIP */
30999+ SAVE_ARGS 8
31000
31001 .if \put_ret_addr_in_rdi
31002- movq_cfi_restore 9*8, rdi
31003+ movq_cfi_restore RIP, rdi
31004 .endif
31005
31006 call \func
31007@@ -47,9 +48,10 @@
31008
31009 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
31010 CFI_STARTPROC
31011- SAVE_ARGS
31012+ SAVE_ARGS 8
31013 restore:
31014- RESTORE_ARGS
31015+ RESTORE_ARGS 1,8
31016+ pax_force_retaddr
31017 ret
31018 CFI_ENDPROC
31019 _ASM_NOKPROBE(restore)
31020diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31021index e2f5e21..4b22130 100644
31022--- a/arch/x86/lib/usercopy_32.c
31023+++ b/arch/x86/lib/usercopy_32.c
31024@@ -42,11 +42,13 @@ do { \
31025 int __d0; \
31026 might_fault(); \
31027 __asm__ __volatile__( \
31028+ __COPYUSER_SET_ES \
31029 ASM_STAC "\n" \
31030 "0: rep; stosl\n" \
31031 " movl %2,%0\n" \
31032 "1: rep; stosb\n" \
31033 "2: " ASM_CLAC "\n" \
31034+ __COPYUSER_RESTORE_ES \
31035 ".section .fixup,\"ax\"\n" \
31036 "3: lea 0(%2,%0,4),%0\n" \
31037 " jmp 2b\n" \
31038@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31039
31040 #ifdef CONFIG_X86_INTEL_USERCOPY
31041 static unsigned long
31042-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31043+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31044 {
31045 int d0, d1;
31046 __asm__ __volatile__(
31047@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31048 " .align 2,0x90\n"
31049 "3: movl 0(%4), %%eax\n"
31050 "4: movl 4(%4), %%edx\n"
31051- "5: movl %%eax, 0(%3)\n"
31052- "6: movl %%edx, 4(%3)\n"
31053+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31054+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31055 "7: movl 8(%4), %%eax\n"
31056 "8: movl 12(%4),%%edx\n"
31057- "9: movl %%eax, 8(%3)\n"
31058- "10: movl %%edx, 12(%3)\n"
31059+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31060+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31061 "11: movl 16(%4), %%eax\n"
31062 "12: movl 20(%4), %%edx\n"
31063- "13: movl %%eax, 16(%3)\n"
31064- "14: movl %%edx, 20(%3)\n"
31065+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31066+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31067 "15: movl 24(%4), %%eax\n"
31068 "16: movl 28(%4), %%edx\n"
31069- "17: movl %%eax, 24(%3)\n"
31070- "18: movl %%edx, 28(%3)\n"
31071+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31072+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31073 "19: movl 32(%4), %%eax\n"
31074 "20: movl 36(%4), %%edx\n"
31075- "21: movl %%eax, 32(%3)\n"
31076- "22: movl %%edx, 36(%3)\n"
31077+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31078+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31079 "23: movl 40(%4), %%eax\n"
31080 "24: movl 44(%4), %%edx\n"
31081- "25: movl %%eax, 40(%3)\n"
31082- "26: movl %%edx, 44(%3)\n"
31083+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31084+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31085 "27: movl 48(%4), %%eax\n"
31086 "28: movl 52(%4), %%edx\n"
31087- "29: movl %%eax, 48(%3)\n"
31088- "30: movl %%edx, 52(%3)\n"
31089+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31090+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31091 "31: movl 56(%4), %%eax\n"
31092 "32: movl 60(%4), %%edx\n"
31093- "33: movl %%eax, 56(%3)\n"
31094- "34: movl %%edx, 60(%3)\n"
31095+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31096+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31097 " addl $-64, %0\n"
31098 " addl $64, %4\n"
31099 " addl $64, %3\n"
31100@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31101 " shrl $2, %0\n"
31102 " andl $3, %%eax\n"
31103 " cld\n"
31104+ __COPYUSER_SET_ES
31105 "99: rep; movsl\n"
31106 "36: movl %%eax, %0\n"
31107 "37: rep; movsb\n"
31108 "100:\n"
31109+ __COPYUSER_RESTORE_ES
31110+ ".section .fixup,\"ax\"\n"
31111+ "101: lea 0(%%eax,%0,4),%0\n"
31112+ " jmp 100b\n"
31113+ ".previous\n"
31114+ _ASM_EXTABLE(1b,100b)
31115+ _ASM_EXTABLE(2b,100b)
31116+ _ASM_EXTABLE(3b,100b)
31117+ _ASM_EXTABLE(4b,100b)
31118+ _ASM_EXTABLE(5b,100b)
31119+ _ASM_EXTABLE(6b,100b)
31120+ _ASM_EXTABLE(7b,100b)
31121+ _ASM_EXTABLE(8b,100b)
31122+ _ASM_EXTABLE(9b,100b)
31123+ _ASM_EXTABLE(10b,100b)
31124+ _ASM_EXTABLE(11b,100b)
31125+ _ASM_EXTABLE(12b,100b)
31126+ _ASM_EXTABLE(13b,100b)
31127+ _ASM_EXTABLE(14b,100b)
31128+ _ASM_EXTABLE(15b,100b)
31129+ _ASM_EXTABLE(16b,100b)
31130+ _ASM_EXTABLE(17b,100b)
31131+ _ASM_EXTABLE(18b,100b)
31132+ _ASM_EXTABLE(19b,100b)
31133+ _ASM_EXTABLE(20b,100b)
31134+ _ASM_EXTABLE(21b,100b)
31135+ _ASM_EXTABLE(22b,100b)
31136+ _ASM_EXTABLE(23b,100b)
31137+ _ASM_EXTABLE(24b,100b)
31138+ _ASM_EXTABLE(25b,100b)
31139+ _ASM_EXTABLE(26b,100b)
31140+ _ASM_EXTABLE(27b,100b)
31141+ _ASM_EXTABLE(28b,100b)
31142+ _ASM_EXTABLE(29b,100b)
31143+ _ASM_EXTABLE(30b,100b)
31144+ _ASM_EXTABLE(31b,100b)
31145+ _ASM_EXTABLE(32b,100b)
31146+ _ASM_EXTABLE(33b,100b)
31147+ _ASM_EXTABLE(34b,100b)
31148+ _ASM_EXTABLE(35b,100b)
31149+ _ASM_EXTABLE(36b,100b)
31150+ _ASM_EXTABLE(37b,100b)
31151+ _ASM_EXTABLE(99b,101b)
31152+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31153+ : "1"(to), "2"(from), "0"(size)
31154+ : "eax", "edx", "memory");
31155+ return size;
31156+}
31157+
31158+static unsigned long
31159+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31160+{
31161+ int d0, d1;
31162+ __asm__ __volatile__(
31163+ " .align 2,0x90\n"
31164+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31165+ " cmpl $67, %0\n"
31166+ " jbe 3f\n"
31167+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31168+ " .align 2,0x90\n"
31169+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31170+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31171+ "5: movl %%eax, 0(%3)\n"
31172+ "6: movl %%edx, 4(%3)\n"
31173+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31174+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31175+ "9: movl %%eax, 8(%3)\n"
31176+ "10: movl %%edx, 12(%3)\n"
31177+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31178+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31179+ "13: movl %%eax, 16(%3)\n"
31180+ "14: movl %%edx, 20(%3)\n"
31181+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31182+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31183+ "17: movl %%eax, 24(%3)\n"
31184+ "18: movl %%edx, 28(%3)\n"
31185+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31186+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31187+ "21: movl %%eax, 32(%3)\n"
31188+ "22: movl %%edx, 36(%3)\n"
31189+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31190+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31191+ "25: movl %%eax, 40(%3)\n"
31192+ "26: movl %%edx, 44(%3)\n"
31193+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31194+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31195+ "29: movl %%eax, 48(%3)\n"
31196+ "30: movl %%edx, 52(%3)\n"
31197+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31198+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31199+ "33: movl %%eax, 56(%3)\n"
31200+ "34: movl %%edx, 60(%3)\n"
31201+ " addl $-64, %0\n"
31202+ " addl $64, %4\n"
31203+ " addl $64, %3\n"
31204+ " cmpl $63, %0\n"
31205+ " ja 1b\n"
31206+ "35: movl %0, %%eax\n"
31207+ " shrl $2, %0\n"
31208+ " andl $3, %%eax\n"
31209+ " cld\n"
31210+ "99: rep; "__copyuser_seg" movsl\n"
31211+ "36: movl %%eax, %0\n"
31212+ "37: rep; "__copyuser_seg" movsb\n"
31213+ "100:\n"
31214 ".section .fixup,\"ax\"\n"
31215 "101: lea 0(%%eax,%0,4),%0\n"
31216 " jmp 100b\n"
31217@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31218 int d0, d1;
31219 __asm__ __volatile__(
31220 " .align 2,0x90\n"
31221- "0: movl 32(%4), %%eax\n"
31222+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31223 " cmpl $67, %0\n"
31224 " jbe 2f\n"
31225- "1: movl 64(%4), %%eax\n"
31226+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31227 " .align 2,0x90\n"
31228- "2: movl 0(%4), %%eax\n"
31229- "21: movl 4(%4), %%edx\n"
31230+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31231+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31232 " movl %%eax, 0(%3)\n"
31233 " movl %%edx, 4(%3)\n"
31234- "3: movl 8(%4), %%eax\n"
31235- "31: movl 12(%4),%%edx\n"
31236+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31237+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31238 " movl %%eax, 8(%3)\n"
31239 " movl %%edx, 12(%3)\n"
31240- "4: movl 16(%4), %%eax\n"
31241- "41: movl 20(%4), %%edx\n"
31242+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31243+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31244 " movl %%eax, 16(%3)\n"
31245 " movl %%edx, 20(%3)\n"
31246- "10: movl 24(%4), %%eax\n"
31247- "51: movl 28(%4), %%edx\n"
31248+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31249+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31250 " movl %%eax, 24(%3)\n"
31251 " movl %%edx, 28(%3)\n"
31252- "11: movl 32(%4), %%eax\n"
31253- "61: movl 36(%4), %%edx\n"
31254+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31255+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31256 " movl %%eax, 32(%3)\n"
31257 " movl %%edx, 36(%3)\n"
31258- "12: movl 40(%4), %%eax\n"
31259- "71: movl 44(%4), %%edx\n"
31260+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31261+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31262 " movl %%eax, 40(%3)\n"
31263 " movl %%edx, 44(%3)\n"
31264- "13: movl 48(%4), %%eax\n"
31265- "81: movl 52(%4), %%edx\n"
31266+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31267+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31268 " movl %%eax, 48(%3)\n"
31269 " movl %%edx, 52(%3)\n"
31270- "14: movl 56(%4), %%eax\n"
31271- "91: movl 60(%4), %%edx\n"
31272+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31273+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31274 " movl %%eax, 56(%3)\n"
31275 " movl %%edx, 60(%3)\n"
31276 " addl $-64, %0\n"
31277@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31278 " shrl $2, %0\n"
31279 " andl $3, %%eax\n"
31280 " cld\n"
31281- "6: rep; movsl\n"
31282+ "6: rep; "__copyuser_seg" movsl\n"
31283 " movl %%eax,%0\n"
31284- "7: rep; movsb\n"
31285+ "7: rep; "__copyuser_seg" movsb\n"
31286 "8:\n"
31287 ".section .fixup,\"ax\"\n"
31288 "9: lea 0(%%eax,%0,4),%0\n"
31289@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31290
31291 __asm__ __volatile__(
31292 " .align 2,0x90\n"
31293- "0: movl 32(%4), %%eax\n"
31294+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31295 " cmpl $67, %0\n"
31296 " jbe 2f\n"
31297- "1: movl 64(%4), %%eax\n"
31298+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31299 " .align 2,0x90\n"
31300- "2: movl 0(%4), %%eax\n"
31301- "21: movl 4(%4), %%edx\n"
31302+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31303+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31304 " movnti %%eax, 0(%3)\n"
31305 " movnti %%edx, 4(%3)\n"
31306- "3: movl 8(%4), %%eax\n"
31307- "31: movl 12(%4),%%edx\n"
31308+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31309+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31310 " movnti %%eax, 8(%3)\n"
31311 " movnti %%edx, 12(%3)\n"
31312- "4: movl 16(%4), %%eax\n"
31313- "41: movl 20(%4), %%edx\n"
31314+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31315+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31316 " movnti %%eax, 16(%3)\n"
31317 " movnti %%edx, 20(%3)\n"
31318- "10: movl 24(%4), %%eax\n"
31319- "51: movl 28(%4), %%edx\n"
31320+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31321+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31322 " movnti %%eax, 24(%3)\n"
31323 " movnti %%edx, 28(%3)\n"
31324- "11: movl 32(%4), %%eax\n"
31325- "61: movl 36(%4), %%edx\n"
31326+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31327+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31328 " movnti %%eax, 32(%3)\n"
31329 " movnti %%edx, 36(%3)\n"
31330- "12: movl 40(%4), %%eax\n"
31331- "71: movl 44(%4), %%edx\n"
31332+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31333+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31334 " movnti %%eax, 40(%3)\n"
31335 " movnti %%edx, 44(%3)\n"
31336- "13: movl 48(%4), %%eax\n"
31337- "81: movl 52(%4), %%edx\n"
31338+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31339+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31340 " movnti %%eax, 48(%3)\n"
31341 " movnti %%edx, 52(%3)\n"
31342- "14: movl 56(%4), %%eax\n"
31343- "91: movl 60(%4), %%edx\n"
31344+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31345+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31346 " movnti %%eax, 56(%3)\n"
31347 " movnti %%edx, 60(%3)\n"
31348 " addl $-64, %0\n"
31349@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31350 " shrl $2, %0\n"
31351 " andl $3, %%eax\n"
31352 " cld\n"
31353- "6: rep; movsl\n"
31354+ "6: rep; "__copyuser_seg" movsl\n"
31355 " movl %%eax,%0\n"
31356- "7: rep; movsb\n"
31357+ "7: rep; "__copyuser_seg" movsb\n"
31358 "8:\n"
31359 ".section .fixup,\"ax\"\n"
31360 "9: lea 0(%%eax,%0,4),%0\n"
31361@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31362
31363 __asm__ __volatile__(
31364 " .align 2,0x90\n"
31365- "0: movl 32(%4), %%eax\n"
31366+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31367 " cmpl $67, %0\n"
31368 " jbe 2f\n"
31369- "1: movl 64(%4), %%eax\n"
31370+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31371 " .align 2,0x90\n"
31372- "2: movl 0(%4), %%eax\n"
31373- "21: movl 4(%4), %%edx\n"
31374+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31375+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31376 " movnti %%eax, 0(%3)\n"
31377 " movnti %%edx, 4(%3)\n"
31378- "3: movl 8(%4), %%eax\n"
31379- "31: movl 12(%4),%%edx\n"
31380+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31381+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31382 " movnti %%eax, 8(%3)\n"
31383 " movnti %%edx, 12(%3)\n"
31384- "4: movl 16(%4), %%eax\n"
31385- "41: movl 20(%4), %%edx\n"
31386+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31387+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31388 " movnti %%eax, 16(%3)\n"
31389 " movnti %%edx, 20(%3)\n"
31390- "10: movl 24(%4), %%eax\n"
31391- "51: movl 28(%4), %%edx\n"
31392+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31393+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31394 " movnti %%eax, 24(%3)\n"
31395 " movnti %%edx, 28(%3)\n"
31396- "11: movl 32(%4), %%eax\n"
31397- "61: movl 36(%4), %%edx\n"
31398+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31399+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31400 " movnti %%eax, 32(%3)\n"
31401 " movnti %%edx, 36(%3)\n"
31402- "12: movl 40(%4), %%eax\n"
31403- "71: movl 44(%4), %%edx\n"
31404+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31405+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31406 " movnti %%eax, 40(%3)\n"
31407 " movnti %%edx, 44(%3)\n"
31408- "13: movl 48(%4), %%eax\n"
31409- "81: movl 52(%4), %%edx\n"
31410+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31411+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31412 " movnti %%eax, 48(%3)\n"
31413 " movnti %%edx, 52(%3)\n"
31414- "14: movl 56(%4), %%eax\n"
31415- "91: movl 60(%4), %%edx\n"
31416+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31417+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31418 " movnti %%eax, 56(%3)\n"
31419 " movnti %%edx, 60(%3)\n"
31420 " addl $-64, %0\n"
31421@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31422 " shrl $2, %0\n"
31423 " andl $3, %%eax\n"
31424 " cld\n"
31425- "6: rep; movsl\n"
31426+ "6: rep; "__copyuser_seg" movsl\n"
31427 " movl %%eax,%0\n"
31428- "7: rep; movsb\n"
31429+ "7: rep; "__copyuser_seg" movsb\n"
31430 "8:\n"
31431 ".section .fixup,\"ax\"\n"
31432 "9: lea 0(%%eax,%0,4),%0\n"
31433@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31434 */
31435 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31436 unsigned long size);
31437-unsigned long __copy_user_intel(void __user *to, const void *from,
31438+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31439+ unsigned long size);
31440+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31441 unsigned long size);
31442 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31443 const void __user *from, unsigned long size);
31444 #endif /* CONFIG_X86_INTEL_USERCOPY */
31445
31446 /* Generic arbitrary sized copy. */
31447-#define __copy_user(to, from, size) \
31448+#define __copy_user(to, from, size, prefix, set, restore) \
31449 do { \
31450 int __d0, __d1, __d2; \
31451 __asm__ __volatile__( \
31452+ set \
31453 " cmp $7,%0\n" \
31454 " jbe 1f\n" \
31455 " movl %1,%0\n" \
31456 " negl %0\n" \
31457 " andl $7,%0\n" \
31458 " subl %0,%3\n" \
31459- "4: rep; movsb\n" \
31460+ "4: rep; "prefix"movsb\n" \
31461 " movl %3,%0\n" \
31462 " shrl $2,%0\n" \
31463 " andl $3,%3\n" \
31464 " .align 2,0x90\n" \
31465- "0: rep; movsl\n" \
31466+ "0: rep; "prefix"movsl\n" \
31467 " movl %3,%0\n" \
31468- "1: rep; movsb\n" \
31469+ "1: rep; "prefix"movsb\n" \
31470 "2:\n" \
31471+ restore \
31472 ".section .fixup,\"ax\"\n" \
31473 "5: addl %3,%0\n" \
31474 " jmp 2b\n" \
31475@@ -538,14 +650,14 @@ do { \
31476 " negl %0\n" \
31477 " andl $7,%0\n" \
31478 " subl %0,%3\n" \
31479- "4: rep; movsb\n" \
31480+ "4: rep; "__copyuser_seg"movsb\n" \
31481 " movl %3,%0\n" \
31482 " shrl $2,%0\n" \
31483 " andl $3,%3\n" \
31484 " .align 2,0x90\n" \
31485- "0: rep; movsl\n" \
31486+ "0: rep; "__copyuser_seg"movsl\n" \
31487 " movl %3,%0\n" \
31488- "1: rep; movsb\n" \
31489+ "1: rep; "__copyuser_seg"movsb\n" \
31490 "2:\n" \
31491 ".section .fixup,\"ax\"\n" \
31492 "5: addl %3,%0\n" \
31493@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31494 {
31495 stac();
31496 if (movsl_is_ok(to, from, n))
31497- __copy_user(to, from, n);
31498+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31499 else
31500- n = __copy_user_intel(to, from, n);
31501+ n = __generic_copy_to_user_intel(to, from, n);
31502 clac();
31503 return n;
31504 }
31505@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31506 {
31507 stac();
31508 if (movsl_is_ok(to, from, n))
31509- __copy_user(to, from, n);
31510+ __copy_user(to, from, n, __copyuser_seg, "", "");
31511 else
31512- n = __copy_user_intel((void __user *)to,
31513- (const void *)from, n);
31514+ n = __generic_copy_from_user_intel(to, from, n);
31515 clac();
31516 return n;
31517 }
31518@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31519 if (n > 64 && cpu_has_xmm2)
31520 n = __copy_user_intel_nocache(to, from, n);
31521 else
31522- __copy_user(to, from, n);
31523+ __copy_user(to, from, n, __copyuser_seg, "", "");
31524 #else
31525- __copy_user(to, from, n);
31526+ __copy_user(to, from, n, __copyuser_seg, "", "");
31527 #endif
31528 clac();
31529 return n;
31530 }
31531 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31532
31533-/**
31534- * copy_to_user: - Copy a block of data into user space.
31535- * @to: Destination address, in user space.
31536- * @from: Source address, in kernel space.
31537- * @n: Number of bytes to copy.
31538- *
31539- * Context: User context only. This function may sleep.
31540- *
31541- * Copy data from kernel space to user space.
31542- *
31543- * Returns number of bytes that could not be copied.
31544- * On success, this will be zero.
31545- */
31546-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31547+#ifdef CONFIG_PAX_MEMORY_UDEREF
31548+void __set_fs(mm_segment_t x)
31549 {
31550- if (access_ok(VERIFY_WRITE, to, n))
31551- n = __copy_to_user(to, from, n);
31552- return n;
31553+ switch (x.seg) {
31554+ case 0:
31555+ loadsegment(gs, 0);
31556+ break;
31557+ case TASK_SIZE_MAX:
31558+ loadsegment(gs, __USER_DS);
31559+ break;
31560+ case -1UL:
31561+ loadsegment(gs, __KERNEL_DS);
31562+ break;
31563+ default:
31564+ BUG();
31565+ }
31566 }
31567-EXPORT_SYMBOL(_copy_to_user);
31568+EXPORT_SYMBOL(__set_fs);
31569
31570-/**
31571- * copy_from_user: - Copy a block of data from user space.
31572- * @to: Destination address, in kernel space.
31573- * @from: Source address, in user space.
31574- * @n: Number of bytes to copy.
31575- *
31576- * Context: User context only. This function may sleep.
31577- *
31578- * Copy data from user space to kernel space.
31579- *
31580- * Returns number of bytes that could not be copied.
31581- * On success, this will be zero.
31582- *
31583- * If some data could not be copied, this function will pad the copied
31584- * data to the requested size using zero bytes.
31585- */
31586-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31587+void set_fs(mm_segment_t x)
31588 {
31589- if (access_ok(VERIFY_READ, from, n))
31590- n = __copy_from_user(to, from, n);
31591- else
31592- memset(to, 0, n);
31593- return n;
31594+ current_thread_info()->addr_limit = x;
31595+ __set_fs(x);
31596 }
31597-EXPORT_SYMBOL(_copy_from_user);
31598+EXPORT_SYMBOL(set_fs);
31599+#endif
31600diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31601index c905e89..01ab928 100644
31602--- a/arch/x86/lib/usercopy_64.c
31603+++ b/arch/x86/lib/usercopy_64.c
31604@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31605 might_fault();
31606 /* no memory constraint because it doesn't change any memory gcc knows
31607 about */
31608+ pax_open_userland();
31609 stac();
31610 asm volatile(
31611 " testq %[size8],%[size8]\n"
31612@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31613 _ASM_EXTABLE(0b,3b)
31614 _ASM_EXTABLE(1b,2b)
31615 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31616- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31617+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31618 [zero] "r" (0UL), [eight] "r" (8UL));
31619 clac();
31620+ pax_close_userland();
31621 return size;
31622 }
31623 EXPORT_SYMBOL(__clear_user);
31624@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31625 }
31626 EXPORT_SYMBOL(clear_user);
31627
31628-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31629+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31630 {
31631- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31632- return copy_user_generic((__force void *)to, (__force void *)from, len);
31633- }
31634- return len;
31635+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31636+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31637+ return len;
31638 }
31639 EXPORT_SYMBOL(copy_in_user);
31640
31641@@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
31642 * it is not necessary to optimize tail handling.
31643 */
31644 __visible unsigned long
31645-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31646+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
31647 {
31648 char c;
31649 unsigned zero_len;
31650
31651+ clac();
31652+ pax_close_userland();
31653 for (; len; --len, to++) {
31654 if (__get_user_nocheck(c, from++, sizeof(char)))
31655 break;
31656@@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
31657 for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
31658 if (__put_user_nocheck(c, to++, sizeof(char)))
31659 break;
31660- clac();
31661 return len;
31662 }
31663diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31664index 6a19ad9..1c48f9a 100644
31665--- a/arch/x86/mm/Makefile
31666+++ b/arch/x86/mm/Makefile
31667@@ -30,3 +30,7 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
31668 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31669
31670 obj-$(CONFIG_MEMTEST) += memtest.o
31671+
31672+quote:="
31673+obj-$(CONFIG_X86_64) += uderef_64.o
31674+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31675diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31676index 903ec1e..c4166b2 100644
31677--- a/arch/x86/mm/extable.c
31678+++ b/arch/x86/mm/extable.c
31679@@ -6,12 +6,24 @@
31680 static inline unsigned long
31681 ex_insn_addr(const struct exception_table_entry *x)
31682 {
31683- return (unsigned long)&x->insn + x->insn;
31684+ unsigned long reloc = 0;
31685+
31686+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31687+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31688+#endif
31689+
31690+ return (unsigned long)&x->insn + x->insn + reloc;
31691 }
31692 static inline unsigned long
31693 ex_fixup_addr(const struct exception_table_entry *x)
31694 {
31695- return (unsigned long)&x->fixup + x->fixup;
31696+ unsigned long reloc = 0;
31697+
31698+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31699+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31700+#endif
31701+
31702+ return (unsigned long)&x->fixup + x->fixup + reloc;
31703 }
31704
31705 int fixup_exception(struct pt_regs *regs)
31706@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31707 unsigned long new_ip;
31708
31709 #ifdef CONFIG_PNPBIOS
31710- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31711+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31712 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31713 extern u32 pnp_bios_is_utter_crap;
31714 pnp_bios_is_utter_crap = 1;
31715@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31716 i += 4;
31717 p->fixup -= i;
31718 i += 4;
31719+
31720+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31721+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31722+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31723+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31724+#endif
31725+
31726 }
31727 }
31728
31729diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31730index d973e61..fb868e9 100644
31731--- a/arch/x86/mm/fault.c
31732+++ b/arch/x86/mm/fault.c
31733@@ -13,12 +13,19 @@
31734 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31735 #include <linux/prefetch.h> /* prefetchw */
31736 #include <linux/context_tracking.h> /* exception_enter(), ... */
31737+#include <linux/unistd.h>
31738+#include <linux/compiler.h>
31739
31740 #include <asm/traps.h> /* dotraplinkage, ... */
31741 #include <asm/pgalloc.h> /* pgd_*(), ... */
31742 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31743 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31744 #include <asm/vsyscall.h> /* emulate_vsyscall */
31745+#include <asm/tlbflush.h>
31746+
31747+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31748+#include <asm/stacktrace.h>
31749+#endif
31750
31751 #define CREATE_TRACE_POINTS
31752 #include <asm/trace/exceptions.h>
31753@@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
31754 int ret = 0;
31755
31756 /* kprobe_running() needs smp_processor_id() */
31757- if (kprobes_built_in() && !user_mode_vm(regs)) {
31758+ if (kprobes_built_in() && !user_mode(regs)) {
31759 preempt_disable();
31760 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31761 ret = 1;
31762@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31763 return !instr_lo || (instr_lo>>1) == 1;
31764 case 0x00:
31765 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31766- if (probe_kernel_address(instr, opcode))
31767+ if (user_mode(regs)) {
31768+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31769+ return 0;
31770+ } else if (probe_kernel_address(instr, opcode))
31771 return 0;
31772
31773 *prefetch = (instr_lo == 0xF) &&
31774@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31775 while (instr < max_instr) {
31776 unsigned char opcode;
31777
31778- if (probe_kernel_address(instr, opcode))
31779+ if (user_mode(regs)) {
31780+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31781+ break;
31782+ } else if (probe_kernel_address(instr, opcode))
31783 break;
31784
31785 instr++;
31786@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31787 force_sig_info(si_signo, &info, tsk);
31788 }
31789
31790+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31791+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31792+#endif
31793+
31794+#ifdef CONFIG_PAX_EMUTRAMP
31795+static int pax_handle_fetch_fault(struct pt_regs *regs);
31796+#endif
31797+
31798+#ifdef CONFIG_PAX_PAGEEXEC
31799+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31800+{
31801+ pgd_t *pgd;
31802+ pud_t *pud;
31803+ pmd_t *pmd;
31804+
31805+ pgd = pgd_offset(mm, address);
31806+ if (!pgd_present(*pgd))
31807+ return NULL;
31808+ pud = pud_offset(pgd, address);
31809+ if (!pud_present(*pud))
31810+ return NULL;
31811+ pmd = pmd_offset(pud, address);
31812+ if (!pmd_present(*pmd))
31813+ return NULL;
31814+ return pmd;
31815+}
31816+#endif
31817+
31818 DEFINE_SPINLOCK(pgd_lock);
31819 LIST_HEAD(pgd_list);
31820
31821@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31822 for (address = VMALLOC_START & PMD_MASK;
31823 address >= TASK_SIZE && address < FIXADDR_TOP;
31824 address += PMD_SIZE) {
31825+
31826+#ifdef CONFIG_PAX_PER_CPU_PGD
31827+ unsigned long cpu;
31828+#else
31829 struct page *page;
31830+#endif
31831
31832 spin_lock(&pgd_lock);
31833+
31834+#ifdef CONFIG_PAX_PER_CPU_PGD
31835+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31836+ pgd_t *pgd = get_cpu_pgd(cpu, user);
31837+ pmd_t *ret;
31838+
31839+ ret = vmalloc_sync_one(pgd, address);
31840+ if (!ret)
31841+ break;
31842+ pgd = get_cpu_pgd(cpu, kernel);
31843+#else
31844 list_for_each_entry(page, &pgd_list, lru) {
31845+ pgd_t *pgd;
31846 spinlock_t *pgt_lock;
31847 pmd_t *ret;
31848
31849@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31850 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31851
31852 spin_lock(pgt_lock);
31853- ret = vmalloc_sync_one(page_address(page), address);
31854+ pgd = page_address(page);
31855+#endif
31856+
31857+ ret = vmalloc_sync_one(pgd, address);
31858+
31859+#ifndef CONFIG_PAX_PER_CPU_PGD
31860 spin_unlock(pgt_lock);
31861+#endif
31862
31863 if (!ret)
31864 break;
31865@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
31866 * an interrupt in the middle of a task switch..
31867 */
31868 pgd_paddr = read_cr3();
31869+
31870+#ifdef CONFIG_PAX_PER_CPU_PGD
31871+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31872+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31873+#endif
31874+
31875 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31876 if (!pmd_k)
31877 return -1;
31878@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
31879 * happen within a race in page table update. In the later
31880 * case just flush:
31881 */
31882- pgd = pgd_offset(current->active_mm, address);
31883+
31884 pgd_ref = pgd_offset_k(address);
31885 if (pgd_none(*pgd_ref))
31886 return -1;
31887
31888+#ifdef CONFIG_PAX_PER_CPU_PGD
31889+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31890+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31891+ if (pgd_none(*pgd)) {
31892+ set_pgd(pgd, *pgd_ref);
31893+ arch_flush_lazy_mmu_mode();
31894+ } else {
31895+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31896+ }
31897+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31898+#else
31899+ pgd = pgd_offset(current->active_mm, address);
31900+#endif
31901+
31902 if (pgd_none(*pgd)) {
31903 set_pgd(pgd, *pgd_ref);
31904 arch_flush_lazy_mmu_mode();
31905@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31906 static int is_errata100(struct pt_regs *regs, unsigned long address)
31907 {
31908 #ifdef CONFIG_X86_64
31909- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31910+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31911 return 1;
31912 #endif
31913 return 0;
31914@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31915 }
31916
31917 static const char nx_warning[] = KERN_CRIT
31918-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31919+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31920 static const char smep_warning[] = KERN_CRIT
31921-"unable to execute userspace code (SMEP?) (uid: %d)\n";
31922+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
31923
31924 static void
31925 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31926@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31927 if (!oops_may_print())
31928 return;
31929
31930- if (error_code & PF_INSTR) {
31931+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31932 unsigned int level;
31933 pgd_t *pgd;
31934 pte_t *pte;
31935@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31936 pte = lookup_address_in_pgd(pgd, address, &level);
31937
31938 if (pte && pte_present(*pte) && !pte_exec(*pte))
31939- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31940+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31941 if (pte && pte_present(*pte) && pte_exec(*pte) &&
31942 (pgd_flags(*pgd) & _PAGE_USER) &&
31943 (read_cr4() & X86_CR4_SMEP))
31944- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
31945+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31946 }
31947
31948+#ifdef CONFIG_PAX_KERNEXEC
31949+ if (init_mm.start_code <= address && address < init_mm.end_code) {
31950+ if (current->signal->curr_ip)
31951+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
31952+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
31953+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31954+ else
31955+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
31956+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31957+ }
31958+#endif
31959+
31960 printk(KERN_ALERT "BUG: unable to handle kernel ");
31961 if (address < PAGE_SIZE)
31962 printk(KERN_CONT "NULL pointer dereference");
31963@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
31964 return;
31965 }
31966 #endif
31967+
31968+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31969+ if (pax_is_fetch_fault(regs, error_code, address)) {
31970+
31971+#ifdef CONFIG_PAX_EMUTRAMP
31972+ switch (pax_handle_fetch_fault(regs)) {
31973+ case 2:
31974+ return;
31975+ }
31976+#endif
31977+
31978+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
31979+ do_group_exit(SIGKILL);
31980+ }
31981+#endif
31982+
31983 /* Kernel addresses are always protection faults: */
31984 if (address >= TASK_SIZE)
31985 error_code |= PF_PROT;
31986@@ -867,7 +979,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
31987 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
31988 printk(KERN_ERR
31989 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
31990- tsk->comm, tsk->pid, address);
31991+ tsk->comm, task_pid_nr(tsk), address);
31992 code = BUS_MCEERR_AR;
31993 }
31994 #endif
31995@@ -921,6 +1033,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
31996 return 1;
31997 }
31998
31999+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32000+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
32001+{
32002+ pte_t *pte;
32003+ pmd_t *pmd;
32004+ spinlock_t *ptl;
32005+ unsigned char pte_mask;
32006+
32007+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
32008+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
32009+ return 0;
32010+
32011+ /* PaX: it's our fault, let's handle it if we can */
32012+
32013+ /* PaX: take a look at read faults before acquiring any locks */
32014+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
32015+ /* instruction fetch attempt from a protected page in user mode */
32016+ up_read(&mm->mmap_sem);
32017+
32018+#ifdef CONFIG_PAX_EMUTRAMP
32019+ switch (pax_handle_fetch_fault(regs)) {
32020+ case 2:
32021+ return 1;
32022+ }
32023+#endif
32024+
32025+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32026+ do_group_exit(SIGKILL);
32027+ }
32028+
32029+ pmd = pax_get_pmd(mm, address);
32030+ if (unlikely(!pmd))
32031+ return 0;
32032+
32033+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32034+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32035+ pte_unmap_unlock(pte, ptl);
32036+ return 0;
32037+ }
32038+
32039+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32040+ /* write attempt to a protected page in user mode */
32041+ pte_unmap_unlock(pte, ptl);
32042+ return 0;
32043+ }
32044+
32045+#ifdef CONFIG_SMP
32046+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
32047+#else
32048+ if (likely(address > get_limit(regs->cs)))
32049+#endif
32050+ {
32051+ set_pte(pte, pte_mkread(*pte));
32052+ __flush_tlb_one(address);
32053+ pte_unmap_unlock(pte, ptl);
32054+ up_read(&mm->mmap_sem);
32055+ return 1;
32056+ }
32057+
32058+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32059+
32060+ /*
32061+ * PaX: fill DTLB with user rights and retry
32062+ */
32063+ __asm__ __volatile__ (
32064+ "orb %2,(%1)\n"
32065+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32066+/*
32067+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32068+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32069+ * page fault when examined during a TLB load attempt. this is true not only
32070+ * for PTEs holding a non-present entry but also present entries that will
32071+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32072+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32073+ * for our target pages since their PTEs are simply not in the TLBs at all.
32074+
32075+ * the best thing in omitting it is that we gain around 15-20% speed in the
32076+ * fast path of the page fault handler and can get rid of tracing since we
32077+ * can no longer flush unintended entries.
32078+ */
32079+ "invlpg (%0)\n"
32080+#endif
32081+ __copyuser_seg"testb $0,(%0)\n"
32082+ "xorb %3,(%1)\n"
32083+ :
32084+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32085+ : "memory", "cc");
32086+ pte_unmap_unlock(pte, ptl);
32087+ up_read(&mm->mmap_sem);
32088+ return 1;
32089+}
32090+#endif
32091+
32092 /*
32093 * Handle a spurious fault caused by a stale TLB entry.
32094 *
32095@@ -1006,6 +1211,9 @@ int show_unhandled_signals = 1;
32096 static inline int
32097 access_error(unsigned long error_code, struct vm_area_struct *vma)
32098 {
32099+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32100+ return 1;
32101+
32102 if (error_code & PF_WRITE) {
32103 /* write, present and write, not present: */
32104 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32105@@ -1040,7 +1248,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
32106 if (error_code & PF_USER)
32107 return false;
32108
32109- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
32110+ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
32111 return false;
32112
32113 return true;
32114@@ -1068,6 +1276,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32115 tsk = current;
32116 mm = tsk->mm;
32117
32118+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32119+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32120+ if (!search_exception_tables(regs->ip)) {
32121+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32122+ bad_area_nosemaphore(regs, error_code, address);
32123+ return;
32124+ }
32125+ if (address < pax_user_shadow_base) {
32126+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32127+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
32128+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
32129+ } else
32130+ address -= pax_user_shadow_base;
32131+ }
32132+#endif
32133+
32134 /*
32135 * Detect and handle instructions that would cause a page fault for
32136 * both a tracked kernel page and a userspace page.
32137@@ -1145,7 +1369,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32138 * User-mode registers count as a user access even for any
32139 * potential system fault or CPU buglet:
32140 */
32141- if (user_mode_vm(regs)) {
32142+ if (user_mode(regs)) {
32143 local_irq_enable();
32144 error_code |= PF_USER;
32145 flags |= FAULT_FLAG_USER;
32146@@ -1192,6 +1416,11 @@ retry:
32147 might_sleep();
32148 }
32149
32150+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32151+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32152+ return;
32153+#endif
32154+
32155 vma = find_vma(mm, address);
32156 if (unlikely(!vma)) {
32157 bad_area(regs, error_code, address);
32158@@ -1203,18 +1432,24 @@ retry:
32159 bad_area(regs, error_code, address);
32160 return;
32161 }
32162- if (error_code & PF_USER) {
32163- /*
32164- * Accessing the stack below %sp is always a bug.
32165- * The large cushion allows instructions like enter
32166- * and pusha to work. ("enter $65535, $31" pushes
32167- * 32 pointers and then decrements %sp by 65535.)
32168- */
32169- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32170- bad_area(regs, error_code, address);
32171- return;
32172- }
32173+ /*
32174+ * Accessing the stack below %sp is always a bug.
32175+ * The large cushion allows instructions like enter
32176+ * and pusha to work. ("enter $65535, $31" pushes
32177+ * 32 pointers and then decrements %sp by 65535.)
32178+ */
32179+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32180+ bad_area(regs, error_code, address);
32181+ return;
32182 }
32183+
32184+#ifdef CONFIG_PAX_SEGMEXEC
32185+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32186+ bad_area(regs, error_code, address);
32187+ return;
32188+ }
32189+#endif
32190+
32191 if (unlikely(expand_stack(vma, address))) {
32192 bad_area(regs, error_code, address);
32193 return;
32194@@ -1331,3 +1566,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32195 }
32196 NOKPROBE_SYMBOL(trace_do_page_fault);
32197 #endif /* CONFIG_TRACING */
32198+
32199+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32200+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32201+{
32202+ struct mm_struct *mm = current->mm;
32203+ unsigned long ip = regs->ip;
32204+
32205+ if (v8086_mode(regs))
32206+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32207+
32208+#ifdef CONFIG_PAX_PAGEEXEC
32209+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32210+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32211+ return true;
32212+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32213+ return true;
32214+ return false;
32215+ }
32216+#endif
32217+
32218+#ifdef CONFIG_PAX_SEGMEXEC
32219+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32220+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32221+ return true;
32222+ return false;
32223+ }
32224+#endif
32225+
32226+ return false;
32227+}
32228+#endif
32229+
32230+#ifdef CONFIG_PAX_EMUTRAMP
32231+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32232+{
32233+ int err;
32234+
32235+ do { /* PaX: libffi trampoline emulation */
32236+ unsigned char mov, jmp;
32237+ unsigned int addr1, addr2;
32238+
32239+#ifdef CONFIG_X86_64
32240+ if ((regs->ip + 9) >> 32)
32241+ break;
32242+#endif
32243+
32244+ err = get_user(mov, (unsigned char __user *)regs->ip);
32245+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32246+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32247+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32248+
32249+ if (err)
32250+ break;
32251+
32252+ if (mov == 0xB8 && jmp == 0xE9) {
32253+ regs->ax = addr1;
32254+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32255+ return 2;
32256+ }
32257+ } while (0);
32258+
32259+ do { /* PaX: gcc trampoline emulation #1 */
32260+ unsigned char mov1, mov2;
32261+ unsigned short jmp;
32262+ unsigned int addr1, addr2;
32263+
32264+#ifdef CONFIG_X86_64
32265+ if ((regs->ip + 11) >> 32)
32266+ break;
32267+#endif
32268+
32269+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32270+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32271+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32272+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32273+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32274+
32275+ if (err)
32276+ break;
32277+
32278+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32279+ regs->cx = addr1;
32280+ regs->ax = addr2;
32281+ regs->ip = addr2;
32282+ return 2;
32283+ }
32284+ } while (0);
32285+
32286+ do { /* PaX: gcc trampoline emulation #2 */
32287+ unsigned char mov, jmp;
32288+ unsigned int addr1, addr2;
32289+
32290+#ifdef CONFIG_X86_64
32291+ if ((regs->ip + 9) >> 32)
32292+ break;
32293+#endif
32294+
32295+ err = get_user(mov, (unsigned char __user *)regs->ip);
32296+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32297+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32298+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32299+
32300+ if (err)
32301+ break;
32302+
32303+ if (mov == 0xB9 && jmp == 0xE9) {
32304+ regs->cx = addr1;
32305+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32306+ return 2;
32307+ }
32308+ } while (0);
32309+
32310+ return 1; /* PaX in action */
32311+}
32312+
32313+#ifdef CONFIG_X86_64
32314+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32315+{
32316+ int err;
32317+
32318+ do { /* PaX: libffi trampoline emulation */
32319+ unsigned short mov1, mov2, jmp1;
32320+ unsigned char stcclc, jmp2;
32321+ unsigned long addr1, addr2;
32322+
32323+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32324+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32325+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32326+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32327+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32328+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32329+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32330+
32331+ if (err)
32332+ break;
32333+
32334+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32335+ regs->r11 = addr1;
32336+ regs->r10 = addr2;
32337+ if (stcclc == 0xF8)
32338+ regs->flags &= ~X86_EFLAGS_CF;
32339+ else
32340+ regs->flags |= X86_EFLAGS_CF;
32341+ regs->ip = addr1;
32342+ return 2;
32343+ }
32344+ } while (0);
32345+
32346+ do { /* PaX: gcc trampoline emulation #1 */
32347+ unsigned short mov1, mov2, jmp1;
32348+ unsigned char jmp2;
32349+ unsigned int addr1;
32350+ unsigned long addr2;
32351+
32352+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32353+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32354+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32355+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32356+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32357+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32358+
32359+ if (err)
32360+ break;
32361+
32362+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32363+ regs->r11 = addr1;
32364+ regs->r10 = addr2;
32365+ regs->ip = addr1;
32366+ return 2;
32367+ }
32368+ } while (0);
32369+
32370+ do { /* PaX: gcc trampoline emulation #2 */
32371+ unsigned short mov1, mov2, jmp1;
32372+ unsigned char jmp2;
32373+ unsigned long addr1, addr2;
32374+
32375+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32376+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32377+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32378+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32379+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32380+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32381+
32382+ if (err)
32383+ break;
32384+
32385+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32386+ regs->r11 = addr1;
32387+ regs->r10 = addr2;
32388+ regs->ip = addr1;
32389+ return 2;
32390+ }
32391+ } while (0);
32392+
32393+ return 1; /* PaX in action */
32394+}
32395+#endif
32396+
32397+/*
32398+ * PaX: decide what to do with offenders (regs->ip = fault address)
32399+ *
32400+ * returns 1 when task should be killed
32401+ * 2 when gcc trampoline was detected
32402+ */
32403+static int pax_handle_fetch_fault(struct pt_regs *regs)
32404+{
32405+ if (v8086_mode(regs))
32406+ return 1;
32407+
32408+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32409+ return 1;
32410+
32411+#ifdef CONFIG_X86_32
32412+ return pax_handle_fetch_fault_32(regs);
32413+#else
32414+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32415+ return pax_handle_fetch_fault_32(regs);
32416+ else
32417+ return pax_handle_fetch_fault_64(regs);
32418+#endif
32419+}
32420+#endif
32421+
32422+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32423+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32424+{
32425+ long i;
32426+
32427+ printk(KERN_ERR "PAX: bytes at PC: ");
32428+ for (i = 0; i < 20; i++) {
32429+ unsigned char c;
32430+ if (get_user(c, (unsigned char __force_user *)pc+i))
32431+ printk(KERN_CONT "?? ");
32432+ else
32433+ printk(KERN_CONT "%02x ", c);
32434+ }
32435+ printk("\n");
32436+
32437+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32438+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32439+ unsigned long c;
32440+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32441+#ifdef CONFIG_X86_32
32442+ printk(KERN_CONT "???????? ");
32443+#else
32444+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32445+ printk(KERN_CONT "???????? ???????? ");
32446+ else
32447+ printk(KERN_CONT "???????????????? ");
32448+#endif
32449+ } else {
32450+#ifdef CONFIG_X86_64
32451+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32452+ printk(KERN_CONT "%08x ", (unsigned int)c);
32453+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32454+ } else
32455+#endif
32456+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32457+ }
32458+ }
32459+ printk("\n");
32460+}
32461+#endif
32462+
32463+/**
32464+ * probe_kernel_write(): safely attempt to write to a location
32465+ * @dst: address to write to
32466+ * @src: pointer to the data that shall be written
32467+ * @size: size of the data chunk
32468+ *
32469+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32470+ * happens, handle that and return -EFAULT.
32471+ */
32472+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32473+{
32474+ long ret;
32475+ mm_segment_t old_fs = get_fs();
32476+
32477+ set_fs(KERNEL_DS);
32478+ pagefault_disable();
32479+ pax_open_kernel();
32480+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32481+ pax_close_kernel();
32482+ pagefault_enable();
32483+ set_fs(old_fs);
32484+
32485+ return ret ? -EFAULT : 0;
32486+}
32487diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32488index 207d9aef..69030980 100644
32489--- a/arch/x86/mm/gup.c
32490+++ b/arch/x86/mm/gup.c
32491@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32492 addr = start;
32493 len = (unsigned long) nr_pages << PAGE_SHIFT;
32494 end = start + len;
32495- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32496+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32497 (void __user *)start, len)))
32498 return 0;
32499
32500@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32501 goto slow_irqon;
32502 #endif
32503
32504+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32505+ (void __user *)start, len)))
32506+ return 0;
32507+
32508 /*
32509 * XXX: batch / limit 'nr', to avoid large irq off latency
32510 * needs some instrumenting to determine the common sizes used by
32511diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32512index 4500142..53a363c 100644
32513--- a/arch/x86/mm/highmem_32.c
32514+++ b/arch/x86/mm/highmem_32.c
32515@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32516 idx = type + KM_TYPE_NR*smp_processor_id();
32517 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32518 BUG_ON(!pte_none(*(kmap_pte-idx)));
32519+
32520+ pax_open_kernel();
32521 set_pte(kmap_pte-idx, mk_pte(page, prot));
32522+ pax_close_kernel();
32523+
32524 arch_flush_lazy_mmu_mode();
32525
32526 return (void *)vaddr;
32527diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32528index 8b977eb..4732c33 100644
32529--- a/arch/x86/mm/hugetlbpage.c
32530+++ b/arch/x86/mm/hugetlbpage.c
32531@@ -80,23 +80,24 @@ int pud_huge(pud_t pud)
32532 #ifdef CONFIG_HUGETLB_PAGE
32533 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32534 unsigned long addr, unsigned long len,
32535- unsigned long pgoff, unsigned long flags)
32536+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32537 {
32538 struct hstate *h = hstate_file(file);
32539 struct vm_unmapped_area_info info;
32540-
32541+
32542 info.flags = 0;
32543 info.length = len;
32544 info.low_limit = current->mm->mmap_legacy_base;
32545 info.high_limit = TASK_SIZE;
32546 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32547 info.align_offset = 0;
32548+ info.threadstack_offset = offset;
32549 return vm_unmapped_area(&info);
32550 }
32551
32552 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32553 unsigned long addr0, unsigned long len,
32554- unsigned long pgoff, unsigned long flags)
32555+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32556 {
32557 struct hstate *h = hstate_file(file);
32558 struct vm_unmapped_area_info info;
32559@@ -108,6 +109,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32560 info.high_limit = current->mm->mmap_base;
32561 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32562 info.align_offset = 0;
32563+ info.threadstack_offset = offset;
32564 addr = vm_unmapped_area(&info);
32565
32566 /*
32567@@ -120,6 +122,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32568 VM_BUG_ON(addr != -ENOMEM);
32569 info.flags = 0;
32570 info.low_limit = TASK_UNMAPPED_BASE;
32571+
32572+#ifdef CONFIG_PAX_RANDMMAP
32573+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32574+ info.low_limit += current->mm->delta_mmap;
32575+#endif
32576+
32577 info.high_limit = TASK_SIZE;
32578 addr = vm_unmapped_area(&info);
32579 }
32580@@ -134,10 +142,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32581 struct hstate *h = hstate_file(file);
32582 struct mm_struct *mm = current->mm;
32583 struct vm_area_struct *vma;
32584+ unsigned long pax_task_size = TASK_SIZE;
32585+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32586
32587 if (len & ~huge_page_mask(h))
32588 return -EINVAL;
32589- if (len > TASK_SIZE)
32590+
32591+#ifdef CONFIG_PAX_SEGMEXEC
32592+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32593+ pax_task_size = SEGMEXEC_TASK_SIZE;
32594+#endif
32595+
32596+ pax_task_size -= PAGE_SIZE;
32597+
32598+ if (len > pax_task_size)
32599 return -ENOMEM;
32600
32601 if (flags & MAP_FIXED) {
32602@@ -146,19 +164,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32603 return addr;
32604 }
32605
32606+#ifdef CONFIG_PAX_RANDMMAP
32607+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32608+#endif
32609+
32610 if (addr) {
32611 addr = ALIGN(addr, huge_page_size(h));
32612 vma = find_vma(mm, addr);
32613- if (TASK_SIZE - len >= addr &&
32614- (!vma || addr + len <= vma->vm_start))
32615+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32616 return addr;
32617 }
32618 if (mm->get_unmapped_area == arch_get_unmapped_area)
32619 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32620- pgoff, flags);
32621+ pgoff, flags, offset);
32622 else
32623 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32624- pgoff, flags);
32625+ pgoff, flags, offset);
32626 }
32627 #endif /* CONFIG_HUGETLB_PAGE */
32628
32629diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32630index 66dba36..f8082ec 100644
32631--- a/arch/x86/mm/init.c
32632+++ b/arch/x86/mm/init.c
32633@@ -4,6 +4,7 @@
32634 #include <linux/swap.h>
32635 #include <linux/memblock.h>
32636 #include <linux/bootmem.h> /* for max_low_pfn */
32637+#include <linux/tboot.h>
32638
32639 #include <asm/cacheflush.h>
32640 #include <asm/e820.h>
32641@@ -17,6 +18,8 @@
32642 #include <asm/proto.h>
32643 #include <asm/dma.h> /* for MAX_DMA_PFN */
32644 #include <asm/microcode.h>
32645+#include <asm/desc.h>
32646+#include <asm/bios_ebda.h>
32647
32648 /*
32649 * We need to define the tracepoints somewhere, and tlb.c
32650@@ -570,7 +573,18 @@ void __init init_mem_mapping(void)
32651 early_ioremap_page_table_range_init();
32652 #endif
32653
32654+#ifdef CONFIG_PAX_PER_CPU_PGD
32655+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32656+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32657+ KERNEL_PGD_PTRS);
32658+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32659+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32660+ KERNEL_PGD_PTRS);
32661+ load_cr3(get_cpu_pgd(0, kernel));
32662+#else
32663 load_cr3(swapper_pg_dir);
32664+#endif
32665+
32666 __flush_tlb_all();
32667
32668 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32669@@ -586,10 +600,40 @@ void __init init_mem_mapping(void)
32670 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32671 * mmio resources as well as potential bios/acpi data regions.
32672 */
32673+
32674+#ifdef CONFIG_GRKERNSEC_KMEM
32675+static unsigned int ebda_start __read_only;
32676+static unsigned int ebda_end __read_only;
32677+#endif
32678+
32679 int devmem_is_allowed(unsigned long pagenr)
32680 {
32681- if (pagenr < 256)
32682+#ifdef CONFIG_GRKERNSEC_KMEM
32683+ /* allow BDA */
32684+ if (!pagenr)
32685 return 1;
32686+ /* allow EBDA */
32687+ if (pagenr >= ebda_start && pagenr < ebda_end)
32688+ return 1;
32689+ /* if tboot is in use, allow access to its hardcoded serial log range */
32690+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32691+ return 1;
32692+#else
32693+ if (!pagenr)
32694+ return 1;
32695+#ifdef CONFIG_VM86
32696+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32697+ return 1;
32698+#endif
32699+#endif
32700+
32701+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32702+ return 1;
32703+#ifdef CONFIG_GRKERNSEC_KMEM
32704+ /* throw out everything else below 1MB */
32705+ if (pagenr <= 256)
32706+ return 0;
32707+#endif
32708 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32709 return 0;
32710 if (!page_is_ram(pagenr))
32711@@ -635,8 +679,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32712 #endif
32713 }
32714
32715+#ifdef CONFIG_GRKERNSEC_KMEM
32716+static inline void gr_init_ebda(void)
32717+{
32718+ unsigned int ebda_addr;
32719+ unsigned int ebda_size = 0;
32720+
32721+ ebda_addr = get_bios_ebda();
32722+ if (ebda_addr) {
32723+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32724+ ebda_size <<= 10;
32725+ }
32726+ if (ebda_addr && ebda_size) {
32727+ ebda_start = ebda_addr >> PAGE_SHIFT;
32728+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32729+ } else {
32730+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32731+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32732+ }
32733+}
32734+#else
32735+static inline void gr_init_ebda(void) { }
32736+#endif
32737+
32738 void free_initmem(void)
32739 {
32740+#ifdef CONFIG_PAX_KERNEXEC
32741+#ifdef CONFIG_X86_32
32742+ /* PaX: limit KERNEL_CS to actual size */
32743+ unsigned long addr, limit;
32744+ struct desc_struct d;
32745+ int cpu;
32746+#else
32747+ pgd_t *pgd;
32748+ pud_t *pud;
32749+ pmd_t *pmd;
32750+ unsigned long addr, end;
32751+#endif
32752+#endif
32753+
32754+ gr_init_ebda();
32755+
32756+#ifdef CONFIG_PAX_KERNEXEC
32757+#ifdef CONFIG_X86_32
32758+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32759+ limit = (limit - 1UL) >> PAGE_SHIFT;
32760+
32761+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32762+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32763+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32764+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32765+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32766+ }
32767+
32768+ /* PaX: make KERNEL_CS read-only */
32769+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32770+ if (!paravirt_enabled())
32771+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32772+/*
32773+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32774+ pgd = pgd_offset_k(addr);
32775+ pud = pud_offset(pgd, addr);
32776+ pmd = pmd_offset(pud, addr);
32777+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32778+ }
32779+*/
32780+#ifdef CONFIG_X86_PAE
32781+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32782+/*
32783+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32784+ pgd = pgd_offset_k(addr);
32785+ pud = pud_offset(pgd, addr);
32786+ pmd = pmd_offset(pud, addr);
32787+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32788+ }
32789+*/
32790+#endif
32791+
32792+#ifdef CONFIG_MODULES
32793+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32794+#endif
32795+
32796+#else
32797+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32798+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32799+ pgd = pgd_offset_k(addr);
32800+ pud = pud_offset(pgd, addr);
32801+ pmd = pmd_offset(pud, addr);
32802+ if (!pmd_present(*pmd))
32803+ continue;
32804+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32805+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32806+ else
32807+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32808+ }
32809+
32810+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32811+ end = addr + KERNEL_IMAGE_SIZE;
32812+ for (; addr < end; addr += PMD_SIZE) {
32813+ pgd = pgd_offset_k(addr);
32814+ pud = pud_offset(pgd, addr);
32815+ pmd = pmd_offset(pud, addr);
32816+ if (!pmd_present(*pmd))
32817+ continue;
32818+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32819+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32820+ }
32821+#endif
32822+
32823+ flush_tlb_all();
32824+#endif
32825+
32826 free_init_pages("unused kernel",
32827 (unsigned long)(&__init_begin),
32828 (unsigned long)(&__init_end));
32829diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32830index c8140e1..59257fc 100644
32831--- a/arch/x86/mm/init_32.c
32832+++ b/arch/x86/mm/init_32.c
32833@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32834 bool __read_mostly __vmalloc_start_set = false;
32835
32836 /*
32837- * Creates a middle page table and puts a pointer to it in the
32838- * given global directory entry. This only returns the gd entry
32839- * in non-PAE compilation mode, since the middle layer is folded.
32840- */
32841-static pmd_t * __init one_md_table_init(pgd_t *pgd)
32842-{
32843- pud_t *pud;
32844- pmd_t *pmd_table;
32845-
32846-#ifdef CONFIG_X86_PAE
32847- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32848- pmd_table = (pmd_t *)alloc_low_page();
32849- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32850- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32851- pud = pud_offset(pgd, 0);
32852- BUG_ON(pmd_table != pmd_offset(pud, 0));
32853-
32854- return pmd_table;
32855- }
32856-#endif
32857- pud = pud_offset(pgd, 0);
32858- pmd_table = pmd_offset(pud, 0);
32859-
32860- return pmd_table;
32861-}
32862-
32863-/*
32864 * Create a page table and place a pointer to it in a middle page
32865 * directory entry:
32866 */
32867@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32868 pte_t *page_table = (pte_t *)alloc_low_page();
32869
32870 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32871+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32872+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32873+#else
32874 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32875+#endif
32876 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32877 }
32878
32879 return pte_offset_kernel(pmd, 0);
32880 }
32881
32882+static pmd_t * __init one_md_table_init(pgd_t *pgd)
32883+{
32884+ pud_t *pud;
32885+ pmd_t *pmd_table;
32886+
32887+ pud = pud_offset(pgd, 0);
32888+ pmd_table = pmd_offset(pud, 0);
32889+
32890+ return pmd_table;
32891+}
32892+
32893 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32894 {
32895 int pgd_idx = pgd_index(vaddr);
32896@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32897 int pgd_idx, pmd_idx;
32898 unsigned long vaddr;
32899 pgd_t *pgd;
32900+ pud_t *pud;
32901 pmd_t *pmd;
32902 pte_t *pte = NULL;
32903 unsigned long count = page_table_range_init_count(start, end);
32904@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32905 pgd = pgd_base + pgd_idx;
32906
32907 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32908- pmd = one_md_table_init(pgd);
32909- pmd = pmd + pmd_index(vaddr);
32910+ pud = pud_offset(pgd, vaddr);
32911+ pmd = pmd_offset(pud, vaddr);
32912+
32913+#ifdef CONFIG_X86_PAE
32914+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32915+#endif
32916+
32917 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32918 pmd++, pmd_idx++) {
32919 pte = page_table_kmap_check(one_page_table_init(pmd),
32920@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32921 }
32922 }
32923
32924-static inline int is_kernel_text(unsigned long addr)
32925+static inline int is_kernel_text(unsigned long start, unsigned long end)
32926 {
32927- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32928- return 1;
32929- return 0;
32930+ if ((start >= ktla_ktva((unsigned long)_etext) ||
32931+ end <= ktla_ktva((unsigned long)_stext)) &&
32932+ (start >= ktla_ktva((unsigned long)_einittext) ||
32933+ end <= ktla_ktva((unsigned long)_sinittext)) &&
32934+
32935+#ifdef CONFIG_ACPI_SLEEP
32936+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32937+#endif
32938+
32939+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32940+ return 0;
32941+ return 1;
32942 }
32943
32944 /*
32945@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
32946 unsigned long last_map_addr = end;
32947 unsigned long start_pfn, end_pfn;
32948 pgd_t *pgd_base = swapper_pg_dir;
32949- int pgd_idx, pmd_idx, pte_ofs;
32950+ unsigned int pgd_idx, pmd_idx, pte_ofs;
32951 unsigned long pfn;
32952 pgd_t *pgd;
32953+ pud_t *pud;
32954 pmd_t *pmd;
32955 pte_t *pte;
32956 unsigned pages_2m, pages_4k;
32957@@ -291,8 +295,13 @@ repeat:
32958 pfn = start_pfn;
32959 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32960 pgd = pgd_base + pgd_idx;
32961- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
32962- pmd = one_md_table_init(pgd);
32963+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
32964+ pud = pud_offset(pgd, 0);
32965+ pmd = pmd_offset(pud, 0);
32966+
32967+#ifdef CONFIG_X86_PAE
32968+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32969+#endif
32970
32971 if (pfn >= end_pfn)
32972 continue;
32973@@ -304,14 +313,13 @@ repeat:
32974 #endif
32975 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
32976 pmd++, pmd_idx++) {
32977- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
32978+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
32979
32980 /*
32981 * Map with big pages if possible, otherwise
32982 * create normal page tables:
32983 */
32984 if (use_pse) {
32985- unsigned int addr2;
32986 pgprot_t prot = PAGE_KERNEL_LARGE;
32987 /*
32988 * first pass will use the same initial
32989@@ -322,11 +330,7 @@ repeat:
32990 _PAGE_PSE);
32991
32992 pfn &= PMD_MASK >> PAGE_SHIFT;
32993- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
32994- PAGE_OFFSET + PAGE_SIZE-1;
32995-
32996- if (is_kernel_text(addr) ||
32997- is_kernel_text(addr2))
32998+ if (is_kernel_text(address, address + PMD_SIZE))
32999 prot = PAGE_KERNEL_LARGE_EXEC;
33000
33001 pages_2m++;
33002@@ -343,7 +347,7 @@ repeat:
33003 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33004 pte += pte_ofs;
33005 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
33006- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
33007+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
33008 pgprot_t prot = PAGE_KERNEL;
33009 /*
33010 * first pass will use the same initial
33011@@ -351,7 +355,7 @@ repeat:
33012 */
33013 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
33014
33015- if (is_kernel_text(addr))
33016+ if (is_kernel_text(address, address + PAGE_SIZE))
33017 prot = PAGE_KERNEL_EXEC;
33018
33019 pages_4k++;
33020@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33021
33022 pud = pud_offset(pgd, va);
33023 pmd = pmd_offset(pud, va);
33024- if (!pmd_present(*pmd))
33025+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33026 break;
33027
33028 /* should not be large page here */
33029@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33030
33031 static void __init pagetable_init(void)
33032 {
33033- pgd_t *pgd_base = swapper_pg_dir;
33034-
33035- permanent_kmaps_init(pgd_base);
33036+ permanent_kmaps_init(swapper_pg_dir);
33037 }
33038
33039-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33040+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33041 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33042
33043 /* user-defined highmem size */
33044@@ -787,10 +789,10 @@ void __init mem_init(void)
33045 ((unsigned long)&__init_end -
33046 (unsigned long)&__init_begin) >> 10,
33047
33048- (unsigned long)&_etext, (unsigned long)&_edata,
33049- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33050+ (unsigned long)&_sdata, (unsigned long)&_edata,
33051+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33052
33053- (unsigned long)&_text, (unsigned long)&_etext,
33054+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33055 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33056
33057 /*
33058@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33059 if (!kernel_set_to_readonly)
33060 return;
33061
33062+ start = ktla_ktva(start);
33063 pr_debug("Set kernel text: %lx - %lx for read write\n",
33064 start, start+size);
33065
33066@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33067 if (!kernel_set_to_readonly)
33068 return;
33069
33070+ start = ktla_ktva(start);
33071 pr_debug("Set kernel text: %lx - %lx for read only\n",
33072 start, start+size);
33073
33074@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33075 unsigned long start = PFN_ALIGN(_text);
33076 unsigned long size = PFN_ALIGN(_etext) - start;
33077
33078+ start = ktla_ktva(start);
33079 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33080 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33081 size >> 10);
33082diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33083index 4e5dfec..6fd6dc5 100644
33084--- a/arch/x86/mm/init_64.c
33085+++ b/arch/x86/mm/init_64.c
33086@@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
33087 * around without checking the pgd every time.
33088 */
33089
33090-pteval_t __supported_pte_mask __read_mostly = ~0;
33091+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33092 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33093
33094 int force_personality32;
33095@@ -184,7 +184,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33096
33097 for (address = start; address <= end; address += PGDIR_SIZE) {
33098 const pgd_t *pgd_ref = pgd_offset_k(address);
33099+
33100+#ifdef CONFIG_PAX_PER_CPU_PGD
33101+ unsigned long cpu;
33102+#else
33103 struct page *page;
33104+#endif
33105
33106 /*
33107 * When it is called after memory hot remove, pgd_none()
33108@@ -195,6 +200,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33109 continue;
33110
33111 spin_lock(&pgd_lock);
33112+
33113+#ifdef CONFIG_PAX_PER_CPU_PGD
33114+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33115+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33116+
33117+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33118+ BUG_ON(pgd_page_vaddr(*pgd)
33119+ != pgd_page_vaddr(*pgd_ref));
33120+
33121+ if (removed) {
33122+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33123+ pgd_clear(pgd);
33124+ } else {
33125+ if (pgd_none(*pgd))
33126+ set_pgd(pgd, *pgd_ref);
33127+ }
33128+
33129+ pgd = pgd_offset_cpu(cpu, kernel, address);
33130+#else
33131 list_for_each_entry(page, &pgd_list, lru) {
33132 pgd_t *pgd;
33133 spinlock_t *pgt_lock;
33134@@ -203,6 +227,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33135 /* the pgt_lock only for Xen */
33136 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33137 spin_lock(pgt_lock);
33138+#endif
33139
33140 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33141 BUG_ON(pgd_page_vaddr(*pgd)
33142@@ -216,7 +241,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33143 set_pgd(pgd, *pgd_ref);
33144 }
33145
33146+#ifndef CONFIG_PAX_PER_CPU_PGD
33147 spin_unlock(pgt_lock);
33148+#endif
33149+
33150 }
33151 spin_unlock(&pgd_lock);
33152 }
33153@@ -249,7 +277,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33154 {
33155 if (pgd_none(*pgd)) {
33156 pud_t *pud = (pud_t *)spp_getpage();
33157- pgd_populate(&init_mm, pgd, pud);
33158+ pgd_populate_kernel(&init_mm, pgd, pud);
33159 if (pud != pud_offset(pgd, 0))
33160 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33161 pud, pud_offset(pgd, 0));
33162@@ -261,7 +289,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33163 {
33164 if (pud_none(*pud)) {
33165 pmd_t *pmd = (pmd_t *) spp_getpage();
33166- pud_populate(&init_mm, pud, pmd);
33167+ pud_populate_kernel(&init_mm, pud, pmd);
33168 if (pmd != pmd_offset(pud, 0))
33169 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33170 pmd, pmd_offset(pud, 0));
33171@@ -290,7 +318,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33172 pmd = fill_pmd(pud, vaddr);
33173 pte = fill_pte(pmd, vaddr);
33174
33175+ pax_open_kernel();
33176 set_pte(pte, new_pte);
33177+ pax_close_kernel();
33178
33179 /*
33180 * It's enough to flush this one mapping.
33181@@ -349,14 +379,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33182 pgd = pgd_offset_k((unsigned long)__va(phys));
33183 if (pgd_none(*pgd)) {
33184 pud = (pud_t *) spp_getpage();
33185- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33186- _PAGE_USER));
33187+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33188 }
33189 pud = pud_offset(pgd, (unsigned long)__va(phys));
33190 if (pud_none(*pud)) {
33191 pmd = (pmd_t *) spp_getpage();
33192- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33193- _PAGE_USER));
33194+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33195 }
33196 pmd = pmd_offset(pud, phys);
33197 BUG_ON(!pmd_none(*pmd));
33198@@ -597,7 +625,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33199 prot);
33200
33201 spin_lock(&init_mm.page_table_lock);
33202- pud_populate(&init_mm, pud, pmd);
33203+ pud_populate_kernel(&init_mm, pud, pmd);
33204 spin_unlock(&init_mm.page_table_lock);
33205 }
33206 __flush_tlb_all();
33207@@ -638,7 +666,7 @@ kernel_physical_mapping_init(unsigned long start,
33208 page_size_mask);
33209
33210 spin_lock(&init_mm.page_table_lock);
33211- pgd_populate(&init_mm, pgd, pud);
33212+ pgd_populate_kernel(&init_mm, pgd, pud);
33213 spin_unlock(&init_mm.page_table_lock);
33214 pgd_changed = true;
33215 }
33216@@ -1217,8 +1245,8 @@ static struct vm_operations_struct gate_vma_ops = {
33217 static struct vm_area_struct gate_vma = {
33218 .vm_start = VSYSCALL_ADDR,
33219 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
33220- .vm_page_prot = PAGE_READONLY_EXEC,
33221- .vm_flags = VM_READ | VM_EXEC,
33222+ .vm_page_prot = PAGE_READONLY,
33223+ .vm_flags = VM_READ,
33224 .vm_ops = &gate_vma_ops,
33225 };
33226
33227diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33228index 7b179b49..6bd17777 100644
33229--- a/arch/x86/mm/iomap_32.c
33230+++ b/arch/x86/mm/iomap_32.c
33231@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33232 type = kmap_atomic_idx_push();
33233 idx = type + KM_TYPE_NR * smp_processor_id();
33234 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33235+
33236+ pax_open_kernel();
33237 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33238+ pax_close_kernel();
33239+
33240 arch_flush_lazy_mmu_mode();
33241
33242 return (void *)vaddr;
33243diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33244index af78e50..0790b03 100644
33245--- a/arch/x86/mm/ioremap.c
33246+++ b/arch/x86/mm/ioremap.c
33247@@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33248 unsigned long i;
33249
33250 for (i = 0; i < nr_pages; ++i)
33251- if (pfn_valid(start_pfn + i) &&
33252- !PageReserved(pfn_to_page(start_pfn + i)))
33253+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33254+ !PageReserved(pfn_to_page(start_pfn + i))))
33255 return 1;
33256
33257 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33258@@ -280,7 +280,7 @@ EXPORT_SYMBOL(ioremap_prot);
33259 *
33260 * Caller must ensure there is only one unmapping for the same pointer.
33261 */
33262-void iounmap(volatile void __iomem *addr)
33263+void iounmap(const volatile void __iomem *addr)
33264 {
33265 struct vm_struct *p, *o;
33266
33267@@ -334,6 +334,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
33268
33269 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33270 if (page_is_ram(start >> PAGE_SHIFT))
33271+#ifdef CONFIG_HIGHMEM
33272+ if ((start >> PAGE_SHIFT) < max_low_pfn)
33273+#endif
33274 return __va(phys);
33275
33276 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
33277@@ -346,13 +349,16 @@ void *xlate_dev_mem_ptr(unsigned long phys)
33278 void unxlate_dev_mem_ptr(unsigned long phys, void *addr)
33279 {
33280 if (page_is_ram(phys >> PAGE_SHIFT))
33281+#ifdef CONFIG_HIGHMEM
33282+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33283+#endif
33284 return;
33285
33286 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33287 return;
33288 }
33289
33290-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33291+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33292
33293 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33294 {
33295@@ -388,8 +394,7 @@ void __init early_ioremap_init(void)
33296 early_ioremap_setup();
33297
33298 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33299- memset(bm_pte, 0, sizeof(bm_pte));
33300- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33301+ pmd_populate_user(&init_mm, pmd, bm_pte);
33302
33303 /*
33304 * The boot-ioremap range spans multiple pmds, for which
33305diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33306index b4f2e7e..96c9c3e 100644
33307--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33308+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33309@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33310 * memory (e.g. tracked pages)? For now, we need this to avoid
33311 * invoking kmemcheck for PnP BIOS calls.
33312 */
33313- if (regs->flags & X86_VM_MASK)
33314+ if (v8086_mode(regs))
33315 return false;
33316- if (regs->cs != __KERNEL_CS)
33317+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33318 return false;
33319
33320 pte = kmemcheck_pte_lookup(address);
33321diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33322index 919b912..9267313 100644
33323--- a/arch/x86/mm/mmap.c
33324+++ b/arch/x86/mm/mmap.c
33325@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
33326 * Leave an at least ~128 MB hole with possible stack randomization.
33327 */
33328 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33329-#define MAX_GAP (TASK_SIZE/6*5)
33330+#define MAX_GAP (pax_task_size/6*5)
33331
33332 static int mmap_is_legacy(void)
33333 {
33334@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
33335 return rnd << PAGE_SHIFT;
33336 }
33337
33338-static unsigned long mmap_base(void)
33339+static unsigned long mmap_base(struct mm_struct *mm)
33340 {
33341 unsigned long gap = rlimit(RLIMIT_STACK);
33342+ unsigned long pax_task_size = TASK_SIZE;
33343+
33344+#ifdef CONFIG_PAX_SEGMEXEC
33345+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33346+ pax_task_size = SEGMEXEC_TASK_SIZE;
33347+#endif
33348
33349 if (gap < MIN_GAP)
33350 gap = MIN_GAP;
33351 else if (gap > MAX_GAP)
33352 gap = MAX_GAP;
33353
33354- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
33355+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
33356 }
33357
33358 /*
33359 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33360 * does, but not when emulating X86_32
33361 */
33362-static unsigned long mmap_legacy_base(void)
33363+static unsigned long mmap_legacy_base(struct mm_struct *mm)
33364 {
33365- if (mmap_is_ia32())
33366+ if (mmap_is_ia32()) {
33367+
33368+#ifdef CONFIG_PAX_SEGMEXEC
33369+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33370+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33371+ else
33372+#endif
33373+
33374 return TASK_UNMAPPED_BASE;
33375- else
33376+ } else
33377 return TASK_UNMAPPED_BASE + mmap_rnd();
33378 }
33379
33380@@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33381 */
33382 void arch_pick_mmap_layout(struct mm_struct *mm)
33383 {
33384- mm->mmap_legacy_base = mmap_legacy_base();
33385- mm->mmap_base = mmap_base();
33386+ mm->mmap_legacy_base = mmap_legacy_base(mm);
33387+ mm->mmap_base = mmap_base(mm);
33388+
33389+#ifdef CONFIG_PAX_RANDMMAP
33390+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33391+ mm->mmap_legacy_base += mm->delta_mmap;
33392+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33393+ }
33394+#endif
33395
33396 if (mmap_is_legacy()) {
33397 mm->mmap_base = mm->mmap_legacy_base;
33398diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33399index 0057a7a..95c7edd 100644
33400--- a/arch/x86/mm/mmio-mod.c
33401+++ b/arch/x86/mm/mmio-mod.c
33402@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33403 break;
33404 default:
33405 {
33406- unsigned char *ip = (unsigned char *)instptr;
33407+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33408 my_trace->opcode = MMIO_UNKNOWN_OP;
33409 my_trace->width = 0;
33410 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33411@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33412 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33413 void __iomem *addr)
33414 {
33415- static atomic_t next_id;
33416+ static atomic_unchecked_t next_id;
33417 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33418 /* These are page-unaligned. */
33419 struct mmiotrace_map map = {
33420@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33421 .private = trace
33422 },
33423 .phys = offset,
33424- .id = atomic_inc_return(&next_id)
33425+ .id = atomic_inc_return_unchecked(&next_id)
33426 };
33427 map.map_id = trace->id;
33428
33429@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33430 ioremap_trace_core(offset, size, addr);
33431 }
33432
33433-static void iounmap_trace_core(volatile void __iomem *addr)
33434+static void iounmap_trace_core(const volatile void __iomem *addr)
33435 {
33436 struct mmiotrace_map map = {
33437 .phys = 0,
33438@@ -328,7 +328,7 @@ not_enabled:
33439 }
33440 }
33441
33442-void mmiotrace_iounmap(volatile void __iomem *addr)
33443+void mmiotrace_iounmap(const volatile void __iomem *addr)
33444 {
33445 might_sleep();
33446 if (is_enabled()) /* recheck and proper locking in *_core() */
33447diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33448index 1a88370..3f598b5 100644
33449--- a/arch/x86/mm/numa.c
33450+++ b/arch/x86/mm/numa.c
33451@@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33452 }
33453 }
33454
33455-static int __init numa_register_memblks(struct numa_meminfo *mi)
33456+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33457 {
33458 unsigned long uninitialized_var(pfn_align);
33459 int i, nid;
33460diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33461index 36de293..b820ddc 100644
33462--- a/arch/x86/mm/pageattr.c
33463+++ b/arch/x86/mm/pageattr.c
33464@@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33465 */
33466 #ifdef CONFIG_PCI_BIOS
33467 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33468- pgprot_val(forbidden) |= _PAGE_NX;
33469+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33470 #endif
33471
33472 /*
33473@@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33474 * Does not cover __inittext since that is gone later on. On
33475 * 64bit we do not enforce !NX on the low mapping
33476 */
33477- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33478- pgprot_val(forbidden) |= _PAGE_NX;
33479+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33480+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33481
33482+#ifdef CONFIG_DEBUG_RODATA
33483 /*
33484 * The .rodata section needs to be read-only. Using the pfn
33485 * catches all aliases.
33486@@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33487 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33488 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33489 pgprot_val(forbidden) |= _PAGE_RW;
33490+#endif
33491
33492 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33493 /*
33494@@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33495 }
33496 #endif
33497
33498+#ifdef CONFIG_PAX_KERNEXEC
33499+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33500+ pgprot_val(forbidden) |= _PAGE_RW;
33501+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33502+ }
33503+#endif
33504+
33505 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33506
33507 return prot;
33508@@ -420,23 +429,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33509 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33510 {
33511 /* change init_mm */
33512+ pax_open_kernel();
33513 set_pte_atomic(kpte, pte);
33514+
33515 #ifdef CONFIG_X86_32
33516 if (!SHARED_KERNEL_PMD) {
33517+
33518+#ifdef CONFIG_PAX_PER_CPU_PGD
33519+ unsigned long cpu;
33520+#else
33521 struct page *page;
33522+#endif
33523
33524+#ifdef CONFIG_PAX_PER_CPU_PGD
33525+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33526+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33527+#else
33528 list_for_each_entry(page, &pgd_list, lru) {
33529- pgd_t *pgd;
33530+ pgd_t *pgd = (pgd_t *)page_address(page);
33531+#endif
33532+
33533 pud_t *pud;
33534 pmd_t *pmd;
33535
33536- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33537+ pgd += pgd_index(address);
33538 pud = pud_offset(pgd, address);
33539 pmd = pmd_offset(pud, address);
33540 set_pte_atomic((pte_t *)pmd, pte);
33541 }
33542 }
33543 #endif
33544+ pax_close_kernel();
33545 }
33546
33547 static int
33548diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33549index 6574388..87e9bef 100644
33550--- a/arch/x86/mm/pat.c
33551+++ b/arch/x86/mm/pat.c
33552@@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
33553
33554 if (!entry) {
33555 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33556- current->comm, current->pid, start, end - 1);
33557+ current->comm, task_pid_nr(current), start, end - 1);
33558 return -EINVAL;
33559 }
33560
33561@@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33562
33563 while (cursor < to) {
33564 if (!devmem_is_allowed(pfn)) {
33565- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33566- current->comm, from, to - 1);
33567+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33568+ current->comm, from, to - 1, cursor);
33569 return 0;
33570 }
33571 cursor += PAGE_SIZE;
33572@@ -577,7 +577,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
33573 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
33574 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33575 "for [mem %#010Lx-%#010Lx]\n",
33576- current->comm, current->pid,
33577+ current->comm, task_pid_nr(current),
33578 cattr_name(flags),
33579 base, (unsigned long long)(base + size-1));
33580 return -EINVAL;
33581@@ -612,7 +612,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33582 flags = lookup_memtype(paddr);
33583 if (want_flags != flags) {
33584 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33585- current->comm, current->pid,
33586+ current->comm, task_pid_nr(current),
33587 cattr_name(want_flags),
33588 (unsigned long long)paddr,
33589 (unsigned long long)(paddr + size - 1),
33590@@ -634,7 +634,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33591 free_memtype(paddr, paddr + size);
33592 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33593 " for [mem %#010Lx-%#010Lx], got %s\n",
33594- current->comm, current->pid,
33595+ current->comm, task_pid_nr(current),
33596 cattr_name(want_flags),
33597 (unsigned long long)paddr,
33598 (unsigned long long)(paddr + size - 1),
33599diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33600index 415f6c4..d319983 100644
33601--- a/arch/x86/mm/pat_rbtree.c
33602+++ b/arch/x86/mm/pat_rbtree.c
33603@@ -160,7 +160,7 @@ success:
33604
33605 failure:
33606 printk(KERN_INFO "%s:%d conflicting memory types "
33607- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33608+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33609 end, cattr_name(found_type), cattr_name(match->type));
33610 return -EBUSY;
33611 }
33612diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33613index 9f0614d..92ae64a 100644
33614--- a/arch/x86/mm/pf_in.c
33615+++ b/arch/x86/mm/pf_in.c
33616@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33617 int i;
33618 enum reason_type rv = OTHERS;
33619
33620- p = (unsigned char *)ins_addr;
33621+ p = (unsigned char *)ktla_ktva(ins_addr);
33622 p += skip_prefix(p, &prf);
33623 p += get_opcode(p, &opcode);
33624
33625@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33626 struct prefix_bits prf;
33627 int i;
33628
33629- p = (unsigned char *)ins_addr;
33630+ p = (unsigned char *)ktla_ktva(ins_addr);
33631 p += skip_prefix(p, &prf);
33632 p += get_opcode(p, &opcode);
33633
33634@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33635 struct prefix_bits prf;
33636 int i;
33637
33638- p = (unsigned char *)ins_addr;
33639+ p = (unsigned char *)ktla_ktva(ins_addr);
33640 p += skip_prefix(p, &prf);
33641 p += get_opcode(p, &opcode);
33642
33643@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33644 struct prefix_bits prf;
33645 int i;
33646
33647- p = (unsigned char *)ins_addr;
33648+ p = (unsigned char *)ktla_ktva(ins_addr);
33649 p += skip_prefix(p, &prf);
33650 p += get_opcode(p, &opcode);
33651 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33652@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33653 struct prefix_bits prf;
33654 int i;
33655
33656- p = (unsigned char *)ins_addr;
33657+ p = (unsigned char *)ktla_ktva(ins_addr);
33658 p += skip_prefix(p, &prf);
33659 p += get_opcode(p, &opcode);
33660 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33661diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33662index 6fb6927..4fc13c0 100644
33663--- a/arch/x86/mm/pgtable.c
33664+++ b/arch/x86/mm/pgtable.c
33665@@ -97,10 +97,71 @@ static inline void pgd_list_del(pgd_t *pgd)
33666 list_del(&page->lru);
33667 }
33668
33669-#define UNSHARED_PTRS_PER_PGD \
33670- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33671+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33672+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33673
33674+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33675+{
33676+ unsigned int count = USER_PGD_PTRS;
33677
33678+ if (!pax_user_shadow_base)
33679+ return;
33680+
33681+ while (count--)
33682+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33683+}
33684+#endif
33685+
33686+#ifdef CONFIG_PAX_PER_CPU_PGD
33687+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33688+{
33689+ unsigned int count = USER_PGD_PTRS;
33690+
33691+ while (count--) {
33692+ pgd_t pgd;
33693+
33694+#ifdef CONFIG_X86_64
33695+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33696+#else
33697+ pgd = *src++;
33698+#endif
33699+
33700+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33701+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33702+#endif
33703+
33704+ *dst++ = pgd;
33705+ }
33706+
33707+}
33708+#endif
33709+
33710+#ifdef CONFIG_X86_64
33711+#define pxd_t pud_t
33712+#define pyd_t pgd_t
33713+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33714+#define pgtable_pxd_page_ctor(page) true
33715+#define pgtable_pxd_page_dtor(page)
33716+#define pxd_free(mm, pud) pud_free((mm), (pud))
33717+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33718+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33719+#define PYD_SIZE PGDIR_SIZE
33720+#else
33721+#define pxd_t pmd_t
33722+#define pyd_t pud_t
33723+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33724+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33725+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33726+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33727+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33728+#define pyd_offset(mm, address) pud_offset((mm), (address))
33729+#define PYD_SIZE PUD_SIZE
33730+#endif
33731+
33732+#ifdef CONFIG_PAX_PER_CPU_PGD
33733+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33734+static inline void pgd_dtor(pgd_t *pgd) {}
33735+#else
33736 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33737 {
33738 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33739@@ -141,6 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
33740 pgd_list_del(pgd);
33741 spin_unlock(&pgd_lock);
33742 }
33743+#endif
33744
33745 /*
33746 * List of all pgd's needed for non-PAE so it can invalidate entries
33747@@ -153,7 +215,7 @@ static void pgd_dtor(pgd_t *pgd)
33748 * -- nyc
33749 */
33750
33751-#ifdef CONFIG_X86_PAE
33752+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33753 /*
33754 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33755 * updating the top-level pagetable entries to guarantee the
33756@@ -165,7 +227,7 @@ static void pgd_dtor(pgd_t *pgd)
33757 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33758 * and initialize the kernel pmds here.
33759 */
33760-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33761+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33762
33763 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33764 {
33765@@ -183,43 +245,45 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33766 */
33767 flush_tlb_mm(mm);
33768 }
33769+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33770+#define PREALLOCATED_PXDS USER_PGD_PTRS
33771 #else /* !CONFIG_X86_PAE */
33772
33773 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33774-#define PREALLOCATED_PMDS 0
33775+#define PREALLOCATED_PXDS 0
33776
33777 #endif /* CONFIG_X86_PAE */
33778
33779-static void free_pmds(pmd_t *pmds[])
33780+static void free_pxds(pxd_t *pxds[])
33781 {
33782 int i;
33783
33784- for(i = 0; i < PREALLOCATED_PMDS; i++)
33785- if (pmds[i]) {
33786- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33787- free_page((unsigned long)pmds[i]);
33788+ for(i = 0; i < PREALLOCATED_PXDS; i++)
33789+ if (pxds[i]) {
33790+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33791+ free_page((unsigned long)pxds[i]);
33792 }
33793 }
33794
33795-static int preallocate_pmds(pmd_t *pmds[])
33796+static int preallocate_pxds(pxd_t *pxds[])
33797 {
33798 int i;
33799 bool failed = false;
33800
33801- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33802- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33803- if (!pmd)
33804+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33805+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33806+ if (!pxd)
33807 failed = true;
33808- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33809- free_page((unsigned long)pmd);
33810- pmd = NULL;
33811+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33812+ free_page((unsigned long)pxd);
33813+ pxd = NULL;
33814 failed = true;
33815 }
33816- pmds[i] = pmd;
33817+ pxds[i] = pxd;
33818 }
33819
33820 if (failed) {
33821- free_pmds(pmds);
33822+ free_pxds(pxds);
33823 return -ENOMEM;
33824 }
33825
33826@@ -232,49 +296,52 @@ static int preallocate_pmds(pmd_t *pmds[])
33827 * preallocate which never got a corresponding vma will need to be
33828 * freed manually.
33829 */
33830-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33831+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33832 {
33833 int i;
33834
33835- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33836+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33837 pgd_t pgd = pgdp[i];
33838
33839 if (pgd_val(pgd) != 0) {
33840- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33841+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33842
33843- pgdp[i] = native_make_pgd(0);
33844+ set_pgd(pgdp + i, native_make_pgd(0));
33845
33846- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33847- pmd_free(mm, pmd);
33848+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33849+ pxd_free(mm, pxd);
33850 }
33851 }
33852 }
33853
33854-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33855+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33856 {
33857- pud_t *pud;
33858+ pyd_t *pyd;
33859 int i;
33860
33861- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33862+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33863 return;
33864
33865- pud = pud_offset(pgd, 0);
33866-
33867- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33868- pmd_t *pmd = pmds[i];
33869+#ifdef CONFIG_X86_64
33870+ pyd = pyd_offset(mm, 0L);
33871+#else
33872+ pyd = pyd_offset(pgd, 0L);
33873+#endif
33874
33875+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33876+ pxd_t *pxd = pxds[i];
33877 if (i >= KERNEL_PGD_BOUNDARY)
33878- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33879- sizeof(pmd_t) * PTRS_PER_PMD);
33880+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33881+ sizeof(pxd_t) * PTRS_PER_PMD);
33882
33883- pud_populate(mm, pud, pmd);
33884+ pyd_populate(mm, pyd, pxd);
33885 }
33886 }
33887
33888 pgd_t *pgd_alloc(struct mm_struct *mm)
33889 {
33890 pgd_t *pgd;
33891- pmd_t *pmds[PREALLOCATED_PMDS];
33892+ pxd_t *pxds[PREALLOCATED_PXDS];
33893
33894 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
33895
33896@@ -283,11 +350,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33897
33898 mm->pgd = pgd;
33899
33900- if (preallocate_pmds(pmds) != 0)
33901+ if (preallocate_pxds(pxds) != 0)
33902 goto out_free_pgd;
33903
33904 if (paravirt_pgd_alloc(mm) != 0)
33905- goto out_free_pmds;
33906+ goto out_free_pxds;
33907
33908 /*
33909 * Make sure that pre-populating the pmds is atomic with
33910@@ -297,14 +364,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33911 spin_lock(&pgd_lock);
33912
33913 pgd_ctor(mm, pgd);
33914- pgd_prepopulate_pmd(mm, pgd, pmds);
33915+ pgd_prepopulate_pxd(mm, pgd, pxds);
33916
33917 spin_unlock(&pgd_lock);
33918
33919 return pgd;
33920
33921-out_free_pmds:
33922- free_pmds(pmds);
33923+out_free_pxds:
33924+ free_pxds(pxds);
33925 out_free_pgd:
33926 free_page((unsigned long)pgd);
33927 out:
33928@@ -313,7 +380,7 @@ out:
33929
33930 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
33931 {
33932- pgd_mop_up_pmds(mm, pgd);
33933+ pgd_mop_up_pxds(mm, pgd);
33934 pgd_dtor(pgd);
33935 paravirt_pgd_free(mm, pgd);
33936 free_page((unsigned long)pgd);
33937diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
33938index 75cc097..79a097f 100644
33939--- a/arch/x86/mm/pgtable_32.c
33940+++ b/arch/x86/mm/pgtable_32.c
33941@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
33942 return;
33943 }
33944 pte = pte_offset_kernel(pmd, vaddr);
33945+
33946+ pax_open_kernel();
33947 if (pte_val(pteval))
33948 set_pte_at(&init_mm, vaddr, pte, pteval);
33949 else
33950 pte_clear(&init_mm, vaddr, pte);
33951+ pax_close_kernel();
33952
33953 /*
33954 * It's enough to flush this one mapping.
33955diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
33956index e666cbb..61788c45 100644
33957--- a/arch/x86/mm/physaddr.c
33958+++ b/arch/x86/mm/physaddr.c
33959@@ -10,7 +10,7 @@
33960 #ifdef CONFIG_X86_64
33961
33962 #ifdef CONFIG_DEBUG_VIRTUAL
33963-unsigned long __phys_addr(unsigned long x)
33964+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33965 {
33966 unsigned long y = x - __START_KERNEL_map;
33967
33968@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
33969 #else
33970
33971 #ifdef CONFIG_DEBUG_VIRTUAL
33972-unsigned long __phys_addr(unsigned long x)
33973+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
33974 {
33975 unsigned long phys_addr = x - PAGE_OFFSET;
33976 /* VMALLOC_* aren't constants */
33977diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
33978index 90555bf..f5f1828 100644
33979--- a/arch/x86/mm/setup_nx.c
33980+++ b/arch/x86/mm/setup_nx.c
33981@@ -5,8 +5,10 @@
33982 #include <asm/pgtable.h>
33983 #include <asm/proto.h>
33984
33985+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
33986 static int disable_nx;
33987
33988+#ifndef CONFIG_PAX_PAGEEXEC
33989 /*
33990 * noexec = on|off
33991 *
33992@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
33993 return 0;
33994 }
33995 early_param("noexec", noexec_setup);
33996+#endif
33997+
33998+#endif
33999
34000 void x86_configure_nx(void)
34001 {
34002+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34003 if (cpu_has_nx && !disable_nx)
34004 __supported_pte_mask |= _PAGE_NX;
34005 else
34006+#endif
34007 __supported_pte_mask &= ~_PAGE_NX;
34008 }
34009
34010diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34011index ee61c36..e6fedeb 100644
34012--- a/arch/x86/mm/tlb.c
34013+++ b/arch/x86/mm/tlb.c
34014@@ -48,7 +48,11 @@ void leave_mm(int cpu)
34015 BUG();
34016 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34017 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34018+
34019+#ifndef CONFIG_PAX_PER_CPU_PGD
34020 load_cr3(swapper_pg_dir);
34021+#endif
34022+
34023 /*
34024 * This gets called in the idle path where RCU
34025 * functions differently. Tracing normally
34026diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34027new file mode 100644
34028index 0000000..dace51c
34029--- /dev/null
34030+++ b/arch/x86/mm/uderef_64.c
34031@@ -0,0 +1,37 @@
34032+#include <linux/mm.h>
34033+#include <asm/pgtable.h>
34034+#include <asm/uaccess.h>
34035+
34036+#ifdef CONFIG_PAX_MEMORY_UDEREF
34037+/* PaX: due to the special call convention these functions must
34038+ * - remain leaf functions under all configurations,
34039+ * - never be called directly, only dereferenced from the wrappers.
34040+ */
34041+void __pax_open_userland(void)
34042+{
34043+ unsigned int cpu;
34044+
34045+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34046+ return;
34047+
34048+ cpu = raw_get_cpu();
34049+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34050+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34051+ raw_put_cpu_no_resched();
34052+}
34053+EXPORT_SYMBOL(__pax_open_userland);
34054+
34055+void __pax_close_userland(void)
34056+{
34057+ unsigned int cpu;
34058+
34059+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34060+ return;
34061+
34062+ cpu = raw_get_cpu();
34063+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34064+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34065+ raw_put_cpu_no_resched();
34066+}
34067+EXPORT_SYMBOL(__pax_close_userland);
34068+#endif
34069diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34070index 6440221..f84b5c7 100644
34071--- a/arch/x86/net/bpf_jit.S
34072+++ b/arch/x86/net/bpf_jit.S
34073@@ -9,6 +9,7 @@
34074 */
34075 #include <linux/linkage.h>
34076 #include <asm/dwarf2.h>
34077+#include <asm/alternative-asm.h>
34078
34079 /*
34080 * Calling convention :
34081@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34082 jle bpf_slow_path_word
34083 mov (SKBDATA,%rsi),%eax
34084 bswap %eax /* ntohl() */
34085+ pax_force_retaddr
34086 ret
34087
34088 sk_load_half:
34089@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34090 jle bpf_slow_path_half
34091 movzwl (SKBDATA,%rsi),%eax
34092 rol $8,%ax # ntohs()
34093+ pax_force_retaddr
34094 ret
34095
34096 sk_load_byte:
34097@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34098 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34099 jle bpf_slow_path_byte
34100 movzbl (SKBDATA,%rsi),%eax
34101+ pax_force_retaddr
34102 ret
34103
34104 /* rsi contains offset and can be scratched */
34105@@ -90,6 +94,7 @@ bpf_slow_path_word:
34106 js bpf_error
34107 mov - MAX_BPF_STACK + 32(%rbp),%eax
34108 bswap %eax
34109+ pax_force_retaddr
34110 ret
34111
34112 bpf_slow_path_half:
34113@@ -98,12 +103,14 @@ bpf_slow_path_half:
34114 mov - MAX_BPF_STACK + 32(%rbp),%ax
34115 rol $8,%ax
34116 movzwl %ax,%eax
34117+ pax_force_retaddr
34118 ret
34119
34120 bpf_slow_path_byte:
34121 bpf_slow_path_common(1)
34122 js bpf_error
34123 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34124+ pax_force_retaddr
34125 ret
34126
34127 #define sk_negative_common(SIZE) \
34128@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34129 sk_negative_common(4)
34130 mov (%rax), %eax
34131 bswap %eax
34132+ pax_force_retaddr
34133 ret
34134
34135 bpf_slow_path_half_neg:
34136@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34137 mov (%rax),%ax
34138 rol $8,%ax
34139 movzwl %ax,%eax
34140+ pax_force_retaddr
34141 ret
34142
34143 bpf_slow_path_byte_neg:
34144@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34145 .globl sk_load_byte_negative_offset
34146 sk_negative_common(1)
34147 movzbl (%rax), %eax
34148+ pax_force_retaddr
34149 ret
34150
34151 bpf_error:
34152@@ -156,4 +166,5 @@ bpf_error:
34153 mov - MAX_BPF_STACK + 16(%rbp),%r14
34154 mov - MAX_BPF_STACK + 24(%rbp),%r15
34155 leaveq
34156+ pax_force_retaddr
34157 ret
34158diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34159index 3f62734..097bf93 100644
34160--- a/arch/x86/net/bpf_jit_comp.c
34161+++ b/arch/x86/net/bpf_jit_comp.c
34162@@ -13,7 +13,11 @@
34163 #include <linux/if_vlan.h>
34164 #include <asm/cacheflush.h>
34165
34166+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34167+int bpf_jit_enable __read_only;
34168+#else
34169 int bpf_jit_enable __read_mostly;
34170+#endif
34171
34172 /*
34173 * assembly code in arch/x86/net/bpf_jit.S
34174@@ -174,7 +178,9 @@ static inline u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34175 static void jit_fill_hole(void *area, unsigned int size)
34176 {
34177 /* fill whole space with int3 instructions */
34178+ pax_open_kernel();
34179 memset(area, 0xcc, size);
34180+ pax_close_kernel();
34181 }
34182
34183 struct jit_context {
34184@@ -894,7 +900,9 @@ common_load:
34185 pr_err("bpf_jit_compile fatal error\n");
34186 return -EFAULT;
34187 }
34188+ pax_open_kernel();
34189 memcpy(image + proglen, temp, ilen);
34190+ pax_close_kernel();
34191 }
34192 proglen += ilen;
34193 addrs[i] = proglen;
34194@@ -966,7 +974,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34195
34196 if (image) {
34197 bpf_flush_icache(header, image + proglen);
34198- set_memory_ro((unsigned long)header, header->pages);
34199 prog->bpf_func = (void *)image;
34200 prog->jited = true;
34201 }
34202@@ -982,7 +989,6 @@ void bpf_jit_free(struct bpf_prog *fp)
34203 if (!fp->jited)
34204 goto free_filter;
34205
34206- set_memory_rw(addr, header->pages);
34207 bpf_jit_binary_free(header);
34208
34209 free_filter:
34210diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34211index 5d04be5..2beeaa2 100644
34212--- a/arch/x86/oprofile/backtrace.c
34213+++ b/arch/x86/oprofile/backtrace.c
34214@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34215 struct stack_frame_ia32 *fp;
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- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34224+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34225
34226 oprofile_add_trace(bufhead[0].return_address);
34227
34228@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34229 struct stack_frame bufhead[2];
34230 unsigned long bytes;
34231
34232- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34233+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34234 if (bytes != 0)
34235 return NULL;
34236
34237@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34238 {
34239 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34240
34241- if (!user_mode_vm(regs)) {
34242+ if (!user_mode(regs)) {
34243 unsigned long stack = kernel_stack_pointer(regs);
34244 if (depth)
34245 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34246diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34247index 1d2e639..f6ef82a 100644
34248--- a/arch/x86/oprofile/nmi_int.c
34249+++ b/arch/x86/oprofile/nmi_int.c
34250@@ -23,6 +23,7 @@
34251 #include <asm/nmi.h>
34252 #include <asm/msr.h>
34253 #include <asm/apic.h>
34254+#include <asm/pgtable.h>
34255
34256 #include "op_counter.h"
34257 #include "op_x86_model.h"
34258@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34259 if (ret)
34260 return ret;
34261
34262- if (!model->num_virt_counters)
34263- model->num_virt_counters = model->num_counters;
34264+ if (!model->num_virt_counters) {
34265+ pax_open_kernel();
34266+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34267+ pax_close_kernel();
34268+ }
34269
34270 mux_init(ops);
34271
34272diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34273index 50d86c0..7985318 100644
34274--- a/arch/x86/oprofile/op_model_amd.c
34275+++ b/arch/x86/oprofile/op_model_amd.c
34276@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34277 num_counters = AMD64_NUM_COUNTERS;
34278 }
34279
34280- op_amd_spec.num_counters = num_counters;
34281- op_amd_spec.num_controls = num_counters;
34282- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34283+ pax_open_kernel();
34284+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34285+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34286+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34287+ pax_close_kernel();
34288
34289 return 0;
34290 }
34291diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34292index d90528e..0127e2b 100644
34293--- a/arch/x86/oprofile/op_model_ppro.c
34294+++ b/arch/x86/oprofile/op_model_ppro.c
34295@@ -19,6 +19,7 @@
34296 #include <asm/msr.h>
34297 #include <asm/apic.h>
34298 #include <asm/nmi.h>
34299+#include <asm/pgtable.h>
34300
34301 #include "op_x86_model.h"
34302 #include "op_counter.h"
34303@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34304
34305 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34306
34307- op_arch_perfmon_spec.num_counters = num_counters;
34308- op_arch_perfmon_spec.num_controls = num_counters;
34309+ pax_open_kernel();
34310+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34311+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34312+ pax_close_kernel();
34313 }
34314
34315 static int arch_perfmon_init(struct oprofile_operations *ignore)
34316diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34317index 71e8a67..6a313bb 100644
34318--- a/arch/x86/oprofile/op_x86_model.h
34319+++ b/arch/x86/oprofile/op_x86_model.h
34320@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34321 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34322 struct op_msrs const * const msrs);
34323 #endif
34324-};
34325+} __do_const;
34326
34327 struct op_counter_config;
34328
34329diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34330index b9958c3..24229ab 100644
34331--- a/arch/x86/pci/intel_mid_pci.c
34332+++ b/arch/x86/pci/intel_mid_pci.c
34333@@ -250,7 +250,7 @@ int __init intel_mid_pci_init(void)
34334 pci_mmcfg_late_init();
34335 pcibios_enable_irq = intel_mid_pci_irq_enable;
34336 pcibios_disable_irq = intel_mid_pci_irq_disable;
34337- pci_root_ops = intel_mid_pci_ops;
34338+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34339 pci_soc_mode = 1;
34340 /* Continue with standard init */
34341 return 1;
34342diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34343index eb500c2..eab9e70 100644
34344--- a/arch/x86/pci/irq.c
34345+++ b/arch/x86/pci/irq.c
34346@@ -51,7 +51,7 @@ struct irq_router {
34347 struct irq_router_handler {
34348 u16 vendor;
34349 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34350-};
34351+} __do_const;
34352
34353 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34354 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34355@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34356 return 0;
34357 }
34358
34359-static __initdata struct irq_router_handler pirq_routers[] = {
34360+static __initconst const struct irq_router_handler pirq_routers[] = {
34361 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34362 { PCI_VENDOR_ID_AL, ali_router_probe },
34363 { PCI_VENDOR_ID_ITE, ite_router_probe },
34364@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34365 static void __init pirq_find_router(struct irq_router *r)
34366 {
34367 struct irq_routing_table *rt = pirq_table;
34368- struct irq_router_handler *h;
34369+ const struct irq_router_handler *h;
34370
34371 #ifdef CONFIG_PCI_BIOS
34372 if (!rt->signature) {
34373@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34374 return 0;
34375 }
34376
34377-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34378+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34379 {
34380 .callback = fix_broken_hp_bios_irq9,
34381 .ident = "HP Pavilion N5400 Series Laptop",
34382diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34383index 9b83b90..4112152 100644
34384--- a/arch/x86/pci/pcbios.c
34385+++ b/arch/x86/pci/pcbios.c
34386@@ -79,7 +79,7 @@ union bios32 {
34387 static struct {
34388 unsigned long address;
34389 unsigned short segment;
34390-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34391+} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34392
34393 /*
34394 * Returns the entry point for the given service, NULL on error
34395@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34396 unsigned long length; /* %ecx */
34397 unsigned long entry; /* %edx */
34398 unsigned long flags;
34399+ struct desc_struct d, *gdt;
34400
34401 local_irq_save(flags);
34402- __asm__("lcall *(%%edi); cld"
34403+
34404+ gdt = get_cpu_gdt_table(smp_processor_id());
34405+
34406+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34407+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34408+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34409+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34410+
34411+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34412 : "=a" (return_code),
34413 "=b" (address),
34414 "=c" (length),
34415 "=d" (entry)
34416 : "0" (service),
34417 "1" (0),
34418- "D" (&bios32_indirect));
34419+ "D" (&bios32_indirect),
34420+ "r"(__PCIBIOS_DS)
34421+ : "memory");
34422+
34423+ pax_open_kernel();
34424+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34425+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34426+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34427+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34428+ pax_close_kernel();
34429+
34430 local_irq_restore(flags);
34431
34432 switch (return_code) {
34433- case 0:
34434- return address + entry;
34435- case 0x80: /* Not present */
34436- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34437- return 0;
34438- default: /* Shouldn't happen */
34439- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34440- service, return_code);
34441+ case 0: {
34442+ int cpu;
34443+ unsigned char flags;
34444+
34445+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34446+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34447+ printk(KERN_WARNING "bios32_service: not valid\n");
34448 return 0;
34449+ }
34450+ address = address + PAGE_OFFSET;
34451+ length += 16UL; /* some BIOSs underreport this... */
34452+ flags = 4;
34453+ if (length >= 64*1024*1024) {
34454+ length >>= PAGE_SHIFT;
34455+ flags |= 8;
34456+ }
34457+
34458+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34459+ gdt = get_cpu_gdt_table(cpu);
34460+ pack_descriptor(&d, address, length, 0x9b, flags);
34461+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34462+ pack_descriptor(&d, address, length, 0x93, flags);
34463+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34464+ }
34465+ return entry;
34466+ }
34467+ case 0x80: /* Not present */
34468+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34469+ return 0;
34470+ default: /* Shouldn't happen */
34471+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34472+ service, return_code);
34473+ return 0;
34474 }
34475 }
34476
34477 static struct {
34478 unsigned long address;
34479 unsigned short segment;
34480-} pci_indirect = { 0, __KERNEL_CS };
34481+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34482
34483-static int pci_bios_present;
34484+static int pci_bios_present __read_only;
34485
34486 static int __init check_pcibios(void)
34487 {
34488@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34489 unsigned long flags, pcibios_entry;
34490
34491 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34492- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34493+ pci_indirect.address = pcibios_entry;
34494
34495 local_irq_save(flags);
34496- __asm__(
34497- "lcall *(%%edi); cld\n\t"
34498+ __asm__("movw %w6, %%ds\n\t"
34499+ "lcall *%%ss:(%%edi); cld\n\t"
34500+ "push %%ss\n\t"
34501+ "pop %%ds\n\t"
34502 "jc 1f\n\t"
34503 "xor %%ah, %%ah\n"
34504 "1:"
34505@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34506 "=b" (ebx),
34507 "=c" (ecx)
34508 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34509- "D" (&pci_indirect)
34510+ "D" (&pci_indirect),
34511+ "r" (__PCIBIOS_DS)
34512 : "memory");
34513 local_irq_restore(flags);
34514
34515@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34516
34517 switch (len) {
34518 case 1:
34519- __asm__("lcall *(%%esi); cld\n\t"
34520+ __asm__("movw %w6, %%ds\n\t"
34521+ "lcall *%%ss:(%%esi); cld\n\t"
34522+ "push %%ss\n\t"
34523+ "pop %%ds\n\t"
34524 "jc 1f\n\t"
34525 "xor %%ah, %%ah\n"
34526 "1:"
34527@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34528 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34529 "b" (bx),
34530 "D" ((long)reg),
34531- "S" (&pci_indirect));
34532+ "S" (&pci_indirect),
34533+ "r" (__PCIBIOS_DS));
34534 /*
34535 * Zero-extend the result beyond 8 bits, do not trust the
34536 * BIOS having done it:
34537@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34538 *value &= 0xff;
34539 break;
34540 case 2:
34541- __asm__("lcall *(%%esi); cld\n\t"
34542+ __asm__("movw %w6, %%ds\n\t"
34543+ "lcall *%%ss:(%%esi); cld\n\t"
34544+ "push %%ss\n\t"
34545+ "pop %%ds\n\t"
34546 "jc 1f\n\t"
34547 "xor %%ah, %%ah\n"
34548 "1:"
34549@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34550 : "1" (PCIBIOS_READ_CONFIG_WORD),
34551 "b" (bx),
34552 "D" ((long)reg),
34553- "S" (&pci_indirect));
34554+ "S" (&pci_indirect),
34555+ "r" (__PCIBIOS_DS));
34556 /*
34557 * Zero-extend the result beyond 16 bits, do not trust the
34558 * BIOS having done it:
34559@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34560 *value &= 0xffff;
34561 break;
34562 case 4:
34563- __asm__("lcall *(%%esi); cld\n\t"
34564+ __asm__("movw %w6, %%ds\n\t"
34565+ "lcall *%%ss:(%%esi); cld\n\t"
34566+ "push %%ss\n\t"
34567+ "pop %%ds\n\t"
34568 "jc 1f\n\t"
34569 "xor %%ah, %%ah\n"
34570 "1:"
34571@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34572 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34573 "b" (bx),
34574 "D" ((long)reg),
34575- "S" (&pci_indirect));
34576+ "S" (&pci_indirect),
34577+ "r" (__PCIBIOS_DS));
34578 break;
34579 }
34580
34581@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34582
34583 switch (len) {
34584 case 1:
34585- __asm__("lcall *(%%esi); cld\n\t"
34586+ __asm__("movw %w6, %%ds\n\t"
34587+ "lcall *%%ss:(%%esi); cld\n\t"
34588+ "push %%ss\n\t"
34589+ "pop %%ds\n\t"
34590 "jc 1f\n\t"
34591 "xor %%ah, %%ah\n"
34592 "1:"
34593@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34594 "c" (value),
34595 "b" (bx),
34596 "D" ((long)reg),
34597- "S" (&pci_indirect));
34598+ "S" (&pci_indirect),
34599+ "r" (__PCIBIOS_DS));
34600 break;
34601 case 2:
34602- __asm__("lcall *(%%esi); cld\n\t"
34603+ __asm__("movw %w6, %%ds\n\t"
34604+ "lcall *%%ss:(%%esi); cld\n\t"
34605+ "push %%ss\n\t"
34606+ "pop %%ds\n\t"
34607 "jc 1f\n\t"
34608 "xor %%ah, %%ah\n"
34609 "1:"
34610@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34611 "c" (value),
34612 "b" (bx),
34613 "D" ((long)reg),
34614- "S" (&pci_indirect));
34615+ "S" (&pci_indirect),
34616+ "r" (__PCIBIOS_DS));
34617 break;
34618 case 4:
34619- __asm__("lcall *(%%esi); cld\n\t"
34620+ __asm__("movw %w6, %%ds\n\t"
34621+ "lcall *%%ss:(%%esi); cld\n\t"
34622+ "push %%ss\n\t"
34623+ "pop %%ds\n\t"
34624 "jc 1f\n\t"
34625 "xor %%ah, %%ah\n"
34626 "1:"
34627@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34628 "c" (value),
34629 "b" (bx),
34630 "D" ((long)reg),
34631- "S" (&pci_indirect));
34632+ "S" (&pci_indirect),
34633+ "r" (__PCIBIOS_DS));
34634 break;
34635 }
34636
34637@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34638
34639 DBG("PCI: Fetching IRQ routing table... ");
34640 __asm__("push %%es\n\t"
34641+ "movw %w8, %%ds\n\t"
34642 "push %%ds\n\t"
34643 "pop %%es\n\t"
34644- "lcall *(%%esi); cld\n\t"
34645+ "lcall *%%ss:(%%esi); cld\n\t"
34646 "pop %%es\n\t"
34647+ "push %%ss\n\t"
34648+ "pop %%ds\n"
34649 "jc 1f\n\t"
34650 "xor %%ah, %%ah\n"
34651 "1:"
34652@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34653 "1" (0),
34654 "D" ((long) &opt),
34655 "S" (&pci_indirect),
34656- "m" (opt)
34657+ "m" (opt),
34658+ "r" (__PCIBIOS_DS)
34659 : "memory");
34660 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34661 if (ret & 0xff00)
34662@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34663 {
34664 int ret;
34665
34666- __asm__("lcall *(%%esi); cld\n\t"
34667+ __asm__("movw %w5, %%ds\n\t"
34668+ "lcall *%%ss:(%%esi); cld\n\t"
34669+ "push %%ss\n\t"
34670+ "pop %%ds\n"
34671 "jc 1f\n\t"
34672 "xor %%ah, %%ah\n"
34673 "1:"
34674@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34675 : "0" (PCIBIOS_SET_PCI_HW_INT),
34676 "b" ((dev->bus->number << 8) | dev->devfn),
34677 "c" ((irq << 8) | (pin + 10)),
34678- "S" (&pci_indirect));
34679+ "S" (&pci_indirect),
34680+ "r" (__PCIBIOS_DS));
34681 return !(ret & 0xff00);
34682 }
34683 EXPORT_SYMBOL(pcibios_set_irq_routing);
34684diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34685index 40e7cda..c7e6672 100644
34686--- a/arch/x86/platform/efi/efi_32.c
34687+++ b/arch/x86/platform/efi/efi_32.c
34688@@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
34689 {
34690 struct desc_ptr gdt_descr;
34691
34692+#ifdef CONFIG_PAX_KERNEXEC
34693+ struct desc_struct d;
34694+#endif
34695+
34696 local_irq_save(efi_rt_eflags);
34697
34698 load_cr3(initial_page_table);
34699 __flush_tlb_all();
34700
34701+#ifdef CONFIG_PAX_KERNEXEC
34702+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34703+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34704+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34705+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34706+#endif
34707+
34708 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34709 gdt_descr.size = GDT_SIZE - 1;
34710 load_gdt(&gdt_descr);
34711@@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
34712 {
34713 struct desc_ptr gdt_descr;
34714
34715+#ifdef CONFIG_PAX_KERNEXEC
34716+ struct desc_struct d;
34717+
34718+ memset(&d, 0, sizeof d);
34719+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34720+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34721+#endif
34722+
34723 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34724 gdt_descr.size = GDT_SIZE - 1;
34725 load_gdt(&gdt_descr);
34726
34727+#ifdef CONFIG_PAX_PER_CPU_PGD
34728+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34729+#else
34730 load_cr3(swapper_pg_dir);
34731+#endif
34732+
34733 __flush_tlb_all();
34734
34735 local_irq_restore(efi_rt_eflags);
34736diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34737index 35aecb6..46177db 100644
34738--- a/arch/x86/platform/efi/efi_64.c
34739+++ b/arch/x86/platform/efi/efi_64.c
34740@@ -99,6 +99,11 @@ void __init efi_call_phys_prolog(void)
34741 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34742 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34743 }
34744+
34745+#ifdef CONFIG_PAX_PER_CPU_PGD
34746+ load_cr3(swapper_pg_dir);
34747+#endif
34748+
34749 __flush_tlb_all();
34750 }
34751
34752@@ -116,6 +121,11 @@ void __init efi_call_phys_epilog(void)
34753 for (pgd = 0; pgd < n_pgds; pgd++)
34754 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34755 kfree(save_pgd);
34756+
34757+#ifdef CONFIG_PAX_PER_CPU_PGD
34758+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34759+#endif
34760+
34761 __flush_tlb_all();
34762 local_irq_restore(efi_flags);
34763 early_code_mapping_set_exec(0);
34764@@ -146,8 +156,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34765 unsigned npages;
34766 pgd_t *pgd;
34767
34768- if (efi_enabled(EFI_OLD_MEMMAP))
34769+ if (efi_enabled(EFI_OLD_MEMMAP)) {
34770+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34771+ * able to execute the EFI services.
34772+ */
34773+ if (__supported_pte_mask & _PAGE_NX) {
34774+ unsigned long addr = (unsigned long) __va(0);
34775+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34776+
34777+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34778+#ifdef CONFIG_PAX_PER_CPU_PGD
34779+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34780+#endif
34781+ set_pgd(pgd_offset_k(addr), pe);
34782+ }
34783+
34784 return 0;
34785+ }
34786
34787 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34788 pgd = __va(efi_scratch.efi_pgt);
34789diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34790index 040192b..7d3300f 100644
34791--- a/arch/x86/platform/efi/efi_stub_32.S
34792+++ b/arch/x86/platform/efi/efi_stub_32.S
34793@@ -6,7 +6,9 @@
34794 */
34795
34796 #include <linux/linkage.h>
34797+#include <linux/init.h>
34798 #include <asm/page_types.h>
34799+#include <asm/segment.h>
34800
34801 /*
34802 * efi_call_phys(void *, ...) is a function with variable parameters.
34803@@ -20,7 +22,7 @@
34804 * service functions will comply with gcc calling convention, too.
34805 */
34806
34807-.text
34808+__INIT
34809 ENTRY(efi_call_phys)
34810 /*
34811 * 0. The function can only be called in Linux kernel. So CS has been
34812@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34813 * The mapping of lower virtual memory has been created in prolog and
34814 * epilog.
34815 */
34816- movl $1f, %edx
34817- subl $__PAGE_OFFSET, %edx
34818- jmp *%edx
34819+#ifdef CONFIG_PAX_KERNEXEC
34820+ movl $(__KERNEXEC_EFI_DS), %edx
34821+ mov %edx, %ds
34822+ mov %edx, %es
34823+ mov %edx, %ss
34824+ addl $2f,(1f)
34825+ ljmp *(1f)
34826+
34827+__INITDATA
34828+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34829+.previous
34830+
34831+2:
34832+ subl $2b,(1b)
34833+#else
34834+ jmp 1f-__PAGE_OFFSET
34835 1:
34836+#endif
34837
34838 /*
34839 * 2. Now on the top of stack is the return
34840@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34841 * parameter 2, ..., param n. To make things easy, we save the return
34842 * address of efi_call_phys in a global variable.
34843 */
34844- popl %edx
34845- movl %edx, saved_return_addr
34846- /* get the function pointer into ECX*/
34847- popl %ecx
34848- movl %ecx, efi_rt_function_ptr
34849- movl $2f, %edx
34850- subl $__PAGE_OFFSET, %edx
34851- pushl %edx
34852+ popl (saved_return_addr)
34853+ popl (efi_rt_function_ptr)
34854
34855 /*
34856 * 3. Clear PG bit in %CR0.
34857@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
34858 /*
34859 * 5. Call the physical function.
34860 */
34861- jmp *%ecx
34862+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
34863
34864-2:
34865 /*
34866 * 6. After EFI runtime service returns, control will return to
34867 * following instruction. We'd better readjust stack pointer first.
34868@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
34869 movl %cr0, %edx
34870 orl $0x80000000, %edx
34871 movl %edx, %cr0
34872- jmp 1f
34873-1:
34874+
34875 /*
34876 * 8. Now restore the virtual mode from flat mode by
34877 * adding EIP with PAGE_OFFSET.
34878 */
34879- movl $1f, %edx
34880- jmp *%edx
34881+#ifdef CONFIG_PAX_KERNEXEC
34882+ movl $(__KERNEL_DS), %edx
34883+ mov %edx, %ds
34884+ mov %edx, %es
34885+ mov %edx, %ss
34886+ ljmp $(__KERNEL_CS),$1f
34887+#else
34888+ jmp 1f+__PAGE_OFFSET
34889+#endif
34890 1:
34891
34892 /*
34893 * 9. Balance the stack. And because EAX contain the return value,
34894 * we'd better not clobber it.
34895 */
34896- leal efi_rt_function_ptr, %edx
34897- movl (%edx), %ecx
34898- pushl %ecx
34899+ pushl (efi_rt_function_ptr)
34900
34901 /*
34902- * 10. Push the saved return address onto the stack and return.
34903+ * 10. Return to the saved return address.
34904 */
34905- leal saved_return_addr, %edx
34906- movl (%edx), %ecx
34907- pushl %ecx
34908- ret
34909+ jmpl *(saved_return_addr)
34910 ENDPROC(efi_call_phys)
34911 .previous
34912
34913-.data
34914+__INITDATA
34915 saved_return_addr:
34916 .long 0
34917 efi_rt_function_ptr:
34918diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
34919index 5fcda72..cd4dc41 100644
34920--- a/arch/x86/platform/efi/efi_stub_64.S
34921+++ b/arch/x86/platform/efi/efi_stub_64.S
34922@@ -11,6 +11,7 @@
34923 #include <asm/msr.h>
34924 #include <asm/processor-flags.h>
34925 #include <asm/page_types.h>
34926+#include <asm/alternative-asm.h>
34927
34928 #define SAVE_XMM \
34929 mov %rsp, %rax; \
34930@@ -88,6 +89,7 @@ ENTRY(efi_call)
34931 RESTORE_PGT
34932 addq $48, %rsp
34933 RESTORE_XMM
34934+ pax_force_retaddr 0, 1
34935 ret
34936 ENDPROC(efi_call)
34937
34938@@ -245,8 +247,8 @@ efi_gdt64:
34939 .long 0 /* Filled out by user */
34940 .word 0
34941 .quad 0x0000000000000000 /* NULL descriptor */
34942- .quad 0x00af9a000000ffff /* __KERNEL_CS */
34943- .quad 0x00cf92000000ffff /* __KERNEL_DS */
34944+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
34945+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
34946 .quad 0x0080890000000000 /* TS descriptor */
34947 .quad 0x0000000000000000 /* TS continued */
34948 efi_gdt64_end:
34949diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
34950index 1bbedc4..eb795b5 100644
34951--- a/arch/x86/platform/intel-mid/intel-mid.c
34952+++ b/arch/x86/platform/intel-mid/intel-mid.c
34953@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
34954 {
34955 };
34956
34957-static void intel_mid_reboot(void)
34958+static void __noreturn intel_mid_reboot(void)
34959 {
34960 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
34961+ BUG();
34962 }
34963
34964 static unsigned long __init intel_mid_calibrate_tsc(void)
34965diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34966index 3c1c386..59a68ed 100644
34967--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34968+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
34969@@ -13,6 +13,6 @@
34970 /* For every CPU addition a new get_<cpuname>_ops interface needs
34971 * to be added.
34972 */
34973-extern void *get_penwell_ops(void);
34974-extern void *get_cloverview_ops(void);
34975-extern void *get_tangier_ops(void);
34976+extern const void *get_penwell_ops(void);
34977+extern const void *get_cloverview_ops(void);
34978+extern const void *get_tangier_ops(void);
34979diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
34980index 23381d2..8ddc10e 100644
34981--- a/arch/x86/platform/intel-mid/mfld.c
34982+++ b/arch/x86/platform/intel-mid/mfld.c
34983@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
34984 pm_power_off = mfld_power_off;
34985 }
34986
34987-void *get_penwell_ops(void)
34988+const void *get_penwell_ops(void)
34989 {
34990 return &penwell_ops;
34991 }
34992
34993-void *get_cloverview_ops(void)
34994+const void *get_cloverview_ops(void)
34995 {
34996 return &penwell_ops;
34997 }
34998diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
34999index aaca917..66eadbc 100644
35000--- a/arch/x86/platform/intel-mid/mrfl.c
35001+++ b/arch/x86/platform/intel-mid/mrfl.c
35002@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35003 .arch_setup = tangier_arch_setup,
35004 };
35005
35006-void *get_tangier_ops(void)
35007+const void *get_tangier_ops(void)
35008 {
35009 return &tangier_ops;
35010 }
35011diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35012index d6ee929..3637cb5 100644
35013--- a/arch/x86/platform/olpc/olpc_dt.c
35014+++ b/arch/x86/platform/olpc/olpc_dt.c
35015@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35016 return res;
35017 }
35018
35019-static struct of_pdt_ops prom_olpc_ops __initdata = {
35020+static struct of_pdt_ops prom_olpc_ops __initconst = {
35021 .nextprop = olpc_dt_nextprop,
35022 .getproplen = olpc_dt_getproplen,
35023 .getproperty = olpc_dt_getproperty,
35024diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35025index 6ec7910..ecdbb11 100644
35026--- a/arch/x86/power/cpu.c
35027+++ b/arch/x86/power/cpu.c
35028@@ -137,11 +137,8 @@ static void do_fpu_end(void)
35029 static void fix_processor_context(void)
35030 {
35031 int cpu = smp_processor_id();
35032- struct tss_struct *t = &per_cpu(init_tss, cpu);
35033-#ifdef CONFIG_X86_64
35034- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35035- tss_desc tss;
35036-#endif
35037+ struct tss_struct *t = init_tss + cpu;
35038+
35039 set_tss_desc(cpu, t); /*
35040 * This just modifies memory; should not be
35041 * necessary. But... This is necessary, because
35042@@ -150,10 +147,6 @@ static void fix_processor_context(void)
35043 */
35044
35045 #ifdef CONFIG_X86_64
35046- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35047- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35048- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35049-
35050 syscall_init(); /* This sets MSR_*STAR and related */
35051 #endif
35052 load_TR_desc(); /* This does ltr */
35053diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35054index bad628a..a102610 100644
35055--- a/arch/x86/realmode/init.c
35056+++ b/arch/x86/realmode/init.c
35057@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35058 __va(real_mode_header->trampoline_header);
35059
35060 #ifdef CONFIG_X86_32
35061- trampoline_header->start = __pa_symbol(startup_32_smp);
35062+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35063+
35064+#ifdef CONFIG_PAX_KERNEXEC
35065+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35066+#endif
35067+
35068+ trampoline_header->boot_cs = __BOOT_CS;
35069 trampoline_header->gdt_limit = __BOOT_DS + 7;
35070 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35071 #else
35072@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35073 *trampoline_cr4_features = read_cr4();
35074
35075 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35076- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35077+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35078 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35079 #endif
35080 }
35081diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35082index 7c0d7be..d24dc88 100644
35083--- a/arch/x86/realmode/rm/Makefile
35084+++ b/arch/x86/realmode/rm/Makefile
35085@@ -67,5 +67,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35086
35087 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35088 -I$(srctree)/arch/x86/boot
35089+ifdef CONSTIFY_PLUGIN
35090+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35091+endif
35092 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35093 GCOV_PROFILE := n
35094diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35095index a28221d..93c40f1 100644
35096--- a/arch/x86/realmode/rm/header.S
35097+++ b/arch/x86/realmode/rm/header.S
35098@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35099 #endif
35100 /* APM/BIOS reboot */
35101 .long pa_machine_real_restart_asm
35102-#ifdef CONFIG_X86_64
35103+#ifdef CONFIG_X86_32
35104+ .long __KERNEL_CS
35105+#else
35106 .long __KERNEL32_CS
35107 #endif
35108 END(real_mode_header)
35109diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35110index 48ddd76..c26749f 100644
35111--- a/arch/x86/realmode/rm/trampoline_32.S
35112+++ b/arch/x86/realmode/rm/trampoline_32.S
35113@@ -24,6 +24,12 @@
35114 #include <asm/page_types.h>
35115 #include "realmode.h"
35116
35117+#ifdef CONFIG_PAX_KERNEXEC
35118+#define ta(X) (X)
35119+#else
35120+#define ta(X) (pa_ ## X)
35121+#endif
35122+
35123 .text
35124 .code16
35125
35126@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35127
35128 cli # We should be safe anyway
35129
35130- movl tr_start, %eax # where we need to go
35131-
35132 movl $0xA5A5A5A5, trampoline_status
35133 # write marker for master knows we're running
35134
35135@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35136 movw $1, %dx # protected mode (PE) bit
35137 lmsw %dx # into protected mode
35138
35139- ljmpl $__BOOT_CS, $pa_startup_32
35140+ ljmpl *(trampoline_header)
35141
35142 .section ".text32","ax"
35143 .code32
35144@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35145 .balign 8
35146 GLOBAL(trampoline_header)
35147 tr_start: .space 4
35148- tr_gdt_pad: .space 2
35149+ tr_boot_cs: .space 2
35150 tr_gdt: .space 6
35151 END(trampoline_header)
35152
35153diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35154index dac7b20..72dbaca 100644
35155--- a/arch/x86/realmode/rm/trampoline_64.S
35156+++ b/arch/x86/realmode/rm/trampoline_64.S
35157@@ -93,6 +93,7 @@ ENTRY(startup_32)
35158 movl %edx, %gs
35159
35160 movl pa_tr_cr4, %eax
35161+ andl $~X86_CR4_PCIDE, %eax
35162 movl %eax, %cr4 # Enable PAE mode
35163
35164 # Setup trampoline 4 level pagetables
35165@@ -106,7 +107,7 @@ ENTRY(startup_32)
35166 wrmsr
35167
35168 # Enable paging and in turn activate Long Mode
35169- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35170+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35171 movl %eax, %cr0
35172
35173 /*
35174diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35175index 9e7e147..25a4158 100644
35176--- a/arch/x86/realmode/rm/wakeup_asm.S
35177+++ b/arch/x86/realmode/rm/wakeup_asm.S
35178@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35179 lgdtl pmode_gdt
35180
35181 /* This really couldn't... */
35182- movl pmode_entry, %eax
35183 movl pmode_cr0, %ecx
35184 movl %ecx, %cr0
35185- ljmpl $__KERNEL_CS, $pa_startup_32
35186- /* -> jmp *%eax in trampoline_32.S */
35187+
35188+ ljmpl *pmode_entry
35189 #else
35190 jmp trampoline_start
35191 #endif
35192diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35193index 604a37e..e49702a 100644
35194--- a/arch/x86/tools/Makefile
35195+++ b/arch/x86/tools/Makefile
35196@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35197
35198 $(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
35199
35200-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35201+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35202 hostprogs-y += relocs
35203 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35204 PHONY += relocs
35205diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35206index a5efb21..97490e9 100644
35207--- a/arch/x86/tools/relocs.c
35208+++ b/arch/x86/tools/relocs.c
35209@@ -1,5 +1,7 @@
35210 /* This is included from relocs_32/64.c */
35211
35212+#include "../../../include/generated/autoconf.h"
35213+
35214 #define ElfW(type) _ElfW(ELF_BITS, type)
35215 #define _ElfW(bits, type) __ElfW(bits, type)
35216 #define __ElfW(bits, type) Elf##bits##_##type
35217@@ -11,6 +13,7 @@
35218 #define Elf_Sym ElfW(Sym)
35219
35220 static Elf_Ehdr ehdr;
35221+static Elf_Phdr *phdr;
35222
35223 struct relocs {
35224 uint32_t *offset;
35225@@ -383,9 +386,39 @@ static void read_ehdr(FILE *fp)
35226 }
35227 }
35228
35229+static void read_phdrs(FILE *fp)
35230+{
35231+ unsigned int i;
35232+
35233+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35234+ if (!phdr) {
35235+ die("Unable to allocate %d program headers\n",
35236+ ehdr.e_phnum);
35237+ }
35238+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35239+ die("Seek to %d failed: %s\n",
35240+ ehdr.e_phoff, strerror(errno));
35241+ }
35242+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35243+ die("Cannot read ELF program headers: %s\n",
35244+ strerror(errno));
35245+ }
35246+ for(i = 0; i < ehdr.e_phnum; i++) {
35247+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35248+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35249+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35250+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35251+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35252+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35253+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35254+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35255+ }
35256+
35257+}
35258+
35259 static void read_shdrs(FILE *fp)
35260 {
35261- int i;
35262+ unsigned int i;
35263 Elf_Shdr shdr;
35264
35265 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35266@@ -420,7 +453,7 @@ static void read_shdrs(FILE *fp)
35267
35268 static void read_strtabs(FILE *fp)
35269 {
35270- int i;
35271+ unsigned int i;
35272 for (i = 0; i < ehdr.e_shnum; i++) {
35273 struct section *sec = &secs[i];
35274 if (sec->shdr.sh_type != SHT_STRTAB) {
35275@@ -445,7 +478,7 @@ static void read_strtabs(FILE *fp)
35276
35277 static void read_symtabs(FILE *fp)
35278 {
35279- int i,j;
35280+ unsigned int i,j;
35281 for (i = 0; i < ehdr.e_shnum; i++) {
35282 struct section *sec = &secs[i];
35283 if (sec->shdr.sh_type != SHT_SYMTAB) {
35284@@ -476,9 +509,11 @@ static void read_symtabs(FILE *fp)
35285 }
35286
35287
35288-static void read_relocs(FILE *fp)
35289+static void read_relocs(FILE *fp, int use_real_mode)
35290 {
35291- int i,j;
35292+ unsigned int i,j;
35293+ uint32_t base;
35294+
35295 for (i = 0; i < ehdr.e_shnum; i++) {
35296 struct section *sec = &secs[i];
35297 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35298@@ -498,9 +533,22 @@ static void read_relocs(FILE *fp)
35299 die("Cannot read symbol table: %s\n",
35300 strerror(errno));
35301 }
35302+ base = 0;
35303+
35304+#ifdef CONFIG_X86_32
35305+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35306+ if (phdr[j].p_type != PT_LOAD )
35307+ continue;
35308+ 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)
35309+ continue;
35310+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35311+ break;
35312+ }
35313+#endif
35314+
35315 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35316 Elf_Rel *rel = &sec->reltab[j];
35317- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35318+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35319 rel->r_info = elf_xword_to_cpu(rel->r_info);
35320 #if (SHT_REL_TYPE == SHT_RELA)
35321 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35322@@ -512,7 +560,7 @@ static void read_relocs(FILE *fp)
35323
35324 static void print_absolute_symbols(void)
35325 {
35326- int i;
35327+ unsigned int i;
35328 const char *format;
35329
35330 if (ELF_BITS == 64)
35331@@ -525,7 +573,7 @@ static void print_absolute_symbols(void)
35332 for (i = 0; i < ehdr.e_shnum; i++) {
35333 struct section *sec = &secs[i];
35334 char *sym_strtab;
35335- int j;
35336+ unsigned int j;
35337
35338 if (sec->shdr.sh_type != SHT_SYMTAB) {
35339 continue;
35340@@ -552,7 +600,7 @@ static void print_absolute_symbols(void)
35341
35342 static void print_absolute_relocs(void)
35343 {
35344- int i, printed = 0;
35345+ unsigned int i, printed = 0;
35346 const char *format;
35347
35348 if (ELF_BITS == 64)
35349@@ -565,7 +613,7 @@ static void print_absolute_relocs(void)
35350 struct section *sec_applies, *sec_symtab;
35351 char *sym_strtab;
35352 Elf_Sym *sh_symtab;
35353- int j;
35354+ unsigned int j;
35355 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35356 continue;
35357 }
35358@@ -642,13 +690,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35359 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35360 Elf_Sym *sym, const char *symname))
35361 {
35362- int i;
35363+ unsigned int i;
35364 /* Walk through the relocations */
35365 for (i = 0; i < ehdr.e_shnum; i++) {
35366 char *sym_strtab;
35367 Elf_Sym *sh_symtab;
35368 struct section *sec_applies, *sec_symtab;
35369- int j;
35370+ unsigned int j;
35371 struct section *sec = &secs[i];
35372
35373 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35374@@ -822,6 +870,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35375 {
35376 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35377 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35378+ char *sym_strtab = sec->link->link->strtab;
35379+
35380+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35381+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35382+ return 0;
35383+
35384+#ifdef CONFIG_PAX_KERNEXEC
35385+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35386+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35387+ return 0;
35388+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35389+ return 0;
35390+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35391+ return 0;
35392+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35393+ return 0;
35394+#endif
35395
35396 switch (r_type) {
35397 case R_386_NONE:
35398@@ -960,7 +1025,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35399
35400 static void emit_relocs(int as_text, int use_real_mode)
35401 {
35402- int i;
35403+ unsigned int i;
35404 int (*write_reloc)(uint32_t, FILE *) = write32;
35405 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35406 const char *symname);
35407@@ -1060,10 +1125,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35408 {
35409 regex_init(use_real_mode);
35410 read_ehdr(fp);
35411+ read_phdrs(fp);
35412 read_shdrs(fp);
35413 read_strtabs(fp);
35414 read_symtabs(fp);
35415- read_relocs(fp);
35416+ read_relocs(fp, use_real_mode);
35417 if (ELF_BITS == 64)
35418 percpu_init();
35419 if (show_absolute_syms) {
35420diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35421index f40281e..92728c9 100644
35422--- a/arch/x86/um/mem_32.c
35423+++ b/arch/x86/um/mem_32.c
35424@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35425 gate_vma.vm_start = FIXADDR_USER_START;
35426 gate_vma.vm_end = FIXADDR_USER_END;
35427 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35428- gate_vma.vm_page_prot = __P101;
35429+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35430
35431 return 0;
35432 }
35433diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35434index 80ffa5b..a33bd15 100644
35435--- a/arch/x86/um/tls_32.c
35436+++ b/arch/x86/um/tls_32.c
35437@@ -260,7 +260,7 @@ out:
35438 if (unlikely(task == current &&
35439 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35440 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35441- "without flushed TLS.", current->pid);
35442+ "without flushed TLS.", task_pid_nr(current));
35443 }
35444
35445 return 0;
35446diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35447index 5a4affe..9e2d522 100644
35448--- a/arch/x86/vdso/Makefile
35449+++ b/arch/x86/vdso/Makefile
35450@@ -174,7 +174,7 @@ quiet_cmd_vdso = VDSO $@
35451 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35452 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35453
35454-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35455+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35456 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35457 GCOV_PROFILE := n
35458
35459diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35460index 0224987..c7d65a5 100644
35461--- a/arch/x86/vdso/vdso2c.h
35462+++ b/arch/x86/vdso/vdso2c.h
35463@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35464 unsigned long load_size = -1; /* Work around bogus warning */
35465 unsigned long mapping_size;
35466 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35467- int i;
35468+ unsigned int i;
35469 unsigned long j;
35470 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35471 *alt_sec = NULL;
35472diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35473index e904c27..b9eaa03 100644
35474--- a/arch/x86/vdso/vdso32-setup.c
35475+++ b/arch/x86/vdso/vdso32-setup.c
35476@@ -14,6 +14,7 @@
35477 #include <asm/cpufeature.h>
35478 #include <asm/processor.h>
35479 #include <asm/vdso.h>
35480+#include <asm/mman.h>
35481
35482 #ifdef CONFIG_COMPAT_VDSO
35483 #define VDSO_DEFAULT 0
35484diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35485index 970463b..da82d3e 100644
35486--- a/arch/x86/vdso/vma.c
35487+++ b/arch/x86/vdso/vma.c
35488@@ -16,10 +16,9 @@
35489 #include <asm/vdso.h>
35490 #include <asm/page.h>
35491 #include <asm/hpet.h>
35492+#include <asm/mman.h>
35493
35494 #if defined(CONFIG_X86_64)
35495-unsigned int __read_mostly vdso64_enabled = 1;
35496-
35497 extern unsigned short vdso_sync_cpuid;
35498 #endif
35499
35500@@ -101,6 +100,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35501 .pages = no_pages,
35502 };
35503
35504+#ifdef CONFIG_PAX_RANDMMAP
35505+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35506+ calculate_addr = false;
35507+#endif
35508+
35509 if (calculate_addr) {
35510 addr = vdso_addr(current->mm->start_stack,
35511 image->size - image->sym_vvar_start);
35512@@ -111,14 +115,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35513 down_write(&mm->mmap_sem);
35514
35515 addr = get_unmapped_area(NULL, addr,
35516- image->size - image->sym_vvar_start, 0, 0);
35517+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35518 if (IS_ERR_VALUE(addr)) {
35519 ret = addr;
35520 goto up_fail;
35521 }
35522
35523 text_start = addr - image->sym_vvar_start;
35524- current->mm->context.vdso = (void __user *)text_start;
35525+ mm->context.vdso = text_start;
35526
35527 /*
35528 * MAYWRITE to allow gdb to COW and set breakpoints
35529@@ -163,15 +167,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35530 hpet_address >> PAGE_SHIFT,
35531 PAGE_SIZE,
35532 pgprot_noncached(PAGE_READONLY));
35533-
35534- if (ret)
35535- goto up_fail;
35536 }
35537 #endif
35538
35539 up_fail:
35540 if (ret)
35541- current->mm->context.vdso = NULL;
35542+ current->mm->context.vdso = 0;
35543
35544 up_write(&mm->mmap_sem);
35545 return ret;
35546@@ -191,8 +192,8 @@ static int load_vdso32(void)
35547
35548 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35549 current_thread_info()->sysenter_return =
35550- current->mm->context.vdso +
35551- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35552+ (void __force_user *)(current->mm->context.vdso +
35553+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35554
35555 return 0;
35556 }
35557@@ -201,9 +202,6 @@ static int load_vdso32(void)
35558 #ifdef CONFIG_X86_64
35559 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35560 {
35561- if (!vdso64_enabled)
35562- return 0;
35563-
35564 return map_vdso(&vdso_image_64, true);
35565 }
35566
35567@@ -212,12 +210,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35568 int uses_interp)
35569 {
35570 #ifdef CONFIG_X86_X32_ABI
35571- if (test_thread_flag(TIF_X32)) {
35572- if (!vdso64_enabled)
35573- return 0;
35574-
35575+ if (test_thread_flag(TIF_X32))
35576 return map_vdso(&vdso_image_x32, true);
35577- }
35578 #endif
35579
35580 return load_vdso32();
35581@@ -229,12 +223,3 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35582 return load_vdso32();
35583 }
35584 #endif
35585-
35586-#ifdef CONFIG_X86_64
35587-static __init int vdso_setup(char *s)
35588-{
35589- vdso64_enabled = simple_strtoul(s, NULL, 0);
35590- return 0;
35591-}
35592-__setup("vdso=", vdso_setup);
35593-#endif
35594diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35595index e88fda8..76ce7ce 100644
35596--- a/arch/x86/xen/Kconfig
35597+++ b/arch/x86/xen/Kconfig
35598@@ -9,6 +9,7 @@ config XEN
35599 select XEN_HAVE_PVMMU
35600 depends on X86_64 || (X86_32 && X86_PAE)
35601 depends on X86_TSC
35602+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35603 help
35604 This is the Linux Xen port. Enabling this will allow the
35605 kernel to boot in a paravirtualized environment under the
35606diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35607index fac5e4f..5b5cf4f 100644
35608--- a/arch/x86/xen/enlighten.c
35609+++ b/arch/x86/xen/enlighten.c
35610@@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35611
35612 struct shared_info xen_dummy_shared_info;
35613
35614-void *xen_initial_gdt;
35615-
35616 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35617 __read_mostly int xen_have_vector_callback;
35618 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35619@@ -542,8 +540,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35620 {
35621 unsigned long va = dtr->address;
35622 unsigned int size = dtr->size + 1;
35623- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35624- unsigned long frames[pages];
35625+ unsigned long frames[65536 / PAGE_SIZE];
35626 int f;
35627
35628 /*
35629@@ -591,8 +588,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35630 {
35631 unsigned long va = dtr->address;
35632 unsigned int size = dtr->size + 1;
35633- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35634- unsigned long frames[pages];
35635+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35636 int f;
35637
35638 /*
35639@@ -600,7 +596,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35640 * 8-byte entries, or 16 4k pages..
35641 */
35642
35643- BUG_ON(size > 65536);
35644+ BUG_ON(size > GDT_SIZE);
35645 BUG_ON(va & ~PAGE_MASK);
35646
35647 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35648@@ -989,7 +985,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35649 return 0;
35650 }
35651
35652-static void set_xen_basic_apic_ops(void)
35653+static void __init set_xen_basic_apic_ops(void)
35654 {
35655 apic->read = xen_apic_read;
35656 apic->write = xen_apic_write;
35657@@ -1295,30 +1291,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35658 #endif
35659 };
35660
35661-static void xen_reboot(int reason)
35662+static __noreturn void xen_reboot(int reason)
35663 {
35664 struct sched_shutdown r = { .reason = reason };
35665
35666- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35667- BUG();
35668+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35669+ BUG();
35670 }
35671
35672-static void xen_restart(char *msg)
35673+static __noreturn void xen_restart(char *msg)
35674 {
35675 xen_reboot(SHUTDOWN_reboot);
35676 }
35677
35678-static void xen_emergency_restart(void)
35679+static __noreturn void xen_emergency_restart(void)
35680 {
35681 xen_reboot(SHUTDOWN_reboot);
35682 }
35683
35684-static void xen_machine_halt(void)
35685+static __noreturn void xen_machine_halt(void)
35686 {
35687 xen_reboot(SHUTDOWN_poweroff);
35688 }
35689
35690-static void xen_machine_power_off(void)
35691+static __noreturn void xen_machine_power_off(void)
35692 {
35693 if (pm_power_off)
35694 pm_power_off();
35695@@ -1573,7 +1569,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35696 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35697
35698 /* Work out if we support NX */
35699- x86_configure_nx();
35700+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35701+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35702+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35703+ unsigned l, h;
35704+
35705+ __supported_pte_mask |= _PAGE_NX;
35706+ rdmsr(MSR_EFER, l, h);
35707+ l |= EFER_NX;
35708+ wrmsr(MSR_EFER, l, h);
35709+ }
35710+#endif
35711
35712 /* Get mfn list */
35713 xen_build_dynamic_phys_to_machine();
35714@@ -1601,13 +1607,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35715
35716 machine_ops = xen_machine_ops;
35717
35718- /*
35719- * The only reliable way to retain the initial address of the
35720- * percpu gdt_page is to remember it here, so we can go and
35721- * mark it RW later, when the initial percpu area is freed.
35722- */
35723- xen_initial_gdt = &per_cpu(gdt_page, 0);
35724-
35725 xen_smp_init();
35726
35727 #ifdef CONFIG_ACPI_NUMA
35728diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35729index a8a1a3d..8216142 100644
35730--- a/arch/x86/xen/mmu.c
35731+++ b/arch/x86/xen/mmu.c
35732@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35733 return val;
35734 }
35735
35736-static pteval_t pte_pfn_to_mfn(pteval_t val)
35737+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35738 {
35739 if (val & _PAGE_PRESENT) {
35740 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35741@@ -1867,7 +1867,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35742 * L3_k[511] -> level2_fixmap_pgt */
35743 convert_pfn_mfn(level3_kernel_pgt);
35744
35745+ convert_pfn_mfn(level3_vmalloc_start_pgt);
35746+ convert_pfn_mfn(level3_vmalloc_end_pgt);
35747+ convert_pfn_mfn(level3_vmemmap_pgt);
35748 /* L3_k[511][506] -> level1_fixmap_pgt */
35749+ /* L3_k[511][507] -> level1_vsyscall_pgt */
35750 convert_pfn_mfn(level2_fixmap_pgt);
35751 }
35752 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35753@@ -1892,11 +1896,16 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35754 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35755 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35756 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35757+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35758+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35759+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35760 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35761 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35762+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35763 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35764 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35765 set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
35766+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
35767
35768 /* Pin down new L4 */
35769 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
35770@@ -2080,6 +2089,7 @@ static void __init xen_post_allocator_init(void)
35771 pv_mmu_ops.set_pud = xen_set_pud;
35772 #if PAGETABLE_LEVELS == 4
35773 pv_mmu_ops.set_pgd = xen_set_pgd;
35774+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35775 #endif
35776
35777 /* This will work as long as patching hasn't happened yet
35778@@ -2158,6 +2168,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35779 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35780 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35781 .set_pgd = xen_set_pgd_hyper,
35782+ .set_pgd_batched = xen_set_pgd_hyper,
35783
35784 .alloc_pud = xen_alloc_pmd_init,
35785 .release_pud = xen_release_pmd_init,
35786diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35787index 4c071ae..00e7049 100644
35788--- a/arch/x86/xen/smp.c
35789+++ b/arch/x86/xen/smp.c
35790@@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35791
35792 if (xen_pv_domain()) {
35793 if (!xen_feature(XENFEAT_writable_page_tables))
35794- /* We've switched to the "real" per-cpu gdt, so make
35795- * sure the old memory can be recycled. */
35796- make_lowmem_page_readwrite(xen_initial_gdt);
35797-
35798 #ifdef CONFIG_X86_32
35799 /*
35800 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35801 * expects __USER_DS
35802 */
35803- loadsegment(ds, __USER_DS);
35804- loadsegment(es, __USER_DS);
35805+ loadsegment(ds, __KERNEL_DS);
35806+ loadsegment(es, __KERNEL_DS);
35807 #endif
35808
35809 xen_filter_cpu_maps();
35810@@ -379,7 +375,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35811 #ifdef CONFIG_X86_32
35812 /* Note: PVH is not yet supported on x86_32. */
35813 ctxt->user_regs.fs = __KERNEL_PERCPU;
35814- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
35815+ savesegment(gs, ctxt->user_regs.gs);
35816 #endif
35817 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
35818
35819@@ -387,8 +383,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35820 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
35821 ctxt->flags = VGCF_IN_KERNEL;
35822 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
35823- ctxt->user_regs.ds = __USER_DS;
35824- ctxt->user_regs.es = __USER_DS;
35825+ ctxt->user_regs.ds = __KERNEL_DS;
35826+ ctxt->user_regs.es = __KERNEL_DS;
35827 ctxt->user_regs.ss = __KERNEL_DS;
35828
35829 xen_copy_trap_info(ctxt->trap_ctxt);
35830@@ -446,14 +442,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
35831 int rc;
35832
35833 per_cpu(current_task, cpu) = idle;
35834+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
35835 #ifdef CONFIG_X86_32
35836 irq_ctx_init(cpu);
35837 #else
35838 clear_tsk_thread_flag(idle, TIF_FORK);
35839 #endif
35840- per_cpu(kernel_stack, cpu) =
35841- (unsigned long)task_stack_page(idle) -
35842- KERNEL_STACK_OFFSET + THREAD_SIZE;
35843+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
35844
35845 xen_setup_runstate_info(cpu);
35846 xen_setup_timer(cpu);
35847@@ -732,7 +727,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
35848
35849 void __init xen_smp_init(void)
35850 {
35851- smp_ops = xen_smp_ops;
35852+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
35853 xen_fill_possible_map();
35854 }
35855
35856diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
35857index fd92a64..1f72641 100644
35858--- a/arch/x86/xen/xen-asm_32.S
35859+++ b/arch/x86/xen/xen-asm_32.S
35860@@ -99,7 +99,7 @@ ENTRY(xen_iret)
35861 pushw %fs
35862 movl $(__KERNEL_PERCPU), %eax
35863 movl %eax, %fs
35864- movl %fs:xen_vcpu, %eax
35865+ mov PER_CPU_VAR(xen_vcpu), %eax
35866 POP_FS
35867 #else
35868 movl %ss:xen_vcpu, %eax
35869diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
35870index 674b2225..f1f5dc1 100644
35871--- a/arch/x86/xen/xen-head.S
35872+++ b/arch/x86/xen/xen-head.S
35873@@ -39,6 +39,17 @@ ENTRY(startup_xen)
35874 #ifdef CONFIG_X86_32
35875 mov %esi,xen_start_info
35876 mov $init_thread_union+THREAD_SIZE,%esp
35877+#ifdef CONFIG_SMP
35878+ movl $cpu_gdt_table,%edi
35879+ movl $__per_cpu_load,%eax
35880+ movw %ax,__KERNEL_PERCPU + 2(%edi)
35881+ rorl $16,%eax
35882+ movb %al,__KERNEL_PERCPU + 4(%edi)
35883+ movb %ah,__KERNEL_PERCPU + 7(%edi)
35884+ movl $__per_cpu_end - 1,%eax
35885+ subl $__per_cpu_start,%eax
35886+ movw %ax,__KERNEL_PERCPU + 0(%edi)
35887+#endif
35888 #else
35889 mov %rsi,xen_start_info
35890 mov $init_thread_union+THREAD_SIZE,%rsp
35891diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
35892index 28c7e0b..2acfec7 100644
35893--- a/arch/x86/xen/xen-ops.h
35894+++ b/arch/x86/xen/xen-ops.h
35895@@ -10,8 +10,6 @@
35896 extern const char xen_hypervisor_callback[];
35897 extern const char xen_failsafe_callback[];
35898
35899-extern void *xen_initial_gdt;
35900-
35901 struct trap_info;
35902 void xen_copy_trap_info(struct trap_info *traps);
35903
35904diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
35905index 525bd3d..ef888b1 100644
35906--- a/arch/xtensa/variants/dc232b/include/variant/core.h
35907+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
35908@@ -119,9 +119,9 @@
35909 ----------------------------------------------------------------------*/
35910
35911 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
35912-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
35913 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
35914 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
35915+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35916
35917 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
35918 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
35919diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
35920index 2f33760..835e50a 100644
35921--- a/arch/xtensa/variants/fsf/include/variant/core.h
35922+++ b/arch/xtensa/variants/fsf/include/variant/core.h
35923@@ -11,6 +11,7 @@
35924 #ifndef _XTENSA_CORE_H
35925 #define _XTENSA_CORE_H
35926
35927+#include <linux/const.h>
35928
35929 /****************************************************************************
35930 Parameters Useful for Any Code, USER or PRIVILEGED
35931@@ -112,9 +113,9 @@
35932 ----------------------------------------------------------------------*/
35933
35934 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35935-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35936 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35937 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35938+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35939
35940 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
35941 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
35942diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
35943index af00795..2bb8105 100644
35944--- a/arch/xtensa/variants/s6000/include/variant/core.h
35945+++ b/arch/xtensa/variants/s6000/include/variant/core.h
35946@@ -11,6 +11,7 @@
35947 #ifndef _XTENSA_CORE_CONFIGURATION_H
35948 #define _XTENSA_CORE_CONFIGURATION_H
35949
35950+#include <linux/const.h>
35951
35952 /****************************************************************************
35953 Parameters Useful for Any Code, USER or PRIVILEGED
35954@@ -118,9 +119,9 @@
35955 ----------------------------------------------------------------------*/
35956
35957 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
35958-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
35959 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
35960 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
35961+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
35962
35963 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
35964 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
35965diff --git a/block/bio.c b/block/bio.c
35966index 3e6e198..5c65199 100644
35967--- a/block/bio.c
35968+++ b/block/bio.c
35969@@ -1163,7 +1163,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
35970 /*
35971 * Overflow, abort
35972 */
35973- if (end < start)
35974+ if (end < start || end - start > INT_MAX - nr_pages)
35975 return ERR_PTR(-EINVAL);
35976
35977 nr_pages += end - start;
35978@@ -1297,7 +1297,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
35979 /*
35980 * Overflow, abort
35981 */
35982- if (end < start)
35983+ if (end < start || end - start > INT_MAX - nr_pages)
35984 return ERR_PTR(-EINVAL);
35985
35986 nr_pages += end - start;
35987@@ -1559,7 +1559,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
35988 const int read = bio_data_dir(bio) == READ;
35989 struct bio_map_data *bmd = bio->bi_private;
35990 int i;
35991- char *p = bmd->sgvecs[0].iov_base;
35992+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
35993
35994 bio_for_each_segment_all(bvec, bio, i) {
35995 char *addr = page_address(bvec->bv_page);
35996diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
35997index 0736729..2ec3b48 100644
35998--- a/block/blk-iopoll.c
35999+++ b/block/blk-iopoll.c
36000@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
36001 }
36002 EXPORT_SYMBOL(blk_iopoll_complete);
36003
36004-static void blk_iopoll_softirq(struct softirq_action *h)
36005+static __latent_entropy void blk_iopoll_softirq(void)
36006 {
36007 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36008 int rearm = 0, budget = blk_iopoll_budget;
36009diff --git a/block/blk-map.c b/block/blk-map.c
36010index f890d43..97b0482 100644
36011--- a/block/blk-map.c
36012+++ b/block/blk-map.c
36013@@ -300,7 +300,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36014 if (!len || !kbuf)
36015 return -EINVAL;
36016
36017- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36018+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36019 if (do_copy)
36020 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36021 else
36022diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36023index 53b1737..08177d2e 100644
36024--- a/block/blk-softirq.c
36025+++ b/block/blk-softirq.c
36026@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36027 * Softirq action handler - move entries to local list and loop over them
36028 * while passing them to the queue registered handler.
36029 */
36030-static void blk_done_softirq(struct softirq_action *h)
36031+static __latent_entropy void blk_done_softirq(void)
36032 {
36033 struct list_head *cpu_list, local_list;
36034
36035diff --git a/block/bsg.c b/block/bsg.c
36036index 276e869..6fe4c61 100644
36037--- a/block/bsg.c
36038+++ b/block/bsg.c
36039@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36040 struct sg_io_v4 *hdr, struct bsg_device *bd,
36041 fmode_t has_write_perm)
36042 {
36043+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36044+ unsigned char *cmdptr;
36045+
36046 if (hdr->request_len > BLK_MAX_CDB) {
36047 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36048 if (!rq->cmd)
36049 return -ENOMEM;
36050- }
36051+ cmdptr = rq->cmd;
36052+ } else
36053+ cmdptr = tmpcmd;
36054
36055- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36056+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36057 hdr->request_len))
36058 return -EFAULT;
36059
36060+ if (cmdptr != rq->cmd)
36061+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36062+
36063 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36064 if (blk_verify_command(rq->cmd, has_write_perm))
36065 return -EPERM;
36066diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36067index f678c73..f35aa18 100644
36068--- a/block/compat_ioctl.c
36069+++ b/block/compat_ioctl.c
36070@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36071 cgc = compat_alloc_user_space(sizeof(*cgc));
36072 cgc32 = compat_ptr(arg);
36073
36074- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36075+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36076 get_user(data, &cgc32->buffer) ||
36077 put_user(compat_ptr(data), &cgc->buffer) ||
36078 copy_in_user(&cgc->buflen, &cgc32->buflen,
36079@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36080 err |= __get_user(f->spec1, &uf->spec1);
36081 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36082 err |= __get_user(name, &uf->name);
36083- f->name = compat_ptr(name);
36084+ f->name = (void __force_kernel *)compat_ptr(name);
36085 if (err) {
36086 err = -EFAULT;
36087 goto out;
36088diff --git a/block/genhd.c b/block/genhd.c
36089index bd30606..bbc9b90 100644
36090--- a/block/genhd.c
36091+++ b/block/genhd.c
36092@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36093
36094 /*
36095 * Register device numbers dev..(dev+range-1)
36096- * range must be nonzero
36097+ * Noop if @range is zero.
36098 * The hash chain is sorted on range, so that subranges can override.
36099 */
36100 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36101 struct kobject *(*probe)(dev_t, int *, void *),
36102 int (*lock)(dev_t, void *), void *data)
36103 {
36104- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36105+ if (range)
36106+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36107 }
36108
36109 EXPORT_SYMBOL(blk_register_region);
36110
36111+/* undo blk_register_region(), noop if @range is zero */
36112 void blk_unregister_region(dev_t devt, unsigned long range)
36113 {
36114- kobj_unmap(bdev_map, devt, range);
36115+ if (range)
36116+ kobj_unmap(bdev_map, devt, range);
36117 }
36118
36119 EXPORT_SYMBOL(blk_unregister_region);
36120diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36121index 56d08fd..2e07090 100644
36122--- a/block/partitions/efi.c
36123+++ b/block/partitions/efi.c
36124@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36125 if (!gpt)
36126 return NULL;
36127
36128+ if (!le32_to_cpu(gpt->num_partition_entries))
36129+ return NULL;
36130+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36131+ if (!pte)
36132+ return NULL;
36133+
36134 count = le32_to_cpu(gpt->num_partition_entries) *
36135 le32_to_cpu(gpt->sizeof_partition_entry);
36136- if (!count)
36137- return NULL;
36138- pte = kmalloc(count, GFP_KERNEL);
36139- if (!pte)
36140- return NULL;
36141-
36142 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36143 (u8 *) pte, count) < count) {
36144 kfree(pte);
36145diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36146index b0c2a61..10bb6ec 100644
36147--- a/block/scsi_ioctl.c
36148+++ b/block/scsi_ioctl.c
36149@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36150 return put_user(0, p);
36151 }
36152
36153-static int sg_get_timeout(struct request_queue *q)
36154+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36155 {
36156 return jiffies_to_clock_t(q->sg_timeout);
36157 }
36158@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36159 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36160 struct sg_io_hdr *hdr, fmode_t mode)
36161 {
36162- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36163+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36164+ unsigned char *cmdptr;
36165+
36166+ if (rq->cmd != rq->__cmd)
36167+ cmdptr = rq->cmd;
36168+ else
36169+ cmdptr = tmpcmd;
36170+
36171+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36172 return -EFAULT;
36173+
36174+ if (cmdptr != rq->cmd)
36175+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36176+
36177 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36178 return -EPERM;
36179
36180@@ -431,6 +443,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36181 int err;
36182 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36183 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36184+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36185+ unsigned char *cmdptr;
36186
36187 if (!sic)
36188 return -EINVAL;
36189@@ -469,9 +483,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36190 */
36191 err = -EFAULT;
36192 rq->cmd_len = cmdlen;
36193- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36194+
36195+ if (rq->cmd != rq->__cmd)
36196+ cmdptr = rq->cmd;
36197+ else
36198+ cmdptr = tmpcmd;
36199+
36200+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36201 goto error;
36202
36203+ if (rq->cmd != cmdptr)
36204+ memcpy(rq->cmd, cmdptr, cmdlen);
36205+
36206 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36207 goto error;
36208
36209diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36210index e592c90..c566114 100644
36211--- a/crypto/cryptd.c
36212+++ b/crypto/cryptd.c
36213@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36214
36215 struct cryptd_blkcipher_request_ctx {
36216 crypto_completion_t complete;
36217-};
36218+} __no_const;
36219
36220 struct cryptd_hash_ctx {
36221 struct crypto_shash *child;
36222@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36223
36224 struct cryptd_aead_request_ctx {
36225 crypto_completion_t complete;
36226-};
36227+} __no_const;
36228
36229 static void cryptd_queue_worker(struct work_struct *work);
36230
36231diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36232index 309d345..1632720 100644
36233--- a/crypto/pcrypt.c
36234+++ b/crypto/pcrypt.c
36235@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36236 int ret;
36237
36238 pinst->kobj.kset = pcrypt_kset;
36239- ret = kobject_add(&pinst->kobj, NULL, name);
36240+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36241 if (!ret)
36242 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36243
36244diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36245index 6921c7f..78e1af7 100644
36246--- a/drivers/acpi/acpica/hwxfsleep.c
36247+++ b/drivers/acpi/acpica/hwxfsleep.c
36248@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36249 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36250
36251 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36252- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36253- acpi_hw_extended_sleep},
36254- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36255- acpi_hw_extended_wake_prep},
36256- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36257+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36258+ .extended_function = acpi_hw_extended_sleep},
36259+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36260+ .extended_function = acpi_hw_extended_wake_prep},
36261+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36262+ .extended_function = acpi_hw_extended_wake}
36263 };
36264
36265 /*
36266diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36267index 16129c7..8b675cd 100644
36268--- a/drivers/acpi/apei/apei-internal.h
36269+++ b/drivers/acpi/apei/apei-internal.h
36270@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36271 struct apei_exec_ins_type {
36272 u32 flags;
36273 apei_exec_ins_func_t run;
36274-};
36275+} __do_const;
36276
36277 struct apei_exec_context {
36278 u32 ip;
36279diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36280index fc5f780..e5ac91a 100644
36281--- a/drivers/acpi/apei/ghes.c
36282+++ b/drivers/acpi/apei/ghes.c
36283@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36284 const struct acpi_hest_generic *generic,
36285 const struct acpi_hest_generic_status *estatus)
36286 {
36287- static atomic_t seqno;
36288+ static atomic_unchecked_t seqno;
36289 unsigned int curr_seqno;
36290 char pfx_seq[64];
36291
36292@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36293 else
36294 pfx = KERN_ERR;
36295 }
36296- curr_seqno = atomic_inc_return(&seqno);
36297+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36298 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36299 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36300 pfx_seq, generic->header.source_id);
36301diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36302index a83e3c6..c3d617f 100644
36303--- a/drivers/acpi/bgrt.c
36304+++ b/drivers/acpi/bgrt.c
36305@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36306 if (!bgrt_image)
36307 return -ENODEV;
36308
36309- bin_attr_image.private = bgrt_image;
36310- bin_attr_image.size = bgrt_image_size;
36311+ pax_open_kernel();
36312+ *(void **)&bin_attr_image.private = bgrt_image;
36313+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36314+ pax_close_kernel();
36315
36316 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36317 if (!bgrt_kobj)
36318diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36319index 7556e7c..89a96bd 100644
36320--- a/drivers/acpi/blacklist.c
36321+++ b/drivers/acpi/blacklist.c
36322@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36323 u32 is_critical_error;
36324 };
36325
36326-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36327+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36328
36329 /*
36330 * POLICY: If *anything* doesn't work, put it on the blacklist.
36331@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36332 return 0;
36333 }
36334
36335-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36336+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36337 {
36338 .callback = dmi_disable_osi_vista,
36339 .ident = "Fujitsu Siemens",
36340diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36341index c68e724..e863008 100644
36342--- a/drivers/acpi/custom_method.c
36343+++ b/drivers/acpi/custom_method.c
36344@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36345 struct acpi_table_header table;
36346 acpi_status status;
36347
36348+#ifdef CONFIG_GRKERNSEC_KMEM
36349+ return -EPERM;
36350+#endif
36351+
36352 if (!(*ppos)) {
36353 /* parse the table header to get the table length */
36354 if (count <= sizeof(struct acpi_table_header))
36355diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36356index 7db1931..302dd5f 100644
36357--- a/drivers/acpi/device_pm.c
36358+++ b/drivers/acpi/device_pm.c
36359@@ -1021,6 +1021,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36360
36361 #endif /* CONFIG_PM_SLEEP */
36362
36363+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36364+
36365 static struct dev_pm_domain acpi_general_pm_domain = {
36366 .ops = {
36367 #ifdef CONFIG_PM_RUNTIME
36368@@ -1039,6 +1041,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36369 .restore_early = acpi_subsys_resume_early,
36370 #endif
36371 },
36372+ .detach = acpi_dev_pm_detach
36373 };
36374
36375 /**
36376@@ -1108,7 +1111,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36377 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36378 }
36379
36380- dev->pm_domain->detach = acpi_dev_pm_detach;
36381 return 0;
36382 }
36383 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36384diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36385index 17f9ec5..d9a455e 100644
36386--- a/drivers/acpi/processor_idle.c
36387+++ b/drivers/acpi/processor_idle.c
36388@@ -952,7 +952,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36389 {
36390 int i, count = CPUIDLE_DRIVER_STATE_START;
36391 struct acpi_processor_cx *cx;
36392- struct cpuidle_state *state;
36393+ cpuidle_state_no_const *state;
36394 struct cpuidle_driver *drv = &acpi_idle_driver;
36395
36396 if (!pr->flags.power_setup_done)
36397diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36398index 13e577c..cef11ee 100644
36399--- a/drivers/acpi/sysfs.c
36400+++ b/drivers/acpi/sysfs.c
36401@@ -423,11 +423,11 @@ static u32 num_counters;
36402 static struct attribute **all_attrs;
36403 static u32 acpi_gpe_count;
36404
36405-static struct attribute_group interrupt_stats_attr_group = {
36406+static attribute_group_no_const interrupt_stats_attr_group = {
36407 .name = "interrupts",
36408 };
36409
36410-static struct kobj_attribute *counter_attrs;
36411+static kobj_attribute_no_const *counter_attrs;
36412
36413 static void delete_gpe_attr_array(void)
36414 {
36415diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36416index 97683e4..655f6ba 100644
36417--- a/drivers/ata/libahci.c
36418+++ b/drivers/ata/libahci.c
36419@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36420 }
36421 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36422
36423-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36424+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36425 struct ata_taskfile *tf, int is_cmd, u16 flags,
36426 unsigned long timeout_msec)
36427 {
36428diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36429index c5ba15a..75ec7a8 100644
36430--- a/drivers/ata/libata-core.c
36431+++ b/drivers/ata/libata-core.c
36432@@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36433 static void ata_dev_xfermask(struct ata_device *dev);
36434 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36435
36436-atomic_t ata_print_id = ATOMIC_INIT(0);
36437+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36438
36439 struct ata_force_param {
36440 const char *name;
36441@@ -4797,7 +4797,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36442 struct ata_port *ap;
36443 unsigned int tag;
36444
36445- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36446+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36447 ap = qc->ap;
36448
36449 qc->flags = 0;
36450@@ -4813,7 +4813,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36451 struct ata_port *ap;
36452 struct ata_link *link;
36453
36454- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36455+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36456 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36457 ap = qc->ap;
36458 link = qc->dev->link;
36459@@ -5917,6 +5917,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36460 return;
36461
36462 spin_lock(&lock);
36463+ pax_open_kernel();
36464
36465 for (cur = ops->inherits; cur; cur = cur->inherits) {
36466 void **inherit = (void **)cur;
36467@@ -5930,8 +5931,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36468 if (IS_ERR(*pp))
36469 *pp = NULL;
36470
36471- ops->inherits = NULL;
36472+ *(struct ata_port_operations **)&ops->inherits = NULL;
36473
36474+ pax_close_kernel();
36475 spin_unlock(&lock);
36476 }
36477
36478@@ -6127,7 +6129,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36479
36480 /* give ports names and add SCSI hosts */
36481 for (i = 0; i < host->n_ports; i++) {
36482- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36483+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36484 host->ports[i]->local_port_no = i + 1;
36485 }
36486
36487diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36488index 0586f66..1a8f74a 100644
36489--- a/drivers/ata/libata-scsi.c
36490+++ b/drivers/ata/libata-scsi.c
36491@@ -4151,7 +4151,7 @@ int ata_sas_port_init(struct ata_port *ap)
36492
36493 if (rc)
36494 return rc;
36495- ap->print_id = atomic_inc_return(&ata_print_id);
36496+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36497 return 0;
36498 }
36499 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36500diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36501index 5f4e0cc..ff2c347 100644
36502--- a/drivers/ata/libata.h
36503+++ b/drivers/ata/libata.h
36504@@ -53,7 +53,7 @@ enum {
36505 ATA_DNXFER_QUIET = (1 << 31),
36506 };
36507
36508-extern atomic_t ata_print_id;
36509+extern atomic_unchecked_t ata_print_id;
36510 extern int atapi_passthru16;
36511 extern int libata_fua;
36512 extern int libata_noacpi;
36513diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36514index 38216b9..4ec6aeb 100644
36515--- a/drivers/ata/pata_arasan_cf.c
36516+++ b/drivers/ata/pata_arasan_cf.c
36517@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36518 /* Handle platform specific quirks */
36519 if (quirk) {
36520 if (quirk & CF_BROKEN_PIO) {
36521- ap->ops->set_piomode = NULL;
36522+ pax_open_kernel();
36523+ *(void **)&ap->ops->set_piomode = NULL;
36524+ pax_close_kernel();
36525 ap->pio_mask = 0;
36526 }
36527 if (quirk & CF_BROKEN_MWDMA)
36528diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36529index f9b983a..887b9d8 100644
36530--- a/drivers/atm/adummy.c
36531+++ b/drivers/atm/adummy.c
36532@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36533 vcc->pop(vcc, skb);
36534 else
36535 dev_kfree_skb_any(skb);
36536- atomic_inc(&vcc->stats->tx);
36537+ atomic_inc_unchecked(&vcc->stats->tx);
36538
36539 return 0;
36540 }
36541diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36542index f1a9198..f466a4a 100644
36543--- a/drivers/atm/ambassador.c
36544+++ b/drivers/atm/ambassador.c
36545@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36546 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36547
36548 // VC layer stats
36549- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36550+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36551
36552 // free the descriptor
36553 kfree (tx_descr);
36554@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36555 dump_skb ("<<<", vc, skb);
36556
36557 // VC layer stats
36558- atomic_inc(&atm_vcc->stats->rx);
36559+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36560 __net_timestamp(skb);
36561 // end of our responsibility
36562 atm_vcc->push (atm_vcc, skb);
36563@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36564 } else {
36565 PRINTK (KERN_INFO, "dropped over-size frame");
36566 // should we count this?
36567- atomic_inc(&atm_vcc->stats->rx_drop);
36568+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36569 }
36570
36571 } else {
36572@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36573 }
36574
36575 if (check_area (skb->data, skb->len)) {
36576- atomic_inc(&atm_vcc->stats->tx_err);
36577+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36578 return -ENOMEM; // ?
36579 }
36580
36581diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36582index 480fa6f..947067c 100644
36583--- a/drivers/atm/atmtcp.c
36584+++ b/drivers/atm/atmtcp.c
36585@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36586 if (vcc->pop) vcc->pop(vcc,skb);
36587 else dev_kfree_skb(skb);
36588 if (dev_data) return 0;
36589- atomic_inc(&vcc->stats->tx_err);
36590+ atomic_inc_unchecked(&vcc->stats->tx_err);
36591 return -ENOLINK;
36592 }
36593 size = skb->len+sizeof(struct atmtcp_hdr);
36594@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36595 if (!new_skb) {
36596 if (vcc->pop) vcc->pop(vcc,skb);
36597 else dev_kfree_skb(skb);
36598- atomic_inc(&vcc->stats->tx_err);
36599+ atomic_inc_unchecked(&vcc->stats->tx_err);
36600 return -ENOBUFS;
36601 }
36602 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36603@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36604 if (vcc->pop) vcc->pop(vcc,skb);
36605 else dev_kfree_skb(skb);
36606 out_vcc->push(out_vcc,new_skb);
36607- atomic_inc(&vcc->stats->tx);
36608- atomic_inc(&out_vcc->stats->rx);
36609+ atomic_inc_unchecked(&vcc->stats->tx);
36610+ atomic_inc_unchecked(&out_vcc->stats->rx);
36611 return 0;
36612 }
36613
36614@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36615 read_unlock(&vcc_sklist_lock);
36616 if (!out_vcc) {
36617 result = -EUNATCH;
36618- atomic_inc(&vcc->stats->tx_err);
36619+ atomic_inc_unchecked(&vcc->stats->tx_err);
36620 goto done;
36621 }
36622 skb_pull(skb,sizeof(struct atmtcp_hdr));
36623@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36624 __net_timestamp(new_skb);
36625 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36626 out_vcc->push(out_vcc,new_skb);
36627- atomic_inc(&vcc->stats->tx);
36628- atomic_inc(&out_vcc->stats->rx);
36629+ atomic_inc_unchecked(&vcc->stats->tx);
36630+ atomic_inc_unchecked(&out_vcc->stats->rx);
36631 done:
36632 if (vcc->pop) vcc->pop(vcc,skb);
36633 else dev_kfree_skb(skb);
36634diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36635index d65975a..0b87e20 100644
36636--- a/drivers/atm/eni.c
36637+++ b/drivers/atm/eni.c
36638@@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36639 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36640 vcc->dev->number);
36641 length = 0;
36642- atomic_inc(&vcc->stats->rx_err);
36643+ atomic_inc_unchecked(&vcc->stats->rx_err);
36644 }
36645 else {
36646 length = ATM_CELL_SIZE-1; /* no HEC */
36647@@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36648 size);
36649 }
36650 eff = length = 0;
36651- atomic_inc(&vcc->stats->rx_err);
36652+ atomic_inc_unchecked(&vcc->stats->rx_err);
36653 }
36654 else {
36655 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36656@@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36657 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36658 vcc->dev->number,vcc->vci,length,size << 2,descr);
36659 length = eff = 0;
36660- atomic_inc(&vcc->stats->rx_err);
36661+ atomic_inc_unchecked(&vcc->stats->rx_err);
36662 }
36663 }
36664 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36665@@ -767,7 +767,7 @@ rx_dequeued++;
36666 vcc->push(vcc,skb);
36667 pushed++;
36668 }
36669- atomic_inc(&vcc->stats->rx);
36670+ atomic_inc_unchecked(&vcc->stats->rx);
36671 }
36672 wake_up(&eni_dev->rx_wait);
36673 }
36674@@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
36675 PCI_DMA_TODEVICE);
36676 if (vcc->pop) vcc->pop(vcc,skb);
36677 else dev_kfree_skb_irq(skb);
36678- atomic_inc(&vcc->stats->tx);
36679+ atomic_inc_unchecked(&vcc->stats->tx);
36680 wake_up(&eni_dev->tx_wait);
36681 dma_complete++;
36682 }
36683diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36684index 82f2ae0..f205c02 100644
36685--- a/drivers/atm/firestream.c
36686+++ b/drivers/atm/firestream.c
36687@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36688 }
36689 }
36690
36691- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36692+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36693
36694 fs_dprintk (FS_DEBUG_TXMEM, "i");
36695 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
36696@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36697 #endif
36698 skb_put (skb, qe->p1 & 0xffff);
36699 ATM_SKB(skb)->vcc = atm_vcc;
36700- atomic_inc(&atm_vcc->stats->rx);
36701+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36702 __net_timestamp(skb);
36703 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
36704 atm_vcc->push (atm_vcc, skb);
36705@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36706 kfree (pe);
36707 }
36708 if (atm_vcc)
36709- atomic_inc(&atm_vcc->stats->rx_drop);
36710+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36711 break;
36712 case 0x1f: /* Reassembly abort: no buffers. */
36713 /* Silently increment error counter. */
36714 if (atm_vcc)
36715- atomic_inc(&atm_vcc->stats->rx_drop);
36716+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36717 break;
36718 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
36719 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
36720diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
36721index d4725fc..2d4ea65 100644
36722--- a/drivers/atm/fore200e.c
36723+++ b/drivers/atm/fore200e.c
36724@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
36725 #endif
36726 /* check error condition */
36727 if (*entry->status & STATUS_ERROR)
36728- atomic_inc(&vcc->stats->tx_err);
36729+ atomic_inc_unchecked(&vcc->stats->tx_err);
36730 else
36731- atomic_inc(&vcc->stats->tx);
36732+ atomic_inc_unchecked(&vcc->stats->tx);
36733 }
36734 }
36735
36736@@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36737 if (skb == NULL) {
36738 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
36739
36740- atomic_inc(&vcc->stats->rx_drop);
36741+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36742 return -ENOMEM;
36743 }
36744
36745@@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36746
36747 dev_kfree_skb_any(skb);
36748
36749- atomic_inc(&vcc->stats->rx_drop);
36750+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36751 return -ENOMEM;
36752 }
36753
36754 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36755
36756 vcc->push(vcc, skb);
36757- atomic_inc(&vcc->stats->rx);
36758+ atomic_inc_unchecked(&vcc->stats->rx);
36759
36760 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36761
36762@@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
36763 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
36764 fore200e->atm_dev->number,
36765 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
36766- atomic_inc(&vcc->stats->rx_err);
36767+ atomic_inc_unchecked(&vcc->stats->rx_err);
36768 }
36769 }
36770
36771@@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
36772 goto retry_here;
36773 }
36774
36775- atomic_inc(&vcc->stats->tx_err);
36776+ atomic_inc_unchecked(&vcc->stats->tx_err);
36777
36778 fore200e->tx_sat++;
36779 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
36780diff --git a/drivers/atm/he.c b/drivers/atm/he.c
36781index c39702b..785b73b 100644
36782--- a/drivers/atm/he.c
36783+++ b/drivers/atm/he.c
36784@@ -1689,7 +1689,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36785
36786 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
36787 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
36788- atomic_inc(&vcc->stats->rx_drop);
36789+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36790 goto return_host_buffers;
36791 }
36792
36793@@ -1716,7 +1716,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36794 RBRQ_LEN_ERR(he_dev->rbrq_head)
36795 ? "LEN_ERR" : "",
36796 vcc->vpi, vcc->vci);
36797- atomic_inc(&vcc->stats->rx_err);
36798+ atomic_inc_unchecked(&vcc->stats->rx_err);
36799 goto return_host_buffers;
36800 }
36801
36802@@ -1768,7 +1768,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
36803 vcc->push(vcc, skb);
36804 spin_lock(&he_dev->global_lock);
36805
36806- atomic_inc(&vcc->stats->rx);
36807+ atomic_inc_unchecked(&vcc->stats->rx);
36808
36809 return_host_buffers:
36810 ++pdus_assembled;
36811@@ -2094,7 +2094,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
36812 tpd->vcc->pop(tpd->vcc, tpd->skb);
36813 else
36814 dev_kfree_skb_any(tpd->skb);
36815- atomic_inc(&tpd->vcc->stats->tx_err);
36816+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
36817 }
36818 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
36819 return;
36820@@ -2506,7 +2506,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36821 vcc->pop(vcc, skb);
36822 else
36823 dev_kfree_skb_any(skb);
36824- atomic_inc(&vcc->stats->tx_err);
36825+ atomic_inc_unchecked(&vcc->stats->tx_err);
36826 return -EINVAL;
36827 }
36828
36829@@ -2517,7 +2517,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36830 vcc->pop(vcc, skb);
36831 else
36832 dev_kfree_skb_any(skb);
36833- atomic_inc(&vcc->stats->tx_err);
36834+ atomic_inc_unchecked(&vcc->stats->tx_err);
36835 return -EINVAL;
36836 }
36837 #endif
36838@@ -2529,7 +2529,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36839 vcc->pop(vcc, skb);
36840 else
36841 dev_kfree_skb_any(skb);
36842- atomic_inc(&vcc->stats->tx_err);
36843+ atomic_inc_unchecked(&vcc->stats->tx_err);
36844 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36845 return -ENOMEM;
36846 }
36847@@ -2571,7 +2571,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36848 vcc->pop(vcc, skb);
36849 else
36850 dev_kfree_skb_any(skb);
36851- atomic_inc(&vcc->stats->tx_err);
36852+ atomic_inc_unchecked(&vcc->stats->tx_err);
36853 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36854 return -ENOMEM;
36855 }
36856@@ -2602,7 +2602,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
36857 __enqueue_tpd(he_dev, tpd, cid);
36858 spin_unlock_irqrestore(&he_dev->global_lock, flags);
36859
36860- atomic_inc(&vcc->stats->tx);
36861+ atomic_inc_unchecked(&vcc->stats->tx);
36862
36863 return 0;
36864 }
36865diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
36866index 1dc0519..1aadaf7 100644
36867--- a/drivers/atm/horizon.c
36868+++ b/drivers/atm/horizon.c
36869@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
36870 {
36871 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
36872 // VC layer stats
36873- atomic_inc(&vcc->stats->rx);
36874+ atomic_inc_unchecked(&vcc->stats->rx);
36875 __net_timestamp(skb);
36876 // end of our responsibility
36877 vcc->push (vcc, skb);
36878@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
36879 dev->tx_iovec = NULL;
36880
36881 // VC layer stats
36882- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36883+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36884
36885 // free the skb
36886 hrz_kfree_skb (skb);
36887diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
36888index 2b24ed0..b3d6acc 100644
36889--- a/drivers/atm/idt77252.c
36890+++ b/drivers/atm/idt77252.c
36891@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
36892 else
36893 dev_kfree_skb(skb);
36894
36895- atomic_inc(&vcc->stats->tx);
36896+ atomic_inc_unchecked(&vcc->stats->tx);
36897 }
36898
36899 atomic_dec(&scq->used);
36900@@ -1072,13 +1072,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36901 if ((sb = dev_alloc_skb(64)) == NULL) {
36902 printk("%s: Can't allocate buffers for aal0.\n",
36903 card->name);
36904- atomic_add(i, &vcc->stats->rx_drop);
36905+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
36906 break;
36907 }
36908 if (!atm_charge(vcc, sb->truesize)) {
36909 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
36910 card->name);
36911- atomic_add(i - 1, &vcc->stats->rx_drop);
36912+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
36913 dev_kfree_skb(sb);
36914 break;
36915 }
36916@@ -1095,7 +1095,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36917 ATM_SKB(sb)->vcc = vcc;
36918 __net_timestamp(sb);
36919 vcc->push(vcc, sb);
36920- atomic_inc(&vcc->stats->rx);
36921+ atomic_inc_unchecked(&vcc->stats->rx);
36922
36923 cell += ATM_CELL_PAYLOAD;
36924 }
36925@@ -1132,13 +1132,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36926 "(CDC: %08x)\n",
36927 card->name, len, rpp->len, readl(SAR_REG_CDC));
36928 recycle_rx_pool_skb(card, rpp);
36929- atomic_inc(&vcc->stats->rx_err);
36930+ atomic_inc_unchecked(&vcc->stats->rx_err);
36931 return;
36932 }
36933 if (stat & SAR_RSQE_CRC) {
36934 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
36935 recycle_rx_pool_skb(card, rpp);
36936- atomic_inc(&vcc->stats->rx_err);
36937+ atomic_inc_unchecked(&vcc->stats->rx_err);
36938 return;
36939 }
36940 if (skb_queue_len(&rpp->queue) > 1) {
36941@@ -1149,7 +1149,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36942 RXPRINTK("%s: Can't alloc RX skb.\n",
36943 card->name);
36944 recycle_rx_pool_skb(card, rpp);
36945- atomic_inc(&vcc->stats->rx_err);
36946+ atomic_inc_unchecked(&vcc->stats->rx_err);
36947 return;
36948 }
36949 if (!atm_charge(vcc, skb->truesize)) {
36950@@ -1168,7 +1168,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36951 __net_timestamp(skb);
36952
36953 vcc->push(vcc, skb);
36954- atomic_inc(&vcc->stats->rx);
36955+ atomic_inc_unchecked(&vcc->stats->rx);
36956
36957 return;
36958 }
36959@@ -1190,7 +1190,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
36960 __net_timestamp(skb);
36961
36962 vcc->push(vcc, skb);
36963- atomic_inc(&vcc->stats->rx);
36964+ atomic_inc_unchecked(&vcc->stats->rx);
36965
36966 if (skb->truesize > SAR_FB_SIZE_3)
36967 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
36968@@ -1301,14 +1301,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
36969 if (vcc->qos.aal != ATM_AAL0) {
36970 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
36971 card->name, vpi, vci);
36972- atomic_inc(&vcc->stats->rx_drop);
36973+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36974 goto drop;
36975 }
36976
36977 if ((sb = dev_alloc_skb(64)) == NULL) {
36978 printk("%s: Can't allocate buffers for AAL0.\n",
36979 card->name);
36980- atomic_inc(&vcc->stats->rx_err);
36981+ atomic_inc_unchecked(&vcc->stats->rx_err);
36982 goto drop;
36983 }
36984
36985@@ -1327,7 +1327,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
36986 ATM_SKB(sb)->vcc = vcc;
36987 __net_timestamp(sb);
36988 vcc->push(vcc, sb);
36989- atomic_inc(&vcc->stats->rx);
36990+ atomic_inc_unchecked(&vcc->stats->rx);
36991
36992 drop:
36993 skb_pull(queue, 64);
36994@@ -1952,13 +1952,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
36995
36996 if (vc == NULL) {
36997 printk("%s: NULL connection in send().\n", card->name);
36998- atomic_inc(&vcc->stats->tx_err);
36999+ atomic_inc_unchecked(&vcc->stats->tx_err);
37000 dev_kfree_skb(skb);
37001 return -EINVAL;
37002 }
37003 if (!test_bit(VCF_TX, &vc->flags)) {
37004 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37005- atomic_inc(&vcc->stats->tx_err);
37006+ atomic_inc_unchecked(&vcc->stats->tx_err);
37007 dev_kfree_skb(skb);
37008 return -EINVAL;
37009 }
37010@@ -1970,14 +1970,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37011 break;
37012 default:
37013 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37014- atomic_inc(&vcc->stats->tx_err);
37015+ atomic_inc_unchecked(&vcc->stats->tx_err);
37016 dev_kfree_skb(skb);
37017 return -EINVAL;
37018 }
37019
37020 if (skb_shinfo(skb)->nr_frags != 0) {
37021 printk("%s: No scatter-gather yet.\n", card->name);
37022- atomic_inc(&vcc->stats->tx_err);
37023+ atomic_inc_unchecked(&vcc->stats->tx_err);
37024 dev_kfree_skb(skb);
37025 return -EINVAL;
37026 }
37027@@ -1985,7 +1985,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37028
37029 err = queue_skb(card, vc, skb, oam);
37030 if (err) {
37031- atomic_inc(&vcc->stats->tx_err);
37032+ atomic_inc_unchecked(&vcc->stats->tx_err);
37033 dev_kfree_skb(skb);
37034 return err;
37035 }
37036@@ -2008,7 +2008,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37037 skb = dev_alloc_skb(64);
37038 if (!skb) {
37039 printk("%s: Out of memory in send_oam().\n", card->name);
37040- atomic_inc(&vcc->stats->tx_err);
37041+ atomic_inc_unchecked(&vcc->stats->tx_err);
37042 return -ENOMEM;
37043 }
37044 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37045diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37046index 4217f29..88f547a 100644
37047--- a/drivers/atm/iphase.c
37048+++ b/drivers/atm/iphase.c
37049@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37050 status = (u_short) (buf_desc_ptr->desc_mode);
37051 if (status & (RX_CER | RX_PTE | RX_OFL))
37052 {
37053- atomic_inc(&vcc->stats->rx_err);
37054+ atomic_inc_unchecked(&vcc->stats->rx_err);
37055 IF_ERR(printk("IA: bad packet, dropping it");)
37056 if (status & RX_CER) {
37057 IF_ERR(printk(" cause: packet CRC error\n");)
37058@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37059 len = dma_addr - buf_addr;
37060 if (len > iadev->rx_buf_sz) {
37061 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37062- atomic_inc(&vcc->stats->rx_err);
37063+ atomic_inc_unchecked(&vcc->stats->rx_err);
37064 goto out_free_desc;
37065 }
37066
37067@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37068 ia_vcc = INPH_IA_VCC(vcc);
37069 if (ia_vcc == NULL)
37070 {
37071- atomic_inc(&vcc->stats->rx_err);
37072+ atomic_inc_unchecked(&vcc->stats->rx_err);
37073 atm_return(vcc, skb->truesize);
37074 dev_kfree_skb_any(skb);
37075 goto INCR_DLE;
37076@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37077 if ((length > iadev->rx_buf_sz) || (length >
37078 (skb->len - sizeof(struct cpcs_trailer))))
37079 {
37080- atomic_inc(&vcc->stats->rx_err);
37081+ atomic_inc_unchecked(&vcc->stats->rx_err);
37082 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37083 length, skb->len);)
37084 atm_return(vcc, skb->truesize);
37085@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37086
37087 IF_RX(printk("rx_dle_intr: skb push");)
37088 vcc->push(vcc,skb);
37089- atomic_inc(&vcc->stats->rx);
37090+ atomic_inc_unchecked(&vcc->stats->rx);
37091 iadev->rx_pkt_cnt++;
37092 }
37093 INCR_DLE:
37094@@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37095 {
37096 struct k_sonet_stats *stats;
37097 stats = &PRIV(_ia_dev[board])->sonet_stats;
37098- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37099- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37100- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37101- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37102- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37103- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37104- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37105- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37106- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37107+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37108+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37109+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37110+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37111+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37112+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37113+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37114+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37115+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37116 }
37117 ia_cmds.status = 0;
37118 break;
37119@@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37120 if ((desc == 0) || (desc > iadev->num_tx_desc))
37121 {
37122 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37123- atomic_inc(&vcc->stats->tx);
37124+ atomic_inc_unchecked(&vcc->stats->tx);
37125 if (vcc->pop)
37126 vcc->pop(vcc, skb);
37127 else
37128@@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37129 ATM_DESC(skb) = vcc->vci;
37130 skb_queue_tail(&iadev->tx_dma_q, skb);
37131
37132- atomic_inc(&vcc->stats->tx);
37133+ atomic_inc_unchecked(&vcc->stats->tx);
37134 iadev->tx_pkt_cnt++;
37135 /* Increment transaction counter */
37136 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37137
37138 #if 0
37139 /* add flow control logic */
37140- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37141+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37142 if (iavcc->vc_desc_cnt > 10) {
37143 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37144 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37145diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37146index 93eaf8d..b4ca7da 100644
37147--- a/drivers/atm/lanai.c
37148+++ b/drivers/atm/lanai.c
37149@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37150 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37151 lanai_endtx(lanai, lvcc);
37152 lanai_free_skb(lvcc->tx.atmvcc, skb);
37153- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37154+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37155 }
37156
37157 /* Try to fill the buffer - don't call unless there is backlog */
37158@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37159 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37160 __net_timestamp(skb);
37161 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37162- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37163+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37164 out:
37165 lvcc->rx.buf.ptr = end;
37166 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37167@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37168 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37169 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37170 lanai->stats.service_rxnotaal5++;
37171- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37172+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37173 return 0;
37174 }
37175 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37176@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37177 int bytes;
37178 read_unlock(&vcc_sklist_lock);
37179 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37180- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37181+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37182 lvcc->stats.x.aal5.service_trash++;
37183 bytes = (SERVICE_GET_END(s) * 16) -
37184 (((unsigned long) lvcc->rx.buf.ptr) -
37185@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37186 }
37187 if (s & SERVICE_STREAM) {
37188 read_unlock(&vcc_sklist_lock);
37189- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37190+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37191 lvcc->stats.x.aal5.service_stream++;
37192 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37193 "PDU on VCI %d!\n", lanai->number, vci);
37194@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37195 return 0;
37196 }
37197 DPRINTK("got rx crc error on vci %d\n", vci);
37198- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37199+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37200 lvcc->stats.x.aal5.service_rxcrc++;
37201 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37202 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37203diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37204index 9988ac9..7c52585 100644
37205--- a/drivers/atm/nicstar.c
37206+++ b/drivers/atm/nicstar.c
37207@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37208 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37209 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37210 card->index);
37211- atomic_inc(&vcc->stats->tx_err);
37212+ atomic_inc_unchecked(&vcc->stats->tx_err);
37213 dev_kfree_skb_any(skb);
37214 return -EINVAL;
37215 }
37216@@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37217 if (!vc->tx) {
37218 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37219 card->index);
37220- atomic_inc(&vcc->stats->tx_err);
37221+ atomic_inc_unchecked(&vcc->stats->tx_err);
37222 dev_kfree_skb_any(skb);
37223 return -EINVAL;
37224 }
37225@@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37226 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37227 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37228 card->index);
37229- atomic_inc(&vcc->stats->tx_err);
37230+ atomic_inc_unchecked(&vcc->stats->tx_err);
37231 dev_kfree_skb_any(skb);
37232 return -EINVAL;
37233 }
37234
37235 if (skb_shinfo(skb)->nr_frags != 0) {
37236 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37237- atomic_inc(&vcc->stats->tx_err);
37238+ atomic_inc_unchecked(&vcc->stats->tx_err);
37239 dev_kfree_skb_any(skb);
37240 return -EINVAL;
37241 }
37242@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37243 }
37244
37245 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37246- atomic_inc(&vcc->stats->tx_err);
37247+ atomic_inc_unchecked(&vcc->stats->tx_err);
37248 dev_kfree_skb_any(skb);
37249 return -EIO;
37250 }
37251- atomic_inc(&vcc->stats->tx);
37252+ atomic_inc_unchecked(&vcc->stats->tx);
37253
37254 return 0;
37255 }
37256@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37257 printk
37258 ("nicstar%d: Can't allocate buffers for aal0.\n",
37259 card->index);
37260- atomic_add(i, &vcc->stats->rx_drop);
37261+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37262 break;
37263 }
37264 if (!atm_charge(vcc, sb->truesize)) {
37265 RXPRINTK
37266 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37267 card->index);
37268- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37269+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37270 dev_kfree_skb_any(sb);
37271 break;
37272 }
37273@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37274 ATM_SKB(sb)->vcc = vcc;
37275 __net_timestamp(sb);
37276 vcc->push(vcc, sb);
37277- atomic_inc(&vcc->stats->rx);
37278+ atomic_inc_unchecked(&vcc->stats->rx);
37279 cell += ATM_CELL_PAYLOAD;
37280 }
37281
37282@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37283 if (iovb == NULL) {
37284 printk("nicstar%d: Out of iovec buffers.\n",
37285 card->index);
37286- atomic_inc(&vcc->stats->rx_drop);
37287+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37288 recycle_rx_buf(card, skb);
37289 return;
37290 }
37291@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37292 small or large buffer itself. */
37293 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37294 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37295- atomic_inc(&vcc->stats->rx_err);
37296+ atomic_inc_unchecked(&vcc->stats->rx_err);
37297 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37298 NS_MAX_IOVECS);
37299 NS_PRV_IOVCNT(iovb) = 0;
37300@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37301 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37302 card->index);
37303 which_list(card, skb);
37304- atomic_inc(&vcc->stats->rx_err);
37305+ atomic_inc_unchecked(&vcc->stats->rx_err);
37306 recycle_rx_buf(card, skb);
37307 vc->rx_iov = NULL;
37308 recycle_iov_buf(card, iovb);
37309@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37310 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37311 card->index);
37312 which_list(card, skb);
37313- atomic_inc(&vcc->stats->rx_err);
37314+ atomic_inc_unchecked(&vcc->stats->rx_err);
37315 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37316 NS_PRV_IOVCNT(iovb));
37317 vc->rx_iov = NULL;
37318@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37319 printk(" - PDU size mismatch.\n");
37320 else
37321 printk(".\n");
37322- atomic_inc(&vcc->stats->rx_err);
37323+ atomic_inc_unchecked(&vcc->stats->rx_err);
37324 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37325 NS_PRV_IOVCNT(iovb));
37326 vc->rx_iov = NULL;
37327@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37328 /* skb points to a small buffer */
37329 if (!atm_charge(vcc, skb->truesize)) {
37330 push_rxbufs(card, skb);
37331- atomic_inc(&vcc->stats->rx_drop);
37332+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37333 } else {
37334 skb_put(skb, len);
37335 dequeue_sm_buf(card, skb);
37336@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37337 ATM_SKB(skb)->vcc = vcc;
37338 __net_timestamp(skb);
37339 vcc->push(vcc, skb);
37340- atomic_inc(&vcc->stats->rx);
37341+ atomic_inc_unchecked(&vcc->stats->rx);
37342 }
37343 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37344 struct sk_buff *sb;
37345@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37346 if (len <= NS_SMBUFSIZE) {
37347 if (!atm_charge(vcc, sb->truesize)) {
37348 push_rxbufs(card, sb);
37349- atomic_inc(&vcc->stats->rx_drop);
37350+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37351 } else {
37352 skb_put(sb, len);
37353 dequeue_sm_buf(card, sb);
37354@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37355 ATM_SKB(sb)->vcc = vcc;
37356 __net_timestamp(sb);
37357 vcc->push(vcc, sb);
37358- atomic_inc(&vcc->stats->rx);
37359+ atomic_inc_unchecked(&vcc->stats->rx);
37360 }
37361
37362 push_rxbufs(card, skb);
37363@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37364
37365 if (!atm_charge(vcc, skb->truesize)) {
37366 push_rxbufs(card, skb);
37367- atomic_inc(&vcc->stats->rx_drop);
37368+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37369 } else {
37370 dequeue_lg_buf(card, skb);
37371 #ifdef NS_USE_DESTRUCTORS
37372@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37373 ATM_SKB(skb)->vcc = vcc;
37374 __net_timestamp(skb);
37375 vcc->push(vcc, skb);
37376- atomic_inc(&vcc->stats->rx);
37377+ atomic_inc_unchecked(&vcc->stats->rx);
37378 }
37379
37380 push_rxbufs(card, sb);
37381@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37382 printk
37383 ("nicstar%d: Out of huge buffers.\n",
37384 card->index);
37385- atomic_inc(&vcc->stats->rx_drop);
37386+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37387 recycle_iovec_rx_bufs(card,
37388 (struct iovec *)
37389 iovb->data,
37390@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37391 card->hbpool.count++;
37392 } else
37393 dev_kfree_skb_any(hb);
37394- atomic_inc(&vcc->stats->rx_drop);
37395+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37396 } else {
37397 /* Copy the small buffer to the huge buffer */
37398 sb = (struct sk_buff *)iov->iov_base;
37399@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37400 #endif /* NS_USE_DESTRUCTORS */
37401 __net_timestamp(hb);
37402 vcc->push(vcc, hb);
37403- atomic_inc(&vcc->stats->rx);
37404+ atomic_inc_unchecked(&vcc->stats->rx);
37405 }
37406 }
37407
37408diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37409index 21b0bc6..b5f40ba 100644
37410--- a/drivers/atm/solos-pci.c
37411+++ b/drivers/atm/solos-pci.c
37412@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37413 }
37414 atm_charge(vcc, skb->truesize);
37415 vcc->push(vcc, skb);
37416- atomic_inc(&vcc->stats->rx);
37417+ atomic_inc_unchecked(&vcc->stats->rx);
37418 break;
37419
37420 case PKT_STATUS:
37421@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37422 vcc = SKB_CB(oldskb)->vcc;
37423
37424 if (vcc) {
37425- atomic_inc(&vcc->stats->tx);
37426+ atomic_inc_unchecked(&vcc->stats->tx);
37427 solos_pop(vcc, oldskb);
37428 } else {
37429 dev_kfree_skb_irq(oldskb);
37430diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37431index 0215934..ce9f5b1 100644
37432--- a/drivers/atm/suni.c
37433+++ b/drivers/atm/suni.c
37434@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37435
37436
37437 #define ADD_LIMITED(s,v) \
37438- atomic_add((v),&stats->s); \
37439- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37440+ atomic_add_unchecked((v),&stats->s); \
37441+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37442
37443
37444 static void suni_hz(unsigned long from_timer)
37445diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37446index 5120a96..e2572bd 100644
37447--- a/drivers/atm/uPD98402.c
37448+++ b/drivers/atm/uPD98402.c
37449@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37450 struct sonet_stats tmp;
37451 int error = 0;
37452
37453- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37454+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37455 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37456 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37457 if (zero && !error) {
37458@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37459
37460
37461 #define ADD_LIMITED(s,v) \
37462- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37463- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37464- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37465+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37466+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37467+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37468
37469
37470 static void stat_event(struct atm_dev *dev)
37471@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37472 if (reason & uPD98402_INT_PFM) stat_event(dev);
37473 if (reason & uPD98402_INT_PCO) {
37474 (void) GET(PCOCR); /* clear interrupt cause */
37475- atomic_add(GET(HECCT),
37476+ atomic_add_unchecked(GET(HECCT),
37477 &PRIV(dev)->sonet_stats.uncorr_hcs);
37478 }
37479 if ((reason & uPD98402_INT_RFO) &&
37480@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37481 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37482 uPD98402_INT_LOS),PIMR); /* enable them */
37483 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37484- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37485- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37486- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37487+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37488+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37489+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37490 return 0;
37491 }
37492
37493diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37494index 969c3c2..9b72956 100644
37495--- a/drivers/atm/zatm.c
37496+++ b/drivers/atm/zatm.c
37497@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37498 }
37499 if (!size) {
37500 dev_kfree_skb_irq(skb);
37501- if (vcc) atomic_inc(&vcc->stats->rx_err);
37502+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37503 continue;
37504 }
37505 if (!atm_charge(vcc,skb->truesize)) {
37506@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37507 skb->len = size;
37508 ATM_SKB(skb)->vcc = vcc;
37509 vcc->push(vcc,skb);
37510- atomic_inc(&vcc->stats->rx);
37511+ atomic_inc_unchecked(&vcc->stats->rx);
37512 }
37513 zout(pos & 0xffff,MTA(mbx));
37514 #if 0 /* probably a stupid idea */
37515@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37516 skb_queue_head(&zatm_vcc->backlog,skb);
37517 break;
37518 }
37519- atomic_inc(&vcc->stats->tx);
37520+ atomic_inc_unchecked(&vcc->stats->tx);
37521 wake_up(&zatm_vcc->tx_wait);
37522 }
37523
37524diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37525index 83e910a..b224a73 100644
37526--- a/drivers/base/bus.c
37527+++ b/drivers/base/bus.c
37528@@ -1124,7 +1124,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37529 return -EINVAL;
37530
37531 mutex_lock(&subsys->p->mutex);
37532- list_add_tail(&sif->node, &subsys->p->interfaces);
37533+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37534 if (sif->add_dev) {
37535 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37536 while ((dev = subsys_dev_iter_next(&iter)))
37537@@ -1149,7 +1149,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37538 subsys = sif->subsys;
37539
37540 mutex_lock(&subsys->p->mutex);
37541- list_del_init(&sif->node);
37542+ pax_list_del_init((struct list_head *)&sif->node);
37543 if (sif->remove_dev) {
37544 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37545 while ((dev = subsys_dev_iter_next(&iter)))
37546diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37547index 25798db..15f130e 100644
37548--- a/drivers/base/devtmpfs.c
37549+++ b/drivers/base/devtmpfs.c
37550@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37551 if (!thread)
37552 return 0;
37553
37554- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37555+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37556 if (err)
37557 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37558 else
37559@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37560 *err = sys_unshare(CLONE_NEWNS);
37561 if (*err)
37562 goto out;
37563- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37564+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37565 if (*err)
37566 goto out;
37567- sys_chdir("/.."); /* will traverse into overmounted root */
37568- sys_chroot(".");
37569+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37570+ sys_chroot((char __force_user *)".");
37571 complete(&setup_done);
37572 while (1) {
37573 spin_lock(&req_lock);
37574diff --git a/drivers/base/node.c b/drivers/base/node.c
37575index 472168c..4af587e 100644
37576--- a/drivers/base/node.c
37577+++ b/drivers/base/node.c
37578@@ -620,7 +620,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37579 struct node_attr {
37580 struct device_attribute attr;
37581 enum node_states state;
37582-};
37583+} __do_const;
37584
37585 static ssize_t show_node_state(struct device *dev,
37586 struct device_attribute *attr, char *buf)
37587diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37588index fb83d4a..4aa50ec 100644
37589--- a/drivers/base/power/domain.c
37590+++ b/drivers/base/power/domain.c
37591@@ -1725,7 +1725,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37592 {
37593 struct cpuidle_driver *cpuidle_drv;
37594 struct gpd_cpuidle_data *cpuidle_data;
37595- struct cpuidle_state *idle_state;
37596+ cpuidle_state_no_const *idle_state;
37597 int ret = 0;
37598
37599 if (IS_ERR_OR_NULL(genpd) || state < 0)
37600@@ -1793,7 +1793,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37601 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37602 {
37603 struct gpd_cpuidle_data *cpuidle_data;
37604- struct cpuidle_state *idle_state;
37605+ cpuidle_state_no_const *idle_state;
37606 int ret = 0;
37607
37608 if (IS_ERR_OR_NULL(genpd))
37609diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37610index a9d26ed..74b8405 100644
37611--- a/drivers/base/power/sysfs.c
37612+++ b/drivers/base/power/sysfs.c
37613@@ -182,7 +182,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37614 return -EIO;
37615 }
37616 }
37617- return sprintf(buf, p);
37618+ return sprintf(buf, "%s", p);
37619 }
37620
37621 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37622diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37623index c2744b3..08fac19 100644
37624--- a/drivers/base/power/wakeup.c
37625+++ b/drivers/base/power/wakeup.c
37626@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37627 * They need to be modified together atomically, so it's better to use one
37628 * atomic variable to hold them both.
37629 */
37630-static atomic_t combined_event_count = ATOMIC_INIT(0);
37631+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37632
37633 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37634 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37635
37636 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37637 {
37638- unsigned int comb = atomic_read(&combined_event_count);
37639+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
37640
37641 *cnt = (comb >> IN_PROGRESS_BITS);
37642 *inpr = comb & MAX_IN_PROGRESS;
37643@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37644 ws->start_prevent_time = ws->last_time;
37645
37646 /* Increment the counter of events in progress. */
37647- cec = atomic_inc_return(&combined_event_count);
37648+ cec = atomic_inc_return_unchecked(&combined_event_count);
37649
37650 trace_wakeup_source_activate(ws->name, cec);
37651 }
37652@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37653 * Increment the counter of registered wakeup events and decrement the
37654 * couter of wakeup events in progress simultaneously.
37655 */
37656- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37657+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37658 trace_wakeup_source_deactivate(ws->name, cec);
37659
37660 split_counters(&cnt, &inpr);
37661diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37662index 8d98a32..61d3165 100644
37663--- a/drivers/base/syscore.c
37664+++ b/drivers/base/syscore.c
37665@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37666 void register_syscore_ops(struct syscore_ops *ops)
37667 {
37668 mutex_lock(&syscore_ops_lock);
37669- list_add_tail(&ops->node, &syscore_ops_list);
37670+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37671 mutex_unlock(&syscore_ops_lock);
37672 }
37673 EXPORT_SYMBOL_GPL(register_syscore_ops);
37674@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37675 void unregister_syscore_ops(struct syscore_ops *ops)
37676 {
37677 mutex_lock(&syscore_ops_lock);
37678- list_del(&ops->node);
37679+ pax_list_del((struct list_head *)&ops->node);
37680 mutex_unlock(&syscore_ops_lock);
37681 }
37682 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37683diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37684index ff20f19..018f1da 100644
37685--- a/drivers/block/cciss.c
37686+++ b/drivers/block/cciss.c
37687@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
37688 while (!list_empty(&h->reqQ)) {
37689 c = list_entry(h->reqQ.next, CommandList_struct, list);
37690 /* can't do anything if fifo is full */
37691- if ((h->access.fifo_full(h))) {
37692+ if ((h->access->fifo_full(h))) {
37693 dev_warn(&h->pdev->dev, "fifo full\n");
37694 break;
37695 }
37696@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
37697 h->Qdepth--;
37698
37699 /* Tell the controller execute command */
37700- h->access.submit_command(h, c);
37701+ h->access->submit_command(h, c);
37702
37703 /* Put job onto the completed Q */
37704 addQ(&h->cmpQ, c);
37705@@ -3444,17 +3444,17 @@ startio:
37706
37707 static inline unsigned long get_next_completion(ctlr_info_t *h)
37708 {
37709- return h->access.command_completed(h);
37710+ return h->access->command_completed(h);
37711 }
37712
37713 static inline int interrupt_pending(ctlr_info_t *h)
37714 {
37715- return h->access.intr_pending(h);
37716+ return h->access->intr_pending(h);
37717 }
37718
37719 static inline long interrupt_not_for_us(ctlr_info_t *h)
37720 {
37721- return ((h->access.intr_pending(h) == 0) ||
37722+ return ((h->access->intr_pending(h) == 0) ||
37723 (h->interrupts_enabled == 0));
37724 }
37725
37726@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
37727 u32 a;
37728
37729 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37730- return h->access.command_completed(h);
37731+ return h->access->command_completed(h);
37732
37733 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
37734 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
37735@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
37736 trans_support & CFGTBL_Trans_use_short_tags);
37737
37738 /* Change the access methods to the performant access methods */
37739- h->access = SA5_performant_access;
37740+ h->access = &SA5_performant_access;
37741 h->transMethod = CFGTBL_Trans_Performant;
37742
37743 return;
37744@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
37745 if (prod_index < 0)
37746 return -ENODEV;
37747 h->product_name = products[prod_index].product_name;
37748- h->access = *(products[prod_index].access);
37749+ h->access = products[prod_index].access;
37750
37751 if (cciss_board_disabled(h)) {
37752 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
37753@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
37754 }
37755
37756 /* make sure the board interrupts are off */
37757- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37758+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37759 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
37760 if (rc)
37761 goto clean2;
37762@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
37763 * fake ones to scoop up any residual completions.
37764 */
37765 spin_lock_irqsave(&h->lock, flags);
37766- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37767+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37768 spin_unlock_irqrestore(&h->lock, flags);
37769 free_irq(h->intr[h->intr_mode], h);
37770 rc = cciss_request_irq(h, cciss_msix_discard_completions,
37771@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
37772 dev_info(&h->pdev->dev, "Board READY.\n");
37773 dev_info(&h->pdev->dev,
37774 "Waiting for stale completions to drain.\n");
37775- h->access.set_intr_mask(h, CCISS_INTR_ON);
37776+ h->access->set_intr_mask(h, CCISS_INTR_ON);
37777 msleep(10000);
37778- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37779+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37780
37781 rc = controller_reset_failed(h->cfgtable);
37782 if (rc)
37783@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
37784 cciss_scsi_setup(h);
37785
37786 /* Turn the interrupts on so we can service requests */
37787- h->access.set_intr_mask(h, CCISS_INTR_ON);
37788+ h->access->set_intr_mask(h, CCISS_INTR_ON);
37789
37790 /* Get the firmware version */
37791 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
37792@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
37793 kfree(flush_buf);
37794 if (return_code != IO_OK)
37795 dev_warn(&h->pdev->dev, "Error flushing cache\n");
37796- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37797+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
37798 free_irq(h->intr[h->intr_mode], h);
37799 }
37800
37801diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
37802index 7fda30e..2f27946 100644
37803--- a/drivers/block/cciss.h
37804+++ b/drivers/block/cciss.h
37805@@ -101,7 +101,7 @@ struct ctlr_info
37806 /* information about each logical volume */
37807 drive_info_struct *drv[CISS_MAX_LUN];
37808
37809- struct access_method access;
37810+ struct access_method *access;
37811
37812 /* queue and queue Info */
37813 struct list_head reqQ;
37814@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
37815 }
37816
37817 static struct access_method SA5_access = {
37818- SA5_submit_command,
37819- SA5_intr_mask,
37820- SA5_fifo_full,
37821- SA5_intr_pending,
37822- SA5_completed,
37823+ .submit_command = SA5_submit_command,
37824+ .set_intr_mask = SA5_intr_mask,
37825+ .fifo_full = SA5_fifo_full,
37826+ .intr_pending = SA5_intr_pending,
37827+ .command_completed = SA5_completed,
37828 };
37829
37830 static struct access_method SA5B_access = {
37831- SA5_submit_command,
37832- SA5B_intr_mask,
37833- SA5_fifo_full,
37834- SA5B_intr_pending,
37835- SA5_completed,
37836+ .submit_command = SA5_submit_command,
37837+ .set_intr_mask = SA5B_intr_mask,
37838+ .fifo_full = SA5_fifo_full,
37839+ .intr_pending = SA5B_intr_pending,
37840+ .command_completed = SA5_completed,
37841 };
37842
37843 static struct access_method SA5_performant_access = {
37844- SA5_submit_command,
37845- SA5_performant_intr_mask,
37846- SA5_fifo_full,
37847- SA5_performant_intr_pending,
37848- SA5_performant_completed,
37849+ .submit_command = SA5_submit_command,
37850+ .set_intr_mask = SA5_performant_intr_mask,
37851+ .fifo_full = SA5_fifo_full,
37852+ .intr_pending = SA5_performant_intr_pending,
37853+ .command_completed = SA5_performant_completed,
37854 };
37855
37856 struct board_type {
37857diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
37858index 2b94403..fd6ad1f 100644
37859--- a/drivers/block/cpqarray.c
37860+++ b/drivers/block/cpqarray.c
37861@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37862 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
37863 goto Enomem4;
37864 }
37865- hba[i]->access.set_intr_mask(hba[i], 0);
37866+ hba[i]->access->set_intr_mask(hba[i], 0);
37867 if (request_irq(hba[i]->intr, do_ida_intr,
37868 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
37869 {
37870@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
37871 add_timer(&hba[i]->timer);
37872
37873 /* Enable IRQ now that spinlock and rate limit timer are set up */
37874- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37875+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
37876
37877 for(j=0; j<NWD; j++) {
37878 struct gendisk *disk = ida_gendisk[i][j];
37879@@ -694,7 +694,7 @@ DBGINFO(
37880 for(i=0; i<NR_PRODUCTS; i++) {
37881 if (board_id == products[i].board_id) {
37882 c->product_name = products[i].product_name;
37883- c->access = *(products[i].access);
37884+ c->access = products[i].access;
37885 break;
37886 }
37887 }
37888@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
37889 hba[ctlr]->intr = intr;
37890 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
37891 hba[ctlr]->product_name = products[j].product_name;
37892- hba[ctlr]->access = *(products[j].access);
37893+ hba[ctlr]->access = products[j].access;
37894 hba[ctlr]->ctlr = ctlr;
37895 hba[ctlr]->board_id = board_id;
37896 hba[ctlr]->pci_dev = NULL; /* not PCI */
37897@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
37898
37899 while((c = h->reqQ) != NULL) {
37900 /* Can't do anything if we're busy */
37901- if (h->access.fifo_full(h) == 0)
37902+ if (h->access->fifo_full(h) == 0)
37903 return;
37904
37905 /* Get the first entry from the request Q */
37906@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
37907 h->Qdepth--;
37908
37909 /* Tell the controller to do our bidding */
37910- h->access.submit_command(h, c);
37911+ h->access->submit_command(h, c);
37912
37913 /* Get onto the completion Q */
37914 addQ(&h->cmpQ, c);
37915@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37916 unsigned long flags;
37917 __u32 a,a1;
37918
37919- istat = h->access.intr_pending(h);
37920+ istat = h->access->intr_pending(h);
37921 /* Is this interrupt for us? */
37922 if (istat == 0)
37923 return IRQ_NONE;
37924@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
37925 */
37926 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
37927 if (istat & FIFO_NOT_EMPTY) {
37928- while((a = h->access.command_completed(h))) {
37929+ while((a = h->access->command_completed(h))) {
37930 a1 = a; a &= ~3;
37931 if ((c = h->cmpQ) == NULL)
37932 {
37933@@ -1448,11 +1448,11 @@ static int sendcmd(
37934 /*
37935 * Disable interrupt
37936 */
37937- info_p->access.set_intr_mask(info_p, 0);
37938+ info_p->access->set_intr_mask(info_p, 0);
37939 /* Make sure there is room in the command FIFO */
37940 /* Actually it should be completely empty at this time. */
37941 for (i = 200000; i > 0; i--) {
37942- temp = info_p->access.fifo_full(info_p);
37943+ temp = info_p->access->fifo_full(info_p);
37944 if (temp != 0) {
37945 break;
37946 }
37947@@ -1465,7 +1465,7 @@ DBG(
37948 /*
37949 * Send the cmd
37950 */
37951- info_p->access.submit_command(info_p, c);
37952+ info_p->access->submit_command(info_p, c);
37953 complete = pollcomplete(ctlr);
37954
37955 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
37956@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
37957 * we check the new geometry. Then turn interrupts back on when
37958 * we're done.
37959 */
37960- host->access.set_intr_mask(host, 0);
37961+ host->access->set_intr_mask(host, 0);
37962 getgeometry(ctlr);
37963- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
37964+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
37965
37966 for(i=0; i<NWD; i++) {
37967 struct gendisk *disk = ida_gendisk[ctlr][i];
37968@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
37969 /* Wait (up to 2 seconds) for a command to complete */
37970
37971 for (i = 200000; i > 0; i--) {
37972- done = hba[ctlr]->access.command_completed(hba[ctlr]);
37973+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
37974 if (done == 0) {
37975 udelay(10); /* a short fixed delay */
37976 } else
37977diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
37978index be73e9d..7fbf140 100644
37979--- a/drivers/block/cpqarray.h
37980+++ b/drivers/block/cpqarray.h
37981@@ -99,7 +99,7 @@ struct ctlr_info {
37982 drv_info_t drv[NWD];
37983 struct proc_dir_entry *proc;
37984
37985- struct access_method access;
37986+ struct access_method *access;
37987
37988 cmdlist_t *reqQ;
37989 cmdlist_t *cmpQ;
37990diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
37991index 434c77d..6d3219a 100644
37992--- a/drivers/block/drbd/drbd_bitmap.c
37993+++ b/drivers/block/drbd/drbd_bitmap.c
37994@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
37995 submit_bio(rw, bio);
37996 /* this should not count as user activity and cause the
37997 * resync to throttle -- see drbd_rs_should_slow_down(). */
37998- atomic_add(len >> 9, &device->rs_sect_ev);
37999+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38000 }
38001 }
38002
38003diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38004index 9b22f8f..f2932af 100644
38005--- a/drivers/block/drbd/drbd_int.h
38006+++ b/drivers/block/drbd/drbd_int.h
38007@@ -385,7 +385,7 @@ struct drbd_epoch {
38008 struct drbd_connection *connection;
38009 struct list_head list;
38010 unsigned int barrier_nr;
38011- atomic_t epoch_size; /* increased on every request added. */
38012+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38013 atomic_t active; /* increased on every req. added, and dec on every finished. */
38014 unsigned long flags;
38015 };
38016@@ -946,7 +946,7 @@ struct drbd_device {
38017 unsigned int al_tr_number;
38018 int al_tr_cycle;
38019 wait_queue_head_t seq_wait;
38020- atomic_t packet_seq;
38021+ atomic_unchecked_t packet_seq;
38022 unsigned int peer_seq;
38023 spinlock_t peer_seq_lock;
38024 unsigned long comm_bm_set; /* communicated number of set bits. */
38025@@ -955,8 +955,8 @@ struct drbd_device {
38026 struct mutex own_state_mutex;
38027 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38028 char congestion_reason; /* Why we where congested... */
38029- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38030- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38031+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38032+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38033 int rs_last_sect_ev; /* counter to compare with */
38034 int rs_last_events; /* counter of read or write "events" (unit sectors)
38035 * on the lower level device when we last looked. */
38036@@ -1567,7 +1567,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
38037 char __user *uoptval;
38038 int err;
38039
38040- uoptval = (char __user __force *)optval;
38041+ uoptval = (char __force_user *)optval;
38042
38043 set_fs(KERNEL_DS);
38044 if (level == SOL_SOCKET)
38045diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38046index 973c185..05d8b1a 100644
38047--- a/drivers/block/drbd/drbd_main.c
38048+++ b/drivers/block/drbd/drbd_main.c
38049@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38050 p->sector = sector;
38051 p->block_id = block_id;
38052 p->blksize = blksize;
38053- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38054+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38055 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38056 }
38057
38058@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38059 return -EIO;
38060 p->sector = cpu_to_be64(req->i.sector);
38061 p->block_id = (unsigned long)req;
38062- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38063+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38064 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38065 if (device->state.conn >= C_SYNC_SOURCE &&
38066 device->state.conn <= C_PAUSED_SYNC_T)
38067@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38068 atomic_set(&device->unacked_cnt, 0);
38069 atomic_set(&device->local_cnt, 0);
38070 atomic_set(&device->pp_in_use_by_net, 0);
38071- atomic_set(&device->rs_sect_in, 0);
38072- atomic_set(&device->rs_sect_ev, 0);
38073+ atomic_set_unchecked(&device->rs_sect_in, 0);
38074+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38075 atomic_set(&device->ap_in_flight, 0);
38076 atomic_set(&device->md_io.in_use, 0);
38077
38078@@ -2688,8 +2688,8 @@ void drbd_destroy_connection(struct kref *kref)
38079 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38080 struct drbd_resource *resource = connection->resource;
38081
38082- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38083- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38084+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38085+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38086 kfree(connection->current_epoch);
38087
38088 idr_destroy(&connection->peer_devices);
38089diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38090index 1cd47df..57c53c0 100644
38091--- a/drivers/block/drbd/drbd_nl.c
38092+++ b/drivers/block/drbd/drbd_nl.c
38093@@ -3645,13 +3645,13 @@ finish:
38094
38095 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38096 {
38097- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38098+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38099 struct sk_buff *msg;
38100 struct drbd_genlmsghdr *d_out;
38101 unsigned seq;
38102 int err = -ENOMEM;
38103
38104- seq = atomic_inc_return(&drbd_genl_seq);
38105+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38106 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38107 if (!msg)
38108 goto failed;
38109diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38110index 6960fb0..215d76b 100644
38111--- a/drivers/block/drbd/drbd_receiver.c
38112+++ b/drivers/block/drbd/drbd_receiver.c
38113@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38114 struct drbd_device *device = peer_device->device;
38115 int err;
38116
38117- atomic_set(&device->packet_seq, 0);
38118+ atomic_set_unchecked(&device->packet_seq, 0);
38119 device->peer_seq = 0;
38120
38121 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38122@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38123 do {
38124 next_epoch = NULL;
38125
38126- epoch_size = atomic_read(&epoch->epoch_size);
38127+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38128
38129 switch (ev & ~EV_CLEANUP) {
38130 case EV_PUT:
38131@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38132 rv = FE_DESTROYED;
38133 } else {
38134 epoch->flags = 0;
38135- atomic_set(&epoch->epoch_size, 0);
38136+ atomic_set_unchecked(&epoch->epoch_size, 0);
38137 /* atomic_set(&epoch->active, 0); is already zero */
38138 if (rv == FE_STILL_LIVE)
38139 rv = FE_RECYCLED;
38140@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38141 conn_wait_active_ee_empty(connection);
38142 drbd_flush(connection);
38143
38144- if (atomic_read(&connection->current_epoch->epoch_size)) {
38145+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38146 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38147 if (epoch)
38148 break;
38149@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38150 }
38151
38152 epoch->flags = 0;
38153- atomic_set(&epoch->epoch_size, 0);
38154+ atomic_set_unchecked(&epoch->epoch_size, 0);
38155 atomic_set(&epoch->active, 0);
38156
38157 spin_lock(&connection->epoch_lock);
38158- if (atomic_read(&connection->current_epoch->epoch_size)) {
38159+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38160 list_add(&epoch->list, &connection->current_epoch->list);
38161 connection->current_epoch = epoch;
38162 connection->epochs++;
38163@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38164 list_add_tail(&peer_req->w.list, &device->sync_ee);
38165 spin_unlock_irq(&device->resource->req_lock);
38166
38167- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38168+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38169 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38170 return 0;
38171
38172@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38173 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38174 }
38175
38176- atomic_add(pi->size >> 9, &device->rs_sect_in);
38177+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38178
38179 return err;
38180 }
38181@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38182
38183 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38184 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38185- atomic_inc(&connection->current_epoch->epoch_size);
38186+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38187 err2 = drbd_drain_block(peer_device, pi->size);
38188 if (!err)
38189 err = err2;
38190@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38191
38192 spin_lock(&connection->epoch_lock);
38193 peer_req->epoch = connection->current_epoch;
38194- atomic_inc(&peer_req->epoch->epoch_size);
38195+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38196 atomic_inc(&peer_req->epoch->active);
38197 spin_unlock(&connection->epoch_lock);
38198
38199@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38200
38201 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38202 (int)part_stat_read(&disk->part0, sectors[1]) -
38203- atomic_read(&device->rs_sect_ev);
38204+ atomic_read_unchecked(&device->rs_sect_ev);
38205
38206 if (atomic_read(&device->ap_actlog_cnt)
38207 || !device->rs_last_events || curr_events - device->rs_last_events > 64) {
38208@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38209 device->use_csums = true;
38210 } else if (pi->cmd == P_OV_REPLY) {
38211 /* track progress, we may need to throttle */
38212- atomic_add(size >> 9, &device->rs_sect_in);
38213+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38214 peer_req->w.cb = w_e_end_ov_reply;
38215 dec_rs_pending(device);
38216 /* drbd_rs_begin_io done when we sent this request,
38217@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38218 goto out_free_e;
38219
38220 submit_for_resync:
38221- atomic_add(size >> 9, &device->rs_sect_ev);
38222+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38223
38224 submit:
38225 update_receiver_timing_details(connection, drbd_submit_peer_request);
38226@@ -4564,7 +4564,7 @@ struct data_cmd {
38227 int expect_payload;
38228 size_t pkt_size;
38229 int (*fn)(struct drbd_connection *, struct packet_info *);
38230-};
38231+} __do_const;
38232
38233 static struct data_cmd drbd_cmd_handler[] = {
38234 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38235@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38236 if (!list_empty(&connection->current_epoch->list))
38237 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38238 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38239- atomic_set(&connection->current_epoch->epoch_size, 0);
38240+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38241 connection->send.seen_any_write_yet = false;
38242
38243 drbd_info(connection, "Connection closed\n");
38244@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38245 put_ldev(device);
38246 }
38247 dec_rs_pending(device);
38248- atomic_add(blksize >> 9, &device->rs_sect_in);
38249+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38250
38251 return 0;
38252 }
38253@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38254 struct asender_cmd {
38255 size_t pkt_size;
38256 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38257-};
38258+} __do_const;
38259
38260 static struct asender_cmd asender_tbl[] = {
38261 [P_PING] = { 0, got_Ping },
38262diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38263index d2d1f97..6a1188f 100644
38264--- a/drivers/block/drbd/drbd_worker.c
38265+++ b/drivers/block/drbd/drbd_worker.c
38266@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38267 list_add_tail(&peer_req->w.list, &device->read_ee);
38268 spin_unlock_irq(&device->resource->req_lock);
38269
38270- atomic_add(size >> 9, &device->rs_sect_ev);
38271+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38272 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38273 return 0;
38274
38275@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38276 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38277 int number, mxb;
38278
38279- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38280+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38281 device->rs_in_flight -= sect_in;
38282
38283 rcu_read_lock();
38284@@ -1594,8 +1594,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38285 {
38286 struct fifo_buffer *plan;
38287
38288- atomic_set(&device->rs_sect_in, 0);
38289- atomic_set(&device->rs_sect_ev, 0);
38290+ atomic_set_unchecked(&device->rs_sect_in, 0);
38291+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38292 device->rs_in_flight = 0;
38293
38294 /* Updating the RCU protected object in place is necessary since
38295diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38296index 6cb1beb..bf490f7 100644
38297--- a/drivers/block/loop.c
38298+++ b/drivers/block/loop.c
38299@@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
38300
38301 file_start_write(file);
38302 set_fs(get_ds());
38303- bw = file->f_op->write(file, buf, len, &pos);
38304+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38305 set_fs(old_fs);
38306 file_end_write(file);
38307 if (likely(bw == len))
38308diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
38309index e2bb8af..44b8aef 100644
38310--- a/drivers/block/nvme-core.c
38311+++ b/drivers/block/nvme-core.c
38312@@ -73,7 +73,6 @@ static LIST_HEAD(dev_list);
38313 static struct task_struct *nvme_thread;
38314 static struct workqueue_struct *nvme_workq;
38315 static wait_queue_head_t nvme_kthread_wait;
38316-static struct notifier_block nvme_nb;
38317
38318 static void nvme_reset_failed_dev(struct work_struct *ws);
38319
38320@@ -2926,6 +2925,10 @@ static struct pci_driver nvme_driver = {
38321 .err_handler = &nvme_err_handler,
38322 };
38323
38324+static struct notifier_block nvme_nb = {
38325+ .notifier_call = &nvme_cpu_notify,
38326+};
38327+
38328 static int __init nvme_init(void)
38329 {
38330 int result;
38331@@ -2942,7 +2945,6 @@ static int __init nvme_init(void)
38332 else if (result > 0)
38333 nvme_major = result;
38334
38335- nvme_nb.notifier_call = &nvme_cpu_notify;
38336 result = register_hotcpu_notifier(&nvme_nb);
38337 if (result)
38338 goto unregister_blkdev;
38339diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38340index 09e628da..7607aaa 100644
38341--- a/drivers/block/pktcdvd.c
38342+++ b/drivers/block/pktcdvd.c
38343@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38344
38345 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38346 {
38347- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38348+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38349 }
38350
38351 /*
38352@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38353 return -EROFS;
38354 }
38355 pd->settings.fp = ti.fp;
38356- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38357+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38358
38359 if (ti.nwa_v) {
38360 pd->nwa = be32_to_cpu(ti.next_writable);
38361diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38362index e5565fb..71be10b4 100644
38363--- a/drivers/block/smart1,2.h
38364+++ b/drivers/block/smart1,2.h
38365@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38366 }
38367
38368 static struct access_method smart4_access = {
38369- smart4_submit_command,
38370- smart4_intr_mask,
38371- smart4_fifo_full,
38372- smart4_intr_pending,
38373- smart4_completed,
38374+ .submit_command = smart4_submit_command,
38375+ .set_intr_mask = smart4_intr_mask,
38376+ .fifo_full = smart4_fifo_full,
38377+ .intr_pending = smart4_intr_pending,
38378+ .command_completed = smart4_completed,
38379 };
38380
38381 /*
38382@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38383 }
38384
38385 static struct access_method smart2_access = {
38386- smart2_submit_command,
38387- smart2_intr_mask,
38388- smart2_fifo_full,
38389- smart2_intr_pending,
38390- smart2_completed,
38391+ .submit_command = smart2_submit_command,
38392+ .set_intr_mask = smart2_intr_mask,
38393+ .fifo_full = smart2_fifo_full,
38394+ .intr_pending = smart2_intr_pending,
38395+ .command_completed = smart2_completed,
38396 };
38397
38398 /*
38399@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38400 }
38401
38402 static struct access_method smart2e_access = {
38403- smart2e_submit_command,
38404- smart2e_intr_mask,
38405- smart2e_fifo_full,
38406- smart2e_intr_pending,
38407- smart2e_completed,
38408+ .submit_command = smart2e_submit_command,
38409+ .set_intr_mask = smart2e_intr_mask,
38410+ .fifo_full = smart2e_fifo_full,
38411+ .intr_pending = smart2e_intr_pending,
38412+ .command_completed = smart2e_completed,
38413 };
38414
38415 /*
38416@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38417 }
38418
38419 static struct access_method smart1_access = {
38420- smart1_submit_command,
38421- smart1_intr_mask,
38422- smart1_fifo_full,
38423- smart1_intr_pending,
38424- smart1_completed,
38425+ .submit_command = smart1_submit_command,
38426+ .set_intr_mask = smart1_intr_mask,
38427+ .fifo_full = smart1_fifo_full,
38428+ .intr_pending = smart1_intr_pending,
38429+ .command_completed = smart1_completed,
38430 };
38431diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38432index f038dba..bb74c08 100644
38433--- a/drivers/bluetooth/btwilink.c
38434+++ b/drivers/bluetooth/btwilink.c
38435@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38436
38437 static int bt_ti_probe(struct platform_device *pdev)
38438 {
38439- static struct ti_st *hst;
38440+ struct ti_st *hst;
38441 struct hci_dev *hdev;
38442 int err;
38443
38444diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38445index 5d28a45..a538f90 100644
38446--- a/drivers/cdrom/cdrom.c
38447+++ b/drivers/cdrom/cdrom.c
38448@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38449 ENSURE(reset, CDC_RESET);
38450 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38451 cdi->mc_flags = 0;
38452- cdo->n_minors = 0;
38453 cdi->options = CDO_USE_FFLAGS;
38454
38455 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38456@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38457 else
38458 cdi->cdda_method = CDDA_OLD;
38459
38460- if (!cdo->generic_packet)
38461- cdo->generic_packet = cdrom_dummy_generic_packet;
38462+ if (!cdo->generic_packet) {
38463+ pax_open_kernel();
38464+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38465+ pax_close_kernel();
38466+ }
38467
38468 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38469 mutex_lock(&cdrom_mutex);
38470@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38471 if (cdi->exit)
38472 cdi->exit(cdi);
38473
38474- cdi->ops->n_minors--;
38475 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38476 }
38477
38478@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38479 */
38480 nr = nframes;
38481 do {
38482- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38483+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38484 if (cgc.buffer)
38485 break;
38486
38487@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38488 struct cdrom_device_info *cdi;
38489 int ret;
38490
38491- ret = scnprintf(info + *pos, max_size - *pos, header);
38492+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38493 if (!ret)
38494 return 1;
38495
38496diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38497index 584bc31..e64a12c 100644
38498--- a/drivers/cdrom/gdrom.c
38499+++ b/drivers/cdrom/gdrom.c
38500@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38501 .audio_ioctl = gdrom_audio_ioctl,
38502 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38503 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38504- .n_minors = 1,
38505 };
38506
38507 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38508diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38509index efefd12..4f1d494 100644
38510--- a/drivers/char/Kconfig
38511+++ b/drivers/char/Kconfig
38512@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
38513
38514 config DEVKMEM
38515 bool "/dev/kmem virtual device support"
38516- default y
38517+ default n
38518+ depends on !GRKERNSEC_KMEM
38519 help
38520 Say Y here if you want to support the /dev/kmem device. The
38521 /dev/kmem device is rarely used, but can be used for certain
38522@@ -577,6 +578,7 @@ config DEVPORT
38523 bool
38524 depends on !M68K
38525 depends on ISA || PCI
38526+ depends on !GRKERNSEC_KMEM
38527 default y
38528
38529 source "drivers/s390/char/Kconfig"
38530diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38531index a48e05b..6bac831 100644
38532--- a/drivers/char/agp/compat_ioctl.c
38533+++ b/drivers/char/agp/compat_ioctl.c
38534@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38535 return -ENOMEM;
38536 }
38537
38538- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38539+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38540 sizeof(*usegment) * ureserve.seg_count)) {
38541 kfree(usegment);
38542 kfree(ksegment);
38543diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38544index 09f17eb..8531d2f 100644
38545--- a/drivers/char/agp/frontend.c
38546+++ b/drivers/char/agp/frontend.c
38547@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38548 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38549 return -EFAULT;
38550
38551- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38552+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38553 return -EFAULT;
38554
38555 client = agp_find_client_by_pid(reserve.pid);
38556@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38557 if (segment == NULL)
38558 return -ENOMEM;
38559
38560- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38561+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38562 sizeof(struct agp_segment) * reserve.seg_count)) {
38563 kfree(segment);
38564 return -EFAULT;
38565diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38566index 4f94375..413694e 100644
38567--- a/drivers/char/genrtc.c
38568+++ b/drivers/char/genrtc.c
38569@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38570 switch (cmd) {
38571
38572 case RTC_PLL_GET:
38573+ memset(&pll, 0, sizeof(pll));
38574 if (get_rtc_pll(&pll))
38575 return -EINVAL;
38576 else
38577diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38578index d5d4cd8..22d561d 100644
38579--- a/drivers/char/hpet.c
38580+++ b/drivers/char/hpet.c
38581@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38582 }
38583
38584 static int
38585-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38586+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38587 struct hpet_info *info)
38588 {
38589 struct hpet_timer __iomem *timer;
38590diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38591index f816211..89eadea 100644
38592--- a/drivers/char/ipmi/ipmi_msghandler.c
38593+++ b/drivers/char/ipmi/ipmi_msghandler.c
38594@@ -438,7 +438,7 @@ struct ipmi_smi {
38595 struct proc_dir_entry *proc_dir;
38596 char proc_dir_name[10];
38597
38598- atomic_t stats[IPMI_NUM_STATS];
38599+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38600
38601 /*
38602 * run_to_completion duplicate of smb_info, smi_info
38603@@ -470,9 +470,9 @@ static LIST_HEAD(smi_watchers);
38604 static DEFINE_MUTEX(smi_watchers_mutex);
38605
38606 #define ipmi_inc_stat(intf, stat) \
38607- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38608+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38609 #define ipmi_get_stat(intf, stat) \
38610- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38611+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38612
38613 static int is_lan_addr(struct ipmi_addr *addr)
38614 {
38615@@ -2925,7 +2925,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38616 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38617 init_waitqueue_head(&intf->waitq);
38618 for (i = 0; i < IPMI_NUM_STATS; i++)
38619- atomic_set(&intf->stats[i], 0);
38620+ atomic_set_unchecked(&intf->stats[i], 0);
38621
38622 intf->proc_dir = NULL;
38623
38624diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38625index 5c4e1f6..0ea58f9 100644
38626--- a/drivers/char/ipmi/ipmi_si_intf.c
38627+++ b/drivers/char/ipmi/ipmi_si_intf.c
38628@@ -285,7 +285,7 @@ struct smi_info {
38629 unsigned char slave_addr;
38630
38631 /* Counters and things for the proc filesystem. */
38632- atomic_t stats[SI_NUM_STATS];
38633+ atomic_unchecked_t stats[SI_NUM_STATS];
38634
38635 struct task_struct *thread;
38636
38637@@ -294,9 +294,9 @@ struct smi_info {
38638 };
38639
38640 #define smi_inc_stat(smi, stat) \
38641- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38642+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38643 #define smi_get_stat(smi, stat) \
38644- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38645+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38646
38647 #define SI_MAX_PARMS 4
38648
38649@@ -3377,7 +3377,7 @@ static int try_smi_init(struct smi_info *new_smi)
38650 atomic_set(&new_smi->req_events, 0);
38651 new_smi->run_to_completion = false;
38652 for (i = 0; i < SI_NUM_STATS; i++)
38653- atomic_set(&new_smi->stats[i], 0);
38654+ atomic_set_unchecked(&new_smi->stats[i], 0);
38655
38656 new_smi->interrupt_disabled = true;
38657 atomic_set(&new_smi->stop_operation, 0);
38658diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38659index 524b707..29d07c1 100644
38660--- a/drivers/char/mem.c
38661+++ b/drivers/char/mem.c
38662@@ -18,6 +18,7 @@
38663 #include <linux/raw.h>
38664 #include <linux/tty.h>
38665 #include <linux/capability.h>
38666+#include <linux/security.h>
38667 #include <linux/ptrace.h>
38668 #include <linux/device.h>
38669 #include <linux/highmem.h>
38670@@ -36,6 +37,10 @@
38671
38672 #define DEVPORT_MINOR 4
38673
38674+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38675+extern const struct file_operations grsec_fops;
38676+#endif
38677+
38678 static inline unsigned long size_inside_page(unsigned long start,
38679 unsigned long size)
38680 {
38681@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38682
38683 while (cursor < to) {
38684 if (!devmem_is_allowed(pfn)) {
38685+#ifdef CONFIG_GRKERNSEC_KMEM
38686+ gr_handle_mem_readwrite(from, to);
38687+#else
38688 printk(KERN_INFO
38689 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38690 current->comm, from, to);
38691+#endif
38692 return 0;
38693 }
38694 cursor += PAGE_SIZE;
38695@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38696 }
38697 return 1;
38698 }
38699+#elif defined(CONFIG_GRKERNSEC_KMEM)
38700+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38701+{
38702+ return 0;
38703+}
38704 #else
38705 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38706 {
38707@@ -122,6 +136,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38708
38709 while (count > 0) {
38710 unsigned long remaining;
38711+ char *temp;
38712
38713 sz = size_inside_page(p, count);
38714
38715@@ -137,7 +152,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38716 if (!ptr)
38717 return -EFAULT;
38718
38719- remaining = copy_to_user(buf, ptr, sz);
38720+#ifdef CONFIG_PAX_USERCOPY
38721+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38722+ if (!temp) {
38723+ unxlate_dev_mem_ptr(p, ptr);
38724+ return -ENOMEM;
38725+ }
38726+ memcpy(temp, ptr, sz);
38727+#else
38728+ temp = ptr;
38729+#endif
38730+
38731+ remaining = copy_to_user(buf, temp, sz);
38732+
38733+#ifdef CONFIG_PAX_USERCOPY
38734+ kfree(temp);
38735+#endif
38736+
38737 unxlate_dev_mem_ptr(p, ptr);
38738 if (remaining)
38739 return -EFAULT;
38740@@ -369,9 +400,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38741 size_t count, loff_t *ppos)
38742 {
38743 unsigned long p = *ppos;
38744- ssize_t low_count, read, sz;
38745+ ssize_t low_count, read, sz, err = 0;
38746 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
38747- int err = 0;
38748
38749 read = 0;
38750 if (p < (unsigned long) high_memory) {
38751@@ -393,6 +423,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38752 }
38753 #endif
38754 while (low_count > 0) {
38755+ char *temp;
38756+
38757 sz = size_inside_page(p, low_count);
38758
38759 /*
38760@@ -402,7 +434,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38761 */
38762 kbuf = xlate_dev_kmem_ptr((char *)p);
38763
38764- if (copy_to_user(buf, kbuf, sz))
38765+#ifdef CONFIG_PAX_USERCOPY
38766+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38767+ if (!temp)
38768+ return -ENOMEM;
38769+ memcpy(temp, kbuf, sz);
38770+#else
38771+ temp = kbuf;
38772+#endif
38773+
38774+ err = copy_to_user(buf, temp, sz);
38775+
38776+#ifdef CONFIG_PAX_USERCOPY
38777+ kfree(temp);
38778+#endif
38779+
38780+ if (err)
38781 return -EFAULT;
38782 buf += sz;
38783 p += sz;
38784@@ -797,6 +844,9 @@ static const struct memdev {
38785 #ifdef CONFIG_PRINTK
38786 [11] = { "kmsg", 0644, &kmsg_fops, NULL },
38787 #endif
38788+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38789+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
38790+#endif
38791 };
38792
38793 static int memory_open(struct inode *inode, struct file *filp)
38794@@ -868,7 +918,7 @@ static int __init chr_dev_init(void)
38795 continue;
38796
38797 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
38798- NULL, devlist[minor].name);
38799+ NULL, "%s", devlist[minor].name);
38800 }
38801
38802 return tty_init();
38803diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
38804index 9df78e2..01ba9ae 100644
38805--- a/drivers/char/nvram.c
38806+++ b/drivers/char/nvram.c
38807@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
38808
38809 spin_unlock_irq(&rtc_lock);
38810
38811- if (copy_to_user(buf, contents, tmp - contents))
38812+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
38813 return -EFAULT;
38814
38815 *ppos = i;
38816diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
38817index 0ea9986..e7b07e4 100644
38818--- a/drivers/char/pcmcia/synclink_cs.c
38819+++ b/drivers/char/pcmcia/synclink_cs.c
38820@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38821
38822 if (debug_level >= DEBUG_LEVEL_INFO)
38823 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
38824- __FILE__, __LINE__, info->device_name, port->count);
38825+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
38826
38827 if (tty_port_close_start(port, tty, filp) == 0)
38828 goto cleanup;
38829@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
38830 cleanup:
38831 if (debug_level >= DEBUG_LEVEL_INFO)
38832 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
38833- tty->driver->name, port->count);
38834+ tty->driver->name, atomic_read(&port->count));
38835 }
38836
38837 /* Wait until the transmitter is empty.
38838@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38839
38840 if (debug_level >= DEBUG_LEVEL_INFO)
38841 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
38842- __FILE__, __LINE__, tty->driver->name, port->count);
38843+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
38844
38845 /* If port is closing, signal caller to try again */
38846 if (port->flags & ASYNC_CLOSING){
38847@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
38848 goto cleanup;
38849 }
38850 spin_lock(&port->lock);
38851- port->count++;
38852+ atomic_inc(&port->count);
38853 spin_unlock(&port->lock);
38854 spin_unlock_irqrestore(&info->netlock, flags);
38855
38856- if (port->count == 1) {
38857+ if (atomic_read(&port->count) == 1) {
38858 /* 1st open on this device, init hardware */
38859 retval = startup(info, tty);
38860 if (retval < 0)
38861@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38862 unsigned short new_crctype;
38863
38864 /* return error if TTY interface open */
38865- if (info->port.count)
38866+ if (atomic_read(&info->port.count))
38867 return -EBUSY;
38868
38869 switch (encoding)
38870@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
38871
38872 /* arbitrate between network and tty opens */
38873 spin_lock_irqsave(&info->netlock, flags);
38874- if (info->port.count != 0 || info->netcount != 0) {
38875+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38876 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
38877 spin_unlock_irqrestore(&info->netlock, flags);
38878 return -EBUSY;
38879@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38880 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
38881
38882 /* return error if TTY interface open */
38883- if (info->port.count)
38884+ if (atomic_read(&info->port.count))
38885 return -EBUSY;
38886
38887 if (cmd != SIOCWANDEV)
38888diff --git a/drivers/char/random.c b/drivers/char/random.c
38889index 04645c0..560e350 100644
38890--- a/drivers/char/random.c
38891+++ b/drivers/char/random.c
38892@@ -289,9 +289,6 @@
38893 /*
38894 * To allow fractional bits to be tracked, the entropy_count field is
38895 * denominated in units of 1/8th bits.
38896- *
38897- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
38898- * credit_entropy_bits() needs to be 64 bits wide.
38899 */
38900 #define ENTROPY_SHIFT 3
38901 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
38902@@ -439,9 +436,9 @@ struct entropy_store {
38903 };
38904
38905 static void push_to_pool(struct work_struct *work);
38906-static __u32 input_pool_data[INPUT_POOL_WORDS];
38907-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
38908-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
38909+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
38910+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38911+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
38912
38913 static struct entropy_store input_pool = {
38914 .poolinfo = &poolinfo_table[0],
38915@@ -635,7 +632,7 @@ retry:
38916 /* The +2 corresponds to the /4 in the denominator */
38917
38918 do {
38919- unsigned int anfrac = min(pnfrac, pool_size/2);
38920+ u64 anfrac = min(pnfrac, pool_size/2);
38921 unsigned int add =
38922 ((pool_size - entropy_count)*anfrac*3) >> s;
38923
38924@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
38925
38926 extract_buf(r, tmp);
38927 i = min_t(int, nbytes, EXTRACT_SIZE);
38928- if (copy_to_user(buf, tmp, i)) {
38929+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
38930 ret = -EFAULT;
38931 break;
38932 }
38933@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
38934 static int proc_do_uuid(struct ctl_table *table, int write,
38935 void __user *buffer, size_t *lenp, loff_t *ppos)
38936 {
38937- struct ctl_table fake_table;
38938+ ctl_table_no_const fake_table;
38939 unsigned char buf[64], tmp_uuid[16], *uuid;
38940
38941 uuid = table->data;
38942@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
38943 static int proc_do_entropy(struct ctl_table *table, int write,
38944 void __user *buffer, size_t *lenp, loff_t *ppos)
38945 {
38946- struct ctl_table fake_table;
38947+ ctl_table_no_const fake_table;
38948 int entropy_count;
38949
38950 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
38951diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
38952index 7cc1fe22..b602d6b 100644
38953--- a/drivers/char/sonypi.c
38954+++ b/drivers/char/sonypi.c
38955@@ -54,6 +54,7 @@
38956
38957 #include <asm/uaccess.h>
38958 #include <asm/io.h>
38959+#include <asm/local.h>
38960
38961 #include <linux/sonypi.h>
38962
38963@@ -490,7 +491,7 @@ static struct sonypi_device {
38964 spinlock_t fifo_lock;
38965 wait_queue_head_t fifo_proc_list;
38966 struct fasync_struct *fifo_async;
38967- int open_count;
38968+ local_t open_count;
38969 int model;
38970 struct input_dev *input_jog_dev;
38971 struct input_dev *input_key_dev;
38972@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
38973 static int sonypi_misc_release(struct inode *inode, struct file *file)
38974 {
38975 mutex_lock(&sonypi_device.lock);
38976- sonypi_device.open_count--;
38977+ local_dec(&sonypi_device.open_count);
38978 mutex_unlock(&sonypi_device.lock);
38979 return 0;
38980 }
38981@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
38982 {
38983 mutex_lock(&sonypi_device.lock);
38984 /* Flush input queue on first open */
38985- if (!sonypi_device.open_count)
38986+ if (!local_read(&sonypi_device.open_count))
38987 kfifo_reset(&sonypi_device.fifo);
38988- sonypi_device.open_count++;
38989+ local_inc(&sonypi_device.open_count);
38990 mutex_unlock(&sonypi_device.lock);
38991
38992 return 0;
38993diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
38994index 565a947..dcdc06e 100644
38995--- a/drivers/char/tpm/tpm_acpi.c
38996+++ b/drivers/char/tpm/tpm_acpi.c
38997@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
38998 virt = acpi_os_map_iomem(start, len);
38999 if (!virt) {
39000 kfree(log->bios_event_log);
39001+ log->bios_event_log = NULL;
39002 printk("%s: ERROR - Unable to map memory\n", __func__);
39003 return -EIO;
39004 }
39005
39006- memcpy_fromio(log->bios_event_log, virt, len);
39007+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39008
39009 acpi_os_unmap_iomem(virt, len);
39010 return 0;
39011diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39012index 3a56a13..f8cbd25 100644
39013--- a/drivers/char/tpm/tpm_eventlog.c
39014+++ b/drivers/char/tpm/tpm_eventlog.c
39015@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39016 event = addr;
39017
39018 if ((event->event_type == 0 && event->event_size == 0) ||
39019- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39020+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39021 return NULL;
39022
39023 return addr;
39024@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39025 return NULL;
39026
39027 if ((event->event_type == 0 && event->event_size == 0) ||
39028- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39029+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39030 return NULL;
39031
39032 (*pos)++;
39033@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39034 int i;
39035
39036 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39037- seq_putc(m, data[i]);
39038+ if (!seq_putc(m, data[i]))
39039+ return -EFAULT;
39040
39041 return 0;
39042 }
39043diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39044index cf7a561..c319ce0 100644
39045--- a/drivers/char/virtio_console.c
39046+++ b/drivers/char/virtio_console.c
39047@@ -684,7 +684,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
39048 if (to_user) {
39049 ssize_t ret;
39050
39051- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39052+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39053 if (ret)
39054 return -EFAULT;
39055 } else {
39056@@ -787,7 +787,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39057 if (!port_has_data(port) && !port->host_connected)
39058 return 0;
39059
39060- return fill_readbuf(port, ubuf, count, true);
39061+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39062 }
39063
39064 static int wait_port_writable(struct port *port, bool nonblock)
39065diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39066index b9355da..9611f4e 100644
39067--- a/drivers/clk/clk-composite.c
39068+++ b/drivers/clk/clk-composite.c
39069@@ -191,7 +191,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39070 struct clk *clk;
39071 struct clk_init_data init;
39072 struct clk_composite *composite;
39073- struct clk_ops *clk_composite_ops;
39074+ clk_ops_no_const *clk_composite_ops;
39075
39076 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39077 if (!composite) {
39078diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39079index dd3a78c..386d49c 100644
39080--- a/drivers/clk/socfpga/clk-gate.c
39081+++ b/drivers/clk/socfpga/clk-gate.c
39082@@ -22,6 +22,7 @@
39083 #include <linux/mfd/syscon.h>
39084 #include <linux/of.h>
39085 #include <linux/regmap.h>
39086+#include <asm/pgtable.h>
39087
39088 #include "clk.h"
39089
39090@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39091 return 0;
39092 }
39093
39094-static struct clk_ops gateclk_ops = {
39095+static clk_ops_no_const gateclk_ops __read_only = {
39096 .prepare = socfpga_clk_prepare,
39097 .recalc_rate = socfpga_clk_recalc_rate,
39098 .get_parent = socfpga_clk_get_parent,
39099@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39100 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39101 socfpga_clk->hw.bit_idx = clk_gate[1];
39102
39103- gateclk_ops.enable = clk_gate_ops.enable;
39104- gateclk_ops.disable = clk_gate_ops.disable;
39105+ pax_open_kernel();
39106+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39107+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39108+ pax_close_kernel();
39109 }
39110
39111 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39112diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39113index de6da95..c98278b 100644
39114--- a/drivers/clk/socfpga/clk-pll.c
39115+++ b/drivers/clk/socfpga/clk-pll.c
39116@@ -21,6 +21,7 @@
39117 #include <linux/io.h>
39118 #include <linux/of.h>
39119 #include <linux/of_address.h>
39120+#include <asm/pgtable.h>
39121
39122 #include "clk.h"
39123
39124@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39125 CLK_MGR_PLL_CLK_SRC_MASK;
39126 }
39127
39128-static struct clk_ops clk_pll_ops = {
39129+static clk_ops_no_const clk_pll_ops __read_only = {
39130 .recalc_rate = clk_pll_recalc_rate,
39131 .get_parent = clk_pll_get_parent,
39132 };
39133@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39134 pll_clk->hw.hw.init = &init;
39135
39136 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39137- clk_pll_ops.enable = clk_gate_ops.enable;
39138- clk_pll_ops.disable = clk_gate_ops.disable;
39139+ pax_open_kernel();
39140+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39141+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39142+ pax_close_kernel();
39143
39144 clk = clk_register(NULL, &pll_clk->hw.hw);
39145 if (WARN_ON(IS_ERR(clk))) {
39146diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39147index b0c18ed..1713a80 100644
39148--- a/drivers/cpufreq/acpi-cpufreq.c
39149+++ b/drivers/cpufreq/acpi-cpufreq.c
39150@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39151 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39152 per_cpu(acfreq_data, cpu) = data;
39153
39154- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39155- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39156+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39157+ pax_open_kernel();
39158+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39159+ pax_close_kernel();
39160+ }
39161
39162 result = acpi_processor_register_performance(data->acpi_data, cpu);
39163 if (result)
39164@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39165 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39166 break;
39167 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39168- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39169+ pax_open_kernel();
39170+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39171+ pax_close_kernel();
39172 break;
39173 default:
39174 break;
39175@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39176 if (!msrs)
39177 return;
39178
39179- acpi_cpufreq_driver.boost_supported = true;
39180- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39181+ pax_open_kernel();
39182+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39183+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39184+ pax_close_kernel();
39185
39186 cpu_notifier_register_begin();
39187
39188diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39189index f657c57..ada41b6 100644
39190--- a/drivers/cpufreq/cpufreq-dt.c
39191+++ b/drivers/cpufreq/cpufreq-dt.c
39192@@ -345,6 +345,7 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39193 struct device *cpu_dev;
39194 struct regulator *cpu_reg;
39195 struct clk *cpu_clk;
39196+ void *fptr;
39197 int ret;
39198
39199 /*
39200@@ -362,7 +363,10 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39201 if (!IS_ERR(cpu_reg))
39202 regulator_put(cpu_reg);
39203
39204- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39205+ fptr = dev_get_platdata(&pdev->dev);
39206+ pax_open_kernel();
39207+ *(void **)&dt_cpufreq_driver.driver_data = fptr;
39208+ pax_close_kernel();
39209
39210 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39211 if (ret)
39212diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39213index 4473eba..a4c9dc2 100644
39214--- a/drivers/cpufreq/cpufreq.c
39215+++ b/drivers/cpufreq/cpufreq.c
39216@@ -2122,7 +2122,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39217 }
39218
39219 mutex_lock(&cpufreq_governor_mutex);
39220- list_del(&governor->governor_list);
39221+ pax_list_del(&governor->governor_list);
39222 mutex_unlock(&cpufreq_governor_mutex);
39223 return;
39224 }
39225@@ -2338,7 +2338,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39226 return NOTIFY_OK;
39227 }
39228
39229-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39230+static struct notifier_block cpufreq_cpu_notifier = {
39231 .notifier_call = cpufreq_cpu_callback,
39232 };
39233
39234@@ -2378,13 +2378,17 @@ int cpufreq_boost_trigger_state(int state)
39235 return 0;
39236
39237 write_lock_irqsave(&cpufreq_driver_lock, flags);
39238- cpufreq_driver->boost_enabled = state;
39239+ pax_open_kernel();
39240+ *(bool *)&cpufreq_driver->boost_enabled = state;
39241+ pax_close_kernel();
39242 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39243
39244 ret = cpufreq_driver->set_boost(state);
39245 if (ret) {
39246 write_lock_irqsave(&cpufreq_driver_lock, flags);
39247- cpufreq_driver->boost_enabled = !state;
39248+ pax_open_kernel();
39249+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39250+ pax_close_kernel();
39251 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39252
39253 pr_err("%s: Cannot %s BOOST\n",
39254@@ -2441,8 +2445,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39255
39256 pr_debug("trying to register driver %s\n", driver_data->name);
39257
39258- if (driver_data->setpolicy)
39259- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39260+ if (driver_data->setpolicy) {
39261+ pax_open_kernel();
39262+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39263+ pax_close_kernel();
39264+ }
39265
39266 write_lock_irqsave(&cpufreq_driver_lock, flags);
39267 if (cpufreq_driver) {
39268@@ -2457,8 +2464,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39269 * Check if driver provides function to enable boost -
39270 * if not, use cpufreq_boost_set_sw as default
39271 */
39272- if (!cpufreq_driver->set_boost)
39273- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39274+ if (!cpufreq_driver->set_boost) {
39275+ pax_open_kernel();
39276+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39277+ pax_close_kernel();
39278+ }
39279
39280 ret = cpufreq_sysfs_create_file(&boost.attr);
39281 if (ret) {
39282diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39283index 1b44496..b80ff5e 100644
39284--- a/drivers/cpufreq/cpufreq_governor.c
39285+++ b/drivers/cpufreq/cpufreq_governor.c
39286@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39287 struct dbs_data *dbs_data;
39288 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39289 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39290- struct od_ops *od_ops = NULL;
39291+ const struct od_ops *od_ops = NULL;
39292 struct od_dbs_tuners *od_tuners = NULL;
39293 struct cs_dbs_tuners *cs_tuners = NULL;
39294 struct cpu_dbs_common_info *cpu_cdbs;
39295@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39296
39297 if ((cdata->governor == GOV_CONSERVATIVE) &&
39298 (!policy->governor->initialized)) {
39299- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39300+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39301
39302 cpufreq_register_notifier(cs_ops->notifier_block,
39303 CPUFREQ_TRANSITION_NOTIFIER);
39304@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39305
39306 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39307 (policy->governor->initialized == 1)) {
39308- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39309+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39310
39311 cpufreq_unregister_notifier(cs_ops->notifier_block,
39312 CPUFREQ_TRANSITION_NOTIFIER);
39313diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39314index cc401d1..8197340 100644
39315--- a/drivers/cpufreq/cpufreq_governor.h
39316+++ b/drivers/cpufreq/cpufreq_governor.h
39317@@ -212,7 +212,7 @@ struct common_dbs_data {
39318 void (*exit)(struct dbs_data *dbs_data);
39319
39320 /* Governor specific ops, see below */
39321- void *gov_ops;
39322+ const void *gov_ops;
39323 };
39324
39325 /* Governor Per policy data */
39326@@ -232,7 +232,7 @@ struct od_ops {
39327 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39328 unsigned int freq_next, unsigned int relation);
39329 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39330-};
39331+} __no_const;
39332
39333 struct cs_ops {
39334 struct notifier_block *notifier_block;
39335diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39336index ad3f38f..8f086cd 100644
39337--- a/drivers/cpufreq/cpufreq_ondemand.c
39338+++ b/drivers/cpufreq/cpufreq_ondemand.c
39339@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39340
39341 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39342
39343-static struct od_ops od_ops = {
39344+static struct od_ops od_ops __read_only = {
39345 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39346 .powersave_bias_target = generic_powersave_bias_target,
39347 .freq_increase = dbs_freq_increase,
39348@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39349 (struct cpufreq_policy *, unsigned int, unsigned int),
39350 unsigned int powersave_bias)
39351 {
39352- od_ops.powersave_bias_target = f;
39353+ pax_open_kernel();
39354+ *(void **)&od_ops.powersave_bias_target = f;
39355+ pax_close_kernel();
39356 od_set_powersave_bias(powersave_bias);
39357 }
39358 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39359
39360 void od_unregister_powersave_bias_handler(void)
39361 {
39362- od_ops.powersave_bias_target = generic_powersave_bias_target;
39363+ pax_open_kernel();
39364+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39365+ pax_close_kernel();
39366 od_set_powersave_bias(0);
39367 }
39368 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39369diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39370index 27bb6d3..4cf595c 100644
39371--- a/drivers/cpufreq/intel_pstate.c
39372+++ b/drivers/cpufreq/intel_pstate.c
39373@@ -133,10 +133,10 @@ struct pstate_funcs {
39374 struct cpu_defaults {
39375 struct pstate_adjust_policy pid_policy;
39376 struct pstate_funcs funcs;
39377-};
39378+} __do_const;
39379
39380 static struct pstate_adjust_policy pid_params;
39381-static struct pstate_funcs pstate_funcs;
39382+static struct pstate_funcs *pstate_funcs;
39383
39384 struct perf_limits {
39385 int no_turbo;
39386@@ -594,18 +594,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39387
39388 cpu->pstate.current_pstate = pstate;
39389
39390- pstate_funcs.set(cpu, pstate);
39391+ pstate_funcs->set(cpu, pstate);
39392 }
39393
39394 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39395 {
39396- cpu->pstate.min_pstate = pstate_funcs.get_min();
39397- cpu->pstate.max_pstate = pstate_funcs.get_max();
39398- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39399- cpu->pstate.scaling = pstate_funcs.get_scaling();
39400+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39401+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39402+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39403+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39404
39405- if (pstate_funcs.get_vid)
39406- pstate_funcs.get_vid(cpu);
39407+ if (pstate_funcs->get_vid)
39408+ pstate_funcs->get_vid(cpu);
39409 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39410 }
39411
39412@@ -875,9 +875,9 @@ static int intel_pstate_msrs_not_valid(void)
39413 rdmsrl(MSR_IA32_APERF, aperf);
39414 rdmsrl(MSR_IA32_MPERF, mperf);
39415
39416- if (!pstate_funcs.get_max() ||
39417- !pstate_funcs.get_min() ||
39418- !pstate_funcs.get_turbo())
39419+ if (!pstate_funcs->get_max() ||
39420+ !pstate_funcs->get_min() ||
39421+ !pstate_funcs->get_turbo())
39422 return -ENODEV;
39423
39424 rdmsrl(MSR_IA32_APERF, tmp);
39425@@ -891,7 +891,7 @@ static int intel_pstate_msrs_not_valid(void)
39426 return 0;
39427 }
39428
39429-static void copy_pid_params(struct pstate_adjust_policy *policy)
39430+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39431 {
39432 pid_params.sample_rate_ms = policy->sample_rate_ms;
39433 pid_params.p_gain_pct = policy->p_gain_pct;
39434@@ -903,12 +903,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39435
39436 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39437 {
39438- pstate_funcs.get_max = funcs->get_max;
39439- pstate_funcs.get_min = funcs->get_min;
39440- pstate_funcs.get_turbo = funcs->get_turbo;
39441- pstate_funcs.get_scaling = funcs->get_scaling;
39442- pstate_funcs.set = funcs->set;
39443- pstate_funcs.get_vid = funcs->get_vid;
39444+ pstate_funcs = funcs;
39445 }
39446
39447 #if IS_ENABLED(CONFIG_ACPI)
39448diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39449index 529cfd9..0e28fff 100644
39450--- a/drivers/cpufreq/p4-clockmod.c
39451+++ b/drivers/cpufreq/p4-clockmod.c
39452@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39453 case 0x0F: /* Core Duo */
39454 case 0x16: /* Celeron Core */
39455 case 0x1C: /* Atom */
39456- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39457+ pax_open_kernel();
39458+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39459+ pax_close_kernel();
39460 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39461 case 0x0D: /* Pentium M (Dothan) */
39462- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39463+ pax_open_kernel();
39464+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39465+ pax_close_kernel();
39466 /* fall through */
39467 case 0x09: /* Pentium M (Banias) */
39468 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39469@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39470
39471 /* on P-4s, the TSC runs with constant frequency independent whether
39472 * throttling is active or not. */
39473- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39474+ pax_open_kernel();
39475+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39476+ pax_close_kernel();
39477
39478 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39479 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39480diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39481index 9bb42ba..b01b4a2 100644
39482--- a/drivers/cpufreq/sparc-us3-cpufreq.c
39483+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39484@@ -18,14 +18,12 @@
39485 #include <asm/head.h>
39486 #include <asm/timer.h>
39487
39488-static struct cpufreq_driver *cpufreq_us3_driver;
39489-
39490 struct us3_freq_percpu_info {
39491 struct cpufreq_frequency_table table[4];
39492 };
39493
39494 /* Indexed by cpu number. */
39495-static struct us3_freq_percpu_info *us3_freq_table;
39496+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39497
39498 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39499 * in the Safari config register.
39500@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39501
39502 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39503 {
39504- if (cpufreq_us3_driver)
39505- us3_freq_target(policy, 0);
39506+ us3_freq_target(policy, 0);
39507
39508 return 0;
39509 }
39510
39511+static int __init us3_freq_init(void);
39512+static void __exit us3_freq_exit(void);
39513+
39514+static struct cpufreq_driver cpufreq_us3_driver = {
39515+ .init = us3_freq_cpu_init,
39516+ .verify = cpufreq_generic_frequency_table_verify,
39517+ .target_index = us3_freq_target,
39518+ .get = us3_freq_get,
39519+ .exit = us3_freq_cpu_exit,
39520+ .name = "UltraSPARC-III",
39521+
39522+};
39523+
39524 static int __init us3_freq_init(void)
39525 {
39526 unsigned long manuf, impl, ver;
39527- int ret;
39528
39529 if (tlb_type != cheetah && tlb_type != cheetah_plus)
39530 return -ENODEV;
39531@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
39532 (impl == CHEETAH_IMPL ||
39533 impl == CHEETAH_PLUS_IMPL ||
39534 impl == JAGUAR_IMPL ||
39535- impl == PANTHER_IMPL)) {
39536- struct cpufreq_driver *driver;
39537-
39538- ret = -ENOMEM;
39539- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39540- if (!driver)
39541- goto err_out;
39542-
39543- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39544- GFP_KERNEL);
39545- if (!us3_freq_table)
39546- goto err_out;
39547-
39548- driver->init = us3_freq_cpu_init;
39549- driver->verify = cpufreq_generic_frequency_table_verify;
39550- driver->target_index = us3_freq_target;
39551- driver->get = us3_freq_get;
39552- driver->exit = us3_freq_cpu_exit;
39553- strcpy(driver->name, "UltraSPARC-III");
39554-
39555- cpufreq_us3_driver = driver;
39556- ret = cpufreq_register_driver(driver);
39557- if (ret)
39558- goto err_out;
39559-
39560- return 0;
39561-
39562-err_out:
39563- if (driver) {
39564- kfree(driver);
39565- cpufreq_us3_driver = NULL;
39566- }
39567- kfree(us3_freq_table);
39568- us3_freq_table = NULL;
39569- return ret;
39570- }
39571+ impl == PANTHER_IMPL))
39572+ return cpufreq_register_driver(&cpufreq_us3_driver);
39573
39574 return -ENODEV;
39575 }
39576
39577 static void __exit us3_freq_exit(void)
39578 {
39579- if (cpufreq_us3_driver) {
39580- cpufreq_unregister_driver(cpufreq_us3_driver);
39581- kfree(cpufreq_us3_driver);
39582- cpufreq_us3_driver = NULL;
39583- kfree(us3_freq_table);
39584- us3_freq_table = NULL;
39585- }
39586+ cpufreq_unregister_driver(&cpufreq_us3_driver);
39587 }
39588
39589 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39590diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39591index 7d4a315..21bb886 100644
39592--- a/drivers/cpufreq/speedstep-centrino.c
39593+++ b/drivers/cpufreq/speedstep-centrino.c
39594@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39595 !cpu_has(cpu, X86_FEATURE_EST))
39596 return -ENODEV;
39597
39598- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39599- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39600+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39601+ pax_open_kernel();
39602+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39603+ pax_close_kernel();
39604+ }
39605
39606 if (policy->cpu != 0)
39607 return -ENODEV;
39608diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39609index e431d11..d0b997e 100644
39610--- a/drivers/cpuidle/driver.c
39611+++ b/drivers/cpuidle/driver.c
39612@@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
39613
39614 static void poll_idle_init(struct cpuidle_driver *drv)
39615 {
39616- struct cpuidle_state *state = &drv->states[0];
39617+ cpuidle_state_no_const *state = &drv->states[0];
39618
39619 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39620 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39621diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39622index fb9f511..213e6cc 100644
39623--- a/drivers/cpuidle/governor.c
39624+++ b/drivers/cpuidle/governor.c
39625@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39626 mutex_lock(&cpuidle_lock);
39627 if (__cpuidle_find_governor(gov->name) == NULL) {
39628 ret = 0;
39629- list_add_tail(&gov->governor_list, &cpuidle_governors);
39630+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39631 if (!cpuidle_curr_governor ||
39632 cpuidle_curr_governor->rating < gov->rating)
39633 cpuidle_switch_governor(gov);
39634diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39635index 97c5903..023ad23 100644
39636--- a/drivers/cpuidle/sysfs.c
39637+++ b/drivers/cpuidle/sysfs.c
39638@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39639 NULL
39640 };
39641
39642-static struct attribute_group cpuidle_attr_group = {
39643+static attribute_group_no_const cpuidle_attr_group = {
39644 .attrs = cpuidle_default_attrs,
39645 .name = "cpuidle",
39646 };
39647diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39648index 8d2a772..33826c9 100644
39649--- a/drivers/crypto/hifn_795x.c
39650+++ b/drivers/crypto/hifn_795x.c
39651@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39652 MODULE_PARM_DESC(hifn_pll_ref,
39653 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39654
39655-static atomic_t hifn_dev_number;
39656+static atomic_unchecked_t hifn_dev_number;
39657
39658 #define ACRYPTO_OP_DECRYPT 0
39659 #define ACRYPTO_OP_ENCRYPT 1
39660@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
39661 goto err_out_disable_pci_device;
39662
39663 snprintf(name, sizeof(name), "hifn%d",
39664- atomic_inc_return(&hifn_dev_number)-1);
39665+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
39666
39667 err = pci_request_regions(pdev, name);
39668 if (err)
39669diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
39670index 30b538d8..1610d75 100644
39671--- a/drivers/devfreq/devfreq.c
39672+++ b/drivers/devfreq/devfreq.c
39673@@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
39674 goto err_out;
39675 }
39676
39677- list_add(&governor->node, &devfreq_governor_list);
39678+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
39679
39680 list_for_each_entry(devfreq, &devfreq_list, node) {
39681 int ret = 0;
39682@@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
39683 }
39684 }
39685
39686- list_del(&governor->node);
39687+ pax_list_del((struct list_head *)&governor->node);
39688 err_out:
39689 mutex_unlock(&devfreq_list_lock);
39690
39691diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
39692index 42d4974..2714f36 100644
39693--- a/drivers/dma/sh/shdma-base.c
39694+++ b/drivers/dma/sh/shdma-base.c
39695@@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
39696 schan->slave_id = -EINVAL;
39697 }
39698
39699- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
39700- sdev->desc_size, GFP_KERNEL);
39701+ schan->desc = kcalloc(sdev->desc_size,
39702+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
39703 if (!schan->desc) {
39704 ret = -ENOMEM;
39705 goto edescalloc;
39706diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
39707index 58eb857..d7e42c8 100644
39708--- a/drivers/dma/sh/shdmac.c
39709+++ b/drivers/dma/sh/shdmac.c
39710@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
39711 return ret;
39712 }
39713
39714-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
39715+static struct notifier_block sh_dmae_nmi_notifier = {
39716 .notifier_call = sh_dmae_nmi_handler,
39717
39718 /* Run before NMI debug handler and KGDB */
39719diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
39720index 592af5f..bb1d583 100644
39721--- a/drivers/edac/edac_device.c
39722+++ b/drivers/edac/edac_device.c
39723@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
39724 */
39725 int edac_device_alloc_index(void)
39726 {
39727- static atomic_t device_indexes = ATOMIC_INIT(0);
39728+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
39729
39730- return atomic_inc_return(&device_indexes) - 1;
39731+ return atomic_inc_return_unchecked(&device_indexes) - 1;
39732 }
39733 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
39734
39735diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
39736index a6cd361..7bdbf53 100644
39737--- a/drivers/edac/edac_mc_sysfs.c
39738+++ b/drivers/edac/edac_mc_sysfs.c
39739@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
39740 struct dev_ch_attribute {
39741 struct device_attribute attr;
39742 int channel;
39743-};
39744+} __do_const;
39745
39746 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
39747 struct dev_ch_attribute dev_attr_legacy_##_name = \
39748@@ -1011,14 +1011,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
39749 }
39750
39751 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
39752+ pax_open_kernel();
39753 if (mci->get_sdram_scrub_rate) {
39754- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39755- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39756+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39757+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39758 }
39759 if (mci->set_sdram_scrub_rate) {
39760- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39761- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39762+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39763+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39764 }
39765+ pax_close_kernel();
39766 err = device_create_file(&mci->dev,
39767 &dev_attr_sdram_scrub_rate);
39768 if (err) {
39769diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
39770index 2cf44b4d..6dd2dc7 100644
39771--- a/drivers/edac/edac_pci.c
39772+++ b/drivers/edac/edac_pci.c
39773@@ -29,7 +29,7 @@
39774
39775 static DEFINE_MUTEX(edac_pci_ctls_mutex);
39776 static LIST_HEAD(edac_pci_list);
39777-static atomic_t pci_indexes = ATOMIC_INIT(0);
39778+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
39779
39780 /*
39781 * edac_pci_alloc_ctl_info
39782@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
39783 */
39784 int edac_pci_alloc_index(void)
39785 {
39786- return atomic_inc_return(&pci_indexes) - 1;
39787+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
39788 }
39789 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
39790
39791diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
39792index e8658e4..22746d6 100644
39793--- a/drivers/edac/edac_pci_sysfs.c
39794+++ b/drivers/edac/edac_pci_sysfs.c
39795@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
39796 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
39797 static int edac_pci_poll_msec = 1000; /* one second workq period */
39798
39799-static atomic_t pci_parity_count = ATOMIC_INIT(0);
39800-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
39801+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
39802+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
39803
39804 static struct kobject *edac_pci_top_main_kobj;
39805 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
39806@@ -235,7 +235,7 @@ struct edac_pci_dev_attribute {
39807 void *value;
39808 ssize_t(*show) (void *, char *);
39809 ssize_t(*store) (void *, const char *, size_t);
39810-};
39811+} __do_const;
39812
39813 /* Set of show/store abstract level functions for PCI Parity object */
39814 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
39815@@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39816 edac_printk(KERN_CRIT, EDAC_PCI,
39817 "Signaled System Error on %s\n",
39818 pci_name(dev));
39819- atomic_inc(&pci_nonparity_count);
39820+ atomic_inc_unchecked(&pci_nonparity_count);
39821 }
39822
39823 if (status & (PCI_STATUS_PARITY)) {
39824@@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39825 "Master Data Parity Error on %s\n",
39826 pci_name(dev));
39827
39828- atomic_inc(&pci_parity_count);
39829+ atomic_inc_unchecked(&pci_parity_count);
39830 }
39831
39832 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39833@@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39834 "Detected Parity Error on %s\n",
39835 pci_name(dev));
39836
39837- atomic_inc(&pci_parity_count);
39838+ atomic_inc_unchecked(&pci_parity_count);
39839 }
39840 }
39841
39842@@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39843 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
39844 "Signaled System Error on %s\n",
39845 pci_name(dev));
39846- atomic_inc(&pci_nonparity_count);
39847+ atomic_inc_unchecked(&pci_nonparity_count);
39848 }
39849
39850 if (status & (PCI_STATUS_PARITY)) {
39851@@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39852 "Master Data Parity Error on "
39853 "%s\n", pci_name(dev));
39854
39855- atomic_inc(&pci_parity_count);
39856+ atomic_inc_unchecked(&pci_parity_count);
39857 }
39858
39859 if (status & (PCI_STATUS_DETECTED_PARITY)) {
39860@@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
39861 "Detected Parity Error on %s\n",
39862 pci_name(dev));
39863
39864- atomic_inc(&pci_parity_count);
39865+ atomic_inc_unchecked(&pci_parity_count);
39866 }
39867 }
39868 }
39869@@ -672,7 +672,7 @@ void edac_pci_do_parity_check(void)
39870 if (!check_pci_errors)
39871 return;
39872
39873- before_count = atomic_read(&pci_parity_count);
39874+ before_count = atomic_read_unchecked(&pci_parity_count);
39875
39876 /* scan all PCI devices looking for a Parity Error on devices and
39877 * bridges.
39878@@ -684,7 +684,7 @@ void edac_pci_do_parity_check(void)
39879 /* Only if operator has selected panic on PCI Error */
39880 if (edac_pci_get_panic_on_pe()) {
39881 /* If the count is different 'after' from 'before' */
39882- if (before_count != atomic_read(&pci_parity_count))
39883+ if (before_count != atomic_read_unchecked(&pci_parity_count))
39884 panic("EDAC: PCI Parity Error");
39885 }
39886 }
39887diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
39888index 51b7e3a..aa8a3e8 100644
39889--- a/drivers/edac/mce_amd.h
39890+++ b/drivers/edac/mce_amd.h
39891@@ -77,7 +77,7 @@ struct amd_decoder_ops {
39892 bool (*mc0_mce)(u16, u8);
39893 bool (*mc1_mce)(u16, u8);
39894 bool (*mc2_mce)(u16, u8);
39895-};
39896+} __no_const;
39897
39898 void amd_report_gart_errors(bool);
39899 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
39900diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
39901index 57ea7f4..af06b76 100644
39902--- a/drivers/firewire/core-card.c
39903+++ b/drivers/firewire/core-card.c
39904@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
39905 const struct fw_card_driver *driver,
39906 struct device *device)
39907 {
39908- static atomic_t index = ATOMIC_INIT(-1);
39909+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
39910
39911- card->index = atomic_inc_return(&index);
39912+ card->index = atomic_inc_return_unchecked(&index);
39913 card->driver = driver;
39914 card->device = device;
39915 card->current_tlabel = 0;
39916@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
39917
39918 void fw_core_remove_card(struct fw_card *card)
39919 {
39920- struct fw_card_driver dummy_driver = dummy_driver_template;
39921+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
39922
39923 card->driver->update_phy_reg(card, 4,
39924 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
39925diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
39926index 2c6d5e1..a2cca6b 100644
39927--- a/drivers/firewire/core-device.c
39928+++ b/drivers/firewire/core-device.c
39929@@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
39930 struct config_rom_attribute {
39931 struct device_attribute attr;
39932 u32 key;
39933-};
39934+} __do_const;
39935
39936 static ssize_t show_immediate(struct device *dev,
39937 struct device_attribute *dattr, char *buf)
39938diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
39939index eb6935c..3cc2bfa 100644
39940--- a/drivers/firewire/core-transaction.c
39941+++ b/drivers/firewire/core-transaction.c
39942@@ -38,6 +38,7 @@
39943 #include <linux/timer.h>
39944 #include <linux/types.h>
39945 #include <linux/workqueue.h>
39946+#include <linux/sched.h>
39947
39948 #include <asm/byteorder.h>
39949
39950diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
39951index e1480ff6..1a429bd 100644
39952--- a/drivers/firewire/core.h
39953+++ b/drivers/firewire/core.h
39954@@ -111,6 +111,7 @@ struct fw_card_driver {
39955
39956 int (*stop_iso)(struct fw_iso_context *ctx);
39957 };
39958+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
39959
39960 void fw_card_initialize(struct fw_card *card,
39961 const struct fw_card_driver *driver, struct device *device);
39962diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
39963index a66a321..f6caf20 100644
39964--- a/drivers/firewire/ohci.c
39965+++ b/drivers/firewire/ohci.c
39966@@ -2056,10 +2056,12 @@ static void bus_reset_work(struct work_struct *work)
39967 be32_to_cpu(ohci->next_header));
39968 }
39969
39970+#ifndef CONFIG_GRKERNSEC
39971 if (param_remote_dma) {
39972 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
39973 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
39974 }
39975+#endif
39976
39977 spin_unlock_irq(&ohci->lock);
39978
39979@@ -2591,8 +2593,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
39980 unsigned long flags;
39981 int n, ret = 0;
39982
39983+#ifndef CONFIG_GRKERNSEC
39984 if (param_remote_dma)
39985 return 0;
39986+#endif
39987
39988 /*
39989 * FIXME: Make sure this bitmask is cleared when we clear the busReset
39990diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
39991index 94a58a0..f5eba42 100644
39992--- a/drivers/firmware/dmi-id.c
39993+++ b/drivers/firmware/dmi-id.c
39994@@ -16,7 +16,7 @@
39995 struct dmi_device_attribute{
39996 struct device_attribute dev_attr;
39997 int field;
39998-};
39999+} __do_const;
40000 #define to_dmi_dev_attr(_dev_attr) \
40001 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40002
40003diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
40004index 17afc51..0ef90cd 100644
40005--- a/drivers/firmware/dmi_scan.c
40006+++ b/drivers/firmware/dmi_scan.c
40007@@ -835,7 +835,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
40008 if (buf == NULL)
40009 return -1;
40010
40011- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
40012+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
40013
40014 dmi_unmap(buf);
40015 return 0;
40016diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40017index 5b53d61..72cee96 100644
40018--- a/drivers/firmware/efi/cper.c
40019+++ b/drivers/firmware/efi/cper.c
40020@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40021 */
40022 u64 cper_next_record_id(void)
40023 {
40024- static atomic64_t seq;
40025+ static atomic64_unchecked_t seq;
40026
40027- if (!atomic64_read(&seq))
40028- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40029+ if (!atomic64_read_unchecked(&seq))
40030+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40031
40032- return atomic64_inc_return(&seq);
40033+ return atomic64_inc_return_unchecked(&seq);
40034 }
40035 EXPORT_SYMBOL_GPL(cper_next_record_id);
40036
40037diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40038index 8590099..d83627a 100644
40039--- a/drivers/firmware/efi/efi.c
40040+++ b/drivers/firmware/efi/efi.c
40041@@ -148,14 +148,16 @@ static struct attribute_group efi_subsys_attr_group = {
40042 };
40043
40044 static struct efivars generic_efivars;
40045-static struct efivar_operations generic_ops;
40046+static efivar_operations_no_const generic_ops __read_only;
40047
40048 static int generic_ops_register(void)
40049 {
40050- generic_ops.get_variable = efi.get_variable;
40051- generic_ops.set_variable = efi.set_variable;
40052- generic_ops.get_next_variable = efi.get_next_variable;
40053- generic_ops.query_variable_store = efi_query_variable_store;
40054+ pax_open_kernel();
40055+ *(void **)&generic_ops.get_variable = efi.get_variable;
40056+ *(void **)&generic_ops.set_variable = efi.set_variable;
40057+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40058+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40059+ pax_close_kernel();
40060
40061 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40062 }
40063diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40064index f256ecd..387dcb1 100644
40065--- a/drivers/firmware/efi/efivars.c
40066+++ b/drivers/firmware/efi/efivars.c
40067@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40068 static int
40069 create_efivars_bin_attributes(void)
40070 {
40071- struct bin_attribute *attr;
40072+ bin_attribute_no_const *attr;
40073 int error;
40074
40075 /* new_var */
40076diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40077index 2f569aa..c95f4fb 100644
40078--- a/drivers/firmware/google/memconsole.c
40079+++ b/drivers/firmware/google/memconsole.c
40080@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40081 if (!found_memconsole())
40082 return -ENODEV;
40083
40084- memconsole_bin_attr.size = memconsole_length;
40085+ pax_open_kernel();
40086+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40087+ pax_close_kernel();
40088+
40089 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40090 }
40091
40092diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40093index fe49ec3..1ade794 100644
40094--- a/drivers/gpio/gpio-em.c
40095+++ b/drivers/gpio/gpio-em.c
40096@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40097 struct em_gio_priv *p;
40098 struct resource *io[2], *irq[2];
40099 struct gpio_chip *gpio_chip;
40100- struct irq_chip *irq_chip;
40101+ irq_chip_no_const *irq_chip;
40102 const char *name = dev_name(&pdev->dev);
40103 int ret;
40104
40105diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40106index 3784e81..73637b5 100644
40107--- a/drivers/gpio/gpio-ich.c
40108+++ b/drivers/gpio/gpio-ich.c
40109@@ -94,7 +94,7 @@ struct ichx_desc {
40110 * this option allows driver caching written output values
40111 */
40112 bool use_outlvl_cache;
40113-};
40114+} __do_const;
40115
40116 static struct {
40117 spinlock_t lock;
40118diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40119index bf6c094..6573caf 100644
40120--- a/drivers/gpio/gpio-rcar.c
40121+++ b/drivers/gpio/gpio-rcar.c
40122@@ -357,7 +357,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40123 struct gpio_rcar_priv *p;
40124 struct resource *io, *irq;
40125 struct gpio_chip *gpio_chip;
40126- struct irq_chip *irq_chip;
40127+ irq_chip_no_const *irq_chip;
40128 struct device *dev = &pdev->dev;
40129 const char *name = dev_name(dev);
40130 int ret;
40131diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40132index dbf28fa..04dad4e 100644
40133--- a/drivers/gpio/gpio-vr41xx.c
40134+++ b/drivers/gpio/gpio-vr41xx.c
40135@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40136 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40137 maskl, pendl, maskh, pendh);
40138
40139- atomic_inc(&irq_err_count);
40140+ atomic_inc_unchecked(&irq_err_count);
40141
40142 return -EINVAL;
40143 }
40144diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40145index e8e98ca..10f416e 100644
40146--- a/drivers/gpio/gpiolib.c
40147+++ b/drivers/gpio/gpiolib.c
40148@@ -537,8 +537,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40149 }
40150
40151 if (gpiochip->irqchip) {
40152- gpiochip->irqchip->irq_request_resources = NULL;
40153- gpiochip->irqchip->irq_release_resources = NULL;
40154+ pax_open_kernel();
40155+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40156+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40157+ pax_close_kernel();
40158 gpiochip->irqchip = NULL;
40159 }
40160 }
40161@@ -604,8 +606,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40162 gpiochip->irqchip = NULL;
40163 return -EINVAL;
40164 }
40165- irqchip->irq_request_resources = gpiochip_irq_reqres;
40166- irqchip->irq_release_resources = gpiochip_irq_relres;
40167+
40168+ pax_open_kernel();
40169+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40170+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40171+ pax_close_kernel();
40172
40173 /*
40174 * Prepare the mapping since the irqchip shall be orthogonal to
40175diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40176index e79c8d3..a9370bc 100644
40177--- a/drivers/gpu/drm/drm_crtc.c
40178+++ b/drivers/gpu/drm/drm_crtc.c
40179@@ -3900,7 +3900,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40180 goto done;
40181 }
40182
40183- if (copy_to_user(&enum_ptr[copied].name,
40184+ if (copy_to_user(enum_ptr[copied].name,
40185 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40186 ret = -EFAULT;
40187 goto done;
40188diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40189index bc3da32..7289357 100644
40190--- a/drivers/gpu/drm/drm_drv.c
40191+++ b/drivers/gpu/drm/drm_drv.c
40192@@ -443,7 +443,7 @@ void drm_unplug_dev(struct drm_device *dev)
40193
40194 drm_device_set_unplugged(dev);
40195
40196- if (dev->open_count == 0) {
40197+ if (local_read(&dev->open_count) == 0) {
40198 drm_put_dev(dev);
40199 }
40200 mutex_unlock(&drm_global_mutex);
40201diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40202index ed7bc68..0d536af 100644
40203--- a/drivers/gpu/drm/drm_fops.c
40204+++ b/drivers/gpu/drm/drm_fops.c
40205@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40206 return PTR_ERR(minor);
40207
40208 dev = minor->dev;
40209- if (!dev->open_count++)
40210+ if (local_inc_return(&dev->open_count) == 1)
40211 need_setup = 1;
40212
40213 /* share address_space across all char-devs of a single device */
40214@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40215 return 0;
40216
40217 err_undo:
40218- dev->open_count--;
40219+ local_dec(&dev->open_count);
40220 drm_minor_release(minor);
40221 return retcode;
40222 }
40223@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40224
40225 mutex_lock(&drm_global_mutex);
40226
40227- DRM_DEBUG("open_count = %d\n", dev->open_count);
40228+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40229
40230 mutex_lock(&dev->struct_mutex);
40231 list_del(&file_priv->lhead);
40232@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40233 * Begin inline drm_release
40234 */
40235
40236- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40237+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40238 task_pid_nr(current),
40239 (long)old_encode_dev(file_priv->minor->kdev->devt),
40240- dev->open_count);
40241+ local_read(&dev->open_count));
40242
40243 /* Release any auth tokens that might point to this file_priv,
40244 (do that under the drm_global_mutex) */
40245@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
40246 * End inline drm_release
40247 */
40248
40249- if (!--dev->open_count) {
40250+ if (local_dec_and_test(&dev->open_count)) {
40251 retcode = drm_lastclose(dev);
40252 if (drm_device_is_unplugged(dev))
40253 drm_put_dev(dev);
40254diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40255index 3d2e91c..d31c4c9 100644
40256--- a/drivers/gpu/drm/drm_global.c
40257+++ b/drivers/gpu/drm/drm_global.c
40258@@ -36,7 +36,7 @@
40259 struct drm_global_item {
40260 struct mutex mutex;
40261 void *object;
40262- int refcount;
40263+ atomic_t refcount;
40264 };
40265
40266 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40267@@ -49,7 +49,7 @@ void drm_global_init(void)
40268 struct drm_global_item *item = &glob[i];
40269 mutex_init(&item->mutex);
40270 item->object = NULL;
40271- item->refcount = 0;
40272+ atomic_set(&item->refcount, 0);
40273 }
40274 }
40275
40276@@ -59,7 +59,7 @@ void drm_global_release(void)
40277 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
40278 struct drm_global_item *item = &glob[i];
40279 BUG_ON(item->object != NULL);
40280- BUG_ON(item->refcount != 0);
40281+ BUG_ON(atomic_read(&item->refcount) != 0);
40282 }
40283 }
40284
40285@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40286 struct drm_global_item *item = &glob[ref->global_type];
40287
40288 mutex_lock(&item->mutex);
40289- if (item->refcount == 0) {
40290+ if (atomic_read(&item->refcount) == 0) {
40291 item->object = kzalloc(ref->size, GFP_KERNEL);
40292 if (unlikely(item->object == NULL)) {
40293 ret = -ENOMEM;
40294@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40295 goto out_err;
40296
40297 }
40298- ++item->refcount;
40299+ atomic_inc(&item->refcount);
40300 ref->object = item->object;
40301 mutex_unlock(&item->mutex);
40302 return 0;
40303@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
40304 struct drm_global_item *item = &glob[ref->global_type];
40305
40306 mutex_lock(&item->mutex);
40307- BUG_ON(item->refcount == 0);
40308+ BUG_ON(atomic_read(&item->refcount) == 0);
40309 BUG_ON(ref->object != item->object);
40310- if (--item->refcount == 0) {
40311+ if (atomic_dec_and_test(&item->refcount)) {
40312 ref->release(ref);
40313 item->object = NULL;
40314 }
40315diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
40316index 51efebd..2b70935 100644
40317--- a/drivers/gpu/drm/drm_info.c
40318+++ b/drivers/gpu/drm/drm_info.c
40319@@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
40320 struct drm_local_map *map;
40321 struct drm_map_list *r_list;
40322
40323- /* Hardcoded from _DRM_FRAME_BUFFER,
40324- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
40325- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
40326- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
40327+ static const char * const types[] = {
40328+ [_DRM_FRAME_BUFFER] = "FB",
40329+ [_DRM_REGISTERS] = "REG",
40330+ [_DRM_SHM] = "SHM",
40331+ [_DRM_AGP] = "AGP",
40332+ [_DRM_SCATTER_GATHER] = "SG",
40333+ [_DRM_CONSISTENT] = "PCI"};
40334 const char *type;
40335 int i;
40336
40337@@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
40338 map = r_list->map;
40339 if (!map)
40340 continue;
40341- if (map->type < 0 || map->type > 5)
40342+ if (map->type >= ARRAY_SIZE(types))
40343 type = "??";
40344 else
40345 type = types[map->type];
40346diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
40347index 2f4c4343..dd12cd2 100644
40348--- a/drivers/gpu/drm/drm_ioc32.c
40349+++ b/drivers/gpu/drm/drm_ioc32.c
40350@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
40351 request = compat_alloc_user_space(nbytes);
40352 if (!access_ok(VERIFY_WRITE, request, nbytes))
40353 return -EFAULT;
40354- list = (struct drm_buf_desc *) (request + 1);
40355+ list = (struct drm_buf_desc __user *) (request + 1);
40356
40357 if (__put_user(count, &request->count)
40358 || __put_user(list, &request->list))
40359@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
40360 request = compat_alloc_user_space(nbytes);
40361 if (!access_ok(VERIFY_WRITE, request, nbytes))
40362 return -EFAULT;
40363- list = (struct drm_buf_pub *) (request + 1);
40364+ list = (struct drm_buf_pub __user *) (request + 1);
40365
40366 if (__put_user(count, &request->count)
40367 || __put_user(list, &request->list))
40368@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
40369 return 0;
40370 }
40371
40372-drm_ioctl_compat_t *drm_compat_ioctls[] = {
40373+drm_ioctl_compat_t drm_compat_ioctls[] = {
40374 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
40375 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
40376 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
40377@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
40378 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40379 {
40380 unsigned int nr = DRM_IOCTL_NR(cmd);
40381- drm_ioctl_compat_t *fn;
40382 int ret;
40383
40384 /* Assume that ioctls without an explicit compat routine will just
40385@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40386 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
40387 return drm_ioctl(filp, cmd, arg);
40388
40389- fn = drm_compat_ioctls[nr];
40390-
40391- if (fn != NULL)
40392- ret = (*fn) (filp, cmd, arg);
40393+ if (drm_compat_ioctls[nr] != NULL)
40394+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
40395 else
40396 ret = drm_ioctl(filp, cmd, arg);
40397
40398diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
40399index 00587a1..57a65ca 100644
40400--- a/drivers/gpu/drm/drm_ioctl.c
40401+++ b/drivers/gpu/drm/drm_ioctl.c
40402@@ -642,7 +642,7 @@ long drm_ioctl(struct file *filp,
40403 struct drm_file *file_priv = filp->private_data;
40404 struct drm_device *dev;
40405 const struct drm_ioctl_desc *ioctl = NULL;
40406- drm_ioctl_t *func;
40407+ drm_ioctl_no_const_t func;
40408 unsigned int nr = DRM_IOCTL_NR(cmd);
40409 int retcode = -EINVAL;
40410 char stack_kdata[128];
40411diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40412index 93ec5dc..82acbaf 100644
40413--- a/drivers/gpu/drm/i810/i810_drv.h
40414+++ b/drivers/gpu/drm/i810/i810_drv.h
40415@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
40416 int page_flipping;
40417
40418 wait_queue_head_t irq_queue;
40419- atomic_t irq_received;
40420- atomic_t irq_emitted;
40421+ atomic_unchecked_t irq_received;
40422+ atomic_unchecked_t irq_emitted;
40423
40424 int front_offset;
40425 } drm_i810_private_t;
40426diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40427index 318ade9..1f5de55 100644
40428--- a/drivers/gpu/drm/i915/i915_dma.c
40429+++ b/drivers/gpu/drm/i915/i915_dma.c
40430@@ -1294,7 +1294,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40431 * locking inversion with the driver load path. And the access here is
40432 * completely racy anyway. So don't bother with locking for now.
40433 */
40434- return dev->open_count == 0;
40435+ return local_read(&dev->open_count) == 0;
40436 }
40437
40438 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
40439diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40440index 1a0611b..dd1fbfc 100644
40441--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40442+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40443@@ -866,12 +866,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
40444 static int
40445 validate_exec_list(struct drm_device *dev,
40446 struct drm_i915_gem_exec_object2 *exec,
40447- int count)
40448+ unsigned int count)
40449 {
40450 unsigned relocs_total = 0;
40451 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
40452 unsigned invalid_flags;
40453- int i;
40454+ unsigned int i;
40455
40456 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
40457 if (USES_FULL_PPGTT(dev))
40458diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
40459index 2e0613e..a8b94d9 100644
40460--- a/drivers/gpu/drm/i915/i915_ioc32.c
40461+++ b/drivers/gpu/drm/i915/i915_ioc32.c
40462@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
40463 (unsigned long)request);
40464 }
40465
40466-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40467+static drm_ioctl_compat_t i915_compat_ioctls[] = {
40468 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
40469 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
40470 [DRM_I915_GETPARAM] = compat_i915_getparam,
40471@@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40472 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40473 {
40474 unsigned int nr = DRM_IOCTL_NR(cmd);
40475- drm_ioctl_compat_t *fn = NULL;
40476 int ret;
40477
40478 if (nr < DRM_COMMAND_BASE)
40479 return drm_compat_ioctl(filp, cmd, arg);
40480
40481- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
40482- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40483-
40484- if (fn != NULL)
40485+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls)) {
40486+ drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40487 ret = (*fn) (filp, cmd, arg);
40488- else
40489+ } else
40490 ret = drm_ioctl(filp, cmd, arg);
40491
40492 return ret;
40493diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
40494index 9cb5c95..9228666 100644
40495--- a/drivers/gpu/drm/i915/intel_display.c
40496+++ b/drivers/gpu/drm/i915/intel_display.c
40497@@ -12811,13 +12811,13 @@ struct intel_quirk {
40498 int subsystem_vendor;
40499 int subsystem_device;
40500 void (*hook)(struct drm_device *dev);
40501-};
40502+} __do_const;
40503
40504 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
40505 struct intel_dmi_quirk {
40506 void (*hook)(struct drm_device *dev);
40507 const struct dmi_system_id (*dmi_id_list)[];
40508-};
40509+} __do_const;
40510
40511 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40512 {
40513@@ -12825,18 +12825,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40514 return 1;
40515 }
40516
40517-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40518+static const struct dmi_system_id intel_dmi_quirks_table[] = {
40519 {
40520- .dmi_id_list = &(const struct dmi_system_id[]) {
40521- {
40522- .callback = intel_dmi_reverse_brightness,
40523- .ident = "NCR Corporation",
40524- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40525- DMI_MATCH(DMI_PRODUCT_NAME, ""),
40526- },
40527- },
40528- { } /* terminating entry */
40529+ .callback = intel_dmi_reverse_brightness,
40530+ .ident = "NCR Corporation",
40531+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40532+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
40533 },
40534+ },
40535+ { } /* terminating entry */
40536+};
40537+
40538+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40539+ {
40540+ .dmi_id_list = &intel_dmi_quirks_table,
40541 .hook = quirk_invert_brightness,
40542 },
40543 };
40544diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
40545index b4a2014..219ab78 100644
40546--- a/drivers/gpu/drm/mga/mga_drv.h
40547+++ b/drivers/gpu/drm/mga/mga_drv.h
40548@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
40549 u32 clear_cmd;
40550 u32 maccess;
40551
40552- atomic_t vbl_received; /**< Number of vblanks received. */
40553+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
40554 wait_queue_head_t fence_queue;
40555- atomic_t last_fence_retired;
40556+ atomic_unchecked_t last_fence_retired;
40557 u32 next_fence_to_post;
40558
40559 unsigned int fb_cpp;
40560diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
40561index 729bfd5..ead8823 100644
40562--- a/drivers/gpu/drm/mga/mga_ioc32.c
40563+++ b/drivers/gpu/drm/mga/mga_ioc32.c
40564@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
40565 return 0;
40566 }
40567
40568-drm_ioctl_compat_t *mga_compat_ioctls[] = {
40569+drm_ioctl_compat_t mga_compat_ioctls[] = {
40570 [DRM_MGA_INIT] = compat_mga_init,
40571 [DRM_MGA_GETPARAM] = compat_mga_getparam,
40572 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
40573@@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
40574 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40575 {
40576 unsigned int nr = DRM_IOCTL_NR(cmd);
40577- drm_ioctl_compat_t *fn = NULL;
40578 int ret;
40579
40580 if (nr < DRM_COMMAND_BASE)
40581 return drm_compat_ioctl(filp, cmd, arg);
40582
40583- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
40584- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40585-
40586- if (fn != NULL)
40587+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls)) {
40588+ drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40589 ret = (*fn) (filp, cmd, arg);
40590- else
40591+ } else
40592 ret = drm_ioctl(filp, cmd, arg);
40593
40594 return ret;
40595diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
40596index 1b071b8..de8601a 100644
40597--- a/drivers/gpu/drm/mga/mga_irq.c
40598+++ b/drivers/gpu/drm/mga/mga_irq.c
40599@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
40600 if (crtc != 0)
40601 return 0;
40602
40603- return atomic_read(&dev_priv->vbl_received);
40604+ return atomic_read_unchecked(&dev_priv->vbl_received);
40605 }
40606
40607
40608@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40609 /* VBLANK interrupt */
40610 if (status & MGA_VLINEPEN) {
40611 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
40612- atomic_inc(&dev_priv->vbl_received);
40613+ atomic_inc_unchecked(&dev_priv->vbl_received);
40614 drm_handle_vblank(dev, 0);
40615 handled = 1;
40616 }
40617@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40618 if ((prim_start & ~0x03) != (prim_end & ~0x03))
40619 MGA_WRITE(MGA_PRIMEND, prim_end);
40620
40621- atomic_inc(&dev_priv->last_fence_retired);
40622+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
40623 wake_up(&dev_priv->fence_queue);
40624 handled = 1;
40625 }
40626@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
40627 * using fences.
40628 */
40629 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
40630- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
40631+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
40632 - *sequence) <= (1 << 23)));
40633
40634 *sequence = cur_fence;
40635diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
40636index dae2c96..324dbe4 100644
40637--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
40638+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
40639@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
40640 struct bit_table {
40641 const char id;
40642 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
40643-};
40644+} __no_const;
40645
40646 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
40647
40648diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
40649index 8ae36f2..1147a30 100644
40650--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
40651+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
40652@@ -121,7 +121,6 @@ struct nouveau_drm {
40653 struct drm_global_reference mem_global_ref;
40654 struct ttm_bo_global_ref bo_global_ref;
40655 struct ttm_bo_device bdev;
40656- atomic_t validate_sequence;
40657 int (*move)(struct nouveau_channel *,
40658 struct ttm_buffer_object *,
40659 struct ttm_mem_reg *, struct ttm_mem_reg *);
40660diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40661index 462679a..88e32a7 100644
40662--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40663+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
40664@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
40665 unsigned long arg)
40666 {
40667 unsigned int nr = DRM_IOCTL_NR(cmd);
40668- drm_ioctl_compat_t *fn = NULL;
40669+ drm_ioctl_compat_t fn = NULL;
40670 int ret;
40671
40672 if (nr < DRM_COMMAND_BASE)
40673diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40674index 753a6de..dd66b98 100644
40675--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
40676+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
40677@@ -126,11 +126,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40678 }
40679
40680 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
40681- nouveau_vram_manager_init,
40682- nouveau_vram_manager_fini,
40683- nouveau_vram_manager_new,
40684- nouveau_vram_manager_del,
40685- nouveau_vram_manager_debug
40686+ .init = nouveau_vram_manager_init,
40687+ .takedown = nouveau_vram_manager_fini,
40688+ .get_node = nouveau_vram_manager_new,
40689+ .put_node = nouveau_vram_manager_del,
40690+ .debug = nouveau_vram_manager_debug
40691 };
40692
40693 static int
40694@@ -194,11 +194,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40695 }
40696
40697 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
40698- nouveau_gart_manager_init,
40699- nouveau_gart_manager_fini,
40700- nouveau_gart_manager_new,
40701- nouveau_gart_manager_del,
40702- nouveau_gart_manager_debug
40703+ .init = nouveau_gart_manager_init,
40704+ .takedown = nouveau_gart_manager_fini,
40705+ .get_node = nouveau_gart_manager_new,
40706+ .put_node = nouveau_gart_manager_del,
40707+ .debug = nouveau_gart_manager_debug
40708 };
40709
40710 /*XXX*/
40711@@ -267,11 +267,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
40712 }
40713
40714 const struct ttm_mem_type_manager_func nv04_gart_manager = {
40715- nv04_gart_manager_init,
40716- nv04_gart_manager_fini,
40717- nv04_gart_manager_new,
40718- nv04_gart_manager_del,
40719- nv04_gart_manager_debug
40720+ .init = nv04_gart_manager_init,
40721+ .takedown = nv04_gart_manager_fini,
40722+ .get_node = nv04_gart_manager_new,
40723+ .put_node = nv04_gart_manager_del,
40724+ .debug = nv04_gart_manager_debug
40725 };
40726
40727 int
40728diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
40729index c7592ec..dd45ebc 100644
40730--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
40731+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
40732@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
40733 * locking inversion with the driver load path. And the access here is
40734 * completely racy anyway. So don't bother with locking for now.
40735 */
40736- return dev->open_count == 0;
40737+ return local_read(&dev->open_count) == 0;
40738 }
40739
40740 static const struct vga_switcheroo_client_ops
40741diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
40742index 9782364..89bd954 100644
40743--- a/drivers/gpu/drm/qxl/qxl_cmd.c
40744+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
40745@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
40746 int ret;
40747
40748 mutex_lock(&qdev->async_io_mutex);
40749- irq_num = atomic_read(&qdev->irq_received_io_cmd);
40750+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40751 if (qdev->last_sent_io_cmd > irq_num) {
40752 if (intr)
40753 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40754- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40755+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40756 else
40757 ret = wait_event_timeout(qdev->io_cmd_event,
40758- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40759+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40760 /* 0 is timeout, just bail the "hw" has gone away */
40761 if (ret <= 0)
40762 goto out;
40763- irq_num = atomic_read(&qdev->irq_received_io_cmd);
40764+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
40765 }
40766 outb(val, addr);
40767 qdev->last_sent_io_cmd = irq_num + 1;
40768 if (intr)
40769 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
40770- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40771+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40772 else
40773 ret = wait_event_timeout(qdev->io_cmd_event,
40774- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40775+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
40776 out:
40777 if (ret > 0)
40778 ret = 0;
40779diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
40780index 6911b8c..89d6867 100644
40781--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
40782+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
40783@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
40784 struct drm_info_node *node = (struct drm_info_node *) m->private;
40785 struct qxl_device *qdev = node->minor->dev->dev_private;
40786
40787- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
40788- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
40789- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
40790- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
40791+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
40792+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
40793+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
40794+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
40795 seq_printf(m, "%d\n", qdev->irq_received_error);
40796 return 0;
40797 }
40798diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
40799index 7c6cafe..460f542 100644
40800--- a/drivers/gpu/drm/qxl/qxl_drv.h
40801+++ b/drivers/gpu/drm/qxl/qxl_drv.h
40802@@ -290,10 +290,10 @@ struct qxl_device {
40803 unsigned int last_sent_io_cmd;
40804
40805 /* interrupt handling */
40806- atomic_t irq_received;
40807- atomic_t irq_received_display;
40808- atomic_t irq_received_cursor;
40809- atomic_t irq_received_io_cmd;
40810+ atomic_unchecked_t irq_received;
40811+ atomic_unchecked_t irq_received_display;
40812+ atomic_unchecked_t irq_received_cursor;
40813+ atomic_unchecked_t irq_received_io_cmd;
40814 unsigned irq_received_error;
40815 wait_queue_head_t display_event;
40816 wait_queue_head_t cursor_event;
40817diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
40818index b110883..dd06418 100644
40819--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
40820+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
40821@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40822
40823 /* TODO copy slow path code from i915 */
40824 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
40825- 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);
40826+ 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);
40827
40828 {
40829 struct qxl_drawable *draw = fb_cmd;
40830@@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
40831 struct drm_qxl_reloc reloc;
40832
40833 if (copy_from_user(&reloc,
40834- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
40835+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
40836 sizeof(reloc))) {
40837 ret = -EFAULT;
40838 goto out_free_bos;
40839@@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
40840
40841 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
40842
40843- struct drm_qxl_command *commands =
40844- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
40845+ struct drm_qxl_command __user *commands =
40846+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
40847
40848- if (copy_from_user(&user_cmd, &commands[cmd_num],
40849+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
40850 sizeof(user_cmd)))
40851 return -EFAULT;
40852
40853diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
40854index 0bf1e20..42a7310 100644
40855--- a/drivers/gpu/drm/qxl/qxl_irq.c
40856+++ b/drivers/gpu/drm/qxl/qxl_irq.c
40857@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
40858 if (!pending)
40859 return IRQ_NONE;
40860
40861- atomic_inc(&qdev->irq_received);
40862+ atomic_inc_unchecked(&qdev->irq_received);
40863
40864 if (pending & QXL_INTERRUPT_DISPLAY) {
40865- atomic_inc(&qdev->irq_received_display);
40866+ atomic_inc_unchecked(&qdev->irq_received_display);
40867 wake_up_all(&qdev->display_event);
40868 qxl_queue_garbage_collect(qdev, false);
40869 }
40870 if (pending & QXL_INTERRUPT_CURSOR) {
40871- atomic_inc(&qdev->irq_received_cursor);
40872+ atomic_inc_unchecked(&qdev->irq_received_cursor);
40873 wake_up_all(&qdev->cursor_event);
40874 }
40875 if (pending & QXL_INTERRUPT_IO_CMD) {
40876- atomic_inc(&qdev->irq_received_io_cmd);
40877+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
40878 wake_up_all(&qdev->io_cmd_event);
40879 }
40880 if (pending & QXL_INTERRUPT_ERROR) {
40881@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
40882 init_waitqueue_head(&qdev->io_cmd_event);
40883 INIT_WORK(&qdev->client_monitors_config_work,
40884 qxl_client_monitors_config_work_func);
40885- atomic_set(&qdev->irq_received, 0);
40886- atomic_set(&qdev->irq_received_display, 0);
40887- atomic_set(&qdev->irq_received_cursor, 0);
40888- atomic_set(&qdev->irq_received_io_cmd, 0);
40889+ atomic_set_unchecked(&qdev->irq_received, 0);
40890+ atomic_set_unchecked(&qdev->irq_received_display, 0);
40891+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
40892+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
40893 qdev->irq_received_error = 0;
40894 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
40895 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
40896diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
40897index 0cbc4c9..0e46686 100644
40898--- a/drivers/gpu/drm/qxl/qxl_ttm.c
40899+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
40900@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
40901 }
40902 }
40903
40904-static struct vm_operations_struct qxl_ttm_vm_ops;
40905+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
40906 static const struct vm_operations_struct *ttm_vm_ops;
40907
40908 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
40909@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
40910 return r;
40911 if (unlikely(ttm_vm_ops == NULL)) {
40912 ttm_vm_ops = vma->vm_ops;
40913+ pax_open_kernel();
40914 qxl_ttm_vm_ops = *ttm_vm_ops;
40915 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
40916+ pax_close_kernel();
40917 }
40918 vma->vm_ops = &qxl_ttm_vm_ops;
40919 return 0;
40920@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
40921 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
40922 {
40923 #if defined(CONFIG_DEBUG_FS)
40924- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
40925- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
40926- unsigned i;
40927+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
40928+ {
40929+ .name = "qxl_mem_mm",
40930+ .show = &qxl_mm_dump_table,
40931+ },
40932+ {
40933+ .name = "qxl_surf_mm",
40934+ .show = &qxl_mm_dump_table,
40935+ }
40936+ };
40937
40938- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
40939- if (i == 0)
40940- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
40941- else
40942- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
40943- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
40944- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
40945- qxl_mem_types_list[i].driver_features = 0;
40946- if (i == 0)
40947- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40948- else
40949- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40950+ pax_open_kernel();
40951+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
40952+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
40953+ pax_close_kernel();
40954
40955- }
40956- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
40957+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
40958 #else
40959 return 0;
40960 #endif
40961diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
40962index 2c45ac9..5d740f8 100644
40963--- a/drivers/gpu/drm/r128/r128_cce.c
40964+++ b/drivers/gpu/drm/r128/r128_cce.c
40965@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
40966
40967 /* GH: Simple idle check.
40968 */
40969- atomic_set(&dev_priv->idle_count, 0);
40970+ atomic_set_unchecked(&dev_priv->idle_count, 0);
40971
40972 /* We don't support anything other than bus-mastering ring mode,
40973 * but the ring can be in either AGP or PCI space for the ring
40974diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
40975index 723e5d6..102dbaf 100644
40976--- a/drivers/gpu/drm/r128/r128_drv.h
40977+++ b/drivers/gpu/drm/r128/r128_drv.h
40978@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
40979 int is_pci;
40980 unsigned long cce_buffers_offset;
40981
40982- atomic_t idle_count;
40983+ atomic_unchecked_t idle_count;
40984
40985 int page_flipping;
40986 int current_page;
40987 u32 crtc_offset;
40988 u32 crtc_offset_cntl;
40989
40990- atomic_t vbl_received;
40991+ atomic_unchecked_t vbl_received;
40992
40993 u32 color_fmt;
40994 unsigned int front_offset;
40995diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
40996index 663f38c..c689495 100644
40997--- a/drivers/gpu/drm/r128/r128_ioc32.c
40998+++ b/drivers/gpu/drm/r128/r128_ioc32.c
40999@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41000 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41001 }
41002
41003-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41004+drm_ioctl_compat_t r128_compat_ioctls[] = {
41005 [DRM_R128_INIT] = compat_r128_init,
41006 [DRM_R128_DEPTH] = compat_r128_depth,
41007 [DRM_R128_STIPPLE] = compat_r128_stipple,
41008@@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41009 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41010 {
41011 unsigned int nr = DRM_IOCTL_NR(cmd);
41012- drm_ioctl_compat_t *fn = NULL;
41013 int ret;
41014
41015 if (nr < DRM_COMMAND_BASE)
41016 return drm_compat_ioctl(filp, cmd, arg);
41017
41018- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41019- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41020-
41021- if (fn != NULL)
41022+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls)) {
41023+ drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41024 ret = (*fn) (filp, cmd, arg);
41025- else
41026+ } else
41027 ret = drm_ioctl(filp, cmd, arg);
41028
41029 return ret;
41030diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41031index c2ae496..30b5993 100644
41032--- a/drivers/gpu/drm/r128/r128_irq.c
41033+++ b/drivers/gpu/drm/r128/r128_irq.c
41034@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41035 if (crtc != 0)
41036 return 0;
41037
41038- return atomic_read(&dev_priv->vbl_received);
41039+ return atomic_read_unchecked(&dev_priv->vbl_received);
41040 }
41041
41042 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41043@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41044 /* VBLANK interrupt */
41045 if (status & R128_CRTC_VBLANK_INT) {
41046 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41047- atomic_inc(&dev_priv->vbl_received);
41048+ atomic_inc_unchecked(&dev_priv->vbl_received);
41049 drm_handle_vblank(dev, 0);
41050 return IRQ_HANDLED;
41051 }
41052diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41053index 575e986..66e62ca 100644
41054--- a/drivers/gpu/drm/r128/r128_state.c
41055+++ b/drivers/gpu/drm/r128/r128_state.c
41056@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41057
41058 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41059 {
41060- if (atomic_read(&dev_priv->idle_count) == 0)
41061+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41062 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41063 else
41064- atomic_set(&dev_priv->idle_count, 0);
41065+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41066 }
41067
41068 #endif
41069diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41070index 4a85bb6..aaea819 100644
41071--- a/drivers/gpu/drm/radeon/mkregtable.c
41072+++ b/drivers/gpu/drm/radeon/mkregtable.c
41073@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41074 regex_t mask_rex;
41075 regmatch_t match[4];
41076 char buf[1024];
41077- size_t end;
41078+ long end;
41079 int len;
41080 int done = 0;
41081 int r;
41082 unsigned o;
41083 struct offset *offset;
41084 char last_reg_s[10];
41085- int last_reg;
41086+ unsigned long last_reg;
41087
41088 if (regcomp
41089 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41090diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41091index 995a8b1..b7cb898 100644
41092--- a/drivers/gpu/drm/radeon/radeon_device.c
41093+++ b/drivers/gpu/drm/radeon/radeon_device.c
41094@@ -1214,7 +1214,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41095 * locking inversion with the driver load path. And the access here is
41096 * completely racy anyway. So don't bother with locking for now.
41097 */
41098- return dev->open_count == 0;
41099+ return local_read(&dev->open_count) == 0;
41100 }
41101
41102 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41103diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41104index 46bd393..6ae4719 100644
41105--- a/drivers/gpu/drm/radeon/radeon_drv.h
41106+++ b/drivers/gpu/drm/radeon/radeon_drv.h
41107@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41108
41109 /* SW interrupt */
41110 wait_queue_head_t swi_queue;
41111- atomic_t swi_emitted;
41112+ atomic_unchecked_t swi_emitted;
41113 int vblank_crtc;
41114 uint32_t irq_enable_reg;
41115 uint32_t r500_disp_irq_reg;
41116diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
41117index 0b98ea1..0881827 100644
41118--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
41119+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
41120@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41121 request = compat_alloc_user_space(sizeof(*request));
41122 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
41123 || __put_user(req32.param, &request->param)
41124- || __put_user((void __user *)(unsigned long)req32.value,
41125+ || __put_user((unsigned long)req32.value,
41126 &request->value))
41127 return -EFAULT;
41128
41129@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41130 #define compat_radeon_cp_setparam NULL
41131 #endif /* X86_64 || IA64 */
41132
41133-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41134+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
41135 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
41136 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
41137 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
41138@@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41139 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41140 {
41141 unsigned int nr = DRM_IOCTL_NR(cmd);
41142- drm_ioctl_compat_t *fn = NULL;
41143 int ret;
41144
41145 if (nr < DRM_COMMAND_BASE)
41146 return drm_compat_ioctl(filp, cmd, arg);
41147
41148- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
41149- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41150-
41151- if (fn != NULL)
41152+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls)) {
41153+ drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41154 ret = (*fn) (filp, cmd, arg);
41155- else
41156+ } else
41157 ret = drm_ioctl(filp, cmd, arg);
41158
41159 return ret;
41160diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
41161index 244b19b..c19226d 100644
41162--- a/drivers/gpu/drm/radeon/radeon_irq.c
41163+++ b/drivers/gpu/drm/radeon/radeon_irq.c
41164@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
41165 unsigned int ret;
41166 RING_LOCALS;
41167
41168- atomic_inc(&dev_priv->swi_emitted);
41169- ret = atomic_read(&dev_priv->swi_emitted);
41170+ atomic_inc_unchecked(&dev_priv->swi_emitted);
41171+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
41172
41173 BEGIN_RING(4);
41174 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
41175@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
41176 drm_radeon_private_t *dev_priv =
41177 (drm_radeon_private_t *) dev->dev_private;
41178
41179- atomic_set(&dev_priv->swi_emitted, 0);
41180+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
41181 init_waitqueue_head(&dev_priv->swi_queue);
41182
41183 dev->max_vblank_count = 0x001fffff;
41184diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
41185index 535403e..5dd655b 100644
41186--- a/drivers/gpu/drm/radeon/radeon_state.c
41187+++ b/drivers/gpu/drm/radeon/radeon_state.c
41188@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
41189 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
41190 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
41191
41192- if (copy_from_user(&depth_boxes, clear->depth_boxes,
41193+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
41194 sarea_priv->nbox * sizeof(depth_boxes[0])))
41195 return -EFAULT;
41196
41197@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
41198 {
41199 drm_radeon_private_t *dev_priv = dev->dev_private;
41200 drm_radeon_getparam_t *param = data;
41201- int value;
41202+ int value = 0;
41203
41204 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
41205
41206diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
41207index 8624979..65e5243 100644
41208--- a/drivers/gpu/drm/radeon/radeon_ttm.c
41209+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
41210@@ -936,7 +936,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
41211 man->size = size >> PAGE_SHIFT;
41212 }
41213
41214-static struct vm_operations_struct radeon_ttm_vm_ops;
41215+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
41216 static const struct vm_operations_struct *ttm_vm_ops = NULL;
41217
41218 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41219@@ -977,8 +977,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
41220 }
41221 if (unlikely(ttm_vm_ops == NULL)) {
41222 ttm_vm_ops = vma->vm_ops;
41223+ pax_open_kernel();
41224 radeon_ttm_vm_ops = *ttm_vm_ops;
41225 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
41226+ pax_close_kernel();
41227 }
41228 vma->vm_ops = &radeon_ttm_vm_ops;
41229 return 0;
41230diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
41231index 054a79f..30d9ac4 100644
41232--- a/drivers/gpu/drm/tegra/dc.c
41233+++ b/drivers/gpu/drm/tegra/dc.c
41234@@ -1242,7 +1242,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
41235 }
41236
41237 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41238- dc->debugfs_files[i].data = dc;
41239+ *(void **)&dc->debugfs_files[i].data = dc;
41240
41241 err = drm_debugfs_create_files(dc->debugfs_files,
41242 ARRAY_SIZE(debugfs_files),
41243diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
41244index f787445..2df2c65 100644
41245--- a/drivers/gpu/drm/tegra/dsi.c
41246+++ b/drivers/gpu/drm/tegra/dsi.c
41247@@ -41,7 +41,7 @@ struct tegra_dsi {
41248 struct clk *clk_lp;
41249 struct clk *clk;
41250
41251- struct drm_info_list *debugfs_files;
41252+ drm_info_list_no_const *debugfs_files;
41253 struct drm_minor *minor;
41254 struct dentry *debugfs;
41255
41256diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41257index ffe2654..03c7b1c 100644
41258--- a/drivers/gpu/drm/tegra/hdmi.c
41259+++ b/drivers/gpu/drm/tegra/hdmi.c
41260@@ -60,7 +60,7 @@ struct tegra_hdmi {
41261 bool stereo;
41262 bool dvi;
41263
41264- struct drm_info_list *debugfs_files;
41265+ drm_info_list_no_const *debugfs_files;
41266 struct drm_minor *minor;
41267 struct dentry *debugfs;
41268 };
41269diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41270index 964387f..4eafc00 100644
41271--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41272+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41273@@ -146,10 +146,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41274 }
41275
41276 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41277- ttm_bo_man_init,
41278- ttm_bo_man_takedown,
41279- ttm_bo_man_get_node,
41280- ttm_bo_man_put_node,
41281- ttm_bo_man_debug
41282+ .init = ttm_bo_man_init,
41283+ .takedown = ttm_bo_man_takedown,
41284+ .get_node = ttm_bo_man_get_node,
41285+ .put_node = ttm_bo_man_put_node,
41286+ .debug = ttm_bo_man_debug
41287 };
41288 EXPORT_SYMBOL(ttm_bo_manager_func);
41289diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41290index a1803fb..c53f6b0 100644
41291--- a/drivers/gpu/drm/ttm/ttm_memory.c
41292+++ b/drivers/gpu/drm/ttm/ttm_memory.c
41293@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41294 zone->glob = glob;
41295 glob->zone_kernel = zone;
41296 ret = kobject_init_and_add(
41297- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41298+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41299 if (unlikely(ret != 0)) {
41300 kobject_put(&zone->kobj);
41301 return ret;
41302@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41303 zone->glob = glob;
41304 glob->zone_dma32 = zone;
41305 ret = kobject_init_and_add(
41306- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41307+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41308 if (unlikely(ret != 0)) {
41309 kobject_put(&zone->kobj);
41310 return ret;
41311diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41312index 09874d6..d6da1de 100644
41313--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41314+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41315@@ -54,7 +54,7 @@
41316
41317 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41318 #define SMALL_ALLOCATION 16
41319-#define FREE_ALL_PAGES (~0U)
41320+#define FREE_ALL_PAGES (~0UL)
41321 /* times are in msecs */
41322 #define PAGE_FREE_INTERVAL 1000
41323
41324@@ -299,14 +299,13 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
41325 * @free_all: If set to true will free all pages in pool
41326 * @gfp: GFP flags.
41327 **/
41328-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
41329+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
41330 gfp_t gfp)
41331 {
41332 unsigned long irq_flags;
41333 struct page *p;
41334 struct page **pages_to_free;
41335- unsigned freed_pages = 0,
41336- npages_to_free = nr_free;
41337+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41338
41339 if (NUM_PAGES_TO_ALLOC < nr_free)
41340 npages_to_free = NUM_PAGES_TO_ALLOC;
41341@@ -366,7 +365,8 @@ restart:
41342 __list_del(&p->lru, &pool->list);
41343
41344 ttm_pool_update_free_locked(pool, freed_pages);
41345- nr_free -= freed_pages;
41346+ if (likely(nr_free != FREE_ALL_PAGES))
41347+ nr_free -= freed_pages;
41348 }
41349
41350 spin_unlock_irqrestore(&pool->lock, irq_flags);
41351@@ -395,7 +395,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41352 unsigned i;
41353 unsigned pool_offset;
41354 struct ttm_page_pool *pool;
41355- int shrink_pages = sc->nr_to_scan;
41356+ unsigned long shrink_pages = sc->nr_to_scan;
41357 unsigned long freed = 0;
41358
41359 if (!mutex_trylock(&lock))
41360@@ -403,7 +403,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41361 pool_offset = ++start_pool % NUM_POOLS;
41362 /* select start pool in round robin fashion */
41363 for (i = 0; i < NUM_POOLS; ++i) {
41364- unsigned nr_free = shrink_pages;
41365+ unsigned long nr_free = shrink_pages;
41366 if (shrink_pages == 0)
41367 break;
41368 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
41369@@ -669,7 +669,7 @@ out:
41370 }
41371
41372 /* Put all pages in pages list to correct pool to wait for reuse */
41373-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
41374+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
41375 enum ttm_caching_state cstate)
41376 {
41377 unsigned long irq_flags;
41378@@ -724,7 +724,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
41379 struct list_head plist;
41380 struct page *p = NULL;
41381 gfp_t gfp_flags = GFP_USER;
41382- unsigned count;
41383+ unsigned long count;
41384 int r;
41385
41386 /* set zero flag for page allocation if required */
41387diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41388index c96db43..c367557 100644
41389--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41390+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41391@@ -56,7 +56,7 @@
41392
41393 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41394 #define SMALL_ALLOCATION 4
41395-#define FREE_ALL_PAGES (~0U)
41396+#define FREE_ALL_PAGES (~0UL)
41397 /* times are in msecs */
41398 #define IS_UNDEFINED (0)
41399 #define IS_WC (1<<1)
41400@@ -413,15 +413,14 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
41401 * @nr_free: If set to true will free all pages in pool
41402 * @gfp: GFP flags.
41403 **/
41404-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41405+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
41406 gfp_t gfp)
41407 {
41408 unsigned long irq_flags;
41409 struct dma_page *dma_p, *tmp;
41410 struct page **pages_to_free;
41411 struct list_head d_pages;
41412- unsigned freed_pages = 0,
41413- npages_to_free = nr_free;
41414+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41415
41416 if (NUM_PAGES_TO_ALLOC < nr_free)
41417 npages_to_free = NUM_PAGES_TO_ALLOC;
41418@@ -494,7 +493,8 @@ restart:
41419 /* remove range of pages from the pool */
41420 if (freed_pages) {
41421 ttm_pool_update_free_locked(pool, freed_pages);
41422- nr_free -= freed_pages;
41423+ if (likely(nr_free != FREE_ALL_PAGES))
41424+ nr_free -= freed_pages;
41425 }
41426
41427 spin_unlock_irqrestore(&pool->lock, irq_flags);
41428@@ -929,7 +929,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
41429 struct dma_page *d_page, *next;
41430 enum pool_type type;
41431 bool is_cached = false;
41432- unsigned count = 0, i, npages = 0;
41433+ unsigned long count = 0, i, npages = 0;
41434 unsigned long irq_flags;
41435
41436 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
41437@@ -1007,7 +1007,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41438 static unsigned start_pool;
41439 unsigned idx = 0;
41440 unsigned pool_offset;
41441- unsigned shrink_pages = sc->nr_to_scan;
41442+ unsigned long shrink_pages = sc->nr_to_scan;
41443 struct device_pools *p;
41444 unsigned long freed = 0;
41445
41446@@ -1020,7 +1020,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41447 goto out;
41448 pool_offset = ++start_pool % _manager->npools;
41449 list_for_each_entry(p, &_manager->pools, pools) {
41450- unsigned nr_free;
41451+ unsigned long nr_free;
41452
41453 if (!p->dev)
41454 continue;
41455@@ -1034,7 +1034,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41456 sc->gfp_mask);
41457 freed += nr_free - shrink_pages;
41458
41459- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
41460+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
41461 p->pool->dev_name, p->pool->name, current->pid,
41462 nr_free, shrink_pages);
41463 }
41464diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
41465index 8cbcb45..a4d9cf7 100644
41466--- a/drivers/gpu/drm/udl/udl_fb.c
41467+++ b/drivers/gpu/drm/udl/udl_fb.c
41468@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
41469 fb_deferred_io_cleanup(info);
41470 kfree(info->fbdefio);
41471 info->fbdefio = NULL;
41472- info->fbops->fb_mmap = udl_fb_mmap;
41473 }
41474
41475 pr_warn("released /dev/fb%d user=%d count=%d\n",
41476diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
41477index ef8c500..01030c8 100644
41478--- a/drivers/gpu/drm/via/via_drv.h
41479+++ b/drivers/gpu/drm/via/via_drv.h
41480@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
41481 typedef uint32_t maskarray_t[5];
41482
41483 typedef struct drm_via_irq {
41484- atomic_t irq_received;
41485+ atomic_unchecked_t irq_received;
41486 uint32_t pending_mask;
41487 uint32_t enable_mask;
41488 wait_queue_head_t irq_queue;
41489@@ -77,7 +77,7 @@ typedef struct drm_via_private {
41490 struct timeval last_vblank;
41491 int last_vblank_valid;
41492 unsigned usec_per_vblank;
41493- atomic_t vbl_received;
41494+ atomic_unchecked_t vbl_received;
41495 drm_via_state_t hc_state;
41496 char pci_buf[VIA_PCI_BUF_SIZE];
41497 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
41498diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
41499index 1319433..a993b0c 100644
41500--- a/drivers/gpu/drm/via/via_irq.c
41501+++ b/drivers/gpu/drm/via/via_irq.c
41502@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
41503 if (crtc != 0)
41504 return 0;
41505
41506- return atomic_read(&dev_priv->vbl_received);
41507+ return atomic_read_unchecked(&dev_priv->vbl_received);
41508 }
41509
41510 irqreturn_t via_driver_irq_handler(int irq, void *arg)
41511@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41512
41513 status = VIA_READ(VIA_REG_INTERRUPT);
41514 if (status & VIA_IRQ_VBLANK_PENDING) {
41515- atomic_inc(&dev_priv->vbl_received);
41516- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
41517+ atomic_inc_unchecked(&dev_priv->vbl_received);
41518+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
41519 do_gettimeofday(&cur_vblank);
41520 if (dev_priv->last_vblank_valid) {
41521 dev_priv->usec_per_vblank =
41522@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41523 dev_priv->last_vblank = cur_vblank;
41524 dev_priv->last_vblank_valid = 1;
41525 }
41526- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
41527+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
41528 DRM_DEBUG("US per vblank is: %u\n",
41529 dev_priv->usec_per_vblank);
41530 }
41531@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41532
41533 for (i = 0; i < dev_priv->num_irqs; ++i) {
41534 if (status & cur_irq->pending_mask) {
41535- atomic_inc(&cur_irq->irq_received);
41536+ atomic_inc_unchecked(&cur_irq->irq_received);
41537 wake_up(&cur_irq->irq_queue);
41538 handled = 1;
41539 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
41540@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
41541 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41542 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
41543 masks[irq][4]));
41544- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
41545+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
41546 } else {
41547 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41548 (((cur_irq_sequence =
41549- atomic_read(&cur_irq->irq_received)) -
41550+ atomic_read_unchecked(&cur_irq->irq_received)) -
41551 *sequence) <= (1 << 23)));
41552 }
41553 *sequence = cur_irq_sequence;
41554@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
41555 }
41556
41557 for (i = 0; i < dev_priv->num_irqs; ++i) {
41558- atomic_set(&cur_irq->irq_received, 0);
41559+ atomic_set_unchecked(&cur_irq->irq_received, 0);
41560 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
41561 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
41562 init_waitqueue_head(&cur_irq->irq_queue);
41563@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
41564 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
41565 case VIA_IRQ_RELATIVE:
41566 irqwait->request.sequence +=
41567- atomic_read(&cur_irq->irq_received);
41568+ atomic_read_unchecked(&cur_irq->irq_received);
41569 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
41570 case VIA_IRQ_ABSOLUTE:
41571 break;
41572diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41573index 4ee799b..69fc0d1 100644
41574--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41575+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41576@@ -446,7 +446,7 @@ struct vmw_private {
41577 * Fencing and IRQs.
41578 */
41579
41580- atomic_t marker_seq;
41581+ atomic_unchecked_t marker_seq;
41582 wait_queue_head_t fence_queue;
41583 wait_queue_head_t fifo_queue;
41584 int fence_queue_waiters; /* Protected by hw_mutex */
41585diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41586index 09e10ae..cb76c60 100644
41587--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41588+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41589@@ -154,7 +154,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
41590 (unsigned int) min,
41591 (unsigned int) fifo->capabilities);
41592
41593- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41594+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41595 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
41596 vmw_marker_queue_init(&fifo->marker_queue);
41597 return vmw_fifo_send_fence(dev_priv, &dummy);
41598@@ -378,7 +378,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
41599 if (reserveable)
41600 iowrite32(bytes, fifo_mem +
41601 SVGA_FIFO_RESERVED);
41602- return fifo_mem + (next_cmd >> 2);
41603+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
41604 } else {
41605 need_bounce = true;
41606 }
41607@@ -498,7 +498,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41608
41609 fm = vmw_fifo_reserve(dev_priv, bytes);
41610 if (unlikely(fm == NULL)) {
41611- *seqno = atomic_read(&dev_priv->marker_seq);
41612+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41613 ret = -ENOMEM;
41614 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
41615 false, 3*HZ);
41616@@ -506,7 +506,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41617 }
41618
41619 do {
41620- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
41621+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
41622 } while (*seqno == 0);
41623
41624 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
41625diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41626index 170b61b..fec7348 100644
41627--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41628+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41629@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
41630 }
41631
41632 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
41633- vmw_gmrid_man_init,
41634- vmw_gmrid_man_takedown,
41635- vmw_gmrid_man_get_node,
41636- vmw_gmrid_man_put_node,
41637- vmw_gmrid_man_debug
41638+ .init = vmw_gmrid_man_init,
41639+ .takedown = vmw_gmrid_man_takedown,
41640+ .get_node = vmw_gmrid_man_get_node,
41641+ .put_node = vmw_gmrid_man_put_node,
41642+ .debug = vmw_gmrid_man_debug
41643 };
41644diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41645index 37881ec..319065d 100644
41646--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41647+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
41648@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
41649 int ret;
41650
41651 num_clips = arg->num_clips;
41652- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41653+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41654
41655 if (unlikely(num_clips == 0))
41656 return 0;
41657@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
41658 int ret;
41659
41660 num_clips = arg->num_clips;
41661- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
41662+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
41663
41664 if (unlikely(num_clips == 0))
41665 return 0;
41666diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41667index 0c42376..6febe77 100644
41668--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41669+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
41670@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
41671 * emitted. Then the fence is stale and signaled.
41672 */
41673
41674- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
41675+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
41676 > VMW_FENCE_WRAP);
41677
41678 return ret;
41679@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
41680
41681 if (fifo_idle)
41682 down_read(&fifo_state->rwsem);
41683- signal_seq = atomic_read(&dev_priv->marker_seq);
41684+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
41685 ret = 0;
41686
41687 for (;;) {
41688diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41689index efd1ffd..0ae13ca 100644
41690--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41691+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
41692@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
41693 while (!vmw_lag_lt(queue, us)) {
41694 spin_lock(&queue->lock);
41695 if (list_empty(&queue->head))
41696- seqno = atomic_read(&dev_priv->marker_seq);
41697+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41698 else {
41699 marker = list_first_entry(&queue->head,
41700 struct vmw_marker, head);
41701diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
41702index 37ac7b5..d52a5c9 100644
41703--- a/drivers/gpu/vga/vga_switcheroo.c
41704+++ b/drivers/gpu/vga/vga_switcheroo.c
41705@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
41706
41707 /* this version is for the case where the power switch is separate
41708 to the device being powered down. */
41709-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
41710+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
41711 {
41712 /* copy over all the bus versions */
41713 if (dev->bus && dev->bus->pm) {
41714@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
41715 return ret;
41716 }
41717
41718-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
41719+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
41720 {
41721 /* copy over all the bus versions */
41722 if (dev->bus && dev->bus->pm) {
41723diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
41724index 3402033..50b562c 100644
41725--- a/drivers/hid/hid-core.c
41726+++ b/drivers/hid/hid-core.c
41727@@ -2506,7 +2506,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
41728
41729 int hid_add_device(struct hid_device *hdev)
41730 {
41731- static atomic_t id = ATOMIC_INIT(0);
41732+ static atomic_unchecked_t id = ATOMIC_INIT(0);
41733 int ret;
41734
41735 if (WARN_ON(hdev->status & HID_STAT_ADDED))
41736@@ -2548,7 +2548,7 @@ int hid_add_device(struct hid_device *hdev)
41737 /* XXX hack, any other cleaner solution after the driver core
41738 * is converted to allow more than 20 bytes as the device name? */
41739 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
41740- hdev->vendor, hdev->product, atomic_inc_return(&id));
41741+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
41742
41743 hid_debug_register(hdev, dev_name(&hdev->dev));
41744 ret = device_add(&hdev->dev);
41745diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
41746index 71f5692..147d3da 100644
41747--- a/drivers/hid/hid-logitech-dj.c
41748+++ b/drivers/hid/hid-logitech-dj.c
41749@@ -658,6 +658,12 @@ static int logi_dj_raw_event(struct hid_device *hdev,
41750 * device (via hid_input_report() ) and return 1 so hid-core does not do
41751 * anything else with it.
41752 */
41753+ if ((dj_report->device_index < DJ_DEVICE_INDEX_MIN) ||
41754+ (dj_report->device_index > DJ_DEVICE_INDEX_MAX)) {
41755+ dev_err(&hdev->dev, "%s: invalid device index:%d\n",
41756+ __func__, dj_report->device_index);
41757+ return false;
41758+ }
41759
41760 /* case 1) */
41761 if (data[0] != REPORT_ID_DJ_SHORT)
41762diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
41763index bc4269e..b6e6102 100644
41764--- a/drivers/hid/hid-sony.c
41765+++ b/drivers/hid/hid-sony.c
41766@@ -798,6 +798,12 @@ union sixaxis_output_report_01 {
41767 __u8 buf[36];
41768 };
41769
41770+#define DS4_REPORT_0x02_SIZE 37
41771+#define DS4_REPORT_0x05_SIZE 32
41772+#define DS4_REPORT_0x11_SIZE 78
41773+#define DS4_REPORT_0x81_SIZE 7
41774+#define SIXAXIS_REPORT_0xF2_SIZE 18
41775+
41776 static spinlock_t sony_dev_list_lock;
41777 static LIST_HEAD(sony_device_list);
41778 static DEFINE_IDA(sony_device_id_allocator);
41779@@ -811,6 +817,7 @@ struct sony_sc {
41780 struct work_struct state_worker;
41781 struct power_supply battery;
41782 int device_id;
41783+ __u8 *output_report_dmabuf;
41784
41785 #ifdef CONFIG_SONY_FF
41786 __u8 left;
41787@@ -1142,9 +1149,20 @@ static int sixaxis_set_operational_usb(struct hid_device *hdev)
41788
41789 static int sixaxis_set_operational_bt(struct hid_device *hdev)
41790 {
41791- unsigned char buf[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
41792- return hid_hw_raw_request(hdev, buf[0], buf, sizeof(buf),
41793+ static const __u8 report[] = { 0xf4, 0x42, 0x03, 0x00, 0x00 };
41794+ __u8 *buf;
41795+ int ret;
41796+
41797+ buf = kmemdup(report, sizeof(report), GFP_KERNEL);
41798+ if (!buf)
41799+ return -ENOMEM;
41800+
41801+ ret = hid_hw_raw_request(hdev, buf[0], buf, sizeof(report),
41802 HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
41803+
41804+ kfree(buf);
41805+
41806+ return ret;
41807 }
41808
41809 /*
41810@@ -1153,10 +1171,19 @@ static int sixaxis_set_operational_bt(struct hid_device *hdev)
41811 */
41812 static int dualshock4_set_operational_bt(struct hid_device *hdev)
41813 {
41814- __u8 buf[37] = { 0 };
41815+ __u8 *buf;
41816+ int ret;
41817
41818- return hid_hw_raw_request(hdev, 0x02, buf, sizeof(buf),
41819+ buf = kmalloc(DS4_REPORT_0x02_SIZE, GFP_KERNEL);
41820+ if (!buf)
41821+ return -ENOMEM;
41822+
41823+ ret = hid_hw_raw_request(hdev, 0x02, buf, DS4_REPORT_0x02_SIZE,
41824 HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
41825+
41826+ kfree(buf);
41827+
41828+ return ret;
41829 }
41830
41831 static void sixaxis_set_leds_from_id(int id, __u8 values[MAX_LEDS])
41832@@ -1471,9 +1498,7 @@ error_leds:
41833
41834 static void sixaxis_state_worker(struct work_struct *work)
41835 {
41836- struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41837- int n;
41838- union sixaxis_output_report_01 report = {
41839+ static const union sixaxis_output_report_01 default_report = {
41840 .buf = {
41841 0x01,
41842 0x00, 0xff, 0x00, 0xff, 0x00,
41843@@ -1485,20 +1510,27 @@ static void sixaxis_state_worker(struct work_struct *work)
41844 0x00, 0x00, 0x00, 0x00, 0x00
41845 }
41846 };
41847+ struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41848+ struct sixaxis_output_report *report =
41849+ (struct sixaxis_output_report *)sc->output_report_dmabuf;
41850+ int n;
41851+
41852+ /* Initialize the report with default values */
41853+ memcpy(report, &default_report, sizeof(struct sixaxis_output_report));
41854
41855 #ifdef CONFIG_SONY_FF
41856- report.data.rumble.right_motor_on = sc->right ? 1 : 0;
41857- report.data.rumble.left_motor_force = sc->left;
41858+ report->rumble.right_motor_on = sc->right ? 1 : 0;
41859+ report->rumble.left_motor_force = sc->left;
41860 #endif
41861
41862- report.data.leds_bitmap |= sc->led_state[0] << 1;
41863- report.data.leds_bitmap |= sc->led_state[1] << 2;
41864- report.data.leds_bitmap |= sc->led_state[2] << 3;
41865- report.data.leds_bitmap |= sc->led_state[3] << 4;
41866+ report->leds_bitmap |= sc->led_state[0] << 1;
41867+ report->leds_bitmap |= sc->led_state[1] << 2;
41868+ report->leds_bitmap |= sc->led_state[2] << 3;
41869+ report->leds_bitmap |= sc->led_state[3] << 4;
41870
41871 /* Set flag for all leds off, required for 3rd party INTEC controller */
41872- if ((report.data.leds_bitmap & 0x1E) == 0)
41873- report.data.leds_bitmap |= 0x20;
41874+ if ((report->leds_bitmap & 0x1E) == 0)
41875+ report->leds_bitmap |= 0x20;
41876
41877 /*
41878 * The LEDs in the report are indexed in reverse order to their
41879@@ -1511,28 +1543,30 @@ static void sixaxis_state_worker(struct work_struct *work)
41880 */
41881 for (n = 0; n < 4; n++) {
41882 if (sc->led_delay_on[n] || sc->led_delay_off[n]) {
41883- report.data.led[3 - n].duty_off = sc->led_delay_off[n];
41884- report.data.led[3 - n].duty_on = sc->led_delay_on[n];
41885+ report->led[3 - n].duty_off = sc->led_delay_off[n];
41886+ report->led[3 - n].duty_on = sc->led_delay_on[n];
41887 }
41888 }
41889
41890- hid_hw_raw_request(sc->hdev, report.data.report_id, report.buf,
41891- sizeof(report), HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41892+ hid_hw_raw_request(sc->hdev, report->report_id, (__u8 *)report,
41893+ sizeof(struct sixaxis_output_report),
41894+ HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41895 }
41896
41897 static void dualshock4_state_worker(struct work_struct *work)
41898 {
41899 struct sony_sc *sc = container_of(work, struct sony_sc, state_worker);
41900 struct hid_device *hdev = sc->hdev;
41901+ __u8 *buf = sc->output_report_dmabuf;
41902 int offset;
41903
41904- __u8 buf[78] = { 0 };
41905-
41906 if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
41907+ memset(buf, 0, DS4_REPORT_0x05_SIZE);
41908 buf[0] = 0x05;
41909 buf[1] = 0xFF;
41910 offset = 4;
41911 } else {
41912+ memset(buf, 0, DS4_REPORT_0x11_SIZE);
41913 buf[0] = 0x11;
41914 buf[1] = 0xB0;
41915 buf[3] = 0x0F;
41916@@ -1560,12 +1594,33 @@ static void dualshock4_state_worker(struct work_struct *work)
41917 buf[offset++] = sc->led_delay_off[3];
41918
41919 if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
41920- hid_hw_output_report(hdev, buf, 32);
41921+ hid_hw_output_report(hdev, buf, DS4_REPORT_0x05_SIZE);
41922 else
41923- hid_hw_raw_request(hdev, 0x11, buf, 78,
41924+ hid_hw_raw_request(hdev, 0x11, buf, DS4_REPORT_0x11_SIZE,
41925 HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
41926 }
41927
41928+static int sony_allocate_output_report(struct sony_sc *sc)
41929+{
41930+ if (sc->quirks & SIXAXIS_CONTROLLER)
41931+ sc->output_report_dmabuf =
41932+ kmalloc(sizeof(union sixaxis_output_report_01),
41933+ GFP_KERNEL);
41934+ else if (sc->quirks & DUALSHOCK4_CONTROLLER_BT)
41935+ sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x11_SIZE,
41936+ GFP_KERNEL);
41937+ else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB)
41938+ sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x05_SIZE,
41939+ GFP_KERNEL);
41940+ else
41941+ return 0;
41942+
41943+ if (!sc->output_report_dmabuf)
41944+ return -ENOMEM;
41945+
41946+ return 0;
41947+}
41948+
41949 #ifdef CONFIG_SONY_FF
41950 static int sony_play_effect(struct input_dev *dev, void *data,
41951 struct ff_effect *effect)
41952@@ -1754,6 +1809,7 @@ static int sony_get_bt_devaddr(struct sony_sc *sc)
41953
41954 static int sony_check_add(struct sony_sc *sc)
41955 {
41956+ __u8 *buf = NULL;
41957 int n, ret;
41958
41959 if ((sc->quirks & DUALSHOCK4_CONTROLLER_BT) ||
41960@@ -1769,36 +1825,44 @@ static int sony_check_add(struct sony_sc *sc)
41961 return 0;
41962 }
41963 } else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) {
41964- __u8 buf[7];
41965+ buf = kmalloc(DS4_REPORT_0x81_SIZE, GFP_KERNEL);
41966+ if (!buf)
41967+ return -ENOMEM;
41968
41969 /*
41970 * The MAC address of a DS4 controller connected via USB can be
41971 * retrieved with feature report 0x81. The address begins at
41972 * offset 1.
41973 */
41974- ret = hid_hw_raw_request(sc->hdev, 0x81, buf, sizeof(buf),
41975- HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
41976+ ret = hid_hw_raw_request(sc->hdev, 0x81, buf,
41977+ DS4_REPORT_0x81_SIZE, HID_FEATURE_REPORT,
41978+ HID_REQ_GET_REPORT);
41979
41980- if (ret != 7) {
41981+ if (ret != DS4_REPORT_0x81_SIZE) {
41982 hid_err(sc->hdev, "failed to retrieve feature report 0x81 with the DualShock 4 MAC address\n");
41983- return ret < 0 ? ret : -EINVAL;
41984+ ret = ret < 0 ? ret : -EINVAL;
41985+ goto out_free;
41986 }
41987
41988 memcpy(sc->mac_address, &buf[1], sizeof(sc->mac_address));
41989 } else if (sc->quirks & SIXAXIS_CONTROLLER_USB) {
41990- __u8 buf[18];
41991+ buf = kmalloc(SIXAXIS_REPORT_0xF2_SIZE, GFP_KERNEL);
41992+ if (!buf)
41993+ return -ENOMEM;
41994
41995 /*
41996 * The MAC address of a Sixaxis controller connected via USB can
41997 * be retrieved with feature report 0xf2. The address begins at
41998 * offset 4.
41999 */
42000- ret = hid_hw_raw_request(sc->hdev, 0xf2, buf, sizeof(buf),
42001- HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
42002+ ret = hid_hw_raw_request(sc->hdev, 0xf2, buf,
42003+ SIXAXIS_REPORT_0xF2_SIZE, HID_FEATURE_REPORT,
42004+ HID_REQ_GET_REPORT);
42005
42006- if (ret != 18) {
42007+ if (ret != SIXAXIS_REPORT_0xF2_SIZE) {
42008 hid_err(sc->hdev, "failed to retrieve feature report 0xf2 with the Sixaxis MAC address\n");
42009- return ret < 0 ? ret : -EINVAL;
42010+ ret = ret < 0 ? ret : -EINVAL;
42011+ goto out_free;
42012 }
42013
42014 /*
42015@@ -1811,7 +1875,13 @@ static int sony_check_add(struct sony_sc *sc)
42016 return 0;
42017 }
42018
42019- return sony_check_add_dev_list(sc);
42020+ ret = sony_check_add_dev_list(sc);
42021+
42022+out_free:
42023+
42024+ kfree(buf);
42025+
42026+ return ret;
42027 }
42028
42029 static int sony_set_device_id(struct sony_sc *sc)
42030@@ -1895,6 +1965,12 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
42031 return ret;
42032 }
42033
42034+ ret = sony_allocate_output_report(sc);
42035+ if (ret < 0) {
42036+ hid_err(hdev, "failed to allocate the output report buffer\n");
42037+ goto err_stop;
42038+ }
42039+
42040 ret = sony_set_device_id(sc);
42041 if (ret < 0) {
42042 hid_err(hdev, "failed to allocate the device id\n");
42043@@ -1984,6 +2060,7 @@ err_stop:
42044 if (sc->quirks & SONY_BATTERY_SUPPORT)
42045 sony_battery_remove(sc);
42046 sony_cancel_work_sync(sc);
42047+ kfree(sc->output_report_dmabuf);
42048 sony_remove_dev_list(sc);
42049 sony_release_device_id(sc);
42050 hid_hw_stop(hdev);
42051@@ -2004,6 +2081,8 @@ static void sony_remove(struct hid_device *hdev)
42052
42053 sony_cancel_work_sync(sc);
42054
42055+ kfree(sc->output_report_dmabuf);
42056+
42057 sony_remove_dev_list(sc);
42058
42059 sony_release_device_id(sc);
42060diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42061index c13fb5b..55a3802 100644
42062--- a/drivers/hid/hid-wiimote-debug.c
42063+++ b/drivers/hid/hid-wiimote-debug.c
42064@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42065 else if (size == 0)
42066 return -EIO;
42067
42068- if (copy_to_user(u, buf, size))
42069+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42070 return -EFAULT;
42071
42072 *off += size;
42073diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42074index 433f72a..2926005 100644
42075--- a/drivers/hv/channel.c
42076+++ b/drivers/hv/channel.c
42077@@ -366,8 +366,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42078 unsigned long flags;
42079 int ret = 0;
42080
42081- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
42082- atomic_inc(&vmbus_connection.next_gpadl_handle);
42083+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
42084+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
42085
42086 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42087 if (ret)
42088diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42089index 3e4235c..877d0e5 100644
42090--- a/drivers/hv/hv.c
42091+++ b/drivers/hv/hv.c
42092@@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42093 u64 output_address = (output) ? virt_to_phys(output) : 0;
42094 u32 output_address_hi = output_address >> 32;
42095 u32 output_address_lo = output_address & 0xFFFFFFFF;
42096- void *hypercall_page = hv_context.hypercall_page;
42097+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42098
42099 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42100 "=a"(hv_status_lo) : "d" (control_hi),
42101@@ -156,7 +156,7 @@ int hv_init(void)
42102 /* See if the hypercall page is already set */
42103 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42104
42105- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42106+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42107
42108 if (!virtaddr)
42109 goto cleanup;
42110diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42111index 5e90c5d..d8fcefb 100644
42112--- a/drivers/hv/hv_balloon.c
42113+++ b/drivers/hv/hv_balloon.c
42114@@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42115
42116 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42117 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42118-static atomic_t trans_id = ATOMIC_INIT(0);
42119+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42120
42121 static int dm_ring_size = (5 * PAGE_SIZE);
42122
42123@@ -893,7 +893,7 @@ static void hot_add_req(struct work_struct *dummy)
42124 pr_info("Memory hot add failed\n");
42125
42126 dm->state = DM_INITIALIZED;
42127- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42128+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42129 vmbus_sendpacket(dm->dev->channel, &resp,
42130 sizeof(struct dm_hot_add_response),
42131 (unsigned long)NULL,
42132@@ -973,7 +973,7 @@ static void post_status(struct hv_dynmem_device *dm)
42133 memset(&status, 0, sizeof(struct dm_status));
42134 status.hdr.type = DM_STATUS_REPORT;
42135 status.hdr.size = sizeof(struct dm_status);
42136- status.hdr.trans_id = atomic_inc_return(&trans_id);
42137+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42138
42139 /*
42140 * The host expects the guest to report free memory.
42141@@ -993,7 +993,7 @@ static void post_status(struct hv_dynmem_device *dm)
42142 * send the status. This can happen if we were interrupted
42143 * after we picked our transaction ID.
42144 */
42145- if (status.hdr.trans_id != atomic_read(&trans_id))
42146+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42147 return;
42148
42149 /*
42150@@ -1129,7 +1129,7 @@ static void balloon_up(struct work_struct *dummy)
42151 */
42152
42153 do {
42154- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42155+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42156 ret = vmbus_sendpacket(dm_device.dev->channel,
42157 bl_resp,
42158 bl_resp->hdr.size,
42159@@ -1175,7 +1175,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42160
42161 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42162 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42163- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42164+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42165 resp.hdr.size = sizeof(struct dm_unballoon_response);
42166
42167 vmbus_sendpacket(dm_device.dev->channel, &resp,
42168@@ -1239,7 +1239,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42169 memset(&version_req, 0, sizeof(struct dm_version_request));
42170 version_req.hdr.type = DM_VERSION_REQUEST;
42171 version_req.hdr.size = sizeof(struct dm_version_request);
42172- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42173+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42174 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42175 version_req.is_last_attempt = 1;
42176
42177@@ -1409,7 +1409,7 @@ static int balloon_probe(struct hv_device *dev,
42178 memset(&version_req, 0, sizeof(struct dm_version_request));
42179 version_req.hdr.type = DM_VERSION_REQUEST;
42180 version_req.hdr.size = sizeof(struct dm_version_request);
42181- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42182+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42183 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42184 version_req.is_last_attempt = 0;
42185
42186@@ -1440,7 +1440,7 @@ static int balloon_probe(struct hv_device *dev,
42187 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42188 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42189 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42190- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42191+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42192
42193 cap_msg.caps.cap_bits.balloon = 1;
42194 cap_msg.caps.cap_bits.hot_add = 1;
42195diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42196index c386d8d..d6004c4 100644
42197--- a/drivers/hv/hyperv_vmbus.h
42198+++ b/drivers/hv/hyperv_vmbus.h
42199@@ -611,7 +611,7 @@ enum vmbus_connect_state {
42200 struct vmbus_connection {
42201 enum vmbus_connect_state conn_state;
42202
42203- atomic_t next_gpadl_handle;
42204+ atomic_unchecked_t next_gpadl_handle;
42205
42206 /*
42207 * Represents channel interrupts. Each bit position represents a
42208diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42209index 4d6b269..2e23b86 100644
42210--- a/drivers/hv/vmbus_drv.c
42211+++ b/drivers/hv/vmbus_drv.c
42212@@ -807,10 +807,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42213 {
42214 int ret = 0;
42215
42216- static atomic_t device_num = ATOMIC_INIT(0);
42217+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42218
42219 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42220- atomic_inc_return(&device_num));
42221+ atomic_inc_return_unchecked(&device_num));
42222
42223 child_device_obj->device.bus = &hv_bus;
42224 child_device_obj->device.parent = &hv_acpi_dev->dev;
42225diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42226index 579bdf9..75118b5 100644
42227--- a/drivers/hwmon/acpi_power_meter.c
42228+++ b/drivers/hwmon/acpi_power_meter.c
42229@@ -116,7 +116,7 @@ struct sensor_template {
42230 struct device_attribute *devattr,
42231 const char *buf, size_t count);
42232 int index;
42233-};
42234+} __do_const;
42235
42236 /* Averaging interval */
42237 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42238@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42239 struct sensor_template *attrs)
42240 {
42241 struct device *dev = &resource->acpi_dev->dev;
42242- struct sensor_device_attribute *sensors =
42243+ sensor_device_attribute_no_const *sensors =
42244 &resource->sensors[resource->num_sensors];
42245 int res = 0;
42246
42247diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42248index 3288f13..71cfb4e 100644
42249--- a/drivers/hwmon/applesmc.c
42250+++ b/drivers/hwmon/applesmc.c
42251@@ -1106,7 +1106,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42252 {
42253 struct applesmc_node_group *grp;
42254 struct applesmc_dev_attr *node;
42255- struct attribute *attr;
42256+ attribute_no_const *attr;
42257 int ret, i;
42258
42259 for (grp = groups; grp->format; grp++) {
42260diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42261index cccef87..06ce8ec 100644
42262--- a/drivers/hwmon/asus_atk0110.c
42263+++ b/drivers/hwmon/asus_atk0110.c
42264@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42265 struct atk_sensor_data {
42266 struct list_head list;
42267 struct atk_data *data;
42268- struct device_attribute label_attr;
42269- struct device_attribute input_attr;
42270- struct device_attribute limit1_attr;
42271- struct device_attribute limit2_attr;
42272+ device_attribute_no_const label_attr;
42273+ device_attribute_no_const input_attr;
42274+ device_attribute_no_const limit1_attr;
42275+ device_attribute_no_const limit2_attr;
42276 char label_attr_name[ATTR_NAME_SIZE];
42277 char input_attr_name[ATTR_NAME_SIZE];
42278 char limit1_attr_name[ATTR_NAME_SIZE];
42279@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42280 static struct device_attribute atk_name_attr =
42281 __ATTR(name, 0444, atk_name_show, NULL);
42282
42283-static void atk_init_attribute(struct device_attribute *attr, char *name,
42284+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42285 sysfs_show_func show)
42286 {
42287 sysfs_attr_init(&attr->attr);
42288diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42289index d76f0b7..55ae976 100644
42290--- a/drivers/hwmon/coretemp.c
42291+++ b/drivers/hwmon/coretemp.c
42292@@ -784,7 +784,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42293 return NOTIFY_OK;
42294 }
42295
42296-static struct notifier_block coretemp_cpu_notifier __refdata = {
42297+static struct notifier_block coretemp_cpu_notifier = {
42298 .notifier_call = coretemp_cpu_callback,
42299 };
42300
42301diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42302index 7a8a6fb..015c1fd 100644
42303--- a/drivers/hwmon/ibmaem.c
42304+++ b/drivers/hwmon/ibmaem.c
42305@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42306 struct aem_rw_sensor_template *rw)
42307 {
42308 struct device *dev = &data->pdev->dev;
42309- struct sensor_device_attribute *sensors = data->sensors;
42310+ sensor_device_attribute_no_const *sensors = data->sensors;
42311 int err;
42312
42313 /* Set up read-only sensors */
42314diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42315index 14c82da..09b25d7 100644
42316--- a/drivers/hwmon/iio_hwmon.c
42317+++ b/drivers/hwmon/iio_hwmon.c
42318@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42319 {
42320 struct device *dev = &pdev->dev;
42321 struct iio_hwmon_state *st;
42322- struct sensor_device_attribute *a;
42323+ sensor_device_attribute_no_const *a;
42324 int ret, i;
42325 int in_i = 1, temp_i = 1, curr_i = 1;
42326 enum iio_chan_type type;
42327diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42328index 7710f46..427a28d 100644
42329--- a/drivers/hwmon/nct6683.c
42330+++ b/drivers/hwmon/nct6683.c
42331@@ -397,11 +397,11 @@ static struct attribute_group *
42332 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42333 int repeat)
42334 {
42335- struct sensor_device_attribute_2 *a2;
42336- struct sensor_device_attribute *a;
42337+ sensor_device_attribute_2_no_const *a2;
42338+ sensor_device_attribute_no_const *a;
42339 struct sensor_device_template **t;
42340 struct sensor_device_attr_u *su;
42341- struct attribute_group *group;
42342+ attribute_group_no_const *group;
42343 struct attribute **attrs;
42344 int i, j, count;
42345
42346diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42347index 504cbdd..35d6f25 100644
42348--- a/drivers/hwmon/nct6775.c
42349+++ b/drivers/hwmon/nct6775.c
42350@@ -943,10 +943,10 @@ static struct attribute_group *
42351 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42352 int repeat)
42353 {
42354- struct attribute_group *group;
42355+ attribute_group_no_const *group;
42356 struct sensor_device_attr_u *su;
42357- struct sensor_device_attribute *a;
42358- struct sensor_device_attribute_2 *a2;
42359+ sensor_device_attribute_no_const *a;
42360+ sensor_device_attribute_2_no_const *a2;
42361 struct attribute **attrs;
42362 struct sensor_device_template **t;
42363 int i, count;
42364diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42365index 291d11f..3f0dbbd 100644
42366--- a/drivers/hwmon/pmbus/pmbus_core.c
42367+++ b/drivers/hwmon/pmbus/pmbus_core.c
42368@@ -783,7 +783,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42369 return 0;
42370 }
42371
42372-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42373+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42374 const char *name,
42375 umode_t mode,
42376 ssize_t (*show)(struct device *dev,
42377@@ -800,7 +800,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42378 dev_attr->store = store;
42379 }
42380
42381-static void pmbus_attr_init(struct sensor_device_attribute *a,
42382+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42383 const char *name,
42384 umode_t mode,
42385 ssize_t (*show)(struct device *dev,
42386@@ -822,7 +822,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42387 u16 reg, u8 mask)
42388 {
42389 struct pmbus_boolean *boolean;
42390- struct sensor_device_attribute *a;
42391+ sensor_device_attribute_no_const *a;
42392
42393 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42394 if (!boolean)
42395@@ -847,7 +847,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42396 bool update, bool readonly)
42397 {
42398 struct pmbus_sensor *sensor;
42399- struct device_attribute *a;
42400+ device_attribute_no_const *a;
42401
42402 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42403 if (!sensor)
42404@@ -878,7 +878,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42405 const char *lstring, int index)
42406 {
42407 struct pmbus_label *label;
42408- struct device_attribute *a;
42409+ device_attribute_no_const *a;
42410
42411 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42412 if (!label)
42413diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42414index 97cd45a..ac54d8b 100644
42415--- a/drivers/hwmon/sht15.c
42416+++ b/drivers/hwmon/sht15.c
42417@@ -169,7 +169,7 @@ struct sht15_data {
42418 int supply_uv;
42419 bool supply_uv_valid;
42420 struct work_struct update_supply_work;
42421- atomic_t interrupt_handled;
42422+ atomic_unchecked_t interrupt_handled;
42423 };
42424
42425 /**
42426@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
42427 ret = gpio_direction_input(data->pdata->gpio_data);
42428 if (ret)
42429 return ret;
42430- atomic_set(&data->interrupt_handled, 0);
42431+ atomic_set_unchecked(&data->interrupt_handled, 0);
42432
42433 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42434 if (gpio_get_value(data->pdata->gpio_data) == 0) {
42435 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
42436 /* Only relevant if the interrupt hasn't occurred. */
42437- if (!atomic_read(&data->interrupt_handled))
42438+ if (!atomic_read_unchecked(&data->interrupt_handled))
42439 schedule_work(&data->read_work);
42440 }
42441 ret = wait_event_timeout(data->wait_queue,
42442@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
42443
42444 /* First disable the interrupt */
42445 disable_irq_nosync(irq);
42446- atomic_inc(&data->interrupt_handled);
42447+ atomic_inc_unchecked(&data->interrupt_handled);
42448 /* Then schedule a reading work struct */
42449 if (data->state != SHT15_READING_NOTHING)
42450 schedule_work(&data->read_work);
42451@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
42452 * If not, then start the interrupt again - care here as could
42453 * have gone low in meantime so verify it hasn't!
42454 */
42455- atomic_set(&data->interrupt_handled, 0);
42456+ atomic_set_unchecked(&data->interrupt_handled, 0);
42457 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42458 /* If still not occurred or another handler was scheduled */
42459 if (gpio_get_value(data->pdata->gpio_data)
42460- || atomic_read(&data->interrupt_handled))
42461+ || atomic_read_unchecked(&data->interrupt_handled))
42462 return;
42463 }
42464
42465diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
42466index 8df43c5..b07b91d 100644
42467--- a/drivers/hwmon/via-cputemp.c
42468+++ b/drivers/hwmon/via-cputemp.c
42469@@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
42470 return NOTIFY_OK;
42471 }
42472
42473-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
42474+static struct notifier_block via_cputemp_cpu_notifier = {
42475 .notifier_call = via_cputemp_cpu_callback,
42476 };
42477
42478diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
42479index 65e3240..e6c511d 100644
42480--- a/drivers/i2c/busses/i2c-amd756-s4882.c
42481+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
42482@@ -39,7 +39,7 @@
42483 extern struct i2c_adapter amd756_smbus;
42484
42485 static struct i2c_adapter *s4882_adapter;
42486-static struct i2c_algorithm *s4882_algo;
42487+static i2c_algorithm_no_const *s4882_algo;
42488
42489 /* Wrapper access functions for multiplexed SMBus */
42490 static DEFINE_MUTEX(amd756_lock);
42491diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
42492index b19a310..d6eece0 100644
42493--- a/drivers/i2c/busses/i2c-diolan-u2c.c
42494+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
42495@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
42496 /* usb layer */
42497
42498 /* Send command to device, and get response. */
42499-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42500+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42501 {
42502 int ret = 0;
42503 int actual;
42504diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
42505index 88eda09..cf40434 100644
42506--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
42507+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
42508@@ -37,7 +37,7 @@
42509 extern struct i2c_adapter *nforce2_smbus;
42510
42511 static struct i2c_adapter *s4985_adapter;
42512-static struct i2c_algorithm *s4985_algo;
42513+static i2c_algorithm_no_const *s4985_algo;
42514
42515 /* Wrapper access functions for multiplexed SMBus */
42516 static DEFINE_MUTEX(nforce2_lock);
42517diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
42518index 71c7a39..71dd3e0 100644
42519--- a/drivers/i2c/i2c-dev.c
42520+++ b/drivers/i2c/i2c-dev.c
42521@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
42522 break;
42523 }
42524
42525- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
42526+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
42527 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
42528 if (IS_ERR(rdwr_pa[i].buf)) {
42529 res = PTR_ERR(rdwr_pa[i].buf);
42530diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
42531index 0b510ba..4fbb5085 100644
42532--- a/drivers/ide/ide-cd.c
42533+++ b/drivers/ide/ide-cd.c
42534@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
42535 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
42536 if ((unsigned long)buf & alignment
42537 || blk_rq_bytes(rq) & q->dma_pad_mask
42538- || object_is_on_stack(buf))
42539+ || object_starts_on_stack(buf))
42540 drive->dma = 0;
42541 }
42542 }
42543diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
42544index af3e76d..96dfe5e 100644
42545--- a/drivers/iio/industrialio-core.c
42546+++ b/drivers/iio/industrialio-core.c
42547@@ -555,7 +555,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
42548 }
42549
42550 static
42551-int __iio_device_attr_init(struct device_attribute *dev_attr,
42552+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
42553 const char *postfix,
42554 struct iio_chan_spec const *chan,
42555 ssize_t (*readfunc)(struct device *dev,
42556diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
42557index e28a494..f7c2671 100644
42558--- a/drivers/infiniband/core/cm.c
42559+++ b/drivers/infiniband/core/cm.c
42560@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
42561
42562 struct cm_counter_group {
42563 struct kobject obj;
42564- atomic_long_t counter[CM_ATTR_COUNT];
42565+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
42566 };
42567
42568 struct cm_counter_attribute {
42569@@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
42570 struct ib_mad_send_buf *msg = NULL;
42571 int ret;
42572
42573- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42574+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42575 counter[CM_REQ_COUNTER]);
42576
42577 /* Quick state check to discard duplicate REQs. */
42578@@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
42579 if (!cm_id_priv)
42580 return;
42581
42582- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42583+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42584 counter[CM_REP_COUNTER]);
42585 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
42586 if (ret)
42587@@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
42588 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42589 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42590 spin_unlock_irq(&cm_id_priv->lock);
42591- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42592+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42593 counter[CM_RTU_COUNTER]);
42594 goto out;
42595 }
42596@@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
42597 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42598 dreq_msg->local_comm_id);
42599 if (!cm_id_priv) {
42600- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42601+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42602 counter[CM_DREQ_COUNTER]);
42603 cm_issue_drep(work->port, work->mad_recv_wc);
42604 return -EINVAL;
42605@@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
42606 case IB_CM_MRA_REP_RCVD:
42607 break;
42608 case IB_CM_TIMEWAIT:
42609- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42610+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42611 counter[CM_DREQ_COUNTER]);
42612 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42613 goto unlock;
42614@@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
42615 cm_free_msg(msg);
42616 goto deref;
42617 case IB_CM_DREQ_RCVD:
42618- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42619+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42620 counter[CM_DREQ_COUNTER]);
42621 goto unlock;
42622 default:
42623@@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
42624 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42625 cm_id_priv->msg, timeout)) {
42626 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42627- atomic_long_inc(&work->port->
42628+ atomic_long_inc_unchecked(&work->port->
42629 counter_group[CM_RECV_DUPLICATES].
42630 counter[CM_MRA_COUNTER]);
42631 goto out;
42632@@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
42633 break;
42634 case IB_CM_MRA_REQ_RCVD:
42635 case IB_CM_MRA_REP_RCVD:
42636- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42637+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42638 counter[CM_MRA_COUNTER]);
42639 /* fall through */
42640 default:
42641@@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
42642 case IB_CM_LAP_IDLE:
42643 break;
42644 case IB_CM_MRA_LAP_SENT:
42645- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42646+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42647 counter[CM_LAP_COUNTER]);
42648 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42649 goto unlock;
42650@@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
42651 cm_free_msg(msg);
42652 goto deref;
42653 case IB_CM_LAP_RCVD:
42654- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42655+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42656 counter[CM_LAP_COUNTER]);
42657 goto unlock;
42658 default:
42659@@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
42660 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
42661 if (cur_cm_id_priv) {
42662 spin_unlock_irq(&cm.lock);
42663- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42664+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42665 counter[CM_SIDR_REQ_COUNTER]);
42666 goto out; /* Duplicate message. */
42667 }
42668@@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
42669 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
42670 msg->retries = 1;
42671
42672- atomic_long_add(1 + msg->retries,
42673+ atomic_long_add_unchecked(1 + msg->retries,
42674 &port->counter_group[CM_XMIT].counter[attr_index]);
42675 if (msg->retries)
42676- atomic_long_add(msg->retries,
42677+ atomic_long_add_unchecked(msg->retries,
42678 &port->counter_group[CM_XMIT_RETRIES].
42679 counter[attr_index]);
42680
42681@@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
42682 }
42683
42684 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
42685- atomic_long_inc(&port->counter_group[CM_RECV].
42686+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
42687 counter[attr_id - CM_ATTR_ID_OFFSET]);
42688
42689 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
42690@@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
42691 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42692
42693 return sprintf(buf, "%ld\n",
42694- atomic_long_read(&group->counter[cm_attr->index]));
42695+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42696 }
42697
42698 static const struct sysfs_ops cm_counter_ops = {
42699diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
42700index 9f5ad7c..588cd84 100644
42701--- a/drivers/infiniband/core/fmr_pool.c
42702+++ b/drivers/infiniband/core/fmr_pool.c
42703@@ -98,8 +98,8 @@ struct ib_fmr_pool {
42704
42705 struct task_struct *thread;
42706
42707- atomic_t req_ser;
42708- atomic_t flush_ser;
42709+ atomic_unchecked_t req_ser;
42710+ atomic_unchecked_t flush_ser;
42711
42712 wait_queue_head_t force_wait;
42713 };
42714@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42715 struct ib_fmr_pool *pool = pool_ptr;
42716
42717 do {
42718- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
42719+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
42720 ib_fmr_batch_release(pool);
42721
42722- atomic_inc(&pool->flush_ser);
42723+ atomic_inc_unchecked(&pool->flush_ser);
42724 wake_up_interruptible(&pool->force_wait);
42725
42726 if (pool->flush_function)
42727@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42728 }
42729
42730 set_current_state(TASK_INTERRUPTIBLE);
42731- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
42732+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
42733 !kthread_should_stop())
42734 schedule();
42735 __set_current_state(TASK_RUNNING);
42736@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
42737 pool->dirty_watermark = params->dirty_watermark;
42738 pool->dirty_len = 0;
42739 spin_lock_init(&pool->pool_lock);
42740- atomic_set(&pool->req_ser, 0);
42741- atomic_set(&pool->flush_ser, 0);
42742+ atomic_set_unchecked(&pool->req_ser, 0);
42743+ atomic_set_unchecked(&pool->flush_ser, 0);
42744 init_waitqueue_head(&pool->force_wait);
42745
42746 pool->thread = kthread_run(ib_fmr_cleanup_thread,
42747@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
42748 }
42749 spin_unlock_irq(&pool->pool_lock);
42750
42751- serial = atomic_inc_return(&pool->req_ser);
42752+ serial = atomic_inc_return_unchecked(&pool->req_ser);
42753 wake_up_process(pool->thread);
42754
42755 if (wait_event_interruptible(pool->force_wait,
42756- atomic_read(&pool->flush_ser) - serial >= 0))
42757+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
42758 return -EINTR;
42759
42760 return 0;
42761@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
42762 } else {
42763 list_add_tail(&fmr->list, &pool->dirty_list);
42764 if (++pool->dirty_len >= pool->dirty_watermark) {
42765- atomic_inc(&pool->req_ser);
42766+ atomic_inc_unchecked(&pool->req_ser);
42767 wake_up_process(pool->thread);
42768 }
42769 }
42770diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
42771index ec7a298..8742e59 100644
42772--- a/drivers/infiniband/hw/cxgb4/mem.c
42773+++ b/drivers/infiniband/hw/cxgb4/mem.c
42774@@ -249,7 +249,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42775 int err;
42776 struct fw_ri_tpte tpt;
42777 u32 stag_idx;
42778- static atomic_t key;
42779+ static atomic_unchecked_t key;
42780
42781 if (c4iw_fatal_error(rdev))
42782 return -EIO;
42783@@ -270,7 +270,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42784 if (rdev->stats.stag.cur > rdev->stats.stag.max)
42785 rdev->stats.stag.max = rdev->stats.stag.cur;
42786 mutex_unlock(&rdev->stats.lock);
42787- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
42788+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
42789 }
42790 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
42791 __func__, stag_state, type, pdid, stag_idx);
42792diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
42793index 79b3dbc..96e5fcc 100644
42794--- a/drivers/infiniband/hw/ipath/ipath_rc.c
42795+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
42796@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42797 struct ib_atomic_eth *ateth;
42798 struct ipath_ack_entry *e;
42799 u64 vaddr;
42800- atomic64_t *maddr;
42801+ atomic64_unchecked_t *maddr;
42802 u64 sdata;
42803 u32 rkey;
42804 u8 next;
42805@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42806 IB_ACCESS_REMOTE_ATOMIC)))
42807 goto nack_acc_unlck;
42808 /* Perform atomic OP and save result. */
42809- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42810+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42811 sdata = be64_to_cpu(ateth->swap_data);
42812 e = &qp->s_ack_queue[qp->r_head_ack_queue];
42813 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
42814- (u64) atomic64_add_return(sdata, maddr) - sdata :
42815+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42816 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42817 be64_to_cpu(ateth->compare_data),
42818 sdata);
42819diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
42820index 1f95bba..9530f87 100644
42821--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
42822+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
42823@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
42824 unsigned long flags;
42825 struct ib_wc wc;
42826 u64 sdata;
42827- atomic64_t *maddr;
42828+ atomic64_unchecked_t *maddr;
42829 enum ib_wc_status send_status;
42830
42831 /*
42832@@ -382,11 +382,11 @@ again:
42833 IB_ACCESS_REMOTE_ATOMIC)))
42834 goto acc_err;
42835 /* Perform atomic OP and save result. */
42836- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42837+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42838 sdata = wqe->wr.wr.atomic.compare_add;
42839 *(u64 *) sqp->s_sge.sge.vaddr =
42840 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
42841- (u64) atomic64_add_return(sdata, maddr) - sdata :
42842+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42843 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42844 sdata, wqe->wr.wr.atomic.swap);
42845 goto send_comp;
42846diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
42847index 82a7dd8..8fb6ba6 100644
42848--- a/drivers/infiniband/hw/mlx4/mad.c
42849+++ b/drivers/infiniband/hw/mlx4/mad.c
42850@@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
42851
42852 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
42853 {
42854- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
42855+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
42856 cpu_to_be64(0xff00000000000000LL);
42857 }
42858
42859diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
42860index ed327e6..ca1739e0 100644
42861--- a/drivers/infiniband/hw/mlx4/mcg.c
42862+++ b/drivers/infiniband/hw/mlx4/mcg.c
42863@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
42864 {
42865 char name[20];
42866
42867- atomic_set(&ctx->tid, 0);
42868+ atomic_set_unchecked(&ctx->tid, 0);
42869 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
42870 ctx->mcg_wq = create_singlethread_workqueue(name);
42871 if (!ctx->mcg_wq)
42872diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42873index 6eb743f..a7b0f6d 100644
42874--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
42875+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42876@@ -426,7 +426,7 @@ struct mlx4_ib_demux_ctx {
42877 struct list_head mcg_mgid0_list;
42878 struct workqueue_struct *mcg_wq;
42879 struct mlx4_ib_demux_pv_ctx **tun;
42880- atomic_t tid;
42881+ atomic_unchecked_t tid;
42882 int flushing; /* flushing the work queue */
42883 };
42884
42885diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
42886index 9d3e5c1..6f166df 100644
42887--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
42888+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
42889@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
42890 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
42891 }
42892
42893-int mthca_QUERY_FW(struct mthca_dev *dev)
42894+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
42895 {
42896 struct mthca_mailbox *mailbox;
42897 u32 *outbox;
42898@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42899 CMD_TIME_CLASS_B);
42900 }
42901
42902-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42903+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42904 int num_mtt)
42905 {
42906 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
42907@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
42908 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
42909 }
42910
42911-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42912+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42913 int eq_num)
42914 {
42915 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
42916@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
42917 CMD_TIME_CLASS_B);
42918 }
42919
42920-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42921+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
42922 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
42923 void *in_mad, void *response_mad)
42924 {
42925diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
42926index ded76c1..0cf0a08 100644
42927--- a/drivers/infiniband/hw/mthca/mthca_main.c
42928+++ b/drivers/infiniband/hw/mthca/mthca_main.c
42929@@ -692,7 +692,7 @@ err_close:
42930 return err;
42931 }
42932
42933-static int mthca_setup_hca(struct mthca_dev *dev)
42934+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
42935 {
42936 int err;
42937
42938diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
42939index ed9a989..6aa5dc2 100644
42940--- a/drivers/infiniband/hw/mthca/mthca_mr.c
42941+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
42942@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
42943 * through the bitmaps)
42944 */
42945
42946-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42947+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
42948 {
42949 int o;
42950 int m;
42951@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
42952 return key;
42953 }
42954
42955-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42956+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
42957 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
42958 {
42959 struct mthca_mailbox *mailbox;
42960@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
42961 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
42962 }
42963
42964-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
42965+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
42966 u64 *buffer_list, int buffer_size_shift,
42967 int list_len, u64 iova, u64 total_size,
42968 u32 access, struct mthca_mr *mr)
42969diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
42970index 415f8e1..e34214e 100644
42971--- a/drivers/infiniband/hw/mthca/mthca_provider.c
42972+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
42973@@ -764,7 +764,7 @@ unlock:
42974 return 0;
42975 }
42976
42977-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
42978+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
42979 {
42980 struct mthca_dev *dev = to_mdev(ibcq->device);
42981 struct mthca_cq *cq = to_mcq(ibcq);
42982diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
42983index 3b2a6dc..bce26ff 100644
42984--- a/drivers/infiniband/hw/nes/nes.c
42985+++ b/drivers/infiniband/hw/nes/nes.c
42986@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
42987 LIST_HEAD(nes_adapter_list);
42988 static LIST_HEAD(nes_dev_list);
42989
42990-atomic_t qps_destroyed;
42991+atomic_unchecked_t qps_destroyed;
42992
42993 static unsigned int ee_flsh_adapter;
42994 static unsigned int sysfs_nonidx_addr;
42995@@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
42996 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
42997 struct nes_adapter *nesadapter = nesdev->nesadapter;
42998
42999- atomic_inc(&qps_destroyed);
43000+ atomic_inc_unchecked(&qps_destroyed);
43001
43002 /* Free the control structures */
43003
43004diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43005index bd9d132..70d84f4 100644
43006--- a/drivers/infiniband/hw/nes/nes.h
43007+++ b/drivers/infiniband/hw/nes/nes.h
43008@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43009 extern unsigned int wqm_quanta;
43010 extern struct list_head nes_adapter_list;
43011
43012-extern atomic_t cm_connects;
43013-extern atomic_t cm_accepts;
43014-extern atomic_t cm_disconnects;
43015-extern atomic_t cm_closes;
43016-extern atomic_t cm_connecteds;
43017-extern atomic_t cm_connect_reqs;
43018-extern atomic_t cm_rejects;
43019-extern atomic_t mod_qp_timouts;
43020-extern atomic_t qps_created;
43021-extern atomic_t qps_destroyed;
43022-extern atomic_t sw_qps_destroyed;
43023+extern atomic_unchecked_t cm_connects;
43024+extern atomic_unchecked_t cm_accepts;
43025+extern atomic_unchecked_t cm_disconnects;
43026+extern atomic_unchecked_t cm_closes;
43027+extern atomic_unchecked_t cm_connecteds;
43028+extern atomic_unchecked_t cm_connect_reqs;
43029+extern atomic_unchecked_t cm_rejects;
43030+extern atomic_unchecked_t mod_qp_timouts;
43031+extern atomic_unchecked_t qps_created;
43032+extern atomic_unchecked_t qps_destroyed;
43033+extern atomic_unchecked_t sw_qps_destroyed;
43034 extern u32 mh_detected;
43035 extern u32 mh_pauses_sent;
43036 extern u32 cm_packets_sent;
43037@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43038 extern u32 cm_packets_received;
43039 extern u32 cm_packets_dropped;
43040 extern u32 cm_packets_retrans;
43041-extern atomic_t cm_listens_created;
43042-extern atomic_t cm_listens_destroyed;
43043+extern atomic_unchecked_t cm_listens_created;
43044+extern atomic_unchecked_t cm_listens_destroyed;
43045 extern u32 cm_backlog_drops;
43046-extern atomic_t cm_loopbacks;
43047-extern atomic_t cm_nodes_created;
43048-extern atomic_t cm_nodes_destroyed;
43049-extern atomic_t cm_accel_dropped_pkts;
43050-extern atomic_t cm_resets_recvd;
43051-extern atomic_t pau_qps_created;
43052-extern atomic_t pau_qps_destroyed;
43053+extern atomic_unchecked_t cm_loopbacks;
43054+extern atomic_unchecked_t cm_nodes_created;
43055+extern atomic_unchecked_t cm_nodes_destroyed;
43056+extern atomic_unchecked_t cm_accel_dropped_pkts;
43057+extern atomic_unchecked_t cm_resets_recvd;
43058+extern atomic_unchecked_t pau_qps_created;
43059+extern atomic_unchecked_t pau_qps_destroyed;
43060
43061 extern u32 int_mod_timer_init;
43062 extern u32 int_mod_cq_depth_256;
43063diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43064index 6f09a72..cf4399d 100644
43065--- a/drivers/infiniband/hw/nes/nes_cm.c
43066+++ b/drivers/infiniband/hw/nes/nes_cm.c
43067@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43068 u32 cm_packets_retrans;
43069 u32 cm_packets_created;
43070 u32 cm_packets_received;
43071-atomic_t cm_listens_created;
43072-atomic_t cm_listens_destroyed;
43073+atomic_unchecked_t cm_listens_created;
43074+atomic_unchecked_t cm_listens_destroyed;
43075 u32 cm_backlog_drops;
43076-atomic_t cm_loopbacks;
43077-atomic_t cm_nodes_created;
43078-atomic_t cm_nodes_destroyed;
43079-atomic_t cm_accel_dropped_pkts;
43080-atomic_t cm_resets_recvd;
43081+atomic_unchecked_t cm_loopbacks;
43082+atomic_unchecked_t cm_nodes_created;
43083+atomic_unchecked_t cm_nodes_destroyed;
43084+atomic_unchecked_t cm_accel_dropped_pkts;
43085+atomic_unchecked_t cm_resets_recvd;
43086
43087 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43088 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43089@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43090 /* instance of function pointers for client API */
43091 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43092 static struct nes_cm_ops nes_cm_api = {
43093- mini_cm_accelerated,
43094- mini_cm_listen,
43095- mini_cm_del_listen,
43096- mini_cm_connect,
43097- mini_cm_close,
43098- mini_cm_accept,
43099- mini_cm_reject,
43100- mini_cm_recv_pkt,
43101- mini_cm_dealloc_core,
43102- mini_cm_get,
43103- mini_cm_set
43104+ .accelerated = mini_cm_accelerated,
43105+ .listen = mini_cm_listen,
43106+ .stop_listener = mini_cm_del_listen,
43107+ .connect = mini_cm_connect,
43108+ .close = mini_cm_close,
43109+ .accept = mini_cm_accept,
43110+ .reject = mini_cm_reject,
43111+ .recv_pkt = mini_cm_recv_pkt,
43112+ .destroy_cm_core = mini_cm_dealloc_core,
43113+ .get = mini_cm_get,
43114+ .set = mini_cm_set
43115 };
43116
43117 static struct nes_cm_core *g_cm_core;
43118
43119-atomic_t cm_connects;
43120-atomic_t cm_accepts;
43121-atomic_t cm_disconnects;
43122-atomic_t cm_closes;
43123-atomic_t cm_connecteds;
43124-atomic_t cm_connect_reqs;
43125-atomic_t cm_rejects;
43126+atomic_unchecked_t cm_connects;
43127+atomic_unchecked_t cm_accepts;
43128+atomic_unchecked_t cm_disconnects;
43129+atomic_unchecked_t cm_closes;
43130+atomic_unchecked_t cm_connecteds;
43131+atomic_unchecked_t cm_connect_reqs;
43132+atomic_unchecked_t cm_rejects;
43133
43134 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43135 {
43136@@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43137 kfree(listener);
43138 listener = NULL;
43139 ret = 0;
43140- atomic_inc(&cm_listens_destroyed);
43141+ atomic_inc_unchecked(&cm_listens_destroyed);
43142 } else {
43143 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43144 }
43145@@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43146 cm_node->rem_mac);
43147
43148 add_hte_node(cm_core, cm_node);
43149- atomic_inc(&cm_nodes_created);
43150+ atomic_inc_unchecked(&cm_nodes_created);
43151
43152 return cm_node;
43153 }
43154@@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43155 }
43156
43157 atomic_dec(&cm_core->node_cnt);
43158- atomic_inc(&cm_nodes_destroyed);
43159+ atomic_inc_unchecked(&cm_nodes_destroyed);
43160 nesqp = cm_node->nesqp;
43161 if (nesqp) {
43162 nesqp->cm_node = NULL;
43163@@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43164
43165 static void drop_packet(struct sk_buff *skb)
43166 {
43167- atomic_inc(&cm_accel_dropped_pkts);
43168+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43169 dev_kfree_skb_any(skb);
43170 }
43171
43172@@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43173 {
43174
43175 int reset = 0; /* whether to send reset in case of err.. */
43176- atomic_inc(&cm_resets_recvd);
43177+ atomic_inc_unchecked(&cm_resets_recvd);
43178 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43179 " refcnt=%d\n", cm_node, cm_node->state,
43180 atomic_read(&cm_node->ref_count));
43181@@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43182 rem_ref_cm_node(cm_node->cm_core, cm_node);
43183 return NULL;
43184 }
43185- atomic_inc(&cm_loopbacks);
43186+ atomic_inc_unchecked(&cm_loopbacks);
43187 loopbackremotenode->loopbackpartner = cm_node;
43188 loopbackremotenode->tcp_cntxt.rcv_wscale =
43189 NES_CM_DEFAULT_RCV_WND_SCALE;
43190@@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43191 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43192 else {
43193 rem_ref_cm_node(cm_core, cm_node);
43194- atomic_inc(&cm_accel_dropped_pkts);
43195+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43196 dev_kfree_skb_any(skb);
43197 }
43198 break;
43199@@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43200
43201 if ((cm_id) && (cm_id->event_handler)) {
43202 if (issue_disconn) {
43203- atomic_inc(&cm_disconnects);
43204+ atomic_inc_unchecked(&cm_disconnects);
43205 cm_event.event = IW_CM_EVENT_DISCONNECT;
43206 cm_event.status = disconn_status;
43207 cm_event.local_addr = cm_id->local_addr;
43208@@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43209 }
43210
43211 if (issue_close) {
43212- atomic_inc(&cm_closes);
43213+ atomic_inc_unchecked(&cm_closes);
43214 nes_disconnect(nesqp, 1);
43215
43216 cm_id->provider_data = nesqp;
43217@@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43218
43219 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43220 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43221- atomic_inc(&cm_accepts);
43222+ atomic_inc_unchecked(&cm_accepts);
43223
43224 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43225 netdev_refcnt_read(nesvnic->netdev));
43226@@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43227 struct nes_cm_core *cm_core;
43228 u8 *start_buff;
43229
43230- atomic_inc(&cm_rejects);
43231+ atomic_inc_unchecked(&cm_rejects);
43232 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43233 loopback = cm_node->loopbackpartner;
43234 cm_core = cm_node->cm_core;
43235@@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43236 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43237 ntohs(laddr->sin_port));
43238
43239- atomic_inc(&cm_connects);
43240+ atomic_inc_unchecked(&cm_connects);
43241 nesqp->active_conn = 1;
43242
43243 /* cache the cm_id in the qp */
43244@@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43245 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43246 return err;
43247 }
43248- atomic_inc(&cm_listens_created);
43249+ atomic_inc_unchecked(&cm_listens_created);
43250 }
43251
43252 cm_id->add_ref(cm_id);
43253@@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43254
43255 if (nesqp->destroyed)
43256 return;
43257- atomic_inc(&cm_connecteds);
43258+ atomic_inc_unchecked(&cm_connecteds);
43259 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43260 " local port 0x%04X. jiffies = %lu.\n",
43261 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43262@@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43263
43264 cm_id->add_ref(cm_id);
43265 ret = cm_id->event_handler(cm_id, &cm_event);
43266- atomic_inc(&cm_closes);
43267+ atomic_inc_unchecked(&cm_closes);
43268 cm_event.event = IW_CM_EVENT_CLOSE;
43269 cm_event.status = 0;
43270 cm_event.provider_data = cm_id->provider_data;
43271@@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43272 return;
43273 cm_id = cm_node->cm_id;
43274
43275- atomic_inc(&cm_connect_reqs);
43276+ atomic_inc_unchecked(&cm_connect_reqs);
43277 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43278 cm_node, cm_id, jiffies);
43279
43280@@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43281 return;
43282 cm_id = cm_node->cm_id;
43283
43284- atomic_inc(&cm_connect_reqs);
43285+ atomic_inc_unchecked(&cm_connect_reqs);
43286 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43287 cm_node, cm_id, jiffies);
43288
43289diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43290index 4166452..fc952c3 100644
43291--- a/drivers/infiniband/hw/nes/nes_mgt.c
43292+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43293@@ -40,8 +40,8 @@
43294 #include "nes.h"
43295 #include "nes_mgt.h"
43296
43297-atomic_t pau_qps_created;
43298-atomic_t pau_qps_destroyed;
43299+atomic_unchecked_t pau_qps_created;
43300+atomic_unchecked_t pau_qps_destroyed;
43301
43302 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43303 {
43304@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43305 {
43306 struct sk_buff *skb;
43307 unsigned long flags;
43308- atomic_inc(&pau_qps_destroyed);
43309+ atomic_inc_unchecked(&pau_qps_destroyed);
43310
43311 /* Free packets that have not yet been forwarded */
43312 /* Lock is acquired by skb_dequeue when removing the skb */
43313@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43314 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43315 skb_queue_head_init(&nesqp->pau_list);
43316 spin_lock_init(&nesqp->pau_lock);
43317- atomic_inc(&pau_qps_created);
43318+ atomic_inc_unchecked(&pau_qps_created);
43319 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43320 }
43321
43322diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43323index 49eb511..a774366 100644
43324--- a/drivers/infiniband/hw/nes/nes_nic.c
43325+++ b/drivers/infiniband/hw/nes/nes_nic.c
43326@@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43327 target_stat_values[++index] = mh_detected;
43328 target_stat_values[++index] = mh_pauses_sent;
43329 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43330- target_stat_values[++index] = atomic_read(&cm_connects);
43331- target_stat_values[++index] = atomic_read(&cm_accepts);
43332- target_stat_values[++index] = atomic_read(&cm_disconnects);
43333- target_stat_values[++index] = atomic_read(&cm_connecteds);
43334- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43335- target_stat_values[++index] = atomic_read(&cm_rejects);
43336- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43337- target_stat_values[++index] = atomic_read(&qps_created);
43338- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43339- target_stat_values[++index] = atomic_read(&qps_destroyed);
43340- target_stat_values[++index] = atomic_read(&cm_closes);
43341+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43342+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43343+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43344+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43345+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43346+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43347+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43348+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43349+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43350+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43351+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43352 target_stat_values[++index] = cm_packets_sent;
43353 target_stat_values[++index] = cm_packets_bounced;
43354 target_stat_values[++index] = cm_packets_created;
43355 target_stat_values[++index] = cm_packets_received;
43356 target_stat_values[++index] = cm_packets_dropped;
43357 target_stat_values[++index] = cm_packets_retrans;
43358- target_stat_values[++index] = atomic_read(&cm_listens_created);
43359- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43360+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43361+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43362 target_stat_values[++index] = cm_backlog_drops;
43363- target_stat_values[++index] = atomic_read(&cm_loopbacks);
43364- target_stat_values[++index] = atomic_read(&cm_nodes_created);
43365- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43366- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43367- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43368+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43369+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43370+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43371+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43372+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43373 target_stat_values[++index] = nesadapter->free_4kpbl;
43374 target_stat_values[++index] = nesadapter->free_256pbl;
43375 target_stat_values[++index] = int_mod_timer_init;
43376 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43377 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43378 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43379- target_stat_values[++index] = atomic_read(&pau_qps_created);
43380- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43381+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43382+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43383 }
43384
43385 /**
43386diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43387index fef067c..6a25ccd 100644
43388--- a/drivers/infiniband/hw/nes/nes_verbs.c
43389+++ b/drivers/infiniband/hw/nes/nes_verbs.c
43390@@ -46,9 +46,9 @@
43391
43392 #include <rdma/ib_umem.h>
43393
43394-atomic_t mod_qp_timouts;
43395-atomic_t qps_created;
43396-atomic_t sw_qps_destroyed;
43397+atomic_unchecked_t mod_qp_timouts;
43398+atomic_unchecked_t qps_created;
43399+atomic_unchecked_t sw_qps_destroyed;
43400
43401 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43402
43403@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43404 if (init_attr->create_flags)
43405 return ERR_PTR(-EINVAL);
43406
43407- atomic_inc(&qps_created);
43408+ atomic_inc_unchecked(&qps_created);
43409 switch (init_attr->qp_type) {
43410 case IB_QPT_RC:
43411 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
43412@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
43413 struct iw_cm_event cm_event;
43414 int ret = 0;
43415
43416- atomic_inc(&sw_qps_destroyed);
43417+ atomic_inc_unchecked(&sw_qps_destroyed);
43418 nesqp->destroyed = 1;
43419
43420 /* Blow away the connection if it exists. */
43421diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
43422index c00ae09..04e91be 100644
43423--- a/drivers/infiniband/hw/qib/qib.h
43424+++ b/drivers/infiniband/hw/qib/qib.h
43425@@ -52,6 +52,7 @@
43426 #include <linux/kref.h>
43427 #include <linux/sched.h>
43428 #include <linux/kthread.h>
43429+#include <linux/slab.h>
43430
43431 #include "qib_common.h"
43432 #include "qib_verbs.h"
43433diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43434index cdc7df4..a2fdfdb 100644
43435--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43436+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43437@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
43438 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
43439 }
43440
43441-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
43442+static struct rtnl_link_ops ipoib_link_ops = {
43443 .kind = "ipoib",
43444 .maxtype = IFLA_IPOIB_MAX,
43445 .policy = ipoib_policy,
43446diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
43447index e29c04e..adbf68c 100644
43448--- a/drivers/input/gameport/gameport.c
43449+++ b/drivers/input/gameport/gameport.c
43450@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
43451 */
43452 static void gameport_init_port(struct gameport *gameport)
43453 {
43454- static atomic_t gameport_no = ATOMIC_INIT(0);
43455+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
43456
43457 __module_get(THIS_MODULE);
43458
43459 mutex_init(&gameport->drv_mutex);
43460 device_initialize(&gameport->dev);
43461 dev_set_name(&gameport->dev, "gameport%lu",
43462- (unsigned long)atomic_inc_return(&gameport_no) - 1);
43463+ (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
43464 gameport->dev.bus = &gameport_bus;
43465 gameport->dev.release = gameport_release_port;
43466 if (gameport->parent)
43467diff --git a/drivers/input/input.c b/drivers/input/input.c
43468index 0f175f5..4c481c0 100644
43469--- a/drivers/input/input.c
43470+++ b/drivers/input/input.c
43471@@ -1775,7 +1775,7 @@ EXPORT_SYMBOL_GPL(input_class);
43472 */
43473 struct input_dev *input_allocate_device(void)
43474 {
43475- static atomic_t input_no = ATOMIC_INIT(0);
43476+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
43477 struct input_dev *dev;
43478
43479 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
43480@@ -1790,7 +1790,7 @@ struct input_dev *input_allocate_device(void)
43481 INIT_LIST_HEAD(&dev->node);
43482
43483 dev_set_name(&dev->dev, "input%lu",
43484- (unsigned long) atomic_inc_return(&input_no) - 1);
43485+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
43486
43487 __module_get(THIS_MODULE);
43488 }
43489diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
43490index 4a95b22..874c182 100644
43491--- a/drivers/input/joystick/sidewinder.c
43492+++ b/drivers/input/joystick/sidewinder.c
43493@@ -30,6 +30,7 @@
43494 #include <linux/kernel.h>
43495 #include <linux/module.h>
43496 #include <linux/slab.h>
43497+#include <linux/sched.h>
43498 #include <linux/input.h>
43499 #include <linux/gameport.h>
43500 #include <linux/jiffies.h>
43501diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
43502index fc55f0d..11e2aa6 100644
43503--- a/drivers/input/joystick/xpad.c
43504+++ b/drivers/input/joystick/xpad.c
43505@@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
43506
43507 static int xpad_led_probe(struct usb_xpad *xpad)
43508 {
43509- static atomic_t led_seq = ATOMIC_INIT(0);
43510+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
43511 long led_no;
43512 struct xpad_led *led;
43513 struct led_classdev *led_cdev;
43514@@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
43515 if (!led)
43516 return -ENOMEM;
43517
43518- led_no = (long)atomic_inc_return(&led_seq) - 1;
43519+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
43520
43521 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
43522 led->xpad = xpad;
43523diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
43524index afed8e2..3aa8a18 100644
43525--- a/drivers/input/misc/ims-pcu.c
43526+++ b/drivers/input/misc/ims-pcu.c
43527@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
43528
43529 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43530 {
43531- static atomic_t device_no = ATOMIC_INIT(0);
43532+ static atomic_unchecked_t device_no = ATOMIC_INIT(0);
43533
43534 const struct ims_pcu_device_info *info;
43535 int error;
43536@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43537 }
43538
43539 /* Device appears to be operable, complete initialization */
43540- pcu->device_no = atomic_inc_return(&device_no) - 1;
43541+ pcu->device_no = atomic_inc_return_unchecked(&device_no) - 1;
43542
43543 /*
43544 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
43545diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
43546index f4cf664..3204fda 100644
43547--- a/drivers/input/mouse/psmouse.h
43548+++ b/drivers/input/mouse/psmouse.h
43549@@ -117,7 +117,7 @@ struct psmouse_attribute {
43550 ssize_t (*set)(struct psmouse *psmouse, void *data,
43551 const char *buf, size_t count);
43552 bool protect;
43553-};
43554+} __do_const;
43555 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
43556
43557 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
43558diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
43559index b604564..3f14ae4 100644
43560--- a/drivers/input/mousedev.c
43561+++ b/drivers/input/mousedev.c
43562@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
43563
43564 spin_unlock_irq(&client->packet_lock);
43565
43566- if (copy_to_user(buffer, data, count))
43567+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
43568 return -EFAULT;
43569
43570 return count;
43571diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
43572index d399b8b..4913ede 100644
43573--- a/drivers/input/serio/serio.c
43574+++ b/drivers/input/serio/serio.c
43575@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
43576 */
43577 static void serio_init_port(struct serio *serio)
43578 {
43579- static atomic_t serio_no = ATOMIC_INIT(0);
43580+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
43581
43582 __module_get(THIS_MODULE);
43583
43584@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
43585 mutex_init(&serio->drv_mutex);
43586 device_initialize(&serio->dev);
43587 dev_set_name(&serio->dev, "serio%lu",
43588- (unsigned long)atomic_inc_return(&serio_no) - 1);
43589+ (unsigned long)atomic_inc_return_unchecked(&serio_no) - 1);
43590 serio->dev.bus = &serio_bus;
43591 serio->dev.release = serio_release_port;
43592 serio->dev.groups = serio_device_attr_groups;
43593diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
43594index c9a02fe..0debc75 100644
43595--- a/drivers/input/serio/serio_raw.c
43596+++ b/drivers/input/serio/serio_raw.c
43597@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
43598
43599 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43600 {
43601- static atomic_t serio_raw_no = ATOMIC_INIT(0);
43602+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(0);
43603 struct serio_raw *serio_raw;
43604 int err;
43605
43606@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43607 }
43608
43609 snprintf(serio_raw->name, sizeof(serio_raw->name),
43610- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no) - 1);
43611+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no) - 1);
43612 kref_init(&serio_raw->kref);
43613 INIT_LIST_HEAD(&serio_raw->client_list);
43614 init_waitqueue_head(&serio_raw->wait);
43615diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
43616index 505a9ad..f0b1b6e 100644
43617--- a/drivers/iommu/amd_iommu.c
43618+++ b/drivers/iommu/amd_iommu.c
43619@@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
43620
43621 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
43622 {
43623+ phys_addr_t physaddr;
43624 WARN_ON(address & 0x7ULL);
43625
43626 memset(cmd, 0, sizeof(*cmd));
43627- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
43628- cmd->data[1] = upper_32_bits(__pa(address));
43629+
43630+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
43631+ if (object_starts_on_stack(address)) {
43632+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
43633+ physaddr = __pa((u64)adjbuf);
43634+ } else
43635+#endif
43636+ physaddr = __pa(address);
43637+
43638+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
43639+ cmd->data[1] = upper_32_bits(physaddr);
43640 cmd->data[2] = 1;
43641 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
43642 }
43643diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
43644index 60558f7..5a02369 100644
43645--- a/drivers/iommu/arm-smmu.c
43646+++ b/drivers/iommu/arm-smmu.c
43647@@ -934,7 +934,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43648 cfg->irptndx = cfg->cbndx;
43649 }
43650
43651- ACCESS_ONCE(smmu_domain->smmu) = smmu;
43652+ ACCESS_ONCE_RW(smmu_domain->smmu) = smmu;
43653 arm_smmu_init_context_bank(smmu_domain);
43654 spin_unlock_irqrestore(&smmu_domain->lock, flags);
43655
43656diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
43657index ed8b048..7fbcc01 100644
43658--- a/drivers/iommu/iommu.c
43659+++ b/drivers/iommu/iommu.c
43660@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
43661 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
43662 {
43663 int err;
43664- struct notifier_block *nb;
43665+ notifier_block_no_const *nb;
43666 struct iommu_callback_data cb = {
43667 .ops = ops,
43668 };
43669diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
43670index 74a1767..5a359e8 100644
43671--- a/drivers/iommu/irq_remapping.c
43672+++ b/drivers/iommu/irq_remapping.c
43673@@ -361,7 +361,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
43674 void panic_if_irq_remap(const char *msg)
43675 {
43676 if (irq_remapping_enabled)
43677- panic(msg);
43678+ panic("%s", msg);
43679 }
43680
43681 static void ir_ack_apic_edge(struct irq_data *data)
43682@@ -382,10 +382,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
43683
43684 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
43685 {
43686- chip->irq_print_chip = ir_print_prefix;
43687- chip->irq_ack = ir_ack_apic_edge;
43688- chip->irq_eoi = ir_ack_apic_level;
43689- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43690+ pax_open_kernel();
43691+ *(void **)&chip->irq_print_chip = ir_print_prefix;
43692+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
43693+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
43694+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
43695+ pax_close_kernel();
43696 }
43697
43698 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
43699diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
43700index 38493ff..001538b 100644
43701--- a/drivers/irqchip/irq-gic.c
43702+++ b/drivers/irqchip/irq-gic.c
43703@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
43704 * Supported arch specific GIC irq extension.
43705 * Default make them NULL.
43706 */
43707-struct irq_chip gic_arch_extn = {
43708+irq_chip_no_const gic_arch_extn = {
43709 .irq_eoi = NULL,
43710 .irq_mask = NULL,
43711 .irq_unmask = NULL,
43712@@ -311,7 +311,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
43713 chained_irq_exit(chip, desc);
43714 }
43715
43716-static struct irq_chip gic_chip = {
43717+static irq_chip_no_const gic_chip __read_only = {
43718 .name = "GIC",
43719 .irq_mask = gic_mask_irq,
43720 .irq_unmask = gic_unmask_irq,
43721diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
43722index 8777065..a4a9967 100644
43723--- a/drivers/irqchip/irq-renesas-irqc.c
43724+++ b/drivers/irqchip/irq-renesas-irqc.c
43725@@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
43726 struct irqc_priv *p;
43727 struct resource *io;
43728 struct resource *irq;
43729- struct irq_chip *irq_chip;
43730+ irq_chip_no_const *irq_chip;
43731 const char *name = dev_name(&pdev->dev);
43732 int ret;
43733 int k;
43734diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
43735index 6a2df32..dc962f1 100644
43736--- a/drivers/isdn/capi/capi.c
43737+++ b/drivers/isdn/capi/capi.c
43738@@ -81,8 +81,8 @@ struct capiminor {
43739
43740 struct capi20_appl *ap;
43741 u32 ncci;
43742- atomic_t datahandle;
43743- atomic_t msgid;
43744+ atomic_unchecked_t datahandle;
43745+ atomic_unchecked_t msgid;
43746
43747 struct tty_port port;
43748 int ttyinstop;
43749@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
43750 capimsg_setu16(s, 2, mp->ap->applid);
43751 capimsg_setu8 (s, 4, CAPI_DATA_B3);
43752 capimsg_setu8 (s, 5, CAPI_RESP);
43753- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
43754+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
43755 capimsg_setu32(s, 8, mp->ncci);
43756 capimsg_setu16(s, 12, datahandle);
43757 }
43758@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
43759 mp->outbytes -= len;
43760 spin_unlock_bh(&mp->outlock);
43761
43762- datahandle = atomic_inc_return(&mp->datahandle);
43763+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
43764 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
43765 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43766 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
43767 capimsg_setu16(skb->data, 2, mp->ap->applid);
43768 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
43769 capimsg_setu8 (skb->data, 5, CAPI_REQ);
43770- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
43771+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
43772 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
43773 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
43774 capimsg_setu16(skb->data, 16, len); /* Data length */
43775diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
43776index aecec6d..11e13c5 100644
43777--- a/drivers/isdn/gigaset/bas-gigaset.c
43778+++ b/drivers/isdn/gigaset/bas-gigaset.c
43779@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
43780
43781
43782 static const struct gigaset_ops gigops = {
43783- gigaset_write_cmd,
43784- gigaset_write_room,
43785- gigaset_chars_in_buffer,
43786- gigaset_brkchars,
43787- gigaset_init_bchannel,
43788- gigaset_close_bchannel,
43789- gigaset_initbcshw,
43790- gigaset_freebcshw,
43791- gigaset_reinitbcshw,
43792- gigaset_initcshw,
43793- gigaset_freecshw,
43794- gigaset_set_modem_ctrl,
43795- gigaset_baud_rate,
43796- gigaset_set_line_ctrl,
43797- gigaset_isoc_send_skb,
43798- gigaset_isoc_input,
43799+ .write_cmd = gigaset_write_cmd,
43800+ .write_room = gigaset_write_room,
43801+ .chars_in_buffer = gigaset_chars_in_buffer,
43802+ .brkchars = gigaset_brkchars,
43803+ .init_bchannel = gigaset_init_bchannel,
43804+ .close_bchannel = gigaset_close_bchannel,
43805+ .initbcshw = gigaset_initbcshw,
43806+ .freebcshw = gigaset_freebcshw,
43807+ .reinitbcshw = gigaset_reinitbcshw,
43808+ .initcshw = gigaset_initcshw,
43809+ .freecshw = gigaset_freecshw,
43810+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43811+ .baud_rate = gigaset_baud_rate,
43812+ .set_line_ctrl = gigaset_set_line_ctrl,
43813+ .send_skb = gigaset_isoc_send_skb,
43814+ .handle_input = gigaset_isoc_input,
43815 };
43816
43817 /* bas_gigaset_init
43818diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
43819index 600c79b..3752bab 100644
43820--- a/drivers/isdn/gigaset/interface.c
43821+++ b/drivers/isdn/gigaset/interface.c
43822@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
43823 }
43824 tty->driver_data = cs;
43825
43826- ++cs->port.count;
43827+ atomic_inc(&cs->port.count);
43828
43829- if (cs->port.count == 1) {
43830+ if (atomic_read(&cs->port.count) == 1) {
43831 tty_port_tty_set(&cs->port, tty);
43832 cs->port.low_latency = 1;
43833 }
43834@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
43835
43836 if (!cs->connected)
43837 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
43838- else if (!cs->port.count)
43839+ else if (!atomic_read(&cs->port.count))
43840 dev_warn(cs->dev, "%s: device not opened\n", __func__);
43841- else if (!--cs->port.count)
43842+ else if (!atomic_dec_return(&cs->port.count))
43843 tty_port_tty_set(&cs->port, NULL);
43844
43845 mutex_unlock(&cs->mutex);
43846diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
43847index 8c91fd5..14f13ce 100644
43848--- a/drivers/isdn/gigaset/ser-gigaset.c
43849+++ b/drivers/isdn/gigaset/ser-gigaset.c
43850@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
43851 }
43852
43853 static const struct gigaset_ops ops = {
43854- gigaset_write_cmd,
43855- gigaset_write_room,
43856- gigaset_chars_in_buffer,
43857- gigaset_brkchars,
43858- gigaset_init_bchannel,
43859- gigaset_close_bchannel,
43860- gigaset_initbcshw,
43861- gigaset_freebcshw,
43862- gigaset_reinitbcshw,
43863- gigaset_initcshw,
43864- gigaset_freecshw,
43865- gigaset_set_modem_ctrl,
43866- gigaset_baud_rate,
43867- gigaset_set_line_ctrl,
43868- gigaset_m10x_send_skb, /* asyncdata.c */
43869- gigaset_m10x_input, /* asyncdata.c */
43870+ .write_cmd = gigaset_write_cmd,
43871+ .write_room = gigaset_write_room,
43872+ .chars_in_buffer = gigaset_chars_in_buffer,
43873+ .brkchars = gigaset_brkchars,
43874+ .init_bchannel = gigaset_init_bchannel,
43875+ .close_bchannel = gigaset_close_bchannel,
43876+ .initbcshw = gigaset_initbcshw,
43877+ .freebcshw = gigaset_freebcshw,
43878+ .reinitbcshw = gigaset_reinitbcshw,
43879+ .initcshw = gigaset_initcshw,
43880+ .freecshw = gigaset_freecshw,
43881+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43882+ .baud_rate = gigaset_baud_rate,
43883+ .set_line_ctrl = gigaset_set_line_ctrl,
43884+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
43885+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
43886 };
43887
43888
43889diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
43890index a8e652d..edadaa4 100644
43891--- a/drivers/isdn/gigaset/usb-gigaset.c
43892+++ b/drivers/isdn/gigaset/usb-gigaset.c
43893@@ -548,7 +548,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
43894 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
43895 memcpy(cs->hw.usb->bchars, buf, 6);
43896 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
43897- 0, 0, &buf, 6, 2000);
43898+ 0, 0, buf, 6, 2000);
43899 }
43900
43901 static void gigaset_freebcshw(struct bc_state *bcs)
43902@@ -867,22 +867,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
43903 }
43904
43905 static const struct gigaset_ops ops = {
43906- gigaset_write_cmd,
43907- gigaset_write_room,
43908- gigaset_chars_in_buffer,
43909- gigaset_brkchars,
43910- gigaset_init_bchannel,
43911- gigaset_close_bchannel,
43912- gigaset_initbcshw,
43913- gigaset_freebcshw,
43914- gigaset_reinitbcshw,
43915- gigaset_initcshw,
43916- gigaset_freecshw,
43917- gigaset_set_modem_ctrl,
43918- gigaset_baud_rate,
43919- gigaset_set_line_ctrl,
43920- gigaset_m10x_send_skb,
43921- gigaset_m10x_input,
43922+ .write_cmd = gigaset_write_cmd,
43923+ .write_room = gigaset_write_room,
43924+ .chars_in_buffer = gigaset_chars_in_buffer,
43925+ .brkchars = gigaset_brkchars,
43926+ .init_bchannel = gigaset_init_bchannel,
43927+ .close_bchannel = gigaset_close_bchannel,
43928+ .initbcshw = gigaset_initbcshw,
43929+ .freebcshw = gigaset_freebcshw,
43930+ .reinitbcshw = gigaset_reinitbcshw,
43931+ .initcshw = gigaset_initcshw,
43932+ .freecshw = gigaset_freecshw,
43933+ .set_modem_ctrl = gigaset_set_modem_ctrl,
43934+ .baud_rate = gigaset_baud_rate,
43935+ .set_line_ctrl = gigaset_set_line_ctrl,
43936+ .send_skb = gigaset_m10x_send_skb,
43937+ .handle_input = gigaset_m10x_input,
43938 };
43939
43940 /*
43941diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
43942index 4d9b195..455075c 100644
43943--- a/drivers/isdn/hardware/avm/b1.c
43944+++ b/drivers/isdn/hardware/avm/b1.c
43945@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
43946 }
43947 if (left) {
43948 if (t4file->user) {
43949- if (copy_from_user(buf, dp, left))
43950+ if (left > sizeof buf || copy_from_user(buf, dp, left))
43951 return -EFAULT;
43952 } else {
43953 memcpy(buf, dp, left);
43954@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
43955 }
43956 if (left) {
43957 if (config->user) {
43958- if (copy_from_user(buf, dp, left))
43959+ if (left > sizeof buf || copy_from_user(buf, dp, left))
43960 return -EFAULT;
43961 } else {
43962 memcpy(buf, dp, left);
43963diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
43964index 9b856e1..fa03c92 100644
43965--- a/drivers/isdn/i4l/isdn_common.c
43966+++ b/drivers/isdn/i4l/isdn_common.c
43967@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
43968 } else
43969 return -EINVAL;
43970 case IIOCDBGVAR:
43971+ if (!capable(CAP_SYS_RAWIO))
43972+ return -EPERM;
43973 if (arg) {
43974 if (copy_to_user(argp, &dev, sizeof(ulong)))
43975 return -EFAULT;
43976diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
43977index 91d5730..336523e 100644
43978--- a/drivers/isdn/i4l/isdn_concap.c
43979+++ b/drivers/isdn/i4l/isdn_concap.c
43980@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
43981 }
43982
43983 struct concap_device_ops isdn_concap_reliable_dl_dops = {
43984- &isdn_concap_dl_data_req,
43985- &isdn_concap_dl_connect_req,
43986- &isdn_concap_dl_disconn_req
43987+ .data_req = &isdn_concap_dl_data_req,
43988+ .connect_req = &isdn_concap_dl_connect_req,
43989+ .disconn_req = &isdn_concap_dl_disconn_req
43990 };
43991
43992 /* The following should better go into a dedicated source file such that
43993diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
43994index bc91261..2ef7e36 100644
43995--- a/drivers/isdn/i4l/isdn_tty.c
43996+++ b/drivers/isdn/i4l/isdn_tty.c
43997@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
43998
43999 #ifdef ISDN_DEBUG_MODEM_OPEN
44000 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
44001- port->count);
44002+ atomic_read(&port->count));
44003 #endif
44004- port->count++;
44005+ atomic_inc(&port->count);
44006 port->tty = tty;
44007 /*
44008 * Start up serial port
44009@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44010 #endif
44011 return;
44012 }
44013- if ((tty->count == 1) && (port->count != 1)) {
44014+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
44015 /*
44016 * Uh, oh. tty->count is 1, which means that the tty
44017 * structure will be freed. Info->count should always
44018@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44019 * serial port won't be shutdown.
44020 */
44021 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
44022- "info->count is %d\n", port->count);
44023- port->count = 1;
44024+ "info->count is %d\n", atomic_read(&port->count));
44025+ atomic_set(&port->count, 1);
44026 }
44027- if (--port->count < 0) {
44028+ if (atomic_dec_return(&port->count) < 0) {
44029 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
44030- info->line, port->count);
44031- port->count = 0;
44032+ info->line, atomic_read(&port->count));
44033+ atomic_set(&port->count, 0);
44034 }
44035- if (port->count) {
44036+ if (atomic_read(&port->count)) {
44037 #ifdef ISDN_DEBUG_MODEM_OPEN
44038 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
44039 #endif
44040@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
44041 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
44042 return;
44043 isdn_tty_shutdown(info);
44044- port->count = 0;
44045+ atomic_set(&port->count, 0);
44046 port->flags &= ~ASYNC_NORMAL_ACTIVE;
44047 port->tty = NULL;
44048 wake_up_interruptible(&port->open_wait);
44049@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
44050 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
44051 modem_info *info = &dev->mdm.info[i];
44052
44053- if (info->port.count == 0)
44054+ if (atomic_read(&info->port.count) == 0)
44055 continue;
44056 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
44057 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
44058diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
44059index e2d4e58..40cd045 100644
44060--- a/drivers/isdn/i4l/isdn_x25iface.c
44061+++ b/drivers/isdn/i4l/isdn_x25iface.c
44062@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
44063
44064
44065 static struct concap_proto_ops ix25_pops = {
44066- &isdn_x25iface_proto_new,
44067- &isdn_x25iface_proto_del,
44068- &isdn_x25iface_proto_restart,
44069- &isdn_x25iface_proto_close,
44070- &isdn_x25iface_xmit,
44071- &isdn_x25iface_receive,
44072- &isdn_x25iface_connect_ind,
44073- &isdn_x25iface_disconn_ind
44074+ .proto_new = &isdn_x25iface_proto_new,
44075+ .proto_del = &isdn_x25iface_proto_del,
44076+ .restart = &isdn_x25iface_proto_restart,
44077+ .close = &isdn_x25iface_proto_close,
44078+ .encap_and_xmit = &isdn_x25iface_xmit,
44079+ .data_ind = &isdn_x25iface_receive,
44080+ .connect_ind = &isdn_x25iface_connect_ind,
44081+ .disconn_ind = &isdn_x25iface_disconn_ind
44082 };
44083
44084 /* error message helper function */
44085diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
44086index 6a7447c..cae33fe 100644
44087--- a/drivers/isdn/icn/icn.c
44088+++ b/drivers/isdn/icn/icn.c
44089@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
44090 if (count > len)
44091 count = len;
44092 if (user) {
44093- if (copy_from_user(msg, buf, count))
44094+ if (count > sizeof msg || copy_from_user(msg, buf, count))
44095 return -EFAULT;
44096 } else
44097 memcpy(msg, buf, count);
44098diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
44099index 87f7dff..7300125 100644
44100--- a/drivers/isdn/mISDN/dsp_cmx.c
44101+++ b/drivers/isdn/mISDN/dsp_cmx.c
44102@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
44103 static u16 dsp_count; /* last sample count */
44104 static int dsp_count_valid; /* if we have last sample count */
44105
44106-void
44107+void __intentional_overflow(-1)
44108 dsp_cmx_send(void *arg)
44109 {
44110 struct dsp_conf *conf;
44111diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
44112index f58a354..fbae176 100644
44113--- a/drivers/leds/leds-clevo-mail.c
44114+++ b/drivers/leds/leds-clevo-mail.c
44115@@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
44116 * detected as working, but in reality it is not) as low as
44117 * possible.
44118 */
44119-static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
44120+static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
44121 {
44122 .callback = clevo_mail_led_dmi_callback,
44123 .ident = "Clevo D410J",
44124diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
44125index 046cb70..6b20d39 100644
44126--- a/drivers/leds/leds-ss4200.c
44127+++ b/drivers/leds/leds-ss4200.c
44128@@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
44129 * detected as working, but in reality it is not) as low as
44130 * possible.
44131 */
44132-static struct dmi_system_id nas_led_whitelist[] __initdata = {
44133+static struct dmi_system_id nas_led_whitelist[] __initconst = {
44134 {
44135 .callback = ss4200_led_dmi_callback,
44136 .ident = "Intel SS4200-E",
44137diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
44138index 6590558..a74c5dd 100644
44139--- a/drivers/lguest/core.c
44140+++ b/drivers/lguest/core.c
44141@@ -96,9 +96,17 @@ static __init int map_switcher(void)
44142 * The end address needs +1 because __get_vm_area allocates an
44143 * extra guard page, so we need space for that.
44144 */
44145+
44146+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
44147+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44148+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
44149+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44150+#else
44151 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44152 VM_ALLOC, switcher_addr, switcher_addr
44153 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44154+#endif
44155+
44156 if (!switcher_vma) {
44157 err = -ENOMEM;
44158 printk("lguest: could not map switcher pages high\n");
44159@@ -121,7 +129,7 @@ static __init int map_switcher(void)
44160 * Now the Switcher is mapped at the right address, we can't fail!
44161 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
44162 */
44163- memcpy(switcher_vma->addr, start_switcher_text,
44164+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
44165 end_switcher_text - start_switcher_text);
44166
44167 printk(KERN_INFO "lguest: mapped switcher at %p\n",
44168diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
44169index e8b55c3..3514c37 100644
44170--- a/drivers/lguest/page_tables.c
44171+++ b/drivers/lguest/page_tables.c
44172@@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
44173 /*:*/
44174
44175 #ifdef CONFIG_X86_PAE
44176-static void release_pmd(pmd_t *spmd)
44177+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
44178 {
44179 /* If the entry's not present, there's nothing to release. */
44180 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
44181diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
44182index 922a1ac..9dd0c2a 100644
44183--- a/drivers/lguest/x86/core.c
44184+++ b/drivers/lguest/x86/core.c
44185@@ -59,7 +59,7 @@ static struct {
44186 /* Offset from where switcher.S was compiled to where we've copied it */
44187 static unsigned long switcher_offset(void)
44188 {
44189- return switcher_addr - (unsigned long)start_switcher_text;
44190+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
44191 }
44192
44193 /* This cpu's struct lguest_pages (after the Switcher text page) */
44194@@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
44195 * These copies are pretty cheap, so we do them unconditionally: */
44196 /* Save the current Host top-level page directory.
44197 */
44198+
44199+#ifdef CONFIG_PAX_PER_CPU_PGD
44200+ pages->state.host_cr3 = read_cr3();
44201+#else
44202 pages->state.host_cr3 = __pa(current->mm->pgd);
44203+#endif
44204+
44205 /*
44206 * Set up the Guest's page tables to see this CPU's pages (and no
44207 * other CPU's pages).
44208@@ -477,7 +483,7 @@ void __init lguest_arch_host_init(void)
44209 * compiled-in switcher code and the high-mapped copy we just made.
44210 */
44211 for (i = 0; i < IDT_ENTRIES; i++)
44212- default_idt_entries[i] += switcher_offset();
44213+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
44214
44215 /*
44216 * Set up the Switcher's per-cpu areas.
44217@@ -560,7 +566,7 @@ void __init lguest_arch_host_init(void)
44218 * it will be undisturbed when we switch. To change %cs and jump we
44219 * need this structure to feed to Intel's "lcall" instruction.
44220 */
44221- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
44222+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
44223 lguest_entry.segment = LGUEST_CS;
44224
44225 /*
44226diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
44227index 40634b0..4f5855e 100644
44228--- a/drivers/lguest/x86/switcher_32.S
44229+++ b/drivers/lguest/x86/switcher_32.S
44230@@ -87,6 +87,7 @@
44231 #include <asm/page.h>
44232 #include <asm/segment.h>
44233 #include <asm/lguest.h>
44234+#include <asm/processor-flags.h>
44235
44236 // We mark the start of the code to copy
44237 // It's placed in .text tho it's never run here
44238@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
44239 // Changes type when we load it: damn Intel!
44240 // For after we switch over our page tables
44241 // That entry will be read-only: we'd crash.
44242+
44243+#ifdef CONFIG_PAX_KERNEXEC
44244+ mov %cr0, %edx
44245+ xor $X86_CR0_WP, %edx
44246+ mov %edx, %cr0
44247+#endif
44248+
44249 movl $(GDT_ENTRY_TSS*8), %edx
44250 ltr %dx
44251
44252@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
44253 // Let's clear it again for our return.
44254 // The GDT descriptor of the Host
44255 // Points to the table after two "size" bytes
44256- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
44257+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
44258 // Clear "used" from type field (byte 5, bit 2)
44259- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
44260+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
44261+
44262+#ifdef CONFIG_PAX_KERNEXEC
44263+ mov %cr0, %eax
44264+ xor $X86_CR0_WP, %eax
44265+ mov %eax, %cr0
44266+#endif
44267
44268 // Once our page table's switched, the Guest is live!
44269 // The Host fades as we run this final step.
44270@@ -295,13 +309,12 @@ deliver_to_host:
44271 // I consulted gcc, and it gave
44272 // These instructions, which I gladly credit:
44273 leal (%edx,%ebx,8), %eax
44274- movzwl (%eax),%edx
44275- movl 4(%eax), %eax
44276- xorw %ax, %ax
44277- orl %eax, %edx
44278+ movl 4(%eax), %edx
44279+ movw (%eax), %dx
44280 // Now the address of the handler's in %edx
44281 // We call it now: its "iret" drops us home.
44282- jmp *%edx
44283+ ljmp $__KERNEL_CS, $1f
44284+1: jmp *%edx
44285
44286 // Every interrupt can come to us here
44287 // But we must truly tell each apart.
44288diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
44289index a08e3ee..df8ade2 100644
44290--- a/drivers/md/bcache/closure.h
44291+++ b/drivers/md/bcache/closure.h
44292@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
44293 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
44294 struct workqueue_struct *wq)
44295 {
44296- BUG_ON(object_is_on_stack(cl));
44297+ BUG_ON(object_starts_on_stack(cl));
44298 closure_set_ip(cl);
44299 cl->fn = fn;
44300 cl->wq = wq;
44301diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
44302index da3604e..7789cb4c 100644
44303--- a/drivers/md/bitmap.c
44304+++ b/drivers/md/bitmap.c
44305@@ -1771,7 +1771,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
44306 chunk_kb ? "KB" : "B");
44307 if (bitmap->storage.file) {
44308 seq_printf(seq, ", file: ");
44309- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
44310+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
44311 }
44312
44313 seq_printf(seq, "\n");
44314diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
44315index 0be9381..114262b 100644
44316--- a/drivers/md/dm-ioctl.c
44317+++ b/drivers/md/dm-ioctl.c
44318@@ -1769,7 +1769,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
44319 cmd == DM_LIST_VERSIONS_CMD)
44320 return 0;
44321
44322- if ((cmd == DM_DEV_CREATE_CMD)) {
44323+ if (cmd == DM_DEV_CREATE_CMD) {
44324 if (!*param->name) {
44325 DMWARN("name not supplied when creating device");
44326 return -EINVAL;
44327diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
44328index 7dfdb5c..4caada6 100644
44329--- a/drivers/md/dm-raid1.c
44330+++ b/drivers/md/dm-raid1.c
44331@@ -40,7 +40,7 @@ enum dm_raid1_error {
44332
44333 struct mirror {
44334 struct mirror_set *ms;
44335- atomic_t error_count;
44336+ atomic_unchecked_t error_count;
44337 unsigned long error_type;
44338 struct dm_dev *dev;
44339 sector_t offset;
44340@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
44341 struct mirror *m;
44342
44343 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
44344- if (!atomic_read(&m->error_count))
44345+ if (!atomic_read_unchecked(&m->error_count))
44346 return m;
44347
44348 return NULL;
44349@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
44350 * simple way to tell if a device has encountered
44351 * errors.
44352 */
44353- atomic_inc(&m->error_count);
44354+ atomic_inc_unchecked(&m->error_count);
44355
44356 if (test_and_set_bit(error_type, &m->error_type))
44357 return;
44358@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
44359 struct mirror *m = get_default_mirror(ms);
44360
44361 do {
44362- if (likely(!atomic_read(&m->error_count)))
44363+ if (likely(!atomic_read_unchecked(&m->error_count)))
44364 return m;
44365
44366 if (m-- == ms->mirror)
44367@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
44368 {
44369 struct mirror *default_mirror = get_default_mirror(m->ms);
44370
44371- return !atomic_read(&default_mirror->error_count);
44372+ return !atomic_read_unchecked(&default_mirror->error_count);
44373 }
44374
44375 static int mirror_available(struct mirror_set *ms, struct bio *bio)
44376@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
44377 */
44378 if (likely(region_in_sync(ms, region, 1)))
44379 m = choose_mirror(ms, bio->bi_iter.bi_sector);
44380- else if (m && atomic_read(&m->error_count))
44381+ else if (m && atomic_read_unchecked(&m->error_count))
44382 m = NULL;
44383
44384 if (likely(m))
44385@@ -927,7 +927,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
44386 }
44387
44388 ms->mirror[mirror].ms = ms;
44389- atomic_set(&(ms->mirror[mirror].error_count), 0);
44390+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
44391 ms->mirror[mirror].error_type = 0;
44392 ms->mirror[mirror].offset = offset;
44393
44394@@ -1342,7 +1342,7 @@ static void mirror_resume(struct dm_target *ti)
44395 */
44396 static char device_status_char(struct mirror *m)
44397 {
44398- if (!atomic_read(&(m->error_count)))
44399+ if (!atomic_read_unchecked(&(m->error_count)))
44400 return 'A';
44401
44402 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
44403diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
44404index 87f86c7..a1a4100 100644
44405--- a/drivers/md/dm-stats.c
44406+++ b/drivers/md/dm-stats.c
44407@@ -382,7 +382,7 @@ do_sync_free:
44408 synchronize_rcu_expedited();
44409 dm_stat_free(&s->rcu_head);
44410 } else {
44411- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
44412+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
44413 call_rcu(&s->rcu_head, dm_stat_free);
44414 }
44415 return 0;
44416@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
44417 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
44418 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
44419 ));
44420- ACCESS_ONCE(last->last_sector) = end_sector;
44421- ACCESS_ONCE(last->last_rw) = bi_rw;
44422+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
44423+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
44424 }
44425
44426 rcu_read_lock();
44427diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
44428index f8b37d4..5c5cafd 100644
44429--- a/drivers/md/dm-stripe.c
44430+++ b/drivers/md/dm-stripe.c
44431@@ -21,7 +21,7 @@ struct stripe {
44432 struct dm_dev *dev;
44433 sector_t physical_start;
44434
44435- atomic_t error_count;
44436+ atomic_unchecked_t error_count;
44437 };
44438
44439 struct stripe_c {
44440@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
44441 kfree(sc);
44442 return r;
44443 }
44444- atomic_set(&(sc->stripe[i].error_count), 0);
44445+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
44446 }
44447
44448 ti->private = sc;
44449@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
44450 DMEMIT("%d ", sc->stripes);
44451 for (i = 0; i < sc->stripes; i++) {
44452 DMEMIT("%s ", sc->stripe[i].dev->name);
44453- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
44454+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
44455 'D' : 'A';
44456 }
44457 buffer[i] = '\0';
44458@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
44459 */
44460 for (i = 0; i < sc->stripes; i++)
44461 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
44462- atomic_inc(&(sc->stripe[i].error_count));
44463- if (atomic_read(&(sc->stripe[i].error_count)) <
44464+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
44465+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
44466 DM_IO_ERROR_THRESHOLD)
44467 schedule_work(&sc->trigger_event);
44468 }
44469diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
44470index b2bd1eb..38f7a44 100644
44471--- a/drivers/md/dm-table.c
44472+++ b/drivers/md/dm-table.c
44473@@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
44474 if (!dev_size)
44475 return 0;
44476
44477- if ((start >= dev_size) || (start + len > dev_size)) {
44478+ if ((start >= dev_size) || (len > dev_size - start)) {
44479 DMWARN("%s: %s too small for target: "
44480 "start=%llu, len=%llu, dev_size=%llu",
44481 dm_device_name(ti->table->md), bdevname(bdev, b),
44482diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
44483index e9d33ad..dae9880d 100644
44484--- a/drivers/md/dm-thin-metadata.c
44485+++ b/drivers/md/dm-thin-metadata.c
44486@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44487 {
44488 pmd->info.tm = pmd->tm;
44489 pmd->info.levels = 2;
44490- pmd->info.value_type.context = pmd->data_sm;
44491+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44492 pmd->info.value_type.size = sizeof(__le64);
44493 pmd->info.value_type.inc = data_block_inc;
44494 pmd->info.value_type.dec = data_block_dec;
44495@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
44496
44497 pmd->bl_info.tm = pmd->tm;
44498 pmd->bl_info.levels = 1;
44499- pmd->bl_info.value_type.context = pmd->data_sm;
44500+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
44501 pmd->bl_info.value_type.size = sizeof(__le64);
44502 pmd->bl_info.value_type.inc = data_block_inc;
44503 pmd->bl_info.value_type.dec = data_block_dec;
44504diff --git a/drivers/md/dm.c b/drivers/md/dm.c
44505index 58f3927..bfbad3e 100644
44506--- a/drivers/md/dm.c
44507+++ b/drivers/md/dm.c
44508@@ -183,9 +183,9 @@ struct mapped_device {
44509 /*
44510 * Event handling.
44511 */
44512- atomic_t event_nr;
44513+ atomic_unchecked_t event_nr;
44514 wait_queue_head_t eventq;
44515- atomic_t uevent_seq;
44516+ atomic_unchecked_t uevent_seq;
44517 struct list_head uevent_list;
44518 spinlock_t uevent_lock; /* Protect access to uevent_list */
44519
44520@@ -2071,8 +2071,8 @@ static struct mapped_device *alloc_dev(int minor)
44521 spin_lock_init(&md->deferred_lock);
44522 atomic_set(&md->holders, 1);
44523 atomic_set(&md->open_count, 0);
44524- atomic_set(&md->event_nr, 0);
44525- atomic_set(&md->uevent_seq, 0);
44526+ atomic_set_unchecked(&md->event_nr, 0);
44527+ atomic_set_unchecked(&md->uevent_seq, 0);
44528 INIT_LIST_HEAD(&md->uevent_list);
44529 INIT_LIST_HEAD(&md->table_devices);
44530 spin_lock_init(&md->uevent_lock);
44531@@ -2228,7 +2228,7 @@ static void event_callback(void *context)
44532
44533 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
44534
44535- atomic_inc(&md->event_nr);
44536+ atomic_inc_unchecked(&md->event_nr);
44537 wake_up(&md->eventq);
44538 }
44539
44540@@ -2921,18 +2921,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
44541
44542 uint32_t dm_next_uevent_seq(struct mapped_device *md)
44543 {
44544- return atomic_add_return(1, &md->uevent_seq);
44545+ return atomic_add_return_unchecked(1, &md->uevent_seq);
44546 }
44547
44548 uint32_t dm_get_event_nr(struct mapped_device *md)
44549 {
44550- return atomic_read(&md->event_nr);
44551+ return atomic_read_unchecked(&md->event_nr);
44552 }
44553
44554 int dm_wait_event(struct mapped_device *md, int event_nr)
44555 {
44556 return wait_event_interruptible(md->eventq,
44557- (event_nr != atomic_read(&md->event_nr)));
44558+ (event_nr != atomic_read_unchecked(&md->event_nr)));
44559 }
44560
44561 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
44562diff --git a/drivers/md/md.c b/drivers/md/md.c
44563index 9233c71..ed5243a 100644
44564--- a/drivers/md/md.c
44565+++ b/drivers/md/md.c
44566@@ -190,10 +190,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
44567 * start build, activate spare
44568 */
44569 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
44570-static atomic_t md_event_count;
44571+static atomic_unchecked_t md_event_count;
44572 void md_new_event(struct mddev *mddev)
44573 {
44574- atomic_inc(&md_event_count);
44575+ atomic_inc_unchecked(&md_event_count);
44576 wake_up(&md_event_waiters);
44577 }
44578 EXPORT_SYMBOL_GPL(md_new_event);
44579@@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
44580 */
44581 static void md_new_event_inintr(struct mddev *mddev)
44582 {
44583- atomic_inc(&md_event_count);
44584+ atomic_inc_unchecked(&md_event_count);
44585 wake_up(&md_event_waiters);
44586 }
44587
44588@@ -1426,7 +1426,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
44589 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
44590 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
44591 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
44592- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44593+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
44594
44595 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
44596 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
44597@@ -1677,7 +1677,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
44598 else
44599 sb->resync_offset = cpu_to_le64(0);
44600
44601- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
44602+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
44603
44604 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
44605 sb->size = cpu_to_le64(mddev->dev_sectors);
44606@@ -2547,7 +2547,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
44607 static ssize_t
44608 errors_show(struct md_rdev *rdev, char *page)
44609 {
44610- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
44611+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
44612 }
44613
44614 static ssize_t
44615@@ -2556,7 +2556,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
44616 char *e;
44617 unsigned long n = simple_strtoul(buf, &e, 10);
44618 if (*buf && (*e == 0 || *e == '\n')) {
44619- atomic_set(&rdev->corrected_errors, n);
44620+ atomic_set_unchecked(&rdev->corrected_errors, n);
44621 return len;
44622 }
44623 return -EINVAL;
44624@@ -3000,8 +3000,8 @@ int md_rdev_init(struct md_rdev *rdev)
44625 rdev->sb_loaded = 0;
44626 rdev->bb_page = NULL;
44627 atomic_set(&rdev->nr_pending, 0);
44628- atomic_set(&rdev->read_errors, 0);
44629- atomic_set(&rdev->corrected_errors, 0);
44630+ atomic_set_unchecked(&rdev->read_errors, 0);
44631+ atomic_set_unchecked(&rdev->corrected_errors, 0);
44632
44633 INIT_LIST_HEAD(&rdev->same_set);
44634 init_waitqueue_head(&rdev->blocked_wait);
44635@@ -6855,7 +6855,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
44636
44637 spin_unlock(&pers_lock);
44638 seq_printf(seq, "\n");
44639- seq->poll_event = atomic_read(&md_event_count);
44640+ seq->poll_event = atomic_read_unchecked(&md_event_count);
44641 return 0;
44642 }
44643 if (v == (void*)2) {
44644@@ -6958,7 +6958,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
44645 return error;
44646
44647 seq = file->private_data;
44648- seq->poll_event = atomic_read(&md_event_count);
44649+ seq->poll_event = atomic_read_unchecked(&md_event_count);
44650 return error;
44651 }
44652
44653@@ -6975,7 +6975,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
44654 /* always allow read */
44655 mask = POLLIN | POLLRDNORM;
44656
44657- if (seq->poll_event != atomic_read(&md_event_count))
44658+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
44659 mask |= POLLERR | POLLPRI;
44660 return mask;
44661 }
44662@@ -7022,7 +7022,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
44663 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
44664 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
44665 (int)part_stat_read(&disk->part0, sectors[1]) -
44666- atomic_read(&disk->sync_io);
44667+ atomic_read_unchecked(&disk->sync_io);
44668 /* sync IO will cause sync_io to increase before the disk_stats
44669 * as sync_io is counted when a request starts, and
44670 * disk_stats is counted when it completes.
44671diff --git a/drivers/md/md.h b/drivers/md/md.h
44672index 03cec5b..0a658c1 100644
44673--- a/drivers/md/md.h
44674+++ b/drivers/md/md.h
44675@@ -94,13 +94,13 @@ struct md_rdev {
44676 * only maintained for arrays that
44677 * support hot removal
44678 */
44679- atomic_t read_errors; /* number of consecutive read errors that
44680+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
44681 * we have tried to ignore.
44682 */
44683 struct timespec last_read_error; /* monotonic time since our
44684 * last read error
44685 */
44686- atomic_t corrected_errors; /* number of corrected read errors,
44687+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
44688 * for reporting to userspace and storing
44689 * in superblock.
44690 */
44691@@ -448,7 +448,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
44692
44693 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
44694 {
44695- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44696+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
44697 }
44698
44699 struct md_personality
44700diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
44701index 786b689..ea8c956 100644
44702--- a/drivers/md/persistent-data/dm-space-map-metadata.c
44703+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
44704@@ -679,7 +679,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
44705 * Flick into a mode where all blocks get allocated in the new area.
44706 */
44707 smm->begin = old_len;
44708- memcpy(sm, &bootstrap_ops, sizeof(*sm));
44709+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
44710
44711 /*
44712 * Extend.
44713@@ -710,7 +710,7 @@ out:
44714 /*
44715 * Switch back to normal behaviour.
44716 */
44717- memcpy(sm, &ops, sizeof(*sm));
44718+ memcpy((void *)sm, &ops, sizeof(*sm));
44719 return r;
44720 }
44721
44722diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
44723index 3e6d115..ffecdeb 100644
44724--- a/drivers/md/persistent-data/dm-space-map.h
44725+++ b/drivers/md/persistent-data/dm-space-map.h
44726@@ -71,6 +71,7 @@ struct dm_space_map {
44727 dm_sm_threshold_fn fn,
44728 void *context);
44729 };
44730+typedef struct dm_space_map __no_const dm_space_map_no_const;
44731
44732 /*----------------------------------------------------------------*/
44733
44734diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
44735index 40b35be..a327e11 100644
44736--- a/drivers/md/raid1.c
44737+++ b/drivers/md/raid1.c
44738@@ -1931,7 +1931,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
44739 if (r1_sync_page_io(rdev, sect, s,
44740 bio->bi_io_vec[idx].bv_page,
44741 READ) != 0)
44742- atomic_add(s, &rdev->corrected_errors);
44743+ atomic_add_unchecked(s, &rdev->corrected_errors);
44744 }
44745 sectors -= s;
44746 sect += s;
44747@@ -2164,7 +2164,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
44748 !test_bit(Faulty, &rdev->flags)) {
44749 if (r1_sync_page_io(rdev, sect, s,
44750 conf->tmppage, READ)) {
44751- atomic_add(s, &rdev->corrected_errors);
44752+ atomic_add_unchecked(s, &rdev->corrected_errors);
44753 printk(KERN_INFO
44754 "md/raid1:%s: read error corrected "
44755 "(%d sectors at %llu on %s)\n",
44756diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
44757index 32e282f..5cec803 100644
44758--- a/drivers/md/raid10.c
44759+++ b/drivers/md/raid10.c
44760@@ -1944,7 +1944,7 @@ static void end_sync_read(struct bio *bio, int error)
44761 /* The write handler will notice the lack of
44762 * R10BIO_Uptodate and record any errors etc
44763 */
44764- atomic_add(r10_bio->sectors,
44765+ atomic_add_unchecked(r10_bio->sectors,
44766 &conf->mirrors[d].rdev->corrected_errors);
44767
44768 /* for reconstruct, we always reschedule after a read.
44769@@ -2301,7 +2301,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44770 {
44771 struct timespec cur_time_mon;
44772 unsigned long hours_since_last;
44773- unsigned int read_errors = atomic_read(&rdev->read_errors);
44774+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
44775
44776 ktime_get_ts(&cur_time_mon);
44777
44778@@ -2323,9 +2323,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
44779 * overflowing the shift of read_errors by hours_since_last.
44780 */
44781 if (hours_since_last >= 8 * sizeof(read_errors))
44782- atomic_set(&rdev->read_errors, 0);
44783+ atomic_set_unchecked(&rdev->read_errors, 0);
44784 else
44785- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
44786+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
44787 }
44788
44789 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
44790@@ -2379,8 +2379,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44791 return;
44792
44793 check_decay_read_errors(mddev, rdev);
44794- atomic_inc(&rdev->read_errors);
44795- if (atomic_read(&rdev->read_errors) > max_read_errors) {
44796+ atomic_inc_unchecked(&rdev->read_errors);
44797+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
44798 char b[BDEVNAME_SIZE];
44799 bdevname(rdev->bdev, b);
44800
44801@@ -2388,7 +2388,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44802 "md/raid10:%s: %s: Raid device exceeded "
44803 "read_error threshold [cur %d:max %d]\n",
44804 mdname(mddev), b,
44805- atomic_read(&rdev->read_errors), max_read_errors);
44806+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
44807 printk(KERN_NOTICE
44808 "md/raid10:%s: %s: Failing raid device\n",
44809 mdname(mddev), b);
44810@@ -2543,7 +2543,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
44811 sect +
44812 choose_data_offset(r10_bio, rdev)),
44813 bdevname(rdev->bdev, b));
44814- atomic_add(s, &rdev->corrected_errors);
44815+ atomic_add_unchecked(s, &rdev->corrected_errors);
44816 }
44817
44818 rdev_dec_pending(rdev, mddev);
44819diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
44820index 9c66e59..42a8eac 100644
44821--- a/drivers/md/raid5.c
44822+++ b/drivers/md/raid5.c
44823@@ -1730,6 +1730,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
44824 return 1;
44825 }
44826
44827+#ifdef CONFIG_GRKERNSEC_HIDESYM
44828+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
44829+#endif
44830+
44831 static int grow_stripes(struct r5conf *conf, int num)
44832 {
44833 struct kmem_cache *sc;
44834@@ -1741,7 +1745,11 @@ static int grow_stripes(struct r5conf *conf, int num)
44835 "raid%d-%s", conf->level, mdname(conf->mddev));
44836 else
44837 sprintf(conf->cache_name[0],
44838+#ifdef CONFIG_GRKERNSEC_HIDESYM
44839+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
44840+#else
44841 "raid%d-%p", conf->level, conf->mddev);
44842+#endif
44843 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
44844
44845 conf->active_name = 0;
44846@@ -2017,21 +2025,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
44847 mdname(conf->mddev), STRIPE_SECTORS,
44848 (unsigned long long)s,
44849 bdevname(rdev->bdev, b));
44850- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
44851+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
44852 clear_bit(R5_ReadError, &sh->dev[i].flags);
44853 clear_bit(R5_ReWrite, &sh->dev[i].flags);
44854 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
44855 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
44856
44857- if (atomic_read(&rdev->read_errors))
44858- atomic_set(&rdev->read_errors, 0);
44859+ if (atomic_read_unchecked(&rdev->read_errors))
44860+ atomic_set_unchecked(&rdev->read_errors, 0);
44861 } else {
44862 const char *bdn = bdevname(rdev->bdev, b);
44863 int retry = 0;
44864 int set_bad = 0;
44865
44866 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
44867- atomic_inc(&rdev->read_errors);
44868+ atomic_inc_unchecked(&rdev->read_errors);
44869 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
44870 printk_ratelimited(
44871 KERN_WARNING
44872@@ -2059,7 +2067,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
44873 mdname(conf->mddev),
44874 (unsigned long long)s,
44875 bdn);
44876- } else if (atomic_read(&rdev->read_errors)
44877+ } else if (atomic_read_unchecked(&rdev->read_errors)
44878 > conf->max_nr_stripes)
44879 printk(KERN_WARNING
44880 "md/raid:%s: Too many read errors, failing device %s.\n",
44881diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
44882index 983db75..ef9248c 100644
44883--- a/drivers/media/dvb-core/dvbdev.c
44884+++ b/drivers/media/dvb-core/dvbdev.c
44885@@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
44886 const struct dvb_device *template, void *priv, int type)
44887 {
44888 struct dvb_device *dvbdev;
44889- struct file_operations *dvbdevfops;
44890+ file_operations_no_const *dvbdevfops;
44891 struct device *clsdev;
44892 int minor;
44893 int id;
44894diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
44895index 6ad22b6..6e90e2a 100644
44896--- a/drivers/media/dvb-frontends/af9033.h
44897+++ b/drivers/media/dvb-frontends/af9033.h
44898@@ -96,6 +96,6 @@ struct af9033_ops {
44899 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
44900 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
44901 int onoff);
44902-};
44903+} __no_const;
44904
44905 #endif /* AF9033_H */
44906diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
44907index 9b6c3bb..baeb5c7 100644
44908--- a/drivers/media/dvb-frontends/dib3000.h
44909+++ b/drivers/media/dvb-frontends/dib3000.h
44910@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
44911 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
44912 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
44913 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
44914-};
44915+} __no_const;
44916
44917 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
44918 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
44919diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
44920index 1fea0e9..321ce8f 100644
44921--- a/drivers/media/dvb-frontends/dib7000p.h
44922+++ b/drivers/media/dvb-frontends/dib7000p.h
44923@@ -64,7 +64,7 @@ struct dib7000p_ops {
44924 int (*get_adc_power)(struct dvb_frontend *fe);
44925 int (*slave_reset)(struct dvb_frontend *fe);
44926 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
44927-};
44928+} __no_const;
44929
44930 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
44931 void *dib7000p_attach(struct dib7000p_ops *ops);
44932diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
44933index 84cc103..5780c54 100644
44934--- a/drivers/media/dvb-frontends/dib8000.h
44935+++ b/drivers/media/dvb-frontends/dib8000.h
44936@@ -61,7 +61,7 @@ struct dib8000_ops {
44937 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
44938 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
44939 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
44940-};
44941+} __no_const;
44942
44943 #if IS_ENABLED(CONFIG_DVB_DIB8000)
44944 void *dib8000_attach(struct dib8000_ops *ops);
44945diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
44946index ce27e6d..b70435a 100644
44947--- a/drivers/media/pci/cx88/cx88-video.c
44948+++ b/drivers/media/pci/cx88/cx88-video.c
44949@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
44950
44951 /* ------------------------------------------------------------------ */
44952
44953-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44954-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44955-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44956+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44957+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44958+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
44959
44960 module_param_array(video_nr, int, NULL, 0444);
44961 module_param_array(vbi_nr, int, NULL, 0444);
44962diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
44963index 802642d..5534900 100644
44964--- a/drivers/media/pci/ivtv/ivtv-driver.c
44965+++ b/drivers/media/pci/ivtv/ivtv-driver.c
44966@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
44967 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
44968
44969 /* ivtv instance counter */
44970-static atomic_t ivtv_instance = ATOMIC_INIT(0);
44971+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
44972
44973 /* Parameter declarations */
44974 static int cardtype[IVTV_MAX_CARDS];
44975diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
44976index 8cbe6b4..ea3601c 100644
44977--- a/drivers/media/pci/solo6x10/solo6x10-core.c
44978+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
44979@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
44980
44981 static int solo_sysfs_init(struct solo_dev *solo_dev)
44982 {
44983- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
44984+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
44985 struct device *dev = &solo_dev->dev;
44986 const char *driver;
44987 int i;
44988diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
44989index c7141f2..5301fec 100644
44990--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
44991+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
44992@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
44993
44994 int solo_g723_init(struct solo_dev *solo_dev)
44995 {
44996- static struct snd_device_ops ops = { NULL };
44997+ static struct snd_device_ops ops = { };
44998 struct snd_card *card;
44999 struct snd_kcontrol_new kctl;
45000 char name[32];
45001diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45002index 8c84846..27b4f83 100644
45003--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
45004+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45005@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
45006
45007 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
45008 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
45009- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
45010+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
45011 if (p2m_id < 0)
45012 p2m_id = -p2m_id;
45013 }
45014diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
45015index 72017b7..dd37ae6 100644
45016--- a/drivers/media/pci/solo6x10/solo6x10.h
45017+++ b/drivers/media/pci/solo6x10/solo6x10.h
45018@@ -219,7 +219,7 @@ struct solo_dev {
45019
45020 /* P2M DMA Engine */
45021 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
45022- atomic_t p2m_count;
45023+ atomic_unchecked_t p2m_count;
45024 int p2m_jiffies;
45025 unsigned int p2m_timeouts;
45026
45027diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
45028index 63f0b64..a017c1c 100644
45029--- a/drivers/media/pci/tw68/tw68-core.c
45030+++ b/drivers/media/pci/tw68/tw68-core.c
45031@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
45032 module_param_array(card, int, NULL, 0444);
45033 MODULE_PARM_DESC(card, "card type");
45034
45035-static atomic_t tw68_instance = ATOMIC_INIT(0);
45036+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
45037
45038 /* ------------------------------------------------------------------ */
45039
45040diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
45041index 64ab6fb..ef4a8b9 100644
45042--- a/drivers/media/platform/omap/omap_vout.c
45043+++ b/drivers/media/platform/omap/omap_vout.c
45044@@ -63,7 +63,6 @@ enum omap_vout_channels {
45045 OMAP_VIDEO2,
45046 };
45047
45048-static struct videobuf_queue_ops video_vbq_ops;
45049 /* Variables configurable through module params*/
45050 static u32 video1_numbuffers = 3;
45051 static u32 video2_numbuffers = 3;
45052@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
45053 {
45054 struct videobuf_queue *q;
45055 struct omap_vout_device *vout = NULL;
45056+ static struct videobuf_queue_ops video_vbq_ops = {
45057+ .buf_setup = omap_vout_buffer_setup,
45058+ .buf_prepare = omap_vout_buffer_prepare,
45059+ .buf_release = omap_vout_buffer_release,
45060+ .buf_queue = omap_vout_buffer_queue,
45061+ };
45062
45063 vout = video_drvdata(file);
45064 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
45065@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
45066 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
45067
45068 q = &vout->vbq;
45069- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
45070- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
45071- video_vbq_ops.buf_release = omap_vout_buffer_release;
45072- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
45073 spin_lock_init(&vout->vbq_lock);
45074
45075 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
45076diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
45077index fb2acc5..a2fcbdc4 100644
45078--- a/drivers/media/platform/s5p-tv/mixer.h
45079+++ b/drivers/media/platform/s5p-tv/mixer.h
45080@@ -156,7 +156,7 @@ struct mxr_layer {
45081 /** layer index (unique identifier) */
45082 int idx;
45083 /** callbacks for layer methods */
45084- struct mxr_layer_ops ops;
45085+ struct mxr_layer_ops *ops;
45086 /** format array */
45087 const struct mxr_format **fmt_array;
45088 /** size of format array */
45089diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45090index 74344c7..a39e70e 100644
45091--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45092+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45093@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
45094 {
45095 struct mxr_layer *layer;
45096 int ret;
45097- struct mxr_layer_ops ops = {
45098+ static struct mxr_layer_ops ops = {
45099 .release = mxr_graph_layer_release,
45100 .buffer_set = mxr_graph_buffer_set,
45101 .stream_set = mxr_graph_stream_set,
45102diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
45103index b713403..53cb5ad 100644
45104--- a/drivers/media/platform/s5p-tv/mixer_reg.c
45105+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
45106@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
45107 layer->update_buf = next;
45108 }
45109
45110- layer->ops.buffer_set(layer, layer->update_buf);
45111+ layer->ops->buffer_set(layer, layer->update_buf);
45112
45113 if (done && done != layer->shadow_buf)
45114 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
45115diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
45116index b4d2696..91df48e 100644
45117--- a/drivers/media/platform/s5p-tv/mixer_video.c
45118+++ b/drivers/media/platform/s5p-tv/mixer_video.c
45119@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
45120 layer->geo.src.height = layer->geo.src.full_height;
45121
45122 mxr_geometry_dump(mdev, &layer->geo);
45123- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45124+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45125 mxr_geometry_dump(mdev, &layer->geo);
45126 }
45127
45128@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
45129 layer->geo.dst.full_width = mbus_fmt.width;
45130 layer->geo.dst.full_height = mbus_fmt.height;
45131 layer->geo.dst.field = mbus_fmt.field;
45132- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45133+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45134
45135 mxr_geometry_dump(mdev, &layer->geo);
45136 }
45137@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
45138 /* set source size to highest accepted value */
45139 geo->src.full_width = max(geo->dst.full_width, pix->width);
45140 geo->src.full_height = max(geo->dst.full_height, pix->height);
45141- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45142+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45143 mxr_geometry_dump(mdev, &layer->geo);
45144 /* set cropping to total visible screen */
45145 geo->src.width = pix->width;
45146@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
45147 geo->src.x_offset = 0;
45148 geo->src.y_offset = 0;
45149 /* assure consistency of geometry */
45150- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45151+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45152 mxr_geometry_dump(mdev, &layer->geo);
45153 /* set full size to lowest possible value */
45154 geo->src.full_width = 0;
45155 geo->src.full_height = 0;
45156- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45157+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45158 mxr_geometry_dump(mdev, &layer->geo);
45159
45160 /* returning results */
45161@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
45162 target->width = s->r.width;
45163 target->height = s->r.height;
45164
45165- layer->ops.fix_geometry(layer, stage, s->flags);
45166+ layer->ops->fix_geometry(layer, stage, s->flags);
45167
45168 /* retrieve update selection rectangle */
45169 res.left = target->x_offset;
45170@@ -954,13 +954,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
45171 mxr_output_get(mdev);
45172
45173 mxr_layer_update_output(layer);
45174- layer->ops.format_set(layer);
45175+ layer->ops->format_set(layer);
45176 /* enabling layer in hardware */
45177 spin_lock_irqsave(&layer->enq_slock, flags);
45178 layer->state = MXR_LAYER_STREAMING;
45179 spin_unlock_irqrestore(&layer->enq_slock, flags);
45180
45181- layer->ops.stream_set(layer, MXR_ENABLE);
45182+ layer->ops->stream_set(layer, MXR_ENABLE);
45183 mxr_streamer_get(mdev);
45184
45185 return 0;
45186@@ -1030,7 +1030,7 @@ static void stop_streaming(struct vb2_queue *vq)
45187 spin_unlock_irqrestore(&layer->enq_slock, flags);
45188
45189 /* disabling layer in hardware */
45190- layer->ops.stream_set(layer, MXR_DISABLE);
45191+ layer->ops->stream_set(layer, MXR_DISABLE);
45192 /* remove one streamer */
45193 mxr_streamer_put(mdev);
45194 /* allow changes in output configuration */
45195@@ -1068,8 +1068,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
45196
45197 void mxr_layer_release(struct mxr_layer *layer)
45198 {
45199- if (layer->ops.release)
45200- layer->ops.release(layer);
45201+ if (layer->ops->release)
45202+ layer->ops->release(layer);
45203 }
45204
45205 void mxr_base_layer_release(struct mxr_layer *layer)
45206@@ -1095,7 +1095,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
45207
45208 layer->mdev = mdev;
45209 layer->idx = idx;
45210- layer->ops = *ops;
45211+ layer->ops = ops;
45212
45213 spin_lock_init(&layer->enq_slock);
45214 INIT_LIST_HEAD(&layer->enq_list);
45215diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45216index c9388c4..ce71ece 100644
45217--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45218+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45219@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
45220 {
45221 struct mxr_layer *layer;
45222 int ret;
45223- struct mxr_layer_ops ops = {
45224+ static struct mxr_layer_ops ops = {
45225 .release = mxr_vp_layer_release,
45226 .buffer_set = mxr_vp_buffer_set,
45227 .stream_set = mxr_vp_stream_set,
45228diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
45229index 82affae..42833ec 100644
45230--- a/drivers/media/radio/radio-cadet.c
45231+++ b/drivers/media/radio/radio-cadet.c
45232@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45233 unsigned char readbuf[RDS_BUFFER];
45234 int i = 0;
45235
45236+ if (count > RDS_BUFFER)
45237+ return -EFAULT;
45238 mutex_lock(&dev->lock);
45239 if (dev->rdsstat == 0)
45240 cadet_start_rds(dev);
45241@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45242 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
45243 mutex_unlock(&dev->lock);
45244
45245- if (i && copy_to_user(data, readbuf, i))
45246- return -EFAULT;
45247+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
45248+ i = -EFAULT;
45249+
45250 return i;
45251 }
45252
45253diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
45254index 5236035..c622c74 100644
45255--- a/drivers/media/radio/radio-maxiradio.c
45256+++ b/drivers/media/radio/radio-maxiradio.c
45257@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
45258 /* TEA5757 pin mappings */
45259 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
45260
45261-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
45262+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
45263
45264 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
45265 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
45266diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
45267index 050b3bb..79f62b9 100644
45268--- a/drivers/media/radio/radio-shark.c
45269+++ b/drivers/media/radio/radio-shark.c
45270@@ -79,7 +79,7 @@ struct shark_device {
45271 u32 last_val;
45272 };
45273
45274-static atomic_t shark_instance = ATOMIC_INIT(0);
45275+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45276
45277 static void shark_write_val(struct snd_tea575x *tea, u32 val)
45278 {
45279diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
45280index 8654e0d..0608a64 100644
45281--- a/drivers/media/radio/radio-shark2.c
45282+++ b/drivers/media/radio/radio-shark2.c
45283@@ -74,7 +74,7 @@ struct shark_device {
45284 u8 *transfer_buffer;
45285 };
45286
45287-static atomic_t shark_instance = ATOMIC_INIT(0);
45288+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45289
45290 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
45291 {
45292diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
45293index 633022b..7f10754 100644
45294--- a/drivers/media/radio/radio-si476x.c
45295+++ b/drivers/media/radio/radio-si476x.c
45296@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
45297 struct si476x_radio *radio;
45298 struct v4l2_ctrl *ctrl;
45299
45300- static atomic_t instance = ATOMIC_INIT(0);
45301+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
45302
45303 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
45304 if (!radio)
45305diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45306index 9fd1527..8927230 100644
45307--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
45308+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45309@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
45310
45311 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
45312 {
45313- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
45314- char result[64];
45315- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
45316- sizeof(result), 0);
45317+ char *buf;
45318+ char *result;
45319+ int retval;
45320+
45321+ buf = kmalloc(2, GFP_KERNEL);
45322+ if (buf == NULL)
45323+ return -ENOMEM;
45324+ result = kmalloc(64, GFP_KERNEL);
45325+ if (result == NULL) {
45326+ kfree(buf);
45327+ return -ENOMEM;
45328+ }
45329+
45330+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
45331+ buf[1] = enable ? 1 : 0;
45332+
45333+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
45334+
45335+ kfree(buf);
45336+ kfree(result);
45337+ return retval;
45338 }
45339
45340 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
45341 {
45342- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
45343- char state[3];
45344- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
45345+ char *buf;
45346+ char *state;
45347+ int retval;
45348+
45349+ buf = kmalloc(2, GFP_KERNEL);
45350+ if (buf == NULL)
45351+ return -ENOMEM;
45352+ state = kmalloc(3, GFP_KERNEL);
45353+ if (state == NULL) {
45354+ kfree(buf);
45355+ return -ENOMEM;
45356+ }
45357+
45358+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
45359+ buf[1] = enable ? 1 : 0;
45360+
45361+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
45362+
45363+ kfree(buf);
45364+ kfree(state);
45365+ return retval;
45366 }
45367
45368 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45369 {
45370- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
45371- char state[3];
45372+ char *query;
45373+ char *state;
45374 int ret;
45375+ query = kmalloc(1, GFP_KERNEL);
45376+ if (query == NULL)
45377+ return -ENOMEM;
45378+ state = kmalloc(3, GFP_KERNEL);
45379+ if (state == NULL) {
45380+ kfree(query);
45381+ return -ENOMEM;
45382+ }
45383+
45384+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
45385
45386 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
45387
45388- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
45389- sizeof(state), 0);
45390+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
45391 if (ret < 0) {
45392 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
45393 "state info\n");
45394@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
45395
45396 /* Copy this pointer as we are gonna need it in the release phase */
45397 cinergyt2_usb_device = adap->dev;
45398-
45399+ kfree(query);
45400+ kfree(state);
45401 return 0;
45402 }
45403
45404@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
45405 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45406 {
45407 struct cinergyt2_state *st = d->priv;
45408- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
45409+ u8 *key, *cmd;
45410 int i;
45411
45412+ cmd = kmalloc(1, GFP_KERNEL);
45413+ if (cmd == NULL)
45414+ return -EINVAL;
45415+ key = kzalloc(5, GFP_KERNEL);
45416+ if (key == NULL) {
45417+ kfree(cmd);
45418+ return -EINVAL;
45419+ }
45420+
45421+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
45422+
45423 *state = REMOTE_NO_KEY_PRESSED;
45424
45425- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
45426+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
45427 if (key[4] == 0xff) {
45428 /* key repeat */
45429 st->rc_counter++;
45430@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45431 *event = d->last_event;
45432 deb_rc("repeat key, event %x\n",
45433 *event);
45434- return 0;
45435+ goto out;
45436 }
45437 }
45438 deb_rc("repeated key (non repeatable)\n");
45439 }
45440- return 0;
45441+ goto out;
45442 }
45443
45444 /* hack to pass checksum on the custom field */
45445@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
45446
45447 deb_rc("key: %*ph\n", 5, key);
45448 }
45449+out:
45450+ kfree(cmd);
45451+ kfree(key);
45452 return 0;
45453 }
45454
45455diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45456index c890fe4..f9b2ae6 100644
45457--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45458+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
45459@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
45460 fe_status_t *status)
45461 {
45462 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45463- struct dvbt_get_status_msg result;
45464- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45465+ struct dvbt_get_status_msg *result;
45466+ u8 *cmd;
45467 int ret;
45468
45469- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
45470- sizeof(result), 0);
45471+ cmd = kmalloc(1, GFP_KERNEL);
45472+ if (cmd == NULL)
45473+ return -ENOMEM;
45474+ result = kmalloc(sizeof(*result), GFP_KERNEL);
45475+ if (result == NULL) {
45476+ kfree(cmd);
45477+ return -ENOMEM;
45478+ }
45479+
45480+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45481+
45482+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
45483+ sizeof(*result), 0);
45484 if (ret < 0)
45485- return ret;
45486+ goto out;
45487
45488 *status = 0;
45489
45490- if (0xffff - le16_to_cpu(result.gain) > 30)
45491+ if (0xffff - le16_to_cpu(result->gain) > 30)
45492 *status |= FE_HAS_SIGNAL;
45493- if (result.lock_bits & (1 << 6))
45494+ if (result->lock_bits & (1 << 6))
45495 *status |= FE_HAS_LOCK;
45496- if (result.lock_bits & (1 << 5))
45497+ if (result->lock_bits & (1 << 5))
45498 *status |= FE_HAS_SYNC;
45499- if (result.lock_bits & (1 << 4))
45500+ if (result->lock_bits & (1 << 4))
45501 *status |= FE_HAS_CARRIER;
45502- if (result.lock_bits & (1 << 1))
45503+ if (result->lock_bits & (1 << 1))
45504 *status |= FE_HAS_VITERBI;
45505
45506 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
45507 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
45508 *status &= ~FE_HAS_LOCK;
45509
45510- return 0;
45511+out:
45512+ kfree(cmd);
45513+ kfree(result);
45514+ return ret;
45515 }
45516
45517 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
45518 {
45519 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45520- struct dvbt_get_status_msg status;
45521- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45522+ struct dvbt_get_status_msg *status;
45523+ char *cmd;
45524 int ret;
45525
45526- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45527- sizeof(status), 0);
45528+ cmd = kmalloc(1, GFP_KERNEL);
45529+ if (cmd == NULL)
45530+ return -ENOMEM;
45531+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45532+ if (status == NULL) {
45533+ kfree(cmd);
45534+ return -ENOMEM;
45535+ }
45536+
45537+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45538+
45539+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45540+ sizeof(*status), 0);
45541 if (ret < 0)
45542- return ret;
45543+ goto out;
45544
45545- *ber = le32_to_cpu(status.viterbi_error_rate);
45546+ *ber = le32_to_cpu(status->viterbi_error_rate);
45547+out:
45548+ kfree(cmd);
45549+ kfree(status);
45550 return 0;
45551 }
45552
45553 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
45554 {
45555 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45556- struct dvbt_get_status_msg status;
45557- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45558+ struct dvbt_get_status_msg *status;
45559+ u8 *cmd;
45560 int ret;
45561
45562- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
45563- sizeof(status), 0);
45564+ cmd = kmalloc(1, GFP_KERNEL);
45565+ if (cmd == NULL)
45566+ return -ENOMEM;
45567+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45568+ if (status == NULL) {
45569+ kfree(cmd);
45570+ return -ENOMEM;
45571+ }
45572+
45573+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45574+
45575+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
45576+ sizeof(*status), 0);
45577 if (ret < 0) {
45578 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
45579 ret);
45580- return ret;
45581+ goto out;
45582 }
45583- *unc = le32_to_cpu(status.uncorrected_block_count);
45584- return 0;
45585+ *unc = le32_to_cpu(status->uncorrected_block_count);
45586+
45587+out:
45588+ kfree(cmd);
45589+ kfree(status);
45590+ return ret;
45591 }
45592
45593 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
45594 u16 *strength)
45595 {
45596 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45597- struct dvbt_get_status_msg status;
45598- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45599+ struct dvbt_get_status_msg *status;
45600+ char *cmd;
45601 int ret;
45602
45603- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45604- sizeof(status), 0);
45605+ cmd = kmalloc(1, GFP_KERNEL);
45606+ if (cmd == NULL)
45607+ return -ENOMEM;
45608+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45609+ if (status == NULL) {
45610+ kfree(cmd);
45611+ return -ENOMEM;
45612+ }
45613+
45614+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45615+
45616+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45617+ sizeof(*status), 0);
45618 if (ret < 0) {
45619 err("cinergyt2_fe_read_signal_strength() Failed!"
45620 " (Error=%d)\n", ret);
45621- return ret;
45622+ goto out;
45623 }
45624- *strength = (0xffff - le16_to_cpu(status.gain));
45625+ *strength = (0xffff - le16_to_cpu(status->gain));
45626+
45627+out:
45628+ kfree(cmd);
45629+ kfree(status);
45630 return 0;
45631 }
45632
45633 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
45634 {
45635 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45636- struct dvbt_get_status_msg status;
45637- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
45638+ struct dvbt_get_status_msg *status;
45639+ char *cmd;
45640 int ret;
45641
45642- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
45643- sizeof(status), 0);
45644+ cmd = kmalloc(1, GFP_KERNEL);
45645+ if (cmd == NULL)
45646+ return -ENOMEM;
45647+ status = kmalloc(sizeof(*status), GFP_KERNEL);
45648+ if (status == NULL) {
45649+ kfree(cmd);
45650+ return -ENOMEM;
45651+ }
45652+
45653+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
45654+
45655+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
45656+ sizeof(*status), 0);
45657 if (ret < 0) {
45658 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
45659- return ret;
45660+ goto out;
45661 }
45662- *snr = (status.snr << 8) | status.snr;
45663- return 0;
45664+ *snr = (status->snr << 8) | status->snr;
45665+
45666+out:
45667+ kfree(cmd);
45668+ kfree(status);
45669+ return ret;
45670 }
45671
45672 static int cinergyt2_fe_init(struct dvb_frontend *fe)
45673@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
45674 {
45675 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
45676 struct cinergyt2_fe_state *state = fe->demodulator_priv;
45677- struct dvbt_set_parameters_msg param;
45678- char result[2];
45679+ struct dvbt_set_parameters_msg *param;
45680+ char *result;
45681 int err;
45682
45683- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45684- param.tps = cpu_to_le16(compute_tps(fep));
45685- param.freq = cpu_to_le32(fep->frequency / 1000);
45686- param.flags = 0;
45687+ result = kmalloc(2, GFP_KERNEL);
45688+ if (result == NULL)
45689+ return -ENOMEM;
45690+ param = kmalloc(sizeof(*param), GFP_KERNEL);
45691+ if (param == NULL) {
45692+ kfree(result);
45693+ return -ENOMEM;
45694+ }
45695+
45696+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
45697+ param->tps = cpu_to_le16(compute_tps(fep));
45698+ param->freq = cpu_to_le32(fep->frequency / 1000);
45699+ param->flags = 0;
45700
45701 switch (fep->bandwidth_hz) {
45702 default:
45703 case 8000000:
45704- param.bandwidth = 8;
45705+ param->bandwidth = 8;
45706 break;
45707 case 7000000:
45708- param.bandwidth = 7;
45709+ param->bandwidth = 7;
45710 break;
45711 case 6000000:
45712- param.bandwidth = 6;
45713+ param->bandwidth = 6;
45714 break;
45715 }
45716
45717 err = dvb_usb_generic_rw(state->d,
45718- (char *)&param, sizeof(param),
45719- result, sizeof(result), 0);
45720+ (char *)param, sizeof(*param),
45721+ result, 2, 0);
45722 if (err < 0)
45723 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
45724
45725- return (err < 0) ? err : 0;
45726+ kfree(result);
45727+ kfree(param);
45728+ return err;
45729 }
45730
45731 static void cinergyt2_fe_release(struct dvb_frontend *fe)
45732diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45733index 733a7ff..f8b52e3 100644
45734--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45735+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
45736@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
45737
45738 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
45739 {
45740- struct hexline hx;
45741- u8 reset;
45742+ struct hexline *hx;
45743+ u8 *reset;
45744 int ret,pos=0;
45745
45746+ reset = kmalloc(1, GFP_KERNEL);
45747+ if (reset == NULL)
45748+ return -ENOMEM;
45749+
45750+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
45751+ if (hx == NULL) {
45752+ kfree(reset);
45753+ return -ENOMEM;
45754+ }
45755+
45756 /* stop the CPU */
45757- reset = 1;
45758- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
45759+ reset[0] = 1;
45760+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
45761 err("could not stop the USB controller CPU.");
45762
45763- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
45764- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
45765- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
45766+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
45767+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
45768+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
45769
45770- if (ret != hx.len) {
45771+ if (ret != hx->len) {
45772 err("error while transferring firmware "
45773 "(transferred size: %d, block size: %d)",
45774- ret,hx.len);
45775+ ret,hx->len);
45776 ret = -EINVAL;
45777 break;
45778 }
45779 }
45780 if (ret < 0) {
45781 err("firmware download failed at %d with %d",pos,ret);
45782+ kfree(reset);
45783+ kfree(hx);
45784 return ret;
45785 }
45786
45787 if (ret == 0) {
45788 /* restart the CPU */
45789- reset = 0;
45790- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
45791+ reset[0] = 0;
45792+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
45793 err("could not restart the USB controller CPU.");
45794 ret = -EINVAL;
45795 }
45796 } else
45797 ret = -EIO;
45798
45799+ kfree(reset);
45800+ kfree(hx);
45801+
45802 return ret;
45803 }
45804 EXPORT_SYMBOL(usb_cypress_load_firmware);
45805diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
45806index 1a3df10..57997a5 100644
45807--- a/drivers/media/usb/dvb-usb/dw2102.c
45808+++ b/drivers/media/usb/dvb-usb/dw2102.c
45809@@ -118,7 +118,7 @@ struct su3000_state {
45810
45811 struct s6x0_state {
45812 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
45813-};
45814+} __no_const;
45815
45816 /* debug */
45817 static int dvb_usb_dw2102_debug;
45818diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
45819index 6b0b8b6b..4038398 100644
45820--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
45821+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
45822@@ -87,8 +87,11 @@ struct technisat_usb2_state {
45823 static int technisat_usb2_i2c_access(struct usb_device *udev,
45824 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
45825 {
45826- u8 b[64];
45827- int ret, actual_length;
45828+ u8 *b = kmalloc(64, GFP_KERNEL);
45829+ int ret, actual_length, error = 0;
45830+
45831+ if (b == NULL)
45832+ return -ENOMEM;
45833
45834 deb_i2c("i2c-access: %02x, tx: ", device_addr);
45835 debug_dump(tx, txlen, deb_i2c);
45836@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45837
45838 if (ret < 0) {
45839 err("i2c-error: out failed %02x = %d", device_addr, ret);
45840- return -ENODEV;
45841+ error = -ENODEV;
45842+ goto out;
45843 }
45844
45845 ret = usb_bulk_msg(udev,
45846@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45847 b, 64, &actual_length, 1000);
45848 if (ret < 0) {
45849 err("i2c-error: in failed %02x = %d", device_addr, ret);
45850- return -ENODEV;
45851+ error = -ENODEV;
45852+ goto out;
45853 }
45854
45855 if (b[0] != I2C_STATUS_OK) {
45856@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45857 /* handle tuner-i2c-nak */
45858 if (!(b[0] == I2C_STATUS_NAK &&
45859 device_addr == 0x60
45860- /* && device_is_technisat_usb2 */))
45861- return -ENODEV;
45862+ /* && device_is_technisat_usb2 */)) {
45863+ error = -ENODEV;
45864+ goto out;
45865+ }
45866 }
45867
45868 deb_i2c("status: %d, ", b[0]);
45869@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
45870
45871 deb_i2c("\n");
45872
45873- return 0;
45874+out:
45875+ kfree(b);
45876+ return error;
45877 }
45878
45879 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
45880@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
45881 {
45882 int ret;
45883
45884- u8 led[8] = {
45885- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
45886- 0
45887- };
45888+ u8 *led = kzalloc(8, GFP_KERNEL);
45889+
45890+ if (led == NULL)
45891+ return -ENOMEM;
45892
45893 if (disable_led_control && state != TECH_LED_OFF)
45894 return 0;
45895
45896+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
45897+
45898 switch (state) {
45899 case TECH_LED_ON:
45900 led[1] = 0x82;
45901@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
45902 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
45903 USB_TYPE_VENDOR | USB_DIR_OUT,
45904 0, 0,
45905- led, sizeof(led), 500);
45906+ led, 8, 500);
45907
45908 mutex_unlock(&d->i2c_mutex);
45909+
45910+ kfree(led);
45911+
45912 return ret;
45913 }
45914
45915 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
45916 {
45917 int ret;
45918- u8 b = 0;
45919+ u8 *b = kzalloc(1, GFP_KERNEL);
45920+
45921+ if (b == NULL)
45922+ return -ENOMEM;
45923
45924 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
45925 return -EAGAIN;
45926@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
45927 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
45928 USB_TYPE_VENDOR | USB_DIR_OUT,
45929 (red << 8) | green, 0,
45930- &b, 1, 500);
45931+ b, 1, 500);
45932
45933 mutex_unlock(&d->i2c_mutex);
45934
45935+ kfree(b);
45936+
45937 return ret;
45938 }
45939
45940@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
45941 struct dvb_usb_device_description **desc, int *cold)
45942 {
45943 int ret;
45944- u8 version[3];
45945+ u8 *version = kmalloc(3, GFP_KERNEL);
45946
45947 /* first select the interface */
45948 if (usb_set_interface(udev, 0, 1) != 0)
45949@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
45950
45951 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
45952
45953+ if (version == NULL)
45954+ return 0;
45955+
45956 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
45957 GET_VERSION_INFO_VENDOR_REQUEST,
45958 USB_TYPE_VENDOR | USB_DIR_IN,
45959 0, 0,
45960- version, sizeof(version), 500);
45961+ version, 3, 500);
45962
45963 if (ret < 0)
45964 *cold = 1;
45965@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
45966 *cold = 0;
45967 }
45968
45969+ kfree(version);
45970+
45971 return 0;
45972 }
45973
45974@@ -591,10 +615,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
45975
45976 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
45977 {
45978- u8 buf[62], *b;
45979+ u8 *buf, *b;
45980 int ret;
45981 struct ir_raw_event ev;
45982
45983+ buf = kmalloc(62, GFP_KERNEL);
45984+
45985+ if (buf == NULL)
45986+ return -ENOMEM;
45987+
45988 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
45989 buf[1] = 0x08;
45990 buf[2] = 0x8f;
45991@@ -617,16 +646,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
45992 GET_IR_DATA_VENDOR_REQUEST,
45993 USB_TYPE_VENDOR | USB_DIR_IN,
45994 0x8080, 0,
45995- buf, sizeof(buf), 500);
45996+ buf, 62, 500);
45997
45998 unlock:
45999 mutex_unlock(&d->i2c_mutex);
46000
46001- if (ret < 0)
46002+ if (ret < 0) {
46003+ kfree(buf);
46004 return ret;
46005+ }
46006
46007- if (ret == 1)
46008+ if (ret == 1) {
46009+ kfree(buf);
46010 return 0; /* no key pressed */
46011+ }
46012
46013 /* decoding */
46014 b = buf+1;
46015@@ -653,6 +686,8 @@ unlock:
46016
46017 ir_raw_event_handle(d->rc_dev);
46018
46019+ kfree(buf);
46020+
46021 return 1;
46022 }
46023
46024diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46025index e502a5f..2a27f40 100644
46026--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46027+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46028@@ -427,7 +427,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46029 * by passing a very big num_planes value */
46030 uplane = compat_alloc_user_space(num_planes *
46031 sizeof(struct v4l2_plane));
46032- kp->m.planes = (__force struct v4l2_plane *)uplane;
46033+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
46034
46035 while (--num_planes >= 0) {
46036 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
46037@@ -498,7 +498,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46038 if (num_planes == 0)
46039 return 0;
46040
46041- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
46042+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
46043 if (get_user(p, &up->m.planes))
46044 return -EFAULT;
46045 uplane32 = compat_ptr(p);
46046@@ -562,7 +562,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
46047 get_user(kp->flags, &up->flags) ||
46048 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
46049 return -EFAULT;
46050- kp->base = (__force void *)compat_ptr(tmp);
46051+ kp->base = (__force_kernel void *)compat_ptr(tmp);
46052 return 0;
46053 }
46054
46055@@ -667,7 +667,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46056 n * sizeof(struct v4l2_ext_control32)))
46057 return -EFAULT;
46058 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
46059- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
46060+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
46061 while (--n >= 0) {
46062 u32 id;
46063
46064@@ -694,7 +694,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46065 {
46066 struct v4l2_ext_control32 __user *ucontrols;
46067 struct v4l2_ext_control __user *kcontrols =
46068- (__force struct v4l2_ext_control __user *)kp->controls;
46069+ (struct v4l2_ext_control __force_user *)kp->controls;
46070 int n = kp->count;
46071 compat_caddr_t p;
46072
46073@@ -778,7 +778,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
46074 get_user(tmp, &up->edid) ||
46075 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
46076 return -EFAULT;
46077- kp->edid = (__force u8 *)compat_ptr(tmp);
46078+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
46079 return 0;
46080 }
46081
46082diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
46083index 015f92a..59e311e 100644
46084--- a/drivers/media/v4l2-core/v4l2-device.c
46085+++ b/drivers/media/v4l2-core/v4l2-device.c
46086@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
46087 EXPORT_SYMBOL_GPL(v4l2_device_put);
46088
46089 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
46090- atomic_t *instance)
46091+ atomic_unchecked_t *instance)
46092 {
46093- int num = atomic_inc_return(instance) - 1;
46094+ int num = atomic_inc_return_unchecked(instance) - 1;
46095 int len = strlen(basename);
46096
46097 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
46098diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
46099index 9ccb19a..d131468 100644
46100--- a/drivers/media/v4l2-core/v4l2-ioctl.c
46101+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
46102@@ -2142,7 +2142,8 @@ struct v4l2_ioctl_info {
46103 struct file *file, void *fh, void *p);
46104 } u;
46105 void (*debug)(const void *arg, bool write_only);
46106-};
46107+} __do_const;
46108+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
46109
46110 /* This control needs a priority check */
46111 #define INFO_FL_PRIO (1 << 0)
46112@@ -2326,7 +2327,7 @@ static long __video_do_ioctl(struct file *file,
46113 struct video_device *vfd = video_devdata(file);
46114 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
46115 bool write_only = false;
46116- struct v4l2_ioctl_info default_info;
46117+ v4l2_ioctl_info_no_const default_info;
46118 const struct v4l2_ioctl_info *info;
46119 void *fh = file->private_data;
46120 struct v4l2_fh *vfh = NULL;
46121@@ -2413,7 +2414,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46122 ret = -EINVAL;
46123 break;
46124 }
46125- *user_ptr = (void __user *)buf->m.planes;
46126+ *user_ptr = (void __force_user *)buf->m.planes;
46127 *kernel_ptr = (void **)&buf->m.planes;
46128 *array_size = sizeof(struct v4l2_plane) * buf->length;
46129 ret = 1;
46130@@ -2430,7 +2431,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46131 ret = -EINVAL;
46132 break;
46133 }
46134- *user_ptr = (void __user *)edid->edid;
46135+ *user_ptr = (void __force_user *)edid->edid;
46136 *kernel_ptr = (void **)&edid->edid;
46137 *array_size = edid->blocks * 128;
46138 ret = 1;
46139@@ -2448,7 +2449,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46140 ret = -EINVAL;
46141 break;
46142 }
46143- *user_ptr = (void __user *)ctrls->controls;
46144+ *user_ptr = (void __force_user *)ctrls->controls;
46145 *kernel_ptr = (void **)&ctrls->controls;
46146 *array_size = sizeof(struct v4l2_ext_control)
46147 * ctrls->count;
46148@@ -2549,7 +2550,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
46149 }
46150
46151 if (has_array_args) {
46152- *kernel_ptr = (void __force *)user_ptr;
46153+ *kernel_ptr = (void __force_kernel *)user_ptr;
46154 if (copy_to_user(user_ptr, mbuf, array_size))
46155 err = -EFAULT;
46156 goto out_array_args;
46157diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
46158index 187f836..679544b 100644
46159--- a/drivers/message/fusion/mptbase.c
46160+++ b/drivers/message/fusion/mptbase.c
46161@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46162 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
46163 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
46164
46165+#ifdef CONFIG_GRKERNSEC_HIDESYM
46166+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
46167+#else
46168 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
46169 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
46170+#endif
46171+
46172 /*
46173 * Rounding UP to nearest 4-kB boundary here...
46174 */
46175@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46176 ioc->facts.GlobalCredits);
46177
46178 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
46179+#ifdef CONFIG_GRKERNSEC_HIDESYM
46180+ NULL, NULL);
46181+#else
46182 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
46183+#endif
46184 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
46185 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
46186 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
46187diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
46188index 0707fa2..70ca794 100644
46189--- a/drivers/message/fusion/mptsas.c
46190+++ b/drivers/message/fusion/mptsas.c
46191@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
46192 return 0;
46193 }
46194
46195+static inline void
46196+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46197+{
46198+ if (phy_info->port_details) {
46199+ phy_info->port_details->rphy = rphy;
46200+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46201+ ioc->name, rphy));
46202+ }
46203+
46204+ if (rphy) {
46205+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46206+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46207+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46208+ ioc->name, rphy, rphy->dev.release));
46209+ }
46210+}
46211+
46212 /* no mutex */
46213 static void
46214 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
46215@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
46216 return NULL;
46217 }
46218
46219-static inline void
46220-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46221-{
46222- if (phy_info->port_details) {
46223- phy_info->port_details->rphy = rphy;
46224- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46225- ioc->name, rphy));
46226- }
46227-
46228- if (rphy) {
46229- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46230- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46231- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46232- ioc->name, rphy, rphy->dev.release));
46233- }
46234-}
46235-
46236 static inline struct sas_port *
46237 mptsas_get_port(struct mptsas_phyinfo *phy_info)
46238 {
46239diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
46240index b7d87cd..3fb36da 100644
46241--- a/drivers/message/i2o/i2o_proc.c
46242+++ b/drivers/message/i2o/i2o_proc.c
46243@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
46244 "Array Controller Device"
46245 };
46246
46247-static char *chtostr(char *tmp, u8 *chars, int n)
46248-{
46249- tmp[0] = 0;
46250- return strncat(tmp, (char *)chars, n);
46251-}
46252-
46253 static int i2o_report_query_status(struct seq_file *seq, int block_status,
46254 char *group)
46255 {
46256@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
46257 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
46258 {
46259 struct i2o_controller *c = (struct i2o_controller *)seq->private;
46260- static u32 work32[5];
46261- static u8 *work8 = (u8 *) work32;
46262- static u16 *work16 = (u16 *) work32;
46263+ u32 work32[5];
46264+ u8 *work8 = (u8 *) work32;
46265+ u16 *work16 = (u16 *) work32;
46266 int token;
46267 u32 hwcap;
46268
46269@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46270 } *result;
46271
46272 i2o_exec_execute_ddm_table ddm_table;
46273- char tmp[28 + 1];
46274
46275 result = kmalloc(sizeof(*result), GFP_KERNEL);
46276 if (!result)
46277@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
46278
46279 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
46280 seq_printf(seq, "%-#8x", ddm_table.module_id);
46281- seq_printf(seq, "%-29s",
46282- chtostr(tmp, ddm_table.module_name_version, 28));
46283+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
46284 seq_printf(seq, "%9d ", ddm_table.data_size);
46285 seq_printf(seq, "%8d", ddm_table.code_size);
46286
46287@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46288
46289 i2o_driver_result_table *result;
46290 i2o_driver_store_table *dst;
46291- char tmp[28 + 1];
46292
46293 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
46294 if (result == NULL)
46295@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
46296
46297 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
46298 seq_printf(seq, "%-#8x", dst->module_id);
46299- seq_printf(seq, "%-29s",
46300- chtostr(tmp, dst->module_name_version, 28));
46301- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
46302+ seq_printf(seq, "%-.28s", dst->module_name_version);
46303+ seq_printf(seq, "%-.8s", dst->date);
46304 seq_printf(seq, "%8d ", dst->module_size);
46305 seq_printf(seq, "%8d ", dst->mpb_size);
46306 seq_printf(seq, "0x%04x", dst->module_flags);
46307@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
46308 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46309 {
46310 struct i2o_device *d = (struct i2o_device *)seq->private;
46311- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46312+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
46313 // == (allow) 512d bytes (max)
46314- static u16 *work16 = (u16 *) work32;
46315+ u16 *work16 = (u16 *) work32;
46316 int token;
46317- char tmp[16 + 1];
46318
46319 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
46320
46321@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
46322 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
46323 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
46324 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
46325- seq_printf(seq, "Vendor info : %s\n",
46326- chtostr(tmp, (u8 *) (work32 + 2), 16));
46327- seq_printf(seq, "Product info : %s\n",
46328- chtostr(tmp, (u8 *) (work32 + 6), 16));
46329- seq_printf(seq, "Description : %s\n",
46330- chtostr(tmp, (u8 *) (work32 + 10), 16));
46331- seq_printf(seq, "Product rev. : %s\n",
46332- chtostr(tmp, (u8 *) (work32 + 14), 8));
46333+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
46334+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
46335+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
46336+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
46337
46338 seq_printf(seq, "Serial number : ");
46339 print_serial_number(seq, (u8 *) (work32 + 16),
46340@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46341 u8 pad[256]; // allow up to 256 byte (max) serial number
46342 } result;
46343
46344- char tmp[24 + 1];
46345-
46346 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
46347
46348 if (token < 0) {
46349@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
46350 }
46351
46352 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
46353- seq_printf(seq, "Module name : %s\n",
46354- chtostr(tmp, result.module_name, 24));
46355- seq_printf(seq, "Module revision : %s\n",
46356- chtostr(tmp, result.module_rev, 8));
46357+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
46358+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
46359
46360 seq_printf(seq, "Serial number : ");
46361 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
46362@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46363 u8 instance_number[4];
46364 } result;
46365
46366- char tmp[64 + 1];
46367-
46368 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
46369
46370 if (token < 0) {
46371@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46372 return 0;
46373 }
46374
46375- seq_printf(seq, "Device name : %s\n",
46376- chtostr(tmp, result.device_name, 64));
46377- seq_printf(seq, "Service name : %s\n",
46378- chtostr(tmp, result.service_name, 64));
46379- seq_printf(seq, "Physical name : %s\n",
46380- chtostr(tmp, result.physical_location, 64));
46381- seq_printf(seq, "Instance number : %s\n",
46382- chtostr(tmp, result.instance_number, 4));
46383+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
46384+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
46385+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
46386+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
46387
46388 return 0;
46389 }
46390@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
46391 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
46392 {
46393 struct i2o_device *d = (struct i2o_device *)seq->private;
46394- static u32 work32[12];
46395- static u16 *work16 = (u16 *) work32;
46396- static u8 *work8 = (u8 *) work32;
46397+ u32 work32[12];
46398+ u16 *work16 = (u16 *) work32;
46399+ u8 *work8 = (u8 *) work32;
46400 int token;
46401
46402 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
46403diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
46404index 92752fb..a7494f6 100644
46405--- a/drivers/message/i2o/iop.c
46406+++ b/drivers/message/i2o/iop.c
46407@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
46408
46409 spin_lock_irqsave(&c->context_list_lock, flags);
46410
46411- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
46412- atomic_inc(&c->context_list_counter);
46413+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
46414+ atomic_inc_unchecked(&c->context_list_counter);
46415
46416- entry->context = atomic_read(&c->context_list_counter);
46417+ entry->context = atomic_read_unchecked(&c->context_list_counter);
46418
46419 list_add(&entry->list, &c->context_list);
46420
46421@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
46422
46423 #if BITS_PER_LONG == 64
46424 spin_lock_init(&c->context_list_lock);
46425- atomic_set(&c->context_list_counter, 0);
46426+ atomic_set_unchecked(&c->context_list_counter, 0);
46427 INIT_LIST_HEAD(&c->context_list);
46428 #endif
46429
46430diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
46431index b2c7e3b..85aa4764 100644
46432--- a/drivers/mfd/ab8500-debugfs.c
46433+++ b/drivers/mfd/ab8500-debugfs.c
46434@@ -100,7 +100,7 @@ static int irq_last;
46435 static u32 *irq_count;
46436 static int num_irqs;
46437
46438-static struct device_attribute **dev_attr;
46439+static device_attribute_no_const **dev_attr;
46440 static char **event_name;
46441
46442 static u8 avg_sample = SAMPLE_16;
46443diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
46444index c880c89..45a7c68 100644
46445--- a/drivers/mfd/max8925-i2c.c
46446+++ b/drivers/mfd/max8925-i2c.c
46447@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
46448 const struct i2c_device_id *id)
46449 {
46450 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
46451- static struct max8925_chip *chip;
46452+ struct max8925_chip *chip;
46453 struct device_node *node = client->dev.of_node;
46454
46455 if (node && !pdata) {
46456diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
46457index 7612d89..70549c2 100644
46458--- a/drivers/mfd/tps65910.c
46459+++ b/drivers/mfd/tps65910.c
46460@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
46461 struct tps65910_platform_data *pdata)
46462 {
46463 int ret = 0;
46464- static struct regmap_irq_chip *tps6591x_irqs_chip;
46465+ struct regmap_irq_chip *tps6591x_irqs_chip;
46466
46467 if (!irq) {
46468 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
46469diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
46470index 1b772ef..01e77d33 100644
46471--- a/drivers/mfd/twl4030-irq.c
46472+++ b/drivers/mfd/twl4030-irq.c
46473@@ -34,6 +34,7 @@
46474 #include <linux/of.h>
46475 #include <linux/irqdomain.h>
46476 #include <linux/i2c/twl.h>
46477+#include <asm/pgtable.h>
46478
46479 #include "twl-core.h"
46480
46481@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
46482 * Install an irq handler for each of the SIH modules;
46483 * clone dummy irq_chip since PIH can't *do* anything
46484 */
46485- twl4030_irq_chip = dummy_irq_chip;
46486- twl4030_irq_chip.name = "twl4030";
46487+ pax_open_kernel();
46488+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
46489+ *(const char **)&twl4030_irq_chip.name = "twl4030";
46490
46491- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46492+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
46493+ pax_close_kernel();
46494
46495 for (i = irq_base; i < irq_end; i++) {
46496 irq_set_chip_and_handler(i, &twl4030_irq_chip,
46497diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
46498index 464419b..64bae8d 100644
46499--- a/drivers/misc/c2port/core.c
46500+++ b/drivers/misc/c2port/core.c
46501@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
46502 goto error_idr_alloc;
46503 c2dev->id = ret;
46504
46505- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46506+ pax_open_kernel();
46507+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
46508+ pax_close_kernel();
46509
46510 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
46511 "c2port%d", c2dev->id);
46512diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
46513index 3f2b625..945e179 100644
46514--- a/drivers/misc/eeprom/sunxi_sid.c
46515+++ b/drivers/misc/eeprom/sunxi_sid.c
46516@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
46517
46518 platform_set_drvdata(pdev, sid_data);
46519
46520- sid_bin_attr.size = sid_data->keysize;
46521+ pax_open_kernel();
46522+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
46523+ pax_close_kernel();
46524 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
46525 return -ENODEV;
46526
46527diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
46528index 36f5d52..32311c3 100644
46529--- a/drivers/misc/kgdbts.c
46530+++ b/drivers/misc/kgdbts.c
46531@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
46532 char before[BREAK_INSTR_SIZE];
46533 char after[BREAK_INSTR_SIZE];
46534
46535- probe_kernel_read(before, (char *)kgdbts_break_test,
46536+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
46537 BREAK_INSTR_SIZE);
46538 init_simple_test();
46539 ts.tst = plant_and_detach_test;
46540@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
46541 /* Activate test with initial breakpoint */
46542 if (!is_early)
46543 kgdb_breakpoint();
46544- probe_kernel_read(after, (char *)kgdbts_break_test,
46545+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
46546 BREAK_INSTR_SIZE);
46547 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
46548 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
46549diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
46550index 3ef4627..8d00486 100644
46551--- a/drivers/misc/lis3lv02d/lis3lv02d.c
46552+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
46553@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
46554 * the lid is closed. This leads to interrupts as soon as a little move
46555 * is done.
46556 */
46557- atomic_inc(&lis3->count);
46558+ atomic_inc_unchecked(&lis3->count);
46559
46560 wake_up_interruptible(&lis3->misc_wait);
46561 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
46562@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
46563 if (lis3->pm_dev)
46564 pm_runtime_get_sync(lis3->pm_dev);
46565
46566- atomic_set(&lis3->count, 0);
46567+ atomic_set_unchecked(&lis3->count, 0);
46568 return 0;
46569 }
46570
46571@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
46572 add_wait_queue(&lis3->misc_wait, &wait);
46573 while (true) {
46574 set_current_state(TASK_INTERRUPTIBLE);
46575- data = atomic_xchg(&lis3->count, 0);
46576+ data = atomic_xchg_unchecked(&lis3->count, 0);
46577 if (data)
46578 break;
46579
46580@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
46581 struct lis3lv02d, miscdev);
46582
46583 poll_wait(file, &lis3->misc_wait, wait);
46584- if (atomic_read(&lis3->count))
46585+ if (atomic_read_unchecked(&lis3->count))
46586 return POLLIN | POLLRDNORM;
46587 return 0;
46588 }
46589diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
46590index c439c82..1f20f57 100644
46591--- a/drivers/misc/lis3lv02d/lis3lv02d.h
46592+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
46593@@ -297,7 +297,7 @@ struct lis3lv02d {
46594 struct input_polled_dev *idev; /* input device */
46595 struct platform_device *pdev; /* platform device */
46596 struct regulator_bulk_data regulators[2];
46597- atomic_t count; /* interrupt count after last read */
46598+ atomic_unchecked_t count; /* interrupt count after last read */
46599 union axis_conversion ac; /* hw -> logical axis */
46600 int mapped_btns[3];
46601
46602diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
46603index 2f30bad..c4c13d0 100644
46604--- a/drivers/misc/sgi-gru/gruhandles.c
46605+++ b/drivers/misc/sgi-gru/gruhandles.c
46606@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
46607 unsigned long nsec;
46608
46609 nsec = CLKS2NSEC(clks);
46610- atomic_long_inc(&mcs_op_statistics[op].count);
46611- atomic_long_add(nsec, &mcs_op_statistics[op].total);
46612+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
46613+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
46614 if (mcs_op_statistics[op].max < nsec)
46615 mcs_op_statistics[op].max = nsec;
46616 }
46617diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
46618index 4f76359..cdfcb2e 100644
46619--- a/drivers/misc/sgi-gru/gruprocfs.c
46620+++ b/drivers/misc/sgi-gru/gruprocfs.c
46621@@ -32,9 +32,9 @@
46622
46623 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
46624
46625-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
46626+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
46627 {
46628- unsigned long val = atomic_long_read(v);
46629+ unsigned long val = atomic_long_read_unchecked(v);
46630
46631 seq_printf(s, "%16lu %s\n", val, id);
46632 }
46633@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
46634
46635 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
46636 for (op = 0; op < mcsop_last; op++) {
46637- count = atomic_long_read(&mcs_op_statistics[op].count);
46638- total = atomic_long_read(&mcs_op_statistics[op].total);
46639+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
46640+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
46641 max = mcs_op_statistics[op].max;
46642 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
46643 count ? total / count : 0, max);
46644diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
46645index 5c3ce24..4915ccb 100644
46646--- a/drivers/misc/sgi-gru/grutables.h
46647+++ b/drivers/misc/sgi-gru/grutables.h
46648@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
46649 * GRU statistics.
46650 */
46651 struct gru_stats_s {
46652- atomic_long_t vdata_alloc;
46653- atomic_long_t vdata_free;
46654- atomic_long_t gts_alloc;
46655- atomic_long_t gts_free;
46656- atomic_long_t gms_alloc;
46657- atomic_long_t gms_free;
46658- atomic_long_t gts_double_allocate;
46659- atomic_long_t assign_context;
46660- atomic_long_t assign_context_failed;
46661- atomic_long_t free_context;
46662- atomic_long_t load_user_context;
46663- atomic_long_t load_kernel_context;
46664- atomic_long_t lock_kernel_context;
46665- atomic_long_t unlock_kernel_context;
46666- atomic_long_t steal_user_context;
46667- atomic_long_t steal_kernel_context;
46668- atomic_long_t steal_context_failed;
46669- atomic_long_t nopfn;
46670- atomic_long_t asid_new;
46671- atomic_long_t asid_next;
46672- atomic_long_t asid_wrap;
46673- atomic_long_t asid_reuse;
46674- atomic_long_t intr;
46675- atomic_long_t intr_cbr;
46676- atomic_long_t intr_tfh;
46677- atomic_long_t intr_spurious;
46678- atomic_long_t intr_mm_lock_failed;
46679- atomic_long_t call_os;
46680- atomic_long_t call_os_wait_queue;
46681- atomic_long_t user_flush_tlb;
46682- atomic_long_t user_unload_context;
46683- atomic_long_t user_exception;
46684- atomic_long_t set_context_option;
46685- atomic_long_t check_context_retarget_intr;
46686- atomic_long_t check_context_unload;
46687- atomic_long_t tlb_dropin;
46688- atomic_long_t tlb_preload_page;
46689- atomic_long_t tlb_dropin_fail_no_asid;
46690- atomic_long_t tlb_dropin_fail_upm;
46691- atomic_long_t tlb_dropin_fail_invalid;
46692- atomic_long_t tlb_dropin_fail_range_active;
46693- atomic_long_t tlb_dropin_fail_idle;
46694- atomic_long_t tlb_dropin_fail_fmm;
46695- atomic_long_t tlb_dropin_fail_no_exception;
46696- atomic_long_t tfh_stale_on_fault;
46697- atomic_long_t mmu_invalidate_range;
46698- atomic_long_t mmu_invalidate_page;
46699- atomic_long_t flush_tlb;
46700- atomic_long_t flush_tlb_gru;
46701- atomic_long_t flush_tlb_gru_tgh;
46702- atomic_long_t flush_tlb_gru_zero_asid;
46703+ atomic_long_unchecked_t vdata_alloc;
46704+ atomic_long_unchecked_t vdata_free;
46705+ atomic_long_unchecked_t gts_alloc;
46706+ atomic_long_unchecked_t gts_free;
46707+ atomic_long_unchecked_t gms_alloc;
46708+ atomic_long_unchecked_t gms_free;
46709+ atomic_long_unchecked_t gts_double_allocate;
46710+ atomic_long_unchecked_t assign_context;
46711+ atomic_long_unchecked_t assign_context_failed;
46712+ atomic_long_unchecked_t free_context;
46713+ atomic_long_unchecked_t load_user_context;
46714+ atomic_long_unchecked_t load_kernel_context;
46715+ atomic_long_unchecked_t lock_kernel_context;
46716+ atomic_long_unchecked_t unlock_kernel_context;
46717+ atomic_long_unchecked_t steal_user_context;
46718+ atomic_long_unchecked_t steal_kernel_context;
46719+ atomic_long_unchecked_t steal_context_failed;
46720+ atomic_long_unchecked_t nopfn;
46721+ atomic_long_unchecked_t asid_new;
46722+ atomic_long_unchecked_t asid_next;
46723+ atomic_long_unchecked_t asid_wrap;
46724+ atomic_long_unchecked_t asid_reuse;
46725+ atomic_long_unchecked_t intr;
46726+ atomic_long_unchecked_t intr_cbr;
46727+ atomic_long_unchecked_t intr_tfh;
46728+ atomic_long_unchecked_t intr_spurious;
46729+ atomic_long_unchecked_t intr_mm_lock_failed;
46730+ atomic_long_unchecked_t call_os;
46731+ atomic_long_unchecked_t call_os_wait_queue;
46732+ atomic_long_unchecked_t user_flush_tlb;
46733+ atomic_long_unchecked_t user_unload_context;
46734+ atomic_long_unchecked_t user_exception;
46735+ atomic_long_unchecked_t set_context_option;
46736+ atomic_long_unchecked_t check_context_retarget_intr;
46737+ atomic_long_unchecked_t check_context_unload;
46738+ atomic_long_unchecked_t tlb_dropin;
46739+ atomic_long_unchecked_t tlb_preload_page;
46740+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
46741+ atomic_long_unchecked_t tlb_dropin_fail_upm;
46742+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
46743+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
46744+ atomic_long_unchecked_t tlb_dropin_fail_idle;
46745+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
46746+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
46747+ atomic_long_unchecked_t tfh_stale_on_fault;
46748+ atomic_long_unchecked_t mmu_invalidate_range;
46749+ atomic_long_unchecked_t mmu_invalidate_page;
46750+ atomic_long_unchecked_t flush_tlb;
46751+ atomic_long_unchecked_t flush_tlb_gru;
46752+ atomic_long_unchecked_t flush_tlb_gru_tgh;
46753+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
46754
46755- atomic_long_t copy_gpa;
46756- atomic_long_t read_gpa;
46757+ atomic_long_unchecked_t copy_gpa;
46758+ atomic_long_unchecked_t read_gpa;
46759
46760- atomic_long_t mesq_receive;
46761- atomic_long_t mesq_receive_none;
46762- atomic_long_t mesq_send;
46763- atomic_long_t mesq_send_failed;
46764- atomic_long_t mesq_noop;
46765- atomic_long_t mesq_send_unexpected_error;
46766- atomic_long_t mesq_send_lb_overflow;
46767- atomic_long_t mesq_send_qlimit_reached;
46768- atomic_long_t mesq_send_amo_nacked;
46769- atomic_long_t mesq_send_put_nacked;
46770- atomic_long_t mesq_page_overflow;
46771- atomic_long_t mesq_qf_locked;
46772- atomic_long_t mesq_qf_noop_not_full;
46773- atomic_long_t mesq_qf_switch_head_failed;
46774- atomic_long_t mesq_qf_unexpected_error;
46775- atomic_long_t mesq_noop_unexpected_error;
46776- atomic_long_t mesq_noop_lb_overflow;
46777- atomic_long_t mesq_noop_qlimit_reached;
46778- atomic_long_t mesq_noop_amo_nacked;
46779- atomic_long_t mesq_noop_put_nacked;
46780- atomic_long_t mesq_noop_page_overflow;
46781+ atomic_long_unchecked_t mesq_receive;
46782+ atomic_long_unchecked_t mesq_receive_none;
46783+ atomic_long_unchecked_t mesq_send;
46784+ atomic_long_unchecked_t mesq_send_failed;
46785+ atomic_long_unchecked_t mesq_noop;
46786+ atomic_long_unchecked_t mesq_send_unexpected_error;
46787+ atomic_long_unchecked_t mesq_send_lb_overflow;
46788+ atomic_long_unchecked_t mesq_send_qlimit_reached;
46789+ atomic_long_unchecked_t mesq_send_amo_nacked;
46790+ atomic_long_unchecked_t mesq_send_put_nacked;
46791+ atomic_long_unchecked_t mesq_page_overflow;
46792+ atomic_long_unchecked_t mesq_qf_locked;
46793+ atomic_long_unchecked_t mesq_qf_noop_not_full;
46794+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
46795+ atomic_long_unchecked_t mesq_qf_unexpected_error;
46796+ atomic_long_unchecked_t mesq_noop_unexpected_error;
46797+ atomic_long_unchecked_t mesq_noop_lb_overflow;
46798+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
46799+ atomic_long_unchecked_t mesq_noop_amo_nacked;
46800+ atomic_long_unchecked_t mesq_noop_put_nacked;
46801+ atomic_long_unchecked_t mesq_noop_page_overflow;
46802
46803 };
46804
46805@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
46806 tghop_invalidate, mcsop_last};
46807
46808 struct mcs_op_statistic {
46809- atomic_long_t count;
46810- atomic_long_t total;
46811+ atomic_long_unchecked_t count;
46812+ atomic_long_unchecked_t total;
46813 unsigned long max;
46814 };
46815
46816@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
46817
46818 #define STAT(id) do { \
46819 if (gru_options & OPT_STATS) \
46820- atomic_long_inc(&gru_stats.id); \
46821+ atomic_long_inc_unchecked(&gru_stats.id); \
46822 } while (0)
46823
46824 #ifdef CONFIG_SGI_GRU_DEBUG
46825diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
46826index c862cd4..0d176fe 100644
46827--- a/drivers/misc/sgi-xp/xp.h
46828+++ b/drivers/misc/sgi-xp/xp.h
46829@@ -288,7 +288,7 @@ struct xpc_interface {
46830 xpc_notify_func, void *);
46831 void (*received) (short, int, void *);
46832 enum xp_retval (*partid_to_nasids) (short, void *);
46833-};
46834+} __no_const;
46835
46836 extern struct xpc_interface xpc_interface;
46837
46838diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
46839index 01be66d..e3a0c7e 100644
46840--- a/drivers/misc/sgi-xp/xp_main.c
46841+++ b/drivers/misc/sgi-xp/xp_main.c
46842@@ -78,13 +78,13 @@ xpc_notloaded(void)
46843 }
46844
46845 struct xpc_interface xpc_interface = {
46846- (void (*)(int))xpc_notloaded,
46847- (void (*)(int))xpc_notloaded,
46848- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
46849- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
46850+ .connect = (void (*)(int))xpc_notloaded,
46851+ .disconnect = (void (*)(int))xpc_notloaded,
46852+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
46853+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
46854 void *))xpc_notloaded,
46855- (void (*)(short, int, void *))xpc_notloaded,
46856- (enum xp_retval(*)(short, void *))xpc_notloaded
46857+ .received = (void (*)(short, int, void *))xpc_notloaded,
46858+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
46859 };
46860 EXPORT_SYMBOL_GPL(xpc_interface);
46861
46862diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
46863index b94d5f7..7f494c5 100644
46864--- a/drivers/misc/sgi-xp/xpc.h
46865+++ b/drivers/misc/sgi-xp/xpc.h
46866@@ -835,6 +835,7 @@ struct xpc_arch_operations {
46867 void (*received_payload) (struct xpc_channel *, void *);
46868 void (*notify_senders_of_disconnect) (struct xpc_channel *);
46869 };
46870+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
46871
46872 /* struct xpc_partition act_state values (for XPC HB) */
46873
46874@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
46875 /* found in xpc_main.c */
46876 extern struct device *xpc_part;
46877 extern struct device *xpc_chan;
46878-extern struct xpc_arch_operations xpc_arch_ops;
46879+extern xpc_arch_operations_no_const xpc_arch_ops;
46880 extern int xpc_disengage_timelimit;
46881 extern int xpc_disengage_timedout;
46882 extern int xpc_activate_IRQ_rcvd;
46883diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
46884index 82dc574..8539ab2 100644
46885--- a/drivers/misc/sgi-xp/xpc_main.c
46886+++ b/drivers/misc/sgi-xp/xpc_main.c
46887@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
46888 .notifier_call = xpc_system_die,
46889 };
46890
46891-struct xpc_arch_operations xpc_arch_ops;
46892+xpc_arch_operations_no_const xpc_arch_ops;
46893
46894 /*
46895 * Timer function to enforce the timelimit on the partition disengage.
46896@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
46897
46898 if (((die_args->trapnr == X86_TRAP_MF) ||
46899 (die_args->trapnr == X86_TRAP_XF)) &&
46900- !user_mode_vm(die_args->regs))
46901+ !user_mode(die_args->regs))
46902 xpc_die_deactivate();
46903
46904 break;
46905diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
46906index 1fa4c80..59447c9 100644
46907--- a/drivers/mmc/card/block.c
46908+++ b/drivers/mmc/card/block.c
46909@@ -574,7 +574,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
46910 if (idata->ic.postsleep_min_us)
46911 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
46912
46913- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
46914+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
46915 err = -EFAULT;
46916 goto cmd_rel_host;
46917 }
46918diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
46919index 7911e05..d0f9dda 100644
46920--- a/drivers/mmc/core/mmc_ops.c
46921+++ b/drivers/mmc/core/mmc_ops.c
46922@@ -267,7 +267,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
46923 void *data_buf;
46924 int is_on_stack;
46925
46926- is_on_stack = object_is_on_stack(buf);
46927+ is_on_stack = object_starts_on_stack(buf);
46928 if (is_on_stack) {
46929 /*
46930 * dma onto stack is unsafe/nonportable, but callers to this
46931diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
46932index 01b99e8..5c325e3 100644
46933--- a/drivers/mmc/host/dw_mmc.h
46934+++ b/drivers/mmc/host/dw_mmc.h
46935@@ -265,5 +265,5 @@ struct dw_mci_drv_data {
46936 int (*parse_dt)(struct dw_mci *host);
46937 int (*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
46938 struct dw_mci_tuning_data *tuning_data);
46939-};
46940+} __do_const;
46941 #endif /* _DW_MMC_H_ */
46942diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
46943index 43af791..86f4c48 100644
46944--- a/drivers/mmc/host/mmci.c
46945+++ b/drivers/mmc/host/mmci.c
46946@@ -1628,7 +1628,9 @@ static int mmci_probe(struct amba_device *dev,
46947 mmc->caps |= MMC_CAP_CMD23;
46948
46949 if (variant->busy_detect) {
46950- mmci_ops.card_busy = mmci_card_busy;
46951+ pax_open_kernel();
46952+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
46953+ pax_close_kernel();
46954 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
46955 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
46956 mmc->max_busy_timeout = 0;
46957diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
46958index df27bb4..2085f0b 100644
46959--- a/drivers/mmc/host/omap_hsmmc.c
46960+++ b/drivers/mmc/host/omap_hsmmc.c
46961@@ -2111,7 +2111,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
46962
46963 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
46964 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
46965- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
46966+ pax_open_kernel();
46967+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
46968+ pax_close_kernel();
46969 }
46970
46971 pm_runtime_enable(host->dev);
46972diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
46973index 587ee0e..b3bbcab 100644
46974--- a/drivers/mmc/host/sdhci-esdhc-imx.c
46975+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
46976@@ -1054,9 +1054,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
46977 host->mmc->caps |= MMC_CAP_1_8V_DDR;
46978 }
46979
46980- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
46981- sdhci_esdhc_ops.platform_execute_tuning =
46982+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
46983+ pax_open_kernel();
46984+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
46985 esdhc_executing_tuning;
46986+ pax_close_kernel();
46987+ }
46988
46989 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
46990 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
46991diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
46992index 0ce6eb1..8dcce1b 100644
46993--- a/drivers/mmc/host/sdhci-s3c.c
46994+++ b/drivers/mmc/host/sdhci-s3c.c
46995@@ -584,9 +584,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
46996 * we can use overriding functions instead of default.
46997 */
46998 if (sc->no_divider) {
46999- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47000- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47001- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47002+ pax_open_kernel();
47003+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47004+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47005+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47006+ pax_close_kernel();
47007 }
47008
47009 /* It supports additional host capabilities if needed */
47010diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
47011index 423666b..81ff5eb 100644
47012--- a/drivers/mtd/chips/cfi_cmdset_0020.c
47013+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
47014@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
47015 size_t totlen = 0, thislen;
47016 int ret = 0;
47017 size_t buflen = 0;
47018- static char *buffer;
47019+ char *buffer;
47020
47021 if (!ECCBUF_SIZE) {
47022 /* We should fall back to a general writev implementation.
47023diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
47024index b3b7ca1..5dd4634 100644
47025--- a/drivers/mtd/nand/denali.c
47026+++ b/drivers/mtd/nand/denali.c
47027@@ -24,6 +24,7 @@
47028 #include <linux/slab.h>
47029 #include <linux/mtd/mtd.h>
47030 #include <linux/module.h>
47031+#include <linux/slab.h>
47032
47033 #include "denali.h"
47034
47035diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47036index 959cb9b..8520fe5 100644
47037--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47038+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47039@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
47040
47041 /* first try to map the upper buffer directly */
47042 if (virt_addr_valid(this->upper_buf) &&
47043- !object_is_on_stack(this->upper_buf)) {
47044+ !object_starts_on_stack(this->upper_buf)) {
47045 sg_init_one(sgl, this->upper_buf, this->upper_len);
47046 ret = dma_map_sg(this->dev, sgl, 1, dr);
47047 if (ret == 0)
47048diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
47049index 51b9d6a..52af9a7 100644
47050--- a/drivers/mtd/nftlmount.c
47051+++ b/drivers/mtd/nftlmount.c
47052@@ -24,6 +24,7 @@
47053 #include <asm/errno.h>
47054 #include <linux/delay.h>
47055 #include <linux/slab.h>
47056+#include <linux/sched.h>
47057 #include <linux/mtd/mtd.h>
47058 #include <linux/mtd/nand.h>
47059 #include <linux/mtd/nftl.h>
47060diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
47061index c23184a..4115c41 100644
47062--- a/drivers/mtd/sm_ftl.c
47063+++ b/drivers/mtd/sm_ftl.c
47064@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
47065 #define SM_CIS_VENDOR_OFFSET 0x59
47066 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
47067 {
47068- struct attribute_group *attr_group;
47069+ attribute_group_no_const *attr_group;
47070 struct attribute **attributes;
47071 struct sm_sysfs_attribute *vendor_attribute;
47072 char *vendor;
47073diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
47074index a5115fb..81b03f6 100644
47075--- a/drivers/net/bonding/bond_main.c
47076+++ b/drivers/net/bonding/bond_main.c
47077@@ -3749,7 +3749,7 @@ int bond_3ad_xor_xmit(struct sk_buff *skb, struct net_device *dev)
47078 bond_dev_queue_xmit(bond, skb, slave->dev);
47079 } else {
47080 dev_kfree_skb_any(skb);
47081- atomic_long_inc(&dev->tx_dropped);
47082+ atomic_long_inc_unchecked(&dev->tx_dropped);
47083 }
47084
47085 return NETDEV_TX_OK;
47086diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
47087index 45f09a6..f154f8d 100644
47088--- a/drivers/net/bonding/bond_netlink.c
47089+++ b/drivers/net/bonding/bond_netlink.c
47090@@ -585,7 +585,7 @@ nla_put_failure:
47091 return -EMSGSIZE;
47092 }
47093
47094-struct rtnl_link_ops bond_link_ops __read_mostly = {
47095+struct rtnl_link_ops bond_link_ops = {
47096 .kind = "bond",
47097 .priv_size = sizeof(struct bonding),
47098 .setup = bond_setup,
47099diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
47100index 5e40a8b..126bfda 100644
47101--- a/drivers/net/caif/caif_hsi.c
47102+++ b/drivers/net/caif/caif_hsi.c
47103@@ -1445,7 +1445,7 @@ err:
47104 return -ENODEV;
47105 }
47106
47107-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
47108+static struct rtnl_link_ops caif_hsi_link_ops = {
47109 .kind = "cfhsi",
47110 .priv_size = sizeof(struct cfhsi),
47111 .setup = cfhsi_setup,
47112diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
47113index 98d73aa..63ef9da 100644
47114--- a/drivers/net/can/Kconfig
47115+++ b/drivers/net/can/Kconfig
47116@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
47117
47118 config CAN_FLEXCAN
47119 tristate "Support for Freescale FLEXCAN based chips"
47120- depends on ARM || PPC
47121+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
47122 ---help---
47123 Say Y here if you want to support for Freescale FlexCAN.
47124
47125diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
47126index 2cfe501..477d4b5 100644
47127--- a/drivers/net/can/dev.c
47128+++ b/drivers/net/can/dev.c
47129@@ -868,7 +868,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
47130 return -EOPNOTSUPP;
47131 }
47132
47133-static struct rtnl_link_ops can_link_ops __read_mostly = {
47134+static struct rtnl_link_ops can_link_ops = {
47135 .kind = "can",
47136 .maxtype = IFLA_CAN_MAX,
47137 .policy = can_policy,
47138diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
47139index 4e94057..32032ff 100644
47140--- a/drivers/net/can/vcan.c
47141+++ b/drivers/net/can/vcan.c
47142@@ -166,7 +166,7 @@ static void vcan_setup(struct net_device *dev)
47143 dev->destructor = free_netdev;
47144 }
47145
47146-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
47147+static struct rtnl_link_ops vcan_link_ops = {
47148 .kind = "vcan",
47149 .setup = vcan_setup,
47150 };
47151diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
47152index ff435fb..d408b1f 100644
47153--- a/drivers/net/dummy.c
47154+++ b/drivers/net/dummy.c
47155@@ -149,7 +149,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
47156 return 0;
47157 }
47158
47159-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
47160+static struct rtnl_link_ops dummy_link_ops = {
47161 .kind = "dummy",
47162 .setup = dummy_setup,
47163 .validate = dummy_validate,
47164diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
47165index 1d162cc..b546a75 100644
47166--- a/drivers/net/ethernet/8390/ax88796.c
47167+++ b/drivers/net/ethernet/8390/ax88796.c
47168@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
47169 if (ax->plat->reg_offsets)
47170 ei_local->reg_offset = ax->plat->reg_offsets;
47171 else {
47172+ resource_size_t _mem_size = mem_size;
47173+ do_div(_mem_size, 0x18);
47174 ei_local->reg_offset = ax->reg_offsets;
47175 for (ret = 0; ret < 0x18; ret++)
47176- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
47177+ ax->reg_offsets[ret] = _mem_size * ret;
47178 }
47179
47180 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
47181diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
47182index 4efc435..4ab9e14 100644
47183--- a/drivers/net/ethernet/altera/altera_tse_main.c
47184+++ b/drivers/net/ethernet/altera/altera_tse_main.c
47185@@ -1224,7 +1224,7 @@ static int tse_shutdown(struct net_device *dev)
47186 return 0;
47187 }
47188
47189-static struct net_device_ops altera_tse_netdev_ops = {
47190+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
47191 .ndo_open = tse_open,
47192 .ndo_stop = tse_shutdown,
47193 .ndo_start_xmit = tse_start_xmit,
47194@@ -1461,11 +1461,13 @@ static int altera_tse_probe(struct platform_device *pdev)
47195 ndev->netdev_ops = &altera_tse_netdev_ops;
47196 altera_tse_set_ethtool_ops(ndev);
47197
47198+ pax_open_kernel();
47199 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
47200
47201 if (priv->hash_filter)
47202 altera_tse_netdev_ops.ndo_set_rx_mode =
47203 tse_set_rx_mode_hashfilter;
47204+ pax_close_kernel();
47205
47206 /* Scatter/gather IO is not supported,
47207 * so it is turned off
47208diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47209index caade30..3e257d9 100644
47210--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47211+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47212@@ -1072,14 +1072,14 @@ do { \
47213 * operations, everything works on mask values.
47214 */
47215 #define XMDIO_READ(_pdata, _mmd, _reg) \
47216- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
47217+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
47218 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
47219
47220 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
47221 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
47222
47223 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
47224- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
47225+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
47226 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
47227
47228 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
47229diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47230index 8a50b01..39c1ad0 100644
47231--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47232+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47233@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
47234
47235 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
47236
47237- pdata->hw_if.config_dcb_tc(pdata);
47238+ pdata->hw_if->config_dcb_tc(pdata);
47239
47240 return 0;
47241 }
47242@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
47243
47244 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
47245
47246- pdata->hw_if.config_dcb_pfc(pdata);
47247+ pdata->hw_if->config_dcb_pfc(pdata);
47248
47249 return 0;
47250 }
47251diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47252index 6fc5da0..61ac2cb 100644
47253--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47254+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47255@@ -235,7 +235,7 @@ err_ring:
47256
47257 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47258 {
47259- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47260+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47261 struct xgbe_channel *channel;
47262 struct xgbe_ring *ring;
47263 struct xgbe_ring_data *rdata;
47264@@ -276,7 +276,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47265
47266 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
47267 {
47268- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47269+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47270 struct xgbe_channel *channel;
47271 struct xgbe_ring *ring;
47272 struct xgbe_ring_desc *rdesc;
47273@@ -505,7 +505,7 @@ err_out:
47274 static void xgbe_realloc_skb(struct xgbe_channel *channel)
47275 {
47276 struct xgbe_prv_data *pdata = channel->pdata;
47277- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47278+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47279 struct xgbe_ring *ring = channel->rx_ring;
47280 struct xgbe_ring_data *rdata;
47281 struct sk_buff *skb = NULL;
47282@@ -546,17 +546,12 @@ static void xgbe_realloc_skb(struct xgbe_channel *channel)
47283 DBGPR("<--xgbe_realloc_skb\n");
47284 }
47285
47286-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
47287-{
47288- DBGPR("-->xgbe_init_function_ptrs_desc\n");
47289-
47290- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
47291- desc_if->free_ring_resources = xgbe_free_ring_resources;
47292- desc_if->map_tx_skb = xgbe_map_tx_skb;
47293- desc_if->realloc_skb = xgbe_realloc_skb;
47294- desc_if->unmap_skb = xgbe_unmap_skb;
47295- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
47296- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
47297-
47298- DBGPR("<--xgbe_init_function_ptrs_desc\n");
47299-}
47300+const struct xgbe_desc_if default_xgbe_desc_if = {
47301+ .alloc_ring_resources = xgbe_alloc_ring_resources,
47302+ .free_ring_resources = xgbe_free_ring_resources,
47303+ .map_tx_skb = xgbe_map_tx_skb,
47304+ .realloc_skb = xgbe_realloc_skb,
47305+ .unmap_skb = xgbe_unmap_skb,
47306+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
47307+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
47308+};
47309diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47310index 9da3a03..022f15c 100644
47311--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47312+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47313@@ -2462,7 +2462,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
47314
47315 static int xgbe_init(struct xgbe_prv_data *pdata)
47316 {
47317- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47318+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47319 int ret;
47320
47321 DBGPR("-->xgbe_init\n");
47322@@ -2524,101 +2524,96 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
47323 return 0;
47324 }
47325
47326-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
47327-{
47328- DBGPR("-->xgbe_init_function_ptrs\n");
47329-
47330- hw_if->tx_complete = xgbe_tx_complete;
47331-
47332- hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
47333- hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
47334- hw_if->add_mac_addresses = xgbe_add_mac_addresses;
47335- hw_if->set_mac_address = xgbe_set_mac_address;
47336-
47337- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
47338- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
47339-
47340- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
47341- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
47342- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
47343- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
47344- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
47345-
47346- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
47347- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
47348-
47349- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
47350- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
47351- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
47352-
47353- hw_if->enable_tx = xgbe_enable_tx;
47354- hw_if->disable_tx = xgbe_disable_tx;
47355- hw_if->enable_rx = xgbe_enable_rx;
47356- hw_if->disable_rx = xgbe_disable_rx;
47357-
47358- hw_if->powerup_tx = xgbe_powerup_tx;
47359- hw_if->powerdown_tx = xgbe_powerdown_tx;
47360- hw_if->powerup_rx = xgbe_powerup_rx;
47361- hw_if->powerdown_rx = xgbe_powerdown_rx;
47362-
47363- hw_if->pre_xmit = xgbe_pre_xmit;
47364- hw_if->dev_read = xgbe_dev_read;
47365- hw_if->enable_int = xgbe_enable_int;
47366- hw_if->disable_int = xgbe_disable_int;
47367- hw_if->init = xgbe_init;
47368- hw_if->exit = xgbe_exit;
47369+const struct xgbe_hw_if default_xgbe_hw_if = {
47370+ .tx_complete = xgbe_tx_complete,
47371+
47372+ .set_promiscuous_mode = xgbe_set_promiscuous_mode,
47373+ .set_all_multicast_mode = xgbe_set_all_multicast_mode,
47374+ .add_mac_addresses = xgbe_add_mac_addresses,
47375+ .set_mac_address = xgbe_set_mac_address,
47376+
47377+ .enable_rx_csum = xgbe_enable_rx_csum,
47378+ .disable_rx_csum = xgbe_disable_rx_csum,
47379+
47380+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
47381+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
47382+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
47383+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
47384+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
47385+
47386+ .read_mmd_regs = xgbe_read_mmd_regs,
47387+ .write_mmd_regs = xgbe_write_mmd_regs,
47388+
47389+ .set_gmii_speed = xgbe_set_gmii_speed,
47390+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
47391+ .set_xgmii_speed = xgbe_set_xgmii_speed,
47392+
47393+ .enable_tx = xgbe_enable_tx,
47394+ .disable_tx = xgbe_disable_tx,
47395+ .enable_rx = xgbe_enable_rx,
47396+ .disable_rx = xgbe_disable_rx,
47397+
47398+ .powerup_tx = xgbe_powerup_tx,
47399+ .powerdown_tx = xgbe_powerdown_tx,
47400+ .powerup_rx = xgbe_powerup_rx,
47401+ .powerdown_rx = xgbe_powerdown_rx,
47402+
47403+ .pre_xmit = xgbe_pre_xmit,
47404+ .dev_read = xgbe_dev_read,
47405+ .enable_int = xgbe_enable_int,
47406+ .disable_int = xgbe_disable_int,
47407+ .init = xgbe_init,
47408+ .exit = xgbe_exit,
47409
47410 /* Descriptor related Sequences have to be initialized here */
47411- hw_if->tx_desc_init = xgbe_tx_desc_init;
47412- hw_if->rx_desc_init = xgbe_rx_desc_init;
47413- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
47414- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
47415- hw_if->is_last_desc = xgbe_is_last_desc;
47416- hw_if->is_context_desc = xgbe_is_context_desc;
47417+ .tx_desc_init = xgbe_tx_desc_init,
47418+ .rx_desc_init = xgbe_rx_desc_init,
47419+ .tx_desc_reset = xgbe_tx_desc_reset,
47420+ .rx_desc_reset = xgbe_rx_desc_reset,
47421+ .is_last_desc = xgbe_is_last_desc,
47422+ .is_context_desc = xgbe_is_context_desc,
47423
47424 /* For FLOW ctrl */
47425- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
47426- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
47427+ .config_tx_flow_control = xgbe_config_tx_flow_control,
47428+ .config_rx_flow_control = xgbe_config_rx_flow_control,
47429
47430 /* For RX coalescing */
47431- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
47432- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
47433- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
47434- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
47435+ .config_rx_coalesce = xgbe_config_rx_coalesce,
47436+ .config_tx_coalesce = xgbe_config_tx_coalesce,
47437+ .usec_to_riwt = xgbe_usec_to_riwt,
47438+ .riwt_to_usec = xgbe_riwt_to_usec,
47439
47440 /* For RX and TX threshold config */
47441- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
47442- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
47443+ .config_rx_threshold = xgbe_config_rx_threshold,
47444+ .config_tx_threshold = xgbe_config_tx_threshold,
47445
47446 /* For RX and TX Store and Forward Mode config */
47447- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
47448- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
47449+ .config_rsf_mode = xgbe_config_rsf_mode,
47450+ .config_tsf_mode = xgbe_config_tsf_mode,
47451
47452 /* For TX DMA Operating on Second Frame config */
47453- hw_if->config_osp_mode = xgbe_config_osp_mode;
47454+ .config_osp_mode = xgbe_config_osp_mode,
47455
47456 /* For RX and TX PBL config */
47457- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
47458- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
47459- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
47460- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
47461- hw_if->config_pblx8 = xgbe_config_pblx8;
47462+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
47463+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
47464+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
47465+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
47466+ .config_pblx8 = xgbe_config_pblx8,
47467
47468 /* For MMC statistics support */
47469- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
47470- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
47471- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
47472+ .tx_mmc_int = xgbe_tx_mmc_int,
47473+ .rx_mmc_int = xgbe_rx_mmc_int,
47474+ .read_mmc_stats = xgbe_read_mmc_stats,
47475
47476 /* For PTP config */
47477- hw_if->config_tstamp = xgbe_config_tstamp;
47478- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
47479- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
47480- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
47481- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
47482+ .config_tstamp = xgbe_config_tstamp,
47483+ .update_tstamp_addend = xgbe_update_tstamp_addend,
47484+ .set_tstamp_time = xgbe_set_tstamp_time,
47485+ .get_tstamp_time = xgbe_get_tstamp_time,
47486+ .get_tx_tstamp = xgbe_get_tx_tstamp,
47487
47488 /* For Data Center Bridging config */
47489- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
47490- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
47491-
47492- DBGPR("<--xgbe_init_function_ptrs\n");
47493-}
47494+ .config_dcb_tc = xgbe_config_dcb_tc,
47495+ .config_dcb_pfc = xgbe_config_dcb_pfc,
47496+};
47497diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47498index 2349ea9..a83a677 100644
47499--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47500+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
47501@@ -154,7 +154,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
47502
47503 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47504 {
47505- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47506+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47507 struct xgbe_channel *channel;
47508 enum xgbe_int int_id;
47509 unsigned int i;
47510@@ -176,7 +176,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
47511
47512 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47513 {
47514- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47515+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47516 struct xgbe_channel *channel;
47517 enum xgbe_int int_id;
47518 unsigned int i;
47519@@ -199,7 +199,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
47520 static irqreturn_t xgbe_isr(int irq, void *data)
47521 {
47522 struct xgbe_prv_data *pdata = data;
47523- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47524+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47525 struct xgbe_channel *channel;
47526 unsigned int dma_isr, dma_ch_isr;
47527 unsigned int mac_isr, mac_tssr;
47528@@ -446,7 +446,7 @@ static void xgbe_napi_disable(struct xgbe_prv_data *pdata, unsigned int del)
47529
47530 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47531 {
47532- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47533+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47534
47535 DBGPR("-->xgbe_init_tx_coalesce\n");
47536
47537@@ -460,7 +460,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
47538
47539 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47540 {
47541- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47542+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47543
47544 DBGPR("-->xgbe_init_rx_coalesce\n");
47545
47546@@ -474,7 +474,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
47547
47548 static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
47549 {
47550- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47551+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47552 struct xgbe_channel *channel;
47553 struct xgbe_ring *ring;
47554 struct xgbe_ring_data *rdata;
47555@@ -499,7 +499,7 @@ static void xgbe_free_tx_skbuff(struct xgbe_prv_data *pdata)
47556
47557 static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
47558 {
47559- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47560+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47561 struct xgbe_channel *channel;
47562 struct xgbe_ring *ring;
47563 struct xgbe_ring_data *rdata;
47564@@ -525,7 +525,7 @@ static void xgbe_free_rx_skbuff(struct xgbe_prv_data *pdata)
47565 static void xgbe_adjust_link(struct net_device *netdev)
47566 {
47567 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47568- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47569+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47570 struct phy_device *phydev = pdata->phydev;
47571 int new_state = 0;
47572
47573@@ -633,7 +633,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
47574 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47575 {
47576 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47577- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47578+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47579 unsigned long flags;
47580
47581 DBGPR("-->xgbe_powerdown\n");
47582@@ -671,7 +671,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
47583 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47584 {
47585 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47586- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47587+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47588 unsigned long flags;
47589
47590 DBGPR("-->xgbe_powerup\n");
47591@@ -708,7 +708,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
47592
47593 static int xgbe_start(struct xgbe_prv_data *pdata)
47594 {
47595- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47596+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47597 struct net_device *netdev = pdata->netdev;
47598
47599 DBGPR("-->xgbe_start\n");
47600@@ -734,7 +734,7 @@ static int xgbe_start(struct xgbe_prv_data *pdata)
47601
47602 static void xgbe_stop(struct xgbe_prv_data *pdata)
47603 {
47604- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47605+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47606 struct net_device *netdev = pdata->netdev;
47607
47608 DBGPR("-->xgbe_stop\n");
47609@@ -754,7 +754,7 @@ static void xgbe_stop(struct xgbe_prv_data *pdata)
47610
47611 static void xgbe_restart_dev(struct xgbe_prv_data *pdata, unsigned int reset)
47612 {
47613- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47614+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47615
47616 DBGPR("-->xgbe_restart_dev\n");
47617
47618@@ -951,7 +951,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
47619 return -ERANGE;
47620 }
47621
47622- pdata->hw_if.config_tstamp(pdata, mac_tscr);
47623+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
47624
47625 memcpy(&pdata->tstamp_config, &config, sizeof(config));
47626
47627@@ -1089,8 +1089,8 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
47628 static int xgbe_open(struct net_device *netdev)
47629 {
47630 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47631- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47632- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47633+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47634+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47635 int ret;
47636
47637 DBGPR("-->xgbe_open\n");
47638@@ -1170,8 +1170,8 @@ err_phy_init:
47639 static int xgbe_close(struct net_device *netdev)
47640 {
47641 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47642- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47643- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47644+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47645+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47646
47647 DBGPR("-->xgbe_close\n");
47648
47649@@ -1205,8 +1205,8 @@ static int xgbe_close(struct net_device *netdev)
47650 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
47651 {
47652 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47653- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47654- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47655+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47656+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47657 struct xgbe_channel *channel;
47658 struct xgbe_ring *ring;
47659 struct xgbe_packet_data *packet;
47660@@ -1275,7 +1275,7 @@ tx_netdev_return:
47661 static void xgbe_set_rx_mode(struct net_device *netdev)
47662 {
47663 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47664- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47665+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47666 unsigned int pr_mode, am_mode;
47667
47668 DBGPR("-->xgbe_set_rx_mode\n");
47669@@ -1294,7 +1294,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
47670 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
47671 {
47672 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47673- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47674+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47675 struct sockaddr *saddr = addr;
47676
47677 DBGPR("-->xgbe_set_mac_address\n");
47678@@ -1361,7 +1361,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
47679
47680 DBGPR("-->%s\n", __func__);
47681
47682- pdata->hw_if.read_mmc_stats(pdata);
47683+ pdata->hw_if->read_mmc_stats(pdata);
47684
47685 s->rx_packets = pstats->rxframecount_gb;
47686 s->rx_bytes = pstats->rxoctetcount_gb;
47687@@ -1388,7 +1388,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
47688 u16 vid)
47689 {
47690 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47691- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47692+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47693
47694 DBGPR("-->%s\n", __func__);
47695
47696@@ -1404,7 +1404,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
47697 u16 vid)
47698 {
47699 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47700- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47701+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47702
47703 DBGPR("-->%s\n", __func__);
47704
47705@@ -1464,7 +1464,7 @@ static int xgbe_set_features(struct net_device *netdev,
47706 netdev_features_t features)
47707 {
47708 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47709- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47710+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47711 netdev_features_t rxcsum, rxvlan, rxvlan_filter;
47712
47713 rxcsum = pdata->netdev_features & NETIF_F_RXCSUM;
47714@@ -1520,7 +1520,7 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
47715 static void xgbe_rx_refresh(struct xgbe_channel *channel)
47716 {
47717 struct xgbe_prv_data *pdata = channel->pdata;
47718- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47719+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47720 struct xgbe_ring *ring = channel->rx_ring;
47721 struct xgbe_ring_data *rdata;
47722
47723@@ -1536,8 +1536,8 @@ static void xgbe_rx_refresh(struct xgbe_channel *channel)
47724 static int xgbe_tx_poll(struct xgbe_channel *channel)
47725 {
47726 struct xgbe_prv_data *pdata = channel->pdata;
47727- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47728- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47729+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47730+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47731 struct xgbe_ring *ring = channel->tx_ring;
47732 struct xgbe_ring_data *rdata;
47733 struct xgbe_ring_desc *rdesc;
47734@@ -1589,7 +1589,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
47735 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
47736 {
47737 struct xgbe_prv_data *pdata = channel->pdata;
47738- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47739+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47740 struct xgbe_ring *ring = channel->rx_ring;
47741 struct xgbe_ring_data *rdata;
47742 struct xgbe_packet_data *packet;
47743diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47744index 49508ec..2617cca 100644
47745--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47746+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
47747@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
47748
47749 DBGPR("-->%s\n", __func__);
47750
47751- pdata->hw_if.read_mmc_stats(pdata);
47752+ pdata->hw_if->read_mmc_stats(pdata);
47753 for (i = 0; i < XGBE_STATS_COUNT; i++) {
47754 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
47755 *data++ = *(u64 *)stat;
47756@@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
47757 struct ethtool_coalesce *ec)
47758 {
47759 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47760- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47761+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47762 unsigned int riwt;
47763
47764 DBGPR("-->xgbe_get_coalesce\n");
47765@@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
47766 struct ethtool_coalesce *ec)
47767 {
47768 struct xgbe_prv_data *pdata = netdev_priv(netdev);
47769- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47770+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47771 unsigned int rx_frames, rx_riwt, rx_usecs;
47772 unsigned int tx_frames, tx_usecs;
47773
47774diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47775index f5a8fa0..0bb58ff 100644
47776--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47777+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
47778@@ -209,12 +209,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
47779 DBGPR("<--xgbe_default_config\n");
47780 }
47781
47782-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
47783-{
47784- xgbe_init_function_ptrs_dev(&pdata->hw_if);
47785- xgbe_init_function_ptrs_desc(&pdata->desc_if);
47786-}
47787-
47788 static int xgbe_probe(struct platform_device *pdev)
47789 {
47790 struct xgbe_prv_data *pdata;
47791@@ -327,9 +321,8 @@ static int xgbe_probe(struct platform_device *pdev)
47792 netdev->base_addr = (unsigned long)pdata->xgmac_regs;
47793
47794 /* Set all the function pointers */
47795- xgbe_init_all_fptrs(pdata);
47796- hw_if = &pdata->hw_if;
47797- desc_if = &pdata->desc_if;
47798+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
47799+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
47800
47801 /* Issue software reset to device */
47802 hw_if->exit(pdata);
47803diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47804index 363b210..b241389 100644
47805--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47806+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
47807@@ -126,7 +126,7 @@
47808 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
47809 {
47810 struct xgbe_prv_data *pdata = mii->priv;
47811- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47812+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47813 int mmd_data;
47814
47815 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
47816@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
47817 u16 mmd_val)
47818 {
47819 struct xgbe_prv_data *pdata = mii->priv;
47820- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47821+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47822 int mmd_data = mmd_val;
47823
47824 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
47825diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47826index a1bf9d1c..84adcab 100644
47827--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47828+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
47829@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
47830 tstamp_cc);
47831 u64 nsec;
47832
47833- nsec = pdata->hw_if.get_tstamp_time(pdata);
47834+ nsec = pdata->hw_if->get_tstamp_time(pdata);
47835
47836 return nsec;
47837 }
47838@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
47839
47840 spin_lock_irqsave(&pdata->tstamp_lock, flags);
47841
47842- pdata->hw_if.update_tstamp_addend(pdata, addend);
47843+ pdata->hw_if->update_tstamp_addend(pdata, addend);
47844
47845 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
47846
47847diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
47848index 789957d..d7d0245 100644
47849--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
47850+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
47851@@ -583,8 +583,8 @@ struct xgbe_prv_data {
47852
47853 int irq_number;
47854
47855- struct xgbe_hw_if hw_if;
47856- struct xgbe_desc_if desc_if;
47857+ const struct xgbe_hw_if *hw_if;
47858+ const struct xgbe_desc_if *desc_if;
47859
47860 /* AXI DMA settings */
47861 unsigned int axdomain;
47862@@ -697,6 +697,9 @@ struct xgbe_prv_data {
47863 #endif
47864 };
47865
47866+extern const struct xgbe_hw_if default_xgbe_hw_if;
47867+extern const struct xgbe_desc_if default_xgbe_desc_if;
47868+
47869 /* Function prototypes*/
47870
47871 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
47872diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47873index adcacda..fa6e0ae 100644
47874--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47875+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
47876@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
47877 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
47878 {
47879 /* RX_MODE controlling object */
47880- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
47881+ bnx2x_init_rx_mode_obj(bp);
47882
47883 /* multicast configuration controlling object */
47884 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
47885diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47886index 7bc2924..2112002 100644
47887--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47888+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
47889@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
47890 return rc;
47891 }
47892
47893-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
47894- struct bnx2x_rx_mode_obj *o)
47895+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
47896 {
47897 if (CHIP_IS_E1x(bp)) {
47898- o->wait_comp = bnx2x_empty_rx_mode_wait;
47899- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
47900+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
47901+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
47902 } else {
47903- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
47904- o->config_rx_mode = bnx2x_set_rx_mode_e2;
47905+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
47906+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
47907 }
47908 }
47909
47910diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47911index e97275f..52e28bc 100644
47912--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47913+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
47914@@ -1409,8 +1409,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
47915
47916 /********************* RX MODE ****************/
47917
47918-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
47919- struct bnx2x_rx_mode_obj *o);
47920+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
47921
47922 /**
47923 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
47924diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
47925index 31c9f82..e65e986 100644
47926--- a/drivers/net/ethernet/broadcom/tg3.h
47927+++ b/drivers/net/ethernet/broadcom/tg3.h
47928@@ -150,6 +150,7 @@
47929 #define CHIPREV_ID_5750_A0 0x4000
47930 #define CHIPREV_ID_5750_A1 0x4001
47931 #define CHIPREV_ID_5750_A3 0x4003
47932+#define CHIPREV_ID_5750_C1 0x4201
47933 #define CHIPREV_ID_5750_C2 0x4202
47934 #define CHIPREV_ID_5752_A0_HW 0x5000
47935 #define CHIPREV_ID_5752_A0 0x6000
47936diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
47937index 903466e..b285864 100644
47938--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
47939+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
47940@@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
47941 }
47942
47943 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
47944- bna_cb_ioceth_enable,
47945- bna_cb_ioceth_disable,
47946- bna_cb_ioceth_hbfail,
47947- bna_cb_ioceth_reset
47948+ .enable_cbfn = bna_cb_ioceth_enable,
47949+ .disable_cbfn = bna_cb_ioceth_disable,
47950+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
47951+ .reset_cbfn = bna_cb_ioceth_reset
47952 };
47953
47954 static void bna_attr_init(struct bna_ioceth *ioceth)
47955diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
47956index 8cffcdf..aadf043 100644
47957--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
47958+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
47959@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
47960 */
47961 struct l2t_skb_cb {
47962 arp_failure_handler_func arp_failure_handler;
47963-};
47964+} __no_const;
47965
47966 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
47967
47968diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
47969index 279873c..11e1921 100644
47970--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
47971+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
47972@@ -2365,7 +2365,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
47973
47974 int i;
47975 struct adapter *ap = netdev2adap(dev);
47976- static const unsigned int *reg_ranges;
47977+ const unsigned int *reg_ranges;
47978 int arr_size = 0, buf_size = 0;
47979
47980 if (is_t4(ap->params.chip)) {
47981diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
47982index cf8b6ff..274271e 100644
47983--- a/drivers/net/ethernet/dec/tulip/de4x5.c
47984+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
47985@@ -5387,7 +5387,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
47986 for (i=0; i<ETH_ALEN; i++) {
47987 tmp.addr[i] = dev->dev_addr[i];
47988 }
47989- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
47990+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
47991 break;
47992
47993 case DE4X5_SET_HWADDR: /* Set the hardware address */
47994@@ -5427,7 +5427,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
47995 spin_lock_irqsave(&lp->lock, flags);
47996 memcpy(&statbuf, &lp->pktStats, ioc->len);
47997 spin_unlock_irqrestore(&lp->lock, flags);
47998- if (copy_to_user(ioc->data, &statbuf, ioc->len))
47999+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
48000 return -EFAULT;
48001 break;
48002 }
48003diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
48004index 597c463..5cc1a7f 100644
48005--- a/drivers/net/ethernet/emulex/benet/be_main.c
48006+++ b/drivers/net/ethernet/emulex/benet/be_main.c
48007@@ -537,7 +537,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
48008
48009 if (wrapped)
48010 newacc += 65536;
48011- ACCESS_ONCE(*acc) = newacc;
48012+ ACCESS_ONCE_RW(*acc) = newacc;
48013 }
48014
48015 static void populate_erx_stats(struct be_adapter *adapter,
48016diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
48017index c77fa4a..7fd42fc 100644
48018--- a/drivers/net/ethernet/faraday/ftgmac100.c
48019+++ b/drivers/net/ethernet/faraday/ftgmac100.c
48020@@ -30,6 +30,8 @@
48021 #include <linux/netdevice.h>
48022 #include <linux/phy.h>
48023 #include <linux/platform_device.h>
48024+#include <linux/interrupt.h>
48025+#include <linux/irqreturn.h>
48026 #include <net/ip.h>
48027
48028 #include "ftgmac100.h"
48029diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
48030index 4ff1adc..0ea6bf4 100644
48031--- a/drivers/net/ethernet/faraday/ftmac100.c
48032+++ b/drivers/net/ethernet/faraday/ftmac100.c
48033@@ -31,6 +31,8 @@
48034 #include <linux/module.h>
48035 #include <linux/netdevice.h>
48036 #include <linux/platform_device.h>
48037+#include <linux/interrupt.h>
48038+#include <linux/irqreturn.h>
48039
48040 #include "ftmac100.h"
48041
48042diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48043index 537b621..07f87ce 100644
48044--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48045+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48046@@ -401,7 +401,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
48047 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
48048
48049 /* Update the base adjustement value. */
48050- ACCESS_ONCE(pf->ptp_base_adj) = incval;
48051+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
48052 smp_mb(); /* Force the above update. */
48053 }
48054
48055diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48056index 5fd4b52..87aa34b 100644
48057--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48058+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48059@@ -794,7 +794,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
48060 }
48061
48062 /* update the base incval used to calculate frequency adjustment */
48063- ACCESS_ONCE(adapter->base_incval) = incval;
48064+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
48065 smp_mb();
48066
48067 /* need lock to prevent incorrect read while modifying cyclecounter */
48068diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48069index 454d9fe..59f0f0b 100644
48070--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48071+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48072@@ -458,8 +458,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
48073 wmb();
48074
48075 /* we want to dirty this cache line once */
48076- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
48077- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
48078+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
48079+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
48080
48081 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
48082
48083diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48084index 2bbd01f..e8baa64 100644
48085--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
48086+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48087@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48088 struct __vxge_hw_fifo *fifo;
48089 struct vxge_hw_fifo_config *config;
48090 u32 txdl_size, txdl_per_memblock;
48091- struct vxge_hw_mempool_cbs fifo_mp_callback;
48092+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
48093+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
48094+ };
48095+
48096 struct __vxge_hw_virtualpath *vpath;
48097
48098 if ((vp == NULL) || (attr == NULL)) {
48099@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48100 goto exit;
48101 }
48102
48103- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
48104-
48105 fifo->mempool =
48106 __vxge_hw_mempool_create(vpath->hldev,
48107 fifo->config->memblock_size,
48108diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48109index 2bb48d5..d1a865d 100644
48110--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48111+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48112@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
48113 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
48114 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
48115 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
48116- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48117+ pax_open_kernel();
48118+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48119+ pax_close_kernel();
48120 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48121 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
48122 max_tx_rings = QLCNIC_MAX_TX_RINGS;
48123diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48124index be7d7a6..a8983f8 100644
48125--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48126+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48127@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
48128 case QLCNIC_NON_PRIV_FUNC:
48129 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
48130 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48131- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48132+ pax_open_kernel();
48133+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48134+ pax_close_kernel();
48135 break;
48136 case QLCNIC_PRIV_FUNC:
48137 ahw->op_mode = QLCNIC_PRIV_FUNC;
48138 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
48139- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48140+ pax_open_kernel();
48141+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48142+ pax_close_kernel();
48143 break;
48144 case QLCNIC_MGMT_FUNC:
48145 ahw->op_mode = QLCNIC_MGMT_FUNC;
48146 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48147- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48148+ pax_open_kernel();
48149+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48150+ pax_close_kernel();
48151 break;
48152 default:
48153 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
48154diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48155index c9f57fb..208bdc1 100644
48156--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48157+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48158@@ -1285,7 +1285,7 @@ flash_temp:
48159 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
48160 {
48161 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
48162- static const struct qlcnic_dump_operations *fw_dump_ops;
48163+ const struct qlcnic_dump_operations *fw_dump_ops;
48164 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
48165 u32 entry_offset, dump, no_entries, buf_offset = 0;
48166 int i, k, ops_cnt, ops_index, dump_size = 0;
48167diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
48168index cf154f7..c948d1b 100644
48169--- a/drivers/net/ethernet/realtek/r8169.c
48170+++ b/drivers/net/ethernet/realtek/r8169.c
48171@@ -788,22 +788,22 @@ struct rtl8169_private {
48172 struct mdio_ops {
48173 void (*write)(struct rtl8169_private *, int, int);
48174 int (*read)(struct rtl8169_private *, int);
48175- } mdio_ops;
48176+ } __no_const mdio_ops;
48177
48178 struct pll_power_ops {
48179 void (*down)(struct rtl8169_private *);
48180 void (*up)(struct rtl8169_private *);
48181- } pll_power_ops;
48182+ } __no_const pll_power_ops;
48183
48184 struct jumbo_ops {
48185 void (*enable)(struct rtl8169_private *);
48186 void (*disable)(struct rtl8169_private *);
48187- } jumbo_ops;
48188+ } __no_const jumbo_ops;
48189
48190 struct csi_ops {
48191 void (*write)(struct rtl8169_private *, int, int);
48192 u32 (*read)(struct rtl8169_private *, int);
48193- } csi_ops;
48194+ } __no_const csi_ops;
48195
48196 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
48197 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
48198diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
48199index 6b861e3..204ac86 100644
48200--- a/drivers/net/ethernet/sfc/ptp.c
48201+++ b/drivers/net/ethernet/sfc/ptp.c
48202@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
48203 ptp->start.dma_addr);
48204
48205 /* Clear flag that signals MC ready */
48206- ACCESS_ONCE(*start) = 0;
48207+ ACCESS_ONCE_RW(*start) = 0;
48208 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
48209 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
48210 EFX_BUG_ON_PARANOID(rc);
48211diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48212index 08c483b..2c4a553 100644
48213--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48214+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48215@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
48216
48217 writel(value, ioaddr + MMC_CNTRL);
48218
48219- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48220- MMC_CNTRL, value);
48221+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48222+// MMC_CNTRL, value);
48223 }
48224
48225 /* To mask all all interrupts.*/
48226diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
48227index 2f48f79..8ae1a1a 100644
48228--- a/drivers/net/hyperv/hyperv_net.h
48229+++ b/drivers/net/hyperv/hyperv_net.h
48230@@ -171,7 +171,7 @@ struct rndis_device {
48231 enum rndis_device_state state;
48232 bool link_state;
48233 bool link_change;
48234- atomic_t new_req_id;
48235+ atomic_unchecked_t new_req_id;
48236
48237 spinlock_t request_lock;
48238 struct list_head req_list;
48239diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
48240index 2b86f0b..ecc996f 100644
48241--- a/drivers/net/hyperv/rndis_filter.c
48242+++ b/drivers/net/hyperv/rndis_filter.c
48243@@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
48244 * template
48245 */
48246 set = &rndis_msg->msg.set_req;
48247- set->req_id = atomic_inc_return(&dev->new_req_id);
48248+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48249
48250 /* Add to the request list */
48251 spin_lock_irqsave(&dev->request_lock, flags);
48252@@ -911,7 +911,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
48253
48254 /* Setup the rndis set */
48255 halt = &request->request_msg.msg.halt_req;
48256- halt->req_id = atomic_inc_return(&dev->new_req_id);
48257+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48258
48259 /* Ignore return since this msg is optional. */
48260 rndis_filter_send_request(dev, request);
48261diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
48262index 6cbc56a..5f7e6c8 100644
48263--- a/drivers/net/ieee802154/fakehard.c
48264+++ b/drivers/net/ieee802154/fakehard.c
48265@@ -365,7 +365,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
48266 phy->transmit_power = 0xbf;
48267
48268 dev->netdev_ops = &fake_ops;
48269- dev->ml_priv = &fake_mlme;
48270+ dev->ml_priv = (void *)&fake_mlme;
48271
48272 priv = netdev_priv(dev);
48273 priv->phy = phy;
48274diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
48275index 34f846b..4a0d5b1 100644
48276--- a/drivers/net/ifb.c
48277+++ b/drivers/net/ifb.c
48278@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
48279 return 0;
48280 }
48281
48282-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
48283+static struct rtnl_link_ops ifb_link_ops = {
48284 .kind = "ifb",
48285 .priv_size = sizeof(struct ifb_private),
48286 .setup = ifb_setup,
48287diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
48288index bfb0b6e..5c396ce 100644
48289--- a/drivers/net/macvlan.c
48290+++ b/drivers/net/macvlan.c
48291@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
48292 free_nskb:
48293 kfree_skb(nskb);
48294 err:
48295- atomic_long_inc(&skb->dev->rx_dropped);
48296+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
48297 }
48298
48299 static void macvlan_flush_sources(struct macvlan_port *port,
48300@@ -1454,13 +1454,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
48301 int macvlan_link_register(struct rtnl_link_ops *ops)
48302 {
48303 /* common fields */
48304- ops->priv_size = sizeof(struct macvlan_dev);
48305- ops->validate = macvlan_validate;
48306- ops->maxtype = IFLA_MACVLAN_MAX;
48307- ops->policy = macvlan_policy;
48308- ops->changelink = macvlan_changelink;
48309- ops->get_size = macvlan_get_size;
48310- ops->fill_info = macvlan_fill_info;
48311+ pax_open_kernel();
48312+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
48313+ *(void **)&ops->validate = macvlan_validate;
48314+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
48315+ *(const void **)&ops->policy = macvlan_policy;
48316+ *(void **)&ops->changelink = macvlan_changelink;
48317+ *(void **)&ops->get_size = macvlan_get_size;
48318+ *(void **)&ops->fill_info = macvlan_fill_info;
48319+ pax_close_kernel();
48320
48321 return rtnl_link_register(ops);
48322 };
48323@@ -1540,7 +1542,7 @@ static int macvlan_device_event(struct notifier_block *unused,
48324 return NOTIFY_DONE;
48325 }
48326
48327-static struct notifier_block macvlan_notifier_block __read_mostly = {
48328+static struct notifier_block macvlan_notifier_block = {
48329 .notifier_call = macvlan_device_event,
48330 };
48331
48332diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
48333index 880cc09..6a68ba6 100644
48334--- a/drivers/net/macvtap.c
48335+++ b/drivers/net/macvtap.c
48336@@ -422,7 +422,7 @@ static void macvtap_setup(struct net_device *dev)
48337 dev->tx_queue_len = TUN_READQ_SIZE;
48338 }
48339
48340-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
48341+static struct rtnl_link_ops macvtap_link_ops = {
48342 .kind = "macvtap",
48343 .setup = macvtap_setup,
48344 .newlink = macvtap_newlink,
48345@@ -1020,7 +1020,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
48346 }
48347
48348 ret = 0;
48349- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48350+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48351 put_user(q->flags, &ifr->ifr_flags))
48352 ret = -EFAULT;
48353 macvtap_put_vlan(vlan);
48354@@ -1190,7 +1190,7 @@ static int macvtap_device_event(struct notifier_block *unused,
48355 return NOTIFY_DONE;
48356 }
48357
48358-static struct notifier_block macvtap_notifier_block __read_mostly = {
48359+static struct notifier_block macvtap_notifier_block = {
48360 .notifier_call = macvtap_device_event,
48361 };
48362
48363diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
48364index 34924df..a747360 100644
48365--- a/drivers/net/nlmon.c
48366+++ b/drivers/net/nlmon.c
48367@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
48368 return 0;
48369 }
48370
48371-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
48372+static struct rtnl_link_ops nlmon_link_ops = {
48373 .kind = "nlmon",
48374 .priv_size = sizeof(struct nlmon),
48375 .setup = nlmon_setup,
48376diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
48377index 794a473..9fd437b 100644
48378--- a/drivers/net/ppp/ppp_generic.c
48379+++ b/drivers/net/ppp/ppp_generic.c
48380@@ -1020,7 +1020,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48381 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
48382 struct ppp_stats stats;
48383 struct ppp_comp_stats cstats;
48384- char *vers;
48385
48386 switch (cmd) {
48387 case SIOCGPPPSTATS:
48388@@ -1042,8 +1041,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48389 break;
48390
48391 case SIOCGPPPVER:
48392- vers = PPP_VERSION;
48393- if (copy_to_user(addr, vers, strlen(vers) + 1))
48394+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
48395 break;
48396 err = 0;
48397 break;
48398diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
48399index 079f7ad..b2a2bfa7 100644
48400--- a/drivers/net/slip/slhc.c
48401+++ b/drivers/net/slip/slhc.c
48402@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
48403 register struct tcphdr *thp;
48404 register struct iphdr *ip;
48405 register struct cstate *cs;
48406- int len, hdrlen;
48407+ long len, hdrlen;
48408 unsigned char *cp = icp;
48409
48410 /* We've got a compressed packet; read the change byte */
48411diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
48412index 2368395..bf6fe96 100644
48413--- a/drivers/net/team/team.c
48414+++ b/drivers/net/team/team.c
48415@@ -2090,7 +2090,7 @@ static unsigned int team_get_num_rx_queues(void)
48416 return TEAM_DEFAULT_NUM_RX_QUEUES;
48417 }
48418
48419-static struct rtnl_link_ops team_link_ops __read_mostly = {
48420+static struct rtnl_link_ops team_link_ops = {
48421 .kind = DRV_NAME,
48422 .priv_size = sizeof(struct team),
48423 .setup = team_setup,
48424@@ -2880,7 +2880,7 @@ static int team_device_event(struct notifier_block *unused,
48425 return NOTIFY_DONE;
48426 }
48427
48428-static struct notifier_block team_notifier_block __read_mostly = {
48429+static struct notifier_block team_notifier_block = {
48430 .notifier_call = team_device_event,
48431 };
48432
48433diff --git a/drivers/net/tun.c b/drivers/net/tun.c
48434index 9dd3746..74f191e 100644
48435--- a/drivers/net/tun.c
48436+++ b/drivers/net/tun.c
48437@@ -1426,7 +1426,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
48438 return -EINVAL;
48439 }
48440
48441-static struct rtnl_link_ops tun_link_ops __read_mostly = {
48442+static struct rtnl_link_ops tun_link_ops = {
48443 .kind = DRV_NAME,
48444 .priv_size = sizeof(struct tun_struct),
48445 .setup = tun_setup,
48446@@ -1868,7 +1868,7 @@ unlock:
48447 }
48448
48449 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48450- unsigned long arg, int ifreq_len)
48451+ unsigned long arg, size_t ifreq_len)
48452 {
48453 struct tun_file *tfile = file->private_data;
48454 struct tun_struct *tun;
48455@@ -1881,6 +1881,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
48456 unsigned int ifindex;
48457 int ret;
48458
48459+ if (ifreq_len > sizeof ifr)
48460+ return -EFAULT;
48461+
48462 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
48463 if (copy_from_user(&ifr, argp, ifreq_len))
48464 return -EFAULT;
48465diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
48466index babda7d..e40c90a 100644
48467--- a/drivers/net/usb/hso.c
48468+++ b/drivers/net/usb/hso.c
48469@@ -71,7 +71,7 @@
48470 #include <asm/byteorder.h>
48471 #include <linux/serial_core.h>
48472 #include <linux/serial.h>
48473-
48474+#include <asm/local.h>
48475
48476 #define MOD_AUTHOR "Option Wireless"
48477 #define MOD_DESCRIPTION "USB High Speed Option driver"
48478@@ -1178,7 +1178,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
48479 struct urb *urb;
48480
48481 urb = serial->rx_urb[0];
48482- if (serial->port.count > 0) {
48483+ if (atomic_read(&serial->port.count) > 0) {
48484 count = put_rxbuf_data(urb, serial);
48485 if (count == -1)
48486 return;
48487@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
48488 DUMP1(urb->transfer_buffer, urb->actual_length);
48489
48490 /* Anyone listening? */
48491- if (serial->port.count == 0)
48492+ if (atomic_read(&serial->port.count) == 0)
48493 return;
48494
48495 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
48496@@ -1278,8 +1278,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48497 tty_port_tty_set(&serial->port, tty);
48498
48499 /* check for port already opened, if not set the termios */
48500- serial->port.count++;
48501- if (serial->port.count == 1) {
48502+ if (atomic_inc_return(&serial->port.count) == 1) {
48503 serial->rx_state = RX_IDLE;
48504 /* Force default termio settings */
48505 _hso_serial_set_termios(tty, NULL);
48506@@ -1289,7 +1288,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
48507 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
48508 if (result) {
48509 hso_stop_serial_device(serial->parent);
48510- serial->port.count--;
48511+ atomic_dec(&serial->port.count);
48512 kref_put(&serial->parent->ref, hso_serial_ref_free);
48513 }
48514 } else {
48515@@ -1326,10 +1325,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
48516
48517 /* reset the rts and dtr */
48518 /* do the actual close */
48519- serial->port.count--;
48520+ atomic_dec(&serial->port.count);
48521
48522- if (serial->port.count <= 0) {
48523- serial->port.count = 0;
48524+ if (atomic_read(&serial->port.count) <= 0) {
48525+ atomic_set(&serial->port.count, 0);
48526 tty_port_tty_set(&serial->port, NULL);
48527 if (!usb_gone)
48528 hso_stop_serial_device(serial->parent);
48529@@ -1404,7 +1403,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
48530
48531 /* the actual setup */
48532 spin_lock_irqsave(&serial->serial_lock, flags);
48533- if (serial->port.count)
48534+ if (atomic_read(&serial->port.count))
48535 _hso_serial_set_termios(tty, old);
48536 else
48537 tty->termios = *old;
48538@@ -1873,7 +1872,7 @@ static void intr_callback(struct urb *urb)
48539 D1("Pending read interrupt on port %d\n", i);
48540 spin_lock(&serial->serial_lock);
48541 if (serial->rx_state == RX_IDLE &&
48542- serial->port.count > 0) {
48543+ atomic_read(&serial->port.count) > 0) {
48544 /* Setup and send a ctrl req read on
48545 * port i */
48546 if (!serial->rx_urb_filled[0]) {
48547@@ -3047,7 +3046,7 @@ static int hso_resume(struct usb_interface *iface)
48548 /* Start all serial ports */
48549 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
48550 if (serial_table[i] && (serial_table[i]->interface == iface)) {
48551- if (dev2ser(serial_table[i])->port.count) {
48552+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
48553 result =
48554 hso_start_serial_device(serial_table[i], GFP_NOIO);
48555 hso_kick_transmit(dev2ser(serial_table[i]));
48556diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
48557index c6554c7..7e2ebd7 100644
48558--- a/drivers/net/usb/r8152.c
48559+++ b/drivers/net/usb/r8152.c
48560@@ -577,7 +577,7 @@ struct r8152 {
48561 void (*unload)(struct r8152 *);
48562 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
48563 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
48564- } rtl_ops;
48565+ } __no_const rtl_ops;
48566
48567 int intr_interval;
48568 u32 saved_wolopts;
48569diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
48570index a2515887..6d13233 100644
48571--- a/drivers/net/usb/sierra_net.c
48572+++ b/drivers/net/usb/sierra_net.c
48573@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
48574 /* atomic counter partially included in MAC address to make sure 2 devices
48575 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
48576 */
48577-static atomic_t iface_counter = ATOMIC_INIT(0);
48578+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
48579
48580 /*
48581 * SYNC Timer Delay definition used to set the expiry time
48582@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
48583 dev->net->netdev_ops = &sierra_net_device_ops;
48584
48585 /* change MAC addr to include, ifacenum, and to be unique */
48586- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
48587+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
48588 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
48589
48590 /* we will have to manufacture ethernet headers, prepare template */
48591diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
48592index b0bc8ea..3af931b5 100644
48593--- a/drivers/net/virtio_net.c
48594+++ b/drivers/net/virtio_net.c
48595@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
48596 #define RECEIVE_AVG_WEIGHT 64
48597
48598 /* Minimum alignment for mergeable packet buffers. */
48599-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
48600+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
48601
48602 #define VIRTNET_DRIVER_VERSION "1.0.0"
48603
48604diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
48605index 42b2d6a5..2a2cb41 100644
48606--- a/drivers/net/vxlan.c
48607+++ b/drivers/net/vxlan.c
48608@@ -2695,7 +2695,7 @@ nla_put_failure:
48609 return -EMSGSIZE;
48610 }
48611
48612-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
48613+static struct rtnl_link_ops vxlan_link_ops = {
48614 .kind = "vxlan",
48615 .maxtype = IFLA_VXLAN_MAX,
48616 .policy = vxlan_policy,
48617@@ -2742,7 +2742,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
48618 return NOTIFY_DONE;
48619 }
48620
48621-static struct notifier_block vxlan_notifier_block __read_mostly = {
48622+static struct notifier_block vxlan_notifier_block = {
48623 .notifier_call = vxlan_lowerdev_event,
48624 };
48625
48626diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
48627index 5920c99..ff2e4a5 100644
48628--- a/drivers/net/wan/lmc/lmc_media.c
48629+++ b/drivers/net/wan/lmc/lmc_media.c
48630@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
48631 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
48632
48633 lmc_media_t lmc_ds3_media = {
48634- lmc_ds3_init, /* special media init stuff */
48635- lmc_ds3_default, /* reset to default state */
48636- lmc_ds3_set_status, /* reset status to state provided */
48637- lmc_dummy_set_1, /* set clock source */
48638- lmc_dummy_set2_1, /* set line speed */
48639- lmc_ds3_set_100ft, /* set cable length */
48640- lmc_ds3_set_scram, /* set scrambler */
48641- lmc_ds3_get_link_status, /* get link status */
48642- lmc_dummy_set_1, /* set link status */
48643- lmc_ds3_set_crc_length, /* set CRC length */
48644- lmc_dummy_set_1, /* set T1 or E1 circuit type */
48645- lmc_ds3_watchdog
48646+ .init = lmc_ds3_init, /* special media init stuff */
48647+ .defaults = lmc_ds3_default, /* reset to default state */
48648+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
48649+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
48650+ .set_speed = lmc_dummy_set2_1, /* set line speed */
48651+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
48652+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
48653+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
48654+ .set_link_status = lmc_dummy_set_1, /* set link status */
48655+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
48656+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48657+ .watchdog = lmc_ds3_watchdog
48658 };
48659
48660 lmc_media_t lmc_hssi_media = {
48661- lmc_hssi_init, /* special media init stuff */
48662- lmc_hssi_default, /* reset to default state */
48663- lmc_hssi_set_status, /* reset status to state provided */
48664- lmc_hssi_set_clock, /* set clock source */
48665- lmc_dummy_set2_1, /* set line speed */
48666- lmc_dummy_set_1, /* set cable length */
48667- lmc_dummy_set_1, /* set scrambler */
48668- lmc_hssi_get_link_status, /* get link status */
48669- lmc_hssi_set_link_status, /* set link status */
48670- lmc_hssi_set_crc_length, /* set CRC length */
48671- lmc_dummy_set_1, /* set T1 or E1 circuit type */
48672- lmc_hssi_watchdog
48673+ .init = lmc_hssi_init, /* special media init stuff */
48674+ .defaults = lmc_hssi_default, /* reset to default state */
48675+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
48676+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
48677+ .set_speed = lmc_dummy_set2_1, /* set line speed */
48678+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
48679+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48680+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
48681+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
48682+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
48683+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48684+ .watchdog = lmc_hssi_watchdog
48685 };
48686
48687-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
48688- lmc_ssi_default, /* reset to default state */
48689- lmc_ssi_set_status, /* reset status to state provided */
48690- lmc_ssi_set_clock, /* set clock source */
48691- lmc_ssi_set_speed, /* set line speed */
48692- lmc_dummy_set_1, /* set cable length */
48693- lmc_dummy_set_1, /* set scrambler */
48694- lmc_ssi_get_link_status, /* get link status */
48695- lmc_ssi_set_link_status, /* set link status */
48696- lmc_ssi_set_crc_length, /* set CRC length */
48697- lmc_dummy_set_1, /* set T1 or E1 circuit type */
48698- lmc_ssi_watchdog
48699+lmc_media_t lmc_ssi_media = {
48700+ .init = lmc_ssi_init, /* special media init stuff */
48701+ .defaults = lmc_ssi_default, /* reset to default state */
48702+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
48703+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
48704+ .set_speed = lmc_ssi_set_speed, /* set line speed */
48705+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
48706+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48707+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
48708+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
48709+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
48710+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
48711+ .watchdog = lmc_ssi_watchdog
48712 };
48713
48714 lmc_media_t lmc_t1_media = {
48715- lmc_t1_init, /* special media init stuff */
48716- lmc_t1_default, /* reset to default state */
48717- lmc_t1_set_status, /* reset status to state provided */
48718- lmc_t1_set_clock, /* set clock source */
48719- lmc_dummy_set2_1, /* set line speed */
48720- lmc_dummy_set_1, /* set cable length */
48721- lmc_dummy_set_1, /* set scrambler */
48722- lmc_t1_get_link_status, /* get link status */
48723- lmc_dummy_set_1, /* set link status */
48724- lmc_t1_set_crc_length, /* set CRC length */
48725- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
48726- lmc_t1_watchdog
48727+ .init = lmc_t1_init, /* special media init stuff */
48728+ .defaults = lmc_t1_default, /* reset to default state */
48729+ .set_status = lmc_t1_set_status, /* reset status to state provided */
48730+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
48731+ .set_speed = lmc_dummy_set2_1, /* set line speed */
48732+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
48733+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
48734+ .get_link_status = lmc_t1_get_link_status, /* get link status */
48735+ .set_link_status = lmc_dummy_set_1, /* set link status */
48736+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
48737+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
48738+ .watchdog = lmc_t1_watchdog
48739 };
48740
48741 static void
48742diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
48743index feacc3b..5bac0de 100644
48744--- a/drivers/net/wan/z85230.c
48745+++ b/drivers/net/wan/z85230.c
48746@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
48747
48748 struct z8530_irqhandler z8530_sync =
48749 {
48750- z8530_rx,
48751- z8530_tx,
48752- z8530_status
48753+ .rx = z8530_rx,
48754+ .tx = z8530_tx,
48755+ .status = z8530_status
48756 };
48757
48758 EXPORT_SYMBOL(z8530_sync);
48759@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
48760 }
48761
48762 static struct z8530_irqhandler z8530_dma_sync = {
48763- z8530_dma_rx,
48764- z8530_dma_tx,
48765- z8530_dma_status
48766+ .rx = z8530_dma_rx,
48767+ .tx = z8530_dma_tx,
48768+ .status = z8530_dma_status
48769 };
48770
48771 static struct z8530_irqhandler z8530_txdma_sync = {
48772- z8530_rx,
48773- z8530_dma_tx,
48774- z8530_dma_status
48775+ .rx = z8530_rx,
48776+ .tx = z8530_dma_tx,
48777+ .status = z8530_dma_status
48778 };
48779
48780 /**
48781@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
48782
48783 struct z8530_irqhandler z8530_nop=
48784 {
48785- z8530_rx_clear,
48786- z8530_tx_clear,
48787- z8530_status_clear
48788+ .rx = z8530_rx_clear,
48789+ .tx = z8530_tx_clear,
48790+ .status = z8530_status_clear
48791 };
48792
48793
48794diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
48795index 0b60295..b8bfa5b 100644
48796--- a/drivers/net/wimax/i2400m/rx.c
48797+++ b/drivers/net/wimax/i2400m/rx.c
48798@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
48799 if (i2400m->rx_roq == NULL)
48800 goto error_roq_alloc;
48801
48802- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
48803+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
48804 GFP_KERNEL);
48805 if (rd == NULL) {
48806 result = -ENOMEM;
48807diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
48808index e71a2ce..2268d61 100644
48809--- a/drivers/net/wireless/airo.c
48810+++ b/drivers/net/wireless/airo.c
48811@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
48812 struct airo_info *ai = dev->ml_priv;
48813 int ridcode;
48814 int enabled;
48815- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
48816+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
48817 unsigned char *iobuf;
48818
48819 /* Only super-user can write RIDs */
48820diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
48821index da92bfa..5a9001a 100644
48822--- a/drivers/net/wireless/at76c50x-usb.c
48823+++ b/drivers/net/wireless/at76c50x-usb.c
48824@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
48825 }
48826
48827 /* Convert timeout from the DFU status to jiffies */
48828-static inline unsigned long at76_get_timeout(struct dfu_status *s)
48829+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
48830 {
48831 return msecs_to_jiffies((s->poll_timeout[2] << 16)
48832 | (s->poll_timeout[1] << 8)
48833diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
48834index 676bd4e..0b807a3 100644
48835--- a/drivers/net/wireless/ath/ath10k/htc.c
48836+++ b/drivers/net/wireless/ath/ath10k/htc.c
48837@@ -848,7 +848,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
48838 /* registered target arrival callback from the HIF layer */
48839 int ath10k_htc_init(struct ath10k *ar)
48840 {
48841- struct ath10k_hif_cb htc_callbacks;
48842+ static struct ath10k_hif_cb htc_callbacks = {
48843+ .rx_completion = ath10k_htc_rx_completion_handler,
48844+ .tx_completion = ath10k_htc_tx_completion_handler,
48845+ };
48846 struct ath10k_htc_ep *ep = NULL;
48847 struct ath10k_htc *htc = &ar->htc;
48848
48849@@ -857,8 +860,6 @@ int ath10k_htc_init(struct ath10k *ar)
48850 ath10k_htc_reset_endpoint_states(htc);
48851
48852 /* setup HIF layer callbacks */
48853- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
48854- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
48855 htc->ar = ar;
48856
48857 /* Get HIF default pipe for HTC message exchange */
48858diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
48859index 527179c..a890150 100644
48860--- a/drivers/net/wireless/ath/ath10k/htc.h
48861+++ b/drivers/net/wireless/ath/ath10k/htc.h
48862@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
48863
48864 struct ath10k_htc_ops {
48865 void (*target_send_suspend_complete)(struct ath10k *ar);
48866-};
48867+} __no_const;
48868
48869 struct ath10k_htc_ep_ops {
48870 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
48871 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
48872 void (*ep_tx_credits)(struct ath10k *);
48873-};
48874+} __no_const;
48875
48876 /* service connection information */
48877 struct ath10k_htc_svc_conn_req {
48878diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48879index 2a93519..7052786 100644
48880--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48881+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
48882@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48883 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
48884 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
48885
48886- ACCESS_ONCE(ads->ds_link) = i->link;
48887- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
48888+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
48889+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
48890
48891 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
48892 ctl6 = SM(i->keytype, AR_EncrType);
48893@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48894
48895 if ((i->is_first || i->is_last) &&
48896 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
48897- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
48898+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
48899 | set11nTries(i->rates, 1)
48900 | set11nTries(i->rates, 2)
48901 | set11nTries(i->rates, 3)
48902 | (i->dur_update ? AR_DurUpdateEna : 0)
48903 | SM(0, AR_BurstDur);
48904
48905- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
48906+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
48907 | set11nRate(i->rates, 1)
48908 | set11nRate(i->rates, 2)
48909 | set11nRate(i->rates, 3);
48910 } else {
48911- ACCESS_ONCE(ads->ds_ctl2) = 0;
48912- ACCESS_ONCE(ads->ds_ctl3) = 0;
48913+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
48914+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
48915 }
48916
48917 if (!i->is_first) {
48918- ACCESS_ONCE(ads->ds_ctl0) = 0;
48919- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
48920- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
48921+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
48922+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
48923+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
48924 return;
48925 }
48926
48927@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48928 break;
48929 }
48930
48931- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
48932+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
48933 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
48934 | SM(i->txpower, AR_XmitPower0)
48935 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
48936@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48937 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
48938 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
48939
48940- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
48941- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
48942+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
48943+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
48944
48945 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
48946 return;
48947
48948- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
48949+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
48950 | set11nPktDurRTSCTS(i->rates, 1);
48951
48952- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
48953+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
48954 | set11nPktDurRTSCTS(i->rates, 3);
48955
48956- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
48957+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
48958 | set11nRateFlags(i->rates, 1)
48959 | set11nRateFlags(i->rates, 2)
48960 | set11nRateFlags(i->rates, 3)
48961 | SM(i->rtscts_rate, AR_RTSCTSRate);
48962
48963- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
48964- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
48965- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
48966+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower, AR_XmitPower1);
48967+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower, AR_XmitPower2);
48968+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower, AR_XmitPower3);
48969 }
48970
48971 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
48972diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
48973index 057b165..98ae88f 100644
48974--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
48975+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
48976@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
48977 (i->qcu << AR_TxQcuNum_S) | desc_len;
48978
48979 checksum += val;
48980- ACCESS_ONCE(ads->info) = val;
48981+ ACCESS_ONCE_RW(ads->info) = val;
48982
48983 checksum += i->link;
48984- ACCESS_ONCE(ads->link) = i->link;
48985+ ACCESS_ONCE_RW(ads->link) = i->link;
48986
48987 checksum += i->buf_addr[0];
48988- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
48989+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
48990 checksum += i->buf_addr[1];
48991- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
48992+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
48993 checksum += i->buf_addr[2];
48994- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
48995+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
48996 checksum += i->buf_addr[3];
48997- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
48998+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
48999
49000 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
49001- ACCESS_ONCE(ads->ctl3) = val;
49002+ ACCESS_ONCE_RW(ads->ctl3) = val;
49003 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
49004- ACCESS_ONCE(ads->ctl5) = val;
49005+ ACCESS_ONCE_RW(ads->ctl5) = val;
49006 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
49007- ACCESS_ONCE(ads->ctl7) = val;
49008+ ACCESS_ONCE_RW(ads->ctl7) = val;
49009 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
49010- ACCESS_ONCE(ads->ctl9) = val;
49011+ ACCESS_ONCE_RW(ads->ctl9) = val;
49012
49013 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
49014- ACCESS_ONCE(ads->ctl10) = checksum;
49015+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
49016
49017 if (i->is_first || i->is_last) {
49018- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
49019+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
49020 | set11nTries(i->rates, 1)
49021 | set11nTries(i->rates, 2)
49022 | set11nTries(i->rates, 3)
49023 | (i->dur_update ? AR_DurUpdateEna : 0)
49024 | SM(0, AR_BurstDur);
49025
49026- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
49027+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
49028 | set11nRate(i->rates, 1)
49029 | set11nRate(i->rates, 2)
49030 | set11nRate(i->rates, 3);
49031 } else {
49032- ACCESS_ONCE(ads->ctl13) = 0;
49033- ACCESS_ONCE(ads->ctl14) = 0;
49034+ ACCESS_ONCE_RW(ads->ctl13) = 0;
49035+ ACCESS_ONCE_RW(ads->ctl14) = 0;
49036 }
49037
49038 ads->ctl20 = 0;
49039@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49040
49041 ctl17 = SM(i->keytype, AR_EncrType);
49042 if (!i->is_first) {
49043- ACCESS_ONCE(ads->ctl11) = 0;
49044- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49045- ACCESS_ONCE(ads->ctl15) = 0;
49046- ACCESS_ONCE(ads->ctl16) = 0;
49047- ACCESS_ONCE(ads->ctl17) = ctl17;
49048- ACCESS_ONCE(ads->ctl18) = 0;
49049- ACCESS_ONCE(ads->ctl19) = 0;
49050+ ACCESS_ONCE_RW(ads->ctl11) = 0;
49051+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49052+ ACCESS_ONCE_RW(ads->ctl15) = 0;
49053+ ACCESS_ONCE_RW(ads->ctl16) = 0;
49054+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49055+ ACCESS_ONCE_RW(ads->ctl18) = 0;
49056+ ACCESS_ONCE_RW(ads->ctl19) = 0;
49057 return;
49058 }
49059
49060- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49061+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49062 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49063 | SM(i->txpower, AR_XmitPower0)
49064 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49065@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49066 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
49067 ctl12 |= SM(val, AR_PAPRDChainMask);
49068
49069- ACCESS_ONCE(ads->ctl12) = ctl12;
49070- ACCESS_ONCE(ads->ctl17) = ctl17;
49071+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
49072+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49073
49074- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49075+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49076 | set11nPktDurRTSCTS(i->rates, 1);
49077
49078- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49079+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49080 | set11nPktDurRTSCTS(i->rates, 3);
49081
49082- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
49083+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
49084 | set11nRateFlags(i->rates, 1)
49085 | set11nRateFlags(i->rates, 2)
49086 | set11nRateFlags(i->rates, 3)
49087 | SM(i->rtscts_rate, AR_RTSCTSRate);
49088
49089- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
49090+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
49091
49092- ACCESS_ONCE(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
49093- ACCESS_ONCE(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
49094- ACCESS_ONCE(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
49095+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower, AR_XmitPower1);
49096+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower, AR_XmitPower2);
49097+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower, AR_XmitPower3);
49098 }
49099
49100 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
49101diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
49102index 975074f..e9440da 100644
49103--- a/drivers/net/wireless/ath/ath9k/hw.h
49104+++ b/drivers/net/wireless/ath/ath9k/hw.h
49105@@ -630,7 +630,7 @@ struct ath_hw_private_ops {
49106
49107 /* ANI */
49108 void (*ani_cache_ini_regs)(struct ath_hw *ah);
49109-};
49110+} __no_const;
49111
49112 /**
49113 * struct ath_spec_scan - parameters for Atheros spectral scan
49114@@ -708,7 +708,7 @@ struct ath_hw_ops {
49115 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
49116 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
49117 #endif
49118-};
49119+} __no_const;
49120
49121 struct ath_nf_limits {
49122 s16 max;
49123diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
49124index 4f18a6b..b07d92f 100644
49125--- a/drivers/net/wireless/ath/ath9k/main.c
49126+++ b/drivers/net/wireless/ath/ath9k/main.c
49127@@ -2454,16 +2454,18 @@ void ath9k_fill_chanctx_ops(void)
49128 if (!ath9k_is_chanctx_enabled())
49129 return;
49130
49131- ath9k_ops.hw_scan = ath9k_hw_scan;
49132- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49133- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49134- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49135- ath9k_ops.add_chanctx = ath9k_add_chanctx;
49136- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49137- ath9k_ops.change_chanctx = ath9k_change_chanctx;
49138- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49139- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49140- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49141+ pax_open_kernel();
49142+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
49143+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49144+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49145+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49146+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
49147+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49148+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
49149+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49150+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49151+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49152+ pax_close_kernel();
49153 }
49154
49155 #endif
49156diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
49157index 058a9f2..d5cb1ba 100644
49158--- a/drivers/net/wireless/b43/phy_lp.c
49159+++ b/drivers/net/wireless/b43/phy_lp.c
49160@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
49161 {
49162 struct ssb_bus *bus = dev->dev->sdev->bus;
49163
49164- static const struct b206x_channel *chandata = NULL;
49165+ const struct b206x_channel *chandata = NULL;
49166 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
49167 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
49168 u16 old_comm15, scale;
49169diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
49170index dc1d20c..f7a4f06 100644
49171--- a/drivers/net/wireless/iwlegacy/3945-mac.c
49172+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
49173@@ -3633,7 +3633,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
49174 */
49175 if (il3945_mod_params.disable_hw_scan) {
49176 D_INFO("Disabling hw_scan\n");
49177- il3945_mac_ops.hw_scan = NULL;
49178+ pax_open_kernel();
49179+ *(void **)&il3945_mac_ops.hw_scan = NULL;
49180+ pax_close_kernel();
49181 }
49182
49183 D_INFO("*** LOAD DRIVER ***\n");
49184diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49185index 0ffb6ff..c0b7f0e 100644
49186--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49187+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49188@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
49189 {
49190 struct iwl_priv *priv = file->private_data;
49191 char buf[64];
49192- int buf_size;
49193+ size_t buf_size;
49194 u32 offset, len;
49195
49196 memset(buf, 0, sizeof(buf));
49197@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
49198 struct iwl_priv *priv = file->private_data;
49199
49200 char buf[8];
49201- int buf_size;
49202+ size_t buf_size;
49203 u32 reset_flag;
49204
49205 memset(buf, 0, sizeof(buf));
49206@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
49207 {
49208 struct iwl_priv *priv = file->private_data;
49209 char buf[8];
49210- int buf_size;
49211+ size_t buf_size;
49212 int ht40;
49213
49214 memset(buf, 0, sizeof(buf));
49215@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
49216 {
49217 struct iwl_priv *priv = file->private_data;
49218 char buf[8];
49219- int buf_size;
49220+ size_t buf_size;
49221 int value;
49222
49223 memset(buf, 0, sizeof(buf));
49224@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
49225 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
49226 DEBUGFS_READ_FILE_OPS(current_sleep_command);
49227
49228-static const char *fmt_value = " %-30s %10u\n";
49229-static const char *fmt_hex = " %-30s 0x%02X\n";
49230-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
49231-static const char *fmt_header =
49232+static const char fmt_value[] = " %-30s %10u\n";
49233+static const char fmt_hex[] = " %-30s 0x%02X\n";
49234+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
49235+static const char fmt_header[] =
49236 "%-32s current cumulative delta max\n";
49237
49238 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
49239@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
49240 {
49241 struct iwl_priv *priv = file->private_data;
49242 char buf[8];
49243- int buf_size;
49244+ size_t buf_size;
49245 int clear;
49246
49247 memset(buf, 0, sizeof(buf));
49248@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
49249 {
49250 struct iwl_priv *priv = file->private_data;
49251 char buf[8];
49252- int buf_size;
49253+ size_t buf_size;
49254 int trace;
49255
49256 memset(buf, 0, sizeof(buf));
49257@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
49258 {
49259 struct iwl_priv *priv = file->private_data;
49260 char buf[8];
49261- int buf_size;
49262+ size_t buf_size;
49263 int missed;
49264
49265 memset(buf, 0, sizeof(buf));
49266@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
49267
49268 struct iwl_priv *priv = file->private_data;
49269 char buf[8];
49270- int buf_size;
49271+ size_t buf_size;
49272 int plcp;
49273
49274 memset(buf, 0, sizeof(buf));
49275@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
49276
49277 struct iwl_priv *priv = file->private_data;
49278 char buf[8];
49279- int buf_size;
49280+ size_t buf_size;
49281 int flush;
49282
49283 memset(buf, 0, sizeof(buf));
49284@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
49285
49286 struct iwl_priv *priv = file->private_data;
49287 char buf[8];
49288- int buf_size;
49289+ size_t buf_size;
49290 int rts;
49291
49292 if (!priv->cfg->ht_params)
49293@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
49294 {
49295 struct iwl_priv *priv = file->private_data;
49296 char buf[8];
49297- int buf_size;
49298+ size_t buf_size;
49299
49300 memset(buf, 0, sizeof(buf));
49301 buf_size = min(count, sizeof(buf) - 1);
49302@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
49303 struct iwl_priv *priv = file->private_data;
49304 u32 event_log_flag;
49305 char buf[8];
49306- int buf_size;
49307+ size_t buf_size;
49308
49309 /* check that the interface is up */
49310 if (!iwl_is_ready(priv))
49311@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
49312 struct iwl_priv *priv = file->private_data;
49313 char buf[8];
49314 u32 calib_disabled;
49315- int buf_size;
49316+ size_t buf_size;
49317
49318 memset(buf, 0, sizeof(buf));
49319 buf_size = min(count, sizeof(buf) - 1);
49320diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
49321index dd2f3f8..fb1ae88 100644
49322--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
49323+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
49324@@ -1689,7 +1689,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
49325 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
49326
49327 char buf[8];
49328- int buf_size;
49329+ size_t buf_size;
49330 u32 reset_flag;
49331
49332 memset(buf, 0, sizeof(buf));
49333@@ -1710,7 +1710,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
49334 {
49335 struct iwl_trans *trans = file->private_data;
49336 char buf[8];
49337- int buf_size;
49338+ size_t buf_size;
49339 int csr;
49340
49341 memset(buf, 0, sizeof(buf));
49342diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
49343index c9ad4cf..49a2fa0 100644
49344--- a/drivers/net/wireless/mac80211_hwsim.c
49345+++ b/drivers/net/wireless/mac80211_hwsim.c
49346@@ -2577,20 +2577,20 @@ static int __init init_mac80211_hwsim(void)
49347 if (channels < 1)
49348 return -EINVAL;
49349
49350- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
49351- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49352- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49353- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49354- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49355- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49356- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49357- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49358- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49359- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49360- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
49361- mac80211_hwsim_assign_vif_chanctx;
49362- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
49363- mac80211_hwsim_unassign_vif_chanctx;
49364+ pax_open_kernel();
49365+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
49366+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49367+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49368+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49369+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49370+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49371+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49372+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49373+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49374+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49375+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
49376+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
49377+ pax_close_kernel();
49378
49379 spin_lock_init(&hwsim_radio_lock);
49380 INIT_LIST_HEAD(&hwsim_radios);
49381diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
49382index 1a4facd..a2ecbbd 100644
49383--- a/drivers/net/wireless/rndis_wlan.c
49384+++ b/drivers/net/wireless/rndis_wlan.c
49385@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
49386
49387 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
49388
49389- if (rts_threshold < 0 || rts_threshold > 2347)
49390+ if (rts_threshold > 2347)
49391 rts_threshold = 2347;
49392
49393 tmp = cpu_to_le32(rts_threshold);
49394diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
49395index d13f25c..2573994 100644
49396--- a/drivers/net/wireless/rt2x00/rt2x00.h
49397+++ b/drivers/net/wireless/rt2x00/rt2x00.h
49398@@ -375,7 +375,7 @@ struct rt2x00_intf {
49399 * for hardware which doesn't support hardware
49400 * sequence counting.
49401 */
49402- atomic_t seqno;
49403+ atomic_unchecked_t seqno;
49404 };
49405
49406 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
49407diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
49408index 66ff364..3ce34f7 100644
49409--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
49410+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
49411@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
49412 * sequence counter given by mac80211.
49413 */
49414 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
49415- seqno = atomic_add_return(0x10, &intf->seqno);
49416+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
49417 else
49418- seqno = atomic_read(&intf->seqno);
49419+ seqno = atomic_read_unchecked(&intf->seqno);
49420
49421 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
49422 hdr->seq_ctrl |= cpu_to_le16(seqno);
49423diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
49424index b661f896..ddf7d2b 100644
49425--- a/drivers/net/wireless/ti/wl1251/sdio.c
49426+++ b/drivers/net/wireless/ti/wl1251/sdio.c
49427@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
49428
49429 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
49430
49431- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49432- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49433+ pax_open_kernel();
49434+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49435+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49436+ pax_close_kernel();
49437
49438 wl1251_info("using dedicated interrupt line");
49439 } else {
49440- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49441- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49442+ pax_open_kernel();
49443+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
49444+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
49445+ pax_close_kernel();
49446
49447 wl1251_info("using SDIO interrupt");
49448 }
49449diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
49450index 0bccf12..3d95068 100644
49451--- a/drivers/net/wireless/ti/wl12xx/main.c
49452+++ b/drivers/net/wireless/ti/wl12xx/main.c
49453@@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49454 sizeof(wl->conf.mem));
49455
49456 /* read data preparation is only needed by wl127x */
49457- wl->ops->prepare_read = wl127x_prepare_read;
49458+ pax_open_kernel();
49459+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49460+ pax_close_kernel();
49461
49462 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49463 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49464@@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
49465 sizeof(wl->conf.mem));
49466
49467 /* read data preparation is only needed by wl127x */
49468- wl->ops->prepare_read = wl127x_prepare_read;
49469+ pax_open_kernel();
49470+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
49471+ pax_close_kernel();
49472
49473 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
49474 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
49475diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
49476index 7af1936..128bb35 100644
49477--- a/drivers/net/wireless/ti/wl18xx/main.c
49478+++ b/drivers/net/wireless/ti/wl18xx/main.c
49479@@ -1916,8 +1916,10 @@ static int wl18xx_setup(struct wl1271 *wl)
49480 }
49481
49482 if (!checksum_param) {
49483- wl18xx_ops.set_rx_csum = NULL;
49484- wl18xx_ops.init_vif = NULL;
49485+ pax_open_kernel();
49486+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
49487+ *(void **)&wl18xx_ops.init_vif = NULL;
49488+ pax_close_kernel();
49489 }
49490
49491 /* Enable 11a Band only if we have 5G antennas */
49492diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
49493index a912dc0..a8225ba 100644
49494--- a/drivers/net/wireless/zd1211rw/zd_usb.c
49495+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
49496@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
49497 {
49498 struct zd_usb *usb = urb->context;
49499 struct zd_usb_interrupt *intr = &usb->intr;
49500- int len;
49501+ unsigned int len;
49502 u16 int_num;
49503
49504 ZD_ASSERT(in_interrupt());
49505diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
49506index 683671a..4519fc2 100644
49507--- a/drivers/nfc/nfcwilink.c
49508+++ b/drivers/nfc/nfcwilink.c
49509@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
49510
49511 static int nfcwilink_probe(struct platform_device *pdev)
49512 {
49513- static struct nfcwilink *drv;
49514+ struct nfcwilink *drv;
49515 int rc;
49516 __u32 protocols;
49517
49518diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
49519index d93b2b6..ae50401 100644
49520--- a/drivers/oprofile/buffer_sync.c
49521+++ b/drivers/oprofile/buffer_sync.c
49522@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
49523 if (cookie == NO_COOKIE)
49524 offset = pc;
49525 if (cookie == INVALID_COOKIE) {
49526- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49527+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49528 offset = pc;
49529 }
49530 if (cookie != last_cookie) {
49531@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
49532 /* add userspace sample */
49533
49534 if (!mm) {
49535- atomic_inc(&oprofile_stats.sample_lost_no_mm);
49536+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
49537 return 0;
49538 }
49539
49540 cookie = lookup_dcookie(mm, s->eip, &offset);
49541
49542 if (cookie == INVALID_COOKIE) {
49543- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
49544+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
49545 return 0;
49546 }
49547
49548@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
49549 /* ignore backtraces if failed to add a sample */
49550 if (state == sb_bt_start) {
49551 state = sb_bt_ignore;
49552- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
49553+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
49554 }
49555 }
49556 release_mm(mm);
49557diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
49558index c0cc4e7..44d4e54 100644
49559--- a/drivers/oprofile/event_buffer.c
49560+++ b/drivers/oprofile/event_buffer.c
49561@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
49562 }
49563
49564 if (buffer_pos == buffer_size) {
49565- atomic_inc(&oprofile_stats.event_lost_overflow);
49566+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
49567 return;
49568 }
49569
49570diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
49571index ed2c3ec..deda85a 100644
49572--- a/drivers/oprofile/oprof.c
49573+++ b/drivers/oprofile/oprof.c
49574@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
49575 if (oprofile_ops.switch_events())
49576 return;
49577
49578- atomic_inc(&oprofile_stats.multiplex_counter);
49579+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
49580 start_switch_worker();
49581 }
49582
49583diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
49584index ee2cfce..7f8f699 100644
49585--- a/drivers/oprofile/oprofile_files.c
49586+++ b/drivers/oprofile/oprofile_files.c
49587@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
49588
49589 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
49590
49591-static ssize_t timeout_read(struct file *file, char __user *buf,
49592+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
49593 size_t count, loff_t *offset)
49594 {
49595 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
49596diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
49597index 59659ce..6c860a0 100644
49598--- a/drivers/oprofile/oprofile_stats.c
49599+++ b/drivers/oprofile/oprofile_stats.c
49600@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
49601 cpu_buf->sample_invalid_eip = 0;
49602 }
49603
49604- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
49605- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
49606- atomic_set(&oprofile_stats.event_lost_overflow, 0);
49607- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
49608- atomic_set(&oprofile_stats.multiplex_counter, 0);
49609+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
49610+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
49611+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
49612+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
49613+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
49614 }
49615
49616
49617diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
49618index 1fc622b..8c48fc3 100644
49619--- a/drivers/oprofile/oprofile_stats.h
49620+++ b/drivers/oprofile/oprofile_stats.h
49621@@ -13,11 +13,11 @@
49622 #include <linux/atomic.h>
49623
49624 struct oprofile_stat_struct {
49625- atomic_t sample_lost_no_mm;
49626- atomic_t sample_lost_no_mapping;
49627- atomic_t bt_lost_no_mapping;
49628- atomic_t event_lost_overflow;
49629- atomic_t multiplex_counter;
49630+ atomic_unchecked_t sample_lost_no_mm;
49631+ atomic_unchecked_t sample_lost_no_mapping;
49632+ atomic_unchecked_t bt_lost_no_mapping;
49633+ atomic_unchecked_t event_lost_overflow;
49634+ atomic_unchecked_t multiplex_counter;
49635 };
49636
49637 extern struct oprofile_stat_struct oprofile_stats;
49638diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
49639index 3f49345..c750d0b 100644
49640--- a/drivers/oprofile/oprofilefs.c
49641+++ b/drivers/oprofile/oprofilefs.c
49642@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
49643
49644 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
49645 {
49646- atomic_t *val = file->private_data;
49647- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
49648+ atomic_unchecked_t *val = file->private_data;
49649+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
49650 }
49651
49652
49653@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
49654
49655
49656 int oprofilefs_create_ro_atomic(struct dentry *root,
49657- char const *name, atomic_t *val)
49658+ char const *name, atomic_unchecked_t *val)
49659 {
49660 return __oprofilefs_create_file(root, name,
49661 &atomic_ro_fops, 0444, val);
49662diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
49663index bdef916..88c7dee 100644
49664--- a/drivers/oprofile/timer_int.c
49665+++ b/drivers/oprofile/timer_int.c
49666@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
49667 return NOTIFY_OK;
49668 }
49669
49670-static struct notifier_block __refdata oprofile_cpu_notifier = {
49671+static struct notifier_block oprofile_cpu_notifier = {
49672 .notifier_call = oprofile_cpu_notify,
49673 };
49674
49675diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
49676index 3b47080..6cd05dd 100644
49677--- a/drivers/parport/procfs.c
49678+++ b/drivers/parport/procfs.c
49679@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
49680
49681 *ppos += len;
49682
49683- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
49684+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
49685 }
49686
49687 #ifdef CONFIG_PARPORT_1284
49688@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
49689
49690 *ppos += len;
49691
49692- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
49693+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
49694 }
49695 #endif /* IEEE1284.3 support. */
49696
49697diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
49698index 6ca2399..68d866b 100644
49699--- a/drivers/pci/hotplug/acpiphp_ibm.c
49700+++ b/drivers/pci/hotplug/acpiphp_ibm.c
49701@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
49702 goto init_cleanup;
49703 }
49704
49705- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
49706+ pax_open_kernel();
49707+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
49708+ pax_close_kernel();
49709 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
49710
49711 return retval;
49712diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
49713index 66b7bbe..26bee78 100644
49714--- a/drivers/pci/hotplug/cpcihp_generic.c
49715+++ b/drivers/pci/hotplug/cpcihp_generic.c
49716@@ -73,7 +73,6 @@ static u16 port;
49717 static unsigned int enum_bit;
49718 static u8 enum_mask;
49719
49720-static struct cpci_hp_controller_ops generic_hpc_ops;
49721 static struct cpci_hp_controller generic_hpc;
49722
49723 static int __init validate_parameters(void)
49724@@ -139,6 +138,10 @@ static int query_enum(void)
49725 return ((value & enum_mask) == enum_mask);
49726 }
49727
49728+static struct cpci_hp_controller_ops generic_hpc_ops = {
49729+ .query_enum = query_enum,
49730+};
49731+
49732 static int __init cpcihp_generic_init(void)
49733 {
49734 int status;
49735@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
49736 pci_dev_put(dev);
49737
49738 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
49739- generic_hpc_ops.query_enum = query_enum;
49740 generic_hpc.ops = &generic_hpc_ops;
49741
49742 status = cpci_hp_register_controller(&generic_hpc);
49743diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
49744index 7ecf34e..effed62 100644
49745--- a/drivers/pci/hotplug/cpcihp_zt5550.c
49746+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
49747@@ -59,7 +59,6 @@
49748 /* local variables */
49749 static bool debug;
49750 static bool poll;
49751-static struct cpci_hp_controller_ops zt5550_hpc_ops;
49752 static struct cpci_hp_controller zt5550_hpc;
49753
49754 /* Primary cPCI bus bridge device */
49755@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
49756 return 0;
49757 }
49758
49759+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
49760+ .query_enum = zt5550_hc_query_enum,
49761+};
49762+
49763 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
49764 {
49765 int status;
49766@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
49767 dbg("returned from zt5550_hc_config");
49768
49769 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
49770- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
49771 zt5550_hpc.ops = &zt5550_hpc_ops;
49772 if (!poll) {
49773 zt5550_hpc.irq = hc_dev->irq;
49774 zt5550_hpc.irq_flags = IRQF_SHARED;
49775 zt5550_hpc.dev_id = hc_dev;
49776
49777- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
49778- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
49779- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
49780+ pax_open_kernel();
49781+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
49782+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
49783+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
49784+ pax_open_kernel();
49785 } else {
49786 info("using ENUM# polling mode");
49787 }
49788diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
49789index 1e08ff8c..3cd145f 100644
49790--- a/drivers/pci/hotplug/cpqphp_nvram.c
49791+++ b/drivers/pci/hotplug/cpqphp_nvram.c
49792@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
49793
49794 void compaq_nvram_init (void __iomem *rom_start)
49795 {
49796+#ifndef CONFIG_PAX_KERNEXEC
49797 if (rom_start)
49798 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
49799+#endif
49800
49801 dbg("int15 entry = %p\n", compaq_int15_entry_point);
49802
49803diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
49804index 56d8486..f26113f 100644
49805--- a/drivers/pci/hotplug/pci_hotplug_core.c
49806+++ b/drivers/pci/hotplug/pci_hotplug_core.c
49807@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
49808 return -EINVAL;
49809 }
49810
49811- slot->ops->owner = owner;
49812- slot->ops->mod_name = mod_name;
49813+ pax_open_kernel();
49814+ *(struct module **)&slot->ops->owner = owner;
49815+ *(const char **)&slot->ops->mod_name = mod_name;
49816+ pax_close_kernel();
49817
49818 mutex_lock(&pci_hp_mutex);
49819 /*
49820diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
49821index 07aa722..84514b4 100644
49822--- a/drivers/pci/hotplug/pciehp_core.c
49823+++ b/drivers/pci/hotplug/pciehp_core.c
49824@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
49825 struct slot *slot = ctrl->slot;
49826 struct hotplug_slot *hotplug = NULL;
49827 struct hotplug_slot_info *info = NULL;
49828- struct hotplug_slot_ops *ops = NULL;
49829+ hotplug_slot_ops_no_const *ops = NULL;
49830 char name[SLOT_NAME_SIZE];
49831 int retval = -ENOMEM;
49832
49833diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
49834index 084587d..4a8f9df 100644
49835--- a/drivers/pci/msi.c
49836+++ b/drivers/pci/msi.c
49837@@ -488,8 +488,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
49838 {
49839 struct attribute **msi_attrs;
49840 struct attribute *msi_attr;
49841- struct device_attribute *msi_dev_attr;
49842- struct attribute_group *msi_irq_group;
49843+ device_attribute_no_const *msi_dev_attr;
49844+ attribute_group_no_const *msi_irq_group;
49845 const struct attribute_group **msi_irq_groups;
49846 struct msi_desc *entry;
49847 int ret = -ENOMEM;
49848@@ -549,7 +549,7 @@ error_attrs:
49849 count = 0;
49850 msi_attr = msi_attrs[count];
49851 while (msi_attr) {
49852- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
49853+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
49854 kfree(msi_attr->name);
49855 kfree(msi_dev_attr);
49856 ++count;
49857diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
49858index 2c6643f..3a6d8e0 100644
49859--- a/drivers/pci/pci-sysfs.c
49860+++ b/drivers/pci/pci-sysfs.c
49861@@ -1133,7 +1133,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
49862 {
49863 /* allocate attribute structure, piggyback attribute name */
49864 int name_len = write_combine ? 13 : 10;
49865- struct bin_attribute *res_attr;
49866+ bin_attribute_no_const *res_attr;
49867 int retval;
49868
49869 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
49870@@ -1310,7 +1310,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
49871 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
49872 {
49873 int retval;
49874- struct bin_attribute *attr;
49875+ bin_attribute_no_const *attr;
49876
49877 /* If the device has VPD, try to expose it in sysfs. */
49878 if (dev->vpd) {
49879@@ -1357,7 +1357,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
49880 {
49881 int retval;
49882 int rom_size = 0;
49883- struct bin_attribute *attr;
49884+ bin_attribute_no_const *attr;
49885
49886 if (!sysfs_initialized)
49887 return -EACCES;
49888diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
49889index 4a3902d..7f1fc42 100644
49890--- a/drivers/pci/pci.h
49891+++ b/drivers/pci/pci.h
49892@@ -93,7 +93,7 @@ struct pci_vpd_ops {
49893 struct pci_vpd {
49894 unsigned int len;
49895 const struct pci_vpd_ops *ops;
49896- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
49897+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
49898 };
49899
49900 int pci_vpd_pci22_init(struct pci_dev *dev);
49901diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
49902index e1e7026..d28dd33 100644
49903--- a/drivers/pci/pcie/aspm.c
49904+++ b/drivers/pci/pcie/aspm.c
49905@@ -27,9 +27,9 @@
49906 #define MODULE_PARAM_PREFIX "pcie_aspm."
49907
49908 /* Note: those are not register definitions */
49909-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
49910-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
49911-#define ASPM_STATE_L1 (4) /* L1 state */
49912+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
49913+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
49914+#define ASPM_STATE_L1 (4U) /* L1 state */
49915 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
49916 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
49917
49918diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
49919index c8ca98c..b1bc005 100644
49920--- a/drivers/pci/probe.c
49921+++ b/drivers/pci/probe.c
49922@@ -177,7 +177,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
49923 struct pci_bus_region region, inverted_region;
49924 bool bar_too_big = false, bar_too_high = false, bar_invalid = false;
49925
49926- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
49927+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
49928
49929 /* No printks while decoding is disabled! */
49930 if (!dev->mmio_always_on) {
49931diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
49932index 3f155e7..0f4b1f0 100644
49933--- a/drivers/pci/proc.c
49934+++ b/drivers/pci/proc.c
49935@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
49936 static int __init pci_proc_init(void)
49937 {
49938 struct pci_dev *dev = NULL;
49939+
49940+#ifdef CONFIG_GRKERNSEC_PROC_ADD
49941+#ifdef CONFIG_GRKERNSEC_PROC_USER
49942+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
49943+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49944+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
49945+#endif
49946+#else
49947 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
49948+#endif
49949 proc_create("devices", 0, proc_bus_pci_dir,
49950 &proc_bus_pci_dev_operations);
49951 proc_initialized = 1;
49952diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
49953index d866db8..c827d1f 100644
49954--- a/drivers/platform/chrome/chromeos_laptop.c
49955+++ b/drivers/platform/chrome/chromeos_laptop.c
49956@@ -479,7 +479,7 @@ static struct chromeos_laptop cr48 = {
49957 .callback = chromeos_laptop_dmi_matched, \
49958 .driver_data = (void *)&board_
49959
49960-static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
49961+static struct dmi_system_id chromeos_laptop_dmi_table[] __initconst = {
49962 {
49963 .ident = "Samsung Series 5 550",
49964 .matches = {
49965diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
49966index c5af23b..3d62d5e 100644
49967--- a/drivers/platform/x86/alienware-wmi.c
49968+++ b/drivers/platform/x86/alienware-wmi.c
49969@@ -150,7 +150,7 @@ struct wmax_led_args {
49970 } __packed;
49971
49972 static struct platform_device *platform_device;
49973-static struct device_attribute *zone_dev_attrs;
49974+static device_attribute_no_const *zone_dev_attrs;
49975 static struct attribute **zone_attrs;
49976 static struct platform_zone *zone_data;
49977
49978@@ -161,7 +161,7 @@ static struct platform_driver platform_driver = {
49979 }
49980 };
49981
49982-static struct attribute_group zone_attribute_group = {
49983+static attribute_group_no_const zone_attribute_group = {
49984 .name = "rgb_zones",
49985 };
49986
49987diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
49988index 21fc932..ee9394a 100644
49989--- a/drivers/platform/x86/asus-wmi.c
49990+++ b/drivers/platform/x86/asus-wmi.c
49991@@ -1590,6 +1590,10 @@ static int show_dsts(struct seq_file *m, void *data)
49992 int err;
49993 u32 retval = -1;
49994
49995+#ifdef CONFIG_GRKERNSEC_KMEM
49996+ return -EPERM;
49997+#endif
49998+
49999 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
50000
50001 if (err < 0)
50002@@ -1606,6 +1610,10 @@ static int show_devs(struct seq_file *m, void *data)
50003 int err;
50004 u32 retval = -1;
50005
50006+#ifdef CONFIG_GRKERNSEC_KMEM
50007+ return -EPERM;
50008+#endif
50009+
50010 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
50011 &retval);
50012
50013@@ -1630,6 +1638,10 @@ static int show_call(struct seq_file *m, void *data)
50014 union acpi_object *obj;
50015 acpi_status status;
50016
50017+#ifdef CONFIG_GRKERNSEC_KMEM
50018+ return -EPERM;
50019+#endif
50020+
50021 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
50022 1, asus->debug.method_id,
50023 &input, &output);
50024diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
50025index 62f8030..c7f2a45 100644
50026--- a/drivers/platform/x86/msi-laptop.c
50027+++ b/drivers/platform/x86/msi-laptop.c
50028@@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
50029
50030 if (!quirks->ec_read_only) {
50031 /* allow userland write sysfs file */
50032- dev_attr_bluetooth.store = store_bluetooth;
50033- dev_attr_wlan.store = store_wlan;
50034- dev_attr_threeg.store = store_threeg;
50035- dev_attr_bluetooth.attr.mode |= S_IWUSR;
50036- dev_attr_wlan.attr.mode |= S_IWUSR;
50037- dev_attr_threeg.attr.mode |= S_IWUSR;
50038+ pax_open_kernel();
50039+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
50040+ *(void **)&dev_attr_wlan.store = store_wlan;
50041+ *(void **)&dev_attr_threeg.store = store_threeg;
50042+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
50043+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
50044+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
50045+ pax_close_kernel();
50046 }
50047
50048 /* disable hardware control by fn key */
50049diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
50050index 70222f2..8c8ce66 100644
50051--- a/drivers/platform/x86/msi-wmi.c
50052+++ b/drivers/platform/x86/msi-wmi.c
50053@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
50054 static void msi_wmi_notify(u32 value, void *context)
50055 {
50056 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
50057- static struct key_entry *key;
50058+ struct key_entry *key;
50059 union acpi_object *obj;
50060 acpi_status status;
50061
50062diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
50063index 26ad9ff..7c52909 100644
50064--- a/drivers/platform/x86/sony-laptop.c
50065+++ b/drivers/platform/x86/sony-laptop.c
50066@@ -2527,7 +2527,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
50067 }
50068
50069 /* High speed charging function */
50070-static struct device_attribute *hsc_handle;
50071+static device_attribute_no_const *hsc_handle;
50072
50073 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
50074 struct device_attribute *attr,
50075@@ -2601,7 +2601,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
50076 }
50077
50078 /* low battery function */
50079-static struct device_attribute *lowbatt_handle;
50080+static device_attribute_no_const *lowbatt_handle;
50081
50082 static ssize_t sony_nc_lowbatt_store(struct device *dev,
50083 struct device_attribute *attr,
50084@@ -2667,7 +2667,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
50085 }
50086
50087 /* fan speed function */
50088-static struct device_attribute *fan_handle, *hsf_handle;
50089+static device_attribute_no_const *fan_handle, *hsf_handle;
50090
50091 static ssize_t sony_nc_hsfan_store(struct device *dev,
50092 struct device_attribute *attr,
50093@@ -2774,7 +2774,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
50094 }
50095
50096 /* USB charge function */
50097-static struct device_attribute *uc_handle;
50098+static device_attribute_no_const *uc_handle;
50099
50100 static ssize_t sony_nc_usb_charge_store(struct device *dev,
50101 struct device_attribute *attr,
50102@@ -2848,7 +2848,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
50103 }
50104
50105 /* Panel ID function */
50106-static struct device_attribute *panel_handle;
50107+static device_attribute_no_const *panel_handle;
50108
50109 static ssize_t sony_nc_panelid_show(struct device *dev,
50110 struct device_attribute *attr, char *buffer)
50111@@ -2895,7 +2895,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
50112 }
50113
50114 /* smart connect function */
50115-static struct device_attribute *sc_handle;
50116+static device_attribute_no_const *sc_handle;
50117
50118 static ssize_t sony_nc_smart_conn_store(struct device *dev,
50119 struct device_attribute *attr,
50120diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
50121index cf0f893..5955997 100644
50122--- a/drivers/platform/x86/thinkpad_acpi.c
50123+++ b/drivers/platform/x86/thinkpad_acpi.c
50124@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
50125 return 0;
50126 }
50127
50128-void static hotkey_mask_warn_incomplete_mask(void)
50129+static void hotkey_mask_warn_incomplete_mask(void)
50130 {
50131 /* log only what the user can fix... */
50132 const u32 wantedmask = hotkey_driver_mask &
50133@@ -2438,10 +2438,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
50134 && !tp_features.bright_unkfw)
50135 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
50136 }
50137+}
50138
50139 #undef TPACPI_COMPARE_KEY
50140 #undef TPACPI_MAY_SEND_KEY
50141-}
50142
50143 /*
50144 * Polling driver
50145diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
50146index 438d4c7..ca8a2fb 100644
50147--- a/drivers/pnp/pnpbios/bioscalls.c
50148+++ b/drivers/pnp/pnpbios/bioscalls.c
50149@@ -59,7 +59,7 @@ do { \
50150 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
50151 } while(0)
50152
50153-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
50154+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
50155 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
50156
50157 /*
50158@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50159
50160 cpu = get_cpu();
50161 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
50162+
50163+ pax_open_kernel();
50164 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
50165+ pax_close_kernel();
50166
50167 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
50168 spin_lock_irqsave(&pnp_bios_lock, flags);
50169@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50170 :"memory");
50171 spin_unlock_irqrestore(&pnp_bios_lock, flags);
50172
50173+ pax_open_kernel();
50174 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
50175+ pax_close_kernel();
50176+
50177 put_cpu();
50178
50179 /* If we get here and this is set then the PnP BIOS faulted on us. */
50180@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
50181 return status;
50182 }
50183
50184-void pnpbios_calls_init(union pnp_bios_install_struct *header)
50185+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
50186 {
50187 int i;
50188
50189@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50190 pnp_bios_callpoint.offset = header->fields.pm16offset;
50191 pnp_bios_callpoint.segment = PNP_CS16;
50192
50193+ pax_open_kernel();
50194+
50195 for_each_possible_cpu(i) {
50196 struct desc_struct *gdt = get_cpu_gdt_table(i);
50197 if (!gdt)
50198@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50199 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
50200 (unsigned long)__va(header->fields.pm16dseg));
50201 }
50202+
50203+ pax_close_kernel();
50204 }
50205diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
50206index 0c52e2a..3421ab7 100644
50207--- a/drivers/power/pda_power.c
50208+++ b/drivers/power/pda_power.c
50209@@ -37,7 +37,11 @@ static int polling;
50210
50211 #if IS_ENABLED(CONFIG_USB_PHY)
50212 static struct usb_phy *transceiver;
50213-static struct notifier_block otg_nb;
50214+static int otg_handle_notification(struct notifier_block *nb,
50215+ unsigned long event, void *unused);
50216+static struct notifier_block otg_nb = {
50217+ .notifier_call = otg_handle_notification
50218+};
50219 #endif
50220
50221 static struct regulator *ac_draw;
50222@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
50223
50224 #if IS_ENABLED(CONFIG_USB_PHY)
50225 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
50226- otg_nb.notifier_call = otg_handle_notification;
50227 ret = usb_register_notifier(transceiver, &otg_nb);
50228 if (ret) {
50229 dev_err(dev, "failure to register otg notifier\n");
50230diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
50231index cc439fd..8fa30df 100644
50232--- a/drivers/power/power_supply.h
50233+++ b/drivers/power/power_supply.h
50234@@ -16,12 +16,12 @@ struct power_supply;
50235
50236 #ifdef CONFIG_SYSFS
50237
50238-extern void power_supply_init_attrs(struct device_type *dev_type);
50239+extern void power_supply_init_attrs(void);
50240 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
50241
50242 #else
50243
50244-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
50245+static inline void power_supply_init_attrs(void) {}
50246 #define power_supply_uevent NULL
50247
50248 #endif /* CONFIG_SYSFS */
50249diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
50250index 694e8cd..9f03483 100644
50251--- a/drivers/power/power_supply_core.c
50252+++ b/drivers/power/power_supply_core.c
50253@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
50254 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
50255 EXPORT_SYMBOL_GPL(power_supply_notifier);
50256
50257-static struct device_type power_supply_dev_type;
50258+extern const struct attribute_group *power_supply_attr_groups[];
50259+static struct device_type power_supply_dev_type = {
50260+ .groups = power_supply_attr_groups,
50261+};
50262
50263 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
50264 struct power_supply *supply)
50265@@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
50266 return PTR_ERR(power_supply_class);
50267
50268 power_supply_class->dev_uevent = power_supply_uevent;
50269- power_supply_init_attrs(&power_supply_dev_type);
50270+ power_supply_init_attrs();
50271
50272 return 0;
50273 }
50274diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
50275index 62653f5..d0bb485 100644
50276--- a/drivers/power/power_supply_sysfs.c
50277+++ b/drivers/power/power_supply_sysfs.c
50278@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
50279 .is_visible = power_supply_attr_is_visible,
50280 };
50281
50282-static const struct attribute_group *power_supply_attr_groups[] = {
50283+const struct attribute_group *power_supply_attr_groups[] = {
50284 &power_supply_attr_group,
50285 NULL,
50286 };
50287
50288-void power_supply_init_attrs(struct device_type *dev_type)
50289+void power_supply_init_attrs(void)
50290 {
50291 int i;
50292
50293- dev_type->groups = power_supply_attr_groups;
50294-
50295 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
50296 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
50297 }
50298diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
50299index 84419af..268ede8 100644
50300--- a/drivers/powercap/powercap_sys.c
50301+++ b/drivers/powercap/powercap_sys.c
50302@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
50303 struct device_attribute name_attr;
50304 };
50305
50306+static ssize_t show_constraint_name(struct device *dev,
50307+ struct device_attribute *dev_attr,
50308+ char *buf);
50309+
50310 static struct powercap_constraint_attr
50311- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
50312+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
50313+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
50314+ .power_limit_attr = {
50315+ .attr = {
50316+ .name = NULL,
50317+ .mode = S_IWUSR | S_IRUGO
50318+ },
50319+ .show = show_constraint_power_limit_uw,
50320+ .store = store_constraint_power_limit_uw
50321+ },
50322+
50323+ .time_window_attr = {
50324+ .attr = {
50325+ .name = NULL,
50326+ .mode = S_IWUSR | S_IRUGO
50327+ },
50328+ .show = show_constraint_time_window_us,
50329+ .store = store_constraint_time_window_us
50330+ },
50331+
50332+ .max_power_attr = {
50333+ .attr = {
50334+ .name = NULL,
50335+ .mode = S_IRUGO
50336+ },
50337+ .show = show_constraint_max_power_uw,
50338+ .store = NULL
50339+ },
50340+
50341+ .min_power_attr = {
50342+ .attr = {
50343+ .name = NULL,
50344+ .mode = S_IRUGO
50345+ },
50346+ .show = show_constraint_min_power_uw,
50347+ .store = NULL
50348+ },
50349+
50350+ .max_time_window_attr = {
50351+ .attr = {
50352+ .name = NULL,
50353+ .mode = S_IRUGO
50354+ },
50355+ .show = show_constraint_max_time_window_us,
50356+ .store = NULL
50357+ },
50358+
50359+ .min_time_window_attr = {
50360+ .attr = {
50361+ .name = NULL,
50362+ .mode = S_IRUGO
50363+ },
50364+ .show = show_constraint_min_time_window_us,
50365+ .store = NULL
50366+ },
50367+
50368+ .name_attr = {
50369+ .attr = {
50370+ .name = NULL,
50371+ .mode = S_IRUGO
50372+ },
50373+ .show = show_constraint_name,
50374+ .store = NULL
50375+ }
50376+ }
50377+};
50378
50379 /* A list of powercap control_types */
50380 static LIST_HEAD(powercap_cntrl_list);
50381@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
50382 }
50383
50384 static int create_constraint_attribute(int id, const char *name,
50385- int mode,
50386- struct device_attribute *dev_attr,
50387- ssize_t (*show)(struct device *,
50388- struct device_attribute *, char *),
50389- ssize_t (*store)(struct device *,
50390- struct device_attribute *,
50391- const char *, size_t)
50392- )
50393+ struct device_attribute *dev_attr)
50394 {
50395+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
50396
50397- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
50398- id, name);
50399- if (!dev_attr->attr.name)
50400+ if (!name)
50401 return -ENOMEM;
50402- dev_attr->attr.mode = mode;
50403- dev_attr->show = show;
50404- dev_attr->store = store;
50405+
50406+ pax_open_kernel();
50407+ *(const char **)&dev_attr->attr.name = name;
50408+ pax_close_kernel();
50409
50410 return 0;
50411 }
50412@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
50413
50414 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
50415 ret = create_constraint_attribute(i, "power_limit_uw",
50416- S_IWUSR | S_IRUGO,
50417- &constraint_attrs[i].power_limit_attr,
50418- show_constraint_power_limit_uw,
50419- store_constraint_power_limit_uw);
50420+ &constraint_attrs[i].power_limit_attr);
50421 if (ret)
50422 goto err_alloc;
50423 ret = create_constraint_attribute(i, "time_window_us",
50424- S_IWUSR | S_IRUGO,
50425- &constraint_attrs[i].time_window_attr,
50426- show_constraint_time_window_us,
50427- store_constraint_time_window_us);
50428+ &constraint_attrs[i].time_window_attr);
50429 if (ret)
50430 goto err_alloc;
50431- ret = create_constraint_attribute(i, "name", S_IRUGO,
50432- &constraint_attrs[i].name_attr,
50433- show_constraint_name,
50434- NULL);
50435+ ret = create_constraint_attribute(i, "name",
50436+ &constraint_attrs[i].name_attr);
50437 if (ret)
50438 goto err_alloc;
50439- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
50440- &constraint_attrs[i].max_power_attr,
50441- show_constraint_max_power_uw,
50442- NULL);
50443+ ret = create_constraint_attribute(i, "max_power_uw",
50444+ &constraint_attrs[i].max_power_attr);
50445 if (ret)
50446 goto err_alloc;
50447- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
50448- &constraint_attrs[i].min_power_attr,
50449- show_constraint_min_power_uw,
50450- NULL);
50451+ ret = create_constraint_attribute(i, "min_power_uw",
50452+ &constraint_attrs[i].min_power_attr);
50453 if (ret)
50454 goto err_alloc;
50455 ret = create_constraint_attribute(i, "max_time_window_us",
50456- S_IRUGO,
50457- &constraint_attrs[i].max_time_window_attr,
50458- show_constraint_max_time_window_us,
50459- NULL);
50460+ &constraint_attrs[i].max_time_window_attr);
50461 if (ret)
50462 goto err_alloc;
50463 ret = create_constraint_attribute(i, "min_time_window_us",
50464- S_IRUGO,
50465- &constraint_attrs[i].min_time_window_attr,
50466- show_constraint_min_time_window_us,
50467- NULL);
50468+ &constraint_attrs[i].min_time_window_attr);
50469 if (ret)
50470 goto err_alloc;
50471
50472@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
50473 power_zone->zone_dev_attrs[count++] =
50474 &dev_attr_max_energy_range_uj.attr;
50475 if (power_zone->ops->get_energy_uj) {
50476+ pax_open_kernel();
50477 if (power_zone->ops->reset_energy_uj)
50478- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50479+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
50480 else
50481- dev_attr_energy_uj.attr.mode = S_IRUGO;
50482+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
50483+ pax_close_kernel();
50484 power_zone->zone_dev_attrs[count++] =
50485 &dev_attr_energy_uj.attr;
50486 }
50487diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
50488index 9c5d414..c7900ce 100644
50489--- a/drivers/ptp/ptp_private.h
50490+++ b/drivers/ptp/ptp_private.h
50491@@ -51,7 +51,7 @@ struct ptp_clock {
50492 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
50493 wait_queue_head_t tsev_wq;
50494 int defunct; /* tells readers to go away when clock is being removed */
50495- struct device_attribute *pin_dev_attr;
50496+ device_attribute_no_const *pin_dev_attr;
50497 struct attribute **pin_attr;
50498 struct attribute_group pin_attr_group;
50499 };
50500diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
50501index 302e626..12579af 100644
50502--- a/drivers/ptp/ptp_sysfs.c
50503+++ b/drivers/ptp/ptp_sysfs.c
50504@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
50505 goto no_pin_attr;
50506
50507 for (i = 0; i < n_pins; i++) {
50508- struct device_attribute *da = &ptp->pin_dev_attr[i];
50509+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
50510 sysfs_attr_init(&da->attr);
50511 da->attr.name = info->pin_config[i].name;
50512 da->attr.mode = 0644;
50513diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
50514index cd87c0c..715ecbe 100644
50515--- a/drivers/regulator/core.c
50516+++ b/drivers/regulator/core.c
50517@@ -3567,7 +3567,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50518 {
50519 const struct regulation_constraints *constraints = NULL;
50520 const struct regulator_init_data *init_data;
50521- static atomic_t regulator_no = ATOMIC_INIT(0);
50522+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
50523 struct regulator_dev *rdev;
50524 struct device *dev;
50525 int ret, i;
50526@@ -3641,7 +3641,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
50527 rdev->dev.class = &regulator_class;
50528 rdev->dev.parent = dev;
50529 dev_set_name(&rdev->dev, "regulator.%d",
50530- atomic_inc_return(&regulator_no) - 1);
50531+ atomic_inc_return_unchecked(&regulator_no) - 1);
50532 ret = device_register(&rdev->dev);
50533 if (ret != 0) {
50534 put_device(&rdev->dev);
50535diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
50536index 7eee2ca..4024513 100644
50537--- a/drivers/regulator/max8660.c
50538+++ b/drivers/regulator/max8660.c
50539@@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
50540 max8660->shadow_regs[MAX8660_OVER1] = 5;
50541 } else {
50542 /* Otherwise devices can be toggled via software */
50543- max8660_dcdc_ops.enable = max8660_dcdc_enable;
50544- max8660_dcdc_ops.disable = max8660_dcdc_disable;
50545+ pax_open_kernel();
50546+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
50547+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
50548+ pax_close_kernel();
50549 }
50550
50551 /*
50552diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
50553index dbedf17..18ff6b7 100644
50554--- a/drivers/regulator/max8973-regulator.c
50555+++ b/drivers/regulator/max8973-regulator.c
50556@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
50557 if (!pdata || !pdata->enable_ext_control) {
50558 max->desc.enable_reg = MAX8973_VOUT;
50559 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
50560- max->ops.enable = regulator_enable_regmap;
50561- max->ops.disable = regulator_disable_regmap;
50562- max->ops.is_enabled = regulator_is_enabled_regmap;
50563+ pax_open_kernel();
50564+ *(void **)&max->ops.enable = regulator_enable_regmap;
50565+ *(void **)&max->ops.disable = regulator_disable_regmap;
50566+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
50567+ pax_close_kernel();
50568 }
50569
50570 if (pdata) {
50571diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
50572index 793b662..85f74cd 100644
50573--- a/drivers/regulator/mc13892-regulator.c
50574+++ b/drivers/regulator/mc13892-regulator.c
50575@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
50576 mc13xxx_unlock(mc13892);
50577
50578 /* update mc13892_vcam ops */
50579+ pax_open_kernel();
50580 memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
50581 sizeof(struct regulator_ops));
50582- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
50583- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
50584+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
50585+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
50586+ pax_close_kernel();
50587 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
50588
50589 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
50590diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
50591index 5b2e761..c8c8a4a 100644
50592--- a/drivers/rtc/rtc-cmos.c
50593+++ b/drivers/rtc/rtc-cmos.c
50594@@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
50595 hpet_rtc_timer_init();
50596
50597 /* export at least the first block of NVRAM */
50598- nvram.size = address_space - NVRAM_OFFSET;
50599+ pax_open_kernel();
50600+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
50601+ pax_close_kernel();
50602 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
50603 if (retval < 0) {
50604 dev_dbg(dev, "can't create nvram file? %d\n", retval);
50605diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
50606index d049393..bb20be0 100644
50607--- a/drivers/rtc/rtc-dev.c
50608+++ b/drivers/rtc/rtc-dev.c
50609@@ -16,6 +16,7 @@
50610 #include <linux/module.h>
50611 #include <linux/rtc.h>
50612 #include <linux/sched.h>
50613+#include <linux/grsecurity.h>
50614 #include "rtc-core.h"
50615
50616 static dev_t rtc_devt;
50617@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
50618 if (copy_from_user(&tm, uarg, sizeof(tm)))
50619 return -EFAULT;
50620
50621+ gr_log_timechange();
50622+
50623 return rtc_set_time(rtc, &tm);
50624
50625 case RTC_PIE_ON:
50626diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
50627index bb43cf7..ee4d274 100644
50628--- a/drivers/rtc/rtc-ds1307.c
50629+++ b/drivers/rtc/rtc-ds1307.c
50630@@ -107,7 +107,7 @@ struct ds1307 {
50631 u8 offset; /* register's offset */
50632 u8 regs[11];
50633 u16 nvram_offset;
50634- struct bin_attribute *nvram;
50635+ bin_attribute_no_const *nvram;
50636 enum ds_type type;
50637 unsigned long flags;
50638 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
50639diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
50640index 11880c1..b823aa4 100644
50641--- a/drivers/rtc/rtc-m48t59.c
50642+++ b/drivers/rtc/rtc-m48t59.c
50643@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
50644 if (IS_ERR(m48t59->rtc))
50645 return PTR_ERR(m48t59->rtc);
50646
50647- m48t59_nvram_attr.size = pdata->offset;
50648+ pax_open_kernel();
50649+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
50650+ pax_close_kernel();
50651
50652 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
50653 if (ret)
50654diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
50655index e693af6..2e525b6 100644
50656--- a/drivers/scsi/bfa/bfa_fcpim.h
50657+++ b/drivers/scsi/bfa/bfa_fcpim.h
50658@@ -36,7 +36,7 @@ struct bfa_iotag_s {
50659
50660 struct bfa_itn_s {
50661 bfa_isr_func_t isr;
50662-};
50663+} __no_const;
50664
50665 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
50666 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
50667diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
50668index 0f19455..ef7adb5 100644
50669--- a/drivers/scsi/bfa/bfa_fcs.c
50670+++ b/drivers/scsi/bfa/bfa_fcs.c
50671@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
50672 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
50673
50674 static struct bfa_fcs_mod_s fcs_modules[] = {
50675- { bfa_fcs_port_attach, NULL, NULL },
50676- { bfa_fcs_uf_attach, NULL, NULL },
50677- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
50678- bfa_fcs_fabric_modexit },
50679+ {
50680+ .attach = bfa_fcs_port_attach,
50681+ .modinit = NULL,
50682+ .modexit = NULL
50683+ },
50684+ {
50685+ .attach = bfa_fcs_uf_attach,
50686+ .modinit = NULL,
50687+ .modexit = NULL
50688+ },
50689+ {
50690+ .attach = bfa_fcs_fabric_attach,
50691+ .modinit = bfa_fcs_fabric_modinit,
50692+ .modexit = bfa_fcs_fabric_modexit
50693+ },
50694 };
50695
50696 /*
50697diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
50698index ff75ef8..2dfe00a 100644
50699--- a/drivers/scsi/bfa/bfa_fcs_lport.c
50700+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
50701@@ -89,15 +89,26 @@ static struct {
50702 void (*offline) (struct bfa_fcs_lport_s *port);
50703 } __port_action[] = {
50704 {
50705- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
50706- bfa_fcs_lport_unknown_offline}, {
50707- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
50708- bfa_fcs_lport_fab_offline}, {
50709- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
50710- bfa_fcs_lport_n2n_offline}, {
50711- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
50712- bfa_fcs_lport_loop_offline},
50713- };
50714+ .init = bfa_fcs_lport_unknown_init,
50715+ .online = bfa_fcs_lport_unknown_online,
50716+ .offline = bfa_fcs_lport_unknown_offline
50717+ },
50718+ {
50719+ .init = bfa_fcs_lport_fab_init,
50720+ .online = bfa_fcs_lport_fab_online,
50721+ .offline = bfa_fcs_lport_fab_offline
50722+ },
50723+ {
50724+ .init = bfa_fcs_lport_n2n_init,
50725+ .online = bfa_fcs_lport_n2n_online,
50726+ .offline = bfa_fcs_lport_n2n_offline
50727+ },
50728+ {
50729+ .init = bfa_fcs_lport_loop_init,
50730+ .online = bfa_fcs_lport_loop_online,
50731+ .offline = bfa_fcs_lport_loop_offline
50732+ },
50733+};
50734
50735 /*
50736 * fcs_port_sm FCS logical port state machine
50737diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
50738index a38aafa0..fe8f03b 100644
50739--- a/drivers/scsi/bfa/bfa_ioc.h
50740+++ b/drivers/scsi/bfa/bfa_ioc.h
50741@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
50742 bfa_ioc_disable_cbfn_t disable_cbfn;
50743 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
50744 bfa_ioc_reset_cbfn_t reset_cbfn;
50745-};
50746+} __no_const;
50747
50748 /*
50749 * IOC event notification mechanism.
50750@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
50751 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
50752 enum bfi_ioc_state fwstate);
50753 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
50754-};
50755+} __no_const;
50756
50757 /*
50758 * Queue element to wait for room in request queue. FIFO order is
50759diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
50760index a14c784..6de6790 100644
50761--- a/drivers/scsi/bfa/bfa_modules.h
50762+++ b/drivers/scsi/bfa/bfa_modules.h
50763@@ -78,12 +78,12 @@ enum {
50764 \
50765 extern struct bfa_module_s hal_mod_ ## __mod; \
50766 struct bfa_module_s hal_mod_ ## __mod = { \
50767- bfa_ ## __mod ## _meminfo, \
50768- bfa_ ## __mod ## _attach, \
50769- bfa_ ## __mod ## _detach, \
50770- bfa_ ## __mod ## _start, \
50771- bfa_ ## __mod ## _stop, \
50772- bfa_ ## __mod ## _iocdisable, \
50773+ .meminfo = bfa_ ## __mod ## _meminfo, \
50774+ .attach = bfa_ ## __mod ## _attach, \
50775+ .detach = bfa_ ## __mod ## _detach, \
50776+ .start = bfa_ ## __mod ## _start, \
50777+ .stop = bfa_ ## __mod ## _stop, \
50778+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
50779 }
50780
50781 #define BFA_CACHELINE_SZ (256)
50782diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
50783index 045c4e1..13de803 100644
50784--- a/drivers/scsi/fcoe/fcoe_sysfs.c
50785+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
50786@@ -33,8 +33,8 @@
50787 */
50788 #include "libfcoe.h"
50789
50790-static atomic_t ctlr_num;
50791-static atomic_t fcf_num;
50792+static atomic_unchecked_t ctlr_num;
50793+static atomic_unchecked_t fcf_num;
50794
50795 /*
50796 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
50797@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
50798 if (!ctlr)
50799 goto out;
50800
50801- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
50802+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
50803 ctlr->f = f;
50804 ctlr->mode = FIP_CONN_TYPE_FABRIC;
50805 INIT_LIST_HEAD(&ctlr->fcfs);
50806@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
50807 fcf->dev.parent = &ctlr->dev;
50808 fcf->dev.bus = &fcoe_bus_type;
50809 fcf->dev.type = &fcoe_fcf_device_type;
50810- fcf->id = atomic_inc_return(&fcf_num) - 1;
50811+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
50812 fcf->state = FCOE_FCF_STATE_UNKNOWN;
50813
50814 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
50815@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
50816 {
50817 int error;
50818
50819- atomic_set(&ctlr_num, 0);
50820- atomic_set(&fcf_num, 0);
50821+ atomic_set_unchecked(&ctlr_num, 0);
50822+ atomic_set_unchecked(&fcf_num, 0);
50823
50824 error = bus_register(&fcoe_bus_type);
50825 if (error)
50826diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
50827index 6de80e3..a11e0ac 100644
50828--- a/drivers/scsi/hosts.c
50829+++ b/drivers/scsi/hosts.c
50830@@ -42,7 +42,7 @@
50831 #include "scsi_logging.h"
50832
50833
50834-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
50835+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
50836
50837
50838 static void scsi_host_cls_release(struct device *dev)
50839@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
50840 * subtract one because we increment first then return, but we need to
50841 * know what the next host number was before increment
50842 */
50843- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
50844+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
50845 shost->dma_channel = 0xff;
50846
50847 /* These three are default values which can be overridden */
50848diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
50849index cef5d49..01e280e 100644
50850--- a/drivers/scsi/hpsa.c
50851+++ b/drivers/scsi/hpsa.c
50852@@ -701,10 +701,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
50853 unsigned long flags;
50854
50855 if (h->transMethod & CFGTBL_Trans_io_accel1)
50856- return h->access.command_completed(h, q);
50857+ return h->access->command_completed(h, q);
50858
50859 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
50860- return h->access.command_completed(h, q);
50861+ return h->access->command_completed(h, q);
50862
50863 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
50864 a = rq->head[rq->current_entry];
50865@@ -5454,7 +5454,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
50866 while (!list_empty(&h->reqQ)) {
50867 c = list_entry(h->reqQ.next, struct CommandList, list);
50868 /* can't do anything if fifo is full */
50869- if ((h->access.fifo_full(h))) {
50870+ if ((h->access->fifo_full(h))) {
50871 h->fifo_recently_full = 1;
50872 dev_warn(&h->pdev->dev, "fifo full\n");
50873 break;
50874@@ -5476,7 +5476,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
50875
50876 /* Tell the controller execute command */
50877 spin_unlock_irqrestore(&h->lock, *flags);
50878- h->access.submit_command(h, c);
50879+ h->access->submit_command(h, c);
50880 spin_lock_irqsave(&h->lock, *flags);
50881 }
50882 }
50883@@ -5492,17 +5492,17 @@ static void lock_and_start_io(struct ctlr_info *h)
50884
50885 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
50886 {
50887- return h->access.command_completed(h, q);
50888+ return h->access->command_completed(h, q);
50889 }
50890
50891 static inline bool interrupt_pending(struct ctlr_info *h)
50892 {
50893- return h->access.intr_pending(h);
50894+ return h->access->intr_pending(h);
50895 }
50896
50897 static inline long interrupt_not_for_us(struct ctlr_info *h)
50898 {
50899- return (h->access.intr_pending(h) == 0) ||
50900+ return (h->access->intr_pending(h) == 0) ||
50901 (h->interrupts_enabled == 0);
50902 }
50903
50904@@ -6445,7 +6445,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
50905 if (prod_index < 0)
50906 return -ENODEV;
50907 h->product_name = products[prod_index].product_name;
50908- h->access = *(products[prod_index].access);
50909+ h->access = products[prod_index].access;
50910
50911 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
50912 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
50913@@ -6790,7 +6790,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
50914 unsigned long flags;
50915 u32 lockup_detected;
50916
50917- h->access.set_intr_mask(h, HPSA_INTR_OFF);
50918+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
50919 spin_lock_irqsave(&h->lock, flags);
50920 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
50921 if (!lockup_detected) {
50922@@ -7037,7 +7037,7 @@ reinit_after_soft_reset:
50923 }
50924
50925 /* make sure the board interrupts are off */
50926- h->access.set_intr_mask(h, HPSA_INTR_OFF);
50927+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
50928
50929 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
50930 goto clean2;
50931@@ -7072,7 +7072,7 @@ reinit_after_soft_reset:
50932 * fake ones to scoop up any residual completions.
50933 */
50934 spin_lock_irqsave(&h->lock, flags);
50935- h->access.set_intr_mask(h, HPSA_INTR_OFF);
50936+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
50937 spin_unlock_irqrestore(&h->lock, flags);
50938 free_irqs(h);
50939 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
50940@@ -7091,9 +7091,9 @@ reinit_after_soft_reset:
50941 dev_info(&h->pdev->dev, "Board READY.\n");
50942 dev_info(&h->pdev->dev,
50943 "Waiting for stale completions to drain.\n");
50944- h->access.set_intr_mask(h, HPSA_INTR_ON);
50945+ h->access->set_intr_mask(h, HPSA_INTR_ON);
50946 msleep(10000);
50947- h->access.set_intr_mask(h, HPSA_INTR_OFF);
50948+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
50949
50950 rc = controller_reset_failed(h->cfgtable);
50951 if (rc)
50952@@ -7119,7 +7119,7 @@ reinit_after_soft_reset:
50953 h->drv_req_rescan = 0;
50954
50955 /* Turn the interrupts on so we can service requests */
50956- h->access.set_intr_mask(h, HPSA_INTR_ON);
50957+ h->access->set_intr_mask(h, HPSA_INTR_ON);
50958
50959 hpsa_hba_inquiry(h);
50960 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
50961@@ -7184,7 +7184,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
50962 * To write all data in the battery backed cache to disks
50963 */
50964 hpsa_flush_cache(h);
50965- h->access.set_intr_mask(h, HPSA_INTR_OFF);
50966+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
50967 hpsa_free_irqs_and_disable_msix(h);
50968 }
50969
50970@@ -7302,7 +7302,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
50971 CFGTBL_Trans_enable_directed_msix |
50972 (trans_support & (CFGTBL_Trans_io_accel1 |
50973 CFGTBL_Trans_io_accel2));
50974- struct access_method access = SA5_performant_access;
50975+ struct access_method *access = &SA5_performant_access;
50976
50977 /* This is a bit complicated. There are 8 registers on
50978 * the controller which we write to to tell it 8 different
50979@@ -7344,7 +7344,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
50980 * perform the superfluous readl() after each command submission.
50981 */
50982 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
50983- access = SA5_performant_access_no_read;
50984+ access = &SA5_performant_access_no_read;
50985
50986 /* Controller spec: zero out this buffer. */
50987 for (i = 0; i < h->nreply_queues; i++)
50988@@ -7374,12 +7374,12 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
50989 * enable outbound interrupt coalescing in accelerator mode;
50990 */
50991 if (trans_support & CFGTBL_Trans_io_accel1) {
50992- access = SA5_ioaccel_mode1_access;
50993+ access = &SA5_ioaccel_mode1_access;
50994 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
50995 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
50996 } else {
50997 if (trans_support & CFGTBL_Trans_io_accel2) {
50998- access = SA5_ioaccel_mode2_access;
50999+ access = &SA5_ioaccel_mode2_access;
51000 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51001 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51002 }
51003diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
51004index 24472ce..8782caf 100644
51005--- a/drivers/scsi/hpsa.h
51006+++ b/drivers/scsi/hpsa.h
51007@@ -127,7 +127,7 @@ struct ctlr_info {
51008 unsigned int msix_vector;
51009 unsigned int msi_vector;
51010 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
51011- struct access_method access;
51012+ struct access_method *access;
51013 char hba_mode_enabled;
51014
51015 /* queue and queue Info */
51016@@ -536,43 +536,43 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
51017 }
51018
51019 static struct access_method SA5_access = {
51020- SA5_submit_command,
51021- SA5_intr_mask,
51022- SA5_fifo_full,
51023- SA5_intr_pending,
51024- SA5_completed,
51025+ .submit_command = SA5_submit_command,
51026+ .set_intr_mask = SA5_intr_mask,
51027+ .fifo_full = SA5_fifo_full,
51028+ .intr_pending = SA5_intr_pending,
51029+ .command_completed = SA5_completed,
51030 };
51031
51032 static struct access_method SA5_ioaccel_mode1_access = {
51033- SA5_submit_command,
51034- SA5_performant_intr_mask,
51035- SA5_fifo_full,
51036- SA5_ioaccel_mode1_intr_pending,
51037- SA5_ioaccel_mode1_completed,
51038+ .submit_command = SA5_submit_command,
51039+ .set_intr_mask = SA5_performant_intr_mask,
51040+ .fifo_full = SA5_fifo_full,
51041+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
51042+ .command_completed = SA5_ioaccel_mode1_completed,
51043 };
51044
51045 static struct access_method SA5_ioaccel_mode2_access = {
51046- SA5_submit_command_ioaccel2,
51047- SA5_performant_intr_mask,
51048- SA5_fifo_full,
51049- SA5_performant_intr_pending,
51050- SA5_performant_completed,
51051+ .submit_command = SA5_submit_command_ioaccel2,
51052+ .set_intr_mask = SA5_performant_intr_mask,
51053+ .fifo_full = SA5_fifo_full,
51054+ .intr_pending = SA5_performant_intr_pending,
51055+ .command_completed = SA5_performant_completed,
51056 };
51057
51058 static struct access_method SA5_performant_access = {
51059- SA5_submit_command,
51060- SA5_performant_intr_mask,
51061- SA5_fifo_full,
51062- SA5_performant_intr_pending,
51063- SA5_performant_completed,
51064+ .submit_command = SA5_submit_command,
51065+ .set_intr_mask = SA5_performant_intr_mask,
51066+ .fifo_full = SA5_fifo_full,
51067+ .intr_pending = SA5_performant_intr_pending,
51068+ .command_completed = SA5_performant_completed,
51069 };
51070
51071 static struct access_method SA5_performant_access_no_read = {
51072- SA5_submit_command_no_read,
51073- SA5_performant_intr_mask,
51074- SA5_fifo_full,
51075- SA5_performant_intr_pending,
51076- SA5_performant_completed,
51077+ .submit_command = SA5_submit_command_no_read,
51078+ .set_intr_mask = SA5_performant_intr_mask,
51079+ .fifo_full = SA5_fifo_full,
51080+ .intr_pending = SA5_performant_intr_pending,
51081+ .command_completed = SA5_performant_completed,
51082 };
51083
51084 struct board_type {
51085diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
51086index 1b3a094..068e683 100644
51087--- a/drivers/scsi/libfc/fc_exch.c
51088+++ b/drivers/scsi/libfc/fc_exch.c
51089@@ -101,12 +101,12 @@ struct fc_exch_mgr {
51090 u16 pool_max_index;
51091
51092 struct {
51093- atomic_t no_free_exch;
51094- atomic_t no_free_exch_xid;
51095- atomic_t xid_not_found;
51096- atomic_t xid_busy;
51097- atomic_t seq_not_found;
51098- atomic_t non_bls_resp;
51099+ atomic_unchecked_t no_free_exch;
51100+ atomic_unchecked_t no_free_exch_xid;
51101+ atomic_unchecked_t xid_not_found;
51102+ atomic_unchecked_t xid_busy;
51103+ atomic_unchecked_t seq_not_found;
51104+ atomic_unchecked_t non_bls_resp;
51105 } stats;
51106 };
51107
51108@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
51109 /* allocate memory for exchange */
51110 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
51111 if (!ep) {
51112- atomic_inc(&mp->stats.no_free_exch);
51113+ atomic_inc_unchecked(&mp->stats.no_free_exch);
51114 goto out;
51115 }
51116 memset(ep, 0, sizeof(*ep));
51117@@ -874,7 +874,7 @@ out:
51118 return ep;
51119 err:
51120 spin_unlock_bh(&pool->lock);
51121- atomic_inc(&mp->stats.no_free_exch_xid);
51122+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
51123 mempool_free(ep, mp->ep_pool);
51124 return NULL;
51125 }
51126@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51127 xid = ntohs(fh->fh_ox_id); /* we originated exch */
51128 ep = fc_exch_find(mp, xid);
51129 if (!ep) {
51130- atomic_inc(&mp->stats.xid_not_found);
51131+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51132 reject = FC_RJT_OX_ID;
51133 goto out;
51134 }
51135@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51136 ep = fc_exch_find(mp, xid);
51137 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
51138 if (ep) {
51139- atomic_inc(&mp->stats.xid_busy);
51140+ atomic_inc_unchecked(&mp->stats.xid_busy);
51141 reject = FC_RJT_RX_ID;
51142 goto rel;
51143 }
51144@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51145 }
51146 xid = ep->xid; /* get our XID */
51147 } else if (!ep) {
51148- atomic_inc(&mp->stats.xid_not_found);
51149+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51150 reject = FC_RJT_RX_ID; /* XID not found */
51151 goto out;
51152 }
51153@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51154 } else {
51155 sp = &ep->seq;
51156 if (sp->id != fh->fh_seq_id) {
51157- atomic_inc(&mp->stats.seq_not_found);
51158+ atomic_inc_unchecked(&mp->stats.seq_not_found);
51159 if (f_ctl & FC_FC_END_SEQ) {
51160 /*
51161 * Update sequence_id based on incoming last
51162@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51163
51164 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
51165 if (!ep) {
51166- atomic_inc(&mp->stats.xid_not_found);
51167+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51168 goto out;
51169 }
51170 if (ep->esb_stat & ESB_ST_COMPLETE) {
51171- atomic_inc(&mp->stats.xid_not_found);
51172+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51173 goto rel;
51174 }
51175 if (ep->rxid == FC_XID_UNKNOWN)
51176 ep->rxid = ntohs(fh->fh_rx_id);
51177 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
51178- atomic_inc(&mp->stats.xid_not_found);
51179+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51180 goto rel;
51181 }
51182 if (ep->did != ntoh24(fh->fh_s_id) &&
51183 ep->did != FC_FID_FLOGI) {
51184- atomic_inc(&mp->stats.xid_not_found);
51185+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51186 goto rel;
51187 }
51188 sof = fr_sof(fp);
51189@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51190 sp->ssb_stat |= SSB_ST_RESP;
51191 sp->id = fh->fh_seq_id;
51192 } else if (sp->id != fh->fh_seq_id) {
51193- atomic_inc(&mp->stats.seq_not_found);
51194+ atomic_inc_unchecked(&mp->stats.seq_not_found);
51195 goto rel;
51196 }
51197
51198@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51199 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
51200
51201 if (!sp)
51202- atomic_inc(&mp->stats.xid_not_found);
51203+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51204 else
51205- atomic_inc(&mp->stats.non_bls_resp);
51206+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
51207
51208 fc_frame_free(fp);
51209 }
51210@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
51211
51212 list_for_each_entry(ema, &lport->ema_list, ema_list) {
51213 mp = ema->mp;
51214- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
51215+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
51216 st->fc_no_free_exch_xid +=
51217- atomic_read(&mp->stats.no_free_exch_xid);
51218- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
51219- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
51220- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
51221- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
51222+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
51223+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
51224+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
51225+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
51226+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
51227 }
51228 }
51229 EXPORT_SYMBOL(fc_exch_update_stats);
51230diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
51231index 766098a..1c6c971 100644
51232--- a/drivers/scsi/libsas/sas_ata.c
51233+++ b/drivers/scsi/libsas/sas_ata.c
51234@@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
51235 .postreset = ata_std_postreset,
51236 .error_handler = ata_std_error_handler,
51237 .post_internal_cmd = sas_ata_post_internal,
51238- .qc_defer = ata_std_qc_defer,
51239+ .qc_defer = ata_std_qc_defer,
51240 .qc_prep = ata_noop_qc_prep,
51241 .qc_issue = sas_ata_qc_issue,
51242 .qc_fill_rtf = sas_ata_qc_fill_rtf,
51243diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
51244index 434e903..5a4a79b 100644
51245--- a/drivers/scsi/lpfc/lpfc.h
51246+++ b/drivers/scsi/lpfc/lpfc.h
51247@@ -430,7 +430,7 @@ struct lpfc_vport {
51248 struct dentry *debug_nodelist;
51249 struct dentry *vport_debugfs_root;
51250 struct lpfc_debugfs_trc *disc_trc;
51251- atomic_t disc_trc_cnt;
51252+ atomic_unchecked_t disc_trc_cnt;
51253 #endif
51254 uint8_t stat_data_enabled;
51255 uint8_t stat_data_blocked;
51256@@ -880,8 +880,8 @@ struct lpfc_hba {
51257 struct timer_list fabric_block_timer;
51258 unsigned long bit_flags;
51259 #define FABRIC_COMANDS_BLOCKED 0
51260- atomic_t num_rsrc_err;
51261- atomic_t num_cmd_success;
51262+ atomic_unchecked_t num_rsrc_err;
51263+ atomic_unchecked_t num_cmd_success;
51264 unsigned long last_rsrc_error_time;
51265 unsigned long last_ramp_down_time;
51266 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
51267@@ -916,7 +916,7 @@ struct lpfc_hba {
51268
51269 struct dentry *debug_slow_ring_trc;
51270 struct lpfc_debugfs_trc *slow_ring_trc;
51271- atomic_t slow_ring_trc_cnt;
51272+ atomic_unchecked_t slow_ring_trc_cnt;
51273 /* iDiag debugfs sub-directory */
51274 struct dentry *idiag_root;
51275 struct dentry *idiag_pci_cfg;
51276diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
51277index 786a2af..562c6a2 100644
51278--- a/drivers/scsi/lpfc/lpfc_debugfs.c
51279+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
51280@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
51281
51282 #include <linux/debugfs.h>
51283
51284-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51285+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
51286 static unsigned long lpfc_debugfs_start_time = 0L;
51287
51288 /* iDiag */
51289@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
51290 lpfc_debugfs_enable = 0;
51291
51292 len = 0;
51293- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
51294+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
51295 (lpfc_debugfs_max_disc_trc - 1);
51296 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
51297 dtp = vport->disc_trc + i;
51298@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
51299 lpfc_debugfs_enable = 0;
51300
51301 len = 0;
51302- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
51303+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
51304 (lpfc_debugfs_max_slow_ring_trc - 1);
51305 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
51306 dtp = phba->slow_ring_trc + i;
51307@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
51308 !vport || !vport->disc_trc)
51309 return;
51310
51311- index = atomic_inc_return(&vport->disc_trc_cnt) &
51312+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
51313 (lpfc_debugfs_max_disc_trc - 1);
51314 dtp = vport->disc_trc + index;
51315 dtp->fmt = fmt;
51316 dtp->data1 = data1;
51317 dtp->data2 = data2;
51318 dtp->data3 = data3;
51319- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51320+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51321 dtp->jif = jiffies;
51322 #endif
51323 return;
51324@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
51325 !phba || !phba->slow_ring_trc)
51326 return;
51327
51328- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
51329+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
51330 (lpfc_debugfs_max_slow_ring_trc - 1);
51331 dtp = phba->slow_ring_trc + index;
51332 dtp->fmt = fmt;
51333 dtp->data1 = data1;
51334 dtp->data2 = data2;
51335 dtp->data3 = data3;
51336- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
51337+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
51338 dtp->jif = jiffies;
51339 #endif
51340 return;
51341@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51342 "slow_ring buffer\n");
51343 goto debug_failed;
51344 }
51345- atomic_set(&phba->slow_ring_trc_cnt, 0);
51346+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
51347 memset(phba->slow_ring_trc, 0,
51348 (sizeof(struct lpfc_debugfs_trc) *
51349 lpfc_debugfs_max_slow_ring_trc));
51350@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
51351 "buffer\n");
51352 goto debug_failed;
51353 }
51354- atomic_set(&vport->disc_trc_cnt, 0);
51355+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
51356
51357 snprintf(name, sizeof(name), "discovery_trace");
51358 vport->debug_disc_trc =
51359diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
51360index 0b2c53a..aec2b45 100644
51361--- a/drivers/scsi/lpfc/lpfc_init.c
51362+++ b/drivers/scsi/lpfc/lpfc_init.c
51363@@ -11290,8 +11290,10 @@ lpfc_init(void)
51364 "misc_register returned with status %d", error);
51365
51366 if (lpfc_enable_npiv) {
51367- lpfc_transport_functions.vport_create = lpfc_vport_create;
51368- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51369+ pax_open_kernel();
51370+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
51371+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
51372+ pax_close_kernel();
51373 }
51374 lpfc_transport_template =
51375 fc_attach_transport(&lpfc_transport_functions);
51376diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
51377index b99399f..d29dc75 100644
51378--- a/drivers/scsi/lpfc/lpfc_scsi.c
51379+++ b/drivers/scsi/lpfc/lpfc_scsi.c
51380@@ -383,7 +383,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
51381 unsigned long expires;
51382
51383 spin_lock_irqsave(&phba->hbalock, flags);
51384- atomic_inc(&phba->num_rsrc_err);
51385+ atomic_inc_unchecked(&phba->num_rsrc_err);
51386 phba->last_rsrc_error_time = jiffies;
51387
51388 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
51389@@ -425,8 +425,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51390 unsigned long num_rsrc_err, num_cmd_success;
51391 int i;
51392
51393- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
51394- num_cmd_success = atomic_read(&phba->num_cmd_success);
51395+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
51396+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
51397
51398 /*
51399 * The error and success command counters are global per
51400@@ -454,8 +454,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
51401 }
51402 }
51403 lpfc_destroy_vport_work_array(phba, vports);
51404- atomic_set(&phba->num_rsrc_err, 0);
51405- atomic_set(&phba->num_cmd_success, 0);
51406+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
51407+ atomic_set_unchecked(&phba->num_cmd_success, 0);
51408 }
51409
51410 /**
51411diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51412index c80ed04..e674f01 100644
51413--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51414+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
51415@@ -1561,7 +1561,7 @@ _scsih_get_resync(struct device *dev)
51416 {
51417 struct scsi_device *sdev = to_scsi_device(dev);
51418 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51419- static struct _raid_device *raid_device;
51420+ struct _raid_device *raid_device;
51421 unsigned long flags;
51422 Mpi2RaidVolPage0_t vol_pg0;
51423 Mpi2ConfigReply_t mpi_reply;
51424@@ -1613,7 +1613,7 @@ _scsih_get_state(struct device *dev)
51425 {
51426 struct scsi_device *sdev = to_scsi_device(dev);
51427 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
51428- static struct _raid_device *raid_device;
51429+ struct _raid_device *raid_device;
51430 unsigned long flags;
51431 Mpi2RaidVolPage0_t vol_pg0;
51432 Mpi2ConfigReply_t mpi_reply;
51433@@ -6663,7 +6663,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
51434 Mpi2EventDataIrOperationStatus_t *event_data =
51435 (Mpi2EventDataIrOperationStatus_t *)
51436 fw_event->event_data;
51437- static struct _raid_device *raid_device;
51438+ struct _raid_device *raid_device;
51439 unsigned long flags;
51440 u16 handle;
51441
51442@@ -7134,7 +7134,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
51443 u64 sas_address;
51444 struct _sas_device *sas_device;
51445 struct _sas_node *expander_device;
51446- static struct _raid_device *raid_device;
51447+ struct _raid_device *raid_device;
51448 u8 retry_count;
51449 unsigned long flags;
51450
51451diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
51452index bcb64eb..f08cf71 100644
51453--- a/drivers/scsi/pmcraid.c
51454+++ b/drivers/scsi/pmcraid.c
51455@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
51456 res->scsi_dev = scsi_dev;
51457 scsi_dev->hostdata = res;
51458 res->change_detected = 0;
51459- atomic_set(&res->read_failures, 0);
51460- atomic_set(&res->write_failures, 0);
51461+ atomic_set_unchecked(&res->read_failures, 0);
51462+ atomic_set_unchecked(&res->write_failures, 0);
51463 rc = 0;
51464 }
51465 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
51466@@ -2687,9 +2687,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
51467
51468 /* If this was a SCSI read/write command keep count of errors */
51469 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
51470- atomic_inc(&res->read_failures);
51471+ atomic_inc_unchecked(&res->read_failures);
51472 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
51473- atomic_inc(&res->write_failures);
51474+ atomic_inc_unchecked(&res->write_failures);
51475
51476 if (!RES_IS_GSCSI(res->cfg_entry) &&
51477 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
51478@@ -3545,7 +3545,7 @@ static int pmcraid_queuecommand_lck(
51479 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51480 * hrrq_id assigned here in queuecommand
51481 */
51482- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51483+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51484 pinstance->num_hrrq;
51485 cmd->cmd_done = pmcraid_io_done;
51486
51487@@ -3857,7 +3857,7 @@ static long pmcraid_ioctl_passthrough(
51488 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
51489 * hrrq_id assigned here in queuecommand
51490 */
51491- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
51492+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
51493 pinstance->num_hrrq;
51494
51495 if (request_size) {
51496@@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
51497
51498 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
51499 /* add resources only after host is added into system */
51500- if (!atomic_read(&pinstance->expose_resources))
51501+ if (!atomic_read_unchecked(&pinstance->expose_resources))
51502 return;
51503
51504 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
51505@@ -5312,8 +5312,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
51506 init_waitqueue_head(&pinstance->reset_wait_q);
51507
51508 atomic_set(&pinstance->outstanding_cmds, 0);
51509- atomic_set(&pinstance->last_message_id, 0);
51510- atomic_set(&pinstance->expose_resources, 0);
51511+ atomic_set_unchecked(&pinstance->last_message_id, 0);
51512+ atomic_set_unchecked(&pinstance->expose_resources, 0);
51513
51514 INIT_LIST_HEAD(&pinstance->free_res_q);
51515 INIT_LIST_HEAD(&pinstance->used_res_q);
51516@@ -6026,7 +6026,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
51517 /* Schedule worker thread to handle CCN and take care of adding and
51518 * removing devices to OS
51519 */
51520- atomic_set(&pinstance->expose_resources, 1);
51521+ atomic_set_unchecked(&pinstance->expose_resources, 1);
51522 schedule_work(&pinstance->worker_q);
51523 return rc;
51524
51525diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
51526index e1d150f..6c6df44 100644
51527--- a/drivers/scsi/pmcraid.h
51528+++ b/drivers/scsi/pmcraid.h
51529@@ -748,7 +748,7 @@ struct pmcraid_instance {
51530 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
51531
51532 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
51533- atomic_t last_message_id;
51534+ atomic_unchecked_t last_message_id;
51535
51536 /* configuration table */
51537 struct pmcraid_config_table *cfg_table;
51538@@ -777,7 +777,7 @@ struct pmcraid_instance {
51539 atomic_t outstanding_cmds;
51540
51541 /* should add/delete resources to mid-layer now ?*/
51542- atomic_t expose_resources;
51543+ atomic_unchecked_t expose_resources;
51544
51545
51546
51547@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
51548 struct pmcraid_config_table_entry_ext cfg_entry_ext;
51549 };
51550 struct scsi_device *scsi_dev; /* Link scsi_device structure */
51551- atomic_t read_failures; /* count of failed READ commands */
51552- atomic_t write_failures; /* count of failed WRITE commands */
51553+ atomic_unchecked_t read_failures; /* count of failed READ commands */
51554+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
51555
51556 /* To indicate add/delete/modify during CCN */
51557 u8 change_detected;
51558diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
51559index 82b92c4..3178171 100644
51560--- a/drivers/scsi/qla2xxx/qla_attr.c
51561+++ b/drivers/scsi/qla2xxx/qla_attr.c
51562@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
51563 return 0;
51564 }
51565
51566-struct fc_function_template qla2xxx_transport_functions = {
51567+fc_function_template_no_const qla2xxx_transport_functions = {
51568
51569 .show_host_node_name = 1,
51570 .show_host_port_name = 1,
51571@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
51572 .bsg_timeout = qla24xx_bsg_timeout,
51573 };
51574
51575-struct fc_function_template qla2xxx_transport_vport_functions = {
51576+fc_function_template_no_const qla2xxx_transport_vport_functions = {
51577
51578 .show_host_node_name = 1,
51579 .show_host_port_name = 1,
51580diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
51581index b1865a7..a7723d3 100644
51582--- a/drivers/scsi/qla2xxx/qla_gbl.h
51583+++ b/drivers/scsi/qla2xxx/qla_gbl.h
51584@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
51585 struct device_attribute;
51586 extern struct device_attribute *qla2x00_host_attrs[];
51587 struct fc_function_template;
51588-extern struct fc_function_template qla2xxx_transport_functions;
51589-extern struct fc_function_template qla2xxx_transport_vport_functions;
51590+extern fc_function_template_no_const qla2xxx_transport_functions;
51591+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
51592 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
51593 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
51594 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
51595diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
51596index db3dbd9..2492392 100644
51597--- a/drivers/scsi/qla2xxx/qla_os.c
51598+++ b/drivers/scsi/qla2xxx/qla_os.c
51599@@ -1507,8 +1507,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
51600 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
51601 /* Ok, a 64bit DMA mask is applicable. */
51602 ha->flags.enable_64bit_addressing = 1;
51603- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
51604- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
51605+ pax_open_kernel();
51606+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
51607+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
51608+ pax_close_kernel();
51609 return;
51610 }
51611 }
51612diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
51613index 8f6d0fb..1b21097 100644
51614--- a/drivers/scsi/qla4xxx/ql4_def.h
51615+++ b/drivers/scsi/qla4xxx/ql4_def.h
51616@@ -305,7 +305,7 @@ struct ddb_entry {
51617 * (4000 only) */
51618 atomic_t relogin_timer; /* Max Time to wait for
51619 * relogin to complete */
51620- atomic_t relogin_retry_count; /* Num of times relogin has been
51621+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
51622 * retried */
51623 uint32_t default_time2wait; /* Default Min time between
51624 * relogins (+aens) */
51625diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
51626index 199fcf7..3c3a918 100644
51627--- a/drivers/scsi/qla4xxx/ql4_os.c
51628+++ b/drivers/scsi/qla4xxx/ql4_os.c
51629@@ -4496,12 +4496,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
51630 */
51631 if (!iscsi_is_session_online(cls_sess)) {
51632 /* Reset retry relogin timer */
51633- atomic_inc(&ddb_entry->relogin_retry_count);
51634+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
51635 DEBUG2(ql4_printk(KERN_INFO, ha,
51636 "%s: index[%d] relogin timed out-retrying"
51637 " relogin (%d), retry (%d)\n", __func__,
51638 ddb_entry->fw_ddb_index,
51639- atomic_read(&ddb_entry->relogin_retry_count),
51640+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
51641 ddb_entry->default_time2wait + 4));
51642 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
51643 atomic_set(&ddb_entry->retry_relogin_timer,
51644@@ -6609,7 +6609,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
51645
51646 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
51647 atomic_set(&ddb_entry->relogin_timer, 0);
51648- atomic_set(&ddb_entry->relogin_retry_count, 0);
51649+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
51650 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
51651 ddb_entry->default_relogin_timeout =
51652 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
51653diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
51654index 79c77b4..ef6ec0b 100644
51655--- a/drivers/scsi/scsi.c
51656+++ b/drivers/scsi/scsi.c
51657@@ -645,7 +645,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
51658 struct Scsi_Host *host = cmd->device->host;
51659 int rtn = 0;
51660
51661- atomic_inc(&cmd->device->iorequest_cnt);
51662+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
51663
51664 /* check if the device is still usable */
51665 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
51666diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
51667index 50a6e1a..de5252e 100644
51668--- a/drivers/scsi/scsi_lib.c
51669+++ b/drivers/scsi/scsi_lib.c
51670@@ -1583,7 +1583,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
51671 shost = sdev->host;
51672 scsi_init_cmd_errh(cmd);
51673 cmd->result = DID_NO_CONNECT << 16;
51674- atomic_inc(&cmd->device->iorequest_cnt);
51675+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
51676
51677 /*
51678 * SCSI request completion path will do scsi_device_unbusy(),
51679@@ -1606,9 +1606,9 @@ static void scsi_softirq_done(struct request *rq)
51680
51681 INIT_LIST_HEAD(&cmd->eh_entry);
51682
51683- atomic_inc(&cmd->device->iodone_cnt);
51684+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
51685 if (cmd->result)
51686- atomic_inc(&cmd->device->ioerr_cnt);
51687+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
51688
51689 disposition = scsi_decide_disposition(cmd);
51690 if (disposition != SUCCESS &&
51691diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
51692index f4cb7b3..dfa79c4 100644
51693--- a/drivers/scsi/scsi_sysfs.c
51694+++ b/drivers/scsi/scsi_sysfs.c
51695@@ -805,7 +805,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
51696 char *buf) \
51697 { \
51698 struct scsi_device *sdev = to_scsi_device(dev); \
51699- unsigned long long count = atomic_read(&sdev->field); \
51700+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
51701 return snprintf(buf, 20, "0x%llx\n", count); \
51702 } \
51703 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
51704diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
51705index 5d6f348..18778a6b 100644
51706--- a/drivers/scsi/scsi_transport_fc.c
51707+++ b/drivers/scsi/scsi_transport_fc.c
51708@@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
51709 * Netlink Infrastructure
51710 */
51711
51712-static atomic_t fc_event_seq;
51713+static atomic_unchecked_t fc_event_seq;
51714
51715 /**
51716 * fc_get_event_number - Obtain the next sequential FC event number
51717@@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
51718 u32
51719 fc_get_event_number(void)
51720 {
51721- return atomic_add_return(1, &fc_event_seq);
51722+ return atomic_add_return_unchecked(1, &fc_event_seq);
51723 }
51724 EXPORT_SYMBOL(fc_get_event_number);
51725
51726@@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
51727 {
51728 int error;
51729
51730- atomic_set(&fc_event_seq, 0);
51731+ atomic_set_unchecked(&fc_event_seq, 0);
51732
51733 error = transport_class_register(&fc_host_class);
51734 if (error)
51735@@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
51736 char *cp;
51737
51738 *val = simple_strtoul(buf, &cp, 0);
51739- if ((*cp && (*cp != '\n')) || (*val < 0))
51740+ if (*cp && (*cp != '\n'))
51741 return -EINVAL;
51742 /*
51743 * Check for overflow; dev_loss_tmo is u32
51744diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
51745index 67d43e3..8cee73c 100644
51746--- a/drivers/scsi/scsi_transport_iscsi.c
51747+++ b/drivers/scsi/scsi_transport_iscsi.c
51748@@ -79,7 +79,7 @@ struct iscsi_internal {
51749 struct transport_container session_cont;
51750 };
51751
51752-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
51753+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
51754 static struct workqueue_struct *iscsi_eh_timer_workq;
51755
51756 static DEFINE_IDA(iscsi_sess_ida);
51757@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
51758 int err;
51759
51760 ihost = shost->shost_data;
51761- session->sid = atomic_add_return(1, &iscsi_session_nr);
51762+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
51763
51764 if (target_id == ISCSI_MAX_TARGET) {
51765 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
51766@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
51767 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
51768 ISCSI_TRANSPORT_VERSION);
51769
51770- atomic_set(&iscsi_session_nr, 0);
51771+ atomic_set_unchecked(&iscsi_session_nr, 0);
51772
51773 err = class_register(&iscsi_transport_class);
51774 if (err)
51775diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
51776index ae45bd9..c32a586 100644
51777--- a/drivers/scsi/scsi_transport_srp.c
51778+++ b/drivers/scsi/scsi_transport_srp.c
51779@@ -35,7 +35,7 @@
51780 #include "scsi_priv.h"
51781
51782 struct srp_host_attrs {
51783- atomic_t next_port_id;
51784+ atomic_unchecked_t next_port_id;
51785 };
51786 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
51787
51788@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
51789 struct Scsi_Host *shost = dev_to_shost(dev);
51790 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
51791
51792- atomic_set(&srp_host->next_port_id, 0);
51793+ atomic_set_unchecked(&srp_host->next_port_id, 0);
51794 return 0;
51795 }
51796
51797@@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
51798 rport_fast_io_fail_timedout);
51799 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
51800
51801- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
51802+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
51803 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
51804
51805 transport_setup_device(&rport->dev);
51806diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
51807index cfba74c..415f09b 100644
51808--- a/drivers/scsi/sd.c
51809+++ b/drivers/scsi/sd.c
51810@@ -3022,7 +3022,7 @@ static int sd_probe(struct device *dev)
51811 sdkp->disk = gd;
51812 sdkp->index = index;
51813 atomic_set(&sdkp->openers, 0);
51814- atomic_set(&sdkp->device->ioerr_cnt, 0);
51815+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
51816
51817 if (!sdp->request_queue->rq_timeout) {
51818 if (sdp->type != TYPE_MOD)
51819diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
51820index 6035444..c82edd4 100644
51821--- a/drivers/scsi/sg.c
51822+++ b/drivers/scsi/sg.c
51823@@ -1138,7 +1138,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
51824 sdp->disk->disk_name,
51825 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
51826 NULL,
51827- (char *)arg);
51828+ (char __user *)arg);
51829 case BLKTRACESTART:
51830 return blk_trace_startstop(sdp->device->request_queue, 1);
51831 case BLKTRACESTOP:
51832diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
51833index 11a5043..e36f04c 100644
51834--- a/drivers/soc/tegra/fuse/fuse-tegra.c
51835+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
51836@@ -70,7 +70,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
51837 return i;
51838 }
51839
51840-static struct bin_attribute fuse_bin_attr = {
51841+static bin_attribute_no_const fuse_bin_attr = {
51842 .attr = { .name = "fuse", .mode = S_IRUGO, },
51843 .read = fuse_read,
51844 };
51845diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
51846index 50f20f2..6bd81e0 100644
51847--- a/drivers/spi/spi.c
51848+++ b/drivers/spi/spi.c
51849@@ -2224,7 +2224,7 @@ int spi_bus_unlock(struct spi_master *master)
51850 EXPORT_SYMBOL_GPL(spi_bus_unlock);
51851
51852 /* portable code must never pass more than 32 bytes */
51853-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
51854+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
51855
51856 static u8 *buf;
51857
51858diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
51859index b41429f..2de5373 100644
51860--- a/drivers/staging/android/timed_output.c
51861+++ b/drivers/staging/android/timed_output.c
51862@@ -25,7 +25,7 @@
51863 #include "timed_output.h"
51864
51865 static struct class *timed_output_class;
51866-static atomic_t device_count;
51867+static atomic_unchecked_t device_count;
51868
51869 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
51870 char *buf)
51871@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
51872 timed_output_class = class_create(THIS_MODULE, "timed_output");
51873 if (IS_ERR(timed_output_class))
51874 return PTR_ERR(timed_output_class);
51875- atomic_set(&device_count, 0);
51876+ atomic_set_unchecked(&device_count, 0);
51877 timed_output_class->dev_groups = timed_output_groups;
51878 }
51879
51880@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
51881 if (ret < 0)
51882 return ret;
51883
51884- tdev->index = atomic_inc_return(&device_count);
51885+ tdev->index = atomic_inc_return_unchecked(&device_count);
51886 tdev->dev = device_create(timed_output_class, NULL,
51887 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
51888 if (IS_ERR(tdev->dev))
51889diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
51890index 001348c..cfaac8a 100644
51891--- a/drivers/staging/gdm724x/gdm_tty.c
51892+++ b/drivers/staging/gdm724x/gdm_tty.c
51893@@ -44,7 +44,7 @@
51894 #define gdm_tty_send_control(n, r, v, d, l) (\
51895 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
51896
51897-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
51898+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
51899
51900 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
51901 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
51902diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c
51903index 9cb222e..8766f26 100644
51904--- a/drivers/staging/imx-drm/imx-drm-core.c
51905+++ b/drivers/staging/imx-drm/imx-drm-core.c
51906@@ -357,7 +357,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
51907 if (imxdrm->pipes >= MAX_CRTC)
51908 return -EINVAL;
51909
51910- if (imxdrm->drm->open_count)
51911+ if (local_read(&imxdrm->drm->open_count))
51912 return -EBUSY;
51913
51914 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
51915diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
51916index 503b2d7..c918745 100644
51917--- a/drivers/staging/line6/driver.c
51918+++ b/drivers/staging/line6/driver.c
51919@@ -463,7 +463,7 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
51920 {
51921 struct usb_device *usbdev = line6->usbdev;
51922 int ret;
51923- unsigned char len;
51924+ unsigned char *plen;
51925
51926 /* query the serial number: */
51927 ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
51928@@ -476,27 +476,34 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
51929 return ret;
51930 }
51931
51932+ plen = kmalloc(1, GFP_KERNEL);
51933+ if (plen == NULL)
51934+ return -ENOMEM;
51935+
51936 /* Wait for data length. We'll get 0xff until length arrives. */
51937 do {
51938 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
51939 USB_TYPE_VENDOR | USB_RECIP_DEVICE |
51940 USB_DIR_IN,
51941- 0x0012, 0x0000, &len, 1,
51942+ 0x0012, 0x0000, plen, 1,
51943 LINE6_TIMEOUT * HZ);
51944 if (ret < 0) {
51945 dev_err(line6->ifcdev,
51946 "receive length failed (error %d)\n", ret);
51947+ kfree(plen);
51948 return ret;
51949 }
51950- } while (len == 0xff);
51951+ } while (*plen == 0xff);
51952
51953- if (len != datalen) {
51954+ if (*plen != datalen) {
51955 /* should be equal or something went wrong */
51956 dev_err(line6->ifcdev,
51957 "length mismatch (expected %d, got %d)\n",
51958- (int)datalen, (int)len);
51959+ (int)datalen, (int)*plen);
51960+ kfree(plen);
51961 return -EINVAL;
51962 }
51963+ kfree(plen);
51964
51965 /* receive the result: */
51966 ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
51967diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
51968index a94f336..6a1924d 100644
51969--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
51970+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
51971@@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
51972 return 0;
51973 }
51974
51975-sfw_test_client_ops_t brw_test_client;
51976-void brw_init_test_client(void)
51977-{
51978- brw_test_client.tso_init = brw_client_init;
51979- brw_test_client.tso_fini = brw_client_fini;
51980- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
51981- brw_test_client.tso_done_rpc = brw_client_done_rpc;
51982+sfw_test_client_ops_t brw_test_client = {
51983+ .tso_init = brw_client_init,
51984+ .tso_fini = brw_client_fini,
51985+ .tso_prep_rpc = brw_client_prep_rpc,
51986+ .tso_done_rpc = brw_client_done_rpc,
51987 };
51988
51989 srpc_service_t brw_test_service;
51990diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
51991index df04ab7..1deb1ac 100644
51992--- a/drivers/staging/lustre/lnet/selftest/framework.c
51993+++ b/drivers/staging/lustre/lnet/selftest/framework.c
51994@@ -1632,12 +1632,10 @@ static srpc_service_t sfw_services[] = {
51995
51996 extern sfw_test_client_ops_t ping_test_client;
51997 extern srpc_service_t ping_test_service;
51998-extern void ping_init_test_client(void);
51999 extern void ping_init_test_service(void);
52000
52001 extern sfw_test_client_ops_t brw_test_client;
52002 extern srpc_service_t brw_test_service;
52003-extern void brw_init_test_client(void);
52004 extern void brw_init_test_service(void);
52005
52006
52007@@ -1681,12 +1679,10 @@ sfw_startup (void)
52008 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
52009 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
52010
52011- brw_init_test_client();
52012 brw_init_test_service();
52013 rc = sfw_register_test(&brw_test_service, &brw_test_client);
52014 LASSERT (rc == 0);
52015
52016- ping_init_test_client();
52017 ping_init_test_service();
52018 rc = sfw_register_test(&ping_test_service, &ping_test_client);
52019 LASSERT (rc == 0);
52020diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
52021index 750cac4..e4d751f 100644
52022--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
52023+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
52024@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
52025 return 0;
52026 }
52027
52028-sfw_test_client_ops_t ping_test_client;
52029-void ping_init_test_client(void)
52030-{
52031- ping_test_client.tso_init = ping_client_init;
52032- ping_test_client.tso_fini = ping_client_fini;
52033- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
52034- ping_test_client.tso_done_rpc = ping_client_done_rpc;
52035-}
52036+sfw_test_client_ops_t ping_test_client = {
52037+ .tso_init = ping_client_init,
52038+ .tso_fini = ping_client_fini,
52039+ .tso_prep_rpc = ping_client_prep_rpc,
52040+ .tso_done_rpc = ping_client_done_rpc,
52041+};
52042
52043 srpc_service_t ping_test_service;
52044 void ping_init_test_service(void)
52045diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52046index 14ac46f..eca2c16 100644
52047--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
52048+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
52049@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
52050 ldlm_completion_callback lcs_completion;
52051 ldlm_blocking_callback lcs_blocking;
52052 ldlm_glimpse_callback lcs_glimpse;
52053-};
52054+} __no_const;
52055
52056 /* ldlm_lockd.c */
52057 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
52058diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
52059index 2a88b80..62e7e5f 100644
52060--- a/drivers/staging/lustre/lustre/include/obd.h
52061+++ b/drivers/staging/lustre/lustre/include/obd.h
52062@@ -1362,7 +1362,7 @@ struct md_ops {
52063 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
52064 * wrapper function in include/linux/obd_class.h.
52065 */
52066-};
52067+} __no_const;
52068
52069 struct lsm_operations {
52070 void (*lsm_free)(struct lov_stripe_md *);
52071diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52072index b798daa..b28ca8f 100644
52073--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52074+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
52075@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
52076 int added = (mode == LCK_NL);
52077 int overlaps = 0;
52078 int splitted = 0;
52079- const struct ldlm_callback_suite null_cbs = { NULL };
52080+ const struct ldlm_callback_suite null_cbs = { };
52081
52082 CDEBUG(D_DLMTRACE, "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
52083 *flags, new->l_policy_data.l_flock.owner,
52084diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52085index bbe2c68..c6b4275 100644
52086--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52087+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
52088@@ -236,7 +236,7 @@ int proc_console_max_delay_cs(struct ctl_table *table, int write,
52089 void __user *buffer, size_t *lenp, loff_t *ppos)
52090 {
52091 int rc, max_delay_cs;
52092- struct ctl_table dummy = *table;
52093+ ctl_table_no_const dummy = *table;
52094 long d;
52095
52096 dummy.data = &max_delay_cs;
52097@@ -268,7 +268,7 @@ int proc_console_min_delay_cs(struct ctl_table *table, int write,
52098 void __user *buffer, size_t *lenp, loff_t *ppos)
52099 {
52100 int rc, min_delay_cs;
52101- struct ctl_table dummy = *table;
52102+ ctl_table_no_const dummy = *table;
52103 long d;
52104
52105 dummy.data = &min_delay_cs;
52106@@ -300,7 +300,7 @@ int proc_console_backoff(struct ctl_table *table, int write,
52107 void __user *buffer, size_t *lenp, loff_t *ppos)
52108 {
52109 int rc, backoff;
52110- struct ctl_table dummy = *table;
52111+ ctl_table_no_const dummy = *table;
52112
52113 dummy.data = &backoff;
52114 dummy.proc_handler = &proc_dointvec;
52115diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
52116index 2c4fc74..b04ca79 100644
52117--- a/drivers/staging/lustre/lustre/libcfs/module.c
52118+++ b/drivers/staging/lustre/lustre/libcfs/module.c
52119@@ -315,11 +315,11 @@ out:
52120
52121
52122 struct cfs_psdev_ops libcfs_psdev_ops = {
52123- libcfs_psdev_open,
52124- libcfs_psdev_release,
52125- NULL,
52126- NULL,
52127- libcfs_ioctl
52128+ .p_open = libcfs_psdev_open,
52129+ .p_close = libcfs_psdev_release,
52130+ .p_read = NULL,
52131+ .p_write = NULL,
52132+ .p_ioctl = libcfs_ioctl
52133 };
52134
52135 extern int insert_proc(void);
52136diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
52137index b0bb709..0117c96 100644
52138--- a/drivers/staging/lustre/lustre/llite/dir.c
52139+++ b/drivers/staging/lustre/lustre/llite/dir.c
52140@@ -661,7 +661,7 @@ int ll_dir_setdirstripe(struct inode *dir, struct lmv_user_md *lump,
52141 int mode;
52142 int err;
52143
52144- mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
52145+ mode = (0755 & (S_IRWXUGO|S_ISVTX) & ~current_umask()) | S_IFDIR;
52146 op_data = ll_prep_md_op_data(NULL, dir, NULL, filename,
52147 strlen(filename), mode, LUSTRE_OPC_MKDIR,
52148 lump);
52149diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
52150index b2b6c3c..302e4e4 100644
52151--- a/drivers/staging/octeon/ethernet-rx.c
52152+++ b/drivers/staging/octeon/ethernet-rx.c
52153@@ -416,11 +416,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52154 /* Increment RX stats for virtual ports */
52155 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
52156 #ifdef CONFIG_64BIT
52157- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
52158- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
52159+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
52160+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
52161 #else
52162- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
52163- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
52164+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
52165+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
52166 #endif
52167 }
52168 netif_receive_skb(skb);
52169@@ -431,9 +431,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
52170 dev->name);
52171 */
52172 #ifdef CONFIG_64BIT
52173- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
52174+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52175 #else
52176- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
52177+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
52178 #endif
52179 dev_kfree_skb_irq(skb);
52180 }
52181diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
52182index 8f9e3fb..d283fb9 100644
52183--- a/drivers/staging/octeon/ethernet.c
52184+++ b/drivers/staging/octeon/ethernet.c
52185@@ -247,11 +247,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
52186 * since the RX tasklet also increments it.
52187 */
52188 #ifdef CONFIG_64BIT
52189- atomic64_add(rx_status.dropped_packets,
52190- (atomic64_t *)&priv->stats.rx_dropped);
52191+ atomic64_add_unchecked(rx_status.dropped_packets,
52192+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
52193 #else
52194- atomic_add(rx_status.dropped_packets,
52195- (atomic_t *)&priv->stats.rx_dropped);
52196+ atomic_add_unchecked(rx_status.dropped_packets,
52197+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
52198 #endif
52199 }
52200
52201diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
52202index 9191993..30e9817 100644
52203--- a/drivers/staging/rtl8188eu/include/hal_intf.h
52204+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
52205@@ -225,7 +225,7 @@ struct hal_ops {
52206
52207 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
52208 void (*hal_reset_security_engine)(struct adapter *adapter);
52209-};
52210+} __no_const;
52211
52212 enum rt_eeprom_type {
52213 EEPROM_93C46,
52214diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
52215index 070cc03..6806e37 100644
52216--- a/drivers/staging/rtl8712/rtl871x_io.h
52217+++ b/drivers/staging/rtl8712/rtl871x_io.h
52218@@ -108,7 +108,7 @@ struct _io_ops {
52219 u8 *pmem);
52220 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
52221 u8 *pmem);
52222-};
52223+} __no_const;
52224
52225 struct io_req {
52226 struct list_head list;
52227diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
52228index 2bf2e2f..84421c9 100644
52229--- a/drivers/staging/unisys/visorchipset/visorchipset.h
52230+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
52231@@ -228,7 +228,7 @@ typedef struct {
52232 void (*device_resume)(ulong busNo, ulong devNo);
52233 int (*get_channel_info)(uuid_le typeGuid, ulong *minSize,
52234 ulong *maxSize);
52235-} VISORCHIPSET_BUSDEV_NOTIFIERS;
52236+} __no_const VISORCHIPSET_BUSDEV_NOTIFIERS;
52237
52238 /* These functions live inside visorchipset, and will be called to indicate
52239 * responses to specific events (by code outside of visorchipset).
52240@@ -243,7 +243,7 @@ typedef struct {
52241 void (*device_destroy)(ulong busNo, ulong devNo, int response);
52242 void (*device_pause)(ulong busNo, ulong devNo, int response);
52243 void (*device_resume)(ulong busNo, ulong devNo, int response);
52244-} VISORCHIPSET_BUSDEV_RESPONDERS;
52245+} __no_const VISORCHIPSET_BUSDEV_RESPONDERS;
52246
52247 /** Register functions (in the bus driver) to get called by visorchipset
52248 * whenever a bus or device appears for which this service partition is
52249diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
52250index ae0dade..803d53a 100644
52251--- a/drivers/staging/vt6655/hostap.c
52252+++ b/drivers/staging/vt6655/hostap.c
52253@@ -65,14 +65,13 @@
52254 *
52255 */
52256
52257+static net_device_ops_no_const apdev_netdev_ops;
52258+
52259 static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
52260 {
52261 struct vnt_private *apdev_priv;
52262 struct net_device *dev = pDevice->dev;
52263 int ret;
52264- const struct net_device_ops apdev_netdev_ops = {
52265- .ndo_start_xmit = pDevice->tx_80211,
52266- };
52267
52268 pr_debug("%s: Enabling hostapd mode\n", dev->name);
52269
52270@@ -84,6 +83,8 @@ static int hostap_enable_hostapd(struct vnt_private *pDevice, int rtnl_locked)
52271 *apdev_priv = *pDevice;
52272 eth_hw_addr_inherit(pDevice->apdev, dev);
52273
52274+ /* only half broken now */
52275+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
52276 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
52277
52278 pDevice->apdev->type = ARPHRD_IEEE80211;
52279diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
52280index e7e9372..161f530 100644
52281--- a/drivers/target/sbp/sbp_target.c
52282+++ b/drivers/target/sbp/sbp_target.c
52283@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
52284
52285 #define SESSION_MAINTENANCE_INTERVAL HZ
52286
52287-static atomic_t login_id = ATOMIC_INIT(0);
52288+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
52289
52290 static void session_maintenance_work(struct work_struct *);
52291 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
52292@@ -444,7 +444,7 @@ static void sbp_management_request_login(
52293 login->lun = se_lun;
52294 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
52295 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
52296- login->login_id = atomic_inc_return(&login_id);
52297+ login->login_id = atomic_inc_return_unchecked(&login_id);
52298
52299 login->tgt_agt = sbp_target_agent_register(login);
52300 if (IS_ERR(login->tgt_agt)) {
52301diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
52302index c45f9e9..00e85f0 100644
52303--- a/drivers/target/target_core_device.c
52304+++ b/drivers/target/target_core_device.c
52305@@ -1532,7 +1532,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
52306 spin_lock_init(&dev->se_tmr_lock);
52307 spin_lock_init(&dev->qf_cmd_lock);
52308 sema_init(&dev->caw_sem, 1);
52309- atomic_set(&dev->dev_ordered_id, 0);
52310+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
52311 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
52312 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
52313 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
52314diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
52315index be877bf..7be9cd4 100644
52316--- a/drivers/target/target_core_transport.c
52317+++ b/drivers/target/target_core_transport.c
52318@@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
52319 * Used to determine when ORDERED commands should go from
52320 * Dormant to Active status.
52321 */
52322- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
52323+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
52324 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
52325 cmd->se_ordered_id, cmd->sam_task_attr,
52326 dev->transport->name);
52327diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
52328index edc1cce..769e4cb 100644
52329--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
52330+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
52331@@ -209,8 +209,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
52332 platform_set_drvdata(pdev, priv);
52333
52334 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
52335- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52336- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52337+ pax_open_kernel();
52338+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
52339+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
52340+ pax_close_kernel();
52341 }
52342 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
52343 priv, &int3400_thermal_ops,
52344diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
52345index 62143ba..ae21165 100644
52346--- a/drivers/thermal/of-thermal.c
52347+++ b/drivers/thermal/of-thermal.c
52348@@ -30,6 +30,7 @@
52349 #include <linux/err.h>
52350 #include <linux/export.h>
52351 #include <linux/string.h>
52352+#include <linux/mm.h>
52353
52354 #include "thermal_core.h"
52355
52356@@ -341,8 +342,10 @@ thermal_zone_of_add_sensor(struct device_node *zone,
52357 tz->get_trend = get_trend;
52358 tz->sensor_data = data;
52359
52360- tzd->ops->get_temp = of_thermal_get_temp;
52361- tzd->ops->get_trend = of_thermal_get_trend;
52362+ pax_open_kernel();
52363+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
52364+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
52365+ pax_close_kernel();
52366 mutex_unlock(&tzd->lock);
52367
52368 return tzd;
52369@@ -473,8 +476,10 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
52370 return;
52371
52372 mutex_lock(&tzd->lock);
52373- tzd->ops->get_temp = NULL;
52374- tzd->ops->get_trend = NULL;
52375+ pax_open_kernel();
52376+ *(void **)&tzd->ops->get_temp = NULL;
52377+ *(void **)&tzd->ops->get_trend = NULL;
52378+ pax_close_kernel();
52379
52380 tz->get_temp = NULL;
52381 tz->get_trend = NULL;
52382diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
52383index fd66f57..48e6376 100644
52384--- a/drivers/tty/cyclades.c
52385+++ b/drivers/tty/cyclades.c
52386@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
52387 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
52388 info->port.count);
52389 #endif
52390- info->port.count++;
52391+ atomic_inc(&info->port.count);
52392 #ifdef CY_DEBUG_COUNT
52393 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
52394- current->pid, info->port.count);
52395+ current->pid, atomic_read(&info->port.count));
52396 #endif
52397
52398 /*
52399@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
52400 for (j = 0; j < cy_card[i].nports; j++) {
52401 info = &cy_card[i].ports[j];
52402
52403- if (info->port.count) {
52404+ if (atomic_read(&info->port.count)) {
52405 /* XXX is the ldisc num worth this? */
52406 struct tty_struct *tty;
52407 struct tty_ldisc *ld;
52408diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
52409index 4fcec1d..5a036f7 100644
52410--- a/drivers/tty/hvc/hvc_console.c
52411+++ b/drivers/tty/hvc/hvc_console.c
52412@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
52413
52414 spin_lock_irqsave(&hp->port.lock, flags);
52415 /* Check and then increment for fast path open. */
52416- if (hp->port.count++ > 0) {
52417+ if (atomic_inc_return(&hp->port.count) > 1) {
52418 spin_unlock_irqrestore(&hp->port.lock, flags);
52419 hvc_kick();
52420 return 0;
52421@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52422
52423 spin_lock_irqsave(&hp->port.lock, flags);
52424
52425- if (--hp->port.count == 0) {
52426+ if (atomic_dec_return(&hp->port.count) == 0) {
52427 spin_unlock_irqrestore(&hp->port.lock, flags);
52428 /* We are done with the tty pointer now. */
52429 tty_port_tty_set(&hp->port, NULL);
52430@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
52431 */
52432 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
52433 } else {
52434- if (hp->port.count < 0)
52435+ if (atomic_read(&hp->port.count) < 0)
52436 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
52437- hp->vtermno, hp->port.count);
52438+ hp->vtermno, atomic_read(&hp->port.count));
52439 spin_unlock_irqrestore(&hp->port.lock, flags);
52440 }
52441 }
52442@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
52443 * open->hangup case this can be called after the final close so prevent
52444 * that from happening for now.
52445 */
52446- if (hp->port.count <= 0) {
52447+ if (atomic_read(&hp->port.count) <= 0) {
52448 spin_unlock_irqrestore(&hp->port.lock, flags);
52449 return;
52450 }
52451
52452- hp->port.count = 0;
52453+ atomic_set(&hp->port.count, 0);
52454 spin_unlock_irqrestore(&hp->port.lock, flags);
52455 tty_port_tty_set(&hp->port, NULL);
52456
52457@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
52458 return -EPIPE;
52459
52460 /* FIXME what's this (unprotected) check for? */
52461- if (hp->port.count <= 0)
52462+ if (atomic_read(&hp->port.count) <= 0)
52463 return -EIO;
52464
52465 spin_lock_irqsave(&hp->lock, flags);
52466diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
52467index 81e939e..95ead10 100644
52468--- a/drivers/tty/hvc/hvcs.c
52469+++ b/drivers/tty/hvc/hvcs.c
52470@@ -83,6 +83,7 @@
52471 #include <asm/hvcserver.h>
52472 #include <asm/uaccess.h>
52473 #include <asm/vio.h>
52474+#include <asm/local.h>
52475
52476 /*
52477 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
52478@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
52479
52480 spin_lock_irqsave(&hvcsd->lock, flags);
52481
52482- if (hvcsd->port.count > 0) {
52483+ if (atomic_read(&hvcsd->port.count) > 0) {
52484 spin_unlock_irqrestore(&hvcsd->lock, flags);
52485 printk(KERN_INFO "HVCS: vterm state unchanged. "
52486 "The hvcs device node is still in use.\n");
52487@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
52488 }
52489 }
52490
52491- hvcsd->port.count = 0;
52492+ atomic_set(&hvcsd->port.count, 0);
52493 hvcsd->port.tty = tty;
52494 tty->driver_data = hvcsd;
52495
52496@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
52497 unsigned long flags;
52498
52499 spin_lock_irqsave(&hvcsd->lock, flags);
52500- hvcsd->port.count++;
52501+ atomic_inc(&hvcsd->port.count);
52502 hvcsd->todo_mask |= HVCS_SCHED_READ;
52503 spin_unlock_irqrestore(&hvcsd->lock, flags);
52504
52505@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
52506 hvcsd = tty->driver_data;
52507
52508 spin_lock_irqsave(&hvcsd->lock, flags);
52509- if (--hvcsd->port.count == 0) {
52510+ if (atomic_dec_and_test(&hvcsd->port.count)) {
52511
52512 vio_disable_interrupts(hvcsd->vdev);
52513
52514@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
52515
52516 free_irq(irq, hvcsd);
52517 return;
52518- } else if (hvcsd->port.count < 0) {
52519+ } else if (atomic_read(&hvcsd->port.count) < 0) {
52520 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
52521 " is missmanaged.\n",
52522- hvcsd->vdev->unit_address, hvcsd->port.count);
52523+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
52524 }
52525
52526 spin_unlock_irqrestore(&hvcsd->lock, flags);
52527@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
52528
52529 spin_lock_irqsave(&hvcsd->lock, flags);
52530 /* Preserve this so that we know how many kref refs to put */
52531- temp_open_count = hvcsd->port.count;
52532+ temp_open_count = atomic_read(&hvcsd->port.count);
52533
52534 /*
52535 * Don't kref put inside the spinlock because the destruction
52536@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
52537 tty->driver_data = NULL;
52538 hvcsd->port.tty = NULL;
52539
52540- hvcsd->port.count = 0;
52541+ atomic_set(&hvcsd->port.count, 0);
52542
52543 /* This will drop any buffered data on the floor which is OK in a hangup
52544 * scenario. */
52545@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
52546 * the middle of a write operation? This is a crummy place to do this
52547 * but we want to keep it all in the spinlock.
52548 */
52549- if (hvcsd->port.count <= 0) {
52550+ if (atomic_read(&hvcsd->port.count) <= 0) {
52551 spin_unlock_irqrestore(&hvcsd->lock, flags);
52552 return -ENODEV;
52553 }
52554@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
52555 {
52556 struct hvcs_struct *hvcsd = tty->driver_data;
52557
52558- if (!hvcsd || hvcsd->port.count <= 0)
52559+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
52560 return 0;
52561
52562 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
52563diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
52564index 4190199..06d5bfa 100644
52565--- a/drivers/tty/hvc/hvsi.c
52566+++ b/drivers/tty/hvc/hvsi.c
52567@@ -85,7 +85,7 @@ struct hvsi_struct {
52568 int n_outbuf;
52569 uint32_t vtermno;
52570 uint32_t virq;
52571- atomic_t seqno; /* HVSI packet sequence number */
52572+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
52573 uint16_t mctrl;
52574 uint8_t state; /* HVSI protocol state */
52575 uint8_t flags;
52576@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
52577
52578 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
52579 packet.hdr.len = sizeof(struct hvsi_query_response);
52580- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52581+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52582 packet.verb = VSV_SEND_VERSION_NUMBER;
52583 packet.u.version = HVSI_VERSION;
52584 packet.query_seqno = query_seqno+1;
52585@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
52586
52587 packet.hdr.type = VS_QUERY_PACKET_HEADER;
52588 packet.hdr.len = sizeof(struct hvsi_query);
52589- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52590+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52591 packet.verb = verb;
52592
52593 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
52594@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
52595 int wrote;
52596
52597 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
52598- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52599+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52600 packet.hdr.len = sizeof(struct hvsi_control);
52601 packet.verb = VSV_SET_MODEM_CTL;
52602 packet.mask = HVSI_TSDTR;
52603@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
52604 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
52605
52606 packet.hdr.type = VS_DATA_PACKET_HEADER;
52607- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52608+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52609 packet.hdr.len = count + sizeof(struct hvsi_header);
52610 memcpy(&packet.data, buf, count);
52611
52612@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
52613 struct hvsi_control packet __ALIGNED__;
52614
52615 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
52616- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
52617+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
52618 packet.hdr.len = 6;
52619 packet.verb = VSV_CLOSE_PROTOCOL;
52620
52621@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
52622
52623 tty_port_tty_set(&hp->port, tty);
52624 spin_lock_irqsave(&hp->lock, flags);
52625- hp->port.count++;
52626+ atomic_inc(&hp->port.count);
52627 atomic_set(&hp->seqno, 0);
52628 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
52629 spin_unlock_irqrestore(&hp->lock, flags);
52630@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
52631
52632 spin_lock_irqsave(&hp->lock, flags);
52633
52634- if (--hp->port.count == 0) {
52635+ if (atomic_dec_return(&hp->port.count) == 0) {
52636 tty_port_tty_set(&hp->port, NULL);
52637 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
52638
52639@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
52640
52641 spin_lock_irqsave(&hp->lock, flags);
52642 }
52643- } else if (hp->port.count < 0)
52644+ } else if (atomic_read(&hp->port.count) < 0)
52645 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
52646- hp - hvsi_ports, hp->port.count);
52647+ hp - hvsi_ports, atomic_read(&hp->port.count));
52648
52649 spin_unlock_irqrestore(&hp->lock, flags);
52650 }
52651@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
52652 tty_port_tty_set(&hp->port, NULL);
52653
52654 spin_lock_irqsave(&hp->lock, flags);
52655- hp->port.count = 0;
52656+ atomic_set(&hp->port.count, 0);
52657 hp->n_outbuf = 0;
52658 spin_unlock_irqrestore(&hp->lock, flags);
52659 }
52660diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
52661index 7ae6c29..05c6dba 100644
52662--- a/drivers/tty/hvc/hvsi_lib.c
52663+++ b/drivers/tty/hvc/hvsi_lib.c
52664@@ -8,7 +8,7 @@
52665
52666 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
52667 {
52668- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
52669+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
52670
52671 /* Assumes that always succeeds, works in practice */
52672 return pv->put_chars(pv->termno, (char *)packet, packet->len);
52673@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
52674
52675 /* Reset state */
52676 pv->established = 0;
52677- atomic_set(&pv->seqno, 0);
52678+ atomic_set_unchecked(&pv->seqno, 0);
52679
52680 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
52681
52682diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
52683index 345cebb..d5a1e9e 100644
52684--- a/drivers/tty/ipwireless/tty.c
52685+++ b/drivers/tty/ipwireless/tty.c
52686@@ -28,6 +28,7 @@
52687 #include <linux/tty_driver.h>
52688 #include <linux/tty_flip.h>
52689 #include <linux/uaccess.h>
52690+#include <asm/local.h>
52691
52692 #include "tty.h"
52693 #include "network.h"
52694@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
52695 return -ENODEV;
52696
52697 mutex_lock(&tty->ipw_tty_mutex);
52698- if (tty->port.count == 0)
52699+ if (atomic_read(&tty->port.count) == 0)
52700 tty->tx_bytes_queued = 0;
52701
52702- tty->port.count++;
52703+ atomic_inc(&tty->port.count);
52704
52705 tty->port.tty = linux_tty;
52706 linux_tty->driver_data = tty;
52707@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
52708
52709 static void do_ipw_close(struct ipw_tty *tty)
52710 {
52711- tty->port.count--;
52712-
52713- if (tty->port.count == 0) {
52714+ if (atomic_dec_return(&tty->port.count) == 0) {
52715 struct tty_struct *linux_tty = tty->port.tty;
52716
52717 if (linux_tty != NULL) {
52718@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
52719 return;
52720
52721 mutex_lock(&tty->ipw_tty_mutex);
52722- if (tty->port.count == 0) {
52723+ if (atomic_read(&tty->port.count) == 0) {
52724 mutex_unlock(&tty->ipw_tty_mutex);
52725 return;
52726 }
52727@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
52728
52729 mutex_lock(&tty->ipw_tty_mutex);
52730
52731- if (!tty->port.count) {
52732+ if (!atomic_read(&tty->port.count)) {
52733 mutex_unlock(&tty->ipw_tty_mutex);
52734 return;
52735 }
52736@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
52737 return -ENODEV;
52738
52739 mutex_lock(&tty->ipw_tty_mutex);
52740- if (!tty->port.count) {
52741+ if (!atomic_read(&tty->port.count)) {
52742 mutex_unlock(&tty->ipw_tty_mutex);
52743 return -EINVAL;
52744 }
52745@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
52746 if (!tty)
52747 return -ENODEV;
52748
52749- if (!tty->port.count)
52750+ if (!atomic_read(&tty->port.count))
52751 return -EINVAL;
52752
52753 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
52754@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
52755 if (!tty)
52756 return 0;
52757
52758- if (!tty->port.count)
52759+ if (!atomic_read(&tty->port.count))
52760 return 0;
52761
52762 return tty->tx_bytes_queued;
52763@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
52764 if (!tty)
52765 return -ENODEV;
52766
52767- if (!tty->port.count)
52768+ if (!atomic_read(&tty->port.count))
52769 return -EINVAL;
52770
52771 return get_control_lines(tty);
52772@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
52773 if (!tty)
52774 return -ENODEV;
52775
52776- if (!tty->port.count)
52777+ if (!atomic_read(&tty->port.count))
52778 return -EINVAL;
52779
52780 return set_control_lines(tty, set, clear);
52781@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
52782 if (!tty)
52783 return -ENODEV;
52784
52785- if (!tty->port.count)
52786+ if (!atomic_read(&tty->port.count))
52787 return -EINVAL;
52788
52789 /* FIXME: Exactly how is the tty object locked here .. */
52790@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
52791 * are gone */
52792 mutex_lock(&ttyj->ipw_tty_mutex);
52793 }
52794- while (ttyj->port.count)
52795+ while (atomic_read(&ttyj->port.count))
52796 do_ipw_close(ttyj);
52797 ipwireless_disassociate_network_ttys(network,
52798 ttyj->channel_idx);
52799diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
52800index 14c54e0..1efd4f2 100644
52801--- a/drivers/tty/moxa.c
52802+++ b/drivers/tty/moxa.c
52803@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
52804 }
52805
52806 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
52807- ch->port.count++;
52808+ atomic_inc(&ch->port.count);
52809 tty->driver_data = ch;
52810 tty_port_tty_set(&ch->port, tty);
52811 mutex_lock(&ch->port.mutex);
52812diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
52813index c434376..114ce13 100644
52814--- a/drivers/tty/n_gsm.c
52815+++ b/drivers/tty/n_gsm.c
52816@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
52817 spin_lock_init(&dlci->lock);
52818 mutex_init(&dlci->mutex);
52819 dlci->fifo = &dlci->_fifo;
52820- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
52821+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
52822 kfree(dlci);
52823 return NULL;
52824 }
52825@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
52826 struct gsm_dlci *dlci = tty->driver_data;
52827 struct tty_port *port = &dlci->port;
52828
52829- port->count++;
52830+ atomic_inc(&port->count);
52831 tty_port_tty_set(port, tty);
52832
52833 dlci->modem_rx = 0;
52834diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
52835index 2e900a9..576d216 100644
52836--- a/drivers/tty/n_tty.c
52837+++ b/drivers/tty/n_tty.c
52838@@ -115,7 +115,7 @@ struct n_tty_data {
52839 int minimum_to_wake;
52840
52841 /* consumer-published */
52842- size_t read_tail;
52843+ size_t read_tail __intentional_overflow(-1);
52844 size_t line_start;
52845
52846 /* protected by output lock */
52847@@ -2522,6 +2522,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
52848 {
52849 *ops = tty_ldisc_N_TTY;
52850 ops->owner = NULL;
52851- ops->refcount = ops->flags = 0;
52852+ atomic_set(&ops->refcount, 0);
52853+ ops->flags = 0;
52854 }
52855 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
52856diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
52857index 7c4447a..70fbc1e 100644
52858--- a/drivers/tty/pty.c
52859+++ b/drivers/tty/pty.c
52860@@ -830,8 +830,10 @@ static void __init unix98_pty_init(void)
52861 panic("Couldn't register Unix98 pts driver");
52862
52863 /* Now create the /dev/ptmx special device */
52864+ pax_open_kernel();
52865 tty_default_fops(&ptmx_fops);
52866- ptmx_fops.open = ptmx_open;
52867+ *(void **)&ptmx_fops.open = ptmx_open;
52868+ pax_close_kernel();
52869
52870 cdev_init(&ptmx_cdev, &ptmx_fops);
52871 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
52872diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
52873index 383c4c7..d408e21 100644
52874--- a/drivers/tty/rocket.c
52875+++ b/drivers/tty/rocket.c
52876@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
52877 tty->driver_data = info;
52878 tty_port_tty_set(port, tty);
52879
52880- if (port->count++ == 0) {
52881+ if (atomic_inc_return(&port->count) == 1) {
52882 atomic_inc(&rp_num_ports_open);
52883
52884 #ifdef ROCKET_DEBUG_OPEN
52885@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
52886 #endif
52887 }
52888 #ifdef ROCKET_DEBUG_OPEN
52889- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
52890+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
52891 #endif
52892
52893 /*
52894@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
52895 spin_unlock_irqrestore(&info->port.lock, flags);
52896 return;
52897 }
52898- if (info->port.count)
52899+ if (atomic_read(&info->port.count))
52900 atomic_dec(&rp_num_ports_open);
52901 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
52902 spin_unlock_irqrestore(&info->port.lock, flags);
52903diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
52904index aa28209..e08fb85 100644
52905--- a/drivers/tty/serial/ioc4_serial.c
52906+++ b/drivers/tty/serial/ioc4_serial.c
52907@@ -437,7 +437,7 @@ struct ioc4_soft {
52908 } is_intr_info[MAX_IOC4_INTR_ENTS];
52909
52910 /* Number of entries active in the above array */
52911- atomic_t is_num_intrs;
52912+ atomic_unchecked_t is_num_intrs;
52913 } is_intr_type[IOC4_NUM_INTR_TYPES];
52914
52915 /* is_ir_lock must be held while
52916@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
52917 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
52918 || (type == IOC4_OTHER_INTR_TYPE)));
52919
52920- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
52921+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
52922 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
52923
52924 /* Save off the lower level interrupt handler */
52925@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
52926
52927 soft = arg;
52928 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
52929- num_intrs = (int)atomic_read(
52930+ num_intrs = (int)atomic_read_unchecked(
52931 &soft->is_intr_type[intr_type].is_num_intrs);
52932
52933 this_mir = this_ir = pending_intrs(soft, intr_type);
52934diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
52935index 129dc5b..1da5bb8 100644
52936--- a/drivers/tty/serial/kgdb_nmi.c
52937+++ b/drivers/tty/serial/kgdb_nmi.c
52938@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
52939 * I/O utilities that messages sent to the console will automatically
52940 * be displayed on the dbg_io.
52941 */
52942- dbg_io_ops->is_console = true;
52943+ pax_open_kernel();
52944+ *(int *)&dbg_io_ops->is_console = true;
52945+ pax_close_kernel();
52946
52947 return 0;
52948 }
52949diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
52950index a260cde..6b2b5ce 100644
52951--- a/drivers/tty/serial/kgdboc.c
52952+++ b/drivers/tty/serial/kgdboc.c
52953@@ -24,8 +24,9 @@
52954 #define MAX_CONFIG_LEN 40
52955
52956 static struct kgdb_io kgdboc_io_ops;
52957+static struct kgdb_io kgdboc_io_ops_console;
52958
52959-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
52960+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
52961 static int configured = -1;
52962
52963 static char config[MAX_CONFIG_LEN];
52964@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
52965 kgdboc_unregister_kbd();
52966 if (configured == 1)
52967 kgdb_unregister_io_module(&kgdboc_io_ops);
52968+ else if (configured == 2)
52969+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
52970 }
52971
52972 static int configure_kgdboc(void)
52973@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
52974 int err;
52975 char *cptr = config;
52976 struct console *cons;
52977+ int is_console = 0;
52978
52979 err = kgdboc_option_setup(config);
52980 if (err || !strlen(config) || isspace(config[0]))
52981 goto noconfig;
52982
52983 err = -ENODEV;
52984- kgdboc_io_ops.is_console = 0;
52985 kgdb_tty_driver = NULL;
52986
52987 kgdboc_use_kms = 0;
52988@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
52989 int idx;
52990 if (cons->device && cons->device(cons, &idx) == p &&
52991 idx == tty_line) {
52992- kgdboc_io_ops.is_console = 1;
52993+ is_console = 1;
52994 break;
52995 }
52996 cons = cons->next;
52997@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
52998 kgdb_tty_line = tty_line;
52999
53000 do_register:
53001- err = kgdb_register_io_module(&kgdboc_io_ops);
53002+ if (is_console) {
53003+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
53004+ configured = 2;
53005+ } else {
53006+ err = kgdb_register_io_module(&kgdboc_io_ops);
53007+ configured = 1;
53008+ }
53009 if (err)
53010 goto noconfig;
53011
53012@@ -205,8 +214,6 @@ do_register:
53013 if (err)
53014 goto nmi_con_failed;
53015
53016- configured = 1;
53017-
53018 return 0;
53019
53020 nmi_con_failed:
53021@@ -223,7 +230,7 @@ noconfig:
53022 static int __init init_kgdboc(void)
53023 {
53024 /* Already configured? */
53025- if (configured == 1)
53026+ if (configured >= 1)
53027 return 0;
53028
53029 return configure_kgdboc();
53030@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
53031 if (config[len - 1] == '\n')
53032 config[len - 1] = '\0';
53033
53034- if (configured == 1)
53035+ if (configured >= 1)
53036 cleanup_kgdboc();
53037
53038 /* Go and configure with the new params. */
53039@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
53040 .post_exception = kgdboc_post_exp_handler,
53041 };
53042
53043+static struct kgdb_io kgdboc_io_ops_console = {
53044+ .name = "kgdboc",
53045+ .read_char = kgdboc_get_char,
53046+ .write_char = kgdboc_put_char,
53047+ .pre_exception = kgdboc_pre_exp_handler,
53048+ .post_exception = kgdboc_post_exp_handler,
53049+ .is_console = 1
53050+};
53051+
53052 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
53053 /* This is only available if kgdboc is a built in for early debugging */
53054 static int __init kgdboc_early_init(char *opt)
53055diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
53056index 4b6c783..9a19db3 100644
53057--- a/drivers/tty/serial/msm_serial.c
53058+++ b/drivers/tty/serial/msm_serial.c
53059@@ -1028,7 +1028,7 @@ static struct uart_driver msm_uart_driver = {
53060 .cons = MSM_CONSOLE,
53061 };
53062
53063-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
53064+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
53065
53066 static const struct of_device_id msm_uartdm_table[] = {
53067 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
53068@@ -1047,7 +1047,7 @@ static int msm_serial_probe(struct platform_device *pdev)
53069 int irq;
53070
53071 if (pdev->id == -1)
53072- pdev->id = atomic_inc_return(&msm_uart_next_id) - 1;
53073+ pdev->id = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
53074
53075 if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
53076 return -ENXIO;
53077diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
53078index c78f43a..22b1dab 100644
53079--- a/drivers/tty/serial/samsung.c
53080+++ b/drivers/tty/serial/samsung.c
53081@@ -478,11 +478,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
53082 }
53083 }
53084
53085+static int s3c64xx_serial_startup(struct uart_port *port);
53086 static int s3c24xx_serial_startup(struct uart_port *port)
53087 {
53088 struct s3c24xx_uart_port *ourport = to_ourport(port);
53089 int ret;
53090
53091+ /* Startup sequence is different for s3c64xx and higher SoC's */
53092+ if (s3c24xx_serial_has_interrupt_mask(port))
53093+ return s3c64xx_serial_startup(port);
53094+
53095 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
53096 port, (unsigned long long)port->mapbase, port->membase);
53097
53098@@ -1155,10 +1160,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
53099 /* setup info for port */
53100 port->dev = &platdev->dev;
53101
53102- /* Startup sequence is different for s3c64xx and higher SoC's */
53103- if (s3c24xx_serial_has_interrupt_mask(port))
53104- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
53105-
53106 port->uartclk = 1;
53107
53108 if (cfg->uart_flags & UPF_CONS_FLOW) {
53109diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
53110index eaeb9a0..2691250 100644
53111--- a/drivers/tty/serial/serial_core.c
53112+++ b/drivers/tty/serial/serial_core.c
53113@@ -1339,7 +1339,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
53114
53115 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
53116
53117- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
53118+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
53119 return;
53120
53121 /*
53122@@ -1466,7 +1466,7 @@ static void uart_hangup(struct tty_struct *tty)
53123 uart_flush_buffer(tty);
53124 uart_shutdown(tty, state);
53125 spin_lock_irqsave(&port->lock, flags);
53126- port->count = 0;
53127+ atomic_set(&port->count, 0);
53128 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
53129 spin_unlock_irqrestore(&port->lock, flags);
53130 tty_port_tty_set(port, NULL);
53131@@ -1564,7 +1564,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53132 goto end;
53133 }
53134
53135- port->count++;
53136+ atomic_inc(&port->count);
53137 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
53138 retval = -ENXIO;
53139 goto err_dec_count;
53140@@ -1596,7 +1596,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
53141 end:
53142 return retval;
53143 err_dec_count:
53144- port->count--;
53145+ atomic_inc(&port->count);
53146 mutex_unlock(&port->mutex);
53147 goto end;
53148 }
53149diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
53150index b799170..87dafd5 100644
53151--- a/drivers/tty/synclink.c
53152+++ b/drivers/tty/synclink.c
53153@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53154
53155 if (debug_level >= DEBUG_LEVEL_INFO)
53156 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
53157- __FILE__,__LINE__, info->device_name, info->port.count);
53158+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53159
53160 if (tty_port_close_start(&info->port, tty, filp) == 0)
53161 goto cleanup;
53162@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
53163 cleanup:
53164 if (debug_level >= DEBUG_LEVEL_INFO)
53165 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
53166- tty->driver->name, info->port.count);
53167+ tty->driver->name, atomic_read(&info->port.count));
53168
53169 } /* end of mgsl_close() */
53170
53171@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
53172
53173 mgsl_flush_buffer(tty);
53174 shutdown(info);
53175-
53176- info->port.count = 0;
53177+
53178+ atomic_set(&info->port.count, 0);
53179 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53180 info->port.tty = NULL;
53181
53182@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53183
53184 if (debug_level >= DEBUG_LEVEL_INFO)
53185 printk("%s(%d):block_til_ready before block on %s count=%d\n",
53186- __FILE__,__LINE__, tty->driver->name, port->count );
53187+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53188
53189 spin_lock_irqsave(&info->irq_spinlock, flags);
53190- port->count--;
53191+ atomic_dec(&port->count);
53192 spin_unlock_irqrestore(&info->irq_spinlock, flags);
53193 port->blocked_open++;
53194
53195@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53196
53197 if (debug_level >= DEBUG_LEVEL_INFO)
53198 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
53199- __FILE__,__LINE__, tty->driver->name, port->count );
53200+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53201
53202 tty_unlock(tty);
53203 schedule();
53204@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
53205
53206 /* FIXME: Racy on hangup during close wait */
53207 if (!tty_hung_up_p(filp))
53208- port->count++;
53209+ atomic_inc(&port->count);
53210 port->blocked_open--;
53211
53212 if (debug_level >= DEBUG_LEVEL_INFO)
53213 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
53214- __FILE__,__LINE__, tty->driver->name, port->count );
53215+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53216
53217 if (!retval)
53218 port->flags |= ASYNC_NORMAL_ACTIVE;
53219@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53220
53221 if (debug_level >= DEBUG_LEVEL_INFO)
53222 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
53223- __FILE__,__LINE__,tty->driver->name, info->port.count);
53224+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53225
53226 /* If port is closing, signal caller to try again */
53227 if (info->port.flags & ASYNC_CLOSING){
53228@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
53229 spin_unlock_irqrestore(&info->netlock, flags);
53230 goto cleanup;
53231 }
53232- info->port.count++;
53233+ atomic_inc(&info->port.count);
53234 spin_unlock_irqrestore(&info->netlock, flags);
53235
53236- if (info->port.count == 1) {
53237+ if (atomic_read(&info->port.count) == 1) {
53238 /* 1st open on this device, init hardware */
53239 retval = startup(info);
53240 if (retval < 0)
53241@@ -3442,8 +3442,8 @@ cleanup:
53242 if (retval) {
53243 if (tty->count == 1)
53244 info->port.tty = NULL; /* tty layer will release tty struct */
53245- if(info->port.count)
53246- info->port.count--;
53247+ if (atomic_read(&info->port.count))
53248+ atomic_dec(&info->port.count);
53249 }
53250
53251 return retval;
53252@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53253 unsigned short new_crctype;
53254
53255 /* return error if TTY interface open */
53256- if (info->port.count)
53257+ if (atomic_read(&info->port.count))
53258 return -EBUSY;
53259
53260 switch (encoding)
53261@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
53262
53263 /* arbitrate between network and tty opens */
53264 spin_lock_irqsave(&info->netlock, flags);
53265- if (info->port.count != 0 || info->netcount != 0) {
53266+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53267 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53268 spin_unlock_irqrestore(&info->netlock, flags);
53269 return -EBUSY;
53270@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53271 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53272
53273 /* return error if TTY interface open */
53274- if (info->port.count)
53275+ if (atomic_read(&info->port.count))
53276 return -EBUSY;
53277
53278 if (cmd != SIOCWANDEV)
53279diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
53280index 0e8c39b..e0cb171 100644
53281--- a/drivers/tty/synclink_gt.c
53282+++ b/drivers/tty/synclink_gt.c
53283@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53284 tty->driver_data = info;
53285 info->port.tty = tty;
53286
53287- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
53288+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
53289
53290 /* If port is closing, signal caller to try again */
53291 if (info->port.flags & ASYNC_CLOSING){
53292@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53293 mutex_unlock(&info->port.mutex);
53294 goto cleanup;
53295 }
53296- info->port.count++;
53297+ atomic_inc(&info->port.count);
53298 spin_unlock_irqrestore(&info->netlock, flags);
53299
53300- if (info->port.count == 1) {
53301+ if (atomic_read(&info->port.count) == 1) {
53302 /* 1st open on this device, init hardware */
53303 retval = startup(info);
53304 if (retval < 0) {
53305@@ -715,8 +715,8 @@ cleanup:
53306 if (retval) {
53307 if (tty->count == 1)
53308 info->port.tty = NULL; /* tty layer will release tty struct */
53309- if(info->port.count)
53310- info->port.count--;
53311+ if(atomic_read(&info->port.count))
53312+ atomic_dec(&info->port.count);
53313 }
53314
53315 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
53316@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53317
53318 if (sanity_check(info, tty->name, "close"))
53319 return;
53320- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
53321+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
53322
53323 if (tty_port_close_start(&info->port, tty, filp) == 0)
53324 goto cleanup;
53325@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53326 tty_port_close_end(&info->port, tty);
53327 info->port.tty = NULL;
53328 cleanup:
53329- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
53330+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
53331 }
53332
53333 static void hangup(struct tty_struct *tty)
53334@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
53335 shutdown(info);
53336
53337 spin_lock_irqsave(&info->port.lock, flags);
53338- info->port.count = 0;
53339+ atomic_set(&info->port.count, 0);
53340 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53341 info->port.tty = NULL;
53342 spin_unlock_irqrestore(&info->port.lock, flags);
53343@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53344 unsigned short new_crctype;
53345
53346 /* return error if TTY interface open */
53347- if (info->port.count)
53348+ if (atomic_read(&info->port.count))
53349 return -EBUSY;
53350
53351 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
53352@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
53353
53354 /* arbitrate between network and tty opens */
53355 spin_lock_irqsave(&info->netlock, flags);
53356- if (info->port.count != 0 || info->netcount != 0) {
53357+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53358 DBGINFO(("%s hdlc_open busy\n", dev->name));
53359 spin_unlock_irqrestore(&info->netlock, flags);
53360 return -EBUSY;
53361@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53362 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
53363
53364 /* return error if TTY interface open */
53365- if (info->port.count)
53366+ if (atomic_read(&info->port.count))
53367 return -EBUSY;
53368
53369 if (cmd != SIOCWANDEV)
53370@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
53371 if (port == NULL)
53372 continue;
53373 spin_lock(&port->lock);
53374- if ((port->port.count || port->netcount) &&
53375+ if ((atomic_read(&port->port.count) || port->netcount) &&
53376 port->pending_bh && !port->bh_running &&
53377 !port->bh_requested) {
53378 DBGISR(("%s bh queued\n", port->device_name));
53379@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53380 add_wait_queue(&port->open_wait, &wait);
53381
53382 spin_lock_irqsave(&info->lock, flags);
53383- port->count--;
53384+ atomic_dec(&port->count);
53385 spin_unlock_irqrestore(&info->lock, flags);
53386 port->blocked_open++;
53387
53388@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53389 remove_wait_queue(&port->open_wait, &wait);
53390
53391 if (!tty_hung_up_p(filp))
53392- port->count++;
53393+ atomic_inc(&port->count);
53394 port->blocked_open--;
53395
53396 if (!retval)
53397diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
53398index c3f9091..abe4601 100644
53399--- a/drivers/tty/synclinkmp.c
53400+++ b/drivers/tty/synclinkmp.c
53401@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
53402
53403 if (debug_level >= DEBUG_LEVEL_INFO)
53404 printk("%s(%d):%s open(), old ref count = %d\n",
53405- __FILE__,__LINE__,tty->driver->name, info->port.count);
53406+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
53407
53408 /* If port is closing, signal caller to try again */
53409 if (info->port.flags & ASYNC_CLOSING){
53410@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
53411 spin_unlock_irqrestore(&info->netlock, flags);
53412 goto cleanup;
53413 }
53414- info->port.count++;
53415+ atomic_inc(&info->port.count);
53416 spin_unlock_irqrestore(&info->netlock, flags);
53417
53418- if (info->port.count == 1) {
53419+ if (atomic_read(&info->port.count) == 1) {
53420 /* 1st open on this device, init hardware */
53421 retval = startup(info);
53422 if (retval < 0)
53423@@ -796,8 +796,8 @@ cleanup:
53424 if (retval) {
53425 if (tty->count == 1)
53426 info->port.tty = NULL; /* tty layer will release tty struct */
53427- if(info->port.count)
53428- info->port.count--;
53429+ if(atomic_read(&info->port.count))
53430+ atomic_dec(&info->port.count);
53431 }
53432
53433 return retval;
53434@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53435
53436 if (debug_level >= DEBUG_LEVEL_INFO)
53437 printk("%s(%d):%s close() entry, count=%d\n",
53438- __FILE__,__LINE__, info->device_name, info->port.count);
53439+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
53440
53441 if (tty_port_close_start(&info->port, tty, filp) == 0)
53442 goto cleanup;
53443@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
53444 cleanup:
53445 if (debug_level >= DEBUG_LEVEL_INFO)
53446 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
53447- tty->driver->name, info->port.count);
53448+ tty->driver->name, atomic_read(&info->port.count));
53449 }
53450
53451 /* Called by tty_hangup() when a hangup is signaled.
53452@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
53453 shutdown(info);
53454
53455 spin_lock_irqsave(&info->port.lock, flags);
53456- info->port.count = 0;
53457+ atomic_set(&info->port.count, 0);
53458 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
53459 info->port.tty = NULL;
53460 spin_unlock_irqrestore(&info->port.lock, flags);
53461@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
53462 unsigned short new_crctype;
53463
53464 /* return error if TTY interface open */
53465- if (info->port.count)
53466+ if (atomic_read(&info->port.count))
53467 return -EBUSY;
53468
53469 switch (encoding)
53470@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
53471
53472 /* arbitrate between network and tty opens */
53473 spin_lock_irqsave(&info->netlock, flags);
53474- if (info->port.count != 0 || info->netcount != 0) {
53475+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
53476 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
53477 spin_unlock_irqrestore(&info->netlock, flags);
53478 return -EBUSY;
53479@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
53480 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
53481
53482 /* return error if TTY interface open */
53483- if (info->port.count)
53484+ if (atomic_read(&info->port.count))
53485 return -EBUSY;
53486
53487 if (cmd != SIOCWANDEV)
53488@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
53489 * do not request bottom half processing if the
53490 * device is not open in a normal mode.
53491 */
53492- if ( port && (port->port.count || port->netcount) &&
53493+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
53494 port->pending_bh && !port->bh_running &&
53495 !port->bh_requested ) {
53496 if ( debug_level >= DEBUG_LEVEL_ISR )
53497@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53498
53499 if (debug_level >= DEBUG_LEVEL_INFO)
53500 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
53501- __FILE__,__LINE__, tty->driver->name, port->count );
53502+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53503
53504 spin_lock_irqsave(&info->lock, flags);
53505- port->count--;
53506+ atomic_dec(&port->count);
53507 spin_unlock_irqrestore(&info->lock, flags);
53508 port->blocked_open++;
53509
53510@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53511
53512 if (debug_level >= DEBUG_LEVEL_INFO)
53513 printk("%s(%d):%s block_til_ready() count=%d\n",
53514- __FILE__,__LINE__, tty->driver->name, port->count );
53515+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53516
53517 tty_unlock(tty);
53518 schedule();
53519@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
53520 set_current_state(TASK_RUNNING);
53521 remove_wait_queue(&port->open_wait, &wait);
53522 if (!tty_hung_up_p(filp))
53523- port->count++;
53524+ atomic_inc(&port->count);
53525 port->blocked_open--;
53526
53527 if (debug_level >= DEBUG_LEVEL_INFO)
53528 printk("%s(%d):%s block_til_ready() after, count=%d\n",
53529- __FILE__,__LINE__, tty->driver->name, port->count );
53530+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
53531
53532 if (!retval)
53533 port->flags |= ASYNC_NORMAL_ACTIVE;
53534diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
53535index 42bad18..447d7a2 100644
53536--- a/drivers/tty/sysrq.c
53537+++ b/drivers/tty/sysrq.c
53538@@ -1084,7 +1084,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
53539 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
53540 size_t count, loff_t *ppos)
53541 {
53542- if (count) {
53543+ if (count && capable(CAP_SYS_ADMIN)) {
53544 char c;
53545
53546 if (get_user(c, buf))
53547diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
53548index 0508a1d..b610592 100644
53549--- a/drivers/tty/tty_io.c
53550+++ b/drivers/tty/tty_io.c
53551@@ -3498,7 +3498,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
53552
53553 void tty_default_fops(struct file_operations *fops)
53554 {
53555- *fops = tty_fops;
53556+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
53557 }
53558
53559 /*
53560diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
53561index 2d822aa..a566234 100644
53562--- a/drivers/tty/tty_ldisc.c
53563+++ b/drivers/tty/tty_ldisc.c
53564@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
53565 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53566 tty_ldiscs[disc] = new_ldisc;
53567 new_ldisc->num = disc;
53568- new_ldisc->refcount = 0;
53569+ atomic_set(&new_ldisc->refcount, 0);
53570 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
53571
53572 return ret;
53573@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
53574 return -EINVAL;
53575
53576 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53577- if (tty_ldiscs[disc]->refcount)
53578+ if (atomic_read(&tty_ldiscs[disc]->refcount))
53579 ret = -EBUSY;
53580 else
53581 tty_ldiscs[disc] = NULL;
53582@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
53583 if (ldops) {
53584 ret = ERR_PTR(-EAGAIN);
53585 if (try_module_get(ldops->owner)) {
53586- ldops->refcount++;
53587+ atomic_inc(&ldops->refcount);
53588 ret = ldops;
53589 }
53590 }
53591@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
53592 unsigned long flags;
53593
53594 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
53595- ldops->refcount--;
53596+ atomic_dec(&ldops->refcount);
53597 module_put(ldops->owner);
53598 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
53599 }
53600diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
53601index 1b93357..ea9f82c 100644
53602--- a/drivers/tty/tty_port.c
53603+++ b/drivers/tty/tty_port.c
53604@@ -237,7 +237,7 @@ void tty_port_hangup(struct tty_port *port)
53605 unsigned long flags;
53606
53607 spin_lock_irqsave(&port->lock, flags);
53608- port->count = 0;
53609+ atomic_set(&port->count, 0);
53610 port->flags &= ~ASYNC_NORMAL_ACTIVE;
53611 tty = port->tty;
53612 if (tty)
53613@@ -399,7 +399,7 @@ int tty_port_block_til_ready(struct tty_port *port,
53614
53615 /* The port lock protects the port counts */
53616 spin_lock_irqsave(&port->lock, flags);
53617- port->count--;
53618+ atomic_dec(&port->count);
53619 port->blocked_open++;
53620 spin_unlock_irqrestore(&port->lock, flags);
53621
53622@@ -441,7 +441,7 @@ int tty_port_block_til_ready(struct tty_port *port,
53623 we must not mess that up further */
53624 spin_lock_irqsave(&port->lock, flags);
53625 if (!tty_hung_up_p(filp))
53626- port->count++;
53627+ atomic_inc(&port->count);
53628 port->blocked_open--;
53629 if (retval == 0)
53630 port->flags |= ASYNC_NORMAL_ACTIVE;
53631@@ -479,19 +479,19 @@ int tty_port_close_start(struct tty_port *port,
53632 return 0;
53633 }
53634
53635- if (tty->count == 1 && port->count != 1) {
53636+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
53637 printk(KERN_WARNING
53638 "tty_port_close_start: tty->count = 1 port count = %d.\n",
53639- port->count);
53640- port->count = 1;
53641+ atomic_read(&port->count));
53642+ atomic_set(&port->count, 1);
53643 }
53644- if (--port->count < 0) {
53645+ if (atomic_dec_return(&port->count) < 0) {
53646 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
53647- port->count);
53648- port->count = 0;
53649+ atomic_read(&port->count));
53650+ atomic_set(&port->count, 0);
53651 }
53652
53653- if (port->count) {
53654+ if (atomic_read(&port->count)) {
53655 spin_unlock_irqrestore(&port->lock, flags);
53656 return 0;
53657 }
53658@@ -592,7 +592,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
53659 struct file *filp)
53660 {
53661 spin_lock_irq(&port->lock);
53662- ++port->count;
53663+ atomic_inc(&port->count);
53664 spin_unlock_irq(&port->lock);
53665 tty_port_tty_set(port, tty);
53666
53667diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
53668index c039cfe..0b463b0 100644
53669--- a/drivers/tty/vt/keyboard.c
53670+++ b/drivers/tty/vt/keyboard.c
53671@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
53672 kbd->kbdmode == VC_OFF) &&
53673 value != KVAL(K_SAK))
53674 return; /* SAK is allowed even in raw mode */
53675+
53676+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
53677+ {
53678+ void *func = fn_handler[value];
53679+ if (func == fn_show_state || func == fn_show_ptregs ||
53680+ func == fn_show_mem)
53681+ return;
53682+ }
53683+#endif
53684+
53685 fn_handler[value](vc);
53686 }
53687
53688@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
53689 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
53690 return -EFAULT;
53691
53692- if (!capable(CAP_SYS_TTY_CONFIG))
53693- perm = 0;
53694-
53695 switch (cmd) {
53696 case KDGKBENT:
53697 /* Ensure another thread doesn't free it under us */
53698@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
53699 spin_unlock_irqrestore(&kbd_event_lock, flags);
53700 return put_user(val, &user_kbe->kb_value);
53701 case KDSKBENT:
53702+ if (!capable(CAP_SYS_TTY_CONFIG))
53703+ perm = 0;
53704+
53705 if (!perm)
53706 return -EPERM;
53707 if (!i && v == K_NOSUCHMAP) {
53708@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
53709 int i, j, k;
53710 int ret;
53711
53712- if (!capable(CAP_SYS_TTY_CONFIG))
53713- perm = 0;
53714-
53715 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
53716 if (!kbs) {
53717 ret = -ENOMEM;
53718@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
53719 kfree(kbs);
53720 return ((p && *p) ? -EOVERFLOW : 0);
53721 case KDSKBSENT:
53722+ if (!capable(CAP_SYS_TTY_CONFIG))
53723+ perm = 0;
53724+
53725 if (!perm) {
53726 ret = -EPERM;
53727 goto reterr;
53728diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
53729index 60fa627..7214965 100644
53730--- a/drivers/uio/uio.c
53731+++ b/drivers/uio/uio.c
53732@@ -25,6 +25,7 @@
53733 #include <linux/kobject.h>
53734 #include <linux/cdev.h>
53735 #include <linux/uio_driver.h>
53736+#include <asm/local.h>
53737
53738 #define UIO_MAX_DEVICES (1U << MINORBITS)
53739
53740@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
53741 struct device_attribute *attr, char *buf)
53742 {
53743 struct uio_device *idev = dev_get_drvdata(dev);
53744- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
53745+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
53746 }
53747 static DEVICE_ATTR_RO(event);
53748
53749@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
53750 {
53751 struct uio_device *idev = info->uio_dev;
53752
53753- atomic_inc(&idev->event);
53754+ atomic_inc_unchecked(&idev->event);
53755 wake_up_interruptible(&idev->wait);
53756 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
53757 }
53758@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
53759 }
53760
53761 listener->dev = idev;
53762- listener->event_count = atomic_read(&idev->event);
53763+ listener->event_count = atomic_read_unchecked(&idev->event);
53764 filep->private_data = listener;
53765
53766 if (idev->info->open) {
53767@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
53768 return -EIO;
53769
53770 poll_wait(filep, &idev->wait, wait);
53771- if (listener->event_count != atomic_read(&idev->event))
53772+ if (listener->event_count != atomic_read_unchecked(&idev->event))
53773 return POLLIN | POLLRDNORM;
53774 return 0;
53775 }
53776@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
53777 do {
53778 set_current_state(TASK_INTERRUPTIBLE);
53779
53780- event_count = atomic_read(&idev->event);
53781+ event_count = atomic_read_unchecked(&idev->event);
53782 if (event_count != listener->event_count) {
53783 if (copy_to_user(buf, &event_count, count))
53784 retval = -EFAULT;
53785@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
53786 static int uio_find_mem_index(struct vm_area_struct *vma)
53787 {
53788 struct uio_device *idev = vma->vm_private_data;
53789+ unsigned long size;
53790
53791 if (vma->vm_pgoff < MAX_UIO_MAPS) {
53792- if (idev->info->mem[vma->vm_pgoff].size == 0)
53793+ size = idev->info->mem[vma->vm_pgoff].size;
53794+ if (size == 0)
53795+ return -1;
53796+ if (vma->vm_end - vma->vm_start > size)
53797 return -1;
53798 return (int)vma->vm_pgoff;
53799 }
53800@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
53801 idev->owner = owner;
53802 idev->info = info;
53803 init_waitqueue_head(&idev->wait);
53804- atomic_set(&idev->event, 0);
53805+ atomic_set_unchecked(&idev->event, 0);
53806
53807 ret = uio_get_minor(idev);
53808 if (ret)
53809diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
53810index 813d4d3..a71934f 100644
53811--- a/drivers/usb/atm/cxacru.c
53812+++ b/drivers/usb/atm/cxacru.c
53813@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
53814 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
53815 if (ret < 2)
53816 return -EINVAL;
53817- if (index < 0 || index > 0x7f)
53818+ if (index > 0x7f)
53819 return -EINVAL;
53820 pos += tmp;
53821
53822diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
53823index dada014..1d0d517 100644
53824--- a/drivers/usb/atm/usbatm.c
53825+++ b/drivers/usb/atm/usbatm.c
53826@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53827 if (printk_ratelimit())
53828 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
53829 __func__, vpi, vci);
53830- atomic_inc(&vcc->stats->rx_err);
53831+ atomic_inc_unchecked(&vcc->stats->rx_err);
53832 return;
53833 }
53834
53835@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53836 if (length > ATM_MAX_AAL5_PDU) {
53837 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
53838 __func__, length, vcc);
53839- atomic_inc(&vcc->stats->rx_err);
53840+ atomic_inc_unchecked(&vcc->stats->rx_err);
53841 goto out;
53842 }
53843
53844@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53845 if (sarb->len < pdu_length) {
53846 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
53847 __func__, pdu_length, sarb->len, vcc);
53848- atomic_inc(&vcc->stats->rx_err);
53849+ atomic_inc_unchecked(&vcc->stats->rx_err);
53850 goto out;
53851 }
53852
53853 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
53854 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
53855 __func__, vcc);
53856- atomic_inc(&vcc->stats->rx_err);
53857+ atomic_inc_unchecked(&vcc->stats->rx_err);
53858 goto out;
53859 }
53860
53861@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53862 if (printk_ratelimit())
53863 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
53864 __func__, length);
53865- atomic_inc(&vcc->stats->rx_drop);
53866+ atomic_inc_unchecked(&vcc->stats->rx_drop);
53867 goto out;
53868 }
53869
53870@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
53871
53872 vcc->push(vcc, skb);
53873
53874- atomic_inc(&vcc->stats->rx);
53875+ atomic_inc_unchecked(&vcc->stats->rx);
53876 out:
53877 skb_trim(sarb, 0);
53878 }
53879@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
53880 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
53881
53882 usbatm_pop(vcc, skb);
53883- atomic_inc(&vcc->stats->tx);
53884+ atomic_inc_unchecked(&vcc->stats->tx);
53885
53886 skb = skb_dequeue(&instance->sndqueue);
53887 }
53888@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
53889 if (!left--)
53890 return sprintf(page,
53891 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
53892- atomic_read(&atm_dev->stats.aal5.tx),
53893- atomic_read(&atm_dev->stats.aal5.tx_err),
53894- atomic_read(&atm_dev->stats.aal5.rx),
53895- atomic_read(&atm_dev->stats.aal5.rx_err),
53896- atomic_read(&atm_dev->stats.aal5.rx_drop));
53897+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
53898+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
53899+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
53900+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
53901+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
53902
53903 if (!left--) {
53904 if (instance->disconnected)
53905diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
53906index 2a3bbdf..91d72cf 100644
53907--- a/drivers/usb/core/devices.c
53908+++ b/drivers/usb/core/devices.c
53909@@ -126,7 +126,7 @@ static const char format_endpt[] =
53910 * time it gets called.
53911 */
53912 static struct device_connect_event {
53913- atomic_t count;
53914+ atomic_unchecked_t count;
53915 wait_queue_head_t wait;
53916 } device_event = {
53917 .count = ATOMIC_INIT(1),
53918@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
53919
53920 void usbfs_conn_disc_event(void)
53921 {
53922- atomic_add(2, &device_event.count);
53923+ atomic_add_unchecked(2, &device_event.count);
53924 wake_up(&device_event.wait);
53925 }
53926
53927@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
53928
53929 poll_wait(file, &device_event.wait, wait);
53930
53931- event_count = atomic_read(&device_event.count);
53932+ event_count = atomic_read_unchecked(&device_event.count);
53933 if (file->f_version != event_count) {
53934 file->f_version = event_count;
53935 return POLLIN | POLLRDNORM;
53936diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
53937index 0b59731..46ee7d1 100644
53938--- a/drivers/usb/core/devio.c
53939+++ b/drivers/usb/core/devio.c
53940@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
53941 struct usb_dev_state *ps = file->private_data;
53942 struct usb_device *dev = ps->dev;
53943 ssize_t ret = 0;
53944- unsigned len;
53945+ size_t len;
53946 loff_t pos;
53947 int i;
53948
53949@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
53950 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
53951 struct usb_config_descriptor *config =
53952 (struct usb_config_descriptor *)dev->rawdescriptors[i];
53953- unsigned int length = le16_to_cpu(config->wTotalLength);
53954+ size_t length = le16_to_cpu(config->wTotalLength);
53955
53956 if (*ppos < pos + length) {
53957
53958 /* The descriptor may claim to be longer than it
53959 * really is. Here is the actual allocated length. */
53960- unsigned alloclen =
53961+ size_t alloclen =
53962 le16_to_cpu(dev->config[i].desc.wTotalLength);
53963
53964- len = length - (*ppos - pos);
53965+ len = length + pos - *ppos;
53966 if (len > nbytes)
53967 len = nbytes;
53968
53969 /* Simply don't write (skip over) unallocated parts */
53970 if (alloclen > (*ppos - pos)) {
53971- alloclen -= (*ppos - pos);
53972+ alloclen = alloclen + pos - *ppos;
53973 if (copy_to_user(buf,
53974 dev->rawdescriptors[i] + (*ppos - pos),
53975 min(len, alloclen))) {
53976diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
53977index a6efb41..6f72549b 100644
53978--- a/drivers/usb/core/hcd.c
53979+++ b/drivers/usb/core/hcd.c
53980@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
53981 */
53982 usb_get_urb(urb);
53983 atomic_inc(&urb->use_count);
53984- atomic_inc(&urb->dev->urbnum);
53985+ atomic_inc_unchecked(&urb->dev->urbnum);
53986 usbmon_urb_submit(&hcd->self, urb);
53987
53988 /* NOTE requirements on root-hub callers (usbfs and the hub
53989@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
53990 urb->hcpriv = NULL;
53991 INIT_LIST_HEAD(&urb->urb_list);
53992 atomic_dec(&urb->use_count);
53993- atomic_dec(&urb->dev->urbnum);
53994+ atomic_dec_unchecked(&urb->dev->urbnum);
53995 if (atomic_read(&urb->reject))
53996 wake_up(&usb_kill_urb_queue);
53997 usb_put_urb(urb);
53998diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
53999index b649fef..c7107a0 100644
54000--- a/drivers/usb/core/hub.c
54001+++ b/drivers/usb/core/hub.c
54002@@ -26,6 +26,7 @@
54003 #include <linux/mutex.h>
54004 #include <linux/random.h>
54005 #include <linux/pm_qos.h>
54006+#include <linux/grsecurity.h>
54007
54008 #include <asm/uaccess.h>
54009 #include <asm/byteorder.h>
54010@@ -4666,6 +4667,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
54011 goto done;
54012 return;
54013 }
54014+
54015+ if (gr_handle_new_usb())
54016+ goto done;
54017+
54018 if (hub_is_superspeed(hub->hdev))
54019 unit_load = 150;
54020 else
54021diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
54022index f7b7713..23d07ec 100644
54023--- a/drivers/usb/core/message.c
54024+++ b/drivers/usb/core/message.c
54025@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
54026 * Return: If successful, the number of bytes transferred. Otherwise, a negative
54027 * error number.
54028 */
54029-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54030+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54031 __u8 requesttype, __u16 value, __u16 index, void *data,
54032 __u16 size, int timeout)
54033 {
54034@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
54035 * If successful, 0. Otherwise a negative error number. The number of actual
54036 * bytes transferred will be stored in the @actual_length parameter.
54037 */
54038-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54039+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54040 void *data, int len, int *actual_length, int timeout)
54041 {
54042 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
54043@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
54044 * bytes transferred will be stored in the @actual_length parameter.
54045 *
54046 */
54047-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54048+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54049 void *data, int len, int *actual_length, int timeout)
54050 {
54051 struct urb *urb;
54052diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
54053index 1236c60..d47a51c 100644
54054--- a/drivers/usb/core/sysfs.c
54055+++ b/drivers/usb/core/sysfs.c
54056@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
54057 struct usb_device *udev;
54058
54059 udev = to_usb_device(dev);
54060- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
54061+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
54062 }
54063 static DEVICE_ATTR_RO(urbnum);
54064
54065diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
54066index 2dd2362..1135437 100644
54067--- a/drivers/usb/core/usb.c
54068+++ b/drivers/usb/core/usb.c
54069@@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
54070 set_dev_node(&dev->dev, dev_to_node(bus->controller));
54071 dev->state = USB_STATE_ATTACHED;
54072 dev->lpm_disable_count = 1;
54073- atomic_set(&dev->urbnum, 0);
54074+ atomic_set_unchecked(&dev->urbnum, 0);
54075
54076 INIT_LIST_HEAD(&dev->ep0.urb_list);
54077 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
54078diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
54079index 8cfc319..4868255 100644
54080--- a/drivers/usb/early/ehci-dbgp.c
54081+++ b/drivers/usb/early/ehci-dbgp.c
54082@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
54083
54084 #ifdef CONFIG_KGDB
54085 static struct kgdb_io kgdbdbgp_io_ops;
54086-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
54087+static struct kgdb_io kgdbdbgp_io_ops_console;
54088+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
54089 #else
54090 #define dbgp_kgdb_mode (0)
54091 #endif
54092@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
54093 .write_char = kgdbdbgp_write_char,
54094 };
54095
54096+static struct kgdb_io kgdbdbgp_io_ops_console = {
54097+ .name = "kgdbdbgp",
54098+ .read_char = kgdbdbgp_read_char,
54099+ .write_char = kgdbdbgp_write_char,
54100+ .is_console = 1
54101+};
54102+
54103 static int kgdbdbgp_wait_time;
54104
54105 static int __init kgdbdbgp_parse_config(char *str)
54106@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
54107 ptr++;
54108 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
54109 }
54110- kgdb_register_io_module(&kgdbdbgp_io_ops);
54111- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
54112+ if (early_dbgp_console.index != -1)
54113+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
54114+ else
54115+ kgdb_register_io_module(&kgdbdbgp_io_ops);
54116
54117 return 0;
54118 }
54119diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
54120index f7b2032..fbb340c 100644
54121--- a/drivers/usb/gadget/function/f_uac1.c
54122+++ b/drivers/usb/gadget/function/f_uac1.c
54123@@ -14,6 +14,7 @@
54124 #include <linux/module.h>
54125 #include <linux/device.h>
54126 #include <linux/atomic.h>
54127+#include <linux/module.h>
54128
54129 #include "u_uac1.h"
54130
54131diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
54132index 491082a..dfd7d17 100644
54133--- a/drivers/usb/gadget/function/u_serial.c
54134+++ b/drivers/usb/gadget/function/u_serial.c
54135@@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54136 spin_lock_irq(&port->port_lock);
54137
54138 /* already open? Great. */
54139- if (port->port.count) {
54140+ if (atomic_read(&port->port.count)) {
54141 status = 0;
54142- port->port.count++;
54143+ atomic_inc(&port->port.count);
54144
54145 /* currently opening/closing? wait ... */
54146 } else if (port->openclose) {
54147@@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
54148 tty->driver_data = port;
54149 port->port.tty = tty;
54150
54151- port->port.count = 1;
54152+ atomic_set(&port->port.count, 1);
54153 port->openclose = false;
54154
54155 /* if connected, start the I/O stream */
54156@@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54157
54158 spin_lock_irq(&port->port_lock);
54159
54160- if (port->port.count != 1) {
54161- if (port->port.count == 0)
54162+ if (atomic_read(&port->port.count) != 1) {
54163+ if (atomic_read(&port->port.count) == 0)
54164 WARN_ON(1);
54165 else
54166- --port->port.count;
54167+ atomic_dec(&port->port.count);
54168 goto exit;
54169 }
54170
54171@@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
54172 * and sleep if necessary
54173 */
54174 port->openclose = true;
54175- port->port.count = 0;
54176+ atomic_set(&port->port.count, 0);
54177
54178 gser = port->port_usb;
54179 if (gser && gser->disconnect)
54180@@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
54181 int cond;
54182
54183 spin_lock_irq(&port->port_lock);
54184- cond = (port->port.count == 0) && !port->openclose;
54185+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
54186 spin_unlock_irq(&port->port_lock);
54187 return cond;
54188 }
54189@@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
54190 /* if it's already open, start I/O ... and notify the serial
54191 * protocol about open/close status (connect/disconnect).
54192 */
54193- if (port->port.count) {
54194+ if (atomic_read(&port->port.count)) {
54195 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
54196 gs_start_io(port);
54197 if (gser->connect)
54198@@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
54199
54200 port->port_usb = NULL;
54201 gser->ioport = NULL;
54202- if (port->port.count > 0 || port->openclose) {
54203+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
54204 wake_up_interruptible(&port->drain_wait);
54205 if (port->port.tty)
54206 tty_hangup(port->port.tty);
54207@@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
54208
54209 /* finally, free any unused/unusable I/O buffers */
54210 spin_lock_irqsave(&port->port_lock, flags);
54211- if (port->port.count == 0 && !port->openclose)
54212+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
54213 gs_buf_free(&port->port_write_buf);
54214 gs_free_requests(gser->out, &port->read_pool, NULL);
54215 gs_free_requests(gser->out, &port->read_queue, NULL);
54216diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
54217index a44a07f..ecea924 100644
54218--- a/drivers/usb/gadget/function/u_uac1.c
54219+++ b/drivers/usb/gadget/function/u_uac1.c
54220@@ -17,6 +17,7 @@
54221 #include <linux/ctype.h>
54222 #include <linux/random.h>
54223 #include <linux/syscalls.h>
54224+#include <linux/module.h>
54225
54226 #include "u_uac1.h"
54227
54228diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
54229index 5728829..fefc6bf 100644
54230--- a/drivers/usb/host/ehci-hub.c
54231+++ b/drivers/usb/host/ehci-hub.c
54232@@ -771,7 +771,7 @@ static struct urb *request_single_step_set_feature_urb(
54233 urb->transfer_flags = URB_DIR_IN;
54234 usb_get_urb(urb);
54235 atomic_inc(&urb->use_count);
54236- atomic_inc(&urb->dev->urbnum);
54237+ atomic_inc_unchecked(&urb->dev->urbnum);
54238 urb->setup_dma = dma_map_single(
54239 hcd->self.controller,
54240 urb->setup_packet,
54241@@ -838,7 +838,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
54242 urb->status = -EINPROGRESS;
54243 usb_get_urb(urb);
54244 atomic_inc(&urb->use_count);
54245- atomic_inc(&urb->dev->urbnum);
54246+ atomic_inc_unchecked(&urb->dev->urbnum);
54247 retval = submit_single_step_set_feature(hcd, urb, 0);
54248 if (!retval && !wait_for_completion_timeout(&done,
54249 msecs_to_jiffies(2000))) {
54250diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
54251index 1db0626..4948782 100644
54252--- a/drivers/usb/host/hwa-hc.c
54253+++ b/drivers/usb/host/hwa-hc.c
54254@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54255 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
54256 struct wahc *wa = &hwahc->wa;
54257 struct device *dev = &wa->usb_iface->dev;
54258- u8 mas_le[UWB_NUM_MAS/8];
54259+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
54260+
54261+ if (mas_le == NULL)
54262+ return -ENOMEM;
54263
54264 /* Set the stream index */
54265 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
54266@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
54267 WUSB_REQ_SET_WUSB_MAS,
54268 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
54269 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
54270- mas_le, 32, USB_CTRL_SET_TIMEOUT);
54271+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
54272 if (result < 0)
54273 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
54274 out:
54275+ kfree(mas_le);
54276+
54277 return result;
54278 }
54279
54280diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
54281index b3d245e..99549ed 100644
54282--- a/drivers/usb/misc/appledisplay.c
54283+++ b/drivers/usb/misc/appledisplay.c
54284@@ -84,7 +84,7 @@ struct appledisplay {
54285 struct mutex sysfslock; /* concurrent read and write */
54286 };
54287
54288-static atomic_t count_displays = ATOMIC_INIT(0);
54289+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
54290 static struct workqueue_struct *wq;
54291
54292 static void appledisplay_complete(struct urb *urb)
54293@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
54294
54295 /* Register backlight device */
54296 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
54297- atomic_inc_return(&count_displays) - 1);
54298+ atomic_inc_return_unchecked(&count_displays) - 1);
54299 memset(&props, 0, sizeof(struct backlight_properties));
54300 props.type = BACKLIGHT_RAW;
54301 props.max_brightness = 0xff;
54302diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
54303index 8d7fc48..01c4986 100644
54304--- a/drivers/usb/serial/console.c
54305+++ b/drivers/usb/serial/console.c
54306@@ -123,7 +123,7 @@ static int usb_console_setup(struct console *co, char *options)
54307
54308 info->port = port;
54309
54310- ++port->port.count;
54311+ atomic_inc(&port->port.count);
54312 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
54313 if (serial->type->set_termios) {
54314 /*
54315@@ -167,7 +167,7 @@ static int usb_console_setup(struct console *co, char *options)
54316 }
54317 /* Now that any required fake tty operations are completed restore
54318 * the tty port count */
54319- --port->port.count;
54320+ atomic_dec(&port->port.count);
54321 /* The console is special in terms of closing the device so
54322 * indicate this port is now acting as a system console. */
54323 port->port.console = 1;
54324@@ -180,7 +180,7 @@ static int usb_console_setup(struct console *co, char *options)
54325 free_tty:
54326 kfree(tty);
54327 reset_open_count:
54328- port->port.count = 0;
54329+ atomic_set(&port->port.count, 0);
54330 usb_autopm_put_interface(serial->interface);
54331 error_get_interface:
54332 usb_serial_put(serial);
54333@@ -191,7 +191,7 @@ static int usb_console_setup(struct console *co, char *options)
54334 static void usb_console_write(struct console *co,
54335 const char *buf, unsigned count)
54336 {
54337- static struct usbcons_info *info = &usbcons_info;
54338+ struct usbcons_info *info = &usbcons_info;
54339 struct usb_serial_port *port = info->port;
54340 struct usb_serial *serial;
54341 int retval = -ENODEV;
54342diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
54343index 307e339..6aa97cb 100644
54344--- a/drivers/usb/storage/usb.h
54345+++ b/drivers/usb/storage/usb.h
54346@@ -63,7 +63,7 @@ struct us_unusual_dev {
54347 __u8 useProtocol;
54348 __u8 useTransport;
54349 int (*initFunction)(struct us_data *);
54350-};
54351+} __do_const;
54352
54353
54354 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
54355diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
54356index a863a98..d272795 100644
54357--- a/drivers/usb/usbip/vhci.h
54358+++ b/drivers/usb/usbip/vhci.h
54359@@ -83,7 +83,7 @@ struct vhci_hcd {
54360 unsigned resuming:1;
54361 unsigned long re_timeout;
54362
54363- atomic_t seqnum;
54364+ atomic_unchecked_t seqnum;
54365
54366 /*
54367 * NOTE:
54368diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
54369index c02374b..32d47a9 100644
54370--- a/drivers/usb/usbip/vhci_hcd.c
54371+++ b/drivers/usb/usbip/vhci_hcd.c
54372@@ -439,7 +439,7 @@ static void vhci_tx_urb(struct urb *urb)
54373
54374 spin_lock(&vdev->priv_lock);
54375
54376- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
54377+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54378 if (priv->seqnum == 0xffff)
54379 dev_info(&urb->dev->dev, "seqnum max\n");
54380
54381@@ -686,7 +686,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
54382 return -ENOMEM;
54383 }
54384
54385- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
54386+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
54387 if (unlink->seqnum == 0xffff)
54388 pr_info("seqnum max\n");
54389
54390@@ -891,7 +891,7 @@ static int vhci_start(struct usb_hcd *hcd)
54391 vdev->rhport = rhport;
54392 }
54393
54394- atomic_set(&vhci->seqnum, 0);
54395+ atomic_set_unchecked(&vhci->seqnum, 0);
54396 spin_lock_init(&vhci->lock);
54397
54398 hcd->power_budget = 0; /* no limit */
54399diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
54400index 00e4a54..d676f85 100644
54401--- a/drivers/usb/usbip/vhci_rx.c
54402+++ b/drivers/usb/usbip/vhci_rx.c
54403@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
54404 if (!urb) {
54405 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
54406 pr_info("max seqnum %d\n",
54407- atomic_read(&the_controller->seqnum));
54408+ atomic_read_unchecked(&the_controller->seqnum));
54409 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
54410 return;
54411 }
54412diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
54413index edc7267..9f65ce2 100644
54414--- a/drivers/usb/wusbcore/wa-hc.h
54415+++ b/drivers/usb/wusbcore/wa-hc.h
54416@@ -240,7 +240,7 @@ struct wahc {
54417 spinlock_t xfer_list_lock;
54418 struct work_struct xfer_enqueue_work;
54419 struct work_struct xfer_error_work;
54420- atomic_t xfer_id_count;
54421+ atomic_unchecked_t xfer_id_count;
54422
54423 kernel_ulong_t quirks;
54424 };
54425@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
54426 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
54427 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
54428 wa->dto_in_use = 0;
54429- atomic_set(&wa->xfer_id_count, 1);
54430+ atomic_set_unchecked(&wa->xfer_id_count, 1);
54431 /* init the buf in URBs */
54432 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
54433 usb_init_urb(&(wa->buf_in_urbs[index]));
54434diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
54435index 69af4fd..da390d7 100644
54436--- a/drivers/usb/wusbcore/wa-xfer.c
54437+++ b/drivers/usb/wusbcore/wa-xfer.c
54438@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
54439 */
54440 static void wa_xfer_id_init(struct wa_xfer *xfer)
54441 {
54442- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
54443+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
54444 }
54445
54446 /* Return the xfer's ID. */
54447diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
54448index f018d8d..ccab63f 100644
54449--- a/drivers/vfio/vfio.c
54450+++ b/drivers/vfio/vfio.c
54451@@ -481,7 +481,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
54452 return 0;
54453
54454 /* TODO Prevent device auto probing */
54455- WARN("Device %s added to live group %d!\n", dev_name(dev),
54456+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
54457 iommu_group_id(group->iommu_group));
54458
54459 return 0;
54460diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
54461index 5174eba..451e6bc 100644
54462--- a/drivers/vhost/vringh.c
54463+++ b/drivers/vhost/vringh.c
54464@@ -530,17 +530,17 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
54465 /* Userspace access helpers: in this case, addresses are really userspace. */
54466 static inline int getu16_user(u16 *val, const u16 *p)
54467 {
54468- return get_user(*val, (__force u16 __user *)p);
54469+ return get_user(*val, (u16 __force_user *)p);
54470 }
54471
54472 static inline int putu16_user(u16 *p, u16 val)
54473 {
54474- return put_user(val, (__force u16 __user *)p);
54475+ return put_user(val, (u16 __force_user *)p);
54476 }
54477
54478 static inline int copydesc_user(void *dst, const void *src, size_t len)
54479 {
54480- return copy_from_user(dst, (__force void __user *)src, len) ?
54481+ return copy_from_user(dst, (void __force_user *)src, len) ?
54482 -EFAULT : 0;
54483 }
54484
54485@@ -548,19 +548,19 @@ static inline int putused_user(struct vring_used_elem *dst,
54486 const struct vring_used_elem *src,
54487 unsigned int num)
54488 {
54489- return copy_to_user((__force void __user *)dst, src,
54490+ return copy_to_user((void __force_user *)dst, src,
54491 sizeof(*dst) * num) ? -EFAULT : 0;
54492 }
54493
54494 static inline int xfer_from_user(void *src, void *dst, size_t len)
54495 {
54496- return copy_from_user(dst, (__force void __user *)src, len) ?
54497+ return copy_from_user(dst, (void __force_user *)src, len) ?
54498 -EFAULT : 0;
54499 }
54500
54501 static inline int xfer_to_user(void *dst, void *src, size_t len)
54502 {
54503- return copy_to_user((__force void __user *)dst, src, len) ?
54504+ return copy_to_user((void __force_user *)dst, src, len) ?
54505 -EFAULT : 0;
54506 }
54507
54508@@ -596,9 +596,9 @@ int vringh_init_user(struct vringh *vrh, u32 features,
54509 vrh->last_used_idx = 0;
54510 vrh->vring.num = num;
54511 /* vring expects kernel addresses, but only used via accessors. */
54512- vrh->vring.desc = (__force struct vring_desc *)desc;
54513- vrh->vring.avail = (__force struct vring_avail *)avail;
54514- vrh->vring.used = (__force struct vring_used *)used;
54515+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
54516+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
54517+ vrh->vring.used = (__force_kernel struct vring_used *)used;
54518 return 0;
54519 }
54520 EXPORT_SYMBOL(vringh_init_user);
54521@@ -800,7 +800,7 @@ static inline int getu16_kern(u16 *val, const u16 *p)
54522
54523 static inline int putu16_kern(u16 *p, u16 val)
54524 {
54525- ACCESS_ONCE(*p) = val;
54526+ ACCESS_ONCE_RW(*p) = val;
54527 return 0;
54528 }
54529
54530diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
54531index 84a110a..96312c3 100644
54532--- a/drivers/video/backlight/kb3886_bl.c
54533+++ b/drivers/video/backlight/kb3886_bl.c
54534@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
54535 static unsigned long kb3886bl_flags;
54536 #define KB3886BL_SUSPENDED 0x01
54537
54538-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
54539+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
54540 {
54541 .ident = "Sahara Touch-iT",
54542 .matches = {
54543diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
54544index 1b0b233..6f34c2c 100644
54545--- a/drivers/video/fbdev/arcfb.c
54546+++ b/drivers/video/fbdev/arcfb.c
54547@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
54548 return -ENOSPC;
54549
54550 err = 0;
54551- if ((count + p) > fbmemlength) {
54552+ if (count > (fbmemlength - p)) {
54553 count = fbmemlength - p;
54554 err = -ENOSPC;
54555 }
54556diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
54557index aedf2fb..47c9aca 100644
54558--- a/drivers/video/fbdev/aty/aty128fb.c
54559+++ b/drivers/video/fbdev/aty/aty128fb.c
54560@@ -149,7 +149,7 @@ enum {
54561 };
54562
54563 /* Must match above enum */
54564-static char * const r128_family[] = {
54565+static const char * const r128_family[] = {
54566 "AGP",
54567 "PCI",
54568 "PRO AGP",
54569diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
54570index 37ec09b..98f8862 100644
54571--- a/drivers/video/fbdev/aty/atyfb_base.c
54572+++ b/drivers/video/fbdev/aty/atyfb_base.c
54573@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
54574 par->accel_flags = var->accel_flags; /* hack */
54575
54576 if (var->accel_flags) {
54577- info->fbops->fb_sync = atyfb_sync;
54578+ pax_open_kernel();
54579+ *(void **)&info->fbops->fb_sync = atyfb_sync;
54580+ pax_close_kernel();
54581 info->flags &= ~FBINFO_HWACCEL_DISABLED;
54582 } else {
54583- info->fbops->fb_sync = NULL;
54584+ pax_open_kernel();
54585+ *(void **)&info->fbops->fb_sync = NULL;
54586+ pax_close_kernel();
54587 info->flags |= FBINFO_HWACCEL_DISABLED;
54588 }
54589
54590diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
54591index 2fa0317..4983f2a 100644
54592--- a/drivers/video/fbdev/aty/mach64_cursor.c
54593+++ b/drivers/video/fbdev/aty/mach64_cursor.c
54594@@ -8,6 +8,7 @@
54595 #include "../core/fb_draw.h"
54596
54597 #include <asm/io.h>
54598+#include <asm/pgtable.h>
54599
54600 #ifdef __sparc__
54601 #include <asm/fbio.h>
54602@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
54603 info->sprite.buf_align = 16; /* and 64 lines tall. */
54604 info->sprite.flags = FB_PIXMAP_IO;
54605
54606- info->fbops->fb_cursor = atyfb_cursor;
54607+ pax_open_kernel();
54608+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
54609+ pax_close_kernel();
54610
54611 return 0;
54612 }
54613diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
54614index 900aa4e..6d49418 100644
54615--- a/drivers/video/fbdev/core/fb_defio.c
54616+++ b/drivers/video/fbdev/core/fb_defio.c
54617@@ -206,7 +206,9 @@ void fb_deferred_io_init(struct fb_info *info)
54618
54619 BUG_ON(!fbdefio);
54620 mutex_init(&fbdefio->lock);
54621- info->fbops->fb_mmap = fb_deferred_io_mmap;
54622+ pax_open_kernel();
54623+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
54624+ pax_close_kernel();
54625 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
54626 INIT_LIST_HEAD(&fbdefio->pagelist);
54627 if (fbdefio->delay == 0) /* set a default of 1 s */
54628@@ -237,7 +239,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
54629 page->mapping = NULL;
54630 }
54631
54632- info->fbops->fb_mmap = NULL;
54633+ *(void **)&info->fbops->fb_mmap = NULL;
54634 mutex_destroy(&fbdefio->lock);
54635 }
54636 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
54637diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
54638index 0705d88..d9429bf 100644
54639--- a/drivers/video/fbdev/core/fbmem.c
54640+++ b/drivers/video/fbdev/core/fbmem.c
54641@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
54642 __u32 data;
54643 int err;
54644
54645- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
54646+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
54647
54648 data = (__u32) (unsigned long) fix->smem_start;
54649 err |= put_user(data, &fix32->smem_start);
54650diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
54651index 4254336..282567e 100644
54652--- a/drivers/video/fbdev/hyperv_fb.c
54653+++ b/drivers/video/fbdev/hyperv_fb.c
54654@@ -240,7 +240,7 @@ static uint screen_fb_size;
54655 static inline int synthvid_send(struct hv_device *hdev,
54656 struct synthvid_msg *msg)
54657 {
54658- static atomic64_t request_id = ATOMIC64_INIT(0);
54659+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
54660 int ret;
54661
54662 msg->pipe_hdr.type = PIPE_MSG_DATA;
54663@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
54664
54665 ret = vmbus_sendpacket(hdev->channel, msg,
54666 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
54667- atomic64_inc_return(&request_id),
54668+ atomic64_inc_return_unchecked(&request_id),
54669 VM_PKT_DATA_INBAND, 0);
54670
54671 if (ret)
54672diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
54673index 7672d2e..b56437f 100644
54674--- a/drivers/video/fbdev/i810/i810_accel.c
54675+++ b/drivers/video/fbdev/i810/i810_accel.c
54676@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
54677 }
54678 }
54679 printk("ringbuffer lockup!!!\n");
54680+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
54681 i810_report_error(mmio);
54682 par->dev_flags |= LOCKUP;
54683 info->pixmap.scan_align = 1;
54684diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54685index a01147f..5d896f8 100644
54686--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54687+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
54688@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
54689
54690 #ifdef CONFIG_FB_MATROX_MYSTIQUE
54691 struct matrox_switch matrox_mystique = {
54692- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
54693+ .preinit = MGA1064_preinit,
54694+ .reset = MGA1064_reset,
54695+ .init = MGA1064_init,
54696+ .restore = MGA1064_restore,
54697 };
54698 EXPORT_SYMBOL(matrox_mystique);
54699 #endif
54700
54701 #ifdef CONFIG_FB_MATROX_G
54702 struct matrox_switch matrox_G100 = {
54703- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
54704+ .preinit = MGAG100_preinit,
54705+ .reset = MGAG100_reset,
54706+ .init = MGAG100_init,
54707+ .restore = MGAG100_restore,
54708 };
54709 EXPORT_SYMBOL(matrox_G100);
54710 #endif
54711diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54712index 195ad7c..09743fc 100644
54713--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54714+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
54715@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
54716 }
54717
54718 struct matrox_switch matrox_millennium = {
54719- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
54720+ .preinit = Ti3026_preinit,
54721+ .reset = Ti3026_reset,
54722+ .init = Ti3026_init,
54723+ .restore = Ti3026_restore
54724 };
54725 EXPORT_SYMBOL(matrox_millennium);
54726 #endif
54727diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54728index fe92eed..106e085 100644
54729--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54730+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
54731@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
54732 struct mb862xxfb_par *par = info->par;
54733
54734 if (info->var.bits_per_pixel == 32) {
54735- info->fbops->fb_fillrect = cfb_fillrect;
54736- info->fbops->fb_copyarea = cfb_copyarea;
54737- info->fbops->fb_imageblit = cfb_imageblit;
54738+ pax_open_kernel();
54739+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
54740+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
54741+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
54742+ pax_close_kernel();
54743 } else {
54744 outreg(disp, GC_L0EM, 3);
54745- info->fbops->fb_fillrect = mb86290fb_fillrect;
54746- info->fbops->fb_copyarea = mb86290fb_copyarea;
54747- info->fbops->fb_imageblit = mb86290fb_imageblit;
54748+ pax_open_kernel();
54749+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
54750+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
54751+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
54752+ pax_close_kernel();
54753 }
54754 outreg(draw, GDC_REG_DRAW_BASE, 0);
54755 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
54756diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
54757index def0412..fed6529 100644
54758--- a/drivers/video/fbdev/nvidia/nvidia.c
54759+++ b/drivers/video/fbdev/nvidia/nvidia.c
54760@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
54761 info->fix.line_length = (info->var.xres_virtual *
54762 info->var.bits_per_pixel) >> 3;
54763 if (info->var.accel_flags) {
54764- info->fbops->fb_imageblit = nvidiafb_imageblit;
54765- info->fbops->fb_fillrect = nvidiafb_fillrect;
54766- info->fbops->fb_copyarea = nvidiafb_copyarea;
54767- info->fbops->fb_sync = nvidiafb_sync;
54768+ pax_open_kernel();
54769+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
54770+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
54771+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
54772+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
54773+ pax_close_kernel();
54774 info->pixmap.scan_align = 4;
54775 info->flags &= ~FBINFO_HWACCEL_DISABLED;
54776 info->flags |= FBINFO_READS_FAST;
54777 NVResetGraphics(info);
54778 } else {
54779- info->fbops->fb_imageblit = cfb_imageblit;
54780- info->fbops->fb_fillrect = cfb_fillrect;
54781- info->fbops->fb_copyarea = cfb_copyarea;
54782- info->fbops->fb_sync = NULL;
54783+ pax_open_kernel();
54784+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
54785+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
54786+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
54787+ *(void **)&info->fbops->fb_sync = NULL;
54788+ pax_close_kernel();
54789 info->pixmap.scan_align = 1;
54790 info->flags |= FBINFO_HWACCEL_DISABLED;
54791 info->flags &= ~FBINFO_READS_FAST;
54792@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
54793 info->pixmap.size = 8 * 1024;
54794 info->pixmap.flags = FB_PIXMAP_SYSTEM;
54795
54796- if (!hwcur)
54797- info->fbops->fb_cursor = NULL;
54798+ if (!hwcur) {
54799+ pax_open_kernel();
54800+ *(void **)&info->fbops->fb_cursor = NULL;
54801+ pax_close_kernel();
54802+ }
54803
54804 info->var.accel_flags = (!noaccel);
54805
54806diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
54807index 2412a0d..294215b 100644
54808--- a/drivers/video/fbdev/omap2/dss/display.c
54809+++ b/drivers/video/fbdev/omap2/dss/display.c
54810@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
54811 if (dssdev->name == NULL)
54812 dssdev->name = dssdev->alias;
54813
54814+ pax_open_kernel();
54815 if (drv && drv->get_resolution == NULL)
54816- drv->get_resolution = omapdss_default_get_resolution;
54817+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
54818 if (drv && drv->get_recommended_bpp == NULL)
54819- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
54820+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
54821 if (drv && drv->get_timings == NULL)
54822- drv->get_timings = omapdss_default_get_timings;
54823+ *(void **)&drv->get_timings = omapdss_default_get_timings;
54824+ pax_close_kernel();
54825
54826 mutex_lock(&panel_list_mutex);
54827 list_add_tail(&dssdev->panel_list, &panel_list);
54828diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
54829index 83433cb..71e9b98 100644
54830--- a/drivers/video/fbdev/s1d13xxxfb.c
54831+++ b/drivers/video/fbdev/s1d13xxxfb.c
54832@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
54833
54834 switch(prod_id) {
54835 case S1D13506_PROD_ID: /* activate acceleration */
54836- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
54837- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
54838+ pax_open_kernel();
54839+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
54840+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
54841+ pax_close_kernel();
54842 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
54843 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
54844 break;
54845diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
54846index 2bcc84a..29dd1ea 100644
54847--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
54848+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
54849@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
54850 }
54851
54852 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
54853- lcdc_sys_write_index,
54854- lcdc_sys_write_data,
54855- lcdc_sys_read_data,
54856+ .write_index = lcdc_sys_write_index,
54857+ .write_data = lcdc_sys_write_data,
54858+ .read_data = lcdc_sys_read_data,
54859 };
54860
54861 static int sh_mobile_lcdc_sginit(struct fb_info *info,
54862diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
54863index d513ed6..90b0de9 100644
54864--- a/drivers/video/fbdev/smscufx.c
54865+++ b/drivers/video/fbdev/smscufx.c
54866@@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
54867 fb_deferred_io_cleanup(info);
54868 kfree(info->fbdefio);
54869 info->fbdefio = NULL;
54870- info->fbops->fb_mmap = ufx_ops_mmap;
54871+ pax_open_kernel();
54872+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
54873+ pax_close_kernel();
54874 }
54875
54876 pr_debug("released /dev/fb%d user=%d count=%d",
54877diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
54878index 046d51d..be564da 100644
54879--- a/drivers/video/fbdev/udlfb.c
54880+++ b/drivers/video/fbdev/udlfb.c
54881@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
54882 dlfb_urb_completion(urb);
54883
54884 error:
54885- atomic_add(bytes_sent, &dev->bytes_sent);
54886- atomic_add(bytes_identical, &dev->bytes_identical);
54887- atomic_add(width*height*2, &dev->bytes_rendered);
54888+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
54889+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
54890+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
54891 end_cycles = get_cycles();
54892- atomic_add(((unsigned int) ((end_cycles - start_cycles)
54893+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
54894 >> 10)), /* Kcycles */
54895 &dev->cpu_kcycles_used);
54896
54897@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
54898 dlfb_urb_completion(urb);
54899
54900 error:
54901- atomic_add(bytes_sent, &dev->bytes_sent);
54902- atomic_add(bytes_identical, &dev->bytes_identical);
54903- atomic_add(bytes_rendered, &dev->bytes_rendered);
54904+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
54905+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
54906+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
54907 end_cycles = get_cycles();
54908- atomic_add(((unsigned int) ((end_cycles - start_cycles)
54909+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
54910 >> 10)), /* Kcycles */
54911 &dev->cpu_kcycles_used);
54912 }
54913@@ -993,7 +993,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
54914 fb_deferred_io_cleanup(info);
54915 kfree(info->fbdefio);
54916 info->fbdefio = NULL;
54917- info->fbops->fb_mmap = dlfb_ops_mmap;
54918+ pax_open_kernel();
54919+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
54920+ pax_close_kernel();
54921 }
54922
54923 pr_warn("released /dev/fb%d user=%d count=%d\n",
54924@@ -1376,7 +1378,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
54925 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54926 struct dlfb_data *dev = fb_info->par;
54927 return snprintf(buf, PAGE_SIZE, "%u\n",
54928- atomic_read(&dev->bytes_rendered));
54929+ atomic_read_unchecked(&dev->bytes_rendered));
54930 }
54931
54932 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
54933@@ -1384,7 +1386,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
54934 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54935 struct dlfb_data *dev = fb_info->par;
54936 return snprintf(buf, PAGE_SIZE, "%u\n",
54937- atomic_read(&dev->bytes_identical));
54938+ atomic_read_unchecked(&dev->bytes_identical));
54939 }
54940
54941 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
54942@@ -1392,7 +1394,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
54943 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54944 struct dlfb_data *dev = fb_info->par;
54945 return snprintf(buf, PAGE_SIZE, "%u\n",
54946- atomic_read(&dev->bytes_sent));
54947+ atomic_read_unchecked(&dev->bytes_sent));
54948 }
54949
54950 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
54951@@ -1400,7 +1402,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
54952 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54953 struct dlfb_data *dev = fb_info->par;
54954 return snprintf(buf, PAGE_SIZE, "%u\n",
54955- atomic_read(&dev->cpu_kcycles_used));
54956+ atomic_read_unchecked(&dev->cpu_kcycles_used));
54957 }
54958
54959 static ssize_t edid_show(
54960@@ -1460,10 +1462,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
54961 struct fb_info *fb_info = dev_get_drvdata(fbdev);
54962 struct dlfb_data *dev = fb_info->par;
54963
54964- atomic_set(&dev->bytes_rendered, 0);
54965- atomic_set(&dev->bytes_identical, 0);
54966- atomic_set(&dev->bytes_sent, 0);
54967- atomic_set(&dev->cpu_kcycles_used, 0);
54968+ atomic_set_unchecked(&dev->bytes_rendered, 0);
54969+ atomic_set_unchecked(&dev->bytes_identical, 0);
54970+ atomic_set_unchecked(&dev->bytes_sent, 0);
54971+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
54972
54973 return count;
54974 }
54975diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
54976index 509d452..7c9d2de 100644
54977--- a/drivers/video/fbdev/uvesafb.c
54978+++ b/drivers/video/fbdev/uvesafb.c
54979@@ -19,6 +19,7 @@
54980 #include <linux/io.h>
54981 #include <linux/mutex.h>
54982 #include <linux/slab.h>
54983+#include <linux/moduleloader.h>
54984 #include <video/edid.h>
54985 #include <video/uvesafb.h>
54986 #ifdef CONFIG_X86
54987@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
54988 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
54989 par->pmi_setpal = par->ypan = 0;
54990 } else {
54991+
54992+#ifdef CONFIG_PAX_KERNEXEC
54993+#ifdef CONFIG_MODULES
54994+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
54995+#endif
54996+ if (!par->pmi_code) {
54997+ par->pmi_setpal = par->ypan = 0;
54998+ return 0;
54999+ }
55000+#endif
55001+
55002 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
55003 + task->t.regs.edi);
55004+
55005+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55006+ pax_open_kernel();
55007+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
55008+ pax_close_kernel();
55009+
55010+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
55011+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
55012+#else
55013 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
55014 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
55015+#endif
55016+
55017 printk(KERN_INFO "uvesafb: protected mode interface info at "
55018 "%04x:%04x\n",
55019 (u16)task->t.regs.es, (u16)task->t.regs.edi);
55020@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
55021 par->ypan = ypan;
55022
55023 if (par->pmi_setpal || par->ypan) {
55024+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
55025 if (__supported_pte_mask & _PAGE_NX) {
55026 par->pmi_setpal = par->ypan = 0;
55027 printk(KERN_WARNING "uvesafb: NX protection is active, "
55028 "better not use the PMI.\n");
55029- } else {
55030+ } else
55031+#endif
55032 uvesafb_vbe_getpmi(task, par);
55033- }
55034 }
55035 #else
55036 /* The protected mode interface is not available on non-x86. */
55037@@ -1453,8 +1477,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55038 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
55039
55040 /* Disable blanking if the user requested so. */
55041- if (!blank)
55042- info->fbops->fb_blank = NULL;
55043+ if (!blank) {
55044+ pax_open_kernel();
55045+ *(void **)&info->fbops->fb_blank = NULL;
55046+ pax_close_kernel();
55047+ }
55048
55049 /*
55050 * Find out how much IO memory is required for the mode with
55051@@ -1525,8 +1552,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55052 info->flags = FBINFO_FLAG_DEFAULT |
55053 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
55054
55055- if (!par->ypan)
55056- info->fbops->fb_pan_display = NULL;
55057+ if (!par->ypan) {
55058+ pax_open_kernel();
55059+ *(void **)&info->fbops->fb_pan_display = NULL;
55060+ pax_close_kernel();
55061+ }
55062 }
55063
55064 static void uvesafb_init_mtrr(struct fb_info *info)
55065@@ -1787,6 +1817,11 @@ out_mode:
55066 out:
55067 kfree(par->vbe_modes);
55068
55069+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55070+ if (par->pmi_code)
55071+ module_free_exec(NULL, par->pmi_code);
55072+#endif
55073+
55074 framebuffer_release(info);
55075 return err;
55076 }
55077@@ -1811,6 +1846,11 @@ static int uvesafb_remove(struct platform_device *dev)
55078 kfree(par->vbe_state_orig);
55079 kfree(par->vbe_state_saved);
55080
55081+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55082+ if (par->pmi_code)
55083+ module_free_exec(NULL, par->pmi_code);
55084+#endif
55085+
55086 framebuffer_release(info);
55087 }
55088 return 0;
55089diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
55090index 6170e7f..dd63031 100644
55091--- a/drivers/video/fbdev/vesafb.c
55092+++ b/drivers/video/fbdev/vesafb.c
55093@@ -9,6 +9,7 @@
55094 */
55095
55096 #include <linux/module.h>
55097+#include <linux/moduleloader.h>
55098 #include <linux/kernel.h>
55099 #include <linux/errno.h>
55100 #include <linux/string.h>
55101@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
55102 static int vram_total; /* Set total amount of memory */
55103 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
55104 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
55105-static void (*pmi_start)(void) __read_mostly;
55106-static void (*pmi_pal) (void) __read_mostly;
55107+static void (*pmi_start)(void) __read_only;
55108+static void (*pmi_pal) (void) __read_only;
55109 static int depth __read_mostly;
55110 static int vga_compat __read_mostly;
55111 /* --------------------------------------------------------------------- */
55112@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
55113 unsigned int size_remap;
55114 unsigned int size_total;
55115 char *option = NULL;
55116+ void *pmi_code = NULL;
55117
55118 /* ignore error return of fb_get_options */
55119 fb_get_options("vesafb", &option);
55120@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
55121 size_remap = size_total;
55122 vesafb_fix.smem_len = size_remap;
55123
55124-#ifndef __i386__
55125- screen_info.vesapm_seg = 0;
55126-#endif
55127-
55128 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
55129 printk(KERN_WARNING
55130 "vesafb: cannot reserve video memory at 0x%lx\n",
55131@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
55132 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
55133 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
55134
55135+#ifdef __i386__
55136+
55137+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55138+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
55139+ if (!pmi_code)
55140+#elif !defined(CONFIG_PAX_KERNEXEC)
55141+ if (0)
55142+#endif
55143+
55144+#endif
55145+ screen_info.vesapm_seg = 0;
55146+
55147 if (screen_info.vesapm_seg) {
55148- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
55149- screen_info.vesapm_seg,screen_info.vesapm_off);
55150+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
55151+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
55152 }
55153
55154 if (screen_info.vesapm_seg < 0xc000)
55155@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
55156
55157 if (ypan || pmi_setpal) {
55158 unsigned short *pmi_base;
55159+
55160 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
55161- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
55162- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
55163+
55164+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55165+ pax_open_kernel();
55166+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
55167+#else
55168+ pmi_code = pmi_base;
55169+#endif
55170+
55171+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
55172+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
55173+
55174+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55175+ pmi_start = ktva_ktla(pmi_start);
55176+ pmi_pal = ktva_ktla(pmi_pal);
55177+ pax_close_kernel();
55178+#endif
55179+
55180 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
55181 if (pmi_base[3]) {
55182 printk(KERN_INFO "vesafb: pmi: ports = ");
55183@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
55184 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
55185 (ypan ? FBINFO_HWACCEL_YPAN : 0);
55186
55187- if (!ypan)
55188- info->fbops->fb_pan_display = NULL;
55189+ if (!ypan) {
55190+ pax_open_kernel();
55191+ *(void **)&info->fbops->fb_pan_display = NULL;
55192+ pax_close_kernel();
55193+ }
55194
55195 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
55196 err = -ENOMEM;
55197@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
55198 fb_info(info, "%s frame buffer device\n", info->fix.id);
55199 return 0;
55200 err:
55201+
55202+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55203+ module_free_exec(NULL, pmi_code);
55204+#endif
55205+
55206 if (info->screen_base)
55207 iounmap(info->screen_base);
55208 framebuffer_release(info);
55209diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
55210index 88714ae..16c2e11 100644
55211--- a/drivers/video/fbdev/via/via_clock.h
55212+++ b/drivers/video/fbdev/via/via_clock.h
55213@@ -56,7 +56,7 @@ struct via_clock {
55214
55215 void (*set_engine_pll_state)(u8 state);
55216 void (*set_engine_pll)(struct via_pll_config config);
55217-};
55218+} __no_const;
55219
55220
55221 static inline u32 get_pll_internal_frequency(u32 ref_freq,
55222diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
55223index 3c14e43..2630570 100644
55224--- a/drivers/video/logo/logo_linux_clut224.ppm
55225+++ b/drivers/video/logo/logo_linux_clut224.ppm
55226@@ -2,1603 +2,1123 @@ P3
55227 # Standard 224-color Linux logo
55228 80 80
55229 255
55230- 0 0 0 0 0 0 0 0 0 0 0 0
55231- 0 0 0 0 0 0 0 0 0 0 0 0
55232- 0 0 0 0 0 0 0 0 0 0 0 0
55233- 0 0 0 0 0 0 0 0 0 0 0 0
55234- 0 0 0 0 0 0 0 0 0 0 0 0
55235- 0 0 0 0 0 0 0 0 0 0 0 0
55236- 0 0 0 0 0 0 0 0 0 0 0 0
55237- 0 0 0 0 0 0 0 0 0 0 0 0
55238- 0 0 0 0 0 0 0 0 0 0 0 0
55239- 6 6 6 6 6 6 10 10 10 10 10 10
55240- 10 10 10 6 6 6 6 6 6 6 6 6
55241- 0 0 0 0 0 0 0 0 0 0 0 0
55242- 0 0 0 0 0 0 0 0 0 0 0 0
55243- 0 0 0 0 0 0 0 0 0 0 0 0
55244- 0 0 0 0 0 0 0 0 0 0 0 0
55245- 0 0 0 0 0 0 0 0 0 0 0 0
55246- 0 0 0 0 0 0 0 0 0 0 0 0
55247- 0 0 0 0 0 0 0 0 0 0 0 0
55248- 0 0 0 0 0 0 0 0 0 0 0 0
55249- 0 0 0 0 0 0 0 0 0 0 0 0
55250- 0 0 0 0 0 0 0 0 0 0 0 0
55251- 0 0 0 0 0 0 0 0 0 0 0 0
55252- 0 0 0 0 0 0 0 0 0 0 0 0
55253- 0 0 0 0 0 0 0 0 0 0 0 0
55254- 0 0 0 0 0 0 0 0 0 0 0 0
55255- 0 0 0 0 0 0 0 0 0 0 0 0
55256- 0 0 0 0 0 0 0 0 0 0 0 0
55257- 0 0 0 0 0 0 0 0 0 0 0 0
55258- 0 0 0 6 6 6 10 10 10 14 14 14
55259- 22 22 22 26 26 26 30 30 30 34 34 34
55260- 30 30 30 30 30 30 26 26 26 18 18 18
55261- 14 14 14 10 10 10 6 6 6 0 0 0
55262- 0 0 0 0 0 0 0 0 0 0 0 0
55263- 0 0 0 0 0 0 0 0 0 0 0 0
55264- 0 0 0 0 0 0 0 0 0 0 0 0
55265- 0 0 0 0 0 0 0 0 0 0 0 0
55266- 0 0 0 0 0 0 0 0 0 0 0 0
55267- 0 0 0 0 0 0 0 0 0 0 0 0
55268- 0 0 0 0 0 0 0 0 0 0 0 0
55269- 0 0 0 0 0 0 0 0 0 0 0 0
55270- 0 0 0 0 0 0 0 0 0 0 0 0
55271- 0 0 0 0 0 1 0 0 1 0 0 0
55272- 0 0 0 0 0 0 0 0 0 0 0 0
55273- 0 0 0 0 0 0 0 0 0 0 0 0
55274- 0 0 0 0 0 0 0 0 0 0 0 0
55275- 0 0 0 0 0 0 0 0 0 0 0 0
55276- 0 0 0 0 0 0 0 0 0 0 0 0
55277- 0 0 0 0 0 0 0 0 0 0 0 0
55278- 6 6 6 14 14 14 26 26 26 42 42 42
55279- 54 54 54 66 66 66 78 78 78 78 78 78
55280- 78 78 78 74 74 74 66 66 66 54 54 54
55281- 42 42 42 26 26 26 18 18 18 10 10 10
55282- 6 6 6 0 0 0 0 0 0 0 0 0
55283- 0 0 0 0 0 0 0 0 0 0 0 0
55284- 0 0 0 0 0 0 0 0 0 0 0 0
55285- 0 0 0 0 0 0 0 0 0 0 0 0
55286- 0 0 0 0 0 0 0 0 0 0 0 0
55287- 0 0 0 0 0 0 0 0 0 0 0 0
55288- 0 0 0 0 0 0 0 0 0 0 0 0
55289- 0 0 0 0 0 0 0 0 0 0 0 0
55290- 0 0 0 0 0 0 0 0 0 0 0 0
55291- 0 0 1 0 0 0 0 0 0 0 0 0
55292- 0 0 0 0 0 0 0 0 0 0 0 0
55293- 0 0 0 0 0 0 0 0 0 0 0 0
55294- 0 0 0 0 0 0 0 0 0 0 0 0
55295- 0 0 0 0 0 0 0 0 0 0 0 0
55296- 0 0 0 0 0 0 0 0 0 0 0 0
55297- 0 0 0 0 0 0 0 0 0 10 10 10
55298- 22 22 22 42 42 42 66 66 66 86 86 86
55299- 66 66 66 38 38 38 38 38 38 22 22 22
55300- 26 26 26 34 34 34 54 54 54 66 66 66
55301- 86 86 86 70 70 70 46 46 46 26 26 26
55302- 14 14 14 6 6 6 0 0 0 0 0 0
55303- 0 0 0 0 0 0 0 0 0 0 0 0
55304- 0 0 0 0 0 0 0 0 0 0 0 0
55305- 0 0 0 0 0 0 0 0 0 0 0 0
55306- 0 0 0 0 0 0 0 0 0 0 0 0
55307- 0 0 0 0 0 0 0 0 0 0 0 0
55308- 0 0 0 0 0 0 0 0 0 0 0 0
55309- 0 0 0 0 0 0 0 0 0 0 0 0
55310- 0 0 0 0 0 0 0 0 0 0 0 0
55311- 0 0 1 0 0 1 0 0 1 0 0 0
55312- 0 0 0 0 0 0 0 0 0 0 0 0
55313- 0 0 0 0 0 0 0 0 0 0 0 0
55314- 0 0 0 0 0 0 0 0 0 0 0 0
55315- 0 0 0 0 0 0 0 0 0 0 0 0
55316- 0 0 0 0 0 0 0 0 0 0 0 0
55317- 0 0 0 0 0 0 10 10 10 26 26 26
55318- 50 50 50 82 82 82 58 58 58 6 6 6
55319- 2 2 6 2 2 6 2 2 6 2 2 6
55320- 2 2 6 2 2 6 2 2 6 2 2 6
55321- 6 6 6 54 54 54 86 86 86 66 66 66
55322- 38 38 38 18 18 18 6 6 6 0 0 0
55323- 0 0 0 0 0 0 0 0 0 0 0 0
55324- 0 0 0 0 0 0 0 0 0 0 0 0
55325- 0 0 0 0 0 0 0 0 0 0 0 0
55326- 0 0 0 0 0 0 0 0 0 0 0 0
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- 0 0 0 0 0 0 0 0 0 0 0 0
55337- 0 0 0 6 6 6 22 22 22 50 50 50
55338- 78 78 78 34 34 34 2 2 6 2 2 6
55339- 2 2 6 2 2 6 2 2 6 2 2 6
55340- 2 2 6 2 2 6 2 2 6 2 2 6
55341- 2 2 6 2 2 6 6 6 6 70 70 70
55342- 78 78 78 46 46 46 22 22 22 6 6 6
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 1 0 0 1 0 0 1 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 0 0 0 0 0 0 0 0 0
55356- 0 0 0 0 0 0 0 0 0 0 0 0
55357- 6 6 6 18 18 18 42 42 42 82 82 82
55358- 26 26 26 2 2 6 2 2 6 2 2 6
55359- 2 2 6 2 2 6 2 2 6 2 2 6
55360- 2 2 6 2 2 6 2 2 6 14 14 14
55361- 46 46 46 34 34 34 6 6 6 2 2 6
55362- 42 42 42 78 78 78 42 42 42 18 18 18
55363- 6 6 6 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 0 0 0 0 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 1 0 0 0 0 0 1 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- 0 0 0 0 0 0 0 0 0 0 0 0
55376- 0 0 0 0 0 0 0 0 0 0 0 0
55377- 10 10 10 30 30 30 66 66 66 58 58 58
55378- 2 2 6 2 2 6 2 2 6 2 2 6
55379- 2 2 6 2 2 6 2 2 6 2 2 6
55380- 2 2 6 2 2 6 2 2 6 26 26 26
55381- 86 86 86 101 101 101 46 46 46 10 10 10
55382- 2 2 6 58 58 58 70 70 70 34 34 34
55383- 10 10 10 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 0 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 1 0 0 1 0 0 1 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 0 0 0
55395- 0 0 0 0 0 0 0 0 0 0 0 0
55396- 0 0 0 0 0 0 0 0 0 0 0 0
55397- 14 14 14 42 42 42 86 86 86 10 10 10
55398- 2 2 6 2 2 6 2 2 6 2 2 6
55399- 2 2 6 2 2 6 2 2 6 2 2 6
55400- 2 2 6 2 2 6 2 2 6 30 30 30
55401- 94 94 94 94 94 94 58 58 58 26 26 26
55402- 2 2 6 6 6 6 78 78 78 54 54 54
55403- 22 22 22 6 6 6 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 0 0 0 0 0 0 0 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 0 0 0 0 0 0
55415- 0 0 0 0 0 0 0 0 0 0 0 0
55416- 0 0 0 0 0 0 0 0 0 6 6 6
55417- 22 22 22 62 62 62 62 62 62 2 2 6
55418- 2 2 6 2 2 6 2 2 6 2 2 6
55419- 2 2 6 2 2 6 2 2 6 2 2 6
55420- 2 2 6 2 2 6 2 2 6 26 26 26
55421- 54 54 54 38 38 38 18 18 18 10 10 10
55422- 2 2 6 2 2 6 34 34 34 82 82 82
55423- 38 38 38 14 14 14 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 1 0 0 1 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 0 0 0 0 0 0 0 0 0
55435- 0 0 0 0 0 0 0 0 0 0 0 0
55436- 0 0 0 0 0 0 0 0 0 6 6 6
55437- 30 30 30 78 78 78 30 30 30 2 2 6
55438- 2 2 6 2 2 6 2 2 6 2 2 6
55439- 2 2 6 2 2 6 2 2 6 2 2 6
55440- 2 2 6 2 2 6 2 2 6 10 10 10
55441- 10 10 10 2 2 6 2 2 6 2 2 6
55442- 2 2 6 2 2 6 2 2 6 78 78 78
55443- 50 50 50 18 18 18 6 6 6 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 0 0 0 0 0 0 0 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 1 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- 0 0 0 0 0 0 0 0 0 0 0 0
55455- 0 0 0 0 0 0 0 0 0 0 0 0
55456- 0 0 0 0 0 0 0 0 0 10 10 10
55457- 38 38 38 86 86 86 14 14 14 2 2 6
55458- 2 2 6 2 2 6 2 2 6 2 2 6
55459- 2 2 6 2 2 6 2 2 6 2 2 6
55460- 2 2 6 2 2 6 2 2 6 2 2 6
55461- 2 2 6 2 2 6 2 2 6 2 2 6
55462- 2 2 6 2 2 6 2 2 6 54 54 54
55463- 66 66 66 26 26 26 6 6 6 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 0 0 0 0 0 0 0 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 1 0 0 1 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- 0 0 0 0 0 0 0 0 0 0 0 0
55475- 0 0 0 0 0 0 0 0 0 0 0 0
55476- 0 0 0 0 0 0 0 0 0 14 14 14
55477- 42 42 42 82 82 82 2 2 6 2 2 6
55478- 2 2 6 6 6 6 10 10 10 2 2 6
55479- 2 2 6 2 2 6 2 2 6 2 2 6
55480- 2 2 6 2 2 6 2 2 6 6 6 6
55481- 14 14 14 10 10 10 2 2 6 2 2 6
55482- 2 2 6 2 2 6 2 2 6 18 18 18
55483- 82 82 82 34 34 34 10 10 10 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 0 0 0 0 0 0 0 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 1 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- 0 0 0 0 0 0 0 0 0 0 0 0
55495- 0 0 0 0 0 0 0 0 0 0 0 0
55496- 0 0 0 0 0 0 0 0 0 14 14 14
55497- 46 46 46 86 86 86 2 2 6 2 2 6
55498- 6 6 6 6 6 6 22 22 22 34 34 34
55499- 6 6 6 2 2 6 2 2 6 2 2 6
55500- 2 2 6 2 2 6 18 18 18 34 34 34
55501- 10 10 10 50 50 50 22 22 22 2 2 6
55502- 2 2 6 2 2 6 2 2 6 10 10 10
55503- 86 86 86 42 42 42 14 14 14 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 1 0 0 1 0 0 1 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 0 0 0
55514- 0 0 0 0 0 0 0 0 0 0 0 0
55515- 0 0 0 0 0 0 0 0 0 0 0 0
55516- 0 0 0 0 0 0 0 0 0 14 14 14
55517- 46 46 46 86 86 86 2 2 6 2 2 6
55518- 38 38 38 116 116 116 94 94 94 22 22 22
55519- 22 22 22 2 2 6 2 2 6 2 2 6
55520- 14 14 14 86 86 86 138 138 138 162 162 162
55521-154 154 154 38 38 38 26 26 26 6 6 6
55522- 2 2 6 2 2 6 2 2 6 2 2 6
55523- 86 86 86 46 46 46 14 14 14 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 0 0 0 0 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 0 0 0
55534- 0 0 0 0 0 0 0 0 0 0 0 0
55535- 0 0 0 0 0 0 0 0 0 0 0 0
55536- 0 0 0 0 0 0 0 0 0 14 14 14
55537- 46 46 46 86 86 86 2 2 6 14 14 14
55538-134 134 134 198 198 198 195 195 195 116 116 116
55539- 10 10 10 2 2 6 2 2 6 6 6 6
55540-101 98 89 187 187 187 210 210 210 218 218 218
55541-214 214 214 134 134 134 14 14 14 6 6 6
55542- 2 2 6 2 2 6 2 2 6 2 2 6
55543- 86 86 86 50 50 50 18 18 18 6 6 6
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 0 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 1 0 0 0
55551- 0 0 1 0 0 1 0 0 1 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 0 0 0
55554- 0 0 0 0 0 0 0 0 0 0 0 0
55555- 0 0 0 0 0 0 0 0 0 0 0 0
55556- 0 0 0 0 0 0 0 0 0 14 14 14
55557- 46 46 46 86 86 86 2 2 6 54 54 54
55558-218 218 218 195 195 195 226 226 226 246 246 246
55559- 58 58 58 2 2 6 2 2 6 30 30 30
55560-210 210 210 253 253 253 174 174 174 123 123 123
55561-221 221 221 234 234 234 74 74 74 2 2 6
55562- 2 2 6 2 2 6 2 2 6 2 2 6
55563- 70 70 70 58 58 58 22 22 22 6 6 6
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 0 0 0 0 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 0 0 0
55574- 0 0 0 0 0 0 0 0 0 0 0 0
55575- 0 0 0 0 0 0 0 0 0 0 0 0
55576- 0 0 0 0 0 0 0 0 0 14 14 14
55577- 46 46 46 82 82 82 2 2 6 106 106 106
55578-170 170 170 26 26 26 86 86 86 226 226 226
55579-123 123 123 10 10 10 14 14 14 46 46 46
55580-231 231 231 190 190 190 6 6 6 70 70 70
55581- 90 90 90 238 238 238 158 158 158 2 2 6
55582- 2 2 6 2 2 6 2 2 6 2 2 6
55583- 70 70 70 58 58 58 22 22 22 6 6 6
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 0 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 1 0 0 0
55591- 0 0 1 0 0 1 0 0 1 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 0 0 0
55594- 0 0 0 0 0 0 0 0 0 0 0 0
55595- 0 0 0 0 0 0 0 0 0 0 0 0
55596- 0 0 0 0 0 0 0 0 0 14 14 14
55597- 42 42 42 86 86 86 6 6 6 116 116 116
55598-106 106 106 6 6 6 70 70 70 149 149 149
55599-128 128 128 18 18 18 38 38 38 54 54 54
55600-221 221 221 106 106 106 2 2 6 14 14 14
55601- 46 46 46 190 190 190 198 198 198 2 2 6
55602- 2 2 6 2 2 6 2 2 6 2 2 6
55603- 74 74 74 62 62 62 22 22 22 6 6 6
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 0 0 0 0 0 0 0 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 1 0 0 0
55611- 0 0 1 0 0 0 0 0 1 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 0 0 0
55614- 0 0 0 0 0 0 0 0 0 0 0 0
55615- 0 0 0 0 0 0 0 0 0 0 0 0
55616- 0 0 0 0 0 0 0 0 0 14 14 14
55617- 42 42 42 94 94 94 14 14 14 101 101 101
55618-128 128 128 2 2 6 18 18 18 116 116 116
55619-118 98 46 121 92 8 121 92 8 98 78 10
55620-162 162 162 106 106 106 2 2 6 2 2 6
55621- 2 2 6 195 195 195 195 195 195 6 6 6
55622- 2 2 6 2 2 6 2 2 6 2 2 6
55623- 74 74 74 62 62 62 22 22 22 6 6 6
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 1 0 0 1
55631- 0 0 1 0 0 0 0 0 1 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 0 0 0
55634- 0 0 0 0 0 0 0 0 0 0 0 0
55635- 0 0 0 0 0 0 0 0 0 0 0 0
55636- 0 0 0 0 0 0 0 0 0 10 10 10
55637- 38 38 38 90 90 90 14 14 14 58 58 58
55638-210 210 210 26 26 26 54 38 6 154 114 10
55639-226 170 11 236 186 11 225 175 15 184 144 12
55640-215 174 15 175 146 61 37 26 9 2 2 6
55641- 70 70 70 246 246 246 138 138 138 2 2 6
55642- 2 2 6 2 2 6 2 2 6 2 2 6
55643- 70 70 70 66 66 66 26 26 26 6 6 6
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 0 0 0 0
55648- 0 0 0 0 0 0 0 0 0 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 0 0 0
55654- 0 0 0 0 0 0 0 0 0 0 0 0
55655- 0 0 0 0 0 0 0 0 0 0 0 0
55656- 0 0 0 0 0 0 0 0 0 10 10 10
55657- 38 38 38 86 86 86 14 14 14 10 10 10
55658-195 195 195 188 164 115 192 133 9 225 175 15
55659-239 182 13 234 190 10 232 195 16 232 200 30
55660-245 207 45 241 208 19 232 195 16 184 144 12
55661-218 194 134 211 206 186 42 42 42 2 2 6
55662- 2 2 6 2 2 6 2 2 6 2 2 6
55663- 50 50 50 74 74 74 30 30 30 6 6 6
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 0 0 0
55674- 0 0 0 0 0 0 0 0 0 0 0 0
55675- 0 0 0 0 0 0 0 0 0 0 0 0
55676- 0 0 0 0 0 0 0 0 0 10 10 10
55677- 34 34 34 86 86 86 14 14 14 2 2 6
55678-121 87 25 192 133 9 219 162 10 239 182 13
55679-236 186 11 232 195 16 241 208 19 244 214 54
55680-246 218 60 246 218 38 246 215 20 241 208 19
55681-241 208 19 226 184 13 121 87 25 2 2 6
55682- 2 2 6 2 2 6 2 2 6 2 2 6
55683- 50 50 50 82 82 82 34 34 34 10 10 10
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 0 0 0 0
55688- 0 0 0 0 0 0 0 0 0 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 0 0 0
55694- 0 0 0 0 0 0 0 0 0 0 0 0
55695- 0 0 0 0 0 0 0 0 0 0 0 0
55696- 0 0 0 0 0 0 0 0 0 10 10 10
55697- 34 34 34 82 82 82 30 30 30 61 42 6
55698-180 123 7 206 145 10 230 174 11 239 182 13
55699-234 190 10 238 202 15 241 208 19 246 218 74
55700-246 218 38 246 215 20 246 215 20 246 215 20
55701-226 184 13 215 174 15 184 144 12 6 6 6
55702- 2 2 6 2 2 6 2 2 6 2 2 6
55703- 26 26 26 94 94 94 42 42 42 14 14 14
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 0 0 0 0
55708- 0 0 0 0 0 0 0 0 0 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 0 0 0
55714- 0 0 0 0 0 0 0 0 0 0 0 0
55715- 0 0 0 0 0 0 0 0 0 0 0 0
55716- 0 0 0 0 0 0 0 0 0 10 10 10
55717- 30 30 30 78 78 78 50 50 50 104 69 6
55718-192 133 9 216 158 10 236 178 12 236 186 11
55719-232 195 16 241 208 19 244 214 54 245 215 43
55720-246 215 20 246 215 20 241 208 19 198 155 10
55721-200 144 11 216 158 10 156 118 10 2 2 6
55722- 2 2 6 2 2 6 2 2 6 2 2 6
55723- 6 6 6 90 90 90 54 54 54 18 18 18
55724- 6 6 6 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 0 0 0 0
55728- 0 0 0 0 0 0 0 0 0 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 0 0 0
55734- 0 0 0 0 0 0 0 0 0 0 0 0
55735- 0 0 0 0 0 0 0 0 0 0 0 0
55736- 0 0 0 0 0 0 0 0 0 10 10 10
55737- 30 30 30 78 78 78 46 46 46 22 22 22
55738-137 92 6 210 162 10 239 182 13 238 190 10
55739-238 202 15 241 208 19 246 215 20 246 215 20
55740-241 208 19 203 166 17 185 133 11 210 150 10
55741-216 158 10 210 150 10 102 78 10 2 2 6
55742- 6 6 6 54 54 54 14 14 14 2 2 6
55743- 2 2 6 62 62 62 74 74 74 30 30 30
55744- 10 10 10 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 0 0 0
55754- 0 0 0 0 0 0 0 0 0 0 0 0
55755- 0 0 0 0 0 0 0 0 0 0 0 0
55756- 0 0 0 0 0 0 0 0 0 10 10 10
55757- 34 34 34 78 78 78 50 50 50 6 6 6
55758- 94 70 30 139 102 15 190 146 13 226 184 13
55759-232 200 30 232 195 16 215 174 15 190 146 13
55760-168 122 10 192 133 9 210 150 10 213 154 11
55761-202 150 34 182 157 106 101 98 89 2 2 6
55762- 2 2 6 78 78 78 116 116 116 58 58 58
55763- 2 2 6 22 22 22 90 90 90 46 46 46
55764- 18 18 18 6 6 6 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 0 0 0
55774- 0 0 0 0 0 0 0 0 0 0 0 0
55775- 0 0 0 0 0 0 0 0 0 0 0 0
55776- 0 0 0 0 0 0 0 0 0 10 10 10
55777- 38 38 38 86 86 86 50 50 50 6 6 6
55778-128 128 128 174 154 114 156 107 11 168 122 10
55779-198 155 10 184 144 12 197 138 11 200 144 11
55780-206 145 10 206 145 10 197 138 11 188 164 115
55781-195 195 195 198 198 198 174 174 174 14 14 14
55782- 2 2 6 22 22 22 116 116 116 116 116 116
55783- 22 22 22 2 2 6 74 74 74 70 70 70
55784- 30 30 30 10 10 10 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 0 0 0
55794- 0 0 0 0 0 0 0 0 0 0 0 0
55795- 0 0 0 0 0 0 0 0 0 0 0 0
55796- 0 0 0 0 0 0 6 6 6 18 18 18
55797- 50 50 50 101 101 101 26 26 26 10 10 10
55798-138 138 138 190 190 190 174 154 114 156 107 11
55799-197 138 11 200 144 11 197 138 11 192 133 9
55800-180 123 7 190 142 34 190 178 144 187 187 187
55801-202 202 202 221 221 221 214 214 214 66 66 66
55802- 2 2 6 2 2 6 50 50 50 62 62 62
55803- 6 6 6 2 2 6 10 10 10 90 90 90
55804- 50 50 50 18 18 18 6 6 6 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 0 0 0
55814- 0 0 0 0 0 0 0 0 0 0 0 0
55815- 0 0 0 0 0 0 0 0 0 0 0 0
55816- 0 0 0 0 0 0 10 10 10 34 34 34
55817- 74 74 74 74 74 74 2 2 6 6 6 6
55818-144 144 144 198 198 198 190 190 190 178 166 146
55819-154 121 60 156 107 11 156 107 11 168 124 44
55820-174 154 114 187 187 187 190 190 190 210 210 210
55821-246 246 246 253 253 253 253 253 253 182 182 182
55822- 6 6 6 2 2 6 2 2 6 2 2 6
55823- 2 2 6 2 2 6 2 2 6 62 62 62
55824- 74 74 74 34 34 34 14 14 14 0 0 0
55825- 0 0 0 0 0 0 0 0 0 0 0 0
55826- 0 0 0 0 0 0 0 0 0 0 0 0
55827- 0 0 0 0 0 0 0 0 0 0 0 0
55828- 0 0 0 0 0 0 0 0 0 0 0 0
55829- 0 0 0 0 0 0 0 0 0 0 0 0
55830- 0 0 0 0 0 0 0 0 0 0 0 0
55831- 0 0 0 0 0 0 0 0 0 0 0 0
55832- 0 0 0 0 0 0 0 0 0 0 0 0
55833- 0 0 0 0 0 0 0 0 0 0 0 0
55834- 0 0 0 0 0 0 0 0 0 0 0 0
55835- 0 0 0 0 0 0 0 0 0 0 0 0
55836- 0 0 0 10 10 10 22 22 22 54 54 54
55837- 94 94 94 18 18 18 2 2 6 46 46 46
55838-234 234 234 221 221 221 190 190 190 190 190 190
55839-190 190 190 187 187 187 187 187 187 190 190 190
55840-190 190 190 195 195 195 214 214 214 242 242 242
55841-253 253 253 253 253 253 253 253 253 253 253 253
55842- 82 82 82 2 2 6 2 2 6 2 2 6
55843- 2 2 6 2 2 6 2 2 6 14 14 14
55844- 86 86 86 54 54 54 22 22 22 6 6 6
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 0 0 0
55854- 0 0 0 0 0 0 0 0 0 0 0 0
55855- 0 0 0 0 0 0 0 0 0 0 0 0
55856- 6 6 6 18 18 18 46 46 46 90 90 90
55857- 46 46 46 18 18 18 6 6 6 182 182 182
55858-253 253 253 246 246 246 206 206 206 190 190 190
55859-190 190 190 190 190 190 190 190 190 190 190 190
55860-206 206 206 231 231 231 250 250 250 253 253 253
55861-253 253 253 253 253 253 253 253 253 253 253 253
55862-202 202 202 14 14 14 2 2 6 2 2 6
55863- 2 2 6 2 2 6 2 2 6 2 2 6
55864- 42 42 42 86 86 86 42 42 42 18 18 18
55865- 6 6 6 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 0 0 0
55874- 0 0 0 0 0 0 0 0 0 0 0 0
55875- 0 0 0 0 0 0 0 0 0 6 6 6
55876- 14 14 14 38 38 38 74 74 74 66 66 66
55877- 2 2 6 6 6 6 90 90 90 250 250 250
55878-253 253 253 253 253 253 238 238 238 198 198 198
55879-190 190 190 190 190 190 195 195 195 221 221 221
55880-246 246 246 253 253 253 253 253 253 253 253 253
55881-253 253 253 253 253 253 253 253 253 253 253 253
55882-253 253 253 82 82 82 2 2 6 2 2 6
55883- 2 2 6 2 2 6 2 2 6 2 2 6
55884- 2 2 6 78 78 78 70 70 70 34 34 34
55885- 14 14 14 6 6 6 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 0 0 0 0 0 0
55894- 0 0 0 0 0 0 0 0 0 0 0 0
55895- 0 0 0 0 0 0 0 0 0 14 14 14
55896- 34 34 34 66 66 66 78 78 78 6 6 6
55897- 2 2 6 18 18 18 218 218 218 253 253 253
55898-253 253 253 253 253 253 253 253 253 246 246 246
55899-226 226 226 231 231 231 246 246 246 253 253 253
55900-253 253 253 253 253 253 253 253 253 253 253 253
55901-253 253 253 253 253 253 253 253 253 253 253 253
55902-253 253 253 178 178 178 2 2 6 2 2 6
55903- 2 2 6 2 2 6 2 2 6 2 2 6
55904- 2 2 6 18 18 18 90 90 90 62 62 62
55905- 30 30 30 10 10 10 0 0 0 0 0 0
55906- 0 0 0 0 0 0 0 0 0 0 0 0
55907- 0 0 0 0 0 0 0 0 0 0 0 0
55908- 0 0 0 0 0 0 0 0 0 0 0 0
55909- 0 0 0 0 0 0 0 0 0 0 0 0
55910- 0 0 0 0 0 0 0 0 0 0 0 0
55911- 0 0 0 0 0 0 0 0 0 0 0 0
55912- 0 0 0 0 0 0 0 0 0 0 0 0
55913- 0 0 0 0 0 0 0 0 0 0 0 0
55914- 0 0 0 0 0 0 0 0 0 0 0 0
55915- 0 0 0 0 0 0 10 10 10 26 26 26
55916- 58 58 58 90 90 90 18 18 18 2 2 6
55917- 2 2 6 110 110 110 253 253 253 253 253 253
55918-253 253 253 253 253 253 253 253 253 253 253 253
55919-250 250 250 253 253 253 253 253 253 253 253 253
55920-253 253 253 253 253 253 253 253 253 253 253 253
55921-253 253 253 253 253 253 253 253 253 253 253 253
55922-253 253 253 231 231 231 18 18 18 2 2 6
55923- 2 2 6 2 2 6 2 2 6 2 2 6
55924- 2 2 6 2 2 6 18 18 18 94 94 94
55925- 54 54 54 26 26 26 10 10 10 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 0 0 0 0 0 0 0 0 0
55934- 0 0 0 0 0 0 0 0 0 0 0 0
55935- 0 0 0 6 6 6 22 22 22 50 50 50
55936- 90 90 90 26 26 26 2 2 6 2 2 6
55937- 14 14 14 195 195 195 250 250 250 253 253 253
55938-253 253 253 253 253 253 253 253 253 253 253 253
55939-253 253 253 253 253 253 253 253 253 253 253 253
55940-253 253 253 253 253 253 253 253 253 253 253 253
55941-253 253 253 253 253 253 253 253 253 253 253 253
55942-250 250 250 242 242 242 54 54 54 2 2 6
55943- 2 2 6 2 2 6 2 2 6 2 2 6
55944- 2 2 6 2 2 6 2 2 6 38 38 38
55945- 86 86 86 50 50 50 22 22 22 6 6 6
55946- 0 0 0 0 0 0 0 0 0 0 0 0
55947- 0 0 0 0 0 0 0 0 0 0 0 0
55948- 0 0 0 0 0 0 0 0 0 0 0 0
55949- 0 0 0 0 0 0 0 0 0 0 0 0
55950- 0 0 0 0 0 0 0 0 0 0 0 0
55951- 0 0 0 0 0 0 0 0 0 0 0 0
55952- 0 0 0 0 0 0 0 0 0 0 0 0
55953- 0 0 0 0 0 0 0 0 0 0 0 0
55954- 0 0 0 0 0 0 0 0 0 0 0 0
55955- 6 6 6 14 14 14 38 38 38 82 82 82
55956- 34 34 34 2 2 6 2 2 6 2 2 6
55957- 42 42 42 195 195 195 246 246 246 253 253 253
55958-253 253 253 253 253 253 253 253 253 250 250 250
55959-242 242 242 242 242 242 250 250 250 253 253 253
55960-253 253 253 253 253 253 253 253 253 253 253 253
55961-253 253 253 250 250 250 246 246 246 238 238 238
55962-226 226 226 231 231 231 101 101 101 6 6 6
55963- 2 2 6 2 2 6 2 2 6 2 2 6
55964- 2 2 6 2 2 6 2 2 6 2 2 6
55965- 38 38 38 82 82 82 42 42 42 14 14 14
55966- 6 6 6 0 0 0 0 0 0 0 0 0
55967- 0 0 0 0 0 0 0 0 0 0 0 0
55968- 0 0 0 0 0 0 0 0 0 0 0 0
55969- 0 0 0 0 0 0 0 0 0 0 0 0
55970- 0 0 0 0 0 0 0 0 0 0 0 0
55971- 0 0 0 0 0 0 0 0 0 0 0 0
55972- 0 0 0 0 0 0 0 0 0 0 0 0
55973- 0 0 0 0 0 0 0 0 0 0 0 0
55974- 0 0 0 0 0 0 0 0 0 0 0 0
55975- 10 10 10 26 26 26 62 62 62 66 66 66
55976- 2 2 6 2 2 6 2 2 6 6 6 6
55977- 70 70 70 170 170 170 206 206 206 234 234 234
55978-246 246 246 250 250 250 250 250 250 238 238 238
55979-226 226 226 231 231 231 238 238 238 250 250 250
55980-250 250 250 250 250 250 246 246 246 231 231 231
55981-214 214 214 206 206 206 202 202 202 202 202 202
55982-198 198 198 202 202 202 182 182 182 18 18 18
55983- 2 2 6 2 2 6 2 2 6 2 2 6
55984- 2 2 6 2 2 6 2 2 6 2 2 6
55985- 2 2 6 62 62 62 66 66 66 30 30 30
55986- 10 10 10 0 0 0 0 0 0 0 0 0
55987- 0 0 0 0 0 0 0 0 0 0 0 0
55988- 0 0 0 0 0 0 0 0 0 0 0 0
55989- 0 0 0 0 0 0 0 0 0 0 0 0
55990- 0 0 0 0 0 0 0 0 0 0 0 0
55991- 0 0 0 0 0 0 0 0 0 0 0 0
55992- 0 0 0 0 0 0 0 0 0 0 0 0
55993- 0 0 0 0 0 0 0 0 0 0 0 0
55994- 0 0 0 0 0 0 0 0 0 0 0 0
55995- 14 14 14 42 42 42 82 82 82 18 18 18
55996- 2 2 6 2 2 6 2 2 6 10 10 10
55997- 94 94 94 182 182 182 218 218 218 242 242 242
55998-250 250 250 253 253 253 253 253 253 250 250 250
55999-234 234 234 253 253 253 253 253 253 253 253 253
56000-253 253 253 253 253 253 253 253 253 246 246 246
56001-238 238 238 226 226 226 210 210 210 202 202 202
56002-195 195 195 195 195 195 210 210 210 158 158 158
56003- 6 6 6 14 14 14 50 50 50 14 14 14
56004- 2 2 6 2 2 6 2 2 6 2 2 6
56005- 2 2 6 6 6 6 86 86 86 46 46 46
56006- 18 18 18 6 6 6 0 0 0 0 0 0
56007- 0 0 0 0 0 0 0 0 0 0 0 0
56008- 0 0 0 0 0 0 0 0 0 0 0 0
56009- 0 0 0 0 0 0 0 0 0 0 0 0
56010- 0 0 0 0 0 0 0 0 0 0 0 0
56011- 0 0 0 0 0 0 0 0 0 0 0 0
56012- 0 0 0 0 0 0 0 0 0 0 0 0
56013- 0 0 0 0 0 0 0 0 0 0 0 0
56014- 0 0 0 0 0 0 0 0 0 6 6 6
56015- 22 22 22 54 54 54 70 70 70 2 2 6
56016- 2 2 6 10 10 10 2 2 6 22 22 22
56017-166 166 166 231 231 231 250 250 250 253 253 253
56018-253 253 253 253 253 253 253 253 253 250 250 250
56019-242 242 242 253 253 253 253 253 253 253 253 253
56020-253 253 253 253 253 253 253 253 253 253 253 253
56021-253 253 253 253 253 253 253 253 253 246 246 246
56022-231 231 231 206 206 206 198 198 198 226 226 226
56023- 94 94 94 2 2 6 6 6 6 38 38 38
56024- 30 30 30 2 2 6 2 2 6 2 2 6
56025- 2 2 6 2 2 6 62 62 62 66 66 66
56026- 26 26 26 10 10 10 0 0 0 0 0 0
56027- 0 0 0 0 0 0 0 0 0 0 0 0
56028- 0 0 0 0 0 0 0 0 0 0 0 0
56029- 0 0 0 0 0 0 0 0 0 0 0 0
56030- 0 0 0 0 0 0 0 0 0 0 0 0
56031- 0 0 0 0 0 0 0 0 0 0 0 0
56032- 0 0 0 0 0 0 0 0 0 0 0 0
56033- 0 0 0 0 0 0 0 0 0 0 0 0
56034- 0 0 0 0 0 0 0 0 0 10 10 10
56035- 30 30 30 74 74 74 50 50 50 2 2 6
56036- 26 26 26 26 26 26 2 2 6 106 106 106
56037-238 238 238 253 253 253 253 253 253 253 253 253
56038-253 253 253 253 253 253 253 253 253 253 253 253
56039-253 253 253 253 253 253 253 253 253 253 253 253
56040-253 253 253 253 253 253 253 253 253 253 253 253
56041-253 253 253 253 253 253 253 253 253 253 253 253
56042-253 253 253 246 246 246 218 218 218 202 202 202
56043-210 210 210 14 14 14 2 2 6 2 2 6
56044- 30 30 30 22 22 22 2 2 6 2 2 6
56045- 2 2 6 2 2 6 18 18 18 86 86 86
56046- 42 42 42 14 14 14 0 0 0 0 0 0
56047- 0 0 0 0 0 0 0 0 0 0 0 0
56048- 0 0 0 0 0 0 0 0 0 0 0 0
56049- 0 0 0 0 0 0 0 0 0 0 0 0
56050- 0 0 0 0 0 0 0 0 0 0 0 0
56051- 0 0 0 0 0 0 0 0 0 0 0 0
56052- 0 0 0 0 0 0 0 0 0 0 0 0
56053- 0 0 0 0 0 0 0 0 0 0 0 0
56054- 0 0 0 0 0 0 0 0 0 14 14 14
56055- 42 42 42 90 90 90 22 22 22 2 2 6
56056- 42 42 42 2 2 6 18 18 18 218 218 218
56057-253 253 253 253 253 253 253 253 253 253 253 253
56058-253 253 253 253 253 253 253 253 253 253 253 253
56059-253 253 253 253 253 253 253 253 253 253 253 253
56060-253 253 253 253 253 253 253 253 253 253 253 253
56061-253 253 253 253 253 253 253 253 253 253 253 253
56062-253 253 253 253 253 253 250 250 250 221 221 221
56063-218 218 218 101 101 101 2 2 6 14 14 14
56064- 18 18 18 38 38 38 10 10 10 2 2 6
56065- 2 2 6 2 2 6 2 2 6 78 78 78
56066- 58 58 58 22 22 22 6 6 6 0 0 0
56067- 0 0 0 0 0 0 0 0 0 0 0 0
56068- 0 0 0 0 0 0 0 0 0 0 0 0
56069- 0 0 0 0 0 0 0 0 0 0 0 0
56070- 0 0 0 0 0 0 0 0 0 0 0 0
56071- 0 0 0 0 0 0 0 0 0 0 0 0
56072- 0 0 0 0 0 0 0 0 0 0 0 0
56073- 0 0 0 0 0 0 0 0 0 0 0 0
56074- 0 0 0 0 0 0 6 6 6 18 18 18
56075- 54 54 54 82 82 82 2 2 6 26 26 26
56076- 22 22 22 2 2 6 123 123 123 253 253 253
56077-253 253 253 253 253 253 253 253 253 253 253 253
56078-253 253 253 253 253 253 253 253 253 253 253 253
56079-253 253 253 253 253 253 253 253 253 253 253 253
56080-253 253 253 253 253 253 253 253 253 253 253 253
56081-253 253 253 253 253 253 253 253 253 253 253 253
56082-253 253 253 253 253 253 253 253 253 250 250 250
56083-238 238 238 198 198 198 6 6 6 38 38 38
56084- 58 58 58 26 26 26 38 38 38 2 2 6
56085- 2 2 6 2 2 6 2 2 6 46 46 46
56086- 78 78 78 30 30 30 10 10 10 0 0 0
56087- 0 0 0 0 0 0 0 0 0 0 0 0
56088- 0 0 0 0 0 0 0 0 0 0 0 0
56089- 0 0 0 0 0 0 0 0 0 0 0 0
56090- 0 0 0 0 0 0 0 0 0 0 0 0
56091- 0 0 0 0 0 0 0 0 0 0 0 0
56092- 0 0 0 0 0 0 0 0 0 0 0 0
56093- 0 0 0 0 0 0 0 0 0 0 0 0
56094- 0 0 0 0 0 0 10 10 10 30 30 30
56095- 74 74 74 58 58 58 2 2 6 42 42 42
56096- 2 2 6 22 22 22 231 231 231 253 253 253
56097-253 253 253 253 253 253 253 253 253 253 253 253
56098-253 253 253 253 253 253 253 253 253 250 250 250
56099-253 253 253 253 253 253 253 253 253 253 253 253
56100-253 253 253 253 253 253 253 253 253 253 253 253
56101-253 253 253 253 253 253 253 253 253 253 253 253
56102-253 253 253 253 253 253 253 253 253 253 253 253
56103-253 253 253 246 246 246 46 46 46 38 38 38
56104- 42 42 42 14 14 14 38 38 38 14 14 14
56105- 2 2 6 2 2 6 2 2 6 6 6 6
56106- 86 86 86 46 46 46 14 14 14 0 0 0
56107- 0 0 0 0 0 0 0 0 0 0 0 0
56108- 0 0 0 0 0 0 0 0 0 0 0 0
56109- 0 0 0 0 0 0 0 0 0 0 0 0
56110- 0 0 0 0 0 0 0 0 0 0 0 0
56111- 0 0 0 0 0 0 0 0 0 0 0 0
56112- 0 0 0 0 0 0 0 0 0 0 0 0
56113- 0 0 0 0 0 0 0 0 0 0 0 0
56114- 0 0 0 6 6 6 14 14 14 42 42 42
56115- 90 90 90 18 18 18 18 18 18 26 26 26
56116- 2 2 6 116 116 116 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 250 250 250 238 238 238
56119-253 253 253 253 253 253 253 253 253 253 253 253
56120-253 253 253 253 253 253 253 253 253 253 253 253
56121-253 253 253 253 253 253 253 253 253 253 253 253
56122-253 253 253 253 253 253 253 253 253 253 253 253
56123-253 253 253 253 253 253 94 94 94 6 6 6
56124- 2 2 6 2 2 6 10 10 10 34 34 34
56125- 2 2 6 2 2 6 2 2 6 2 2 6
56126- 74 74 74 58 58 58 22 22 22 6 6 6
56127- 0 0 0 0 0 0 0 0 0 0 0 0
56128- 0 0 0 0 0 0 0 0 0 0 0 0
56129- 0 0 0 0 0 0 0 0 0 0 0 0
56130- 0 0 0 0 0 0 0 0 0 0 0 0
56131- 0 0 0 0 0 0 0 0 0 0 0 0
56132- 0 0 0 0 0 0 0 0 0 0 0 0
56133- 0 0 0 0 0 0 0 0 0 0 0 0
56134- 0 0 0 10 10 10 26 26 26 66 66 66
56135- 82 82 82 2 2 6 38 38 38 6 6 6
56136- 14 14 14 210 210 210 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 246 246 246 242 242 242
56139-253 253 253 253 253 253 253 253 253 253 253 253
56140-253 253 253 253 253 253 253 253 253 253 253 253
56141-253 253 253 253 253 253 253 253 253 253 253 253
56142-253 253 253 253 253 253 253 253 253 253 253 253
56143-253 253 253 253 253 253 144 144 144 2 2 6
56144- 2 2 6 2 2 6 2 2 6 46 46 46
56145- 2 2 6 2 2 6 2 2 6 2 2 6
56146- 42 42 42 74 74 74 30 30 30 10 10 10
56147- 0 0 0 0 0 0 0 0 0 0 0 0
56148- 0 0 0 0 0 0 0 0 0 0 0 0
56149- 0 0 0 0 0 0 0 0 0 0 0 0
56150- 0 0 0 0 0 0 0 0 0 0 0 0
56151- 0 0 0 0 0 0 0 0 0 0 0 0
56152- 0 0 0 0 0 0 0 0 0 0 0 0
56153- 0 0 0 0 0 0 0 0 0 0 0 0
56154- 6 6 6 14 14 14 42 42 42 90 90 90
56155- 26 26 26 6 6 6 42 42 42 2 2 6
56156- 74 74 74 250 250 250 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 242 242 242 242 242 242
56159-253 253 253 253 253 253 253 253 253 253 253 253
56160-253 253 253 253 253 253 253 253 253 253 253 253
56161-253 253 253 253 253 253 253 253 253 253 253 253
56162-253 253 253 253 253 253 253 253 253 253 253 253
56163-253 253 253 253 253 253 182 182 182 2 2 6
56164- 2 2 6 2 2 6 2 2 6 46 46 46
56165- 2 2 6 2 2 6 2 2 6 2 2 6
56166- 10 10 10 86 86 86 38 38 38 10 10 10
56167- 0 0 0 0 0 0 0 0 0 0 0 0
56168- 0 0 0 0 0 0 0 0 0 0 0 0
56169- 0 0 0 0 0 0 0 0 0 0 0 0
56170- 0 0 0 0 0 0 0 0 0 0 0 0
56171- 0 0 0 0 0 0 0 0 0 0 0 0
56172- 0 0 0 0 0 0 0 0 0 0 0 0
56173- 0 0 0 0 0 0 0 0 0 0 0 0
56174- 10 10 10 26 26 26 66 66 66 82 82 82
56175- 2 2 6 22 22 22 18 18 18 2 2 6
56176-149 149 149 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 234 234 234 242 242 242
56179-253 253 253 253 253 253 253 253 253 253 253 253
56180-253 253 253 253 253 253 253 253 253 253 253 253
56181-253 253 253 253 253 253 253 253 253 253 253 253
56182-253 253 253 253 253 253 253 253 253 253 253 253
56183-253 253 253 253 253 253 206 206 206 2 2 6
56184- 2 2 6 2 2 6 2 2 6 38 38 38
56185- 2 2 6 2 2 6 2 2 6 2 2 6
56186- 6 6 6 86 86 86 46 46 46 14 14 14
56187- 0 0 0 0 0 0 0 0 0 0 0 0
56188- 0 0 0 0 0 0 0 0 0 0 0 0
56189- 0 0 0 0 0 0 0 0 0 0 0 0
56190- 0 0 0 0 0 0 0 0 0 0 0 0
56191- 0 0 0 0 0 0 0 0 0 0 0 0
56192- 0 0 0 0 0 0 0 0 0 0 0 0
56193- 0 0 0 0 0 0 0 0 0 6 6 6
56194- 18 18 18 46 46 46 86 86 86 18 18 18
56195- 2 2 6 34 34 34 10 10 10 6 6 6
56196-210 210 210 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 234 234 234 242 242 242
56199-253 253 253 253 253 253 253 253 253 253 253 253
56200-253 253 253 253 253 253 253 253 253 253 253 253
56201-253 253 253 253 253 253 253 253 253 253 253 253
56202-253 253 253 253 253 253 253 253 253 253 253 253
56203-253 253 253 253 253 253 221 221 221 6 6 6
56204- 2 2 6 2 2 6 6 6 6 30 30 30
56205- 2 2 6 2 2 6 2 2 6 2 2 6
56206- 2 2 6 82 82 82 54 54 54 18 18 18
56207- 6 6 6 0 0 0 0 0 0 0 0 0
56208- 0 0 0 0 0 0 0 0 0 0 0 0
56209- 0 0 0 0 0 0 0 0 0 0 0 0
56210- 0 0 0 0 0 0 0 0 0 0 0 0
56211- 0 0 0 0 0 0 0 0 0 0 0 0
56212- 0 0 0 0 0 0 0 0 0 0 0 0
56213- 0 0 0 0 0 0 0 0 0 10 10 10
56214- 26 26 26 66 66 66 62 62 62 2 2 6
56215- 2 2 6 38 38 38 10 10 10 26 26 26
56216-238 238 238 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 231 231 231 238 238 238
56219-253 253 253 253 253 253 253 253 253 253 253 253
56220-253 253 253 253 253 253 253 253 253 253 253 253
56221-253 253 253 253 253 253 253 253 253 253 253 253
56222-253 253 253 253 253 253 253 253 253 253 253 253
56223-253 253 253 253 253 253 231 231 231 6 6 6
56224- 2 2 6 2 2 6 10 10 10 30 30 30
56225- 2 2 6 2 2 6 2 2 6 2 2 6
56226- 2 2 6 66 66 66 58 58 58 22 22 22
56227- 6 6 6 0 0 0 0 0 0 0 0 0
56228- 0 0 0 0 0 0 0 0 0 0 0 0
56229- 0 0 0 0 0 0 0 0 0 0 0 0
56230- 0 0 0 0 0 0 0 0 0 0 0 0
56231- 0 0 0 0 0 0 0 0 0 0 0 0
56232- 0 0 0 0 0 0 0 0 0 0 0 0
56233- 0 0 0 0 0 0 0 0 0 10 10 10
56234- 38 38 38 78 78 78 6 6 6 2 2 6
56235- 2 2 6 46 46 46 14 14 14 42 42 42
56236-246 246 246 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 231 231 231 242 242 242
56239-253 253 253 253 253 253 253 253 253 253 253 253
56240-253 253 253 253 253 253 253 253 253 253 253 253
56241-253 253 253 253 253 253 253 253 253 253 253 253
56242-253 253 253 253 253 253 253 253 253 253 253 253
56243-253 253 253 253 253 253 234 234 234 10 10 10
56244- 2 2 6 2 2 6 22 22 22 14 14 14
56245- 2 2 6 2 2 6 2 2 6 2 2 6
56246- 2 2 6 66 66 66 62 62 62 22 22 22
56247- 6 6 6 0 0 0 0 0 0 0 0 0
56248- 0 0 0 0 0 0 0 0 0 0 0 0
56249- 0 0 0 0 0 0 0 0 0 0 0 0
56250- 0 0 0 0 0 0 0 0 0 0 0 0
56251- 0 0 0 0 0 0 0 0 0 0 0 0
56252- 0 0 0 0 0 0 0 0 0 0 0 0
56253- 0 0 0 0 0 0 6 6 6 18 18 18
56254- 50 50 50 74 74 74 2 2 6 2 2 6
56255- 14 14 14 70 70 70 34 34 34 62 62 62
56256-250 250 250 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 231 231 231 246 246 246
56259-253 253 253 253 253 253 253 253 253 253 253 253
56260-253 253 253 253 253 253 253 253 253 253 253 253
56261-253 253 253 253 253 253 253 253 253 253 253 253
56262-253 253 253 253 253 253 253 253 253 253 253 253
56263-253 253 253 253 253 253 234 234 234 14 14 14
56264- 2 2 6 2 2 6 30 30 30 2 2 6
56265- 2 2 6 2 2 6 2 2 6 2 2 6
56266- 2 2 6 66 66 66 62 62 62 22 22 22
56267- 6 6 6 0 0 0 0 0 0 0 0 0
56268- 0 0 0 0 0 0 0 0 0 0 0 0
56269- 0 0 0 0 0 0 0 0 0 0 0 0
56270- 0 0 0 0 0 0 0 0 0 0 0 0
56271- 0 0 0 0 0 0 0 0 0 0 0 0
56272- 0 0 0 0 0 0 0 0 0 0 0 0
56273- 0 0 0 0 0 0 6 6 6 18 18 18
56274- 54 54 54 62 62 62 2 2 6 2 2 6
56275- 2 2 6 30 30 30 46 46 46 70 70 70
56276-250 250 250 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 231 231 231 246 246 246
56279-253 253 253 253 253 253 253 253 253 253 253 253
56280-253 253 253 253 253 253 253 253 253 253 253 253
56281-253 253 253 253 253 253 253 253 253 253 253 253
56282-253 253 253 253 253 253 253 253 253 253 253 253
56283-253 253 253 253 253 253 226 226 226 10 10 10
56284- 2 2 6 6 6 6 30 30 30 2 2 6
56285- 2 2 6 2 2 6 2 2 6 2 2 6
56286- 2 2 6 66 66 66 58 58 58 22 22 22
56287- 6 6 6 0 0 0 0 0 0 0 0 0
56288- 0 0 0 0 0 0 0 0 0 0 0 0
56289- 0 0 0 0 0 0 0 0 0 0 0 0
56290- 0 0 0 0 0 0 0 0 0 0 0 0
56291- 0 0 0 0 0 0 0 0 0 0 0 0
56292- 0 0 0 0 0 0 0 0 0 0 0 0
56293- 0 0 0 0 0 0 6 6 6 22 22 22
56294- 58 58 58 62 62 62 2 2 6 2 2 6
56295- 2 2 6 2 2 6 30 30 30 78 78 78
56296-250 250 250 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 231 231 231 246 246 246
56299-253 253 253 253 253 253 253 253 253 253 253 253
56300-253 253 253 253 253 253 253 253 253 253 253 253
56301-253 253 253 253 253 253 253 253 253 253 253 253
56302-253 253 253 253 253 253 253 253 253 253 253 253
56303-253 253 253 253 253 253 206 206 206 2 2 6
56304- 22 22 22 34 34 34 18 14 6 22 22 22
56305- 26 26 26 18 18 18 6 6 6 2 2 6
56306- 2 2 6 82 82 82 54 54 54 18 18 18
56307- 6 6 6 0 0 0 0 0 0 0 0 0
56308- 0 0 0 0 0 0 0 0 0 0 0 0
56309- 0 0 0 0 0 0 0 0 0 0 0 0
56310- 0 0 0 0 0 0 0 0 0 0 0 0
56311- 0 0 0 0 0 0 0 0 0 0 0 0
56312- 0 0 0 0 0 0 0 0 0 0 0 0
56313- 0 0 0 0 0 0 6 6 6 26 26 26
56314- 62 62 62 106 106 106 74 54 14 185 133 11
56315-210 162 10 121 92 8 6 6 6 62 62 62
56316-238 238 238 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 231 231 231 246 246 246
56319-253 253 253 253 253 253 253 253 253 253 253 253
56320-253 253 253 253 253 253 253 253 253 253 253 253
56321-253 253 253 253 253 253 253 253 253 253 253 253
56322-253 253 253 253 253 253 253 253 253 253 253 253
56323-253 253 253 253 253 253 158 158 158 18 18 18
56324- 14 14 14 2 2 6 2 2 6 2 2 6
56325- 6 6 6 18 18 18 66 66 66 38 38 38
56326- 6 6 6 94 94 94 50 50 50 18 18 18
56327- 6 6 6 0 0 0 0 0 0 0 0 0
56328- 0 0 0 0 0 0 0 0 0 0 0 0
56329- 0 0 0 0 0 0 0 0 0 0 0 0
56330- 0 0 0 0 0 0 0 0 0 0 0 0
56331- 0 0 0 0 0 0 0 0 0 0 0 0
56332- 0 0 0 0 0 0 0 0 0 6 6 6
56333- 10 10 10 10 10 10 18 18 18 38 38 38
56334- 78 78 78 142 134 106 216 158 10 242 186 14
56335-246 190 14 246 190 14 156 118 10 10 10 10
56336- 90 90 90 238 238 238 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 231 231 231 250 250 250
56339-253 253 253 253 253 253 253 253 253 253 253 253
56340-253 253 253 253 253 253 253 253 253 253 253 253
56341-253 253 253 253 253 253 253 253 253 253 253 253
56342-253 253 253 253 253 253 253 253 253 246 230 190
56343-238 204 91 238 204 91 181 142 44 37 26 9
56344- 2 2 6 2 2 6 2 2 6 2 2 6
56345- 2 2 6 2 2 6 38 38 38 46 46 46
56346- 26 26 26 106 106 106 54 54 54 18 18 18
56347- 6 6 6 0 0 0 0 0 0 0 0 0
56348- 0 0 0 0 0 0 0 0 0 0 0 0
56349- 0 0 0 0 0 0 0 0 0 0 0 0
56350- 0 0 0 0 0 0 0 0 0 0 0 0
56351- 0 0 0 0 0 0 0 0 0 0 0 0
56352- 0 0 0 6 6 6 14 14 14 22 22 22
56353- 30 30 30 38 38 38 50 50 50 70 70 70
56354-106 106 106 190 142 34 226 170 11 242 186 14
56355-246 190 14 246 190 14 246 190 14 154 114 10
56356- 6 6 6 74 74 74 226 226 226 253 253 253
56357-253 253 253 253 253 253 253 253 253 253 253 253
56358-253 253 253 253 253 253 231 231 231 250 250 250
56359-253 253 253 253 253 253 253 253 253 253 253 253
56360-253 253 253 253 253 253 253 253 253 253 253 253
56361-253 253 253 253 253 253 253 253 253 253 253 253
56362-253 253 253 253 253 253 253 253 253 228 184 62
56363-241 196 14 241 208 19 232 195 16 38 30 10
56364- 2 2 6 2 2 6 2 2 6 2 2 6
56365- 2 2 6 6 6 6 30 30 30 26 26 26
56366-203 166 17 154 142 90 66 66 66 26 26 26
56367- 6 6 6 0 0 0 0 0 0 0 0 0
56368- 0 0 0 0 0 0 0 0 0 0 0 0
56369- 0 0 0 0 0 0 0 0 0 0 0 0
56370- 0 0 0 0 0 0 0 0 0 0 0 0
56371- 0 0 0 0 0 0 0 0 0 0 0 0
56372- 6 6 6 18 18 18 38 38 38 58 58 58
56373- 78 78 78 86 86 86 101 101 101 123 123 123
56374-175 146 61 210 150 10 234 174 13 246 186 14
56375-246 190 14 246 190 14 246 190 14 238 190 10
56376-102 78 10 2 2 6 46 46 46 198 198 198
56377-253 253 253 253 253 253 253 253 253 253 253 253
56378-253 253 253 253 253 253 234 234 234 242 242 242
56379-253 253 253 253 253 253 253 253 253 253 253 253
56380-253 253 253 253 253 253 253 253 253 253 253 253
56381-253 253 253 253 253 253 253 253 253 253 253 253
56382-253 253 253 253 253 253 253 253 253 224 178 62
56383-242 186 14 241 196 14 210 166 10 22 18 6
56384- 2 2 6 2 2 6 2 2 6 2 2 6
56385- 2 2 6 2 2 6 6 6 6 121 92 8
56386-238 202 15 232 195 16 82 82 82 34 34 34
56387- 10 10 10 0 0 0 0 0 0 0 0 0
56388- 0 0 0 0 0 0 0 0 0 0 0 0
56389- 0 0 0 0 0 0 0 0 0 0 0 0
56390- 0 0 0 0 0 0 0 0 0 0 0 0
56391- 0 0 0 0 0 0 0 0 0 0 0 0
56392- 14 14 14 38 38 38 70 70 70 154 122 46
56393-190 142 34 200 144 11 197 138 11 197 138 11
56394-213 154 11 226 170 11 242 186 14 246 190 14
56395-246 190 14 246 190 14 246 190 14 246 190 14
56396-225 175 15 46 32 6 2 2 6 22 22 22
56397-158 158 158 250 250 250 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 253 253 253 253 253 253
56401-253 253 253 253 253 253 253 253 253 253 253 253
56402-253 253 253 250 250 250 242 242 242 224 178 62
56403-239 182 13 236 186 11 213 154 11 46 32 6
56404- 2 2 6 2 2 6 2 2 6 2 2 6
56405- 2 2 6 2 2 6 61 42 6 225 175 15
56406-238 190 10 236 186 11 112 100 78 42 42 42
56407- 14 14 14 0 0 0 0 0 0 0 0 0
56408- 0 0 0 0 0 0 0 0 0 0 0 0
56409- 0 0 0 0 0 0 0 0 0 0 0 0
56410- 0 0 0 0 0 0 0 0 0 0 0 0
56411- 0 0 0 0 0 0 0 0 0 6 6 6
56412- 22 22 22 54 54 54 154 122 46 213 154 11
56413-226 170 11 230 174 11 226 170 11 226 170 11
56414-236 178 12 242 186 14 246 190 14 246 190 14
56415-246 190 14 246 190 14 246 190 14 246 190 14
56416-241 196 14 184 144 12 10 10 10 2 2 6
56417- 6 6 6 116 116 116 242 242 242 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 253 253 253 253 253 253
56421-253 253 253 253 253 253 253 253 253 253 253 253
56422-253 253 253 231 231 231 198 198 198 214 170 54
56423-236 178 12 236 178 12 210 150 10 137 92 6
56424- 18 14 6 2 2 6 2 2 6 2 2 6
56425- 6 6 6 70 47 6 200 144 11 236 178 12
56426-239 182 13 239 182 13 124 112 88 58 58 58
56427- 22 22 22 6 6 6 0 0 0 0 0 0
56428- 0 0 0 0 0 0 0 0 0 0 0 0
56429- 0 0 0 0 0 0 0 0 0 0 0 0
56430- 0 0 0 0 0 0 0 0 0 0 0 0
56431- 0 0 0 0 0 0 0 0 0 10 10 10
56432- 30 30 30 70 70 70 180 133 36 226 170 11
56433-239 182 13 242 186 14 242 186 14 246 186 14
56434-246 190 14 246 190 14 246 190 14 246 190 14
56435-246 190 14 246 190 14 246 190 14 246 190 14
56436-246 190 14 232 195 16 98 70 6 2 2 6
56437- 2 2 6 2 2 6 66 66 66 221 221 221
56438-253 253 253 253 253 253 253 253 253 253 253 253
56439-253 253 253 253 253 253 253 253 253 253 253 253
56440-253 253 253 253 253 253 253 253 253 253 253 253
56441-253 253 253 253 253 253 253 253 253 253 253 253
56442-253 253 253 206 206 206 198 198 198 214 166 58
56443-230 174 11 230 174 11 216 158 10 192 133 9
56444-163 110 8 116 81 8 102 78 10 116 81 8
56445-167 114 7 197 138 11 226 170 11 239 182 13
56446-242 186 14 242 186 14 162 146 94 78 78 78
56447- 34 34 34 14 14 14 6 6 6 0 0 0
56448- 0 0 0 0 0 0 0 0 0 0 0 0
56449- 0 0 0 0 0 0 0 0 0 0 0 0
56450- 0 0 0 0 0 0 0 0 0 0 0 0
56451- 0 0 0 0 0 0 0 0 0 6 6 6
56452- 30 30 30 78 78 78 190 142 34 226 170 11
56453-239 182 13 246 190 14 246 190 14 246 190 14
56454-246 190 14 246 190 14 246 190 14 246 190 14
56455-246 190 14 246 190 14 246 190 14 246 190 14
56456-246 190 14 241 196 14 203 166 17 22 18 6
56457- 2 2 6 2 2 6 2 2 6 38 38 38
56458-218 218 218 253 253 253 253 253 253 253 253 253
56459-253 253 253 253 253 253 253 253 253 253 253 253
56460-253 253 253 253 253 253 253 253 253 253 253 253
56461-253 253 253 253 253 253 253 253 253 253 253 253
56462-250 250 250 206 206 206 198 198 198 202 162 69
56463-226 170 11 236 178 12 224 166 10 210 150 10
56464-200 144 11 197 138 11 192 133 9 197 138 11
56465-210 150 10 226 170 11 242 186 14 246 190 14
56466-246 190 14 246 186 14 225 175 15 124 112 88
56467- 62 62 62 30 30 30 14 14 14 6 6 6
56468- 0 0 0 0 0 0 0 0 0 0 0 0
56469- 0 0 0 0 0 0 0 0 0 0 0 0
56470- 0 0 0 0 0 0 0 0 0 0 0 0
56471- 0 0 0 0 0 0 0 0 0 10 10 10
56472- 30 30 30 78 78 78 174 135 50 224 166 10
56473-239 182 13 246 190 14 246 190 14 246 190 14
56474-246 190 14 246 190 14 246 190 14 246 190 14
56475-246 190 14 246 190 14 246 190 14 246 190 14
56476-246 190 14 246 190 14 241 196 14 139 102 15
56477- 2 2 6 2 2 6 2 2 6 2 2 6
56478- 78 78 78 250 250 250 253 253 253 253 253 253
56479-253 253 253 253 253 253 253 253 253 253 253 253
56480-253 253 253 253 253 253 253 253 253 253 253 253
56481-253 253 253 253 253 253 253 253 253 253 253 253
56482-250 250 250 214 214 214 198 198 198 190 150 46
56483-219 162 10 236 178 12 234 174 13 224 166 10
56484-216 158 10 213 154 11 213 154 11 216 158 10
56485-226 170 11 239 182 13 246 190 14 246 190 14
56486-246 190 14 246 190 14 242 186 14 206 162 42
56487-101 101 101 58 58 58 30 30 30 14 14 14
56488- 6 6 6 0 0 0 0 0 0 0 0 0
56489- 0 0 0 0 0 0 0 0 0 0 0 0
56490- 0 0 0 0 0 0 0 0 0 0 0 0
56491- 0 0 0 0 0 0 0 0 0 10 10 10
56492- 30 30 30 74 74 74 174 135 50 216 158 10
56493-236 178 12 246 190 14 246 190 14 246 190 14
56494-246 190 14 246 190 14 246 190 14 246 190 14
56495-246 190 14 246 190 14 246 190 14 246 190 14
56496-246 190 14 246 190 14 241 196 14 226 184 13
56497- 61 42 6 2 2 6 2 2 6 2 2 6
56498- 22 22 22 238 238 238 253 253 253 253 253 253
56499-253 253 253 253 253 253 253 253 253 253 253 253
56500-253 253 253 253 253 253 253 253 253 253 253 253
56501-253 253 253 253 253 253 253 253 253 253 253 253
56502-253 253 253 226 226 226 187 187 187 180 133 36
56503-216 158 10 236 178 12 239 182 13 236 178 12
56504-230 174 11 226 170 11 226 170 11 230 174 11
56505-236 178 12 242 186 14 246 190 14 246 190 14
56506-246 190 14 246 190 14 246 186 14 239 182 13
56507-206 162 42 106 106 106 66 66 66 34 34 34
56508- 14 14 14 6 6 6 0 0 0 0 0 0
56509- 0 0 0 0 0 0 0 0 0 0 0 0
56510- 0 0 0 0 0 0 0 0 0 0 0 0
56511- 0 0 0 0 0 0 0 0 0 6 6 6
56512- 26 26 26 70 70 70 163 133 67 213 154 11
56513-236 178 12 246 190 14 246 190 14 246 190 14
56514-246 190 14 246 190 14 246 190 14 246 190 14
56515-246 190 14 246 190 14 246 190 14 246 190 14
56516-246 190 14 246 190 14 246 190 14 241 196 14
56517-190 146 13 18 14 6 2 2 6 2 2 6
56518- 46 46 46 246 246 246 253 253 253 253 253 253
56519-253 253 253 253 253 253 253 253 253 253 253 253
56520-253 253 253 253 253 253 253 253 253 253 253 253
56521-253 253 253 253 253 253 253 253 253 253 253 253
56522-253 253 253 221 221 221 86 86 86 156 107 11
56523-216 158 10 236 178 12 242 186 14 246 186 14
56524-242 186 14 239 182 13 239 182 13 242 186 14
56525-242 186 14 246 186 14 246 190 14 246 190 14
56526-246 190 14 246 190 14 246 190 14 246 190 14
56527-242 186 14 225 175 15 142 122 72 66 66 66
56528- 30 30 30 10 10 10 0 0 0 0 0 0
56529- 0 0 0 0 0 0 0 0 0 0 0 0
56530- 0 0 0 0 0 0 0 0 0 0 0 0
56531- 0 0 0 0 0 0 0 0 0 6 6 6
56532- 26 26 26 70 70 70 163 133 67 210 150 10
56533-236 178 12 246 190 14 246 190 14 246 190 14
56534-246 190 14 246 190 14 246 190 14 246 190 14
56535-246 190 14 246 190 14 246 190 14 246 190 14
56536-246 190 14 246 190 14 246 190 14 246 190 14
56537-232 195 16 121 92 8 34 34 34 106 106 106
56538-221 221 221 253 253 253 253 253 253 253 253 253
56539-253 253 253 253 253 253 253 253 253 253 253 253
56540-253 253 253 253 253 253 253 253 253 253 253 253
56541-253 253 253 253 253 253 253 253 253 253 253 253
56542-242 242 242 82 82 82 18 14 6 163 110 8
56543-216 158 10 236 178 12 242 186 14 246 190 14
56544-246 190 14 246 190 14 246 190 14 246 190 14
56545-246 190 14 246 190 14 246 190 14 246 190 14
56546-246 190 14 246 190 14 246 190 14 246 190 14
56547-246 190 14 246 190 14 242 186 14 163 133 67
56548- 46 46 46 18 18 18 6 6 6 0 0 0
56549- 0 0 0 0 0 0 0 0 0 0 0 0
56550- 0 0 0 0 0 0 0 0 0 0 0 0
56551- 0 0 0 0 0 0 0 0 0 10 10 10
56552- 30 30 30 78 78 78 163 133 67 210 150 10
56553-236 178 12 246 186 14 246 190 14 246 190 14
56554-246 190 14 246 190 14 246 190 14 246 190 14
56555-246 190 14 246 190 14 246 190 14 246 190 14
56556-246 190 14 246 190 14 246 190 14 246 190 14
56557-241 196 14 215 174 15 190 178 144 253 253 253
56558-253 253 253 253 253 253 253 253 253 253 253 253
56559-253 253 253 253 253 253 253 253 253 253 253 253
56560-253 253 253 253 253 253 253 253 253 253 253 253
56561-253 253 253 253 253 253 253 253 253 218 218 218
56562- 58 58 58 2 2 6 22 18 6 167 114 7
56563-216 158 10 236 178 12 246 186 14 246 190 14
56564-246 190 14 246 190 14 246 190 14 246 190 14
56565-246 190 14 246 190 14 246 190 14 246 190 14
56566-246 190 14 246 190 14 246 190 14 246 190 14
56567-246 190 14 246 186 14 242 186 14 190 150 46
56568- 54 54 54 22 22 22 6 6 6 0 0 0
56569- 0 0 0 0 0 0 0 0 0 0 0 0
56570- 0 0 0 0 0 0 0 0 0 0 0 0
56571- 0 0 0 0 0 0 0 0 0 14 14 14
56572- 38 38 38 86 86 86 180 133 36 213 154 11
56573-236 178 12 246 186 14 246 190 14 246 190 14
56574-246 190 14 246 190 14 246 190 14 246 190 14
56575-246 190 14 246 190 14 246 190 14 246 190 14
56576-246 190 14 246 190 14 246 190 14 246 190 14
56577-246 190 14 232 195 16 190 146 13 214 214 214
56578-253 253 253 253 253 253 253 253 253 253 253 253
56579-253 253 253 253 253 253 253 253 253 253 253 253
56580-253 253 253 253 253 253 253 253 253 253 253 253
56581-253 253 253 250 250 250 170 170 170 26 26 26
56582- 2 2 6 2 2 6 37 26 9 163 110 8
56583-219 162 10 239 182 13 246 186 14 246 190 14
56584-246 190 14 246 190 14 246 190 14 246 190 14
56585-246 190 14 246 190 14 246 190 14 246 190 14
56586-246 190 14 246 190 14 246 190 14 246 190 14
56587-246 186 14 236 178 12 224 166 10 142 122 72
56588- 46 46 46 18 18 18 6 6 6 0 0 0
56589- 0 0 0 0 0 0 0 0 0 0 0 0
56590- 0 0 0 0 0 0 0 0 0 0 0 0
56591- 0 0 0 0 0 0 6 6 6 18 18 18
56592- 50 50 50 109 106 95 192 133 9 224 166 10
56593-242 186 14 246 190 14 246 190 14 246 190 14
56594-246 190 14 246 190 14 246 190 14 246 190 14
56595-246 190 14 246 190 14 246 190 14 246 190 14
56596-246 190 14 246 190 14 246 190 14 246 190 14
56597-242 186 14 226 184 13 210 162 10 142 110 46
56598-226 226 226 253 253 253 253 253 253 253 253 253
56599-253 253 253 253 253 253 253 253 253 253 253 253
56600-253 253 253 253 253 253 253 253 253 253 253 253
56601-198 198 198 66 66 66 2 2 6 2 2 6
56602- 2 2 6 2 2 6 50 34 6 156 107 11
56603-219 162 10 239 182 13 246 186 14 246 190 14
56604-246 190 14 246 190 14 246 190 14 246 190 14
56605-246 190 14 246 190 14 246 190 14 246 190 14
56606-246 190 14 246 190 14 246 190 14 242 186 14
56607-234 174 13 213 154 11 154 122 46 66 66 66
56608- 30 30 30 10 10 10 0 0 0 0 0 0
56609- 0 0 0 0 0 0 0 0 0 0 0 0
56610- 0 0 0 0 0 0 0 0 0 0 0 0
56611- 0 0 0 0 0 0 6 6 6 22 22 22
56612- 58 58 58 154 121 60 206 145 10 234 174 13
56613-242 186 14 246 186 14 246 190 14 246 190 14
56614-246 190 14 246 190 14 246 190 14 246 190 14
56615-246 190 14 246 190 14 246 190 14 246 190 14
56616-246 190 14 246 190 14 246 190 14 246 190 14
56617-246 186 14 236 178 12 210 162 10 163 110 8
56618- 61 42 6 138 138 138 218 218 218 250 250 250
56619-253 253 253 253 253 253 253 253 253 250 250 250
56620-242 242 242 210 210 210 144 144 144 66 66 66
56621- 6 6 6 2 2 6 2 2 6 2 2 6
56622- 2 2 6 2 2 6 61 42 6 163 110 8
56623-216 158 10 236 178 12 246 190 14 246 190 14
56624-246 190 14 246 190 14 246 190 14 246 190 14
56625-246 190 14 246 190 14 246 190 14 246 190 14
56626-246 190 14 239 182 13 230 174 11 216 158 10
56627-190 142 34 124 112 88 70 70 70 38 38 38
56628- 18 18 18 6 6 6 0 0 0 0 0 0
56629- 0 0 0 0 0 0 0 0 0 0 0 0
56630- 0 0 0 0 0 0 0 0 0 0 0 0
56631- 0 0 0 0 0 0 6 6 6 22 22 22
56632- 62 62 62 168 124 44 206 145 10 224 166 10
56633-236 178 12 239 182 13 242 186 14 242 186 14
56634-246 186 14 246 190 14 246 190 14 246 190 14
56635-246 190 14 246 190 14 246 190 14 246 190 14
56636-246 190 14 246 190 14 246 190 14 246 190 14
56637-246 190 14 236 178 12 216 158 10 175 118 6
56638- 80 54 7 2 2 6 6 6 6 30 30 30
56639- 54 54 54 62 62 62 50 50 50 38 38 38
56640- 14 14 14 2 2 6 2 2 6 2 2 6
56641- 2 2 6 2 2 6 2 2 6 2 2 6
56642- 2 2 6 6 6 6 80 54 7 167 114 7
56643-213 154 11 236 178 12 246 190 14 246 190 14
56644-246 190 14 246 190 14 246 190 14 246 190 14
56645-246 190 14 242 186 14 239 182 13 239 182 13
56646-230 174 11 210 150 10 174 135 50 124 112 88
56647- 82 82 82 54 54 54 34 34 34 18 18 18
56648- 6 6 6 0 0 0 0 0 0 0 0 0
56649- 0 0 0 0 0 0 0 0 0 0 0 0
56650- 0 0 0 0 0 0 0 0 0 0 0 0
56651- 0 0 0 0 0 0 6 6 6 18 18 18
56652- 50 50 50 158 118 36 192 133 9 200 144 11
56653-216 158 10 219 162 10 224 166 10 226 170 11
56654-230 174 11 236 178 12 239 182 13 239 182 13
56655-242 186 14 246 186 14 246 190 14 246 190 14
56656-246 190 14 246 190 14 246 190 14 246 190 14
56657-246 186 14 230 174 11 210 150 10 163 110 8
56658-104 69 6 10 10 10 2 2 6 2 2 6
56659- 2 2 6 2 2 6 2 2 6 2 2 6
56660- 2 2 6 2 2 6 2 2 6 2 2 6
56661- 2 2 6 2 2 6 2 2 6 2 2 6
56662- 2 2 6 6 6 6 91 60 6 167 114 7
56663-206 145 10 230 174 11 242 186 14 246 190 14
56664-246 190 14 246 190 14 246 186 14 242 186 14
56665-239 182 13 230 174 11 224 166 10 213 154 11
56666-180 133 36 124 112 88 86 86 86 58 58 58
56667- 38 38 38 22 22 22 10 10 10 6 6 6
56668- 0 0 0 0 0 0 0 0 0 0 0 0
56669- 0 0 0 0 0 0 0 0 0 0 0 0
56670- 0 0 0 0 0 0 0 0 0 0 0 0
56671- 0 0 0 0 0 0 0 0 0 14 14 14
56672- 34 34 34 70 70 70 138 110 50 158 118 36
56673-167 114 7 180 123 7 192 133 9 197 138 11
56674-200 144 11 206 145 10 213 154 11 219 162 10
56675-224 166 10 230 174 11 239 182 13 242 186 14
56676-246 186 14 246 186 14 246 186 14 246 186 14
56677-239 182 13 216 158 10 185 133 11 152 99 6
56678-104 69 6 18 14 6 2 2 6 2 2 6
56679- 2 2 6 2 2 6 2 2 6 2 2 6
56680- 2 2 6 2 2 6 2 2 6 2 2 6
56681- 2 2 6 2 2 6 2 2 6 2 2 6
56682- 2 2 6 6 6 6 80 54 7 152 99 6
56683-192 133 9 219 162 10 236 178 12 239 182 13
56684-246 186 14 242 186 14 239 182 13 236 178 12
56685-224 166 10 206 145 10 192 133 9 154 121 60
56686- 94 94 94 62 62 62 42 42 42 22 22 22
56687- 14 14 14 6 6 6 0 0 0 0 0 0
56688- 0 0 0 0 0 0 0 0 0 0 0 0
56689- 0 0 0 0 0 0 0 0 0 0 0 0
56690- 0 0 0 0 0 0 0 0 0 0 0 0
56691- 0 0 0 0 0 0 0 0 0 6 6 6
56692- 18 18 18 34 34 34 58 58 58 78 78 78
56693-101 98 89 124 112 88 142 110 46 156 107 11
56694-163 110 8 167 114 7 175 118 6 180 123 7
56695-185 133 11 197 138 11 210 150 10 219 162 10
56696-226 170 11 236 178 12 236 178 12 234 174 13
56697-219 162 10 197 138 11 163 110 8 130 83 6
56698- 91 60 6 10 10 10 2 2 6 2 2 6
56699- 18 18 18 38 38 38 38 38 38 38 38 38
56700- 38 38 38 38 38 38 38 38 38 38 38 38
56701- 38 38 38 38 38 38 26 26 26 2 2 6
56702- 2 2 6 6 6 6 70 47 6 137 92 6
56703-175 118 6 200 144 11 219 162 10 230 174 11
56704-234 174 13 230 174 11 219 162 10 210 150 10
56705-192 133 9 163 110 8 124 112 88 82 82 82
56706- 50 50 50 30 30 30 14 14 14 6 6 6
56707- 0 0 0 0 0 0 0 0 0 0 0 0
56708- 0 0 0 0 0 0 0 0 0 0 0 0
56709- 0 0 0 0 0 0 0 0 0 0 0 0
56710- 0 0 0 0 0 0 0 0 0 0 0 0
56711- 0 0 0 0 0 0 0 0 0 0 0 0
56712- 6 6 6 14 14 14 22 22 22 34 34 34
56713- 42 42 42 58 58 58 74 74 74 86 86 86
56714-101 98 89 122 102 70 130 98 46 121 87 25
56715-137 92 6 152 99 6 163 110 8 180 123 7
56716-185 133 11 197 138 11 206 145 10 200 144 11
56717-180 123 7 156 107 11 130 83 6 104 69 6
56718- 50 34 6 54 54 54 110 110 110 101 98 89
56719- 86 86 86 82 82 82 78 78 78 78 78 78
56720- 78 78 78 78 78 78 78 78 78 78 78 78
56721- 78 78 78 82 82 82 86 86 86 94 94 94
56722-106 106 106 101 101 101 86 66 34 124 80 6
56723-156 107 11 180 123 7 192 133 9 200 144 11
56724-206 145 10 200 144 11 192 133 9 175 118 6
56725-139 102 15 109 106 95 70 70 70 42 42 42
56726- 22 22 22 10 10 10 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 0 0 0 0 0 0
56729- 0 0 0 0 0 0 0 0 0 0 0 0
56730- 0 0 0 0 0 0 0 0 0 0 0 0
56731- 0 0 0 0 0 0 0 0 0 0 0 0
56732- 0 0 0 0 0 0 6 6 6 10 10 10
56733- 14 14 14 22 22 22 30 30 30 38 38 38
56734- 50 50 50 62 62 62 74 74 74 90 90 90
56735-101 98 89 112 100 78 121 87 25 124 80 6
56736-137 92 6 152 99 6 152 99 6 152 99 6
56737-138 86 6 124 80 6 98 70 6 86 66 30
56738-101 98 89 82 82 82 58 58 58 46 46 46
56739- 38 38 38 34 34 34 34 34 34 34 34 34
56740- 34 34 34 34 34 34 34 34 34 34 34 34
56741- 34 34 34 34 34 34 38 38 38 42 42 42
56742- 54 54 54 82 82 82 94 86 76 91 60 6
56743-134 86 6 156 107 11 167 114 7 175 118 6
56744-175 118 6 167 114 7 152 99 6 121 87 25
56745-101 98 89 62 62 62 34 34 34 18 18 18
56746- 6 6 6 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 0 0 0 0 0 0
56749- 0 0 0 0 0 0 0 0 0 0 0 0
56750- 0 0 0 0 0 0 0 0 0 0 0 0
56751- 0 0 0 0 0 0 0 0 0 0 0 0
56752- 0 0 0 0 0 0 0 0 0 0 0 0
56753- 0 0 0 6 6 6 6 6 6 10 10 10
56754- 18 18 18 22 22 22 30 30 30 42 42 42
56755- 50 50 50 66 66 66 86 86 86 101 98 89
56756-106 86 58 98 70 6 104 69 6 104 69 6
56757-104 69 6 91 60 6 82 62 34 90 90 90
56758- 62 62 62 38 38 38 22 22 22 14 14 14
56759- 10 10 10 10 10 10 10 10 10 10 10 10
56760- 10 10 10 10 10 10 6 6 6 10 10 10
56761- 10 10 10 10 10 10 10 10 10 14 14 14
56762- 22 22 22 42 42 42 70 70 70 89 81 66
56763- 80 54 7 104 69 6 124 80 6 137 92 6
56764-134 86 6 116 81 8 100 82 52 86 86 86
56765- 58 58 58 30 30 30 14 14 14 6 6 6
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 0 0 0
56769- 0 0 0 0 0 0 0 0 0 0 0 0
56770- 0 0 0 0 0 0 0 0 0 0 0 0
56771- 0 0 0 0 0 0 0 0 0 0 0 0
56772- 0 0 0 0 0 0 0 0 0 0 0 0
56773- 0 0 0 0 0 0 0 0 0 0 0 0
56774- 0 0 0 6 6 6 10 10 10 14 14 14
56775- 18 18 18 26 26 26 38 38 38 54 54 54
56776- 70 70 70 86 86 86 94 86 76 89 81 66
56777- 89 81 66 86 86 86 74 74 74 50 50 50
56778- 30 30 30 14 14 14 6 6 6 0 0 0
56779- 0 0 0 0 0 0 0 0 0 0 0 0
56780- 0 0 0 0 0 0 0 0 0 0 0 0
56781- 0 0 0 0 0 0 0 0 0 0 0 0
56782- 6 6 6 18 18 18 34 34 34 58 58 58
56783- 82 82 82 89 81 66 89 81 66 89 81 66
56784- 94 86 66 94 86 76 74 74 74 50 50 50
56785- 26 26 26 14 14 14 6 6 6 0 0 0
56786- 0 0 0 0 0 0 0 0 0 0 0 0
56787- 0 0 0 0 0 0 0 0 0 0 0 0
56788- 0 0 0 0 0 0 0 0 0 0 0 0
56789- 0 0 0 0 0 0 0 0 0 0 0 0
56790- 0 0 0 0 0 0 0 0 0 0 0 0
56791- 0 0 0 0 0 0 0 0 0 0 0 0
56792- 0 0 0 0 0 0 0 0 0 0 0 0
56793- 0 0 0 0 0 0 0 0 0 0 0 0
56794- 0 0 0 0 0 0 0 0 0 0 0 0
56795- 6 6 6 6 6 6 14 14 14 18 18 18
56796- 30 30 30 38 38 38 46 46 46 54 54 54
56797- 50 50 50 42 42 42 30 30 30 18 18 18
56798- 10 10 10 0 0 0 0 0 0 0 0 0
56799- 0 0 0 0 0 0 0 0 0 0 0 0
56800- 0 0 0 0 0 0 0 0 0 0 0 0
56801- 0 0 0 0 0 0 0 0 0 0 0 0
56802- 0 0 0 6 6 6 14 14 14 26 26 26
56803- 38 38 38 50 50 50 58 58 58 58 58 58
56804- 54 54 54 42 42 42 30 30 30 18 18 18
56805- 10 10 10 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- 0 0 0 0 0 0 0 0 0 0 0 0
56810- 0 0 0 0 0 0 0 0 0 0 0 0
56811- 0 0 0 0 0 0 0 0 0 0 0 0
56812- 0 0 0 0 0 0 0 0 0 0 0 0
56813- 0 0 0 0 0 0 0 0 0 0 0 0
56814- 0 0 0 0 0 0 0 0 0 0 0 0
56815- 0 0 0 0 0 0 0 0 0 6 6 6
56816- 6 6 6 10 10 10 14 14 14 18 18 18
56817- 18 18 18 14 14 14 10 10 10 6 6 6
56818- 0 0 0 0 0 0 0 0 0 0 0 0
56819- 0 0 0 0 0 0 0 0 0 0 0 0
56820- 0 0 0 0 0 0 0 0 0 0 0 0
56821- 0 0 0 0 0 0 0 0 0 0 0 0
56822- 0 0 0 0 0 0 0 0 0 6 6 6
56823- 14 14 14 18 18 18 22 22 22 22 22 22
56824- 18 18 18 14 14 14 10 10 10 6 6 6
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 0 0 0 0 0 0
56830+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56831+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56832+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56833+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56834+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56835+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56836+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56837+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56838+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56839+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56840+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56841+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56842+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56843+4 4 4 4 4 4
56844+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56845+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56846+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56847+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56848+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56849+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56850+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56851+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56852+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56853+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56854+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56855+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56856+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56857+4 4 4 4 4 4
56858+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56859+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56860+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56861+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56862+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56863+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56864+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56865+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56866+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56867+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56868+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56869+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56870+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56871+4 4 4 4 4 4
56872+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56873+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56874+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56875+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56876+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56877+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56878+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56879+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56880+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56881+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56882+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56883+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56884+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56885+4 4 4 4 4 4
56886+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56887+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56888+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56889+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56890+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56891+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56892+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56893+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56894+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56895+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56896+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56897+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56898+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56899+4 4 4 4 4 4
56900+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56901+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56902+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56903+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56904+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56905+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56906+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56907+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56908+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56909+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56910+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56911+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56912+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56913+4 4 4 4 4 4
56914+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56915+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56916+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56917+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56918+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
56919+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
56920+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56921+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56922+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56923+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
56924+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
56925+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
56926+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56927+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 2 2 2 0 0 0 3 4 3 26 28 28
56933+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
56934+5 5 5 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 3 3 3 0 0 0 1 1 1 6 6 6
56938+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
56939+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
56940+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
56941+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+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
56947+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
56948+0 0 0 3 3 3 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 0 0 0 4 4 4 41 54 63 125 124 125
56952+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
56953+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
56954+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
56955+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 5 5 5 5 5 5 2 2 2 0 0 0
56960+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
56961+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
56962+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 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 5 5 5 5 5 5
56965+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
56966+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
56967+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
56968+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
56969+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 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
56974+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
56975+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
56976+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
56977+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
56978+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
56979+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
56980+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
56981+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
56982+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
56983+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 5 5 5
56987+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
56988+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
56989+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
56990+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
56991+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
56992+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
56993+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
56994+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
56995+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
56996+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
56997+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 5 5 5 3 3 3
57001+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
57002+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
57003+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
57004+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
57005+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
57006+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
57007+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
57008+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
57009+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
57010+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
57011+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 2 2 2 0 0 0 4 0 0
57015+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
57016+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
57017+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
57018+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
57019+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
57020+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
57021+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
57022+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
57023+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
57024+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
57025+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 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
57029+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
57030+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
57031+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
57032+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
57033+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
57034+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
57035+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
57036+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
57037+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
57038+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57039+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+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
57043+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
57044+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
57045+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
57046+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
57047+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
57048+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
57049+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
57050+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
57051+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
57052+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
57053+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 3 3 3 0 0 0
57056+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
57057+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
57058+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
57059+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
57060+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
57061+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
57062+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
57063+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
57064+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
57065+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
57066+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
57067+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 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
57070+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
57071+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
57072+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57073+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
57074+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
57075+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
57076+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
57077+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
57078+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
57079+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
57080+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
57081+0 0 0 4 4 4
57082+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57083+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
57084+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
57085+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
57086+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
57087+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
57088+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
57089+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
57090+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
57091+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
57092+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
57093+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
57094+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
57095+2 0 0 0 0 0
57096+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
57097+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
57098+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
57099+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
57100+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
57101+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
57102+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
57103+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
57104+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
57105+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
57106+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
57107+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
57108+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
57109+37 38 37 0 0 0
57110+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57111+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
57112+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
57113+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
57114+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
57115+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
57116+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
57117+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
57118+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
57119+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
57120+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
57121+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
57122+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
57123+85 115 134 4 0 0
57124+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
57125+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
57126+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
57127+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
57128+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
57129+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
57130+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
57131+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
57132+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
57133+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
57134+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
57135+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
57136+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
57137+60 73 81 4 0 0
57138+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
57139+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
57140+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
57141+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
57142+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
57143+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
57144+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
57145+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
57146+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
57147+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
57148+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
57149+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
57150+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
57151+16 19 21 4 0 0
57152+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
57153+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
57154+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
57155+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
57156+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
57157+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
57158+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
57159+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
57160+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
57161+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
57162+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
57163+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
57164+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
57165+4 0 0 4 3 3
57166+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
57167+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
57168+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
57169+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
57170+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
57171+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
57172+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
57173+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
57174+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
57175+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
57176+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
57177+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
57178+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
57179+3 2 2 4 4 4
57180+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
57181+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
57182+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
57183+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
57184+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
57185+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
57186+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
57187+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
57188+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
57189+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
57190+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
57191+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
57192+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
57193+4 4 4 4 4 4
57194+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
57195+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
57196+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
57197+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
57198+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
57199+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
57200+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
57201+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
57202+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
57203+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
57204+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
57205+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
57206+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
57207+4 4 4 4 4 4
57208+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
57209+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
57210+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
57211+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
57212+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
57213+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57214+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
57215+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
57216+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
57217+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
57218+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
57219+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
57220+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
57221+5 5 5 5 5 5
57222+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
57223+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
57224+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
57225+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
57226+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
57227+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57228+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
57229+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
57230+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
57231+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
57232+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
57233+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
57234+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
57235+5 5 5 4 4 4
57236+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
57237+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
57238+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
57239+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
57240+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57241+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
57242+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
57243+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
57244+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
57245+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
57246+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
57247+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
57248+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57249+4 4 4 4 4 4
57250+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
57251+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
57252+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
57253+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
57254+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
57255+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57256+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57257+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
57258+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
57259+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
57260+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
57261+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
57262+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57263+4 4 4 4 4 4
57264+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
57265+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
57266+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
57267+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
57268+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57269+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
57270+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
57271+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
57272+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
57273+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
57274+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
57275+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57276+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57277+4 4 4 4 4 4
57278+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
57279+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
57280+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
57281+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
57282+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57283+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57284+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
57285+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
57286+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
57287+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
57288+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
57289+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57290+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57291+4 4 4 4 4 4
57292+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
57293+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
57294+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
57295+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
57296+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57297+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
57298+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
57299+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
57300+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
57301+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
57302+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57303+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57304+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57305+4 4 4 4 4 4
57306+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
57307+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
57308+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
57309+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
57310+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
57311+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
57312+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
57313+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
57314+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
57315+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
57316+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
57317+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57318+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57319+4 4 4 4 4 4
57320+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
57321+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
57322+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
57323+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
57324+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
57325+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
57326+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
57327+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
57328+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
57329+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
57330+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
57331+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57332+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57333+4 4 4 4 4 4
57334+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
57335+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
57336+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
57337+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57338+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
57339+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
57340+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
57341+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
57342+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
57343+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
57344+4 0 0 4 3 3 5 5 5 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57347+4 4 4 4 4 4
57348+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
57349+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
57350+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
57351+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57352+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57353+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
57354+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
57355+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
57356+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
57357+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
57358+4 0 0 4 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57361+4 4 4 4 4 4
57362+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
57363+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
57364+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57365+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
57366+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57367+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
57368+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
57369+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
57370+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
57371+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
57372+4 0 0 3 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57375+4 4 4 4 4 4
57376+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
57377+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
57378+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57379+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
57380+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57381+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
57382+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
57383+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
57384+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57385+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57386+0 0 0 3 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57389+4 4 4 4 4 4
57390+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57391+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
57392+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
57393+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
57394+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
57395+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
57396+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
57397+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
57398+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57399+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57400+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57401+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57402+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57403+4 4 4 4 4 4
57404+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
57405+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
57406+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
57407+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
57408+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57409+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
57410+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
57411+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
57412+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57413+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57414+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57415+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57416+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57417+4 4 4 4 4 4
57418+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
57419+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
57420+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
57421+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
57422+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
57423+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
57424+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
57425+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
57426+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57427+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57428+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57430+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57431+4 4 4 4 4 4
57432+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
57433+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
57434+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57435+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
57436+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
57437+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
57438+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
57439+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
57440+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
57441+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57442+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57444+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57445+4 4 4 4 4 4
57446+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
57447+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
57448+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
57449+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
57450+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
57451+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
57452+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
57453+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
57454+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57455+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57456+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57458+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57459+4 4 4 4 4 4
57460+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
57461+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
57462+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57463+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
57464+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
57465+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
57466+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
57467+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
57468+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
57469+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57470+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57472+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57473+4 4 4 4 4 4
57474+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
57475+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
57476+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
57477+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
57478+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
57479+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
57480+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
57481+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
57482+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57483+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57484+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57486+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57487+4 4 4 4 4 4
57488+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57489+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
57490+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
57491+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
57492+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
57493+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
57494+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
57495+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
57496+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57497+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57498+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
57499+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57500+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57501+4 4 4 4 4 4
57502+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
57503+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
57504+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
57505+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
57506+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
57507+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
57508+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57509+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
57510+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
57511+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57512+0 0 0 3 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57515+4 4 4 4 4 4
57516+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57517+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
57518+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
57519+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
57520+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
57521+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
57522+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
57523+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
57524+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
57525+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57526+0 0 0 3 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57529+4 4 4 4 4 4
57530+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
57531+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
57532+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
57533+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
57534+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
57535+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
57536+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
57537+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
57538+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
57539+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57540+0 0 0 3 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57543+4 4 4 4 4 4
57544+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57545+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
57546+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
57547+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
57548+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
57549+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
57550+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
57551+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
57552+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
57553+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57554+0 0 0 3 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57557+4 4 4 4 4 4
57558+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
57559+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
57560+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
57561+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
57562+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
57563+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
57564+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
57565+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
57566+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
57567+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57568+0 0 0 3 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57571+4 4 4 4 4 4
57572+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
57573+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
57574+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
57575+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
57576+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
57577+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
57578+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
57579+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
57580+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
57581+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
57582+0 0 0 3 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57585+4 4 4 4 4 4
57586+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
57587+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
57588+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
57589+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
57590+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
57591+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
57592+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
57593+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
57594+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
57595+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
57596+0 0 0 3 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57599+4 4 4 4 4 4
57600+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
57601+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
57602+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
57603+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
57604+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
57605+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
57606+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
57607+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
57608+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
57609+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
57610+0 0 0 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 4 4 4 4 4 4 4 4 4 4 4 4
57613+4 4 4 4 4 4
57614+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
57615+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
57616+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
57617+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
57618+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
57619+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
57620+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57621+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
57622+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
57623+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
57624+4 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57627+4 4 4 4 4 4
57628+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
57629+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
57630+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
57631+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
57632+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
57633+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
57634+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
57635+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
57636+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
57637+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
57638+5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57641+4 4 4 4 4 4
57642+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
57643+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
57644+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
57645+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
57646+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
57647+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
57648+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
57649+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
57650+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
57651+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
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 4 4 4 4 4 4 4 4 4 4 4 4
57655+4 4 4 4 4 4
57656+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57657+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
57658+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
57659+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
57660+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
57661+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
57662+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
57663+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
57664+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
57665+13 16 17 4 0 0 4 0 0 4 3 3 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 4 4 4 4 4 4 4 4 4 4 4 4
57669+4 4 4 4 4 4
57670+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
57671+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
57672+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
57673+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
57674+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
57675+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
57676+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
57677+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
57678+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
57679+4 0 0 4 0 0 5 5 5 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57683+4 4 4 4 4 4
57684+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
57685+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
57686+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
57687+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
57688+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
57689+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
57690+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
57691+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
57692+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
57693+4 3 3 5 5 5 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57697+4 4 4 4 4 4
57698+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
57699+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57700+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
57701+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
57702+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
57703+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
57704+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
57705+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
57706+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
57707+4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57711+4 4 4 4 4 4
57712+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
57713+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
57714+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
57715+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
57716+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
57717+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
57718+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
57719+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
57720+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
57721+4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57725+4 4 4 4 4 4
57726+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
57727+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
57728+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
57729+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
57730+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
57731+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
57732+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
57733+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
57734+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57735+4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57739+4 4 4 4 4 4
57740+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
57741+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
57742+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
57743+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
57744+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
57745+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
57746+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
57747+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
57748+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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 4 4 4 4 4 4 4 4 4 4 4 4
57753+4 4 4 4 4 4
57754+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
57755+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
57756+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
57757+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
57758+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
57759+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
57760+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
57761+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
57762+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57767+4 4 4 4 4 4
57768+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57769+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
57770+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57771+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
57772+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
57773+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
57774+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
57775+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
57776+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57781+4 4 4 4 4 4
57782+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57783+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
57784+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
57785+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
57786+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
57787+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
57788+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
57789+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
57790+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57791+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57792+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57793+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57794+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57795+4 4 4 4 4 4
57796+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57797+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
57798+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
57799+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
57800+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
57801+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
57802+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
57803+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57804+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57805+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57806+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57807+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57808+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57809+4 4 4 4 4 4
57810+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57811+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57812+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
57813+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
57814+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
57815+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
57816+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
57817+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57818+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57819+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57820+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57821+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57822+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57823+4 4 4 4 4 4
57824+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57825+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57826+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57827+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57828+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
57829+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
57830+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
57831+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57832+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57833+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57834+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57835+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57836+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57837+4 4 4 4 4 4
57838+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57839+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57840+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57841+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
57842+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
57843+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
57844+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
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 4 4 4 4 4 4 4 4 4 4 4 4
57851+4 4 4 4 4 4
57852+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57853+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57854+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57855+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
57856+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
57857+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
57858+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57865+4 4 4 4 4 4
57866+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57867+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57868+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57869+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
57870+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
57871+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
57872+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57879+4 4 4 4 4 4
57880+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57881+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57882+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57883+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57884+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
57885+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
57886+6 6 6 4 3 3 5 5 5 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57893+4 4 4 4 4 4
57894+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57895+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57896+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57897+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57898+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
57899+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
57900+4 3 3 5 5 5 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57907+4 4 4 4 4 4
57908+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57909+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57910+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57911+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57912+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
57913+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
57914+5 5 5 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57921+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 4 4 4
57924+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57925+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57926+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
57927+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
57935+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 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57939+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57940+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
57941+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
57942+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57943+4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
57949+4 4 4 4 4 4
57950diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
57951index fef20db..d28b1ab 100644
57952--- a/drivers/xen/xenfs/xenstored.c
57953+++ b/drivers/xen/xenfs/xenstored.c
57954@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
57955 static int xsd_kva_open(struct inode *inode, struct file *file)
57956 {
57957 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
57958+#ifdef CONFIG_GRKERNSEC_HIDESYM
57959+ NULL);
57960+#else
57961 xen_store_interface);
57962+#endif
57963+
57964 if (!file->private_data)
57965 return -ENOMEM;
57966 return 0;
57967diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
57968index eb14e05..5156de7 100644
57969--- a/fs/9p/vfs_addr.c
57970+++ b/fs/9p/vfs_addr.c
57971@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
57972
57973 retval = v9fs_file_write_internal(inode,
57974 v9inode->writeback_fid,
57975- (__force const char __user *)buffer,
57976+ (const char __force_user *)buffer,
57977 len, &offset, 0);
57978 if (retval > 0)
57979 retval = 0;
57980diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
57981index 296482f..183ddc3 100644
57982--- a/fs/9p/vfs_inode.c
57983+++ b/fs/9p/vfs_inode.c
57984@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
57985 void
57986 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
57987 {
57988- char *s = nd_get_link(nd);
57989+ const char *s = nd_get_link(nd);
57990
57991 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
57992 dentry, IS_ERR(s) ? "<error>" : s);
57993diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
57994index 370b24c..ff0be7b 100644
57995--- a/fs/Kconfig.binfmt
57996+++ b/fs/Kconfig.binfmt
57997@@ -103,7 +103,7 @@ config HAVE_AOUT
57998
57999 config BINFMT_AOUT
58000 tristate "Kernel support for a.out and ECOFF binaries"
58001- depends on HAVE_AOUT
58002+ depends on HAVE_AOUT && BROKEN
58003 ---help---
58004 A.out (Assembler.OUTput) is a set of formats for libraries and
58005 executables used in the earliest versions of UNIX. Linux used
58006diff --git a/fs/afs/inode.c b/fs/afs/inode.c
58007index 2946712..f737435 100644
58008--- a/fs/afs/inode.c
58009+++ b/fs/afs/inode.c
58010@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58011 struct afs_vnode *vnode;
58012 struct super_block *sb;
58013 struct inode *inode;
58014- static atomic_t afs_autocell_ino;
58015+ static atomic_unchecked_t afs_autocell_ino;
58016
58017 _enter("{%x:%u},%*.*s,",
58018 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
58019@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58020 data.fid.unique = 0;
58021 data.fid.vnode = 0;
58022
58023- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
58024+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
58025 afs_iget5_autocell_test, afs_iget5_set,
58026 &data);
58027 if (!inode) {
58028diff --git a/fs/aio.c b/fs/aio.c
58029index 14b9315..365980f 100644
58030--- a/fs/aio.c
58031+++ b/fs/aio.c
58032@@ -388,7 +388,7 @@ static int aio_setup_ring(struct kioctx *ctx)
58033 size += sizeof(struct io_event) * nr_events;
58034
58035 nr_pages = PFN_UP(size);
58036- if (nr_pages < 0)
58037+ if (nr_pages <= 0)
58038 return -EINVAL;
58039
58040 file = aio_private_file(ctx, nr_pages);
58041diff --git a/fs/attr.c b/fs/attr.c
58042index 6530ced..4a827e2 100644
58043--- a/fs/attr.c
58044+++ b/fs/attr.c
58045@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
58046 unsigned long limit;
58047
58048 limit = rlimit(RLIMIT_FSIZE);
58049+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
58050 if (limit != RLIM_INFINITY && offset > limit)
58051 goto out_sig;
58052 if (offset > inode->i_sb->s_maxbytes)
58053diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
58054index 116fd38..c04182da 100644
58055--- a/fs/autofs4/waitq.c
58056+++ b/fs/autofs4/waitq.c
58057@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
58058 {
58059 unsigned long sigpipe, flags;
58060 mm_segment_t fs;
58061- const char *data = (const char *)addr;
58062+ const char __user *data = (const char __force_user *)addr;
58063 ssize_t wr = 0;
58064
58065 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
58066@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
58067 return 1;
58068 }
58069
58070+#ifdef CONFIG_GRKERNSEC_HIDESYM
58071+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
58072+#endif
58073+
58074 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58075 enum autofs_notify notify)
58076 {
58077@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
58078
58079 /* If this is a direct mount request create a dummy name */
58080 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
58081+#ifdef CONFIG_GRKERNSEC_HIDESYM
58082+ /* this name does get written to userland via autofs4_write() */
58083+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
58084+#else
58085 qstr.len = sprintf(name, "%p", dentry);
58086+#endif
58087 else {
58088 qstr.len = autofs4_getpath(sbi, dentry, &name);
58089 if (!qstr.len) {
58090diff --git a/fs/befs/endian.h b/fs/befs/endian.h
58091index 2722387..56059b5 100644
58092--- a/fs/befs/endian.h
58093+++ b/fs/befs/endian.h
58094@@ -11,7 +11,7 @@
58095
58096 #include <asm/byteorder.h>
58097
58098-static inline u64
58099+static inline u64 __intentional_overflow(-1)
58100 fs64_to_cpu(const struct super_block *sb, fs64 n)
58101 {
58102 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58103@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
58104 return (__force fs64)cpu_to_be64(n);
58105 }
58106
58107-static inline u32
58108+static inline u32 __intentional_overflow(-1)
58109 fs32_to_cpu(const struct super_block *sb, fs32 n)
58110 {
58111 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58112@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
58113 return (__force fs32)cpu_to_be32(n);
58114 }
58115
58116-static inline u16
58117+static inline u16 __intentional_overflow(-1)
58118 fs16_to_cpu(const struct super_block *sb, fs16 n)
58119 {
58120 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
58121diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
58122index 929dec0..84bd914 100644
58123--- a/fs/binfmt_aout.c
58124+++ b/fs/binfmt_aout.c
58125@@ -16,6 +16,7 @@
58126 #include <linux/string.h>
58127 #include <linux/fs.h>
58128 #include <linux/file.h>
58129+#include <linux/security.h>
58130 #include <linux/stat.h>
58131 #include <linux/fcntl.h>
58132 #include <linux/ptrace.h>
58133@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
58134 #endif
58135 # define START_STACK(u) ((void __user *)u.start_stack)
58136
58137+ memset(&dump, 0, sizeof(dump));
58138+
58139 fs = get_fs();
58140 set_fs(KERNEL_DS);
58141 has_dumped = 1;
58142@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
58143
58144 /* If the size of the dump file exceeds the rlimit, then see what would happen
58145 if we wrote the stack, but not the data area. */
58146+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
58147 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
58148 dump.u_dsize = 0;
58149
58150 /* Make sure we have enough room to write the stack and data areas. */
58151+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
58152 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
58153 dump.u_ssize = 0;
58154
58155@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
58156 rlim = rlimit(RLIMIT_DATA);
58157 if (rlim >= RLIM_INFINITY)
58158 rlim = ~0;
58159+
58160+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
58161 if (ex.a_data + ex.a_bss > rlim)
58162 return -ENOMEM;
58163
58164@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
58165
58166 install_exec_creds(bprm);
58167
58168+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58169+ current->mm->pax_flags = 0UL;
58170+#endif
58171+
58172+#ifdef CONFIG_PAX_PAGEEXEC
58173+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
58174+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
58175+
58176+#ifdef CONFIG_PAX_EMUTRAMP
58177+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
58178+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
58179+#endif
58180+
58181+#ifdef CONFIG_PAX_MPROTECT
58182+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
58183+ current->mm->pax_flags |= MF_PAX_MPROTECT;
58184+#endif
58185+
58186+ }
58187+#endif
58188+
58189 if (N_MAGIC(ex) == OMAGIC) {
58190 unsigned long text_addr, map_size;
58191 loff_t pos;
58192@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
58193 return error;
58194
58195 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
58196- PROT_READ | PROT_WRITE | PROT_EXEC,
58197+ PROT_READ | PROT_WRITE,
58198 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
58199 fd_offset + ex.a_text);
58200 if (error != N_DATADDR(ex))
58201diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
58202index d8fc060..cbd44d5 100644
58203--- a/fs/binfmt_elf.c
58204+++ b/fs/binfmt_elf.c
58205@@ -34,6 +34,7 @@
58206 #include <linux/utsname.h>
58207 #include <linux/coredump.h>
58208 #include <linux/sched.h>
58209+#include <linux/xattr.h>
58210 #include <asm/uaccess.h>
58211 #include <asm/param.h>
58212 #include <asm/page.h>
58213@@ -47,7 +48,7 @@
58214
58215 static int load_elf_binary(struct linux_binprm *bprm);
58216 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
58217- int, int, unsigned long);
58218+ int, int, unsigned long) __intentional_overflow(-1);
58219
58220 #ifdef CONFIG_USELIB
58221 static int load_elf_library(struct file *);
58222@@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
58223 #define elf_core_dump NULL
58224 #endif
58225
58226+#ifdef CONFIG_PAX_MPROTECT
58227+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
58228+#endif
58229+
58230+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58231+static void elf_handle_mmap(struct file *file);
58232+#endif
58233+
58234 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
58235 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
58236 #else
58237@@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
58238 .load_binary = load_elf_binary,
58239 .load_shlib = load_elf_library,
58240 .core_dump = elf_core_dump,
58241+
58242+#ifdef CONFIG_PAX_MPROTECT
58243+ .handle_mprotect= elf_handle_mprotect,
58244+#endif
58245+
58246+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58247+ .handle_mmap = elf_handle_mmap,
58248+#endif
58249+
58250 .min_coredump = ELF_EXEC_PAGESIZE,
58251 };
58252
58253@@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
58254
58255 static int set_brk(unsigned long start, unsigned long end)
58256 {
58257+ unsigned long e = end;
58258+
58259 start = ELF_PAGEALIGN(start);
58260 end = ELF_PAGEALIGN(end);
58261 if (end > start) {
58262@@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
58263 if (BAD_ADDR(addr))
58264 return addr;
58265 }
58266- current->mm->start_brk = current->mm->brk = end;
58267+ current->mm->start_brk = current->mm->brk = e;
58268 return 0;
58269 }
58270
58271@@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58272 elf_addr_t __user *u_rand_bytes;
58273 const char *k_platform = ELF_PLATFORM;
58274 const char *k_base_platform = ELF_BASE_PLATFORM;
58275- unsigned char k_rand_bytes[16];
58276+ u32 k_rand_bytes[4];
58277 int items;
58278 elf_addr_t *elf_info;
58279 int ei_index = 0;
58280 const struct cred *cred = current_cred();
58281 struct vm_area_struct *vma;
58282+ unsigned long saved_auxv[AT_VECTOR_SIZE];
58283
58284 /*
58285 * In some cases (e.g. Hyper-Threading), we want to avoid L1
58286@@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58287 * Generate 16 random bytes for userspace PRNG seeding.
58288 */
58289 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
58290- u_rand_bytes = (elf_addr_t __user *)
58291- STACK_ALLOC(p, sizeof(k_rand_bytes));
58292+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
58293+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
58294+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
58295+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
58296+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
58297+ u_rand_bytes = (elf_addr_t __user *) p;
58298 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
58299 return -EFAULT;
58300
58301@@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
58302 return -EFAULT;
58303 current->mm->env_end = p;
58304
58305+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
58306+
58307 /* Put the elf_info on the stack in the right place. */
58308 sp = (elf_addr_t __user *)envp + 1;
58309- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
58310+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
58311 return -EFAULT;
58312 return 0;
58313 }
58314@@ -393,15 +420,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
58315 an ELF header */
58316
58317 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58318- struct file *interpreter, unsigned long *interp_map_addr,
58319- unsigned long no_base)
58320+ struct file *interpreter, unsigned long no_base)
58321 {
58322 struct elf_phdr *elf_phdata;
58323 struct elf_phdr *eppnt;
58324- unsigned long load_addr = 0;
58325+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
58326 int load_addr_set = 0;
58327 unsigned long last_bss = 0, elf_bss = 0;
58328- unsigned long error = ~0UL;
58329+ unsigned long error = -EINVAL;
58330 unsigned long total_size;
58331 int retval, i, size;
58332
58333@@ -447,6 +473,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58334 goto out_close;
58335 }
58336
58337+#ifdef CONFIG_PAX_SEGMEXEC
58338+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
58339+ pax_task_size = SEGMEXEC_TASK_SIZE;
58340+#endif
58341+
58342 eppnt = elf_phdata;
58343 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
58344 if (eppnt->p_type == PT_LOAD) {
58345@@ -470,8 +501,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58346 map_addr = elf_map(interpreter, load_addr + vaddr,
58347 eppnt, elf_prot, elf_type, total_size);
58348 total_size = 0;
58349- if (!*interp_map_addr)
58350- *interp_map_addr = map_addr;
58351 error = map_addr;
58352 if (BAD_ADDR(map_addr))
58353 goto out_close;
58354@@ -490,8 +519,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58355 k = load_addr + eppnt->p_vaddr;
58356 if (BAD_ADDR(k) ||
58357 eppnt->p_filesz > eppnt->p_memsz ||
58358- eppnt->p_memsz > TASK_SIZE ||
58359- TASK_SIZE - eppnt->p_memsz < k) {
58360+ eppnt->p_memsz > pax_task_size ||
58361+ pax_task_size - eppnt->p_memsz < k) {
58362 error = -ENOMEM;
58363 goto out_close;
58364 }
58365@@ -530,9 +559,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
58366 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
58367
58368 /* Map the last of the bss segment */
58369- error = vm_brk(elf_bss, last_bss - elf_bss);
58370- if (BAD_ADDR(error))
58371- goto out_close;
58372+ if (last_bss > elf_bss) {
58373+ error = vm_brk(elf_bss, last_bss - elf_bss);
58374+ if (BAD_ADDR(error))
58375+ goto out_close;
58376+ }
58377 }
58378
58379 error = load_addr;
58380@@ -543,6 +574,336 @@ out:
58381 return error;
58382 }
58383
58384+#ifdef CONFIG_PAX_PT_PAX_FLAGS
58385+#ifdef CONFIG_PAX_SOFTMODE
58386+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
58387+{
58388+ unsigned long pax_flags = 0UL;
58389+
58390+#ifdef CONFIG_PAX_PAGEEXEC
58391+ if (elf_phdata->p_flags & PF_PAGEEXEC)
58392+ pax_flags |= MF_PAX_PAGEEXEC;
58393+#endif
58394+
58395+#ifdef CONFIG_PAX_SEGMEXEC
58396+ if (elf_phdata->p_flags & PF_SEGMEXEC)
58397+ pax_flags |= MF_PAX_SEGMEXEC;
58398+#endif
58399+
58400+#ifdef CONFIG_PAX_EMUTRAMP
58401+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
58402+ pax_flags |= MF_PAX_EMUTRAMP;
58403+#endif
58404+
58405+#ifdef CONFIG_PAX_MPROTECT
58406+ if (elf_phdata->p_flags & PF_MPROTECT)
58407+ pax_flags |= MF_PAX_MPROTECT;
58408+#endif
58409+
58410+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58411+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
58412+ pax_flags |= MF_PAX_RANDMMAP;
58413+#endif
58414+
58415+ return pax_flags;
58416+}
58417+#endif
58418+
58419+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
58420+{
58421+ unsigned long pax_flags = 0UL;
58422+
58423+#ifdef CONFIG_PAX_PAGEEXEC
58424+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
58425+ pax_flags |= MF_PAX_PAGEEXEC;
58426+#endif
58427+
58428+#ifdef CONFIG_PAX_SEGMEXEC
58429+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
58430+ pax_flags |= MF_PAX_SEGMEXEC;
58431+#endif
58432+
58433+#ifdef CONFIG_PAX_EMUTRAMP
58434+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
58435+ pax_flags |= MF_PAX_EMUTRAMP;
58436+#endif
58437+
58438+#ifdef CONFIG_PAX_MPROTECT
58439+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
58440+ pax_flags |= MF_PAX_MPROTECT;
58441+#endif
58442+
58443+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58444+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
58445+ pax_flags |= MF_PAX_RANDMMAP;
58446+#endif
58447+
58448+ return pax_flags;
58449+}
58450+#endif
58451+
58452+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
58453+#ifdef CONFIG_PAX_SOFTMODE
58454+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
58455+{
58456+ unsigned long pax_flags = 0UL;
58457+
58458+#ifdef CONFIG_PAX_PAGEEXEC
58459+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
58460+ pax_flags |= MF_PAX_PAGEEXEC;
58461+#endif
58462+
58463+#ifdef CONFIG_PAX_SEGMEXEC
58464+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
58465+ pax_flags |= MF_PAX_SEGMEXEC;
58466+#endif
58467+
58468+#ifdef CONFIG_PAX_EMUTRAMP
58469+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
58470+ pax_flags |= MF_PAX_EMUTRAMP;
58471+#endif
58472+
58473+#ifdef CONFIG_PAX_MPROTECT
58474+ if (pax_flags_softmode & MF_PAX_MPROTECT)
58475+ pax_flags |= MF_PAX_MPROTECT;
58476+#endif
58477+
58478+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58479+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
58480+ pax_flags |= MF_PAX_RANDMMAP;
58481+#endif
58482+
58483+ return pax_flags;
58484+}
58485+#endif
58486+
58487+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
58488+{
58489+ unsigned long pax_flags = 0UL;
58490+
58491+#ifdef CONFIG_PAX_PAGEEXEC
58492+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
58493+ pax_flags |= MF_PAX_PAGEEXEC;
58494+#endif
58495+
58496+#ifdef CONFIG_PAX_SEGMEXEC
58497+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
58498+ pax_flags |= MF_PAX_SEGMEXEC;
58499+#endif
58500+
58501+#ifdef CONFIG_PAX_EMUTRAMP
58502+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
58503+ pax_flags |= MF_PAX_EMUTRAMP;
58504+#endif
58505+
58506+#ifdef CONFIG_PAX_MPROTECT
58507+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
58508+ pax_flags |= MF_PAX_MPROTECT;
58509+#endif
58510+
58511+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
58512+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
58513+ pax_flags |= MF_PAX_RANDMMAP;
58514+#endif
58515+
58516+ return pax_flags;
58517+}
58518+#endif
58519+
58520+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58521+static unsigned long pax_parse_defaults(void)
58522+{
58523+ unsigned long pax_flags = 0UL;
58524+
58525+#ifdef CONFIG_PAX_SOFTMODE
58526+ if (pax_softmode)
58527+ return pax_flags;
58528+#endif
58529+
58530+#ifdef CONFIG_PAX_PAGEEXEC
58531+ pax_flags |= MF_PAX_PAGEEXEC;
58532+#endif
58533+
58534+#ifdef CONFIG_PAX_SEGMEXEC
58535+ pax_flags |= MF_PAX_SEGMEXEC;
58536+#endif
58537+
58538+#ifdef CONFIG_PAX_MPROTECT
58539+ pax_flags |= MF_PAX_MPROTECT;
58540+#endif
58541+
58542+#ifdef CONFIG_PAX_RANDMMAP
58543+ if (randomize_va_space)
58544+ pax_flags |= MF_PAX_RANDMMAP;
58545+#endif
58546+
58547+ return pax_flags;
58548+}
58549+
58550+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
58551+{
58552+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
58553+
58554+#ifdef CONFIG_PAX_EI_PAX
58555+
58556+#ifdef CONFIG_PAX_SOFTMODE
58557+ if (pax_softmode)
58558+ return pax_flags;
58559+#endif
58560+
58561+ pax_flags = 0UL;
58562+
58563+#ifdef CONFIG_PAX_PAGEEXEC
58564+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
58565+ pax_flags |= MF_PAX_PAGEEXEC;
58566+#endif
58567+
58568+#ifdef CONFIG_PAX_SEGMEXEC
58569+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
58570+ pax_flags |= MF_PAX_SEGMEXEC;
58571+#endif
58572+
58573+#ifdef CONFIG_PAX_EMUTRAMP
58574+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
58575+ pax_flags |= MF_PAX_EMUTRAMP;
58576+#endif
58577+
58578+#ifdef CONFIG_PAX_MPROTECT
58579+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
58580+ pax_flags |= MF_PAX_MPROTECT;
58581+#endif
58582+
58583+#ifdef CONFIG_PAX_ASLR
58584+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
58585+ pax_flags |= MF_PAX_RANDMMAP;
58586+#endif
58587+
58588+#endif
58589+
58590+ return pax_flags;
58591+
58592+}
58593+
58594+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
58595+{
58596+
58597+#ifdef CONFIG_PAX_PT_PAX_FLAGS
58598+ unsigned long i;
58599+
58600+ for (i = 0UL; i < elf_ex->e_phnum; i++)
58601+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
58602+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
58603+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
58604+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
58605+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
58606+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
58607+ return PAX_PARSE_FLAGS_FALLBACK;
58608+
58609+#ifdef CONFIG_PAX_SOFTMODE
58610+ if (pax_softmode)
58611+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
58612+ else
58613+#endif
58614+
58615+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
58616+ break;
58617+ }
58618+#endif
58619+
58620+ return PAX_PARSE_FLAGS_FALLBACK;
58621+}
58622+
58623+static unsigned long pax_parse_xattr_pax(struct file * const file)
58624+{
58625+
58626+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
58627+ ssize_t xattr_size, i;
58628+ unsigned char xattr_value[sizeof("pemrs") - 1];
58629+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
58630+
58631+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
58632+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
58633+ return PAX_PARSE_FLAGS_FALLBACK;
58634+
58635+ for (i = 0; i < xattr_size; i++)
58636+ switch (xattr_value[i]) {
58637+ default:
58638+ return PAX_PARSE_FLAGS_FALLBACK;
58639+
58640+#define parse_flag(option1, option2, flag) \
58641+ case option1: \
58642+ if (pax_flags_hardmode & MF_PAX_##flag) \
58643+ return PAX_PARSE_FLAGS_FALLBACK;\
58644+ pax_flags_hardmode |= MF_PAX_##flag; \
58645+ break; \
58646+ case option2: \
58647+ if (pax_flags_softmode & MF_PAX_##flag) \
58648+ return PAX_PARSE_FLAGS_FALLBACK;\
58649+ pax_flags_softmode |= MF_PAX_##flag; \
58650+ break;
58651+
58652+ parse_flag('p', 'P', PAGEEXEC);
58653+ parse_flag('e', 'E', EMUTRAMP);
58654+ parse_flag('m', 'M', MPROTECT);
58655+ parse_flag('r', 'R', RANDMMAP);
58656+ parse_flag('s', 'S', SEGMEXEC);
58657+
58658+#undef parse_flag
58659+ }
58660+
58661+ if (pax_flags_hardmode & pax_flags_softmode)
58662+ return PAX_PARSE_FLAGS_FALLBACK;
58663+
58664+#ifdef CONFIG_PAX_SOFTMODE
58665+ if (pax_softmode)
58666+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
58667+ else
58668+#endif
58669+
58670+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
58671+#else
58672+ return PAX_PARSE_FLAGS_FALLBACK;
58673+#endif
58674+
58675+}
58676+
58677+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
58678+{
58679+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
58680+
58681+ pax_flags = pax_parse_defaults();
58682+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
58683+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
58684+ xattr_pax_flags = pax_parse_xattr_pax(file);
58685+
58686+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
58687+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
58688+ pt_pax_flags != xattr_pax_flags)
58689+ return -EINVAL;
58690+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58691+ pax_flags = xattr_pax_flags;
58692+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58693+ pax_flags = pt_pax_flags;
58694+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
58695+ pax_flags = ei_pax_flags;
58696+
58697+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
58698+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58699+ if ((__supported_pte_mask & _PAGE_NX))
58700+ pax_flags &= ~MF_PAX_SEGMEXEC;
58701+ else
58702+ pax_flags &= ~MF_PAX_PAGEEXEC;
58703+ }
58704+#endif
58705+
58706+ if (0 > pax_check_flags(&pax_flags))
58707+ return -EINVAL;
58708+
58709+ current->mm->pax_flags = pax_flags;
58710+ return 0;
58711+}
58712+#endif
58713+
58714 /*
58715 * These are the functions used to load ELF style executables and shared
58716 * libraries. There is no binary dependent code anywhere else.
58717@@ -556,6 +917,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
58718 {
58719 unsigned int random_variable = 0;
58720
58721+#ifdef CONFIG_PAX_RANDUSTACK
58722+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
58723+ return stack_top - current->mm->delta_stack;
58724+#endif
58725+
58726 if ((current->flags & PF_RANDOMIZE) &&
58727 !(current->personality & ADDR_NO_RANDOMIZE)) {
58728 random_variable = get_random_int() & STACK_RND_MASK;
58729@@ -574,7 +940,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
58730 unsigned long load_addr = 0, load_bias = 0;
58731 int load_addr_set = 0;
58732 char * elf_interpreter = NULL;
58733- unsigned long error;
58734+ unsigned long error = 0;
58735 struct elf_phdr *elf_ppnt, *elf_phdata;
58736 unsigned long elf_bss, elf_brk;
58737 int retval, i;
58738@@ -589,6 +955,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
58739 struct elfhdr elf_ex;
58740 struct elfhdr interp_elf_ex;
58741 } *loc;
58742+ unsigned long pax_task_size;
58743
58744 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
58745 if (!loc) {
58746@@ -726,6 +1093,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
58747 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
58748 may depend on the personality. */
58749 SET_PERSONALITY(loc->elf_ex);
58750+
58751+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58752+ current->mm->pax_flags = 0UL;
58753+#endif
58754+
58755+#ifdef CONFIG_PAX_DLRESOLVE
58756+ current->mm->call_dl_resolve = 0UL;
58757+#endif
58758+
58759+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
58760+ current->mm->call_syscall = 0UL;
58761+#endif
58762+
58763+#ifdef CONFIG_PAX_ASLR
58764+ current->mm->delta_mmap = 0UL;
58765+ current->mm->delta_stack = 0UL;
58766+#endif
58767+
58768+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
58769+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
58770+ send_sig(SIGKILL, current, 0);
58771+ goto out_free_dentry;
58772+ }
58773+#endif
58774+
58775+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
58776+ pax_set_initial_flags(bprm);
58777+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
58778+ if (pax_set_initial_flags_func)
58779+ (pax_set_initial_flags_func)(bprm);
58780+#endif
58781+
58782+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
58783+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
58784+ current->mm->context.user_cs_limit = PAGE_SIZE;
58785+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
58786+ }
58787+#endif
58788+
58789+#ifdef CONFIG_PAX_SEGMEXEC
58790+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
58791+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
58792+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
58793+ pax_task_size = SEGMEXEC_TASK_SIZE;
58794+ current->mm->def_flags |= VM_NOHUGEPAGE;
58795+ } else
58796+#endif
58797+
58798+ pax_task_size = TASK_SIZE;
58799+
58800+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
58801+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58802+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
58803+ put_cpu();
58804+ }
58805+#endif
58806+
58807+#ifdef CONFIG_PAX_ASLR
58808+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
58809+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
58810+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
58811+ }
58812+#endif
58813+
58814+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
58815+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
58816+ executable_stack = EXSTACK_DISABLE_X;
58817+ current->personality &= ~READ_IMPLIES_EXEC;
58818+ } else
58819+#endif
58820+
58821 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
58822 current->personality |= READ_IMPLIES_EXEC;
58823
58824@@ -811,6 +1249,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
58825 #else
58826 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
58827 #endif
58828+
58829+#ifdef CONFIG_PAX_RANDMMAP
58830+ /* PaX: randomize base address at the default exe base if requested */
58831+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
58832+#ifdef CONFIG_SPARC64
58833+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
58834+#else
58835+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
58836+#endif
58837+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
58838+ elf_flags |= MAP_FIXED;
58839+ }
58840+#endif
58841+
58842 }
58843
58844 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
58845@@ -842,9 +1294,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
58846 * allowed task size. Note that p_filesz must always be
58847 * <= p_memsz so it is only necessary to check p_memsz.
58848 */
58849- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
58850- elf_ppnt->p_memsz > TASK_SIZE ||
58851- TASK_SIZE - elf_ppnt->p_memsz < k) {
58852+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
58853+ elf_ppnt->p_memsz > pax_task_size ||
58854+ pax_task_size - elf_ppnt->p_memsz < k) {
58855 /* set_brk can never work. Avoid overflows. */
58856 retval = -EINVAL;
58857 goto out_free_dentry;
58858@@ -880,16 +1332,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
58859 if (retval)
58860 goto out_free_dentry;
58861 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
58862- retval = -EFAULT; /* Nobody gets to see this, but.. */
58863- goto out_free_dentry;
58864+ /*
58865+ * This bss-zeroing can fail if the ELF
58866+ * file specifies odd protections. So
58867+ * we don't check the return value
58868+ */
58869 }
58870
58871+#ifdef CONFIG_PAX_RANDMMAP
58872+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
58873+ unsigned long start, size, flags;
58874+ vm_flags_t vm_flags;
58875+
58876+ start = ELF_PAGEALIGN(elf_brk);
58877+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
58878+ flags = MAP_FIXED | MAP_PRIVATE;
58879+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
58880+
58881+ down_write(&current->mm->mmap_sem);
58882+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
58883+ retval = -ENOMEM;
58884+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
58885+// if (current->personality & ADDR_NO_RANDOMIZE)
58886+// vm_flags |= VM_READ | VM_MAYREAD;
58887+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
58888+ retval = IS_ERR_VALUE(start) ? start : 0;
58889+ }
58890+ up_write(&current->mm->mmap_sem);
58891+ if (retval == 0)
58892+ retval = set_brk(start + size, start + size + PAGE_SIZE);
58893+ if (retval < 0)
58894+ goto out_free_dentry;
58895+ }
58896+#endif
58897+
58898 if (elf_interpreter) {
58899- unsigned long interp_map_addr = 0;
58900-
58901 elf_entry = load_elf_interp(&loc->interp_elf_ex,
58902 interpreter,
58903- &interp_map_addr,
58904 load_bias);
58905 if (!IS_ERR((void *)elf_entry)) {
58906 /*
58907@@ -1115,7 +1594,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
58908 * Decide what to dump of a segment, part, all or none.
58909 */
58910 static unsigned long vma_dump_size(struct vm_area_struct *vma,
58911- unsigned long mm_flags)
58912+ unsigned long mm_flags, long signr)
58913 {
58914 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
58915
58916@@ -1153,7 +1632,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
58917 if (vma->vm_file == NULL)
58918 return 0;
58919
58920- if (FILTER(MAPPED_PRIVATE))
58921+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
58922 goto whole;
58923
58924 /*
58925@@ -1360,9 +1839,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
58926 {
58927 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
58928 int i = 0;
58929- do
58930+ do {
58931 i += 2;
58932- while (auxv[i - 2] != AT_NULL);
58933+ } while (auxv[i - 2] != AT_NULL);
58934 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
58935 }
58936
58937@@ -1371,7 +1850,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
58938 {
58939 mm_segment_t old_fs = get_fs();
58940 set_fs(KERNEL_DS);
58941- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
58942+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
58943 set_fs(old_fs);
58944 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
58945 }
58946@@ -1995,14 +2474,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
58947 }
58948
58949 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
58950- unsigned long mm_flags)
58951+ struct coredump_params *cprm)
58952 {
58953 struct vm_area_struct *vma;
58954 size_t size = 0;
58955
58956 for (vma = first_vma(current, gate_vma); vma != NULL;
58957 vma = next_vma(vma, gate_vma))
58958- size += vma_dump_size(vma, mm_flags);
58959+ size += vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
58960 return size;
58961 }
58962
58963@@ -2093,7 +2572,7 @@ static int elf_core_dump(struct coredump_params *cprm)
58964
58965 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
58966
58967- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
58968+ offset += elf_core_vma_data_size(gate_vma, cprm);
58969 offset += elf_core_extra_data_size();
58970 e_shoff = offset;
58971
58972@@ -2121,7 +2600,7 @@ static int elf_core_dump(struct coredump_params *cprm)
58973 phdr.p_offset = offset;
58974 phdr.p_vaddr = vma->vm_start;
58975 phdr.p_paddr = 0;
58976- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
58977+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
58978 phdr.p_memsz = vma->vm_end - vma->vm_start;
58979 offset += phdr.p_filesz;
58980 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
58981@@ -2154,7 +2633,7 @@ static int elf_core_dump(struct coredump_params *cprm)
58982 unsigned long addr;
58983 unsigned long end;
58984
58985- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
58986+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
58987
58988 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
58989 struct page *page;
58990@@ -2195,6 +2674,167 @@ out:
58991
58992 #endif /* CONFIG_ELF_CORE */
58993
58994+#ifdef CONFIG_PAX_MPROTECT
58995+/* PaX: non-PIC ELF libraries need relocations on their executable segments
58996+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
58997+ * we'll remove VM_MAYWRITE for good on RELRO segments.
58998+ *
58999+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
59000+ * basis because we want to allow the common case and not the special ones.
59001+ */
59002+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
59003+{
59004+ struct elfhdr elf_h;
59005+ struct elf_phdr elf_p;
59006+ unsigned long i;
59007+ unsigned long oldflags;
59008+ bool is_textrel_rw, is_textrel_rx, is_relro;
59009+
59010+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
59011+ return;
59012+
59013+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
59014+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
59015+
59016+#ifdef CONFIG_PAX_ELFRELOCS
59017+ /* possible TEXTREL */
59018+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
59019+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
59020+#else
59021+ is_textrel_rw = false;
59022+ is_textrel_rx = false;
59023+#endif
59024+
59025+ /* possible RELRO */
59026+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
59027+
59028+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
59029+ return;
59030+
59031+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59032+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59033+
59034+#ifdef CONFIG_PAX_ETEXECRELOCS
59035+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59036+#else
59037+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
59038+#endif
59039+
59040+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59041+ !elf_check_arch(&elf_h) ||
59042+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59043+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59044+ return;
59045+
59046+ for (i = 0UL; i < elf_h.e_phnum; i++) {
59047+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59048+ return;
59049+ switch (elf_p.p_type) {
59050+ case PT_DYNAMIC:
59051+ if (!is_textrel_rw && !is_textrel_rx)
59052+ continue;
59053+ i = 0UL;
59054+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
59055+ elf_dyn dyn;
59056+
59057+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
59058+ break;
59059+ if (dyn.d_tag == DT_NULL)
59060+ break;
59061+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
59062+ gr_log_textrel(vma);
59063+ if (is_textrel_rw)
59064+ vma->vm_flags |= VM_MAYWRITE;
59065+ else
59066+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
59067+ vma->vm_flags &= ~VM_MAYWRITE;
59068+ break;
59069+ }
59070+ i++;
59071+ }
59072+ is_textrel_rw = false;
59073+ is_textrel_rx = false;
59074+ continue;
59075+
59076+ case PT_GNU_RELRO:
59077+ if (!is_relro)
59078+ continue;
59079+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
59080+ vma->vm_flags &= ~VM_MAYWRITE;
59081+ is_relro = false;
59082+ continue;
59083+
59084+#ifdef CONFIG_PAX_PT_PAX_FLAGS
59085+ case PT_PAX_FLAGS: {
59086+ const char *msg_mprotect = "", *msg_emutramp = "";
59087+ char *buffer_lib, *buffer_exe;
59088+
59089+ if (elf_p.p_flags & PF_NOMPROTECT)
59090+ msg_mprotect = "MPROTECT disabled";
59091+
59092+#ifdef CONFIG_PAX_EMUTRAMP
59093+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
59094+ msg_emutramp = "EMUTRAMP enabled";
59095+#endif
59096+
59097+ if (!msg_mprotect[0] && !msg_emutramp[0])
59098+ continue;
59099+
59100+ if (!printk_ratelimit())
59101+ continue;
59102+
59103+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
59104+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
59105+ if (buffer_lib && buffer_exe) {
59106+ char *path_lib, *path_exe;
59107+
59108+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
59109+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
59110+
59111+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
59112+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
59113+
59114+ }
59115+ free_page((unsigned long)buffer_exe);
59116+ free_page((unsigned long)buffer_lib);
59117+ continue;
59118+ }
59119+#endif
59120+
59121+ }
59122+ }
59123+}
59124+#endif
59125+
59126+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59127+
59128+extern int grsec_enable_log_rwxmaps;
59129+
59130+static void elf_handle_mmap(struct file *file)
59131+{
59132+ struct elfhdr elf_h;
59133+ struct elf_phdr elf_p;
59134+ unsigned long i;
59135+
59136+ if (!grsec_enable_log_rwxmaps)
59137+ return;
59138+
59139+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59140+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59141+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
59142+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59143+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59144+ return;
59145+
59146+ for (i = 0UL; i < elf_h.e_phnum; i++) {
59147+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59148+ return;
59149+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
59150+ gr_log_ptgnustack(file);
59151+ }
59152+}
59153+#endif
59154+
59155 static int __init init_elf_binfmt(void)
59156 {
59157 register_binfmt(&elf_format);
59158diff --git a/fs/block_dev.c b/fs/block_dev.c
59159index 1d9c9f3..2905786 100644
59160--- a/fs/block_dev.c
59161+++ b/fs/block_dev.c
59162@@ -697,7 +697,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
59163 else if (bdev->bd_contains == bdev)
59164 return true; /* is a whole device which isn't held */
59165
59166- else if (whole->bd_holder == bd_may_claim)
59167+ else if (whole->bd_holder == (void *)bd_may_claim)
59168 return true; /* is a partition of a device that is being partitioned */
59169 else if (whole->bd_holder != NULL)
59170 return false; /* is a partition of a held device */
59171diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
59172index 150822e..75bb326 100644
59173--- a/fs/btrfs/ctree.c
59174+++ b/fs/btrfs/ctree.c
59175@@ -1173,9 +1173,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
59176 free_extent_buffer(buf);
59177 add_root_to_dirty_list(root);
59178 } else {
59179- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
59180- parent_start = parent->start;
59181- else
59182+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
59183+ if (parent)
59184+ parent_start = parent->start;
59185+ else
59186+ parent_start = 0;
59187+ } else
59188 parent_start = 0;
59189
59190 WARN_ON(trans->transid != btrfs_header_generation(parent));
59191diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
59192index 054577b..9b342cc 100644
59193--- a/fs/btrfs/delayed-inode.c
59194+++ b/fs/btrfs/delayed-inode.c
59195@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
59196
59197 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
59198 {
59199- int seq = atomic_inc_return(&delayed_root->items_seq);
59200+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
59201 if ((atomic_dec_return(&delayed_root->items) <
59202 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
59203 waitqueue_active(&delayed_root->wait))
59204@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
59205
59206 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
59207 {
59208- int val = atomic_read(&delayed_root->items_seq);
59209+ int val = atomic_read_unchecked(&delayed_root->items_seq);
59210
59211 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
59212 return 1;
59213@@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
59214 int seq;
59215 int ret;
59216
59217- seq = atomic_read(&delayed_root->items_seq);
59218+ seq = atomic_read_unchecked(&delayed_root->items_seq);
59219
59220 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
59221 if (ret)
59222diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
59223index f70119f..ab5894d 100644
59224--- a/fs/btrfs/delayed-inode.h
59225+++ b/fs/btrfs/delayed-inode.h
59226@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
59227 */
59228 struct list_head prepare_list;
59229 atomic_t items; /* for delayed items */
59230- atomic_t items_seq; /* for delayed items */
59231+ atomic_unchecked_t items_seq; /* for delayed items */
59232 int nodes; /* for delayed nodes */
59233 wait_queue_head_t wait;
59234 };
59235@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
59236 struct btrfs_delayed_root *delayed_root)
59237 {
59238 atomic_set(&delayed_root->items, 0);
59239- atomic_set(&delayed_root->items_seq, 0);
59240+ atomic_set_unchecked(&delayed_root->items_seq, 0);
59241 delayed_root->nodes = 0;
59242 spin_lock_init(&delayed_root->lock);
59243 init_waitqueue_head(&delayed_root->wait);
59244diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
59245index 4399f0c..a34d8b4 100644
59246--- a/fs/btrfs/ioctl.c
59247+++ b/fs/btrfs/ioctl.c
59248@@ -3953,9 +3953,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
59249 for (i = 0; i < num_types; i++) {
59250 struct btrfs_space_info *tmp;
59251
59252+ /* Don't copy in more than we allocated */
59253 if (!slot_count)
59254 break;
59255
59256+ slot_count--;
59257+
59258 info = NULL;
59259 rcu_read_lock();
59260 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
59261@@ -3977,10 +3980,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
59262 memcpy(dest, &space, sizeof(space));
59263 dest++;
59264 space_args.total_spaces++;
59265- slot_count--;
59266 }
59267- if (!slot_count)
59268- break;
59269 }
59270 up_read(&info->groups_sem);
59271 }
59272diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
59273index 54bd91e..aefa810 100644
59274--- a/fs/btrfs/super.c
59275+++ b/fs/btrfs/super.c
59276@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
59277 function, line, errstr);
59278 return;
59279 }
59280- ACCESS_ONCE(trans->transaction->aborted) = errno;
59281+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
59282 /* Wake up anybody who may be waiting on this transaction */
59283 wake_up(&root->fs_info->transaction_wait);
59284 wake_up(&root->fs_info->transaction_blocked_wait);
59285diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
59286index b2e7bb4..3719201 100644
59287--- a/fs/btrfs/sysfs.c
59288+++ b/fs/btrfs/sysfs.c
59289@@ -480,7 +480,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
59290 for (set = 0; set < FEAT_MAX; set++) {
59291 int i;
59292 struct attribute *attrs[2];
59293- struct attribute_group agroup = {
59294+ attribute_group_no_const agroup = {
59295 .name = "features",
59296 .attrs = attrs,
59297 };
59298diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
59299index 2299bfd..4098e72 100644
59300--- a/fs/btrfs/tests/free-space-tests.c
59301+++ b/fs/btrfs/tests/free-space-tests.c
59302@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59303 * extent entry.
59304 */
59305 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
59306- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59307+ pax_open_kernel();
59308+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
59309+ pax_close_kernel();
59310
59311 /*
59312 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
59313@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
59314 if (ret)
59315 return ret;
59316
59317- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59318+ pax_open_kernel();
59319+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
59320+ pax_close_kernel();
59321 __btrfs_remove_free_space_cache(cache->free_space_ctl);
59322
59323 return 0;
59324diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
59325index 154990c..d0cf699 100644
59326--- a/fs/btrfs/tree-log.h
59327+++ b/fs/btrfs/tree-log.h
59328@@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
59329 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
59330 struct btrfs_trans_handle *trans)
59331 {
59332- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
59333+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
59334 }
59335
59336 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
59337diff --git a/fs/buffer.c b/fs/buffer.c
59338index 20805db..2e8fc69 100644
59339--- a/fs/buffer.c
59340+++ b/fs/buffer.c
59341@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
59342 bh_cachep = kmem_cache_create("buffer_head",
59343 sizeof(struct buffer_head), 0,
59344 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
59345- SLAB_MEM_SPREAD),
59346+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
59347 NULL);
59348
59349 /*
59350diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
59351index fbb08e9..0fda764 100644
59352--- a/fs/cachefiles/bind.c
59353+++ b/fs/cachefiles/bind.c
59354@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
59355 args);
59356
59357 /* start by checking things over */
59358- ASSERT(cache->fstop_percent >= 0 &&
59359- cache->fstop_percent < cache->fcull_percent &&
59360+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
59361 cache->fcull_percent < cache->frun_percent &&
59362 cache->frun_percent < 100);
59363
59364- ASSERT(cache->bstop_percent >= 0 &&
59365- cache->bstop_percent < cache->bcull_percent &&
59366+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
59367 cache->bcull_percent < cache->brun_percent &&
59368 cache->brun_percent < 100);
59369
59370diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
59371index ce1b115..4a6852c 100644
59372--- a/fs/cachefiles/daemon.c
59373+++ b/fs/cachefiles/daemon.c
59374@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
59375 if (n > buflen)
59376 return -EMSGSIZE;
59377
59378- if (copy_to_user(_buffer, buffer, n) != 0)
59379+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
59380 return -EFAULT;
59381
59382 return n;
59383@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
59384 if (test_bit(CACHEFILES_DEAD, &cache->flags))
59385 return -EIO;
59386
59387- if (datalen < 0 || datalen > PAGE_SIZE - 1)
59388+ if (datalen > PAGE_SIZE - 1)
59389 return -EOPNOTSUPP;
59390
59391 /* drag the command string into the kernel so we can parse it */
59392@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
59393 if (args[0] != '%' || args[1] != '\0')
59394 return -EINVAL;
59395
59396- if (fstop < 0 || fstop >= cache->fcull_percent)
59397+ if (fstop >= cache->fcull_percent)
59398 return cachefiles_daemon_range_error(cache, args);
59399
59400 cache->fstop_percent = fstop;
59401@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
59402 if (args[0] != '%' || args[1] != '\0')
59403 return -EINVAL;
59404
59405- if (bstop < 0 || bstop >= cache->bcull_percent)
59406+ if (bstop >= cache->bcull_percent)
59407 return cachefiles_daemon_range_error(cache, args);
59408
59409 cache->bstop_percent = bstop;
59410diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
59411index 8c52472..c4e3a69 100644
59412--- a/fs/cachefiles/internal.h
59413+++ b/fs/cachefiles/internal.h
59414@@ -66,7 +66,7 @@ struct cachefiles_cache {
59415 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
59416 struct rb_root active_nodes; /* active nodes (can't be culled) */
59417 rwlock_t active_lock; /* lock for active_nodes */
59418- atomic_t gravecounter; /* graveyard uniquifier */
59419+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
59420 unsigned frun_percent; /* when to stop culling (% files) */
59421 unsigned fcull_percent; /* when to start culling (% files) */
59422 unsigned fstop_percent; /* when to stop allocating (% files) */
59423@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
59424 * proc.c
59425 */
59426 #ifdef CONFIG_CACHEFILES_HISTOGRAM
59427-extern atomic_t cachefiles_lookup_histogram[HZ];
59428-extern atomic_t cachefiles_mkdir_histogram[HZ];
59429-extern atomic_t cachefiles_create_histogram[HZ];
59430+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59431+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59432+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
59433
59434 extern int __init cachefiles_proc_init(void);
59435 extern void cachefiles_proc_cleanup(void);
59436 static inline
59437-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
59438+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
59439 {
59440 unsigned long jif = jiffies - start_jif;
59441 if (jif >= HZ)
59442 jif = HZ - 1;
59443- atomic_inc(&histogram[jif]);
59444+ atomic_inc_unchecked(&histogram[jif]);
59445 }
59446
59447 #else
59448diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
59449index e12f189..ed17244 100644
59450--- a/fs/cachefiles/namei.c
59451+++ b/fs/cachefiles/namei.c
59452@@ -312,7 +312,7 @@ try_again:
59453 /* first step is to make up a grave dentry in the graveyard */
59454 sprintf(nbuffer, "%08x%08x",
59455 (uint32_t) get_seconds(),
59456- (uint32_t) atomic_inc_return(&cache->gravecounter));
59457+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
59458
59459 /* do the multiway lock magic */
59460 trap = lock_rename(cache->graveyard, dir);
59461diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
59462index eccd339..4c1d995 100644
59463--- a/fs/cachefiles/proc.c
59464+++ b/fs/cachefiles/proc.c
59465@@ -14,9 +14,9 @@
59466 #include <linux/seq_file.h>
59467 #include "internal.h"
59468
59469-atomic_t cachefiles_lookup_histogram[HZ];
59470-atomic_t cachefiles_mkdir_histogram[HZ];
59471-atomic_t cachefiles_create_histogram[HZ];
59472+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
59473+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
59474+atomic_unchecked_t cachefiles_create_histogram[HZ];
59475
59476 /*
59477 * display the latency histogram
59478@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
59479 return 0;
59480 default:
59481 index = (unsigned long) v - 3;
59482- x = atomic_read(&cachefiles_lookup_histogram[index]);
59483- y = atomic_read(&cachefiles_mkdir_histogram[index]);
59484- z = atomic_read(&cachefiles_create_histogram[index]);
59485+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
59486+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
59487+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
59488 if (x == 0 && y == 0 && z == 0)
59489 return 0;
59490
59491diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
59492index 695e788..f4a9d4d 100644
59493--- a/fs/ceph/dir.c
59494+++ b/fs/ceph/dir.c
59495@@ -129,6 +129,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
59496 struct dentry *dentry, *last;
59497 struct ceph_dentry_info *di;
59498 int err = 0;
59499+ char d_name[DNAME_INLINE_LEN];
59500+ const unsigned char *name;
59501
59502 /* claim ref on last dentry we returned */
59503 last = fi->dentry;
59504@@ -192,7 +194,12 @@ more:
59505
59506 dout(" %llu (%llu) dentry %p %.*s %p\n", di->offset, ctx->pos,
59507 dentry, dentry->d_name.len, dentry->d_name.name, dentry->d_inode);
59508- if (!dir_emit(ctx, dentry->d_name.name,
59509+ name = dentry->d_name.name;
59510+ if (name == dentry->d_iname) {
59511+ memcpy(d_name, name, dentry->d_name.len);
59512+ name = d_name;
59513+ }
59514+ if (!dir_emit(ctx, name,
59515 dentry->d_name.len,
59516 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
59517 dentry->d_inode->i_mode >> 12)) {
59518@@ -250,7 +257,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
59519 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
59520 struct ceph_mds_client *mdsc = fsc->mdsc;
59521 unsigned frag = fpos_frag(ctx->pos);
59522- int off = fpos_off(ctx->pos);
59523+ unsigned int off = fpos_off(ctx->pos);
59524 int err;
59525 u32 ftype;
59526 struct ceph_mds_reply_info_parsed *rinfo;
59527diff --git a/fs/ceph/super.c b/fs/ceph/super.c
59528index f6e1237..796ffd1 100644
59529--- a/fs/ceph/super.c
59530+++ b/fs/ceph/super.c
59531@@ -895,7 +895,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
59532 /*
59533 * construct our own bdi so we can control readahead, etc.
59534 */
59535-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
59536+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
59537
59538 static int ceph_register_bdi(struct super_block *sb,
59539 struct ceph_fs_client *fsc)
59540@@ -912,7 +912,7 @@ static int ceph_register_bdi(struct super_block *sb,
59541 default_backing_dev_info.ra_pages;
59542
59543 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
59544- atomic_long_inc_return(&bdi_seq));
59545+ atomic_long_inc_return_unchecked(&bdi_seq));
59546 if (!err)
59547 sb->s_bdi = &fsc->backing_dev_info;
59548 return err;
59549diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
59550index 44ec726..bcb06a3 100644
59551--- a/fs/cifs/cifs_debug.c
59552+++ b/fs/cifs/cifs_debug.c
59553@@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
59554
59555 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
59556 #ifdef CONFIG_CIFS_STATS2
59557- atomic_set(&totBufAllocCount, 0);
59558- atomic_set(&totSmBufAllocCount, 0);
59559+ atomic_set_unchecked(&totBufAllocCount, 0);
59560+ atomic_set_unchecked(&totSmBufAllocCount, 0);
59561 #endif /* CONFIG_CIFS_STATS2 */
59562 spin_lock(&cifs_tcp_ses_lock);
59563 list_for_each(tmp1, &cifs_tcp_ses_list) {
59564@@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
59565 tcon = list_entry(tmp3,
59566 struct cifs_tcon,
59567 tcon_list);
59568- atomic_set(&tcon->num_smbs_sent, 0);
59569+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
59570 if (server->ops->clear_stats)
59571 server->ops->clear_stats(tcon);
59572 }
59573@@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
59574 smBufAllocCount.counter, cifs_min_small);
59575 #ifdef CONFIG_CIFS_STATS2
59576 seq_printf(m, "Total Large %d Small %d Allocations\n",
59577- atomic_read(&totBufAllocCount),
59578- atomic_read(&totSmBufAllocCount));
59579+ atomic_read_unchecked(&totBufAllocCount),
59580+ atomic_read_unchecked(&totSmBufAllocCount));
59581 #endif /* CONFIG_CIFS_STATS2 */
59582
59583 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
59584@@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
59585 if (tcon->need_reconnect)
59586 seq_puts(m, "\tDISCONNECTED ");
59587 seq_printf(m, "\nSMBs: %d",
59588- atomic_read(&tcon->num_smbs_sent));
59589+ atomic_read_unchecked(&tcon->num_smbs_sent));
59590 if (server->ops->print_stats)
59591 server->ops->print_stats(m, tcon);
59592 }
59593diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
59594index 9d7996e..35ad5cf4 100644
59595--- a/fs/cifs/cifsfs.c
59596+++ b/fs/cifs/cifsfs.c
59597@@ -1093,7 +1093,7 @@ cifs_init_request_bufs(void)
59598 */
59599 cifs_req_cachep = kmem_cache_create("cifs_request",
59600 CIFSMaxBufSize + max_hdr_size, 0,
59601- SLAB_HWCACHE_ALIGN, NULL);
59602+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
59603 if (cifs_req_cachep == NULL)
59604 return -ENOMEM;
59605
59606@@ -1120,7 +1120,7 @@ cifs_init_request_bufs(void)
59607 efficient to alloc 1 per page off the slab compared to 17K (5page)
59608 alloc of large cifs buffers even when page debugging is on */
59609 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
59610- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
59611+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
59612 NULL);
59613 if (cifs_sm_req_cachep == NULL) {
59614 mempool_destroy(cifs_req_poolp);
59615@@ -1205,8 +1205,8 @@ init_cifs(void)
59616 atomic_set(&bufAllocCount, 0);
59617 atomic_set(&smBufAllocCount, 0);
59618 #ifdef CONFIG_CIFS_STATS2
59619- atomic_set(&totBufAllocCount, 0);
59620- atomic_set(&totSmBufAllocCount, 0);
59621+ atomic_set_unchecked(&totBufAllocCount, 0);
59622+ atomic_set_unchecked(&totSmBufAllocCount, 0);
59623 #endif /* CONFIG_CIFS_STATS2 */
59624
59625 atomic_set(&midCount, 0);
59626diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
59627index 02a33e5..3a28b5a 100644
59628--- a/fs/cifs/cifsglob.h
59629+++ b/fs/cifs/cifsglob.h
59630@@ -823,35 +823,35 @@ struct cifs_tcon {
59631 __u16 Flags; /* optional support bits */
59632 enum statusEnum tidStatus;
59633 #ifdef CONFIG_CIFS_STATS
59634- atomic_t num_smbs_sent;
59635+ atomic_unchecked_t num_smbs_sent;
59636 union {
59637 struct {
59638- atomic_t num_writes;
59639- atomic_t num_reads;
59640- atomic_t num_flushes;
59641- atomic_t num_oplock_brks;
59642- atomic_t num_opens;
59643- atomic_t num_closes;
59644- atomic_t num_deletes;
59645- atomic_t num_mkdirs;
59646- atomic_t num_posixopens;
59647- atomic_t num_posixmkdirs;
59648- atomic_t num_rmdirs;
59649- atomic_t num_renames;
59650- atomic_t num_t2renames;
59651- atomic_t num_ffirst;
59652- atomic_t num_fnext;
59653- atomic_t num_fclose;
59654- atomic_t num_hardlinks;
59655- atomic_t num_symlinks;
59656- atomic_t num_locks;
59657- atomic_t num_acl_get;
59658- atomic_t num_acl_set;
59659+ atomic_unchecked_t num_writes;
59660+ atomic_unchecked_t num_reads;
59661+ atomic_unchecked_t num_flushes;
59662+ atomic_unchecked_t num_oplock_brks;
59663+ atomic_unchecked_t num_opens;
59664+ atomic_unchecked_t num_closes;
59665+ atomic_unchecked_t num_deletes;
59666+ atomic_unchecked_t num_mkdirs;
59667+ atomic_unchecked_t num_posixopens;
59668+ atomic_unchecked_t num_posixmkdirs;
59669+ atomic_unchecked_t num_rmdirs;
59670+ atomic_unchecked_t num_renames;
59671+ atomic_unchecked_t num_t2renames;
59672+ atomic_unchecked_t num_ffirst;
59673+ atomic_unchecked_t num_fnext;
59674+ atomic_unchecked_t num_fclose;
59675+ atomic_unchecked_t num_hardlinks;
59676+ atomic_unchecked_t num_symlinks;
59677+ atomic_unchecked_t num_locks;
59678+ atomic_unchecked_t num_acl_get;
59679+ atomic_unchecked_t num_acl_set;
59680 } cifs_stats;
59681 #ifdef CONFIG_CIFS_SMB2
59682 struct {
59683- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
59684- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
59685+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
59686+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
59687 } smb2_stats;
59688 #endif /* CONFIG_CIFS_SMB2 */
59689 } stats;
59690@@ -1192,7 +1192,7 @@ convert_delimiter(char *path, char delim)
59691 }
59692
59693 #ifdef CONFIG_CIFS_STATS
59694-#define cifs_stats_inc atomic_inc
59695+#define cifs_stats_inc atomic_inc_unchecked
59696
59697 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
59698 unsigned int bytes)
59699@@ -1559,8 +1559,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
59700 /* Various Debug counters */
59701 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
59702 #ifdef CONFIG_CIFS_STATS2
59703-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
59704-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
59705+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
59706+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
59707 #endif
59708 GLOBAL_EXTERN atomic_t smBufAllocCount;
59709 GLOBAL_EXTERN atomic_t midCount;
59710diff --git a/fs/cifs/file.c b/fs/cifs/file.c
59711index 3e4d00a..38a122d 100644
59712--- a/fs/cifs/file.c
59713+++ b/fs/cifs/file.c
59714@@ -2056,10 +2056,14 @@ static int cifs_writepages(struct address_space *mapping,
59715 index = mapping->writeback_index; /* Start from prev offset */
59716 end = -1;
59717 } else {
59718- index = wbc->range_start >> PAGE_CACHE_SHIFT;
59719- end = wbc->range_end >> PAGE_CACHE_SHIFT;
59720- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
59721+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
59722 range_whole = true;
59723+ index = 0;
59724+ end = ULONG_MAX;
59725+ } else {
59726+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
59727+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
59728+ }
59729 scanned = true;
59730 }
59731 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
59732diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
59733index b7415d5..3984ec0 100644
59734--- a/fs/cifs/misc.c
59735+++ b/fs/cifs/misc.c
59736@@ -170,7 +170,7 @@ cifs_buf_get(void)
59737 memset(ret_buf, 0, buf_size + 3);
59738 atomic_inc(&bufAllocCount);
59739 #ifdef CONFIG_CIFS_STATS2
59740- atomic_inc(&totBufAllocCount);
59741+ atomic_inc_unchecked(&totBufAllocCount);
59742 #endif /* CONFIG_CIFS_STATS2 */
59743 }
59744
59745@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
59746 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
59747 atomic_inc(&smBufAllocCount);
59748 #ifdef CONFIG_CIFS_STATS2
59749- atomic_inc(&totSmBufAllocCount);
59750+ atomic_inc_unchecked(&totSmBufAllocCount);
59751 #endif /* CONFIG_CIFS_STATS2 */
59752
59753 }
59754diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
59755index d297903..1cb7516 100644
59756--- a/fs/cifs/smb1ops.c
59757+++ b/fs/cifs/smb1ops.c
59758@@ -622,27 +622,27 @@ static void
59759 cifs_clear_stats(struct cifs_tcon *tcon)
59760 {
59761 #ifdef CONFIG_CIFS_STATS
59762- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
59763- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
59764- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
59765- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
59766- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
59767- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
59768- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
59769- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
59770- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
59771- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
59772- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
59773- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
59774- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
59775- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
59776- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
59777- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
59778- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
59779- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
59780- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
59781- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
59782- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
59783+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
59784+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
59785+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
59786+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
59787+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
59788+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
59789+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
59790+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
59791+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
59792+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
59793+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
59794+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
59795+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
59796+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
59797+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
59798+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
59799+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
59800+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
59801+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
59802+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
59803+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
59804 #endif
59805 }
59806
59807@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
59808 {
59809 #ifdef CONFIG_CIFS_STATS
59810 seq_printf(m, " Oplocks breaks: %d",
59811- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
59812+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
59813 seq_printf(m, "\nReads: %d Bytes: %llu",
59814- atomic_read(&tcon->stats.cifs_stats.num_reads),
59815+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
59816 (long long)(tcon->bytes_read));
59817 seq_printf(m, "\nWrites: %d Bytes: %llu",
59818- atomic_read(&tcon->stats.cifs_stats.num_writes),
59819+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
59820 (long long)(tcon->bytes_written));
59821 seq_printf(m, "\nFlushes: %d",
59822- atomic_read(&tcon->stats.cifs_stats.num_flushes));
59823+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
59824 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
59825- atomic_read(&tcon->stats.cifs_stats.num_locks),
59826- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
59827- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
59828+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
59829+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
59830+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
59831 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
59832- atomic_read(&tcon->stats.cifs_stats.num_opens),
59833- atomic_read(&tcon->stats.cifs_stats.num_closes),
59834- atomic_read(&tcon->stats.cifs_stats.num_deletes));
59835+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
59836+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
59837+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
59838 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
59839- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
59840- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
59841+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
59842+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
59843 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
59844- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
59845- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
59846+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
59847+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
59848 seq_printf(m, "\nRenames: %d T2 Renames %d",
59849- atomic_read(&tcon->stats.cifs_stats.num_renames),
59850- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
59851+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
59852+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
59853 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
59854- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
59855- atomic_read(&tcon->stats.cifs_stats.num_fnext),
59856- atomic_read(&tcon->stats.cifs_stats.num_fclose));
59857+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
59858+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
59859+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
59860 #endif
59861 }
59862
59863diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
59864index c5f521b..1a40865 100644
59865--- a/fs/cifs/smb2ops.c
59866+++ b/fs/cifs/smb2ops.c
59867@@ -417,8 +417,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
59868 #ifdef CONFIG_CIFS_STATS
59869 int i;
59870 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
59871- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
59872- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
59873+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
59874+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
59875 }
59876 #endif
59877 }
59878@@ -458,65 +458,65 @@ static void
59879 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
59880 {
59881 #ifdef CONFIG_CIFS_STATS
59882- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
59883- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
59884+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
59885+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
59886 seq_printf(m, "\nNegotiates: %d sent %d failed",
59887- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
59888- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
59889+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
59890+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
59891 seq_printf(m, "\nSessionSetups: %d sent %d failed",
59892- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
59893- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
59894+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
59895+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
59896 seq_printf(m, "\nLogoffs: %d sent %d failed",
59897- atomic_read(&sent[SMB2_LOGOFF_HE]),
59898- atomic_read(&failed[SMB2_LOGOFF_HE]));
59899+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
59900+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
59901 seq_printf(m, "\nTreeConnects: %d sent %d failed",
59902- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
59903- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
59904+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
59905+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
59906 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
59907- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
59908- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
59909+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
59910+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
59911 seq_printf(m, "\nCreates: %d sent %d failed",
59912- atomic_read(&sent[SMB2_CREATE_HE]),
59913- atomic_read(&failed[SMB2_CREATE_HE]));
59914+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
59915+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
59916 seq_printf(m, "\nCloses: %d sent %d failed",
59917- atomic_read(&sent[SMB2_CLOSE_HE]),
59918- atomic_read(&failed[SMB2_CLOSE_HE]));
59919+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
59920+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
59921 seq_printf(m, "\nFlushes: %d sent %d failed",
59922- atomic_read(&sent[SMB2_FLUSH_HE]),
59923- atomic_read(&failed[SMB2_FLUSH_HE]));
59924+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
59925+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
59926 seq_printf(m, "\nReads: %d sent %d failed",
59927- atomic_read(&sent[SMB2_READ_HE]),
59928- atomic_read(&failed[SMB2_READ_HE]));
59929+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
59930+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
59931 seq_printf(m, "\nWrites: %d sent %d failed",
59932- atomic_read(&sent[SMB2_WRITE_HE]),
59933- atomic_read(&failed[SMB2_WRITE_HE]));
59934+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
59935+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
59936 seq_printf(m, "\nLocks: %d sent %d failed",
59937- atomic_read(&sent[SMB2_LOCK_HE]),
59938- atomic_read(&failed[SMB2_LOCK_HE]));
59939+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
59940+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
59941 seq_printf(m, "\nIOCTLs: %d sent %d failed",
59942- atomic_read(&sent[SMB2_IOCTL_HE]),
59943- atomic_read(&failed[SMB2_IOCTL_HE]));
59944+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
59945+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
59946 seq_printf(m, "\nCancels: %d sent %d failed",
59947- atomic_read(&sent[SMB2_CANCEL_HE]),
59948- atomic_read(&failed[SMB2_CANCEL_HE]));
59949+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
59950+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
59951 seq_printf(m, "\nEchos: %d sent %d failed",
59952- atomic_read(&sent[SMB2_ECHO_HE]),
59953- atomic_read(&failed[SMB2_ECHO_HE]));
59954+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
59955+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
59956 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
59957- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
59958- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
59959+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
59960+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
59961 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
59962- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
59963- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
59964+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
59965+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
59966 seq_printf(m, "\nQueryInfos: %d sent %d failed",
59967- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
59968- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
59969+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
59970+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
59971 seq_printf(m, "\nSetInfos: %d sent %d failed",
59972- atomic_read(&sent[SMB2_SET_INFO_HE]),
59973- atomic_read(&failed[SMB2_SET_INFO_HE]));
59974+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
59975+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
59976 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
59977- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
59978- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
59979+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
59980+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
59981 #endif
59982 }
59983
59984diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
59985index 8f1672b..af339c07 100644
59986--- a/fs/cifs/smb2pdu.c
59987+++ b/fs/cifs/smb2pdu.c
59988@@ -2145,8 +2145,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
59989 default:
59990 cifs_dbg(VFS, "info level %u isn't supported\n",
59991 srch_inf->info_level);
59992- rc = -EINVAL;
59993- goto qdir_exit;
59994+ return -EINVAL;
59995 }
59996
59997 req->FileIndex = cpu_to_le32(index);
59998diff --git a/fs/coda/cache.c b/fs/coda/cache.c
59999index 46ee6f2..89a9e7f 100644
60000--- a/fs/coda/cache.c
60001+++ b/fs/coda/cache.c
60002@@ -24,7 +24,7 @@
60003 #include "coda_linux.h"
60004 #include "coda_cache.h"
60005
60006-static atomic_t permission_epoch = ATOMIC_INIT(0);
60007+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
60008
60009 /* replace or extend an acl cache hit */
60010 void coda_cache_enter(struct inode *inode, int mask)
60011@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
60012 struct coda_inode_info *cii = ITOC(inode);
60013
60014 spin_lock(&cii->c_lock);
60015- cii->c_cached_epoch = atomic_read(&permission_epoch);
60016+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
60017 if (!uid_eq(cii->c_uid, current_fsuid())) {
60018 cii->c_uid = current_fsuid();
60019 cii->c_cached_perm = mask;
60020@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
60021 {
60022 struct coda_inode_info *cii = ITOC(inode);
60023 spin_lock(&cii->c_lock);
60024- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
60025+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
60026 spin_unlock(&cii->c_lock);
60027 }
60028
60029 /* remove all acl caches */
60030 void coda_cache_clear_all(struct super_block *sb)
60031 {
60032- atomic_inc(&permission_epoch);
60033+ atomic_inc_unchecked(&permission_epoch);
60034 }
60035
60036
60037@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
60038 spin_lock(&cii->c_lock);
60039 hit = (mask & cii->c_cached_perm) == mask &&
60040 uid_eq(cii->c_uid, current_fsuid()) &&
60041- cii->c_cached_epoch == atomic_read(&permission_epoch);
60042+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
60043 spin_unlock(&cii->c_lock);
60044
60045 return hit;
60046diff --git a/fs/compat.c b/fs/compat.c
60047index b13df99..6f6f4a3 100644
60048--- a/fs/compat.c
60049+++ b/fs/compat.c
60050@@ -54,7 +54,7 @@
60051 #include <asm/ioctls.h>
60052 #include "internal.h"
60053
60054-int compat_log = 1;
60055+int compat_log = 0;
60056
60057 int compat_printk(const char *fmt, ...)
60058 {
60059@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
60060
60061 set_fs(KERNEL_DS);
60062 /* The __user pointer cast is valid because of the set_fs() */
60063- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
60064+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
60065 set_fs(oldfs);
60066 /* truncating is ok because it's a user address */
60067 if (!ret)
60068@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
60069 goto out;
60070
60071 ret = -EINVAL;
60072- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
60073+ if (nr_segs > UIO_MAXIOV)
60074 goto out;
60075 if (nr_segs > fast_segs) {
60076 ret = -ENOMEM;
60077@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
60078 struct compat_readdir_callback {
60079 struct dir_context ctx;
60080 struct compat_old_linux_dirent __user *dirent;
60081+ struct file * file;
60082 int result;
60083 };
60084
60085@@ -861,6 +862,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
60086 buf->result = -EOVERFLOW;
60087 return -EOVERFLOW;
60088 }
60089+
60090+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60091+ return 0;
60092+
60093 buf->result++;
60094 dirent = buf->dirent;
60095 if (!access_ok(VERIFY_WRITE, dirent,
60096@@ -892,6 +897,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
60097 if (!f.file)
60098 return -EBADF;
60099
60100+ buf.file = f.file;
60101 error = iterate_dir(f.file, &buf.ctx);
60102 if (buf.result)
60103 error = buf.result;
60104@@ -911,6 +917,7 @@ struct compat_getdents_callback {
60105 struct dir_context ctx;
60106 struct compat_linux_dirent __user *current_dir;
60107 struct compat_linux_dirent __user *previous;
60108+ struct file * file;
60109 int count;
60110 int error;
60111 };
60112@@ -932,6 +939,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
60113 buf->error = -EOVERFLOW;
60114 return -EOVERFLOW;
60115 }
60116+
60117+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60118+ return 0;
60119+
60120 dirent = buf->previous;
60121 if (dirent) {
60122 if (__put_user(offset, &dirent->d_off))
60123@@ -977,6 +988,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
60124 if (!f.file)
60125 return -EBADF;
60126
60127+ buf.file = f.file;
60128 error = iterate_dir(f.file, &buf.ctx);
60129 if (error >= 0)
60130 error = buf.error;
60131@@ -997,6 +1009,7 @@ struct compat_getdents_callback64 {
60132 struct dir_context ctx;
60133 struct linux_dirent64 __user *current_dir;
60134 struct linux_dirent64 __user *previous;
60135+ struct file * file;
60136 int count;
60137 int error;
60138 };
60139@@ -1013,6 +1026,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
60140 buf->error = -EINVAL; /* only used if we fail.. */
60141 if (reclen > buf->count)
60142 return -EINVAL;
60143+
60144+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
60145+ return 0;
60146+
60147 dirent = buf->previous;
60148
60149 if (dirent) {
60150@@ -1062,6 +1079,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
60151 if (!f.file)
60152 return -EBADF;
60153
60154+ buf.file = f.file;
60155 error = iterate_dir(f.file, &buf.ctx);
60156 if (error >= 0)
60157 error = buf.error;
60158diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
60159index 4d24d17..4f8c09e 100644
60160--- a/fs/compat_binfmt_elf.c
60161+++ b/fs/compat_binfmt_elf.c
60162@@ -30,11 +30,13 @@
60163 #undef elf_phdr
60164 #undef elf_shdr
60165 #undef elf_note
60166+#undef elf_dyn
60167 #undef elf_addr_t
60168 #define elfhdr elf32_hdr
60169 #define elf_phdr elf32_phdr
60170 #define elf_shdr elf32_shdr
60171 #define elf_note elf32_note
60172+#define elf_dyn Elf32_Dyn
60173 #define elf_addr_t Elf32_Addr
60174
60175 /*
60176diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
60177index afec645..9c65620 100644
60178--- a/fs/compat_ioctl.c
60179+++ b/fs/compat_ioctl.c
60180@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
60181 return -EFAULT;
60182 if (__get_user(udata, &ss32->iomem_base))
60183 return -EFAULT;
60184- ss.iomem_base = compat_ptr(udata);
60185+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
60186 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
60187 __get_user(ss.port_high, &ss32->port_high))
60188 return -EFAULT;
60189@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
60190 for (i = 0; i < nmsgs; i++) {
60191 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
60192 return -EFAULT;
60193- if (get_user(datap, &umsgs[i].buf) ||
60194- put_user(compat_ptr(datap), &tmsgs[i].buf))
60195+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
60196+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
60197 return -EFAULT;
60198 }
60199 return sys_ioctl(fd, cmd, (unsigned long)tdata);
60200@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
60201 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
60202 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
60203 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
60204- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
60205+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
60206 return -EFAULT;
60207
60208 return ioctl_preallocate(file, p);
60209@@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
60210 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
60211 {
60212 unsigned int a, b;
60213- a = *(unsigned int *)p;
60214- b = *(unsigned int *)q;
60215+ a = *(const unsigned int *)p;
60216+ b = *(const unsigned int *)q;
60217 if (a > b)
60218 return 1;
60219 if (a < b)
60220diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
60221index 668dcab..daebcd6 100644
60222--- a/fs/configfs/dir.c
60223+++ b/fs/configfs/dir.c
60224@@ -1548,7 +1548,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60225 }
60226 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
60227 struct configfs_dirent *next;
60228- const char *name;
60229+ const unsigned char * name;
60230+ char d_name[sizeof(next->s_dentry->d_iname)];
60231 int len;
60232 struct inode *inode = NULL;
60233
60234@@ -1557,7 +1558,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
60235 continue;
60236
60237 name = configfs_get_name(next);
60238- len = strlen(name);
60239+ if (next->s_dentry && name == next->s_dentry->d_iname) {
60240+ len = next->s_dentry->d_name.len;
60241+ memcpy(d_name, name, len);
60242+ name = d_name;
60243+ } else
60244+ len = strlen(name);
60245
60246 /*
60247 * We'll have a dentry and an inode for
60248diff --git a/fs/coredump.c b/fs/coredump.c
60249index b5c86ff..0dac262 100644
60250--- a/fs/coredump.c
60251+++ b/fs/coredump.c
60252@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
60253 struct pipe_inode_info *pipe = file->private_data;
60254
60255 pipe_lock(pipe);
60256- pipe->readers++;
60257- pipe->writers--;
60258+ atomic_inc(&pipe->readers);
60259+ atomic_dec(&pipe->writers);
60260 wake_up_interruptible_sync(&pipe->wait);
60261 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
60262 pipe_unlock(pipe);
60263@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
60264 * We actually want wait_event_freezable() but then we need
60265 * to clear TIF_SIGPENDING and improve dump_interrupted().
60266 */
60267- wait_event_interruptible(pipe->wait, pipe->readers == 1);
60268+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
60269
60270 pipe_lock(pipe);
60271- pipe->readers--;
60272- pipe->writers++;
60273+ atomic_dec(&pipe->readers);
60274+ atomic_inc(&pipe->writers);
60275 pipe_unlock(pipe);
60276 }
60277
60278@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
60279 struct files_struct *displaced;
60280 bool need_nonrelative = false;
60281 bool core_dumped = false;
60282- static atomic_t core_dump_count = ATOMIC_INIT(0);
60283+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
60284+ long signr = siginfo->si_signo;
60285+ int dumpable;
60286 struct coredump_params cprm = {
60287 .siginfo = siginfo,
60288 .regs = signal_pt_regs(),
60289@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
60290 .mm_flags = mm->flags,
60291 };
60292
60293- audit_core_dumps(siginfo->si_signo);
60294+ audit_core_dumps(signr);
60295+
60296+ dumpable = __get_dumpable(cprm.mm_flags);
60297+
60298+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
60299+ gr_handle_brute_attach(dumpable);
60300
60301 binfmt = mm->binfmt;
60302 if (!binfmt || !binfmt->core_dump)
60303 goto fail;
60304- if (!__get_dumpable(cprm.mm_flags))
60305+ if (!dumpable)
60306 goto fail;
60307
60308 cred = prepare_creds();
60309@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
60310 need_nonrelative = true;
60311 }
60312
60313- retval = coredump_wait(siginfo->si_signo, &core_state);
60314+ retval = coredump_wait(signr, &core_state);
60315 if (retval < 0)
60316 goto fail_creds;
60317
60318@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
60319 }
60320 cprm.limit = RLIM_INFINITY;
60321
60322- dump_count = atomic_inc_return(&core_dump_count);
60323+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
60324 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
60325 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
60326 task_tgid_vnr(current), current->comm);
60327@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
60328 } else {
60329 struct inode *inode;
60330
60331+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
60332+
60333 if (cprm.limit < binfmt->min_coredump)
60334 goto fail_unlock;
60335
60336@@ -681,7 +690,7 @@ close_fail:
60337 filp_close(cprm.file, NULL);
60338 fail_dropcount:
60339 if (ispipe)
60340- atomic_dec(&core_dump_count);
60341+ atomic_dec_unchecked(&core_dump_count);
60342 fail_unlock:
60343 kfree(cn.corename);
60344 coredump_finish(mm, core_dumped);
60345@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
60346 struct file *file = cprm->file;
60347 loff_t pos = file->f_pos;
60348 ssize_t n;
60349+
60350+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
60351 if (cprm->written + nr > cprm->limit)
60352 return 0;
60353 while (nr) {
60354diff --git a/fs/dcache.c b/fs/dcache.c
60355index 71acf8d..815e743 100644
60356--- a/fs/dcache.c
60357+++ b/fs/dcache.c
60358@@ -508,7 +508,7 @@ static void __dentry_kill(struct dentry *dentry)
60359 * dentry_iput drops the locks, at which point nobody (except
60360 * transient RCU lookups) can reach this dentry.
60361 */
60362- BUG_ON((int)dentry->d_lockref.count > 0);
60363+ BUG_ON((int)__lockref_read(&dentry->d_lockref) > 0);
60364 this_cpu_dec(nr_dentry);
60365 if (dentry->d_op && dentry->d_op->d_release)
60366 dentry->d_op->d_release(dentry);
60367@@ -561,7 +561,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
60368 struct dentry *parent = dentry->d_parent;
60369 if (IS_ROOT(dentry))
60370 return NULL;
60371- if (unlikely((int)dentry->d_lockref.count < 0))
60372+ if (unlikely((int)__lockref_read(&dentry->d_lockref) < 0))
60373 return NULL;
60374 if (likely(spin_trylock(&parent->d_lock)))
60375 return parent;
60376@@ -638,7 +638,7 @@ repeat:
60377 dentry->d_flags |= DCACHE_REFERENCED;
60378 dentry_lru_add(dentry);
60379
60380- dentry->d_lockref.count--;
60381+ __lockref_dec(&dentry->d_lockref);
60382 spin_unlock(&dentry->d_lock);
60383 return;
60384
60385@@ -653,7 +653,7 @@ EXPORT_SYMBOL(dput);
60386 /* This must be called with d_lock held */
60387 static inline void __dget_dlock(struct dentry *dentry)
60388 {
60389- dentry->d_lockref.count++;
60390+ __lockref_inc(&dentry->d_lockref);
60391 }
60392
60393 static inline void __dget(struct dentry *dentry)
60394@@ -694,8 +694,8 @@ repeat:
60395 goto repeat;
60396 }
60397 rcu_read_unlock();
60398- BUG_ON(!ret->d_lockref.count);
60399- ret->d_lockref.count++;
60400+ BUG_ON(!__lockref_read(&ret->d_lockref));
60401+ __lockref_inc(&ret->d_lockref);
60402 spin_unlock(&ret->d_lock);
60403 return ret;
60404 }
60405@@ -773,9 +773,9 @@ restart:
60406 spin_lock(&inode->i_lock);
60407 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
60408 spin_lock(&dentry->d_lock);
60409- if (!dentry->d_lockref.count) {
60410+ if (!__lockref_read(&dentry->d_lockref)) {
60411 struct dentry *parent = lock_parent(dentry);
60412- if (likely(!dentry->d_lockref.count)) {
60413+ if (likely(!__lockref_read(&dentry->d_lockref))) {
60414 __dentry_kill(dentry);
60415 dput(parent);
60416 goto restart;
60417@@ -810,7 +810,7 @@ static void shrink_dentry_list(struct list_head *list)
60418 * We found an inuse dentry which was not removed from
60419 * the LRU because of laziness during lookup. Do not free it.
60420 */
60421- if ((int)dentry->d_lockref.count > 0) {
60422+ if ((int)__lockref_read(&dentry->d_lockref) > 0) {
60423 spin_unlock(&dentry->d_lock);
60424 if (parent)
60425 spin_unlock(&parent->d_lock);
60426@@ -848,8 +848,8 @@ static void shrink_dentry_list(struct list_head *list)
60427 dentry = parent;
60428 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
60429 parent = lock_parent(dentry);
60430- if (dentry->d_lockref.count != 1) {
60431- dentry->d_lockref.count--;
60432+ if (__lockref_read(&dentry->d_lockref) != 1) {
60433+ __lockref_inc(&dentry->d_lockref);
60434 spin_unlock(&dentry->d_lock);
60435 if (parent)
60436 spin_unlock(&parent->d_lock);
60437@@ -889,7 +889,7 @@ dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg)
60438 * counts, just remove them from the LRU. Otherwise give them
60439 * another pass through the LRU.
60440 */
60441- if (dentry->d_lockref.count) {
60442+ if (__lockref_read(&dentry->d_lockref) > 0) {
60443 d_lru_isolate(dentry);
60444 spin_unlock(&dentry->d_lock);
60445 return LRU_REMOVED;
60446@@ -1225,7 +1225,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
60447 } else {
60448 if (dentry->d_flags & DCACHE_LRU_LIST)
60449 d_lru_del(dentry);
60450- if (!dentry->d_lockref.count) {
60451+ if (!__lockref_read(&dentry->d_lockref)) {
60452 d_shrink_add(dentry, &data->dispose);
60453 data->found++;
60454 }
60455@@ -1273,7 +1273,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60456 return D_WALK_CONTINUE;
60457
60458 /* root with refcount 1 is fine */
60459- if (dentry == _data && dentry->d_lockref.count == 1)
60460+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
60461 return D_WALK_CONTINUE;
60462
60463 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
60464@@ -1282,7 +1282,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
60465 dentry->d_inode ?
60466 dentry->d_inode->i_ino : 0UL,
60467 dentry,
60468- dentry->d_lockref.count,
60469+ __lockref_read(&dentry->d_lockref),
60470 dentry->d_sb->s_type->name,
60471 dentry->d_sb->s_id);
60472 WARN_ON(1);
60473@@ -1423,7 +1423,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
60474 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
60475 if (name->len > DNAME_INLINE_LEN-1) {
60476 size_t size = offsetof(struct external_name, name[1]);
60477- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
60478+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
60479 if (!p) {
60480 kmem_cache_free(dentry_cache, dentry);
60481 return NULL;
60482@@ -1443,7 +1443,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
60483 smp_wmb();
60484 dentry->d_name.name = dname;
60485
60486- dentry->d_lockref.count = 1;
60487+ __lockref_set(&dentry->d_lockref, 1);
60488 dentry->d_flags = 0;
60489 spin_lock_init(&dentry->d_lock);
60490 seqcount_init(&dentry->d_seq);
60491@@ -2183,7 +2183,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
60492 goto next;
60493 }
60494
60495- dentry->d_lockref.count++;
60496+ __lockref_inc(&dentry->d_lockref);
60497 found = dentry;
60498 spin_unlock(&dentry->d_lock);
60499 break;
60500@@ -2282,7 +2282,7 @@ again:
60501 spin_lock(&dentry->d_lock);
60502 inode = dentry->d_inode;
60503 isdir = S_ISDIR(inode->i_mode);
60504- if (dentry->d_lockref.count == 1) {
60505+ if (__lockref_read(&dentry->d_lockref) == 1) {
60506 if (!spin_trylock(&inode->i_lock)) {
60507 spin_unlock(&dentry->d_lock);
60508 cpu_relax();
60509@@ -3306,7 +3306,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
60510
60511 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
60512 dentry->d_flags |= DCACHE_GENOCIDE;
60513- dentry->d_lockref.count--;
60514+ __lockref_dec(&dentry->d_lockref);
60515 }
60516 }
60517 return D_WALK_CONTINUE;
60518@@ -3422,7 +3422,8 @@ void __init vfs_caches_init(unsigned long mempages)
60519 mempages -= reserve;
60520
60521 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
60522- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
60523+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
60524+ SLAB_NO_SANITIZE, NULL);
60525
60526 dcache_init();
60527 inode_init();
60528diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
60529index 05f2960..b012481 100644
60530--- a/fs/debugfs/inode.c
60531+++ b/fs/debugfs/inode.c
60532@@ -416,7 +416,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
60533 */
60534 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
60535 {
60536+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
60537+ return __create_file(name, S_IFDIR | S_IRWXU,
60538+#else
60539 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
60540+#endif
60541 parent, NULL, NULL);
60542 }
60543 EXPORT_SYMBOL_GPL(debugfs_create_dir);
60544diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
60545index 1686dc2..9611c50 100644
60546--- a/fs/ecryptfs/inode.c
60547+++ b/fs/ecryptfs/inode.c
60548@@ -664,7 +664,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
60549 old_fs = get_fs();
60550 set_fs(get_ds());
60551 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
60552- (char __user *)lower_buf,
60553+ (char __force_user *)lower_buf,
60554 PATH_MAX);
60555 set_fs(old_fs);
60556 if (rc < 0)
60557diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
60558index e4141f2..d8263e8 100644
60559--- a/fs/ecryptfs/miscdev.c
60560+++ b/fs/ecryptfs/miscdev.c
60561@@ -304,7 +304,7 @@ check_list:
60562 goto out_unlock_msg_ctx;
60563 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
60564 if (msg_ctx->msg) {
60565- if (copy_to_user(&buf[i], packet_length, packet_length_size))
60566+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
60567 goto out_unlock_msg_ctx;
60568 i += packet_length_size;
60569 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
60570diff --git a/fs/exec.c b/fs/exec.c
60571index 7302b75..7d61d19 100644
60572--- a/fs/exec.c
60573+++ b/fs/exec.c
60574@@ -56,8 +56,20 @@
60575 #include <linux/pipe_fs_i.h>
60576 #include <linux/oom.h>
60577 #include <linux/compat.h>
60578+#include <linux/random.h>
60579+#include <linux/seq_file.h>
60580+#include <linux/coredump.h>
60581+#include <linux/mman.h>
60582+
60583+#ifdef CONFIG_PAX_REFCOUNT
60584+#include <linux/kallsyms.h>
60585+#include <linux/kdebug.h>
60586+#endif
60587+
60588+#include <trace/events/fs.h>
60589
60590 #include <asm/uaccess.h>
60591+#include <asm/sections.h>
60592 #include <asm/mmu_context.h>
60593 #include <asm/tlb.h>
60594
60595@@ -66,19 +78,34 @@
60596
60597 #include <trace/events/sched.h>
60598
60599+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
60600+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
60601+{
60602+ 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");
60603+}
60604+#endif
60605+
60606+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
60607+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
60608+EXPORT_SYMBOL(pax_set_initial_flags_func);
60609+#endif
60610+
60611 int suid_dumpable = 0;
60612
60613 static LIST_HEAD(formats);
60614 static DEFINE_RWLOCK(binfmt_lock);
60615
60616+extern int gr_process_kernel_exec_ban(void);
60617+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
60618+
60619 void __register_binfmt(struct linux_binfmt * fmt, int insert)
60620 {
60621 BUG_ON(!fmt);
60622 if (WARN_ON(!fmt->load_binary))
60623 return;
60624 write_lock(&binfmt_lock);
60625- insert ? list_add(&fmt->lh, &formats) :
60626- list_add_tail(&fmt->lh, &formats);
60627+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
60628+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
60629 write_unlock(&binfmt_lock);
60630 }
60631
60632@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
60633 void unregister_binfmt(struct linux_binfmt * fmt)
60634 {
60635 write_lock(&binfmt_lock);
60636- list_del(&fmt->lh);
60637+ pax_list_del((struct list_head *)&fmt->lh);
60638 write_unlock(&binfmt_lock);
60639 }
60640
60641@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
60642 int write)
60643 {
60644 struct page *page;
60645- int ret;
60646
60647-#ifdef CONFIG_STACK_GROWSUP
60648- if (write) {
60649- ret = expand_downwards(bprm->vma, pos);
60650- if (ret < 0)
60651- return NULL;
60652- }
60653-#endif
60654- ret = get_user_pages(current, bprm->mm, pos,
60655- 1, write, 1, &page, NULL);
60656- if (ret <= 0)
60657+ if (0 > expand_downwards(bprm->vma, pos))
60658+ return NULL;
60659+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
60660 return NULL;
60661
60662 if (write) {
60663@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
60664 if (size <= ARG_MAX)
60665 return page;
60666
60667+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60668+ // only allow 512KB for argv+env on suid/sgid binaries
60669+ // to prevent easy ASLR exhaustion
60670+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
60671+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
60672+ (size > (512 * 1024))) {
60673+ put_page(page);
60674+ return NULL;
60675+ }
60676+#endif
60677+
60678 /*
60679 * Limit to 1/4-th the stack size for the argv+env strings.
60680 * This ensures that:
60681@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
60682 vma->vm_end = STACK_TOP_MAX;
60683 vma->vm_start = vma->vm_end - PAGE_SIZE;
60684 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
60685+
60686+#ifdef CONFIG_PAX_SEGMEXEC
60687+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
60688+#endif
60689+
60690 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
60691 INIT_LIST_HEAD(&vma->anon_vma_chain);
60692
60693@@ -279,6 +314,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
60694 mm->stack_vm = mm->total_vm = 1;
60695 up_write(&mm->mmap_sem);
60696 bprm->p = vma->vm_end - sizeof(void *);
60697+
60698+#ifdef CONFIG_PAX_RANDUSTACK
60699+ if (randomize_va_space)
60700+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
60701+#endif
60702+
60703 return 0;
60704 err:
60705 up_write(&mm->mmap_sem);
60706@@ -395,7 +436,7 @@ struct user_arg_ptr {
60707 } ptr;
60708 };
60709
60710-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60711+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60712 {
60713 const char __user *native;
60714
60715@@ -404,14 +445,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
60716 compat_uptr_t compat;
60717
60718 if (get_user(compat, argv.ptr.compat + nr))
60719- return ERR_PTR(-EFAULT);
60720+ return (const char __force_user *)ERR_PTR(-EFAULT);
60721
60722 return compat_ptr(compat);
60723 }
60724 #endif
60725
60726 if (get_user(native, argv.ptr.native + nr))
60727- return ERR_PTR(-EFAULT);
60728+ return (const char __force_user *)ERR_PTR(-EFAULT);
60729
60730 return native;
60731 }
60732@@ -430,7 +471,7 @@ static int count(struct user_arg_ptr argv, int max)
60733 if (!p)
60734 break;
60735
60736- if (IS_ERR(p))
60737+ if (IS_ERR((const char __force_kernel *)p))
60738 return -EFAULT;
60739
60740 if (i >= max)
60741@@ -465,7 +506,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
60742
60743 ret = -EFAULT;
60744 str = get_user_arg_ptr(argv, argc);
60745- if (IS_ERR(str))
60746+ if (IS_ERR((const char __force_kernel *)str))
60747 goto out;
60748
60749 len = strnlen_user(str, MAX_ARG_STRLEN);
60750@@ -547,7 +588,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
60751 int r;
60752 mm_segment_t oldfs = get_fs();
60753 struct user_arg_ptr argv = {
60754- .ptr.native = (const char __user *const __user *)__argv,
60755+ .ptr.native = (const char __user * const __force_user *)__argv,
60756 };
60757
60758 set_fs(KERNEL_DS);
60759@@ -582,7 +623,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
60760 unsigned long new_end = old_end - shift;
60761 struct mmu_gather tlb;
60762
60763- BUG_ON(new_start > new_end);
60764+ if (new_start >= new_end || new_start < mmap_min_addr)
60765+ return -ENOMEM;
60766
60767 /*
60768 * ensure there are no vmas between where we want to go
60769@@ -591,6 +633,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
60770 if (vma != find_vma(mm, new_start))
60771 return -EFAULT;
60772
60773+#ifdef CONFIG_PAX_SEGMEXEC
60774+ BUG_ON(pax_find_mirror_vma(vma));
60775+#endif
60776+
60777 /*
60778 * cover the whole range: [new_start, old_end)
60779 */
60780@@ -671,10 +717,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
60781 stack_top = arch_align_stack(stack_top);
60782 stack_top = PAGE_ALIGN(stack_top);
60783
60784- if (unlikely(stack_top < mmap_min_addr) ||
60785- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
60786- return -ENOMEM;
60787-
60788 stack_shift = vma->vm_end - stack_top;
60789
60790 bprm->p -= stack_shift;
60791@@ -686,8 +728,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
60792 bprm->exec -= stack_shift;
60793
60794 down_write(&mm->mmap_sem);
60795+
60796+ /* Move stack pages down in memory. */
60797+ if (stack_shift) {
60798+ ret = shift_arg_pages(vma, stack_shift);
60799+ if (ret)
60800+ goto out_unlock;
60801+ }
60802+
60803 vm_flags = VM_STACK_FLAGS;
60804
60805+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
60806+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
60807+ vm_flags &= ~VM_EXEC;
60808+
60809+#ifdef CONFIG_PAX_MPROTECT
60810+ if (mm->pax_flags & MF_PAX_MPROTECT)
60811+ vm_flags &= ~VM_MAYEXEC;
60812+#endif
60813+
60814+ }
60815+#endif
60816+
60817 /*
60818 * Adjust stack execute permissions; explicitly enable for
60819 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
60820@@ -706,13 +768,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
60821 goto out_unlock;
60822 BUG_ON(prev != vma);
60823
60824- /* Move stack pages down in memory. */
60825- if (stack_shift) {
60826- ret = shift_arg_pages(vma, stack_shift);
60827- if (ret)
60828- goto out_unlock;
60829- }
60830-
60831 /* mprotect_fixup is overkill to remove the temporary stack flags */
60832 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
60833
60834@@ -736,6 +791,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
60835 #endif
60836 current->mm->start_stack = bprm->p;
60837 ret = expand_stack(vma, stack_base);
60838+
60839+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
60840+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
60841+ unsigned long size;
60842+ vm_flags_t vm_flags;
60843+
60844+ size = STACK_TOP - vma->vm_end;
60845+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
60846+
60847+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
60848+
60849+#ifdef CONFIG_X86
60850+ if (!ret) {
60851+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
60852+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
60853+ }
60854+#endif
60855+
60856+ }
60857+#endif
60858+
60859 if (ret)
60860 ret = -EFAULT;
60861
60862@@ -771,6 +847,8 @@ static struct file *do_open_exec(struct filename *name)
60863
60864 fsnotify_open(file);
60865
60866+ trace_open_exec(name->name);
60867+
60868 err = deny_write_access(file);
60869 if (err)
60870 goto exit;
60871@@ -800,7 +878,7 @@ int kernel_read(struct file *file, loff_t offset,
60872 old_fs = get_fs();
60873 set_fs(get_ds());
60874 /* The cast to a user pointer is valid due to the set_fs() */
60875- result = vfs_read(file, (void __user *)addr, count, &pos);
60876+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
60877 set_fs(old_fs);
60878 return result;
60879 }
60880@@ -845,6 +923,7 @@ static int exec_mmap(struct mm_struct *mm)
60881 tsk->mm = mm;
60882 tsk->active_mm = mm;
60883 activate_mm(active_mm, mm);
60884+ populate_stack();
60885 tsk->mm->vmacache_seqnum = 0;
60886 vmacache_flush(tsk);
60887 task_unlock(tsk);
60888@@ -1243,7 +1322,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
60889 }
60890 rcu_read_unlock();
60891
60892- if (p->fs->users > n_fs)
60893+ if (atomic_read(&p->fs->users) > n_fs)
60894 bprm->unsafe |= LSM_UNSAFE_SHARE;
60895 else
60896 p->fs->in_exec = 1;
60897@@ -1424,6 +1503,31 @@ static int exec_binprm(struct linux_binprm *bprm)
60898 return ret;
60899 }
60900
60901+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60902+static DEFINE_PER_CPU(u64, exec_counter);
60903+static int __init init_exec_counters(void)
60904+{
60905+ unsigned int cpu;
60906+
60907+ for_each_possible_cpu(cpu) {
60908+ per_cpu(exec_counter, cpu) = (u64)cpu;
60909+ }
60910+
60911+ return 0;
60912+}
60913+early_initcall(init_exec_counters);
60914+static inline void increment_exec_counter(void)
60915+{
60916+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
60917+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
60918+}
60919+#else
60920+static inline void increment_exec_counter(void) {}
60921+#endif
60922+
60923+extern void gr_handle_exec_args(struct linux_binprm *bprm,
60924+ struct user_arg_ptr argv);
60925+
60926 /*
60927 * sys_execve() executes a new program.
60928 */
60929@@ -1431,6 +1535,11 @@ static int do_execve_common(struct filename *filename,
60930 struct user_arg_ptr argv,
60931 struct user_arg_ptr envp)
60932 {
60933+#ifdef CONFIG_GRKERNSEC
60934+ struct file *old_exec_file;
60935+ struct acl_subject_label *old_acl;
60936+ struct rlimit old_rlim[RLIM_NLIMITS];
60937+#endif
60938 struct linux_binprm *bprm;
60939 struct file *file;
60940 struct files_struct *displaced;
60941@@ -1439,6 +1548,8 @@ static int do_execve_common(struct filename *filename,
60942 if (IS_ERR(filename))
60943 return PTR_ERR(filename);
60944
60945+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
60946+
60947 /*
60948 * We move the actual failure in case of RLIMIT_NPROC excess from
60949 * set*uid() to execve() because too many poorly written programs
60950@@ -1476,11 +1587,21 @@ static int do_execve_common(struct filename *filename,
60951 if (IS_ERR(file))
60952 goto out_unmark;
60953
60954+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
60955+ retval = -EPERM;
60956+ goto out_unmark;
60957+ }
60958+
60959 sched_exec();
60960
60961 bprm->file = file;
60962 bprm->filename = bprm->interp = filename->name;
60963
60964+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
60965+ retval = -EACCES;
60966+ goto out_unmark;
60967+ }
60968+
60969 retval = bprm_mm_init(bprm);
60970 if (retval)
60971 goto out_unmark;
60972@@ -1497,24 +1618,70 @@ static int do_execve_common(struct filename *filename,
60973 if (retval < 0)
60974 goto out;
60975
60976+#ifdef CONFIG_GRKERNSEC
60977+ old_acl = current->acl;
60978+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
60979+ old_exec_file = current->exec_file;
60980+ get_file(file);
60981+ current->exec_file = file;
60982+#endif
60983+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
60984+ /* limit suid stack to 8MB
60985+ * we saved the old limits above and will restore them if this exec fails
60986+ */
60987+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
60988+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
60989+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
60990+#endif
60991+
60992+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
60993+ retval = -EPERM;
60994+ goto out_fail;
60995+ }
60996+
60997+ if (!gr_tpe_allow(file)) {
60998+ retval = -EACCES;
60999+ goto out_fail;
61000+ }
61001+
61002+ if (gr_check_crash_exec(file)) {
61003+ retval = -EACCES;
61004+ goto out_fail;
61005+ }
61006+
61007+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
61008+ bprm->unsafe);
61009+ if (retval < 0)
61010+ goto out_fail;
61011+
61012 retval = copy_strings_kernel(1, &bprm->filename, bprm);
61013 if (retval < 0)
61014- goto out;
61015+ goto out_fail;
61016
61017 bprm->exec = bprm->p;
61018 retval = copy_strings(bprm->envc, envp, bprm);
61019 if (retval < 0)
61020- goto out;
61021+ goto out_fail;
61022
61023 retval = copy_strings(bprm->argc, argv, bprm);
61024 if (retval < 0)
61025- goto out;
61026+ goto out_fail;
61027+
61028+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
61029+
61030+ gr_handle_exec_args(bprm, argv);
61031
61032 retval = exec_binprm(bprm);
61033 if (retval < 0)
61034- goto out;
61035+ goto out_fail;
61036+#ifdef CONFIG_GRKERNSEC
61037+ if (old_exec_file)
61038+ fput(old_exec_file);
61039+#endif
61040
61041 /* execve succeeded */
61042+
61043+ increment_exec_counter();
61044 current->fs->in_exec = 0;
61045 current->in_execve = 0;
61046 acct_update_integrals(current);
61047@@ -1525,6 +1692,14 @@ static int do_execve_common(struct filename *filename,
61048 put_files_struct(displaced);
61049 return retval;
61050
61051+out_fail:
61052+#ifdef CONFIG_GRKERNSEC
61053+ current->acl = old_acl;
61054+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
61055+ fput(current->exec_file);
61056+ current->exec_file = old_exec_file;
61057+#endif
61058+
61059 out:
61060 if (bprm->mm) {
61061 acct_arg_size(bprm, 0);
61062@@ -1616,3 +1791,312 @@ COMPAT_SYSCALL_DEFINE3(execve, const char __user *, filename,
61063 return compat_do_execve(getname(filename), argv, envp);
61064 }
61065 #endif
61066+
61067+int pax_check_flags(unsigned long *flags)
61068+{
61069+ int retval = 0;
61070+
61071+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
61072+ if (*flags & MF_PAX_SEGMEXEC)
61073+ {
61074+ *flags &= ~MF_PAX_SEGMEXEC;
61075+ retval = -EINVAL;
61076+ }
61077+#endif
61078+
61079+ if ((*flags & MF_PAX_PAGEEXEC)
61080+
61081+#ifdef CONFIG_PAX_PAGEEXEC
61082+ && (*flags & MF_PAX_SEGMEXEC)
61083+#endif
61084+
61085+ )
61086+ {
61087+ *flags &= ~MF_PAX_PAGEEXEC;
61088+ retval = -EINVAL;
61089+ }
61090+
61091+ if ((*flags & MF_PAX_MPROTECT)
61092+
61093+#ifdef CONFIG_PAX_MPROTECT
61094+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61095+#endif
61096+
61097+ )
61098+ {
61099+ *flags &= ~MF_PAX_MPROTECT;
61100+ retval = -EINVAL;
61101+ }
61102+
61103+ if ((*flags & MF_PAX_EMUTRAMP)
61104+
61105+#ifdef CONFIG_PAX_EMUTRAMP
61106+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
61107+#endif
61108+
61109+ )
61110+ {
61111+ *flags &= ~MF_PAX_EMUTRAMP;
61112+ retval = -EINVAL;
61113+ }
61114+
61115+ return retval;
61116+}
61117+
61118+EXPORT_SYMBOL(pax_check_flags);
61119+
61120+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
61121+char *pax_get_path(const struct path *path, char *buf, int buflen)
61122+{
61123+ char *pathname = d_path(path, buf, buflen);
61124+
61125+ if (IS_ERR(pathname))
61126+ goto toolong;
61127+
61128+ pathname = mangle_path(buf, pathname, "\t\n\\");
61129+ if (!pathname)
61130+ goto toolong;
61131+
61132+ *pathname = 0;
61133+ return buf;
61134+
61135+toolong:
61136+ return "<path too long>";
61137+}
61138+EXPORT_SYMBOL(pax_get_path);
61139+
61140+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
61141+{
61142+ struct task_struct *tsk = current;
61143+ struct mm_struct *mm = current->mm;
61144+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
61145+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
61146+ char *path_exec = NULL;
61147+ char *path_fault = NULL;
61148+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
61149+ siginfo_t info = { };
61150+
61151+ if (buffer_exec && buffer_fault) {
61152+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
61153+
61154+ down_read(&mm->mmap_sem);
61155+ vma = mm->mmap;
61156+ while (vma && (!vma_exec || !vma_fault)) {
61157+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
61158+ vma_exec = vma;
61159+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
61160+ vma_fault = vma;
61161+ vma = vma->vm_next;
61162+ }
61163+ if (vma_exec)
61164+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
61165+ if (vma_fault) {
61166+ start = vma_fault->vm_start;
61167+ end = vma_fault->vm_end;
61168+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
61169+ if (vma_fault->vm_file)
61170+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
61171+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
61172+ path_fault = "<heap>";
61173+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
61174+ path_fault = "<stack>";
61175+ else
61176+ path_fault = "<anonymous mapping>";
61177+ }
61178+ up_read(&mm->mmap_sem);
61179+ }
61180+ if (tsk->signal->curr_ip)
61181+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
61182+ else
61183+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
61184+ 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),
61185+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
61186+ free_page((unsigned long)buffer_exec);
61187+ free_page((unsigned long)buffer_fault);
61188+ pax_report_insns(regs, pc, sp);
61189+ info.si_signo = SIGKILL;
61190+ info.si_errno = 0;
61191+ info.si_code = SI_KERNEL;
61192+ info.si_pid = 0;
61193+ info.si_uid = 0;
61194+ do_coredump(&info);
61195+}
61196+#endif
61197+
61198+#ifdef CONFIG_PAX_REFCOUNT
61199+void pax_report_refcount_overflow(struct pt_regs *regs)
61200+{
61201+ if (current->signal->curr_ip)
61202+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
61203+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
61204+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61205+ else
61206+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
61207+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
61208+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
61209+ preempt_disable();
61210+ show_regs(regs);
61211+ preempt_enable();
61212+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
61213+}
61214+#endif
61215+
61216+#ifdef CONFIG_PAX_USERCOPY
61217+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
61218+static noinline int check_stack_object(const void *obj, unsigned long len)
61219+{
61220+ const void * const stack = task_stack_page(current);
61221+ const void * const stackend = stack + THREAD_SIZE;
61222+
61223+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61224+ const void *frame = NULL;
61225+ const void *oldframe;
61226+#endif
61227+
61228+ if (obj + len < obj)
61229+ return -1;
61230+
61231+ if (obj + len <= stack || stackend <= obj)
61232+ return 0;
61233+
61234+ if (obj < stack || stackend < obj + len)
61235+ return -1;
61236+
61237+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
61238+ oldframe = __builtin_frame_address(1);
61239+ if (oldframe)
61240+ frame = __builtin_frame_address(2);
61241+ /*
61242+ low ----------------------------------------------> high
61243+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
61244+ ^----------------^
61245+ allow copies only within here
61246+ */
61247+ while (stack <= frame && frame < stackend) {
61248+ /* if obj + len extends past the last frame, this
61249+ check won't pass and the next frame will be 0,
61250+ causing us to bail out and correctly report
61251+ the copy as invalid
61252+ */
61253+ if (obj + len <= frame)
61254+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
61255+ oldframe = frame;
61256+ frame = *(const void * const *)frame;
61257+ }
61258+ return -1;
61259+#else
61260+ return 1;
61261+#endif
61262+}
61263+
61264+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
61265+{
61266+ if (current->signal->curr_ip)
61267+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61268+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61269+ else
61270+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
61271+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
61272+ dump_stack();
61273+ gr_handle_kernel_exploit();
61274+ do_group_exit(SIGKILL);
61275+}
61276+#endif
61277+
61278+#ifdef CONFIG_PAX_USERCOPY
61279+
61280+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
61281+{
61282+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
61283+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
61284+#ifdef CONFIG_MODULES
61285+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
61286+#else
61287+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
61288+#endif
61289+
61290+#else
61291+ unsigned long textlow = (unsigned long)_stext;
61292+ unsigned long texthigh = (unsigned long)_etext;
61293+
61294+#ifdef CONFIG_X86_64
61295+ /* check against linear mapping as well */
61296+ if (high > (unsigned long)__va(__pa(textlow)) &&
61297+ low < (unsigned long)__va(__pa(texthigh)))
61298+ return true;
61299+#endif
61300+
61301+#endif
61302+
61303+ if (high <= textlow || low >= texthigh)
61304+ return false;
61305+ else
61306+ return true;
61307+}
61308+#endif
61309+
61310+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
61311+{
61312+#ifdef CONFIG_PAX_USERCOPY
61313+ const char *type;
61314+#endif
61315+
61316+#ifndef CONFIG_STACK_GROWSUP
61317+ unsigned long stackstart = (unsigned long)task_stack_page(current);
61318+ unsigned long currentsp = (unsigned long)&stackstart;
61319+ if (unlikely((currentsp < stackstart + 512 ||
61320+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
61321+ BUG();
61322+#endif
61323+
61324+#ifndef CONFIG_PAX_USERCOPY_DEBUG
61325+ if (const_size)
61326+ return;
61327+#endif
61328+
61329+#ifdef CONFIG_PAX_USERCOPY
61330+ if (!n)
61331+ return;
61332+
61333+ type = check_heap_object(ptr, n);
61334+ if (!type) {
61335+ int ret = check_stack_object(ptr, n);
61336+ if (ret == 1 || ret == 2)
61337+ return;
61338+ if (ret == 0) {
61339+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
61340+ type = "<kernel text>";
61341+ else
61342+ return;
61343+ } else
61344+ type = "<process stack>";
61345+ }
61346+
61347+ pax_report_usercopy(ptr, n, to_user, type);
61348+#endif
61349+
61350+}
61351+EXPORT_SYMBOL(__check_object_size);
61352+
61353+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
61354+void pax_track_stack(void)
61355+{
61356+ unsigned long sp = (unsigned long)&sp;
61357+ if (sp < current_thread_info()->lowest_stack &&
61358+ sp > (unsigned long)task_stack_page(current))
61359+ current_thread_info()->lowest_stack = sp;
61360+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
61361+ BUG();
61362+}
61363+EXPORT_SYMBOL(pax_track_stack);
61364+#endif
61365+
61366+#ifdef CONFIG_PAX_SIZE_OVERFLOW
61367+void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
61368+{
61369+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
61370+ dump_stack();
61371+ do_group_exit(SIGKILL);
61372+}
61373+EXPORT_SYMBOL(report_size_overflow);
61374+#endif
61375diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
61376index 9f9992b..8b59411 100644
61377--- a/fs/ext2/balloc.c
61378+++ b/fs/ext2/balloc.c
61379@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
61380
61381 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61382 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61383- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61384+ if (free_blocks < root_blocks + 1 &&
61385 !uid_eq(sbi->s_resuid, current_fsuid()) &&
61386 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61387- !in_group_p (sbi->s_resgid))) {
61388+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61389 return 0;
61390 }
61391 return 1;
61392diff --git a/fs/ext2/super.c b/fs/ext2/super.c
61393index 170dc41..62f6b18 100644
61394--- a/fs/ext2/super.c
61395+++ b/fs/ext2/super.c
61396@@ -264,10 +264,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
61397 #ifdef CONFIG_EXT2_FS_XATTR
61398 if (test_opt(sb, XATTR_USER))
61399 seq_puts(seq, ",user_xattr");
61400- if (!test_opt(sb, XATTR_USER) &&
61401- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
61402+ if (!test_opt(sb, XATTR_USER))
61403 seq_puts(seq, ",nouser_xattr");
61404- }
61405 #endif
61406
61407 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61408@@ -841,8 +839,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
61409 if (def_mount_opts & EXT2_DEFM_UID16)
61410 set_opt(sbi->s_mount_opt, NO_UID32);
61411 #ifdef CONFIG_EXT2_FS_XATTR
61412- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
61413- set_opt(sbi->s_mount_opt, XATTR_USER);
61414+ /* always enable user xattrs */
61415+ set_opt(sbi->s_mount_opt, XATTR_USER);
61416 #endif
61417 #ifdef CONFIG_EXT2_FS_POSIX_ACL
61418 if (def_mount_opts & EXT2_DEFM_ACL)
61419diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
61420index 9142614..97484fa 100644
61421--- a/fs/ext2/xattr.c
61422+++ b/fs/ext2/xattr.c
61423@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
61424 struct buffer_head *bh = NULL;
61425 struct ext2_xattr_entry *entry;
61426 char *end;
61427- size_t rest = buffer_size;
61428+ size_t rest = buffer_size, total_size = 0;
61429 int error;
61430
61431 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
61432@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
61433 buffer += size;
61434 }
61435 rest -= size;
61436+ total_size += size;
61437 }
61438 }
61439- error = buffer_size - rest; /* total size */
61440+ error = total_size;
61441
61442 cleanup:
61443 brelse(bh);
61444diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
61445index 158b5d4..2432610 100644
61446--- a/fs/ext3/balloc.c
61447+++ b/fs/ext3/balloc.c
61448@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
61449
61450 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
61451 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
61452- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
61453+ if (free_blocks < root_blocks + 1 &&
61454 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
61455 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
61456- !in_group_p (sbi->s_resgid))) {
61457+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
61458 return 0;
61459 }
61460 return 1;
61461diff --git a/fs/ext3/super.c b/fs/ext3/super.c
61462index eb742d0..c19f705 100644
61463--- a/fs/ext3/super.c
61464+++ b/fs/ext3/super.c
61465@@ -649,10 +649,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
61466 #ifdef CONFIG_EXT3_FS_XATTR
61467 if (test_opt(sb, XATTR_USER))
61468 seq_puts(seq, ",user_xattr");
61469- if (!test_opt(sb, XATTR_USER) &&
61470- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
61471+ if (!test_opt(sb, XATTR_USER))
61472 seq_puts(seq, ",nouser_xattr");
61473- }
61474 #endif
61475 #ifdef CONFIG_EXT3_FS_POSIX_ACL
61476 if (test_opt(sb, POSIX_ACL))
61477@@ -1749,8 +1747,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
61478 if (def_mount_opts & EXT3_DEFM_UID16)
61479 set_opt(sbi->s_mount_opt, NO_UID32);
61480 #ifdef CONFIG_EXT3_FS_XATTR
61481- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
61482- set_opt(sbi->s_mount_opt, XATTR_USER);
61483+ /* always enable user xattrs */
61484+ set_opt(sbi->s_mount_opt, XATTR_USER);
61485 #endif
61486 #ifdef CONFIG_EXT3_FS_POSIX_ACL
61487 if (def_mount_opts & EXT3_DEFM_ACL)
61488diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
61489index c6874be..f8a6ae8 100644
61490--- a/fs/ext3/xattr.c
61491+++ b/fs/ext3/xattr.c
61492@@ -330,7 +330,7 @@ static int
61493 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
61494 char *buffer, size_t buffer_size)
61495 {
61496- size_t rest = buffer_size;
61497+ size_t rest = buffer_size, total_size = 0;
61498
61499 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
61500 const struct xattr_handler *handler =
61501@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
61502 buffer += size;
61503 }
61504 rest -= size;
61505+ total_size += size;
61506 }
61507 }
61508- return buffer_size - rest;
61509+ return total_size;
61510 }
61511
61512 static int
61513diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
61514index 83a6f49..d4e4d03 100644
61515--- a/fs/ext4/balloc.c
61516+++ b/fs/ext4/balloc.c
61517@@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
61518 /* Hm, nope. Are (enough) root reserved clusters available? */
61519 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
61520 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
61521- capable(CAP_SYS_RESOURCE) ||
61522- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
61523+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
61524+ capable_nolog(CAP_SYS_RESOURCE)) {
61525
61526 if (free_clusters >= (nclusters + dirty_clusters +
61527 resv_clusters))
61528diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
61529index c55a1fa..9904ebb 100644
61530--- a/fs/ext4/ext4.h
61531+++ b/fs/ext4/ext4.h
61532@@ -1279,19 +1279,19 @@ struct ext4_sb_info {
61533 unsigned long s_mb_last_start;
61534
61535 /* stats for buddy allocator */
61536- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
61537- atomic_t s_bal_success; /* we found long enough chunks */
61538- atomic_t s_bal_allocated; /* in blocks */
61539- atomic_t s_bal_ex_scanned; /* total extents scanned */
61540- atomic_t s_bal_goals; /* goal hits */
61541- atomic_t s_bal_breaks; /* too long searches */
61542- atomic_t s_bal_2orders; /* 2^order hits */
61543+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
61544+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
61545+ atomic_unchecked_t s_bal_allocated; /* in blocks */
61546+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
61547+ atomic_unchecked_t s_bal_goals; /* goal hits */
61548+ atomic_unchecked_t s_bal_breaks; /* too long searches */
61549+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
61550 spinlock_t s_bal_lock;
61551 unsigned long s_mb_buddies_generated;
61552 unsigned long long s_mb_generation_time;
61553- atomic_t s_mb_lost_chunks;
61554- atomic_t s_mb_preallocated;
61555- atomic_t s_mb_discarded;
61556+ atomic_unchecked_t s_mb_lost_chunks;
61557+ atomic_unchecked_t s_mb_preallocated;
61558+ atomic_unchecked_t s_mb_discarded;
61559 atomic_t s_lock_busy;
61560
61561 /* locality groups */
61562diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
61563index dbfe15c..9a6ee8d 100644
61564--- a/fs/ext4/mballoc.c
61565+++ b/fs/ext4/mballoc.c
61566@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
61567 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
61568
61569 if (EXT4_SB(sb)->s_mb_stats)
61570- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
61571+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
61572
61573 break;
61574 }
61575@@ -2211,7 +2211,7 @@ repeat:
61576 ac->ac_status = AC_STATUS_CONTINUE;
61577 ac->ac_flags |= EXT4_MB_HINT_FIRST;
61578 cr = 3;
61579- atomic_inc(&sbi->s_mb_lost_chunks);
61580+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
61581 goto repeat;
61582 }
61583 }
61584@@ -2717,25 +2717,25 @@ int ext4_mb_release(struct super_block *sb)
61585 if (sbi->s_mb_stats) {
61586 ext4_msg(sb, KERN_INFO,
61587 "mballoc: %u blocks %u reqs (%u success)",
61588- atomic_read(&sbi->s_bal_allocated),
61589- atomic_read(&sbi->s_bal_reqs),
61590- atomic_read(&sbi->s_bal_success));
61591+ atomic_read_unchecked(&sbi->s_bal_allocated),
61592+ atomic_read_unchecked(&sbi->s_bal_reqs),
61593+ atomic_read_unchecked(&sbi->s_bal_success));
61594 ext4_msg(sb, KERN_INFO,
61595 "mballoc: %u extents scanned, %u goal hits, "
61596 "%u 2^N hits, %u breaks, %u lost",
61597- atomic_read(&sbi->s_bal_ex_scanned),
61598- atomic_read(&sbi->s_bal_goals),
61599- atomic_read(&sbi->s_bal_2orders),
61600- atomic_read(&sbi->s_bal_breaks),
61601- atomic_read(&sbi->s_mb_lost_chunks));
61602+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
61603+ atomic_read_unchecked(&sbi->s_bal_goals),
61604+ atomic_read_unchecked(&sbi->s_bal_2orders),
61605+ atomic_read_unchecked(&sbi->s_bal_breaks),
61606+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
61607 ext4_msg(sb, KERN_INFO,
61608 "mballoc: %lu generated and it took %Lu",
61609 sbi->s_mb_buddies_generated,
61610 sbi->s_mb_generation_time);
61611 ext4_msg(sb, KERN_INFO,
61612 "mballoc: %u preallocated, %u discarded",
61613- atomic_read(&sbi->s_mb_preallocated),
61614- atomic_read(&sbi->s_mb_discarded));
61615+ atomic_read_unchecked(&sbi->s_mb_preallocated),
61616+ atomic_read_unchecked(&sbi->s_mb_discarded));
61617 }
61618
61619 free_percpu(sbi->s_locality_groups);
61620@@ -3191,16 +3191,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
61621 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
61622
61623 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
61624- atomic_inc(&sbi->s_bal_reqs);
61625- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
61626+ atomic_inc_unchecked(&sbi->s_bal_reqs);
61627+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
61628 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
61629- atomic_inc(&sbi->s_bal_success);
61630- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
61631+ atomic_inc_unchecked(&sbi->s_bal_success);
61632+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
61633 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
61634 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
61635- atomic_inc(&sbi->s_bal_goals);
61636+ atomic_inc_unchecked(&sbi->s_bal_goals);
61637 if (ac->ac_found > sbi->s_mb_max_to_scan)
61638- atomic_inc(&sbi->s_bal_breaks);
61639+ atomic_inc_unchecked(&sbi->s_bal_breaks);
61640 }
61641
61642 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
61643@@ -3627,7 +3627,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
61644 trace_ext4_mb_new_inode_pa(ac, pa);
61645
61646 ext4_mb_use_inode_pa(ac, pa);
61647- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
61648+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
61649
61650 ei = EXT4_I(ac->ac_inode);
61651 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
61652@@ -3687,7 +3687,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
61653 trace_ext4_mb_new_group_pa(ac, pa);
61654
61655 ext4_mb_use_group_pa(ac, pa);
61656- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
61657+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
61658
61659 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
61660 lg = ac->ac_lg;
61661@@ -3776,7 +3776,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
61662 * from the bitmap and continue.
61663 */
61664 }
61665- atomic_add(free, &sbi->s_mb_discarded);
61666+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
61667
61668 return err;
61669 }
61670@@ -3794,7 +3794,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
61671 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
61672 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
61673 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
61674- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
61675+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
61676 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
61677
61678 return 0;
61679diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
61680index 8313ca3..8a37d08 100644
61681--- a/fs/ext4/mmp.c
61682+++ b/fs/ext4/mmp.c
61683@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
61684 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
61685 const char *function, unsigned int line, const char *msg)
61686 {
61687- __ext4_warning(sb, function, line, msg);
61688+ __ext4_warning(sb, function, line, "%s", msg);
61689 __ext4_warning(sb, function, line,
61690 "MMP failure info: last update time: %llu, last update "
61691 "node: %s, last update device: %s\n",
61692diff --git a/fs/ext4/super.c b/fs/ext4/super.c
61693index 2c9e686..6a40edc 100644
61694--- a/fs/ext4/super.c
61695+++ b/fs/ext4/super.c
61696@@ -1254,7 +1254,7 @@ static ext4_fsblk_t get_sb_block(void **data)
61697 }
61698
61699 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
61700-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
61701+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
61702 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
61703
61704 #ifdef CONFIG_QUOTA
61705@@ -2434,7 +2434,7 @@ struct ext4_attr {
61706 int offset;
61707 int deprecated_val;
61708 } u;
61709-};
61710+} __do_const;
61711
61712 static int parse_strtoull(const char *buf,
61713 unsigned long long max, unsigned long long *value)
61714diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
61715index 1e09fc7..0400dd4 100644
61716--- a/fs/ext4/xattr.c
61717+++ b/fs/ext4/xattr.c
61718@@ -399,7 +399,7 @@ static int
61719 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
61720 char *buffer, size_t buffer_size)
61721 {
61722- size_t rest = buffer_size;
61723+ size_t rest = buffer_size, total_size = 0;
61724
61725 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
61726 const struct xattr_handler *handler =
61727@@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
61728 buffer += size;
61729 }
61730 rest -= size;
61731+ total_size += size;
61732 }
61733 }
61734- return buffer_size - rest;
61735+ return total_size;
61736 }
61737
61738 static int
61739diff --git a/fs/fcntl.c b/fs/fcntl.c
61740index 99d440a..eb979d1 100644
61741--- a/fs/fcntl.c
61742+++ b/fs/fcntl.c
61743@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
61744 int force)
61745 {
61746 security_file_set_fowner(filp);
61747+ if (gr_handle_chroot_fowner(pid, type))
61748+ return;
61749+ if (gr_check_protected_task_fowner(pid, type))
61750+ return;
61751 f_modown(filp, pid, type, force);
61752 }
61753 EXPORT_SYMBOL(__f_setown);
61754diff --git a/fs/fhandle.c b/fs/fhandle.c
61755index 999ff5c..ac037c9 100644
61756--- a/fs/fhandle.c
61757+++ b/fs/fhandle.c
61758@@ -8,6 +8,7 @@
61759 #include <linux/fs_struct.h>
61760 #include <linux/fsnotify.h>
61761 #include <linux/personality.h>
61762+#include <linux/grsecurity.h>
61763 #include <asm/uaccess.h>
61764 #include "internal.h"
61765 #include "mount.h"
61766@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
61767 } else
61768 retval = 0;
61769 /* copy the mount id */
61770- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
61771- sizeof(*mnt_id)) ||
61772+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
61773 copy_to_user(ufh, handle,
61774 sizeof(struct file_handle) + handle_bytes))
61775 retval = -EFAULT;
61776@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
61777 * the directory. Ideally we would like CAP_DAC_SEARCH.
61778 * But we don't have that
61779 */
61780- if (!capable(CAP_DAC_READ_SEARCH)) {
61781+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
61782 retval = -EPERM;
61783 goto out_err;
61784 }
61785diff --git a/fs/file.c b/fs/file.c
61786index ab3eb6a..8de2392 100644
61787--- a/fs/file.c
61788+++ b/fs/file.c
61789@@ -16,6 +16,7 @@
61790 #include <linux/slab.h>
61791 #include <linux/vmalloc.h>
61792 #include <linux/file.h>
61793+#include <linux/security.h>
61794 #include <linux/fdtable.h>
61795 #include <linux/bitops.h>
61796 #include <linux/interrupt.h>
61797@@ -139,7 +140,7 @@ out:
61798 * Return <0 error code on error; 1 on successful completion.
61799 * The files->file_lock should be held on entry, and will be held on exit.
61800 */
61801-static int expand_fdtable(struct files_struct *files, int nr)
61802+static int expand_fdtable(struct files_struct *files, unsigned int nr)
61803 __releases(files->file_lock)
61804 __acquires(files->file_lock)
61805 {
61806@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
61807 * expanded and execution may have blocked.
61808 * The files->file_lock should be held on entry, and will be held on exit.
61809 */
61810-static int expand_files(struct files_struct *files, int nr)
61811+static int expand_files(struct files_struct *files, unsigned int nr)
61812 {
61813 struct fdtable *fdt;
61814
61815@@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
61816 if (!file)
61817 return __close_fd(files, fd);
61818
61819+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
61820 if (fd >= rlimit(RLIMIT_NOFILE))
61821 return -EBADF;
61822
61823@@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
61824 if (unlikely(oldfd == newfd))
61825 return -EINVAL;
61826
61827+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
61828 if (newfd >= rlimit(RLIMIT_NOFILE))
61829 return -EBADF;
61830
61831@@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
61832 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
61833 {
61834 int err;
61835+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
61836 if (from >= rlimit(RLIMIT_NOFILE))
61837 return -EINVAL;
61838 err = alloc_fd(from, flags);
61839diff --git a/fs/filesystems.c b/fs/filesystems.c
61840index 5797d45..7d7d79a 100644
61841--- a/fs/filesystems.c
61842+++ b/fs/filesystems.c
61843@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
61844 int len = dot ? dot - name : strlen(name);
61845
61846 fs = __get_fs_type(name, len);
61847+#ifdef CONFIG_GRKERNSEC_MODHARDEN
61848+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
61849+#else
61850 if (!fs && (request_module("fs-%.*s", len, name) == 0))
61851+#endif
61852 fs = __get_fs_type(name, len);
61853
61854 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
61855diff --git a/fs/fs_struct.c b/fs/fs_struct.c
61856index 7dca743..543d620 100644
61857--- a/fs/fs_struct.c
61858+++ b/fs/fs_struct.c
61859@@ -4,6 +4,7 @@
61860 #include <linux/path.h>
61861 #include <linux/slab.h>
61862 #include <linux/fs_struct.h>
61863+#include <linux/grsecurity.h>
61864 #include "internal.h"
61865
61866 /*
61867@@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
61868 write_seqcount_begin(&fs->seq);
61869 old_root = fs->root;
61870 fs->root = *path;
61871+ gr_set_chroot_entries(current, path);
61872 write_seqcount_end(&fs->seq);
61873 spin_unlock(&fs->lock);
61874 if (old_root.dentry)
61875@@ -67,6 +69,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
61876 int hits = 0;
61877 spin_lock(&fs->lock);
61878 write_seqcount_begin(&fs->seq);
61879+ /* this root replacement is only done by pivot_root,
61880+ leave grsec's chroot tagging alone for this task
61881+ so that a pivoted root isn't treated as a chroot
61882+ */
61883 hits += replace_path(&fs->root, old_root, new_root);
61884 hits += replace_path(&fs->pwd, old_root, new_root);
61885 write_seqcount_end(&fs->seq);
61886@@ -99,7 +105,8 @@ void exit_fs(struct task_struct *tsk)
61887 task_lock(tsk);
61888 spin_lock(&fs->lock);
61889 tsk->fs = NULL;
61890- kill = !--fs->users;
61891+ gr_clear_chroot_entries(tsk);
61892+ kill = !atomic_dec_return(&fs->users);
61893 spin_unlock(&fs->lock);
61894 task_unlock(tsk);
61895 if (kill)
61896@@ -112,7 +119,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
61897 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
61898 /* We don't need to lock fs - think why ;-) */
61899 if (fs) {
61900- fs->users = 1;
61901+ atomic_set(&fs->users, 1);
61902 fs->in_exec = 0;
61903 spin_lock_init(&fs->lock);
61904 seqcount_init(&fs->seq);
61905@@ -121,6 +128,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
61906 spin_lock(&old->lock);
61907 fs->root = old->root;
61908 path_get(&fs->root);
61909+ /* instead of calling gr_set_chroot_entries here,
61910+ we call it from every caller of this function
61911+ */
61912 fs->pwd = old->pwd;
61913 path_get(&fs->pwd);
61914 spin_unlock(&old->lock);
61915@@ -139,8 +149,9 @@ int unshare_fs_struct(void)
61916
61917 task_lock(current);
61918 spin_lock(&fs->lock);
61919- kill = !--fs->users;
61920+ kill = !atomic_dec_return(&fs->users);
61921 current->fs = new_fs;
61922+ gr_set_chroot_entries(current, &new_fs->root);
61923 spin_unlock(&fs->lock);
61924 task_unlock(current);
61925
61926@@ -153,13 +164,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
61927
61928 int current_umask(void)
61929 {
61930- return current->fs->umask;
61931+ return current->fs->umask | gr_acl_umask();
61932 }
61933 EXPORT_SYMBOL(current_umask);
61934
61935 /* to be mentioned only in INIT_TASK */
61936 struct fs_struct init_fs = {
61937- .users = 1,
61938+ .users = ATOMIC_INIT(1),
61939 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
61940 .seq = SEQCNT_ZERO(init_fs.seq),
61941 .umask = 0022,
61942diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
61943index 89acec7..a575262 100644
61944--- a/fs/fscache/cookie.c
61945+++ b/fs/fscache/cookie.c
61946@@ -19,7 +19,7 @@
61947
61948 struct kmem_cache *fscache_cookie_jar;
61949
61950-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
61951+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
61952
61953 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
61954 static int fscache_alloc_object(struct fscache_cache *cache,
61955@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
61956 parent ? (char *) parent->def->name : "<no-parent>",
61957 def->name, netfs_data, enable);
61958
61959- fscache_stat(&fscache_n_acquires);
61960+ fscache_stat_unchecked(&fscache_n_acquires);
61961
61962 /* if there's no parent cookie, then we don't create one here either */
61963 if (!parent) {
61964- fscache_stat(&fscache_n_acquires_null);
61965+ fscache_stat_unchecked(&fscache_n_acquires_null);
61966 _leave(" [no parent]");
61967 return NULL;
61968 }
61969@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
61970 /* allocate and initialise a cookie */
61971 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
61972 if (!cookie) {
61973- fscache_stat(&fscache_n_acquires_oom);
61974+ fscache_stat_unchecked(&fscache_n_acquires_oom);
61975 _leave(" [ENOMEM]");
61976 return NULL;
61977 }
61978@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
61979
61980 switch (cookie->def->type) {
61981 case FSCACHE_COOKIE_TYPE_INDEX:
61982- fscache_stat(&fscache_n_cookie_index);
61983+ fscache_stat_unchecked(&fscache_n_cookie_index);
61984 break;
61985 case FSCACHE_COOKIE_TYPE_DATAFILE:
61986- fscache_stat(&fscache_n_cookie_data);
61987+ fscache_stat_unchecked(&fscache_n_cookie_data);
61988 break;
61989 default:
61990- fscache_stat(&fscache_n_cookie_special);
61991+ fscache_stat_unchecked(&fscache_n_cookie_special);
61992 break;
61993 }
61994
61995@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
61996 } else {
61997 atomic_dec(&parent->n_children);
61998 __fscache_cookie_put(cookie);
61999- fscache_stat(&fscache_n_acquires_nobufs);
62000+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
62001 _leave(" = NULL");
62002 return NULL;
62003 }
62004@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
62005 }
62006 }
62007
62008- fscache_stat(&fscache_n_acquires_ok);
62009+ fscache_stat_unchecked(&fscache_n_acquires_ok);
62010 _leave(" = %p", cookie);
62011 return cookie;
62012 }
62013@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
62014 cache = fscache_select_cache_for_object(cookie->parent);
62015 if (!cache) {
62016 up_read(&fscache_addremove_sem);
62017- fscache_stat(&fscache_n_acquires_no_cache);
62018+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
62019 _leave(" = -ENOMEDIUM [no cache]");
62020 return -ENOMEDIUM;
62021 }
62022@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
62023 object = cache->ops->alloc_object(cache, cookie);
62024 fscache_stat_d(&fscache_n_cop_alloc_object);
62025 if (IS_ERR(object)) {
62026- fscache_stat(&fscache_n_object_no_alloc);
62027+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
62028 ret = PTR_ERR(object);
62029 goto error;
62030 }
62031
62032- fscache_stat(&fscache_n_object_alloc);
62033+ fscache_stat_unchecked(&fscache_n_object_alloc);
62034
62035- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
62036+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
62037
62038 _debug("ALLOC OBJ%x: %s {%lx}",
62039 object->debug_id, cookie->def->name, object->events);
62040@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
62041
62042 _enter("{%s}", cookie->def->name);
62043
62044- fscache_stat(&fscache_n_invalidates);
62045+ fscache_stat_unchecked(&fscache_n_invalidates);
62046
62047 /* Only permit invalidation of data files. Invalidating an index will
62048 * require the caller to release all its attachments to the tree rooted
62049@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
62050 {
62051 struct fscache_object *object;
62052
62053- fscache_stat(&fscache_n_updates);
62054+ fscache_stat_unchecked(&fscache_n_updates);
62055
62056 if (!cookie) {
62057- fscache_stat(&fscache_n_updates_null);
62058+ fscache_stat_unchecked(&fscache_n_updates_null);
62059 _leave(" [no cookie]");
62060 return;
62061 }
62062@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
62063 */
62064 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
62065 {
62066- fscache_stat(&fscache_n_relinquishes);
62067+ fscache_stat_unchecked(&fscache_n_relinquishes);
62068 if (retire)
62069- fscache_stat(&fscache_n_relinquishes_retire);
62070+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
62071
62072 if (!cookie) {
62073- fscache_stat(&fscache_n_relinquishes_null);
62074+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
62075 _leave(" [no cookie]");
62076 return;
62077 }
62078@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
62079 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
62080 goto inconsistent;
62081
62082- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
62083+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
62084
62085 __fscache_use_cookie(cookie);
62086 if (fscache_submit_op(object, op) < 0)
62087diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
62088index 7872a62..d91b19f 100644
62089--- a/fs/fscache/internal.h
62090+++ b/fs/fscache/internal.h
62091@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
62092 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
62093 extern int fscache_wait_for_operation_activation(struct fscache_object *,
62094 struct fscache_operation *,
62095- atomic_t *,
62096- atomic_t *,
62097+ atomic_unchecked_t *,
62098+ atomic_unchecked_t *,
62099 void (*)(struct fscache_operation *));
62100 extern void fscache_invalidate_writes(struct fscache_cookie *);
62101
62102@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
62103 * stats.c
62104 */
62105 #ifdef CONFIG_FSCACHE_STATS
62106-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62107-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62108+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
62109+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
62110
62111-extern atomic_t fscache_n_op_pend;
62112-extern atomic_t fscache_n_op_run;
62113-extern atomic_t fscache_n_op_enqueue;
62114-extern atomic_t fscache_n_op_deferred_release;
62115-extern atomic_t fscache_n_op_release;
62116-extern atomic_t fscache_n_op_gc;
62117-extern atomic_t fscache_n_op_cancelled;
62118-extern atomic_t fscache_n_op_rejected;
62119+extern atomic_unchecked_t fscache_n_op_pend;
62120+extern atomic_unchecked_t fscache_n_op_run;
62121+extern atomic_unchecked_t fscache_n_op_enqueue;
62122+extern atomic_unchecked_t fscache_n_op_deferred_release;
62123+extern atomic_unchecked_t fscache_n_op_release;
62124+extern atomic_unchecked_t fscache_n_op_gc;
62125+extern atomic_unchecked_t fscache_n_op_cancelled;
62126+extern atomic_unchecked_t fscache_n_op_rejected;
62127
62128-extern atomic_t fscache_n_attr_changed;
62129-extern atomic_t fscache_n_attr_changed_ok;
62130-extern atomic_t fscache_n_attr_changed_nobufs;
62131-extern atomic_t fscache_n_attr_changed_nomem;
62132-extern atomic_t fscache_n_attr_changed_calls;
62133+extern atomic_unchecked_t fscache_n_attr_changed;
62134+extern atomic_unchecked_t fscache_n_attr_changed_ok;
62135+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
62136+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
62137+extern atomic_unchecked_t fscache_n_attr_changed_calls;
62138
62139-extern atomic_t fscache_n_allocs;
62140-extern atomic_t fscache_n_allocs_ok;
62141-extern atomic_t fscache_n_allocs_wait;
62142-extern atomic_t fscache_n_allocs_nobufs;
62143-extern atomic_t fscache_n_allocs_intr;
62144-extern atomic_t fscache_n_allocs_object_dead;
62145-extern atomic_t fscache_n_alloc_ops;
62146-extern atomic_t fscache_n_alloc_op_waits;
62147+extern atomic_unchecked_t fscache_n_allocs;
62148+extern atomic_unchecked_t fscache_n_allocs_ok;
62149+extern atomic_unchecked_t fscache_n_allocs_wait;
62150+extern atomic_unchecked_t fscache_n_allocs_nobufs;
62151+extern atomic_unchecked_t fscache_n_allocs_intr;
62152+extern atomic_unchecked_t fscache_n_allocs_object_dead;
62153+extern atomic_unchecked_t fscache_n_alloc_ops;
62154+extern atomic_unchecked_t fscache_n_alloc_op_waits;
62155
62156-extern atomic_t fscache_n_retrievals;
62157-extern atomic_t fscache_n_retrievals_ok;
62158-extern atomic_t fscache_n_retrievals_wait;
62159-extern atomic_t fscache_n_retrievals_nodata;
62160-extern atomic_t fscache_n_retrievals_nobufs;
62161-extern atomic_t fscache_n_retrievals_intr;
62162-extern atomic_t fscache_n_retrievals_nomem;
62163-extern atomic_t fscache_n_retrievals_object_dead;
62164-extern atomic_t fscache_n_retrieval_ops;
62165-extern atomic_t fscache_n_retrieval_op_waits;
62166+extern atomic_unchecked_t fscache_n_retrievals;
62167+extern atomic_unchecked_t fscache_n_retrievals_ok;
62168+extern atomic_unchecked_t fscache_n_retrievals_wait;
62169+extern atomic_unchecked_t fscache_n_retrievals_nodata;
62170+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
62171+extern atomic_unchecked_t fscache_n_retrievals_intr;
62172+extern atomic_unchecked_t fscache_n_retrievals_nomem;
62173+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
62174+extern atomic_unchecked_t fscache_n_retrieval_ops;
62175+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
62176
62177-extern atomic_t fscache_n_stores;
62178-extern atomic_t fscache_n_stores_ok;
62179-extern atomic_t fscache_n_stores_again;
62180-extern atomic_t fscache_n_stores_nobufs;
62181-extern atomic_t fscache_n_stores_oom;
62182-extern atomic_t fscache_n_store_ops;
62183-extern atomic_t fscache_n_store_calls;
62184-extern atomic_t fscache_n_store_pages;
62185-extern atomic_t fscache_n_store_radix_deletes;
62186-extern atomic_t fscache_n_store_pages_over_limit;
62187+extern atomic_unchecked_t fscache_n_stores;
62188+extern atomic_unchecked_t fscache_n_stores_ok;
62189+extern atomic_unchecked_t fscache_n_stores_again;
62190+extern atomic_unchecked_t fscache_n_stores_nobufs;
62191+extern atomic_unchecked_t fscache_n_stores_oom;
62192+extern atomic_unchecked_t fscache_n_store_ops;
62193+extern atomic_unchecked_t fscache_n_store_calls;
62194+extern atomic_unchecked_t fscache_n_store_pages;
62195+extern atomic_unchecked_t fscache_n_store_radix_deletes;
62196+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
62197
62198-extern atomic_t fscache_n_store_vmscan_not_storing;
62199-extern atomic_t fscache_n_store_vmscan_gone;
62200-extern atomic_t fscache_n_store_vmscan_busy;
62201-extern atomic_t fscache_n_store_vmscan_cancelled;
62202-extern atomic_t fscache_n_store_vmscan_wait;
62203+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
62204+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
62205+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
62206+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
62207+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
62208
62209-extern atomic_t fscache_n_marks;
62210-extern atomic_t fscache_n_uncaches;
62211+extern atomic_unchecked_t fscache_n_marks;
62212+extern atomic_unchecked_t fscache_n_uncaches;
62213
62214-extern atomic_t fscache_n_acquires;
62215-extern atomic_t fscache_n_acquires_null;
62216-extern atomic_t fscache_n_acquires_no_cache;
62217-extern atomic_t fscache_n_acquires_ok;
62218-extern atomic_t fscache_n_acquires_nobufs;
62219-extern atomic_t fscache_n_acquires_oom;
62220+extern atomic_unchecked_t fscache_n_acquires;
62221+extern atomic_unchecked_t fscache_n_acquires_null;
62222+extern atomic_unchecked_t fscache_n_acquires_no_cache;
62223+extern atomic_unchecked_t fscache_n_acquires_ok;
62224+extern atomic_unchecked_t fscache_n_acquires_nobufs;
62225+extern atomic_unchecked_t fscache_n_acquires_oom;
62226
62227-extern atomic_t fscache_n_invalidates;
62228-extern atomic_t fscache_n_invalidates_run;
62229+extern atomic_unchecked_t fscache_n_invalidates;
62230+extern atomic_unchecked_t fscache_n_invalidates_run;
62231
62232-extern atomic_t fscache_n_updates;
62233-extern atomic_t fscache_n_updates_null;
62234-extern atomic_t fscache_n_updates_run;
62235+extern atomic_unchecked_t fscache_n_updates;
62236+extern atomic_unchecked_t fscache_n_updates_null;
62237+extern atomic_unchecked_t fscache_n_updates_run;
62238
62239-extern atomic_t fscache_n_relinquishes;
62240-extern atomic_t fscache_n_relinquishes_null;
62241-extern atomic_t fscache_n_relinquishes_waitcrt;
62242-extern atomic_t fscache_n_relinquishes_retire;
62243+extern atomic_unchecked_t fscache_n_relinquishes;
62244+extern atomic_unchecked_t fscache_n_relinquishes_null;
62245+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
62246+extern atomic_unchecked_t fscache_n_relinquishes_retire;
62247
62248-extern atomic_t fscache_n_cookie_index;
62249-extern atomic_t fscache_n_cookie_data;
62250-extern atomic_t fscache_n_cookie_special;
62251+extern atomic_unchecked_t fscache_n_cookie_index;
62252+extern atomic_unchecked_t fscache_n_cookie_data;
62253+extern atomic_unchecked_t fscache_n_cookie_special;
62254
62255-extern atomic_t fscache_n_object_alloc;
62256-extern atomic_t fscache_n_object_no_alloc;
62257-extern atomic_t fscache_n_object_lookups;
62258-extern atomic_t fscache_n_object_lookups_negative;
62259-extern atomic_t fscache_n_object_lookups_positive;
62260-extern atomic_t fscache_n_object_lookups_timed_out;
62261-extern atomic_t fscache_n_object_created;
62262-extern atomic_t fscache_n_object_avail;
62263-extern atomic_t fscache_n_object_dead;
62264+extern atomic_unchecked_t fscache_n_object_alloc;
62265+extern atomic_unchecked_t fscache_n_object_no_alloc;
62266+extern atomic_unchecked_t fscache_n_object_lookups;
62267+extern atomic_unchecked_t fscache_n_object_lookups_negative;
62268+extern atomic_unchecked_t fscache_n_object_lookups_positive;
62269+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
62270+extern atomic_unchecked_t fscache_n_object_created;
62271+extern atomic_unchecked_t fscache_n_object_avail;
62272+extern atomic_unchecked_t fscache_n_object_dead;
62273
62274-extern atomic_t fscache_n_checkaux_none;
62275-extern atomic_t fscache_n_checkaux_okay;
62276-extern atomic_t fscache_n_checkaux_update;
62277-extern atomic_t fscache_n_checkaux_obsolete;
62278+extern atomic_unchecked_t fscache_n_checkaux_none;
62279+extern atomic_unchecked_t fscache_n_checkaux_okay;
62280+extern atomic_unchecked_t fscache_n_checkaux_update;
62281+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
62282
62283 extern atomic_t fscache_n_cop_alloc_object;
62284 extern atomic_t fscache_n_cop_lookup_object;
62285@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
62286 atomic_inc(stat);
62287 }
62288
62289+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
62290+{
62291+ atomic_inc_unchecked(stat);
62292+}
62293+
62294 static inline void fscache_stat_d(atomic_t *stat)
62295 {
62296 atomic_dec(stat);
62297@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
62298
62299 #define __fscache_stat(stat) (NULL)
62300 #define fscache_stat(stat) do {} while (0)
62301+#define fscache_stat_unchecked(stat) do {} while (0)
62302 #define fscache_stat_d(stat) do {} while (0)
62303 #endif
62304
62305diff --git a/fs/fscache/object.c b/fs/fscache/object.c
62306index da032da..0076ce7 100644
62307--- a/fs/fscache/object.c
62308+++ b/fs/fscache/object.c
62309@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62310 _debug("LOOKUP \"%s\" in \"%s\"",
62311 cookie->def->name, object->cache->tag->name);
62312
62313- fscache_stat(&fscache_n_object_lookups);
62314+ fscache_stat_unchecked(&fscache_n_object_lookups);
62315 fscache_stat(&fscache_n_cop_lookup_object);
62316 ret = object->cache->ops->lookup_object(object);
62317 fscache_stat_d(&fscache_n_cop_lookup_object);
62318@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
62319 if (ret == -ETIMEDOUT) {
62320 /* probably stuck behind another object, so move this one to
62321 * the back of the queue */
62322- fscache_stat(&fscache_n_object_lookups_timed_out);
62323+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
62324 _leave(" [timeout]");
62325 return NO_TRANSIT;
62326 }
62327@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
62328 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
62329
62330 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62331- fscache_stat(&fscache_n_object_lookups_negative);
62332+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
62333
62334 /* Allow write requests to begin stacking up and read requests to begin
62335 * returning ENODATA.
62336@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
62337 /* if we were still looking up, then we must have a positive lookup
62338 * result, in which case there may be data available */
62339 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
62340- fscache_stat(&fscache_n_object_lookups_positive);
62341+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
62342
62343 /* We do (presumably) have data */
62344 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
62345@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
62346 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
62347 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
62348 } else {
62349- fscache_stat(&fscache_n_object_created);
62350+ fscache_stat_unchecked(&fscache_n_object_created);
62351 }
62352
62353 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
62354@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
62355 fscache_stat_d(&fscache_n_cop_lookup_complete);
62356
62357 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
62358- fscache_stat(&fscache_n_object_avail);
62359+ fscache_stat_unchecked(&fscache_n_object_avail);
62360
62361 _leave("");
62362 return transit_to(JUMPSTART_DEPS);
62363@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
62364
62365 /* this just shifts the object release to the work processor */
62366 fscache_put_object(object);
62367- fscache_stat(&fscache_n_object_dead);
62368+ fscache_stat_unchecked(&fscache_n_object_dead);
62369
62370 _leave("");
62371 return transit_to(OBJECT_DEAD);
62372@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
62373 enum fscache_checkaux result;
62374
62375 if (!object->cookie->def->check_aux) {
62376- fscache_stat(&fscache_n_checkaux_none);
62377+ fscache_stat_unchecked(&fscache_n_checkaux_none);
62378 return FSCACHE_CHECKAUX_OKAY;
62379 }
62380
62381@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
62382 switch (result) {
62383 /* entry okay as is */
62384 case FSCACHE_CHECKAUX_OKAY:
62385- fscache_stat(&fscache_n_checkaux_okay);
62386+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
62387 break;
62388
62389 /* entry requires update */
62390 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
62391- fscache_stat(&fscache_n_checkaux_update);
62392+ fscache_stat_unchecked(&fscache_n_checkaux_update);
62393 break;
62394
62395 /* entry requires deletion */
62396 case FSCACHE_CHECKAUX_OBSOLETE:
62397- fscache_stat(&fscache_n_checkaux_obsolete);
62398+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
62399 break;
62400
62401 default:
62402@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
62403 {
62404 const struct fscache_state *s;
62405
62406- fscache_stat(&fscache_n_invalidates_run);
62407+ fscache_stat_unchecked(&fscache_n_invalidates_run);
62408 fscache_stat(&fscache_n_cop_invalidate_object);
62409 s = _fscache_invalidate_object(object, event);
62410 fscache_stat_d(&fscache_n_cop_invalidate_object);
62411@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
62412 {
62413 _enter("{OBJ%x},%d", object->debug_id, event);
62414
62415- fscache_stat(&fscache_n_updates_run);
62416+ fscache_stat_unchecked(&fscache_n_updates_run);
62417 fscache_stat(&fscache_n_cop_update_object);
62418 object->cache->ops->update_object(object);
62419 fscache_stat_d(&fscache_n_cop_update_object);
62420diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
62421index e7b87a0..a85d47a 100644
62422--- a/fs/fscache/operation.c
62423+++ b/fs/fscache/operation.c
62424@@ -17,7 +17,7 @@
62425 #include <linux/slab.h>
62426 #include "internal.h"
62427
62428-atomic_t fscache_op_debug_id;
62429+atomic_unchecked_t fscache_op_debug_id;
62430 EXPORT_SYMBOL(fscache_op_debug_id);
62431
62432 /**
62433@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
62434 ASSERTCMP(atomic_read(&op->usage), >, 0);
62435 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
62436
62437- fscache_stat(&fscache_n_op_enqueue);
62438+ fscache_stat_unchecked(&fscache_n_op_enqueue);
62439 switch (op->flags & FSCACHE_OP_TYPE) {
62440 case FSCACHE_OP_ASYNC:
62441 _debug("queue async");
62442@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
62443 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
62444 if (op->processor)
62445 fscache_enqueue_operation(op);
62446- fscache_stat(&fscache_n_op_run);
62447+ fscache_stat_unchecked(&fscache_n_op_run);
62448 }
62449
62450 /*
62451@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
62452 if (object->n_in_progress > 0) {
62453 atomic_inc(&op->usage);
62454 list_add_tail(&op->pend_link, &object->pending_ops);
62455- fscache_stat(&fscache_n_op_pend);
62456+ fscache_stat_unchecked(&fscache_n_op_pend);
62457 } else if (!list_empty(&object->pending_ops)) {
62458 atomic_inc(&op->usage);
62459 list_add_tail(&op->pend_link, &object->pending_ops);
62460- fscache_stat(&fscache_n_op_pend);
62461+ fscache_stat_unchecked(&fscache_n_op_pend);
62462 fscache_start_operations(object);
62463 } else {
62464 ASSERTCMP(object->n_in_progress, ==, 0);
62465@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
62466 object->n_exclusive++; /* reads and writes must wait */
62467 atomic_inc(&op->usage);
62468 list_add_tail(&op->pend_link, &object->pending_ops);
62469- fscache_stat(&fscache_n_op_pend);
62470+ fscache_stat_unchecked(&fscache_n_op_pend);
62471 ret = 0;
62472 } else {
62473 /* If we're in any other state, there must have been an I/O
62474@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
62475 if (object->n_exclusive > 0) {
62476 atomic_inc(&op->usage);
62477 list_add_tail(&op->pend_link, &object->pending_ops);
62478- fscache_stat(&fscache_n_op_pend);
62479+ fscache_stat_unchecked(&fscache_n_op_pend);
62480 } else if (!list_empty(&object->pending_ops)) {
62481 atomic_inc(&op->usage);
62482 list_add_tail(&op->pend_link, &object->pending_ops);
62483- fscache_stat(&fscache_n_op_pend);
62484+ fscache_stat_unchecked(&fscache_n_op_pend);
62485 fscache_start_operations(object);
62486 } else {
62487 ASSERTCMP(object->n_exclusive, ==, 0);
62488@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
62489 object->n_ops++;
62490 atomic_inc(&op->usage);
62491 list_add_tail(&op->pend_link, &object->pending_ops);
62492- fscache_stat(&fscache_n_op_pend);
62493+ fscache_stat_unchecked(&fscache_n_op_pend);
62494 ret = 0;
62495 } else if (fscache_object_is_dying(object)) {
62496- fscache_stat(&fscache_n_op_rejected);
62497+ fscache_stat_unchecked(&fscache_n_op_rejected);
62498 op->state = FSCACHE_OP_ST_CANCELLED;
62499 ret = -ENOBUFS;
62500 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
62501@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
62502 ret = -EBUSY;
62503 if (op->state == FSCACHE_OP_ST_PENDING) {
62504 ASSERT(!list_empty(&op->pend_link));
62505- fscache_stat(&fscache_n_op_cancelled);
62506+ fscache_stat_unchecked(&fscache_n_op_cancelled);
62507 list_del_init(&op->pend_link);
62508 if (do_cancel)
62509 do_cancel(op);
62510@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
62511 while (!list_empty(&object->pending_ops)) {
62512 op = list_entry(object->pending_ops.next,
62513 struct fscache_operation, pend_link);
62514- fscache_stat(&fscache_n_op_cancelled);
62515+ fscache_stat_unchecked(&fscache_n_op_cancelled);
62516 list_del_init(&op->pend_link);
62517
62518 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
62519@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
62520 op->state, ==, FSCACHE_OP_ST_CANCELLED);
62521 op->state = FSCACHE_OP_ST_DEAD;
62522
62523- fscache_stat(&fscache_n_op_release);
62524+ fscache_stat_unchecked(&fscache_n_op_release);
62525
62526 if (op->release) {
62527 op->release(op);
62528@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
62529 * lock, and defer it otherwise */
62530 if (!spin_trylock(&object->lock)) {
62531 _debug("defer put");
62532- fscache_stat(&fscache_n_op_deferred_release);
62533+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
62534
62535 cache = object->cache;
62536 spin_lock(&cache->op_gc_list_lock);
62537@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
62538
62539 _debug("GC DEFERRED REL OBJ%x OP%x",
62540 object->debug_id, op->debug_id);
62541- fscache_stat(&fscache_n_op_gc);
62542+ fscache_stat_unchecked(&fscache_n_op_gc);
62543
62544 ASSERTCMP(atomic_read(&op->usage), ==, 0);
62545 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
62546diff --git a/fs/fscache/page.c b/fs/fscache/page.c
62547index de33b3f..8be4d29 100644
62548--- a/fs/fscache/page.c
62549+++ b/fs/fscache/page.c
62550@@ -74,7 +74,7 @@ try_again:
62551 val = radix_tree_lookup(&cookie->stores, page->index);
62552 if (!val) {
62553 rcu_read_unlock();
62554- fscache_stat(&fscache_n_store_vmscan_not_storing);
62555+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
62556 __fscache_uncache_page(cookie, page);
62557 return true;
62558 }
62559@@ -104,11 +104,11 @@ try_again:
62560 spin_unlock(&cookie->stores_lock);
62561
62562 if (xpage) {
62563- fscache_stat(&fscache_n_store_vmscan_cancelled);
62564- fscache_stat(&fscache_n_store_radix_deletes);
62565+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
62566+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
62567 ASSERTCMP(xpage, ==, page);
62568 } else {
62569- fscache_stat(&fscache_n_store_vmscan_gone);
62570+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
62571 }
62572
62573 wake_up_bit(&cookie->flags, 0);
62574@@ -123,11 +123,11 @@ page_busy:
62575 * sleeping on memory allocation, so we may need to impose a timeout
62576 * too. */
62577 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
62578- fscache_stat(&fscache_n_store_vmscan_busy);
62579+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
62580 return false;
62581 }
62582
62583- fscache_stat(&fscache_n_store_vmscan_wait);
62584+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
62585 if (!release_page_wait_timeout(cookie, page))
62586 _debug("fscache writeout timeout page: %p{%lx}",
62587 page, page->index);
62588@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
62589 FSCACHE_COOKIE_STORING_TAG);
62590 if (!radix_tree_tag_get(&cookie->stores, page->index,
62591 FSCACHE_COOKIE_PENDING_TAG)) {
62592- fscache_stat(&fscache_n_store_radix_deletes);
62593+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
62594 xpage = radix_tree_delete(&cookie->stores, page->index);
62595 }
62596 spin_unlock(&cookie->stores_lock);
62597@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
62598
62599 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
62600
62601- fscache_stat(&fscache_n_attr_changed_calls);
62602+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
62603
62604 if (fscache_object_is_active(object)) {
62605 fscache_stat(&fscache_n_cop_attr_changed);
62606@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
62607
62608 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
62609
62610- fscache_stat(&fscache_n_attr_changed);
62611+ fscache_stat_unchecked(&fscache_n_attr_changed);
62612
62613 op = kzalloc(sizeof(*op), GFP_KERNEL);
62614 if (!op) {
62615- fscache_stat(&fscache_n_attr_changed_nomem);
62616+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
62617 _leave(" = -ENOMEM");
62618 return -ENOMEM;
62619 }
62620@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
62621 if (fscache_submit_exclusive_op(object, op) < 0)
62622 goto nobufs_dec;
62623 spin_unlock(&cookie->lock);
62624- fscache_stat(&fscache_n_attr_changed_ok);
62625+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
62626 fscache_put_operation(op);
62627 _leave(" = 0");
62628 return 0;
62629@@ -242,7 +242,7 @@ nobufs:
62630 kfree(op);
62631 if (wake_cookie)
62632 __fscache_wake_unused_cookie(cookie);
62633- fscache_stat(&fscache_n_attr_changed_nobufs);
62634+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
62635 _leave(" = %d", -ENOBUFS);
62636 return -ENOBUFS;
62637 }
62638@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
62639 /* allocate a retrieval operation and attempt to submit it */
62640 op = kzalloc(sizeof(*op), GFP_NOIO);
62641 if (!op) {
62642- fscache_stat(&fscache_n_retrievals_nomem);
62643+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62644 return NULL;
62645 }
62646
62647@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
62648 return 0;
62649 }
62650
62651- fscache_stat(&fscache_n_retrievals_wait);
62652+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
62653
62654 jif = jiffies;
62655 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
62656 TASK_INTERRUPTIBLE) != 0) {
62657- fscache_stat(&fscache_n_retrievals_intr);
62658+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
62659 _leave(" = -ERESTARTSYS");
62660 return -ERESTARTSYS;
62661 }
62662@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
62663 */
62664 int fscache_wait_for_operation_activation(struct fscache_object *object,
62665 struct fscache_operation *op,
62666- atomic_t *stat_op_waits,
62667- atomic_t *stat_object_dead,
62668+ atomic_unchecked_t *stat_op_waits,
62669+ atomic_unchecked_t *stat_object_dead,
62670 void (*do_cancel)(struct fscache_operation *))
62671 {
62672 int ret;
62673@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
62674
62675 _debug(">>> WT");
62676 if (stat_op_waits)
62677- fscache_stat(stat_op_waits);
62678+ fscache_stat_unchecked(stat_op_waits);
62679 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
62680 TASK_INTERRUPTIBLE) != 0) {
62681 ret = fscache_cancel_op(op, do_cancel);
62682@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
62683 check_if_dead:
62684 if (op->state == FSCACHE_OP_ST_CANCELLED) {
62685 if (stat_object_dead)
62686- fscache_stat(stat_object_dead);
62687+ fscache_stat_unchecked(stat_object_dead);
62688 _leave(" = -ENOBUFS [cancelled]");
62689 return -ENOBUFS;
62690 }
62691@@ -381,7 +381,7 @@ check_if_dead:
62692 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
62693 fscache_cancel_op(op, do_cancel);
62694 if (stat_object_dead)
62695- fscache_stat(stat_object_dead);
62696+ fscache_stat_unchecked(stat_object_dead);
62697 return -ENOBUFS;
62698 }
62699 return 0;
62700@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62701
62702 _enter("%p,%p,,,", cookie, page);
62703
62704- fscache_stat(&fscache_n_retrievals);
62705+ fscache_stat_unchecked(&fscache_n_retrievals);
62706
62707 if (hlist_empty(&cookie->backing_objects))
62708 goto nobufs;
62709@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62710 goto nobufs_unlock_dec;
62711 spin_unlock(&cookie->lock);
62712
62713- fscache_stat(&fscache_n_retrieval_ops);
62714+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
62715
62716 /* pin the netfs read context in case we need to do the actual netfs
62717 * read because we've encountered a cache read failure */
62718@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
62719
62720 error:
62721 if (ret == -ENOMEM)
62722- fscache_stat(&fscache_n_retrievals_nomem);
62723+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62724 else if (ret == -ERESTARTSYS)
62725- fscache_stat(&fscache_n_retrievals_intr);
62726+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
62727 else if (ret == -ENODATA)
62728- fscache_stat(&fscache_n_retrievals_nodata);
62729+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
62730 else if (ret < 0)
62731- fscache_stat(&fscache_n_retrievals_nobufs);
62732+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62733 else
62734- fscache_stat(&fscache_n_retrievals_ok);
62735+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
62736
62737 fscache_put_retrieval(op);
62738 _leave(" = %d", ret);
62739@@ -505,7 +505,7 @@ nobufs_unlock:
62740 __fscache_wake_unused_cookie(cookie);
62741 kfree(op);
62742 nobufs:
62743- fscache_stat(&fscache_n_retrievals_nobufs);
62744+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62745 _leave(" = -ENOBUFS");
62746 return -ENOBUFS;
62747 }
62748@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62749
62750 _enter("%p,,%d,,,", cookie, *nr_pages);
62751
62752- fscache_stat(&fscache_n_retrievals);
62753+ fscache_stat_unchecked(&fscache_n_retrievals);
62754
62755 if (hlist_empty(&cookie->backing_objects))
62756 goto nobufs;
62757@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62758 goto nobufs_unlock_dec;
62759 spin_unlock(&cookie->lock);
62760
62761- fscache_stat(&fscache_n_retrieval_ops);
62762+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
62763
62764 /* pin the netfs read context in case we need to do the actual netfs
62765 * read because we've encountered a cache read failure */
62766@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
62767
62768 error:
62769 if (ret == -ENOMEM)
62770- fscache_stat(&fscache_n_retrievals_nomem);
62771+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
62772 else if (ret == -ERESTARTSYS)
62773- fscache_stat(&fscache_n_retrievals_intr);
62774+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
62775 else if (ret == -ENODATA)
62776- fscache_stat(&fscache_n_retrievals_nodata);
62777+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
62778 else if (ret < 0)
62779- fscache_stat(&fscache_n_retrievals_nobufs);
62780+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62781 else
62782- fscache_stat(&fscache_n_retrievals_ok);
62783+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
62784
62785 fscache_put_retrieval(op);
62786 _leave(" = %d", ret);
62787@@ -636,7 +636,7 @@ nobufs_unlock:
62788 if (wake_cookie)
62789 __fscache_wake_unused_cookie(cookie);
62790 nobufs:
62791- fscache_stat(&fscache_n_retrievals_nobufs);
62792+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
62793 _leave(" = -ENOBUFS");
62794 return -ENOBUFS;
62795 }
62796@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62797
62798 _enter("%p,%p,,,", cookie, page);
62799
62800- fscache_stat(&fscache_n_allocs);
62801+ fscache_stat_unchecked(&fscache_n_allocs);
62802
62803 if (hlist_empty(&cookie->backing_objects))
62804 goto nobufs;
62805@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62806 goto nobufs_unlock_dec;
62807 spin_unlock(&cookie->lock);
62808
62809- fscache_stat(&fscache_n_alloc_ops);
62810+ fscache_stat_unchecked(&fscache_n_alloc_ops);
62811
62812 ret = fscache_wait_for_operation_activation(
62813 object, &op->op,
62814@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
62815
62816 error:
62817 if (ret == -ERESTARTSYS)
62818- fscache_stat(&fscache_n_allocs_intr);
62819+ fscache_stat_unchecked(&fscache_n_allocs_intr);
62820 else if (ret < 0)
62821- fscache_stat(&fscache_n_allocs_nobufs);
62822+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
62823 else
62824- fscache_stat(&fscache_n_allocs_ok);
62825+ fscache_stat_unchecked(&fscache_n_allocs_ok);
62826
62827 fscache_put_retrieval(op);
62828 _leave(" = %d", ret);
62829@@ -730,7 +730,7 @@ nobufs_unlock:
62830 if (wake_cookie)
62831 __fscache_wake_unused_cookie(cookie);
62832 nobufs:
62833- fscache_stat(&fscache_n_allocs_nobufs);
62834+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
62835 _leave(" = -ENOBUFS");
62836 return -ENOBUFS;
62837 }
62838@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
62839
62840 spin_lock(&cookie->stores_lock);
62841
62842- fscache_stat(&fscache_n_store_calls);
62843+ fscache_stat_unchecked(&fscache_n_store_calls);
62844
62845 /* find a page to store */
62846 page = NULL;
62847@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
62848 page = results[0];
62849 _debug("gang %d [%lx]", n, page->index);
62850 if (page->index > op->store_limit) {
62851- fscache_stat(&fscache_n_store_pages_over_limit);
62852+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
62853 goto superseded;
62854 }
62855
62856@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
62857 spin_unlock(&cookie->stores_lock);
62858 spin_unlock(&object->lock);
62859
62860- fscache_stat(&fscache_n_store_pages);
62861+ fscache_stat_unchecked(&fscache_n_store_pages);
62862 fscache_stat(&fscache_n_cop_write_page);
62863 ret = object->cache->ops->write_page(op, page);
62864 fscache_stat_d(&fscache_n_cop_write_page);
62865@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62866 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
62867 ASSERT(PageFsCache(page));
62868
62869- fscache_stat(&fscache_n_stores);
62870+ fscache_stat_unchecked(&fscache_n_stores);
62871
62872 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
62873 _leave(" = -ENOBUFS [invalidating]");
62874@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62875 spin_unlock(&cookie->stores_lock);
62876 spin_unlock(&object->lock);
62877
62878- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
62879+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
62880 op->store_limit = object->store_limit;
62881
62882 __fscache_use_cookie(cookie);
62883@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62884
62885 spin_unlock(&cookie->lock);
62886 radix_tree_preload_end();
62887- fscache_stat(&fscache_n_store_ops);
62888- fscache_stat(&fscache_n_stores_ok);
62889+ fscache_stat_unchecked(&fscache_n_store_ops);
62890+ fscache_stat_unchecked(&fscache_n_stores_ok);
62891
62892 /* the work queue now carries its own ref on the object */
62893 fscache_put_operation(&op->op);
62894@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
62895 return 0;
62896
62897 already_queued:
62898- fscache_stat(&fscache_n_stores_again);
62899+ fscache_stat_unchecked(&fscache_n_stores_again);
62900 already_pending:
62901 spin_unlock(&cookie->stores_lock);
62902 spin_unlock(&object->lock);
62903 spin_unlock(&cookie->lock);
62904 radix_tree_preload_end();
62905 kfree(op);
62906- fscache_stat(&fscache_n_stores_ok);
62907+ fscache_stat_unchecked(&fscache_n_stores_ok);
62908 _leave(" = 0");
62909 return 0;
62910
62911@@ -1039,14 +1039,14 @@ nobufs:
62912 kfree(op);
62913 if (wake_cookie)
62914 __fscache_wake_unused_cookie(cookie);
62915- fscache_stat(&fscache_n_stores_nobufs);
62916+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
62917 _leave(" = -ENOBUFS");
62918 return -ENOBUFS;
62919
62920 nomem_free:
62921 kfree(op);
62922 nomem:
62923- fscache_stat(&fscache_n_stores_oom);
62924+ fscache_stat_unchecked(&fscache_n_stores_oom);
62925 _leave(" = -ENOMEM");
62926 return -ENOMEM;
62927 }
62928@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
62929 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
62930 ASSERTCMP(page, !=, NULL);
62931
62932- fscache_stat(&fscache_n_uncaches);
62933+ fscache_stat_unchecked(&fscache_n_uncaches);
62934
62935 /* cache withdrawal may beat us to it */
62936 if (!PageFsCache(page))
62937@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
62938 struct fscache_cookie *cookie = op->op.object->cookie;
62939
62940 #ifdef CONFIG_FSCACHE_STATS
62941- atomic_inc(&fscache_n_marks);
62942+ atomic_inc_unchecked(&fscache_n_marks);
62943 #endif
62944
62945 _debug("- mark %p{%lx}", page, page->index);
62946diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
62947index 40d13c7..ddf52b9 100644
62948--- a/fs/fscache/stats.c
62949+++ b/fs/fscache/stats.c
62950@@ -18,99 +18,99 @@
62951 /*
62952 * operation counters
62953 */
62954-atomic_t fscache_n_op_pend;
62955-atomic_t fscache_n_op_run;
62956-atomic_t fscache_n_op_enqueue;
62957-atomic_t fscache_n_op_requeue;
62958-atomic_t fscache_n_op_deferred_release;
62959-atomic_t fscache_n_op_release;
62960-atomic_t fscache_n_op_gc;
62961-atomic_t fscache_n_op_cancelled;
62962-atomic_t fscache_n_op_rejected;
62963+atomic_unchecked_t fscache_n_op_pend;
62964+atomic_unchecked_t fscache_n_op_run;
62965+atomic_unchecked_t fscache_n_op_enqueue;
62966+atomic_unchecked_t fscache_n_op_requeue;
62967+atomic_unchecked_t fscache_n_op_deferred_release;
62968+atomic_unchecked_t fscache_n_op_release;
62969+atomic_unchecked_t fscache_n_op_gc;
62970+atomic_unchecked_t fscache_n_op_cancelled;
62971+atomic_unchecked_t fscache_n_op_rejected;
62972
62973-atomic_t fscache_n_attr_changed;
62974-atomic_t fscache_n_attr_changed_ok;
62975-atomic_t fscache_n_attr_changed_nobufs;
62976-atomic_t fscache_n_attr_changed_nomem;
62977-atomic_t fscache_n_attr_changed_calls;
62978+atomic_unchecked_t fscache_n_attr_changed;
62979+atomic_unchecked_t fscache_n_attr_changed_ok;
62980+atomic_unchecked_t fscache_n_attr_changed_nobufs;
62981+atomic_unchecked_t fscache_n_attr_changed_nomem;
62982+atomic_unchecked_t fscache_n_attr_changed_calls;
62983
62984-atomic_t fscache_n_allocs;
62985-atomic_t fscache_n_allocs_ok;
62986-atomic_t fscache_n_allocs_wait;
62987-atomic_t fscache_n_allocs_nobufs;
62988-atomic_t fscache_n_allocs_intr;
62989-atomic_t fscache_n_allocs_object_dead;
62990-atomic_t fscache_n_alloc_ops;
62991-atomic_t fscache_n_alloc_op_waits;
62992+atomic_unchecked_t fscache_n_allocs;
62993+atomic_unchecked_t fscache_n_allocs_ok;
62994+atomic_unchecked_t fscache_n_allocs_wait;
62995+atomic_unchecked_t fscache_n_allocs_nobufs;
62996+atomic_unchecked_t fscache_n_allocs_intr;
62997+atomic_unchecked_t fscache_n_allocs_object_dead;
62998+atomic_unchecked_t fscache_n_alloc_ops;
62999+atomic_unchecked_t fscache_n_alloc_op_waits;
63000
63001-atomic_t fscache_n_retrievals;
63002-atomic_t fscache_n_retrievals_ok;
63003-atomic_t fscache_n_retrievals_wait;
63004-atomic_t fscache_n_retrievals_nodata;
63005-atomic_t fscache_n_retrievals_nobufs;
63006-atomic_t fscache_n_retrievals_intr;
63007-atomic_t fscache_n_retrievals_nomem;
63008-atomic_t fscache_n_retrievals_object_dead;
63009-atomic_t fscache_n_retrieval_ops;
63010-atomic_t fscache_n_retrieval_op_waits;
63011+atomic_unchecked_t fscache_n_retrievals;
63012+atomic_unchecked_t fscache_n_retrievals_ok;
63013+atomic_unchecked_t fscache_n_retrievals_wait;
63014+atomic_unchecked_t fscache_n_retrievals_nodata;
63015+atomic_unchecked_t fscache_n_retrievals_nobufs;
63016+atomic_unchecked_t fscache_n_retrievals_intr;
63017+atomic_unchecked_t fscache_n_retrievals_nomem;
63018+atomic_unchecked_t fscache_n_retrievals_object_dead;
63019+atomic_unchecked_t fscache_n_retrieval_ops;
63020+atomic_unchecked_t fscache_n_retrieval_op_waits;
63021
63022-atomic_t fscache_n_stores;
63023-atomic_t fscache_n_stores_ok;
63024-atomic_t fscache_n_stores_again;
63025-atomic_t fscache_n_stores_nobufs;
63026-atomic_t fscache_n_stores_oom;
63027-atomic_t fscache_n_store_ops;
63028-atomic_t fscache_n_store_calls;
63029-atomic_t fscache_n_store_pages;
63030-atomic_t fscache_n_store_radix_deletes;
63031-atomic_t fscache_n_store_pages_over_limit;
63032+atomic_unchecked_t fscache_n_stores;
63033+atomic_unchecked_t fscache_n_stores_ok;
63034+atomic_unchecked_t fscache_n_stores_again;
63035+atomic_unchecked_t fscache_n_stores_nobufs;
63036+atomic_unchecked_t fscache_n_stores_oom;
63037+atomic_unchecked_t fscache_n_store_ops;
63038+atomic_unchecked_t fscache_n_store_calls;
63039+atomic_unchecked_t fscache_n_store_pages;
63040+atomic_unchecked_t fscache_n_store_radix_deletes;
63041+atomic_unchecked_t fscache_n_store_pages_over_limit;
63042
63043-atomic_t fscache_n_store_vmscan_not_storing;
63044-atomic_t fscache_n_store_vmscan_gone;
63045-atomic_t fscache_n_store_vmscan_busy;
63046-atomic_t fscache_n_store_vmscan_cancelled;
63047-atomic_t fscache_n_store_vmscan_wait;
63048+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
63049+atomic_unchecked_t fscache_n_store_vmscan_gone;
63050+atomic_unchecked_t fscache_n_store_vmscan_busy;
63051+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
63052+atomic_unchecked_t fscache_n_store_vmscan_wait;
63053
63054-atomic_t fscache_n_marks;
63055-atomic_t fscache_n_uncaches;
63056+atomic_unchecked_t fscache_n_marks;
63057+atomic_unchecked_t fscache_n_uncaches;
63058
63059-atomic_t fscache_n_acquires;
63060-atomic_t fscache_n_acquires_null;
63061-atomic_t fscache_n_acquires_no_cache;
63062-atomic_t fscache_n_acquires_ok;
63063-atomic_t fscache_n_acquires_nobufs;
63064-atomic_t fscache_n_acquires_oom;
63065+atomic_unchecked_t fscache_n_acquires;
63066+atomic_unchecked_t fscache_n_acquires_null;
63067+atomic_unchecked_t fscache_n_acquires_no_cache;
63068+atomic_unchecked_t fscache_n_acquires_ok;
63069+atomic_unchecked_t fscache_n_acquires_nobufs;
63070+atomic_unchecked_t fscache_n_acquires_oom;
63071
63072-atomic_t fscache_n_invalidates;
63073-atomic_t fscache_n_invalidates_run;
63074+atomic_unchecked_t fscache_n_invalidates;
63075+atomic_unchecked_t fscache_n_invalidates_run;
63076
63077-atomic_t fscache_n_updates;
63078-atomic_t fscache_n_updates_null;
63079-atomic_t fscache_n_updates_run;
63080+atomic_unchecked_t fscache_n_updates;
63081+atomic_unchecked_t fscache_n_updates_null;
63082+atomic_unchecked_t fscache_n_updates_run;
63083
63084-atomic_t fscache_n_relinquishes;
63085-atomic_t fscache_n_relinquishes_null;
63086-atomic_t fscache_n_relinquishes_waitcrt;
63087-atomic_t fscache_n_relinquishes_retire;
63088+atomic_unchecked_t fscache_n_relinquishes;
63089+atomic_unchecked_t fscache_n_relinquishes_null;
63090+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
63091+atomic_unchecked_t fscache_n_relinquishes_retire;
63092
63093-atomic_t fscache_n_cookie_index;
63094-atomic_t fscache_n_cookie_data;
63095-atomic_t fscache_n_cookie_special;
63096+atomic_unchecked_t fscache_n_cookie_index;
63097+atomic_unchecked_t fscache_n_cookie_data;
63098+atomic_unchecked_t fscache_n_cookie_special;
63099
63100-atomic_t fscache_n_object_alloc;
63101-atomic_t fscache_n_object_no_alloc;
63102-atomic_t fscache_n_object_lookups;
63103-atomic_t fscache_n_object_lookups_negative;
63104-atomic_t fscache_n_object_lookups_positive;
63105-atomic_t fscache_n_object_lookups_timed_out;
63106-atomic_t fscache_n_object_created;
63107-atomic_t fscache_n_object_avail;
63108-atomic_t fscache_n_object_dead;
63109+atomic_unchecked_t fscache_n_object_alloc;
63110+atomic_unchecked_t fscache_n_object_no_alloc;
63111+atomic_unchecked_t fscache_n_object_lookups;
63112+atomic_unchecked_t fscache_n_object_lookups_negative;
63113+atomic_unchecked_t fscache_n_object_lookups_positive;
63114+atomic_unchecked_t fscache_n_object_lookups_timed_out;
63115+atomic_unchecked_t fscache_n_object_created;
63116+atomic_unchecked_t fscache_n_object_avail;
63117+atomic_unchecked_t fscache_n_object_dead;
63118
63119-atomic_t fscache_n_checkaux_none;
63120-atomic_t fscache_n_checkaux_okay;
63121-atomic_t fscache_n_checkaux_update;
63122-atomic_t fscache_n_checkaux_obsolete;
63123+atomic_unchecked_t fscache_n_checkaux_none;
63124+atomic_unchecked_t fscache_n_checkaux_okay;
63125+atomic_unchecked_t fscache_n_checkaux_update;
63126+atomic_unchecked_t fscache_n_checkaux_obsolete;
63127
63128 atomic_t fscache_n_cop_alloc_object;
63129 atomic_t fscache_n_cop_lookup_object;
63130@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
63131 seq_puts(m, "FS-Cache statistics\n");
63132
63133 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
63134- atomic_read(&fscache_n_cookie_index),
63135- atomic_read(&fscache_n_cookie_data),
63136- atomic_read(&fscache_n_cookie_special));
63137+ atomic_read_unchecked(&fscache_n_cookie_index),
63138+ atomic_read_unchecked(&fscache_n_cookie_data),
63139+ atomic_read_unchecked(&fscache_n_cookie_special));
63140
63141 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
63142- atomic_read(&fscache_n_object_alloc),
63143- atomic_read(&fscache_n_object_no_alloc),
63144- atomic_read(&fscache_n_object_avail),
63145- atomic_read(&fscache_n_object_dead));
63146+ atomic_read_unchecked(&fscache_n_object_alloc),
63147+ atomic_read_unchecked(&fscache_n_object_no_alloc),
63148+ atomic_read_unchecked(&fscache_n_object_avail),
63149+ atomic_read_unchecked(&fscache_n_object_dead));
63150 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
63151- atomic_read(&fscache_n_checkaux_none),
63152- atomic_read(&fscache_n_checkaux_okay),
63153- atomic_read(&fscache_n_checkaux_update),
63154- atomic_read(&fscache_n_checkaux_obsolete));
63155+ atomic_read_unchecked(&fscache_n_checkaux_none),
63156+ atomic_read_unchecked(&fscache_n_checkaux_okay),
63157+ atomic_read_unchecked(&fscache_n_checkaux_update),
63158+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
63159
63160 seq_printf(m, "Pages : mrk=%u unc=%u\n",
63161- atomic_read(&fscache_n_marks),
63162- atomic_read(&fscache_n_uncaches));
63163+ atomic_read_unchecked(&fscache_n_marks),
63164+ atomic_read_unchecked(&fscache_n_uncaches));
63165
63166 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
63167 " oom=%u\n",
63168- atomic_read(&fscache_n_acquires),
63169- atomic_read(&fscache_n_acquires_null),
63170- atomic_read(&fscache_n_acquires_no_cache),
63171- atomic_read(&fscache_n_acquires_ok),
63172- atomic_read(&fscache_n_acquires_nobufs),
63173- atomic_read(&fscache_n_acquires_oom));
63174+ atomic_read_unchecked(&fscache_n_acquires),
63175+ atomic_read_unchecked(&fscache_n_acquires_null),
63176+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
63177+ atomic_read_unchecked(&fscache_n_acquires_ok),
63178+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
63179+ atomic_read_unchecked(&fscache_n_acquires_oom));
63180
63181 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
63182- atomic_read(&fscache_n_object_lookups),
63183- atomic_read(&fscache_n_object_lookups_negative),
63184- atomic_read(&fscache_n_object_lookups_positive),
63185- atomic_read(&fscache_n_object_created),
63186- atomic_read(&fscache_n_object_lookups_timed_out));
63187+ atomic_read_unchecked(&fscache_n_object_lookups),
63188+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
63189+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
63190+ atomic_read_unchecked(&fscache_n_object_created),
63191+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
63192
63193 seq_printf(m, "Invals : n=%u run=%u\n",
63194- atomic_read(&fscache_n_invalidates),
63195- atomic_read(&fscache_n_invalidates_run));
63196+ atomic_read_unchecked(&fscache_n_invalidates),
63197+ atomic_read_unchecked(&fscache_n_invalidates_run));
63198
63199 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
63200- atomic_read(&fscache_n_updates),
63201- atomic_read(&fscache_n_updates_null),
63202- atomic_read(&fscache_n_updates_run));
63203+ atomic_read_unchecked(&fscache_n_updates),
63204+ atomic_read_unchecked(&fscache_n_updates_null),
63205+ atomic_read_unchecked(&fscache_n_updates_run));
63206
63207 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
63208- atomic_read(&fscache_n_relinquishes),
63209- atomic_read(&fscache_n_relinquishes_null),
63210- atomic_read(&fscache_n_relinquishes_waitcrt),
63211- atomic_read(&fscache_n_relinquishes_retire));
63212+ atomic_read_unchecked(&fscache_n_relinquishes),
63213+ atomic_read_unchecked(&fscache_n_relinquishes_null),
63214+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
63215+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
63216
63217 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
63218- atomic_read(&fscache_n_attr_changed),
63219- atomic_read(&fscache_n_attr_changed_ok),
63220- atomic_read(&fscache_n_attr_changed_nobufs),
63221- atomic_read(&fscache_n_attr_changed_nomem),
63222- atomic_read(&fscache_n_attr_changed_calls));
63223+ atomic_read_unchecked(&fscache_n_attr_changed),
63224+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
63225+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
63226+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
63227+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
63228
63229 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
63230- atomic_read(&fscache_n_allocs),
63231- atomic_read(&fscache_n_allocs_ok),
63232- atomic_read(&fscache_n_allocs_wait),
63233- atomic_read(&fscache_n_allocs_nobufs),
63234- atomic_read(&fscache_n_allocs_intr));
63235+ atomic_read_unchecked(&fscache_n_allocs),
63236+ atomic_read_unchecked(&fscache_n_allocs_ok),
63237+ atomic_read_unchecked(&fscache_n_allocs_wait),
63238+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
63239+ atomic_read_unchecked(&fscache_n_allocs_intr));
63240 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
63241- atomic_read(&fscache_n_alloc_ops),
63242- atomic_read(&fscache_n_alloc_op_waits),
63243- atomic_read(&fscache_n_allocs_object_dead));
63244+ atomic_read_unchecked(&fscache_n_alloc_ops),
63245+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
63246+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
63247
63248 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
63249 " int=%u oom=%u\n",
63250- atomic_read(&fscache_n_retrievals),
63251- atomic_read(&fscache_n_retrievals_ok),
63252- atomic_read(&fscache_n_retrievals_wait),
63253- atomic_read(&fscache_n_retrievals_nodata),
63254- atomic_read(&fscache_n_retrievals_nobufs),
63255- atomic_read(&fscache_n_retrievals_intr),
63256- atomic_read(&fscache_n_retrievals_nomem));
63257+ atomic_read_unchecked(&fscache_n_retrievals),
63258+ atomic_read_unchecked(&fscache_n_retrievals_ok),
63259+ atomic_read_unchecked(&fscache_n_retrievals_wait),
63260+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
63261+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
63262+ atomic_read_unchecked(&fscache_n_retrievals_intr),
63263+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
63264 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
63265- atomic_read(&fscache_n_retrieval_ops),
63266- atomic_read(&fscache_n_retrieval_op_waits),
63267- atomic_read(&fscache_n_retrievals_object_dead));
63268+ atomic_read_unchecked(&fscache_n_retrieval_ops),
63269+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
63270+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
63271
63272 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
63273- atomic_read(&fscache_n_stores),
63274- atomic_read(&fscache_n_stores_ok),
63275- atomic_read(&fscache_n_stores_again),
63276- atomic_read(&fscache_n_stores_nobufs),
63277- atomic_read(&fscache_n_stores_oom));
63278+ atomic_read_unchecked(&fscache_n_stores),
63279+ atomic_read_unchecked(&fscache_n_stores_ok),
63280+ atomic_read_unchecked(&fscache_n_stores_again),
63281+ atomic_read_unchecked(&fscache_n_stores_nobufs),
63282+ atomic_read_unchecked(&fscache_n_stores_oom));
63283 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
63284- atomic_read(&fscache_n_store_ops),
63285- atomic_read(&fscache_n_store_calls),
63286- atomic_read(&fscache_n_store_pages),
63287- atomic_read(&fscache_n_store_radix_deletes),
63288- atomic_read(&fscache_n_store_pages_over_limit));
63289+ atomic_read_unchecked(&fscache_n_store_ops),
63290+ atomic_read_unchecked(&fscache_n_store_calls),
63291+ atomic_read_unchecked(&fscache_n_store_pages),
63292+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
63293+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
63294
63295 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
63296- atomic_read(&fscache_n_store_vmscan_not_storing),
63297- atomic_read(&fscache_n_store_vmscan_gone),
63298- atomic_read(&fscache_n_store_vmscan_busy),
63299- atomic_read(&fscache_n_store_vmscan_cancelled),
63300- atomic_read(&fscache_n_store_vmscan_wait));
63301+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
63302+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
63303+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
63304+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
63305+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
63306
63307 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
63308- atomic_read(&fscache_n_op_pend),
63309- atomic_read(&fscache_n_op_run),
63310- atomic_read(&fscache_n_op_enqueue),
63311- atomic_read(&fscache_n_op_cancelled),
63312- atomic_read(&fscache_n_op_rejected));
63313+ atomic_read_unchecked(&fscache_n_op_pend),
63314+ atomic_read_unchecked(&fscache_n_op_run),
63315+ atomic_read_unchecked(&fscache_n_op_enqueue),
63316+ atomic_read_unchecked(&fscache_n_op_cancelled),
63317+ atomic_read_unchecked(&fscache_n_op_rejected));
63318 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
63319- atomic_read(&fscache_n_op_deferred_release),
63320- atomic_read(&fscache_n_op_release),
63321- atomic_read(&fscache_n_op_gc));
63322+ atomic_read_unchecked(&fscache_n_op_deferred_release),
63323+ atomic_read_unchecked(&fscache_n_op_release),
63324+ atomic_read_unchecked(&fscache_n_op_gc));
63325
63326 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
63327 atomic_read(&fscache_n_cop_alloc_object),
63328diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
63329index 966ace8..030a03a 100644
63330--- a/fs/fuse/cuse.c
63331+++ b/fs/fuse/cuse.c
63332@@ -611,10 +611,12 @@ static int __init cuse_init(void)
63333 INIT_LIST_HEAD(&cuse_conntbl[i]);
63334
63335 /* inherit and extend fuse_dev_operations */
63336- cuse_channel_fops = fuse_dev_operations;
63337- cuse_channel_fops.owner = THIS_MODULE;
63338- cuse_channel_fops.open = cuse_channel_open;
63339- cuse_channel_fops.release = cuse_channel_release;
63340+ pax_open_kernel();
63341+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
63342+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
63343+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
63344+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
63345+ pax_close_kernel();
63346
63347 cuse_class = class_create(THIS_MODULE, "cuse");
63348 if (IS_ERR(cuse_class))
63349diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
63350index ca88731..8e9c55d 100644
63351--- a/fs/fuse/dev.c
63352+++ b/fs/fuse/dev.c
63353@@ -1318,7 +1318,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
63354 ret = 0;
63355 pipe_lock(pipe);
63356
63357- if (!pipe->readers) {
63358+ if (!atomic_read(&pipe->readers)) {
63359 send_sig(SIGPIPE, current, 0);
63360 if (!ret)
63361 ret = -EPIPE;
63362@@ -1347,7 +1347,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
63363 page_nr++;
63364 ret += buf->len;
63365
63366- if (pipe->files)
63367+ if (atomic_read(&pipe->files))
63368 do_wakeup = 1;
63369 }
63370
63371diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
63372index dbab798..fefa22b 100644
63373--- a/fs/fuse/dir.c
63374+++ b/fs/fuse/dir.c
63375@@ -1474,7 +1474,7 @@ static char *read_link(struct dentry *dentry)
63376 return link;
63377 }
63378
63379-static void free_link(char *link)
63380+static void free_link(const char *link)
63381 {
63382 if (!IS_ERR(link))
63383 free_page((unsigned long) link);
63384diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
63385index fd62cae..3494dfa 100644
63386--- a/fs/hostfs/hostfs_kern.c
63387+++ b/fs/hostfs/hostfs_kern.c
63388@@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
63389
63390 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
63391 {
63392- char *s = nd_get_link(nd);
63393+ const char *s = nd_get_link(nd);
63394 if (!IS_ERR(s))
63395 __putname(s);
63396 }
63397diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
63398index 1e2872b..7aea000 100644
63399--- a/fs/hugetlbfs/inode.c
63400+++ b/fs/hugetlbfs/inode.c
63401@@ -154,6 +154,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
63402 struct mm_struct *mm = current->mm;
63403 struct vm_area_struct *vma;
63404 struct hstate *h = hstate_file(file);
63405+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
63406 struct vm_unmapped_area_info info;
63407
63408 if (len & ~huge_page_mask(h))
63409@@ -167,17 +168,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
63410 return addr;
63411 }
63412
63413+#ifdef CONFIG_PAX_RANDMMAP
63414+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
63415+#endif
63416+
63417 if (addr) {
63418 addr = ALIGN(addr, huge_page_size(h));
63419 vma = find_vma(mm, addr);
63420- if (TASK_SIZE - len >= addr &&
63421- (!vma || addr + len <= vma->vm_start))
63422+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
63423 return addr;
63424 }
63425
63426 info.flags = 0;
63427 info.length = len;
63428 info.low_limit = TASK_UNMAPPED_BASE;
63429+
63430+#ifdef CONFIG_PAX_RANDMMAP
63431+ if (mm->pax_flags & MF_PAX_RANDMMAP)
63432+ info.low_limit += mm->delta_mmap;
63433+#endif
63434+
63435 info.high_limit = TASK_SIZE;
63436 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
63437 info.align_offset = 0;
63438@@ -919,7 +929,7 @@ static struct file_system_type hugetlbfs_fs_type = {
63439 };
63440 MODULE_ALIAS_FS("hugetlbfs");
63441
63442-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63443+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
63444
63445 static int can_do_hugetlb_shm(void)
63446 {
63447diff --git a/fs/inode.c b/fs/inode.c
63448index 26753ba..d19eb34 100644
63449--- a/fs/inode.c
63450+++ b/fs/inode.c
63451@@ -840,16 +840,20 @@ unsigned int get_next_ino(void)
63452 unsigned int *p = &get_cpu_var(last_ino);
63453 unsigned int res = *p;
63454
63455+start:
63456+
63457 #ifdef CONFIG_SMP
63458 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
63459- static atomic_t shared_last_ino;
63460- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
63461+ static atomic_unchecked_t shared_last_ino;
63462+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
63463
63464 res = next - LAST_INO_BATCH;
63465 }
63466 #endif
63467
63468- *p = ++res;
63469+ if (unlikely(!++res))
63470+ goto start; /* never zero */
63471+ *p = res;
63472 put_cpu_var(last_ino);
63473 return res;
63474 }
63475diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c
63476index f488bba..bb63254 100644
63477--- a/fs/isofs/rock.c
63478+++ b/fs/isofs/rock.c
63479@@ -30,6 +30,7 @@ struct rock_state {
63480 int cont_size;
63481 int cont_extent;
63482 int cont_offset;
63483+ int cont_loops;
63484 struct inode *inode;
63485 };
63486
63487@@ -73,6 +74,9 @@ static void init_rock_state(struct rock_state *rs, struct inode *inode)
63488 rs->inode = inode;
63489 }
63490
63491+/* Maximum number of Rock Ridge continuation entries */
63492+#define RR_MAX_CE_ENTRIES 32
63493+
63494 /*
63495 * Returns 0 if the caller should continue scanning, 1 if the scan must end
63496 * and -ve on error.
63497@@ -105,6 +109,8 @@ static int rock_continue(struct rock_state *rs)
63498 goto out;
63499 }
63500 ret = -EIO;
63501+ if (++rs->cont_loops >= RR_MAX_CE_ENTRIES)
63502+ goto out;
63503 bh = sb_bread(rs->inode->i_sb, rs->cont_extent);
63504 if (bh) {
63505 memcpy(rs->buffer, bh->b_data + rs->cont_offset,
63506diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
63507index 4a6cf28..d3a29d3 100644
63508--- a/fs/jffs2/erase.c
63509+++ b/fs/jffs2/erase.c
63510@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
63511 struct jffs2_unknown_node marker = {
63512 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
63513 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
63514- .totlen = cpu_to_je32(c->cleanmarker_size)
63515+ .totlen = cpu_to_je32(c->cleanmarker_size),
63516+ .hdr_crc = cpu_to_je32(0)
63517 };
63518
63519 jffs2_prealloc_raw_node_refs(c, jeb, 1);
63520diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
63521index 09ed551..45684f8 100644
63522--- a/fs/jffs2/wbuf.c
63523+++ b/fs/jffs2/wbuf.c
63524@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
63525 {
63526 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
63527 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
63528- .totlen = constant_cpu_to_je32(8)
63529+ .totlen = constant_cpu_to_je32(8),
63530+ .hdr_crc = constant_cpu_to_je32(0)
63531 };
63532
63533 /*
63534diff --git a/fs/jfs/super.c b/fs/jfs/super.c
63535index 93e897e..a863de4 100644
63536--- a/fs/jfs/super.c
63537+++ b/fs/jfs/super.c
63538@@ -893,7 +893,7 @@ static int __init init_jfs_fs(void)
63539
63540 jfs_inode_cachep =
63541 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
63542- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
63543+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
63544 init_once);
63545 if (jfs_inode_cachep == NULL)
63546 return -ENOMEM;
63547diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
63548index 1c77193..a50091d 100644
63549--- a/fs/kernfs/dir.c
63550+++ b/fs/kernfs/dir.c
63551@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
63552 *
63553 * Returns 31 bit hash of ns + name (so it fits in an off_t )
63554 */
63555-static unsigned int kernfs_name_hash(const char *name, const void *ns)
63556+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
63557 {
63558 unsigned long hash = init_name_hash();
63559 unsigned int len = strlen(name);
63560diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
63561index 4429d6d..9831f52 100644
63562--- a/fs/kernfs/file.c
63563+++ b/fs/kernfs/file.c
63564@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
63565
63566 struct kernfs_open_node {
63567 atomic_t refcnt;
63568- atomic_t event;
63569+ atomic_unchecked_t event;
63570 wait_queue_head_t poll;
63571 struct list_head files; /* goes through kernfs_open_file.list */
63572 };
63573@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
63574 {
63575 struct kernfs_open_file *of = sf->private;
63576
63577- of->event = atomic_read(&of->kn->attr.open->event);
63578+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
63579
63580 return of->kn->attr.ops->seq_show(sf, v);
63581 }
63582@@ -375,12 +375,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
63583 return ret;
63584 }
63585
63586-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
63587- void *buf, int len, int write)
63588+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
63589+ void *buf, size_t len, int write)
63590 {
63591 struct file *file = vma->vm_file;
63592 struct kernfs_open_file *of = kernfs_of(file);
63593- int ret;
63594+ ssize_t ret;
63595
63596 if (!of->vm_ops)
63597 return -EINVAL;
63598@@ -581,7 +581,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
63599 return -ENOMEM;
63600
63601 atomic_set(&new_on->refcnt, 0);
63602- atomic_set(&new_on->event, 1);
63603+ atomic_set_unchecked(&new_on->event, 1);
63604 init_waitqueue_head(&new_on->poll);
63605 INIT_LIST_HEAD(&new_on->files);
63606 goto retry;
63607@@ -787,7 +787,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
63608
63609 kernfs_put_active(kn);
63610
63611- if (of->event != atomic_read(&on->event))
63612+ if (of->event != atomic_read_unchecked(&on->event))
63613 goto trigger;
63614
63615 return DEFAULT_POLLMASK;
63616@@ -818,7 +818,7 @@ repeat:
63617
63618 on = kn->attr.open;
63619 if (on) {
63620- atomic_inc(&on->event);
63621+ atomic_inc_unchecked(&on->event);
63622 wake_up_interruptible(&on->poll);
63623 }
63624
63625diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
63626index 8a19889..4c3069a 100644
63627--- a/fs/kernfs/symlink.c
63628+++ b/fs/kernfs/symlink.c
63629@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
63630 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
63631 void *cookie)
63632 {
63633- char *page = nd_get_link(nd);
63634+ const char *page = nd_get_link(nd);
63635 if (!IS_ERR(page))
63636 free_page((unsigned long)page);
63637 }
63638diff --git a/fs/libfs.c b/fs/libfs.c
63639index 005843c..06c4191 100644
63640--- a/fs/libfs.c
63641+++ b/fs/libfs.c
63642@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
63643
63644 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
63645 struct dentry *next = list_entry(p, struct dentry, d_child);
63646+ char d_name[sizeof(next->d_iname)];
63647+ const unsigned char *name;
63648+
63649 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
63650 if (!simple_positive(next)) {
63651 spin_unlock(&next->d_lock);
63652@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
63653
63654 spin_unlock(&next->d_lock);
63655 spin_unlock(&dentry->d_lock);
63656- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
63657+ name = next->d_name.name;
63658+ if (name == next->d_iname) {
63659+ memcpy(d_name, name, next->d_name.len);
63660+ name = d_name;
63661+ }
63662+ if (!dir_emit(ctx, name, next->d_name.len,
63663 next->d_inode->i_ino, dt_type(next->d_inode)))
63664 return 0;
63665 spin_lock(&dentry->d_lock);
63666@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
63667 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
63668 void *cookie)
63669 {
63670- char *s = nd_get_link(nd);
63671+ const char *s = nd_get_link(nd);
63672 if (!IS_ERR(s))
63673 kfree(s);
63674 }
63675diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
63676index acd3947..1f896e2 100644
63677--- a/fs/lockd/clntproc.c
63678+++ b/fs/lockd/clntproc.c
63679@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
63680 /*
63681 * Cookie counter for NLM requests
63682 */
63683-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
63684+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
63685
63686 void nlmclnt_next_cookie(struct nlm_cookie *c)
63687 {
63688- u32 cookie = atomic_inc_return(&nlm_cookie);
63689+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
63690
63691 memcpy(c->data, &cookie, 4);
63692 c->len=4;
63693diff --git a/fs/locks.c b/fs/locks.c
63694index 735b8d3..dfc44a2 100644
63695--- a/fs/locks.c
63696+++ b/fs/locks.c
63697@@ -2374,7 +2374,7 @@ void locks_remove_file(struct file *filp)
63698 locks_remove_posix(filp, filp);
63699
63700 if (filp->f_op->flock) {
63701- struct file_lock fl = {
63702+ struct file_lock flock = {
63703 .fl_owner = filp,
63704 .fl_pid = current->tgid,
63705 .fl_file = filp,
63706@@ -2382,9 +2382,9 @@ void locks_remove_file(struct file *filp)
63707 .fl_type = F_UNLCK,
63708 .fl_end = OFFSET_MAX,
63709 };
63710- filp->f_op->flock(filp, F_SETLKW, &fl);
63711- if (fl.fl_ops && fl.fl_ops->fl_release_private)
63712- fl.fl_ops->fl_release_private(&fl);
63713+ filp->f_op->flock(filp, F_SETLKW, &flock);
63714+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
63715+ flock.fl_ops->fl_release_private(&flock);
63716 }
63717
63718 spin_lock(&inode->i_lock);
63719diff --git a/fs/mount.h b/fs/mount.h
63720index f82c628..9492b99 100644
63721--- a/fs/mount.h
63722+++ b/fs/mount.h
63723@@ -11,7 +11,7 @@ struct mnt_namespace {
63724 u64 seq; /* Sequence number to prevent loops */
63725 wait_queue_head_t poll;
63726 u64 event;
63727-};
63728+} __randomize_layout;
63729
63730 struct mnt_pcp {
63731 int mnt_count;
63732@@ -62,7 +62,7 @@ struct mount {
63733 int mnt_expiry_mark; /* true if marked for expiry */
63734 struct hlist_head mnt_pins;
63735 struct path mnt_ex_mountpoint;
63736-};
63737+} __randomize_layout;
63738
63739 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
63740
63741diff --git a/fs/namei.c b/fs/namei.c
63742index db5fe86..d3dcc14 100644
63743--- a/fs/namei.c
63744+++ b/fs/namei.c
63745@@ -331,17 +331,32 @@ int generic_permission(struct inode *inode, int mask)
63746 if (ret != -EACCES)
63747 return ret;
63748
63749+#ifdef CONFIG_GRKERNSEC
63750+ /* we'll block if we have to log due to a denied capability use */
63751+ if (mask & MAY_NOT_BLOCK)
63752+ return -ECHILD;
63753+#endif
63754+
63755 if (S_ISDIR(inode->i_mode)) {
63756 /* DACs are overridable for directories */
63757- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63758- return 0;
63759 if (!(mask & MAY_WRITE))
63760- if (capable_wrt_inode_uidgid(inode,
63761- CAP_DAC_READ_SEARCH))
63762+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
63763+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63764 return 0;
63765+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63766+ return 0;
63767 return -EACCES;
63768 }
63769 /*
63770+ * Searching includes executable on directories, else just read.
63771+ */
63772+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
63773+ if (mask == MAY_READ)
63774+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
63775+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63776+ return 0;
63777+
63778+ /*
63779 * Read/write DACs are always overridable.
63780 * Executable DACs are overridable when there is
63781 * at least one exec bit set.
63782@@ -350,14 +365,6 @@ int generic_permission(struct inode *inode, int mask)
63783 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
63784 return 0;
63785
63786- /*
63787- * Searching includes executable on directories, else just read.
63788- */
63789- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
63790- if (mask == MAY_READ)
63791- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
63792- return 0;
63793-
63794 return -EACCES;
63795 }
63796 EXPORT_SYMBOL(generic_permission);
63797@@ -824,7 +831,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
63798 {
63799 struct dentry *dentry = link->dentry;
63800 int error;
63801- char *s;
63802+ const char *s;
63803
63804 BUG_ON(nd->flags & LOOKUP_RCU);
63805
63806@@ -845,6 +852,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
63807 if (error)
63808 goto out_put_nd_path;
63809
63810+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
63811+ dentry->d_inode, dentry, nd->path.mnt)) {
63812+ error = -EACCES;
63813+ goto out_put_nd_path;
63814+ }
63815+
63816 nd->last_type = LAST_BIND;
63817 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
63818 error = PTR_ERR(*p);
63819@@ -1608,6 +1621,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
63820 if (res)
63821 break;
63822 res = walk_component(nd, path, LOOKUP_FOLLOW);
63823+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
63824+ res = -EACCES;
63825 put_link(nd, &link, cookie);
63826 } while (res > 0);
63827
63828@@ -1680,7 +1695,7 @@ EXPORT_SYMBOL(full_name_hash);
63829 static inline u64 hash_name(const char *name)
63830 {
63831 unsigned long a, b, adata, bdata, mask, hash, len;
63832- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
63833+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
63834
63835 hash = a = 0;
63836 len = -sizeof(unsigned long);
63837@@ -1969,6 +1984,8 @@ static int path_lookupat(int dfd, const char *name,
63838 if (err)
63839 break;
63840 err = lookup_last(nd, &path);
63841+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
63842+ err = -EACCES;
63843 put_link(nd, &link, cookie);
63844 }
63845 }
63846@@ -1976,6 +1993,13 @@ static int path_lookupat(int dfd, const char *name,
63847 if (!err)
63848 err = complete_walk(nd);
63849
63850+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
63851+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
63852+ path_put(&nd->path);
63853+ err = -ENOENT;
63854+ }
63855+ }
63856+
63857 if (!err && nd->flags & LOOKUP_DIRECTORY) {
63858 if (!d_can_lookup(nd->path.dentry)) {
63859 path_put(&nd->path);
63860@@ -2004,8 +2028,15 @@ static int filename_lookup(int dfd, struct filename *name,
63861 retval = path_lookupat(dfd, name->name,
63862 flags | LOOKUP_REVAL, nd);
63863
63864- if (likely(!retval))
63865+ if (likely(!retval)) {
63866 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
63867+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
63868+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
63869+ path_put(&nd->path);
63870+ return -ENOENT;
63871+ }
63872+ }
63873+ }
63874 return retval;
63875 }
63876
63877@@ -2582,6 +2613,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
63878 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
63879 return -EPERM;
63880
63881+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
63882+ return -EPERM;
63883+ if (gr_handle_rawio(inode))
63884+ return -EPERM;
63885+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
63886+ return -EACCES;
63887+
63888 return 0;
63889 }
63890
63891@@ -2813,7 +2851,7 @@ looked_up:
63892 * cleared otherwise prior to returning.
63893 */
63894 static int lookup_open(struct nameidata *nd, struct path *path,
63895- struct file *file,
63896+ struct path *link, struct file *file,
63897 const struct open_flags *op,
63898 bool got_write, int *opened)
63899 {
63900@@ -2848,6 +2886,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
63901 /* Negative dentry, just create the file */
63902 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
63903 umode_t mode = op->mode;
63904+
63905+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
63906+ error = -EACCES;
63907+ goto out_dput;
63908+ }
63909+
63910+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
63911+ error = -EACCES;
63912+ goto out_dput;
63913+ }
63914+
63915 if (!IS_POSIXACL(dir->d_inode))
63916 mode &= ~current_umask();
63917 /*
63918@@ -2869,6 +2918,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
63919 nd->flags & LOOKUP_EXCL);
63920 if (error)
63921 goto out_dput;
63922+ else
63923+ gr_handle_create(dentry, nd->path.mnt);
63924 }
63925 out_no_open:
63926 path->dentry = dentry;
63927@@ -2883,7 +2934,7 @@ out_dput:
63928 /*
63929 * Handle the last step of open()
63930 */
63931-static int do_last(struct nameidata *nd, struct path *path,
63932+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
63933 struct file *file, const struct open_flags *op,
63934 int *opened, struct filename *name)
63935 {
63936@@ -2933,6 +2984,15 @@ static int do_last(struct nameidata *nd, struct path *path,
63937 if (error)
63938 return error;
63939
63940+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
63941+ error = -ENOENT;
63942+ goto out;
63943+ }
63944+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
63945+ error = -EACCES;
63946+ goto out;
63947+ }
63948+
63949 audit_inode(name, dir, LOOKUP_PARENT);
63950 error = -EISDIR;
63951 /* trailing slashes? */
63952@@ -2952,7 +3012,7 @@ retry_lookup:
63953 */
63954 }
63955 mutex_lock(&dir->d_inode->i_mutex);
63956- error = lookup_open(nd, path, file, op, got_write, opened);
63957+ error = lookup_open(nd, path, link, file, op, got_write, opened);
63958 mutex_unlock(&dir->d_inode->i_mutex);
63959
63960 if (error <= 0) {
63961@@ -2976,11 +3036,28 @@ retry_lookup:
63962 goto finish_open_created;
63963 }
63964
63965+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
63966+ error = -ENOENT;
63967+ goto exit_dput;
63968+ }
63969+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
63970+ error = -EACCES;
63971+ goto exit_dput;
63972+ }
63973+
63974 /*
63975 * create/update audit record if it already exists.
63976 */
63977- if (d_is_positive(path->dentry))
63978+ if (d_is_positive(path->dentry)) {
63979+ /* only check if O_CREAT is specified, all other checks need to go
63980+ into may_open */
63981+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
63982+ error = -EACCES;
63983+ goto exit_dput;
63984+ }
63985+
63986 audit_inode(name, path->dentry, 0);
63987+ }
63988
63989 /*
63990 * If atomic_open() acquired write access it is dropped now due to
63991@@ -3021,6 +3098,11 @@ finish_lookup:
63992 }
63993 }
63994 BUG_ON(inode != path->dentry->d_inode);
63995+ /* if we're resolving a symlink to another symlink */
63996+ if (link && gr_handle_symlink_owner(link, inode)) {
63997+ error = -EACCES;
63998+ goto out;
63999+ }
64000 return 1;
64001 }
64002
64003@@ -3040,7 +3122,18 @@ finish_open:
64004 path_put(&save_parent);
64005 return error;
64006 }
64007+
64008+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
64009+ error = -ENOENT;
64010+ goto out;
64011+ }
64012+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
64013+ error = -EACCES;
64014+ goto out;
64015+ }
64016+
64017 audit_inode(name, nd->path.dentry, 0);
64018+
64019 error = -EISDIR;
64020 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
64021 goto out;
64022@@ -3207,7 +3300,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64023 if (unlikely(error))
64024 goto out;
64025
64026- error = do_last(nd, &path, file, op, &opened, pathname);
64027+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
64028 while (unlikely(error > 0)) { /* trailing symlink */
64029 struct path link = path;
64030 void *cookie;
64031@@ -3225,7 +3318,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
64032 error = follow_link(&link, nd, &cookie);
64033 if (unlikely(error))
64034 break;
64035- error = do_last(nd, &path, file, op, &opened, pathname);
64036+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
64037 put_link(nd, &link, cookie);
64038 }
64039 out:
64040@@ -3325,9 +3418,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
64041 goto unlock;
64042
64043 error = -EEXIST;
64044- if (d_is_positive(dentry))
64045+ if (d_is_positive(dentry)) {
64046+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
64047+ error = -ENOENT;
64048 goto fail;
64049-
64050+ }
64051 /*
64052 * Special case - lookup gave negative, but... we had foo/bar/
64053 * From the vfs_mknod() POV we just have a negative dentry -
64054@@ -3379,6 +3474,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
64055 }
64056 EXPORT_SYMBOL(user_path_create);
64057
64058+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
64059+{
64060+ struct filename *tmp = getname(pathname);
64061+ struct dentry *res;
64062+ if (IS_ERR(tmp))
64063+ return ERR_CAST(tmp);
64064+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
64065+ if (IS_ERR(res))
64066+ putname(tmp);
64067+ else
64068+ *to = tmp;
64069+ return res;
64070+}
64071+
64072 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
64073 {
64074 int error = may_create(dir, dentry);
64075@@ -3442,6 +3551,17 @@ retry:
64076
64077 if (!IS_POSIXACL(path.dentry->d_inode))
64078 mode &= ~current_umask();
64079+
64080+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
64081+ error = -EPERM;
64082+ goto out;
64083+ }
64084+
64085+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
64086+ error = -EACCES;
64087+ goto out;
64088+ }
64089+
64090 error = security_path_mknod(&path, dentry, mode, dev);
64091 if (error)
64092 goto out;
64093@@ -3457,6 +3577,8 @@ retry:
64094 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
64095 break;
64096 }
64097+ if (!error)
64098+ gr_handle_create(dentry, path.mnt);
64099 out:
64100 done_path_create(&path, dentry);
64101 if (retry_estale(error, lookup_flags)) {
64102@@ -3511,9 +3633,16 @@ retry:
64103
64104 if (!IS_POSIXACL(path.dentry->d_inode))
64105 mode &= ~current_umask();
64106+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
64107+ error = -EACCES;
64108+ goto out;
64109+ }
64110 error = security_path_mkdir(&path, dentry, mode);
64111 if (!error)
64112 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
64113+ if (!error)
64114+ gr_handle_create(dentry, path.mnt);
64115+out:
64116 done_path_create(&path, dentry);
64117 if (retry_estale(error, lookup_flags)) {
64118 lookup_flags |= LOOKUP_REVAL;
64119@@ -3597,6 +3726,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
64120 struct filename *name;
64121 struct dentry *dentry;
64122 struct nameidata nd;
64123+ ino_t saved_ino = 0;
64124+ dev_t saved_dev = 0;
64125 unsigned int lookup_flags = 0;
64126 retry:
64127 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64128@@ -3629,10 +3760,21 @@ retry:
64129 error = -ENOENT;
64130 goto exit3;
64131 }
64132+
64133+ saved_ino = dentry->d_inode->i_ino;
64134+ saved_dev = gr_get_dev_from_dentry(dentry);
64135+
64136+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
64137+ error = -EACCES;
64138+ goto exit3;
64139+ }
64140+
64141 error = security_path_rmdir(&nd.path, dentry);
64142 if (error)
64143 goto exit3;
64144 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
64145+ if (!error && (saved_dev || saved_ino))
64146+ gr_handle_delete(saved_ino, saved_dev);
64147 exit3:
64148 dput(dentry);
64149 exit2:
64150@@ -3725,6 +3867,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
64151 struct nameidata nd;
64152 struct inode *inode = NULL;
64153 struct inode *delegated_inode = NULL;
64154+ ino_t saved_ino = 0;
64155+ dev_t saved_dev = 0;
64156 unsigned int lookup_flags = 0;
64157 retry:
64158 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
64159@@ -3751,10 +3895,22 @@ retry_deleg:
64160 if (d_is_negative(dentry))
64161 goto slashes;
64162 ihold(inode);
64163+
64164+ if (inode->i_nlink <= 1) {
64165+ saved_ino = inode->i_ino;
64166+ saved_dev = gr_get_dev_from_dentry(dentry);
64167+ }
64168+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
64169+ error = -EACCES;
64170+ goto exit2;
64171+ }
64172+
64173 error = security_path_unlink(&nd.path, dentry);
64174 if (error)
64175 goto exit2;
64176 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
64177+ if (!error && (saved_ino || saved_dev))
64178+ gr_handle_delete(saved_ino, saved_dev);
64179 exit2:
64180 dput(dentry);
64181 }
64182@@ -3843,9 +3999,17 @@ retry:
64183 if (IS_ERR(dentry))
64184 goto out_putname;
64185
64186+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
64187+ error = -EACCES;
64188+ goto out;
64189+ }
64190+
64191 error = security_path_symlink(&path, dentry, from->name);
64192 if (!error)
64193 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
64194+ if (!error)
64195+ gr_handle_create(dentry, path.mnt);
64196+out:
64197 done_path_create(&path, dentry);
64198 if (retry_estale(error, lookup_flags)) {
64199 lookup_flags |= LOOKUP_REVAL;
64200@@ -3949,6 +4113,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
64201 struct dentry *new_dentry;
64202 struct path old_path, new_path;
64203 struct inode *delegated_inode = NULL;
64204+ struct filename *to = NULL;
64205 int how = 0;
64206 int error;
64207
64208@@ -3972,7 +4137,7 @@ retry:
64209 if (error)
64210 return error;
64211
64212- new_dentry = user_path_create(newdfd, newname, &new_path,
64213+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
64214 (how & LOOKUP_REVAL));
64215 error = PTR_ERR(new_dentry);
64216 if (IS_ERR(new_dentry))
64217@@ -3984,11 +4149,28 @@ retry:
64218 error = may_linkat(&old_path);
64219 if (unlikely(error))
64220 goto out_dput;
64221+
64222+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
64223+ old_path.dentry->d_inode,
64224+ old_path.dentry->d_inode->i_mode, to)) {
64225+ error = -EACCES;
64226+ goto out_dput;
64227+ }
64228+
64229+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
64230+ old_path.dentry, old_path.mnt, to)) {
64231+ error = -EACCES;
64232+ goto out_dput;
64233+ }
64234+
64235 error = security_path_link(old_path.dentry, &new_path, new_dentry);
64236 if (error)
64237 goto out_dput;
64238 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
64239+ if (!error)
64240+ gr_handle_create(new_dentry, new_path.mnt);
64241 out_dput:
64242+ putname(to);
64243 done_path_create(&new_path, new_dentry);
64244 if (delegated_inode) {
64245 error = break_deleg_wait(&delegated_inode);
64246@@ -4304,6 +4486,12 @@ retry_deleg:
64247 if (new_dentry == trap)
64248 goto exit5;
64249
64250+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
64251+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
64252+ to, flags);
64253+ if (error)
64254+ goto exit5;
64255+
64256 error = security_path_rename(&oldnd.path, old_dentry,
64257 &newnd.path, new_dentry, flags);
64258 if (error)
64259@@ -4311,6 +4499,9 @@ retry_deleg:
64260 error = vfs_rename(old_dir->d_inode, old_dentry,
64261 new_dir->d_inode, new_dentry,
64262 &delegated_inode, flags);
64263+ if (!error)
64264+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
64265+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
64266 exit5:
64267 dput(new_dentry);
64268 exit4:
64269@@ -4367,14 +4558,24 @@ EXPORT_SYMBOL(vfs_whiteout);
64270
64271 int readlink_copy(char __user *buffer, int buflen, const char *link)
64272 {
64273+ char tmpbuf[64];
64274+ const char *newlink;
64275 int len = PTR_ERR(link);
64276+
64277 if (IS_ERR(link))
64278 goto out;
64279
64280 len = strlen(link);
64281 if (len > (unsigned) buflen)
64282 len = buflen;
64283- if (copy_to_user(buffer, link, len))
64284+
64285+ if (len < sizeof(tmpbuf)) {
64286+ memcpy(tmpbuf, link, len);
64287+ newlink = tmpbuf;
64288+ } else
64289+ newlink = link;
64290+
64291+ if (copy_to_user(buffer, newlink, len))
64292 len = -EFAULT;
64293 out:
64294 return len;
64295diff --git a/fs/namespace.c b/fs/namespace.c
64296index 5b66b2b..4d8290d 100644
64297--- a/fs/namespace.c
64298+++ b/fs/namespace.c
64299@@ -1369,6 +1369,8 @@ void umount_tree(struct mount *mnt, int how)
64300 }
64301 if (last) {
64302 last->mnt_hash.next = unmounted.first;
64303+ if (unmounted.first)
64304+ unmounted.first->pprev = &last->mnt_hash.next;
64305 unmounted.first = tmp_list.first;
64306 unmounted.first->pprev = &unmounted.first;
64307 }
64308@@ -1445,6 +1447,9 @@ static int do_umount(struct mount *mnt, int flags)
64309 if (!(sb->s_flags & MS_RDONLY))
64310 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
64311 up_write(&sb->s_umount);
64312+
64313+ gr_log_remount(mnt->mnt_devname, retval);
64314+
64315 return retval;
64316 }
64317
64318@@ -1467,6 +1472,9 @@ static int do_umount(struct mount *mnt, int flags)
64319 }
64320 unlock_mount_hash();
64321 namespace_unlock();
64322+
64323+ gr_log_unmount(mnt->mnt_devname, retval);
64324+
64325 return retval;
64326 }
64327
64328@@ -1517,7 +1525,7 @@ static inline bool may_mount(void)
64329 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
64330 */
64331
64332-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
64333+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
64334 {
64335 struct path path;
64336 struct mount *mnt;
64337@@ -1559,7 +1567,7 @@ out:
64338 /*
64339 * The 2.0 compatible umount. No flags.
64340 */
64341-SYSCALL_DEFINE1(oldumount, char __user *, name)
64342+SYSCALL_DEFINE1(oldumount, const char __user *, name)
64343 {
64344 return sys_umount(name, 0);
64345 }
64346@@ -2621,6 +2629,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
64347 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
64348 MS_STRICTATIME);
64349
64350+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
64351+ retval = -EPERM;
64352+ goto dput_out;
64353+ }
64354+
64355+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
64356+ retval = -EPERM;
64357+ goto dput_out;
64358+ }
64359+
64360 if (flags & MS_REMOUNT)
64361 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
64362 data_page);
64363@@ -2634,7 +2652,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
64364 retval = do_new_mount(&path, type_page, flags, mnt_flags,
64365 dev_name, data_page);
64366 dput_out:
64367+ gr_log_mount(dev_name, &path, retval);
64368+
64369 path_put(&path);
64370+
64371 return retval;
64372 }
64373
64374@@ -2652,7 +2673,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
64375 * number incrementing at 10Ghz will take 12,427 years to wrap which
64376 * is effectively never, so we can ignore the possibility.
64377 */
64378-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
64379+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
64380
64381 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64382 {
64383@@ -2667,7 +2688,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64384 kfree(new_ns);
64385 return ERR_PTR(ret);
64386 }
64387- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
64388+ new_ns->seq = atomic64_inc_return_unchecked(&mnt_ns_seq);
64389 atomic_set(&new_ns->count, 1);
64390 new_ns->root = NULL;
64391 INIT_LIST_HEAD(&new_ns->list);
64392@@ -2677,7 +2698,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
64393 return new_ns;
64394 }
64395
64396-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
64397+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
64398 struct user_namespace *user_ns, struct fs_struct *new_fs)
64399 {
64400 struct mnt_namespace *new_ns;
64401@@ -2798,8 +2819,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
64402 }
64403 EXPORT_SYMBOL(mount_subtree);
64404
64405-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
64406- char __user *, type, unsigned long, flags, void __user *, data)
64407+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
64408+ const char __user *, type, unsigned long, flags, void __user *, data)
64409 {
64410 int ret;
64411 char *kernel_type;
64412@@ -2905,6 +2926,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
64413 if (error)
64414 goto out2;
64415
64416+ if (gr_handle_chroot_pivot()) {
64417+ error = -EPERM;
64418+ goto out2;
64419+ }
64420+
64421 get_fs_root(current->fs, &root);
64422 old_mp = lock_mount(&old);
64423 error = PTR_ERR(old_mp);
64424@@ -3176,7 +3202,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
64425 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
64426 return -EPERM;
64427
64428- if (fs->users != 1)
64429+ if (atomic_read(&fs->users) != 1)
64430 return -EINVAL;
64431
64432 get_mnt_ns(mnt_ns);
64433diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
64434index f4ccfe6..a5cf064 100644
64435--- a/fs/nfs/callback_xdr.c
64436+++ b/fs/nfs/callback_xdr.c
64437@@ -51,7 +51,7 @@ struct callback_op {
64438 callback_decode_arg_t decode_args;
64439 callback_encode_res_t encode_res;
64440 long res_maxsize;
64441-};
64442+} __do_const;
64443
64444 static struct callback_op callback_ops[];
64445
64446diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
64447index 00689a8..b162632 100644
64448--- a/fs/nfs/inode.c
64449+++ b/fs/nfs/inode.c
64450@@ -1232,16 +1232,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
64451 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
64452 }
64453
64454-static atomic_long_t nfs_attr_generation_counter;
64455+static atomic_long_unchecked_t nfs_attr_generation_counter;
64456
64457 static unsigned long nfs_read_attr_generation_counter(void)
64458 {
64459- return atomic_long_read(&nfs_attr_generation_counter);
64460+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
64461 }
64462
64463 unsigned long nfs_inc_attr_generation_counter(void)
64464 {
64465- return atomic_long_inc_return(&nfs_attr_generation_counter);
64466+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
64467 }
64468
64469 void nfs_fattr_init(struct nfs_fattr *fattr)
64470diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
64471index 0beb023..3f685ec 100644
64472--- a/fs/nfsd/nfs4proc.c
64473+++ b/fs/nfsd/nfs4proc.c
64474@@ -1198,7 +1198,7 @@ struct nfsd4_operation {
64475 nfsd4op_rsize op_rsize_bop;
64476 stateid_getter op_get_currentstateid;
64477 stateid_setter op_set_currentstateid;
64478-};
64479+} __do_const;
64480
64481 static struct nfsd4_operation nfsd4_ops[];
64482
64483diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
64484index eeea7a9..f3ba422 100644
64485--- a/fs/nfsd/nfs4xdr.c
64486+++ b/fs/nfsd/nfs4xdr.c
64487@@ -1543,7 +1543,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
64488
64489 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
64490
64491-static nfsd4_dec nfsd4_dec_ops[] = {
64492+static const nfsd4_dec nfsd4_dec_ops[] = {
64493 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
64494 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
64495 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
64496diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
64497index 122f691..a00e2e0 100644
64498--- a/fs/nfsd/nfscache.c
64499+++ b/fs/nfsd/nfscache.c
64500@@ -537,7 +537,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64501 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
64502 u32 hash;
64503 struct nfsd_drc_bucket *b;
64504- int len;
64505+ long len;
64506 size_t bufsize = 0;
64507
64508 if (!rp)
64509@@ -546,11 +546,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64510 hash = nfsd_cache_hash(rp->c_xid);
64511 b = &drc_hashtbl[hash];
64512
64513- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
64514- len >>= 2;
64515+ if (statp) {
64516+ len = (char*)statp - (char*)resv->iov_base;
64517+ len = resv->iov_len - len;
64518+ len >>= 2;
64519+ }
64520
64521 /* Don't cache excessive amounts of data and XDR failures */
64522- if (!statp || len > (256 >> 2)) {
64523+ if (!statp || len > (256 >> 2) || len < 0) {
64524 nfsd_reply_cache_free(b, rp);
64525 return;
64526 }
64527@@ -558,7 +561,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
64528 switch (cachetype) {
64529 case RC_REPLSTAT:
64530 if (len != 1)
64531- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
64532+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
64533 rp->c_replstat = *statp;
64534 break;
64535 case RC_REPLBUFF:
64536diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
64537index 989129e..42e019e 100644
64538--- a/fs/nfsd/vfs.c
64539+++ b/fs/nfsd/vfs.c
64540@@ -872,7 +872,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
64541
64542 oldfs = get_fs();
64543 set_fs(KERNEL_DS);
64544- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
64545+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
64546 set_fs(oldfs);
64547 return nfsd_finish_read(file, count, host_err);
64548 }
64549@@ -960,7 +960,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
64550
64551 /* Write the data. */
64552 oldfs = get_fs(); set_fs(KERNEL_DS);
64553- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
64554+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
64555 set_fs(oldfs);
64556 if (host_err < 0)
64557 goto out_nfserr;
64558@@ -1502,7 +1502,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
64559 */
64560
64561 oldfs = get_fs(); set_fs(KERNEL_DS);
64562- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
64563+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
64564 set_fs(oldfs);
64565
64566 if (host_err < 0)
64567diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
64568index 52ccd34..7a6b202 100644
64569--- a/fs/nls/nls_base.c
64570+++ b/fs/nls/nls_base.c
64571@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
64572
64573 int __register_nls(struct nls_table *nls, struct module *owner)
64574 {
64575- struct nls_table ** tmp = &tables;
64576+ struct nls_table *tmp = tables;
64577
64578 if (nls->next)
64579 return -EBUSY;
64580
64581- nls->owner = owner;
64582+ pax_open_kernel();
64583+ *(void **)&nls->owner = owner;
64584+ pax_close_kernel();
64585 spin_lock(&nls_lock);
64586- while (*tmp) {
64587- if (nls == *tmp) {
64588+ while (tmp) {
64589+ if (nls == tmp) {
64590 spin_unlock(&nls_lock);
64591 return -EBUSY;
64592 }
64593- tmp = &(*tmp)->next;
64594+ tmp = tmp->next;
64595 }
64596- nls->next = tables;
64597+ pax_open_kernel();
64598+ *(struct nls_table **)&nls->next = tables;
64599+ pax_close_kernel();
64600 tables = nls;
64601 spin_unlock(&nls_lock);
64602 return 0;
64603@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
64604
64605 int unregister_nls(struct nls_table * nls)
64606 {
64607- struct nls_table ** tmp = &tables;
64608+ struct nls_table * const * tmp = &tables;
64609
64610 spin_lock(&nls_lock);
64611 while (*tmp) {
64612 if (nls == *tmp) {
64613- *tmp = nls->next;
64614+ pax_open_kernel();
64615+ *(struct nls_table **)tmp = nls->next;
64616+ pax_close_kernel();
64617 spin_unlock(&nls_lock);
64618 return 0;
64619 }
64620@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
64621 return -EINVAL;
64622 }
64623
64624-static struct nls_table *find_nls(char *charset)
64625+static struct nls_table *find_nls(const char *charset)
64626 {
64627 struct nls_table *nls;
64628 spin_lock(&nls_lock);
64629@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
64630 return nls;
64631 }
64632
64633-struct nls_table *load_nls(char *charset)
64634+struct nls_table *load_nls(const char *charset)
64635 {
64636 return try_then_request_module(find_nls(charset), "nls_%s", charset);
64637 }
64638diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
64639index 162b3f1..6076a7c 100644
64640--- a/fs/nls/nls_euc-jp.c
64641+++ b/fs/nls/nls_euc-jp.c
64642@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
64643 p_nls = load_nls("cp932");
64644
64645 if (p_nls) {
64646- table.charset2upper = p_nls->charset2upper;
64647- table.charset2lower = p_nls->charset2lower;
64648+ pax_open_kernel();
64649+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
64650+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
64651+ pax_close_kernel();
64652 return register_nls(&table);
64653 }
64654
64655diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
64656index a80a741..7b96e1b 100644
64657--- a/fs/nls/nls_koi8-ru.c
64658+++ b/fs/nls/nls_koi8-ru.c
64659@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
64660 p_nls = load_nls("koi8-u");
64661
64662 if (p_nls) {
64663- table.charset2upper = p_nls->charset2upper;
64664- table.charset2lower = p_nls->charset2lower;
64665+ pax_open_kernel();
64666+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
64667+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
64668+ pax_close_kernel();
64669 return register_nls(&table);
64670 }
64671
64672diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
64673index c991616..5ae51af 100644
64674--- a/fs/notify/fanotify/fanotify_user.c
64675+++ b/fs/notify/fanotify/fanotify_user.c
64676@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
64677
64678 fd = fanotify_event_metadata.fd;
64679 ret = -EFAULT;
64680- if (copy_to_user(buf, &fanotify_event_metadata,
64681- fanotify_event_metadata.event_len))
64682+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
64683+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
64684 goto out_close_fd;
64685
64686 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
64687diff --git a/fs/notify/notification.c b/fs/notify/notification.c
64688index a95d8e0..a91a5fd 100644
64689--- a/fs/notify/notification.c
64690+++ b/fs/notify/notification.c
64691@@ -48,7 +48,7 @@
64692 #include <linux/fsnotify_backend.h>
64693 #include "fsnotify.h"
64694
64695-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64696+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64697
64698 /**
64699 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
64700@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
64701 */
64702 u32 fsnotify_get_cookie(void)
64703 {
64704- return atomic_inc_return(&fsnotify_sync_cookie);
64705+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
64706 }
64707 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
64708
64709diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
64710index 9e38daf..5727cae 100644
64711--- a/fs/ntfs/dir.c
64712+++ b/fs/ntfs/dir.c
64713@@ -1310,7 +1310,7 @@ find_next_index_buffer:
64714 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
64715 ~(s64)(ndir->itype.index.block_size - 1)));
64716 /* Bounds checks. */
64717- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
64718+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
64719 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
64720 "inode 0x%lx or driver bug.", vdir->i_ino);
64721 goto err_out;
64722diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
64723index 643faa4..ef9027e 100644
64724--- a/fs/ntfs/file.c
64725+++ b/fs/ntfs/file.c
64726@@ -1280,7 +1280,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
64727 char *addr;
64728 size_t total = 0;
64729 unsigned len;
64730- int left;
64731+ unsigned left;
64732
64733 do {
64734 len = PAGE_CACHE_SIZE - ofs;
64735diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
64736index 9e1e112..241a52a 100644
64737--- a/fs/ntfs/super.c
64738+++ b/fs/ntfs/super.c
64739@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64740 if (!silent)
64741 ntfs_error(sb, "Primary boot sector is invalid.");
64742 } else if (!silent)
64743- ntfs_error(sb, read_err_str, "primary");
64744+ ntfs_error(sb, read_err_str, "%s", "primary");
64745 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
64746 if (bh_primary)
64747 brelse(bh_primary);
64748@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64749 goto hotfix_primary_boot_sector;
64750 brelse(bh_backup);
64751 } else if (!silent)
64752- ntfs_error(sb, read_err_str, "backup");
64753+ ntfs_error(sb, read_err_str, "%s", "backup");
64754 /* Try to read NT3.51- backup boot sector. */
64755 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
64756 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
64757@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
64758 "sector.");
64759 brelse(bh_backup);
64760 } else if (!silent)
64761- ntfs_error(sb, read_err_str, "backup");
64762+ ntfs_error(sb, read_err_str, "%s", "backup");
64763 /* We failed. Cleanup and return. */
64764 if (bh_primary)
64765 brelse(bh_primary);
64766diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
64767index 0440134..d52c93a 100644
64768--- a/fs/ocfs2/localalloc.c
64769+++ b/fs/ocfs2/localalloc.c
64770@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
64771 goto bail;
64772 }
64773
64774- atomic_inc(&osb->alloc_stats.moves);
64775+ atomic_inc_unchecked(&osb->alloc_stats.moves);
64776
64777 bail:
64778 if (handle)
64779diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
64780index bbec539..7b266d5 100644
64781--- a/fs/ocfs2/ocfs2.h
64782+++ b/fs/ocfs2/ocfs2.h
64783@@ -236,11 +236,11 @@ enum ocfs2_vol_state
64784
64785 struct ocfs2_alloc_stats
64786 {
64787- atomic_t moves;
64788- atomic_t local_data;
64789- atomic_t bitmap_data;
64790- atomic_t bg_allocs;
64791- atomic_t bg_extends;
64792+ atomic_unchecked_t moves;
64793+ atomic_unchecked_t local_data;
64794+ atomic_unchecked_t bitmap_data;
64795+ atomic_unchecked_t bg_allocs;
64796+ atomic_unchecked_t bg_extends;
64797 };
64798
64799 enum ocfs2_local_alloc_state
64800diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
64801index 0cb889a..6a26b24 100644
64802--- a/fs/ocfs2/suballoc.c
64803+++ b/fs/ocfs2/suballoc.c
64804@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
64805 mlog_errno(status);
64806 goto bail;
64807 }
64808- atomic_inc(&osb->alloc_stats.bg_extends);
64809+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
64810
64811 /* You should never ask for this much metadata */
64812 BUG_ON(bits_wanted >
64813@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
64814 mlog_errno(status);
64815 goto bail;
64816 }
64817- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64818+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64819
64820 *suballoc_loc = res.sr_bg_blkno;
64821 *suballoc_bit_start = res.sr_bit_offset;
64822@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
64823 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
64824 res->sr_bits);
64825
64826- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64827+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64828
64829 BUG_ON(res->sr_bits != 1);
64830
64831@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
64832 mlog_errno(status);
64833 goto bail;
64834 }
64835- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64836+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
64837
64838 BUG_ON(res.sr_bits != 1);
64839
64840@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
64841 cluster_start,
64842 num_clusters);
64843 if (!status)
64844- atomic_inc(&osb->alloc_stats.local_data);
64845+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
64846 } else {
64847 if (min_clusters > (osb->bitmap_cpg - 1)) {
64848 /* The only paths asking for contiguousness
64849@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
64850 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
64851 res.sr_bg_blkno,
64852 res.sr_bit_offset);
64853- atomic_inc(&osb->alloc_stats.bitmap_data);
64854+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
64855 *num_clusters = res.sr_bits;
64856 }
64857 }
64858diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
64859index 93c85bc..02f68a4 100644
64860--- a/fs/ocfs2/super.c
64861+++ b/fs/ocfs2/super.c
64862@@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
64863 "%10s => GlobalAllocs: %d LocalAllocs: %d "
64864 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
64865 "Stats",
64866- atomic_read(&osb->alloc_stats.bitmap_data),
64867- atomic_read(&osb->alloc_stats.local_data),
64868- atomic_read(&osb->alloc_stats.bg_allocs),
64869- atomic_read(&osb->alloc_stats.moves),
64870- atomic_read(&osb->alloc_stats.bg_extends));
64871+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
64872+ atomic_read_unchecked(&osb->alloc_stats.local_data),
64873+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
64874+ atomic_read_unchecked(&osb->alloc_stats.moves),
64875+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
64876
64877 out += snprintf(buf + out, len - out,
64878 "%10s => State: %u Descriptor: %llu Size: %u bits "
64879@@ -2104,11 +2104,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
64880
64881 mutex_init(&osb->system_file_mutex);
64882
64883- atomic_set(&osb->alloc_stats.moves, 0);
64884- atomic_set(&osb->alloc_stats.local_data, 0);
64885- atomic_set(&osb->alloc_stats.bitmap_data, 0);
64886- atomic_set(&osb->alloc_stats.bg_allocs, 0);
64887- atomic_set(&osb->alloc_stats.bg_extends, 0);
64888+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
64889+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
64890+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
64891+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
64892+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
64893
64894 /* Copy the blockcheck stats from the superblock probe */
64895 osb->osb_ecc_stats = *stats;
64896diff --git a/fs/open.c b/fs/open.c
64897index de92c13..52d2a6c 100644
64898--- a/fs/open.c
64899+++ b/fs/open.c
64900@@ -32,6 +32,8 @@
64901 #include <linux/dnotify.h>
64902 #include <linux/compat.h>
64903
64904+#define CREATE_TRACE_POINTS
64905+#include <trace/events/fs.h>
64906 #include "internal.h"
64907
64908 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
64909@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
64910 error = locks_verify_truncate(inode, NULL, length);
64911 if (!error)
64912 error = security_path_truncate(path);
64913+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
64914+ error = -EACCES;
64915 if (!error)
64916 error = do_truncate(path->dentry, length, 0, NULL);
64917
64918@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
64919 error = locks_verify_truncate(inode, f.file, length);
64920 if (!error)
64921 error = security_path_truncate(&f.file->f_path);
64922+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
64923+ error = -EACCES;
64924 if (!error)
64925 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
64926 sb_end_write(inode->i_sb);
64927@@ -380,6 +386,9 @@ retry:
64928 if (__mnt_is_readonly(path.mnt))
64929 res = -EROFS;
64930
64931+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
64932+ res = -EACCES;
64933+
64934 out_path_release:
64935 path_put(&path);
64936 if (retry_estale(res, lookup_flags)) {
64937@@ -411,6 +420,8 @@ retry:
64938 if (error)
64939 goto dput_and_out;
64940
64941+ gr_log_chdir(path.dentry, path.mnt);
64942+
64943 set_fs_pwd(current->fs, &path);
64944
64945 dput_and_out:
64946@@ -440,6 +451,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
64947 goto out_putf;
64948
64949 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
64950+
64951+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
64952+ error = -EPERM;
64953+
64954+ if (!error)
64955+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
64956+
64957 if (!error)
64958 set_fs_pwd(current->fs, &f.file->f_path);
64959 out_putf:
64960@@ -469,7 +487,13 @@ retry:
64961 if (error)
64962 goto dput_and_out;
64963
64964+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
64965+ goto dput_and_out;
64966+
64967 set_fs_root(current->fs, &path);
64968+
64969+ gr_handle_chroot_chdir(&path);
64970+
64971 error = 0;
64972 dput_and_out:
64973 path_put(&path);
64974@@ -493,6 +517,16 @@ static int chmod_common(struct path *path, umode_t mode)
64975 return error;
64976 retry_deleg:
64977 mutex_lock(&inode->i_mutex);
64978+
64979+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
64980+ error = -EACCES;
64981+ goto out_unlock;
64982+ }
64983+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
64984+ error = -EACCES;
64985+ goto out_unlock;
64986+ }
64987+
64988 error = security_path_chmod(path, mode);
64989 if (error)
64990 goto out_unlock;
64991@@ -558,6 +592,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
64992 uid = make_kuid(current_user_ns(), user);
64993 gid = make_kgid(current_user_ns(), group);
64994
64995+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
64996+ return -EACCES;
64997+
64998 newattrs.ia_valid = ATTR_CTIME;
64999 if (user != (uid_t) -1) {
65000 if (!uid_valid(uid))
65001@@ -1002,6 +1039,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
65002 } else {
65003 fsnotify_open(f);
65004 fd_install(fd, f);
65005+ trace_do_sys_open(tmp->name, flags, mode);
65006 }
65007 }
65008 putname(tmp);
65009diff --git a/fs/pipe.c b/fs/pipe.c
65010index 21981e5..3d5f55c 100644
65011--- a/fs/pipe.c
65012+++ b/fs/pipe.c
65013@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
65014
65015 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
65016 {
65017- if (pipe->files)
65018+ if (atomic_read(&pipe->files))
65019 mutex_lock_nested(&pipe->mutex, subclass);
65020 }
65021
65022@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
65023
65024 void pipe_unlock(struct pipe_inode_info *pipe)
65025 {
65026- if (pipe->files)
65027+ if (atomic_read(&pipe->files))
65028 mutex_unlock(&pipe->mutex);
65029 }
65030 EXPORT_SYMBOL(pipe_unlock);
65031@@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
65032 }
65033 if (bufs) /* More to do? */
65034 continue;
65035- if (!pipe->writers)
65036+ if (!atomic_read(&pipe->writers))
65037 break;
65038- if (!pipe->waiting_writers) {
65039+ if (!atomic_read(&pipe->waiting_writers)) {
65040 /* syscall merging: Usually we must not sleep
65041 * if O_NONBLOCK is set, or if we got some data.
65042 * But if a writer sleeps in kernel space, then
65043@@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65044
65045 __pipe_lock(pipe);
65046
65047- if (!pipe->readers) {
65048+ if (!atomic_read(&pipe->readers)) {
65049 send_sig(SIGPIPE, current, 0);
65050 ret = -EPIPE;
65051 goto out;
65052@@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65053 for (;;) {
65054 int bufs;
65055
65056- if (!pipe->readers) {
65057+ if (!atomic_read(&pipe->readers)) {
65058 send_sig(SIGPIPE, current, 0);
65059 if (!ret)
65060 ret = -EPIPE;
65061@@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
65062 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65063 do_wakeup = 0;
65064 }
65065- pipe->waiting_writers++;
65066+ atomic_inc(&pipe->waiting_writers);
65067 pipe_wait(pipe);
65068- pipe->waiting_writers--;
65069+ atomic_dec(&pipe->waiting_writers);
65070 }
65071 out:
65072 __pipe_unlock(pipe);
65073@@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65074 mask = 0;
65075 if (filp->f_mode & FMODE_READ) {
65076 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
65077- if (!pipe->writers && filp->f_version != pipe->w_counter)
65078+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
65079 mask |= POLLHUP;
65080 }
65081
65082@@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
65083 * Most Unices do not set POLLERR for FIFOs but on Linux they
65084 * behave exactly like pipes for poll().
65085 */
65086- if (!pipe->readers)
65087+ if (!atomic_read(&pipe->readers))
65088 mask |= POLLERR;
65089 }
65090
65091@@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
65092 int kill = 0;
65093
65094 spin_lock(&inode->i_lock);
65095- if (!--pipe->files) {
65096+ if (atomic_dec_and_test(&pipe->files)) {
65097 inode->i_pipe = NULL;
65098 kill = 1;
65099 }
65100@@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
65101
65102 __pipe_lock(pipe);
65103 if (file->f_mode & FMODE_READ)
65104- pipe->readers--;
65105+ atomic_dec(&pipe->readers);
65106 if (file->f_mode & FMODE_WRITE)
65107- pipe->writers--;
65108+ atomic_dec(&pipe->writers);
65109
65110- if (pipe->readers || pipe->writers) {
65111+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
65112 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
65113 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
65114 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
65115@@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
65116 kfree(pipe);
65117 }
65118
65119-static struct vfsmount *pipe_mnt __read_mostly;
65120+struct vfsmount *pipe_mnt __read_mostly;
65121
65122 /*
65123 * pipefs_dname() is called from d_path().
65124@@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
65125 goto fail_iput;
65126
65127 inode->i_pipe = pipe;
65128- pipe->files = 2;
65129- pipe->readers = pipe->writers = 1;
65130+ atomic_set(&pipe->files, 2);
65131+ atomic_set(&pipe->readers, 1);
65132+ atomic_set(&pipe->writers, 1);
65133 inode->i_fop = &pipefifo_fops;
65134
65135 /*
65136@@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
65137 spin_lock(&inode->i_lock);
65138 if (inode->i_pipe) {
65139 pipe = inode->i_pipe;
65140- pipe->files++;
65141+ atomic_inc(&pipe->files);
65142 spin_unlock(&inode->i_lock);
65143 } else {
65144 spin_unlock(&inode->i_lock);
65145 pipe = alloc_pipe_info();
65146 if (!pipe)
65147 return -ENOMEM;
65148- pipe->files = 1;
65149+ atomic_set(&pipe->files, 1);
65150 spin_lock(&inode->i_lock);
65151 if (unlikely(inode->i_pipe)) {
65152- inode->i_pipe->files++;
65153+ atomic_inc(&inode->i_pipe->files);
65154 spin_unlock(&inode->i_lock);
65155 free_pipe_info(pipe);
65156 pipe = inode->i_pipe;
65157@@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
65158 * opened, even when there is no process writing the FIFO.
65159 */
65160 pipe->r_counter++;
65161- if (pipe->readers++ == 0)
65162+ if (atomic_inc_return(&pipe->readers) == 1)
65163 wake_up_partner(pipe);
65164
65165- if (!is_pipe && !pipe->writers) {
65166+ if (!is_pipe && !atomic_read(&pipe->writers)) {
65167 if ((filp->f_flags & O_NONBLOCK)) {
65168 /* suppress POLLHUP until we have
65169 * seen a writer */
65170@@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
65171 * errno=ENXIO when there is no process reading the FIFO.
65172 */
65173 ret = -ENXIO;
65174- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
65175+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
65176 goto err;
65177
65178 pipe->w_counter++;
65179- if (!pipe->writers++)
65180+ if (atomic_inc_return(&pipe->writers) == 1)
65181 wake_up_partner(pipe);
65182
65183- if (!is_pipe && !pipe->readers) {
65184+ if (!is_pipe && !atomic_read(&pipe->readers)) {
65185 if (wait_for_partner(pipe, &pipe->r_counter))
65186 goto err_wr;
65187 }
65188@@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
65189 * the process can at least talk to itself.
65190 */
65191
65192- pipe->readers++;
65193- pipe->writers++;
65194+ atomic_inc(&pipe->readers);
65195+ atomic_inc(&pipe->writers);
65196 pipe->r_counter++;
65197 pipe->w_counter++;
65198- if (pipe->readers == 1 || pipe->writers == 1)
65199+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
65200 wake_up_partner(pipe);
65201 break;
65202
65203@@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
65204 return 0;
65205
65206 err_rd:
65207- if (!--pipe->readers)
65208+ if (atomic_dec_and_test(&pipe->readers))
65209 wake_up_interruptible(&pipe->wait);
65210 ret = -ERESTARTSYS;
65211 goto err;
65212
65213 err_wr:
65214- if (!--pipe->writers)
65215+ if (atomic_dec_and_test(&pipe->writers))
65216 wake_up_interruptible(&pipe->wait);
65217 ret = -ERESTARTSYS;
65218 goto err;
65219diff --git a/fs/posix_acl.c b/fs/posix_acl.c
65220index 0855f77..6787d50 100644
65221--- a/fs/posix_acl.c
65222+++ b/fs/posix_acl.c
65223@@ -20,6 +20,7 @@
65224 #include <linux/xattr.h>
65225 #include <linux/export.h>
65226 #include <linux/user_namespace.h>
65227+#include <linux/grsecurity.h>
65228
65229 struct posix_acl **acl_by_type(struct inode *inode, int type)
65230 {
65231@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
65232 }
65233 }
65234 if (mode_p)
65235- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65236+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65237 return not_equiv;
65238 }
65239 EXPORT_SYMBOL(posix_acl_equiv_mode);
65240@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
65241 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
65242 }
65243
65244- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
65245+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
65246 return not_equiv;
65247 }
65248
65249@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
65250 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
65251 int err = -ENOMEM;
65252 if (clone) {
65253+ *mode_p &= ~gr_acl_umask();
65254+
65255 err = posix_acl_create_masq(clone, mode_p);
65256 if (err < 0) {
65257 posix_acl_release(clone);
65258@@ -659,11 +662,12 @@ struct posix_acl *
65259 posix_acl_from_xattr(struct user_namespace *user_ns,
65260 const void *value, size_t size)
65261 {
65262- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
65263- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
65264+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
65265+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
65266 int count;
65267 struct posix_acl *acl;
65268 struct posix_acl_entry *acl_e;
65269+ umode_t umask = gr_acl_umask();
65270
65271 if (!value)
65272 return NULL;
65273@@ -689,12 +693,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65274
65275 switch(acl_e->e_tag) {
65276 case ACL_USER_OBJ:
65277+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65278+ break;
65279 case ACL_GROUP_OBJ:
65280 case ACL_MASK:
65281+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65282+ break;
65283 case ACL_OTHER:
65284+ acl_e->e_perm &= ~(umask & S_IRWXO);
65285 break;
65286
65287 case ACL_USER:
65288+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
65289 acl_e->e_uid =
65290 make_kuid(user_ns,
65291 le32_to_cpu(entry->e_id));
65292@@ -702,6 +712,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
65293 goto fail;
65294 break;
65295 case ACL_GROUP:
65296+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
65297 acl_e->e_gid =
65298 make_kgid(user_ns,
65299 le32_to_cpu(entry->e_id));
65300diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
65301index 2183fcf..3c32a98 100644
65302--- a/fs/proc/Kconfig
65303+++ b/fs/proc/Kconfig
65304@@ -30,7 +30,7 @@ config PROC_FS
65305
65306 config PROC_KCORE
65307 bool "/proc/kcore support" if !ARM
65308- depends on PROC_FS && MMU
65309+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
65310 help
65311 Provides a virtual ELF core file of the live kernel. This can
65312 be read with gdb and other ELF tools. No modifications can be
65313@@ -38,8 +38,8 @@ config PROC_KCORE
65314
65315 config PROC_VMCORE
65316 bool "/proc/vmcore support"
65317- depends on PROC_FS && CRASH_DUMP
65318- default y
65319+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
65320+ default n
65321 help
65322 Exports the dump image of crashed kernel in ELF format.
65323
65324@@ -63,8 +63,8 @@ config PROC_SYSCTL
65325 limited in memory.
65326
65327 config PROC_PAGE_MONITOR
65328- default y
65329- depends on PROC_FS && MMU
65330+ default n
65331+ depends on PROC_FS && MMU && !GRKERNSEC
65332 bool "Enable /proc page monitoring" if EXPERT
65333 help
65334 Various /proc files exist to monitor process memory utilization:
65335diff --git a/fs/proc/array.c b/fs/proc/array.c
65336index cd3653e..9b9b79a 100644
65337--- a/fs/proc/array.c
65338+++ b/fs/proc/array.c
65339@@ -60,6 +60,7 @@
65340 #include <linux/tty.h>
65341 #include <linux/string.h>
65342 #include <linux/mman.h>
65343+#include <linux/grsecurity.h>
65344 #include <linux/proc_fs.h>
65345 #include <linux/ioport.h>
65346 #include <linux/uaccess.h>
65347@@ -347,6 +348,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
65348 seq_putc(m, '\n');
65349 }
65350
65351+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
65352+static inline void task_pax(struct seq_file *m, struct task_struct *p)
65353+{
65354+ if (p->mm)
65355+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
65356+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
65357+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
65358+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
65359+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
65360+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
65361+ else
65362+ seq_printf(m, "PaX:\t-----\n");
65363+}
65364+#endif
65365+
65366 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
65367 struct pid *pid, struct task_struct *task)
65368 {
65369@@ -365,9 +381,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
65370 task_cpus_allowed(m, task);
65371 cpuset_task_status_allowed(m, task);
65372 task_context_switch_counts(m, task);
65373+
65374+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
65375+ task_pax(m, task);
65376+#endif
65377+
65378+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
65379+ task_grsec_rbac(m, task);
65380+#endif
65381+
65382 return 0;
65383 }
65384
65385+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65386+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
65387+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
65388+ _mm->pax_flags & MF_PAX_SEGMEXEC))
65389+#endif
65390+
65391 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65392 struct pid *pid, struct task_struct *task, int whole)
65393 {
65394@@ -389,6 +420,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65395 char tcomm[sizeof(task->comm)];
65396 unsigned long flags;
65397
65398+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65399+ if (current->exec_id != m->exec_id) {
65400+ gr_log_badprocpid("stat");
65401+ return 0;
65402+ }
65403+#endif
65404+
65405 state = *get_task_state(task);
65406 vsize = eip = esp = 0;
65407 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
65408@@ -459,6 +497,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65409 gtime = task_gtime(task);
65410 }
65411
65412+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65413+ if (PAX_RAND_FLAGS(mm)) {
65414+ eip = 0;
65415+ esp = 0;
65416+ wchan = 0;
65417+ }
65418+#endif
65419+#ifdef CONFIG_GRKERNSEC_HIDESYM
65420+ wchan = 0;
65421+ eip =0;
65422+ esp =0;
65423+#endif
65424+
65425 /* scale priority and nice values from timeslices to -20..20 */
65426 /* to make it look like a "normal" Unix priority/nice value */
65427 priority = task_prio(task);
65428@@ -490,9 +541,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65429 seq_put_decimal_ull(m, ' ', vsize);
65430 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
65431 seq_put_decimal_ull(m, ' ', rsslim);
65432+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65433+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
65434+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
65435+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
65436+#else
65437 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
65438 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
65439 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
65440+#endif
65441 seq_put_decimal_ull(m, ' ', esp);
65442 seq_put_decimal_ull(m, ' ', eip);
65443 /* The signal information here is obsolete.
65444@@ -514,7 +571,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
65445 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
65446 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
65447
65448- if (mm && permitted) {
65449+ if (mm && permitted
65450+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65451+ && !PAX_RAND_FLAGS(mm)
65452+#endif
65453+ ) {
65454 seq_put_decimal_ull(m, ' ', mm->start_data);
65455 seq_put_decimal_ull(m, ' ', mm->end_data);
65456 seq_put_decimal_ull(m, ' ', mm->start_brk);
65457@@ -552,8 +613,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
65458 struct pid *pid, struct task_struct *task)
65459 {
65460 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
65461- struct mm_struct *mm = get_task_mm(task);
65462+ struct mm_struct *mm;
65463
65464+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65465+ if (current->exec_id != m->exec_id) {
65466+ gr_log_badprocpid("statm");
65467+ return 0;
65468+ }
65469+#endif
65470+ mm = get_task_mm(task);
65471 if (mm) {
65472 size = task_statm(mm, &shared, &text, &data, &resident);
65473 mmput(mm);
65474@@ -576,6 +644,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
65475 return 0;
65476 }
65477
65478+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
65479+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
65480+{
65481+ unsigned long flags;
65482+ u32 curr_ip = 0;
65483+
65484+ if (lock_task_sighand(task, &flags)) {
65485+ curr_ip = task->signal->curr_ip;
65486+ unlock_task_sighand(task, &flags);
65487+ }
65488+ return seq_printf(m, "%pI4\n", &curr_ip);
65489+}
65490+#endif
65491+
65492 #ifdef CONFIG_CHECKPOINT_RESTORE
65493 static struct pid *
65494 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
65495diff --git a/fs/proc/base.c b/fs/proc/base.c
65496index 772efa4..e7f1a5c 100644
65497--- a/fs/proc/base.c
65498+++ b/fs/proc/base.c
65499@@ -113,6 +113,14 @@ struct pid_entry {
65500 union proc_op op;
65501 };
65502
65503+struct getdents_callback {
65504+ struct linux_dirent __user * current_dir;
65505+ struct linux_dirent __user * previous;
65506+ struct file * file;
65507+ int count;
65508+ int error;
65509+};
65510+
65511 #define NOD(NAME, MODE, IOP, FOP, OP) { \
65512 .name = (NAME), \
65513 .len = sizeof(NAME) - 1, \
65514@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
65515 return 0;
65516 }
65517
65518+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65519+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
65520+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
65521+ _mm->pax_flags & MF_PAX_SEGMEXEC))
65522+#endif
65523+
65524 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
65525 struct pid *pid, struct task_struct *task)
65526 {
65527 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
65528 if (mm && !IS_ERR(mm)) {
65529 unsigned int nwords = 0;
65530+
65531+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65532+ /* allow if we're currently ptracing this task */
65533+ if (PAX_RAND_FLAGS(mm) &&
65534+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
65535+ mmput(mm);
65536+ return 0;
65537+ }
65538+#endif
65539+
65540 do {
65541 nwords += 2;
65542 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
65543@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
65544 }
65545
65546
65547-#ifdef CONFIG_KALLSYMS
65548+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65549 /*
65550 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
65551 * Returns the resolved symbol. If that fails, simply return the address.
65552@@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
65553 mutex_unlock(&task->signal->cred_guard_mutex);
65554 }
65555
65556-#ifdef CONFIG_STACKTRACE
65557+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65558
65559 #define MAX_STACK_TRACE_DEPTH 64
65560
65561@@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
65562 return 0;
65563 }
65564
65565-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65566+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65567 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
65568 struct pid *pid, struct task_struct *task)
65569 {
65570@@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
65571 /************************************************************************/
65572
65573 /* permission checks */
65574-static int proc_fd_access_allowed(struct inode *inode)
65575+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
65576 {
65577 struct task_struct *task;
65578 int allowed = 0;
65579@@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
65580 */
65581 task = get_proc_task(inode);
65582 if (task) {
65583- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
65584+ if (log)
65585+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
65586+ else
65587+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
65588 put_task_struct(task);
65589 }
65590 return allowed;
65591@@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
65592 struct task_struct *task,
65593 int hide_pid_min)
65594 {
65595+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65596+ return false;
65597+
65598+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65599+ rcu_read_lock();
65600+ {
65601+ const struct cred *tmpcred = current_cred();
65602+ const struct cred *cred = __task_cred(task);
65603+
65604+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
65605+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65606+ || in_group_p(grsec_proc_gid)
65607+#endif
65608+ ) {
65609+ rcu_read_unlock();
65610+ return true;
65611+ }
65612+ }
65613+ rcu_read_unlock();
65614+
65615+ if (!pid->hide_pid)
65616+ return false;
65617+#endif
65618+
65619 if (pid->hide_pid < hide_pid_min)
65620 return true;
65621 if (in_group_p(pid->pid_gid))
65622 return true;
65623+
65624 return ptrace_may_access(task, PTRACE_MODE_READ);
65625 }
65626
65627@@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
65628 put_task_struct(task);
65629
65630 if (!has_perms) {
65631+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65632+ {
65633+#else
65634 if (pid->hide_pid == 2) {
65635+#endif
65636 /*
65637 * Let's make getdents(), stat(), and open()
65638 * consistent with each other. If a process
65639@@ -609,6 +665,8 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
65640
65641 if (task) {
65642 mm = mm_access(task, mode);
65643+ if (gr_acl_handle_procpidmem(task))
65644+ mm = ERR_PTR(-EPERM);
65645 put_task_struct(task);
65646
65647 if (!IS_ERR_OR_NULL(mm)) {
65648@@ -630,6 +688,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
65649 return PTR_ERR(mm);
65650
65651 file->private_data = mm;
65652+
65653+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65654+ file->f_version = current->exec_id;
65655+#endif
65656+
65657 return 0;
65658 }
65659
65660@@ -651,6 +714,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
65661 ssize_t copied;
65662 char *page;
65663
65664+#ifdef CONFIG_GRKERNSEC
65665+ if (write)
65666+ return -EPERM;
65667+#endif
65668+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65669+ if (file->f_version != current->exec_id) {
65670+ gr_log_badprocpid("mem");
65671+ return 0;
65672+ }
65673+#endif
65674+
65675 if (!mm)
65676 return 0;
65677
65678@@ -663,7 +737,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
65679 goto free;
65680
65681 while (count > 0) {
65682- int this_len = min_t(int, count, PAGE_SIZE);
65683+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
65684
65685 if (write && copy_from_user(page, buf, this_len)) {
65686 copied = -EFAULT;
65687@@ -755,6 +829,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
65688 if (!mm)
65689 return 0;
65690
65691+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
65692+ if (file->f_version != current->exec_id) {
65693+ gr_log_badprocpid("environ");
65694+ return 0;
65695+ }
65696+#endif
65697+
65698 page = (char *)__get_free_page(GFP_TEMPORARY);
65699 if (!page)
65700 return -ENOMEM;
65701@@ -764,7 +845,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
65702 goto free;
65703 while (count > 0) {
65704 size_t this_len, max_len;
65705- int retval;
65706+ ssize_t retval;
65707
65708 if (src >= (mm->env_end - mm->env_start))
65709 break;
65710@@ -1378,7 +1459,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
65711 int error = -EACCES;
65712
65713 /* Are we allowed to snoop on the tasks file descriptors? */
65714- if (!proc_fd_access_allowed(inode))
65715+ if (!proc_fd_access_allowed(inode, 0))
65716 goto out;
65717
65718 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
65719@@ -1422,8 +1503,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
65720 struct path path;
65721
65722 /* Are we allowed to snoop on the tasks file descriptors? */
65723- if (!proc_fd_access_allowed(inode))
65724- goto out;
65725+ /* logging this is needed for learning on chromium to work properly,
65726+ but we don't want to flood the logs from 'ps' which does a readlink
65727+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
65728+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
65729+ */
65730+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
65731+ if (!proc_fd_access_allowed(inode,0))
65732+ goto out;
65733+ } else {
65734+ if (!proc_fd_access_allowed(inode,1))
65735+ goto out;
65736+ }
65737
65738 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
65739 if (error)
65740@@ -1473,7 +1564,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
65741 rcu_read_lock();
65742 cred = __task_cred(task);
65743 inode->i_uid = cred->euid;
65744+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65745+ inode->i_gid = grsec_proc_gid;
65746+#else
65747 inode->i_gid = cred->egid;
65748+#endif
65749 rcu_read_unlock();
65750 }
65751 security_task_to_inode(task, inode);
65752@@ -1509,10 +1604,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
65753 return -ENOENT;
65754 }
65755 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
65756+#ifdef CONFIG_GRKERNSEC_PROC_USER
65757+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
65758+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65759+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
65760+#endif
65761 task_dumpable(task)) {
65762 cred = __task_cred(task);
65763 stat->uid = cred->euid;
65764+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65765+ stat->gid = grsec_proc_gid;
65766+#else
65767 stat->gid = cred->egid;
65768+#endif
65769 }
65770 }
65771 rcu_read_unlock();
65772@@ -1550,11 +1654,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
65773
65774 if (task) {
65775 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
65776+#ifdef CONFIG_GRKERNSEC_PROC_USER
65777+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
65778+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65779+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
65780+#endif
65781 task_dumpable(task)) {
65782 rcu_read_lock();
65783 cred = __task_cred(task);
65784 inode->i_uid = cred->euid;
65785+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
65786+ inode->i_gid = grsec_proc_gid;
65787+#else
65788 inode->i_gid = cred->egid;
65789+#endif
65790 rcu_read_unlock();
65791 } else {
65792 inode->i_uid = GLOBAL_ROOT_UID;
65793@@ -2085,6 +2198,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
65794 if (!task)
65795 goto out_no_task;
65796
65797+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65798+ goto out;
65799+
65800 /*
65801 * Yes, it does not scale. And it should not. Don't add
65802 * new entries into /proc/<tgid>/ without very good reasons.
65803@@ -2115,6 +2231,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
65804 if (!task)
65805 return -ENOENT;
65806
65807+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65808+ goto out;
65809+
65810 if (!dir_emit_dots(file, ctx))
65811 goto out;
65812
65813@@ -2506,7 +2625,7 @@ static const struct pid_entry tgid_base_stuff[] = {
65814 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
65815 #endif
65816 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
65817-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65818+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65819 ONE("syscall", S_IRUSR, proc_pid_syscall),
65820 #endif
65821 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
65822@@ -2531,10 +2650,10 @@ static const struct pid_entry tgid_base_stuff[] = {
65823 #ifdef CONFIG_SECURITY
65824 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
65825 #endif
65826-#ifdef CONFIG_KALLSYMS
65827+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65828 ONE("wchan", S_IRUGO, proc_pid_wchan),
65829 #endif
65830-#ifdef CONFIG_STACKTRACE
65831+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65832 ONE("stack", S_IRUSR, proc_pid_stack),
65833 #endif
65834 #ifdef CONFIG_SCHEDSTATS
65835@@ -2568,6 +2687,9 @@ static const struct pid_entry tgid_base_stuff[] = {
65836 #ifdef CONFIG_HARDWALL
65837 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
65838 #endif
65839+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
65840+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
65841+#endif
65842 #ifdef CONFIG_USER_NS
65843 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
65844 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
65845@@ -2696,7 +2818,14 @@ static int proc_pid_instantiate(struct inode *dir,
65846 if (!inode)
65847 goto out;
65848
65849+#ifdef CONFIG_GRKERNSEC_PROC_USER
65850+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
65851+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65852+ inode->i_gid = grsec_proc_gid;
65853+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
65854+#else
65855 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
65856+#endif
65857 inode->i_op = &proc_tgid_base_inode_operations;
65858 inode->i_fop = &proc_tgid_base_operations;
65859 inode->i_flags|=S_IMMUTABLE;
65860@@ -2734,7 +2863,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
65861 if (!task)
65862 goto out;
65863
65864+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
65865+ goto out_put_task;
65866+
65867 result = proc_pid_instantiate(dir, dentry, task, NULL);
65868+out_put_task:
65869 put_task_struct(task);
65870 out:
65871 return ERR_PTR(result);
65872@@ -2848,7 +2981,7 @@ static const struct pid_entry tid_base_stuff[] = {
65873 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
65874 #endif
65875 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
65876-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
65877+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
65878 ONE("syscall", S_IRUSR, proc_pid_syscall),
65879 #endif
65880 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
65881@@ -2875,10 +3008,10 @@ static const struct pid_entry tid_base_stuff[] = {
65882 #ifdef CONFIG_SECURITY
65883 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
65884 #endif
65885-#ifdef CONFIG_KALLSYMS
65886+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65887 ONE("wchan", S_IRUGO, proc_pid_wchan),
65888 #endif
65889-#ifdef CONFIG_STACKTRACE
65890+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
65891 ONE("stack", S_IRUSR, proc_pid_stack),
65892 #endif
65893 #ifdef CONFIG_SCHEDSTATS
65894diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
65895index cbd82df..c0407d2 100644
65896--- a/fs/proc/cmdline.c
65897+++ b/fs/proc/cmdline.c
65898@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
65899
65900 static int __init proc_cmdline_init(void)
65901 {
65902+#ifdef CONFIG_GRKERNSEC_PROC_ADD
65903+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
65904+#else
65905 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
65906+#endif
65907 return 0;
65908 }
65909 fs_initcall(proc_cmdline_init);
65910diff --git a/fs/proc/devices.c b/fs/proc/devices.c
65911index 50493ed..248166b 100644
65912--- a/fs/proc/devices.c
65913+++ b/fs/proc/devices.c
65914@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
65915
65916 static int __init proc_devices_init(void)
65917 {
65918+#ifdef CONFIG_GRKERNSEC_PROC_ADD
65919+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
65920+#else
65921 proc_create("devices", 0, NULL, &proc_devinfo_operations);
65922+#endif
65923 return 0;
65924 }
65925 fs_initcall(proc_devices_init);
65926diff --git a/fs/proc/fd.c b/fs/proc/fd.c
65927index e11d7c5..9128ce06 100644
65928--- a/fs/proc/fd.c
65929+++ b/fs/proc/fd.c
65930@@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
65931 if (!task)
65932 return -ENOENT;
65933
65934- files = get_files_struct(task);
65935+ if (!gr_acl_handle_procpidmem(task))
65936+ files = get_files_struct(task);
65937 put_task_struct(task);
65938
65939 if (files) {
65940@@ -283,11 +284,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
65941 */
65942 int proc_fd_permission(struct inode *inode, int mask)
65943 {
65944+ struct task_struct *task;
65945 int rv = generic_permission(inode, mask);
65946- if (rv == 0)
65947- return 0;
65948+
65949 if (task_tgid(current) == proc_pid(inode))
65950 rv = 0;
65951+
65952+ task = get_proc_task(inode);
65953+ if (task == NULL)
65954+ return rv;
65955+
65956+ if (gr_acl_handle_procpidmem(task))
65957+ rv = -EACCES;
65958+
65959+ put_task_struct(task);
65960+
65961 return rv;
65962 }
65963
65964diff --git a/fs/proc/generic.c b/fs/proc/generic.c
65965index 317b726..e329aed 100644
65966--- a/fs/proc/generic.c
65967+++ b/fs/proc/generic.c
65968@@ -23,6 +23,7 @@
65969 #include <linux/bitops.h>
65970 #include <linux/spinlock.h>
65971 #include <linux/completion.h>
65972+#include <linux/grsecurity.h>
65973 #include <asm/uaccess.h>
65974
65975 #include "internal.h"
65976@@ -207,6 +208,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
65977 return proc_lookup_de(PDE(dir), dir, dentry);
65978 }
65979
65980+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
65981+ unsigned int flags)
65982+{
65983+ if (gr_proc_is_restricted())
65984+ return ERR_PTR(-EACCES);
65985+
65986+ return proc_lookup_de(PDE(dir), dir, dentry);
65987+}
65988+
65989 /*
65990 * This returns non-zero if at EOF, so that the /proc
65991 * root directory can use this and check if it should
65992@@ -264,6 +274,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
65993 return proc_readdir_de(PDE(inode), file, ctx);
65994 }
65995
65996+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
65997+{
65998+ struct inode *inode = file_inode(file);
65999+
66000+ if (gr_proc_is_restricted())
66001+ return -EACCES;
66002+
66003+ return proc_readdir_de(PDE(inode), file, ctx);
66004+}
66005+
66006 /*
66007 * These are the generic /proc directory operations. They
66008 * use the in-memory "struct proc_dir_entry" tree to parse
66009@@ -275,6 +295,12 @@ static const struct file_operations proc_dir_operations = {
66010 .iterate = proc_readdir,
66011 };
66012
66013+static const struct file_operations proc_dir_restricted_operations = {
66014+ .llseek = generic_file_llseek,
66015+ .read = generic_read_dir,
66016+ .iterate = proc_readdir_restrict,
66017+};
66018+
66019 /*
66020 * proc directories can do almost nothing..
66021 */
66022@@ -284,6 +310,12 @@ static const struct inode_operations proc_dir_inode_operations = {
66023 .setattr = proc_notify_change,
66024 };
66025
66026+static const struct inode_operations proc_dir_restricted_inode_operations = {
66027+ .lookup = proc_lookup_restrict,
66028+ .getattr = proc_getattr,
66029+ .setattr = proc_notify_change,
66030+};
66031+
66032 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
66033 {
66034 struct proc_dir_entry *tmp;
66035@@ -294,8 +326,13 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
66036 return ret;
66037
66038 if (S_ISDIR(dp->mode)) {
66039- dp->proc_fops = &proc_dir_operations;
66040- dp->proc_iops = &proc_dir_inode_operations;
66041+ if (dp->restricted) {
66042+ dp->proc_fops = &proc_dir_restricted_operations;
66043+ dp->proc_iops = &proc_dir_restricted_inode_operations;
66044+ } else {
66045+ dp->proc_fops = &proc_dir_operations;
66046+ dp->proc_iops = &proc_dir_inode_operations;
66047+ }
66048 dir->nlink++;
66049 } else if (S_ISLNK(dp->mode)) {
66050 dp->proc_iops = &proc_link_inode_operations;
66051@@ -407,6 +444,27 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
66052 }
66053 EXPORT_SYMBOL_GPL(proc_mkdir_data);
66054
66055+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
66056+ struct proc_dir_entry *parent, void *data)
66057+{
66058+ struct proc_dir_entry *ent;
66059+
66060+ if (mode == 0)
66061+ mode = S_IRUGO | S_IXUGO;
66062+
66063+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
66064+ if (ent) {
66065+ ent->data = data;
66066+ ent->restricted = 1;
66067+ if (proc_register(parent, ent) < 0) {
66068+ kfree(ent);
66069+ ent = NULL;
66070+ }
66071+ }
66072+ return ent;
66073+}
66074+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
66075+
66076 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
66077 struct proc_dir_entry *parent)
66078 {
66079@@ -421,6 +479,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
66080 }
66081 EXPORT_SYMBOL(proc_mkdir);
66082
66083+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
66084+ struct proc_dir_entry *parent)
66085+{
66086+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
66087+}
66088+EXPORT_SYMBOL(proc_mkdir_restrict);
66089+
66090 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
66091 struct proc_dir_entry *parent,
66092 const struct file_operations *proc_fops,
66093diff --git a/fs/proc/inode.c b/fs/proc/inode.c
66094index 333080d..0a35ec4 100644
66095--- a/fs/proc/inode.c
66096+++ b/fs/proc/inode.c
66097@@ -23,11 +23,17 @@
66098 #include <linux/slab.h>
66099 #include <linux/mount.h>
66100 #include <linux/magic.h>
66101+#include <linux/grsecurity.h>
66102
66103 #include <asm/uaccess.h>
66104
66105 #include "internal.h"
66106
66107+#ifdef CONFIG_PROC_SYSCTL
66108+extern const struct inode_operations proc_sys_inode_operations;
66109+extern const struct inode_operations proc_sys_dir_operations;
66110+#endif
66111+
66112 static void proc_evict_inode(struct inode *inode)
66113 {
66114 struct proc_dir_entry *de;
66115@@ -55,6 +61,13 @@ static void proc_evict_inode(struct inode *inode)
66116 ns = PROC_I(inode)->ns.ns;
66117 if (ns_ops && ns)
66118 ns_ops->put(ns);
66119+
66120+#ifdef CONFIG_PROC_SYSCTL
66121+ if (inode->i_op == &proc_sys_inode_operations ||
66122+ inode->i_op == &proc_sys_dir_operations)
66123+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
66124+#endif
66125+
66126 }
66127
66128 static struct kmem_cache * proc_inode_cachep;
66129@@ -413,7 +426,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
66130 if (de->mode) {
66131 inode->i_mode = de->mode;
66132 inode->i_uid = de->uid;
66133+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66134+ inode->i_gid = grsec_proc_gid;
66135+#else
66136 inode->i_gid = de->gid;
66137+#endif
66138 }
66139 if (de->size)
66140 inode->i_size = de->size;
66141diff --git a/fs/proc/internal.h b/fs/proc/internal.h
66142index aa7a0ee..f2318df 100644
66143--- a/fs/proc/internal.h
66144+++ b/fs/proc/internal.h
66145@@ -46,9 +46,10 @@ struct proc_dir_entry {
66146 struct completion *pde_unload_completion;
66147 struct list_head pde_openers; /* who did ->open, but not ->release */
66148 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
66149+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
66150 u8 namelen;
66151 char name[];
66152-};
66153+} __randomize_layout;
66154
66155 union proc_op {
66156 int (*proc_get_link)(struct dentry *, struct path *);
66157@@ -66,7 +67,7 @@ struct proc_inode {
66158 struct ctl_table *sysctl_entry;
66159 struct proc_ns ns;
66160 struct inode vfs_inode;
66161-};
66162+} __randomize_layout;
66163
66164 /*
66165 * General functions
66166@@ -154,6 +155,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
66167 struct pid *, struct task_struct *);
66168 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
66169 struct pid *, struct task_struct *);
66170+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66171+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
66172+ struct pid *, struct task_struct *);
66173+#endif
66174
66175 /*
66176 * base.c
66177@@ -178,9 +183,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
66178 * generic.c
66179 */
66180 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
66181+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
66182 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
66183 struct dentry *);
66184 extern int proc_readdir(struct file *, struct dir_context *);
66185+extern int proc_readdir_restrict(struct file *, struct dir_context *);
66186 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
66187
66188 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
66189diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
66190index a352d57..cb94a5c 100644
66191--- a/fs/proc/interrupts.c
66192+++ b/fs/proc/interrupts.c
66193@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
66194
66195 static int __init proc_interrupts_init(void)
66196 {
66197+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66198+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
66199+#else
66200 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
66201+#endif
66202 return 0;
66203 }
66204 fs_initcall(proc_interrupts_init);
66205diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
66206index 91a4e64..cb007c0 100644
66207--- a/fs/proc/kcore.c
66208+++ b/fs/proc/kcore.c
66209@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66210 * the addresses in the elf_phdr on our list.
66211 */
66212 start = kc_offset_to_vaddr(*fpos - elf_buflen);
66213- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
66214+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
66215+ if (tsz > buflen)
66216 tsz = buflen;
66217-
66218+
66219 while (buflen) {
66220 struct kcore_list *m;
66221
66222@@ -514,20 +515,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66223 kfree(elf_buf);
66224 } else {
66225 if (kern_addr_valid(start)) {
66226- unsigned long n;
66227+ char *elf_buf;
66228+ mm_segment_t oldfs;
66229
66230- n = copy_to_user(buffer, (char *)start, tsz);
66231- /*
66232- * We cannot distinguish between fault on source
66233- * and fault on destination. When this happens
66234- * we clear too and hope it will trigger the
66235- * EFAULT again.
66236- */
66237- if (n) {
66238- if (clear_user(buffer + tsz - n,
66239- n))
66240+ elf_buf = kmalloc(tsz, GFP_KERNEL);
66241+ if (!elf_buf)
66242+ return -ENOMEM;
66243+ oldfs = get_fs();
66244+ set_fs(KERNEL_DS);
66245+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
66246+ set_fs(oldfs);
66247+ if (copy_to_user(buffer, elf_buf, tsz)) {
66248+ kfree(elf_buf);
66249 return -EFAULT;
66250+ }
66251 }
66252+ set_fs(oldfs);
66253+ kfree(elf_buf);
66254 } else {
66255 if (clear_user(buffer, tsz))
66256 return -EFAULT;
66257@@ -547,6 +551,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
66258
66259 static int open_kcore(struct inode *inode, struct file *filp)
66260 {
66261+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
66262+ return -EPERM;
66263+#endif
66264 if (!capable(CAP_SYS_RAWIO))
66265 return -EPERM;
66266 if (kcore_need_update)
66267diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
66268index aa1eee0..03dda72 100644
66269--- a/fs/proc/meminfo.c
66270+++ b/fs/proc/meminfo.c
66271@@ -187,7 +187,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
66272 vmi.used >> 10,
66273 vmi.largest_chunk >> 10
66274 #ifdef CONFIG_MEMORY_FAILURE
66275- ,atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66276+ ,atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
66277 #endif
66278 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
66279 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
66280diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
66281index d4a3574..b421ce9 100644
66282--- a/fs/proc/nommu.c
66283+++ b/fs/proc/nommu.c
66284@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
66285
66286 if (file) {
66287 seq_pad(m, ' ');
66288- seq_path(m, &file->f_path, "");
66289+ seq_path(m, &file->f_path, "\n\\");
66290 }
66291
66292 seq_putc(m, '\n');
66293diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
66294index a63af3e..b4f262a 100644
66295--- a/fs/proc/proc_net.c
66296+++ b/fs/proc/proc_net.c
66297@@ -23,9 +23,27 @@
66298 #include <linux/nsproxy.h>
66299 #include <net/net_namespace.h>
66300 #include <linux/seq_file.h>
66301+#include <linux/grsecurity.h>
66302
66303 #include "internal.h"
66304
66305+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
66306+static struct seq_operations *ipv6_seq_ops_addr;
66307+
66308+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
66309+{
66310+ ipv6_seq_ops_addr = addr;
66311+}
66312+
66313+void unregister_ipv6_seq_ops_addr(void)
66314+{
66315+ ipv6_seq_ops_addr = NULL;
66316+}
66317+
66318+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
66319+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
66320+#endif
66321+
66322 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
66323 {
66324 return pde->parent->data;
66325@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
66326 return maybe_get_net(PDE_NET(PDE(inode)));
66327 }
66328
66329+extern const struct seq_operations dev_seq_ops;
66330+
66331 int seq_open_net(struct inode *ino, struct file *f,
66332 const struct seq_operations *ops, int size)
66333 {
66334@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
66335
66336 BUG_ON(size < sizeof(*p));
66337
66338+ /* only permit access to /proc/net/dev */
66339+ if (
66340+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
66341+ ops != ipv6_seq_ops_addr &&
66342+#endif
66343+ ops != &dev_seq_ops && gr_proc_is_restricted())
66344+ return -EACCES;
66345+
66346 net = get_proc_net(ino);
66347 if (net == NULL)
66348 return -ENXIO;
66349@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
66350 int err;
66351 struct net *net;
66352
66353+ if (gr_proc_is_restricted())
66354+ return -EACCES;
66355+
66356 err = -ENXIO;
66357 net = get_proc_net(inode);
66358 if (net == NULL)
66359diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
66360index f92d5dd..26398ac 100644
66361--- a/fs/proc/proc_sysctl.c
66362+++ b/fs/proc/proc_sysctl.c
66363@@ -11,13 +11,21 @@
66364 #include <linux/namei.h>
66365 #include <linux/mm.h>
66366 #include <linux/module.h>
66367+#include <linux/nsproxy.h>
66368+#ifdef CONFIG_GRKERNSEC
66369+#include <net/net_namespace.h>
66370+#endif
66371 #include "internal.h"
66372
66373+extern int gr_handle_chroot_sysctl(const int op);
66374+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
66375+ const int op);
66376+
66377 static const struct dentry_operations proc_sys_dentry_operations;
66378 static const struct file_operations proc_sys_file_operations;
66379-static const struct inode_operations proc_sys_inode_operations;
66380+const struct inode_operations proc_sys_inode_operations;
66381 static const struct file_operations proc_sys_dir_file_operations;
66382-static const struct inode_operations proc_sys_dir_operations;
66383+const struct inode_operations proc_sys_dir_operations;
66384
66385 void proc_sys_poll_notify(struct ctl_table_poll *poll)
66386 {
66387@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
66388
66389 err = NULL;
66390 d_set_d_op(dentry, &proc_sys_dentry_operations);
66391+
66392+ gr_handle_proc_create(dentry, inode);
66393+
66394 d_add(dentry, inode);
66395
66396 out:
66397@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66398 struct inode *inode = file_inode(filp);
66399 struct ctl_table_header *head = grab_header(inode);
66400 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
66401+ int op = write ? MAY_WRITE : MAY_READ;
66402 ssize_t error;
66403 size_t res;
66404
66405@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66406 * and won't be until we finish.
66407 */
66408 error = -EPERM;
66409- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
66410+ if (sysctl_perm(head, table, op))
66411 goto out;
66412
66413 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
66414@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
66415 if (!table->proc_handler)
66416 goto out;
66417
66418+#ifdef CONFIG_GRKERNSEC
66419+ error = -EPERM;
66420+ if (gr_handle_chroot_sysctl(op))
66421+ goto out;
66422+ dget(filp->f_path.dentry);
66423+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
66424+ dput(filp->f_path.dentry);
66425+ goto out;
66426+ }
66427+ dput(filp->f_path.dentry);
66428+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
66429+ goto out;
66430+ if (write) {
66431+ if (current->nsproxy->net_ns != table->extra2) {
66432+ if (!capable(CAP_SYS_ADMIN))
66433+ goto out;
66434+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
66435+ goto out;
66436+ }
66437+#endif
66438+
66439 /* careful: calling conventions are nasty here */
66440 res = count;
66441 error = table->proc_handler(table, write, buf, &res, ppos);
66442@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
66443 return false;
66444 } else {
66445 d_set_d_op(child, &proc_sys_dentry_operations);
66446+
66447+ gr_handle_proc_create(child, inode);
66448+
66449 d_add(child, inode);
66450 }
66451 } else {
66452@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
66453 if ((*pos)++ < ctx->pos)
66454 return true;
66455
66456+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
66457+ return 0;
66458+
66459 if (unlikely(S_ISLNK(table->mode)))
66460 res = proc_sys_link_fill_cache(file, ctx, head, table);
66461 else
66462@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
66463 if (IS_ERR(head))
66464 return PTR_ERR(head);
66465
66466+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
66467+ return -ENOENT;
66468+
66469 generic_fillattr(inode, stat);
66470 if (table)
66471 stat->mode = (stat->mode & S_IFMT) | table->mode;
66472@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
66473 .llseek = generic_file_llseek,
66474 };
66475
66476-static const struct inode_operations proc_sys_inode_operations = {
66477+const struct inode_operations proc_sys_inode_operations = {
66478 .permission = proc_sys_permission,
66479 .setattr = proc_sys_setattr,
66480 .getattr = proc_sys_getattr,
66481 };
66482
66483-static const struct inode_operations proc_sys_dir_operations = {
66484+const struct inode_operations proc_sys_dir_operations = {
66485 .lookup = proc_sys_lookup,
66486 .permission = proc_sys_permission,
66487 .setattr = proc_sys_setattr,
66488@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
66489 static struct ctl_dir *new_dir(struct ctl_table_set *set,
66490 const char *name, int namelen)
66491 {
66492- struct ctl_table *table;
66493+ ctl_table_no_const *table;
66494 struct ctl_dir *new;
66495 struct ctl_node *node;
66496 char *new_name;
66497@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
66498 return NULL;
66499
66500 node = (struct ctl_node *)(new + 1);
66501- table = (struct ctl_table *)(node + 1);
66502+ table = (ctl_table_no_const *)(node + 1);
66503 new_name = (char *)(table + 2);
66504 memcpy(new_name, name, namelen);
66505 new_name[namelen] = '\0';
66506@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
66507 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
66508 struct ctl_table_root *link_root)
66509 {
66510- struct ctl_table *link_table, *entry, *link;
66511+ ctl_table_no_const *link_table, *link;
66512+ struct ctl_table *entry;
66513 struct ctl_table_header *links;
66514 struct ctl_node *node;
66515 char *link_name;
66516@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
66517 return NULL;
66518
66519 node = (struct ctl_node *)(links + 1);
66520- link_table = (struct ctl_table *)(node + nr_entries);
66521+ link_table = (ctl_table_no_const *)(node + nr_entries);
66522 link_name = (char *)&link_table[nr_entries + 1];
66523
66524 for (link = link_table, entry = table; entry->procname; link++, entry++) {
66525@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66526 struct ctl_table_header ***subheader, struct ctl_table_set *set,
66527 struct ctl_table *table)
66528 {
66529- struct ctl_table *ctl_table_arg = NULL;
66530- struct ctl_table *entry, *files;
66531+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
66532+ struct ctl_table *entry;
66533 int nr_files = 0;
66534 int nr_dirs = 0;
66535 int err = -ENOMEM;
66536@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66537 nr_files++;
66538 }
66539
66540- files = table;
66541 /* If there are mixed files and directories we need a new table */
66542 if (nr_dirs && nr_files) {
66543- struct ctl_table *new;
66544+ ctl_table_no_const *new;
66545 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
66546 GFP_KERNEL);
66547 if (!files)
66548@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
66549 /* Register everything except a directory full of subdirectories */
66550 if (nr_files || !nr_dirs) {
66551 struct ctl_table_header *header;
66552- header = __register_sysctl_table(set, path, files);
66553+ header = __register_sysctl_table(set, path, files ? files : table);
66554 if (!header) {
66555 kfree(ctl_table_arg);
66556 goto out;
66557diff --git a/fs/proc/root.c b/fs/proc/root.c
66558index 094e44d..085a877 100644
66559--- a/fs/proc/root.c
66560+++ b/fs/proc/root.c
66561@@ -188,7 +188,15 @@ void __init proc_root_init(void)
66562 proc_mkdir("openprom", NULL);
66563 #endif
66564 proc_tty_init();
66565+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66566+#ifdef CONFIG_GRKERNSEC_PROC_USER
66567+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
66568+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66569+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
66570+#endif
66571+#else
66572 proc_mkdir("bus", NULL);
66573+#endif
66574 proc_sys_init();
66575 }
66576
66577diff --git a/fs/proc/stat.c b/fs/proc/stat.c
66578index bf2d03f..f058f9c 100644
66579--- a/fs/proc/stat.c
66580+++ b/fs/proc/stat.c
66581@@ -11,6 +11,7 @@
66582 #include <linux/irqnr.h>
66583 #include <linux/cputime.h>
66584 #include <linux/tick.h>
66585+#include <linux/grsecurity.h>
66586
66587 #ifndef arch_irq_stat_cpu
66588 #define arch_irq_stat_cpu(cpu) 0
66589@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
66590 u64 sum_softirq = 0;
66591 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
66592 struct timespec boottime;
66593+ int unrestricted = 1;
66594+
66595+#ifdef CONFIG_GRKERNSEC_PROC_ADD
66596+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66597+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
66598+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66599+ && !in_group_p(grsec_proc_gid)
66600+#endif
66601+ )
66602+ unrestricted = 0;
66603+#endif
66604+#endif
66605
66606 user = nice = system = idle = iowait =
66607 irq = softirq = steal = 0;
66608@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
66609 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
66610 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
66611 idle += get_idle_time(i);
66612- iowait += get_iowait_time(i);
66613- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66614- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66615- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66616- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66617- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66618- sum += kstat_cpu_irqs_sum(i);
66619- sum += arch_irq_stat_cpu(i);
66620+ if (unrestricted) {
66621+ iowait += get_iowait_time(i);
66622+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66623+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66624+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66625+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66626+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66627+ sum += kstat_cpu_irqs_sum(i);
66628+ sum += arch_irq_stat_cpu(i);
66629+ for (j = 0; j < NR_SOFTIRQS; j++) {
66630+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
66631
66632- for (j = 0; j < NR_SOFTIRQS; j++) {
66633- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
66634-
66635- per_softirq_sums[j] += softirq_stat;
66636- sum_softirq += softirq_stat;
66637+ per_softirq_sums[j] += softirq_stat;
66638+ sum_softirq += softirq_stat;
66639+ }
66640 }
66641 }
66642- sum += arch_irq_stat();
66643+ if (unrestricted)
66644+ sum += arch_irq_stat();
66645
66646 seq_puts(p, "cpu ");
66647 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
66648@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
66649 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
66650 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
66651 idle = get_idle_time(i);
66652- iowait = get_iowait_time(i);
66653- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66654- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66655- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66656- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66657- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66658+ if (unrestricted) {
66659+ iowait = get_iowait_time(i);
66660+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
66661+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
66662+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
66663+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
66664+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
66665+ }
66666 seq_printf(p, "cpu%d", i);
66667 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
66668 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
66669@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
66670
66671 /* sum again ? it could be updated? */
66672 for_each_irq_nr(j)
66673- seq_put_decimal_ull(p, ' ', kstat_irqs(j));
66674+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs(j) : 0ULL);
66675
66676 seq_printf(p,
66677 "\nctxt %llu\n"
66678@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
66679 "processes %lu\n"
66680 "procs_running %lu\n"
66681 "procs_blocked %lu\n",
66682- nr_context_switches(),
66683+ unrestricted ? nr_context_switches() : 0ULL,
66684 (unsigned long)jif,
66685- total_forks,
66686- nr_running(),
66687- nr_iowait());
66688+ unrestricted ? total_forks : 0UL,
66689+ unrestricted ? nr_running() : 0UL,
66690+ unrestricted ? nr_iowait() : 0UL);
66691
66692 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
66693
66694diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
66695index 4e0388c..fc6a0e1 100644
66696--- a/fs/proc/task_mmu.c
66697+++ b/fs/proc/task_mmu.c
66698@@ -13,12 +13,19 @@
66699 #include <linux/swap.h>
66700 #include <linux/swapops.h>
66701 #include <linux/mmu_notifier.h>
66702+#include <linux/grsecurity.h>
66703
66704 #include <asm/elf.h>
66705 #include <asm/uaccess.h>
66706 #include <asm/tlbflush.h>
66707 #include "internal.h"
66708
66709+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66710+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
66711+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
66712+ _mm->pax_flags & MF_PAX_SEGMEXEC))
66713+#endif
66714+
66715 void task_mem(struct seq_file *m, struct mm_struct *mm)
66716 {
66717 unsigned long data, text, lib, swap;
66718@@ -54,8 +61,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66719 "VmExe:\t%8lu kB\n"
66720 "VmLib:\t%8lu kB\n"
66721 "VmPTE:\t%8lu kB\n"
66722- "VmSwap:\t%8lu kB\n",
66723- hiwater_vm << (PAGE_SHIFT-10),
66724+ "VmSwap:\t%8lu kB\n"
66725+
66726+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66727+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
66728+#endif
66729+
66730+ ,hiwater_vm << (PAGE_SHIFT-10),
66731 total_vm << (PAGE_SHIFT-10),
66732 mm->locked_vm << (PAGE_SHIFT-10),
66733 mm->pinned_vm << (PAGE_SHIFT-10),
66734@@ -65,7 +77,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66735 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
66736 (PTRS_PER_PTE * sizeof(pte_t) *
66737 atomic_long_read(&mm->nr_ptes)) >> 10,
66738- swap << (PAGE_SHIFT-10));
66739+ swap << (PAGE_SHIFT-10)
66740+
66741+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
66742+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66743+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
66744+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
66745+#else
66746+ , mm->context.user_cs_base
66747+ , mm->context.user_cs_limit
66748+#endif
66749+#endif
66750+
66751+ );
66752 }
66753
66754 unsigned long task_vsize(struct mm_struct *mm)
66755@@ -282,13 +306,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66756 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
66757 }
66758
66759- /* We don't show the stack guard page in /proc/maps */
66760+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66761+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
66762+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
66763+#else
66764 start = vma->vm_start;
66765- if (stack_guard_page_start(vma, start))
66766- start += PAGE_SIZE;
66767 end = vma->vm_end;
66768- if (stack_guard_page_end(vma, end))
66769- end -= PAGE_SIZE;
66770+#endif
66771
66772 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
66773 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
66774@@ -298,7 +322,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66775 flags & VM_WRITE ? 'w' : '-',
66776 flags & VM_EXEC ? 'x' : '-',
66777 flags & VM_MAYSHARE ? 's' : 'p',
66778+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66779+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
66780+#else
66781 pgoff,
66782+#endif
66783 MAJOR(dev), MINOR(dev), ino);
66784
66785 /*
66786@@ -307,7 +335,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66787 */
66788 if (file) {
66789 seq_pad(m, ' ');
66790- seq_path(m, &file->f_path, "\n");
66791+ seq_path(m, &file->f_path, "\n\\");
66792 goto done;
66793 }
66794
66795@@ -338,8 +366,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
66796 * Thread stack in /proc/PID/task/TID/maps or
66797 * the main process stack.
66798 */
66799- if (!is_pid || (vma->vm_start <= mm->start_stack &&
66800- vma->vm_end >= mm->start_stack)) {
66801+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
66802+ (vma->vm_start <= mm->start_stack &&
66803+ vma->vm_end >= mm->start_stack)) {
66804 name = "[stack]";
66805 } else {
66806 /* Thread stack in /proc/PID/maps */
66807@@ -359,6 +388,12 @@ done:
66808
66809 static int show_map(struct seq_file *m, void *v, int is_pid)
66810 {
66811+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66812+ if (current->exec_id != m->exec_id) {
66813+ gr_log_badprocpid("maps");
66814+ return 0;
66815+ }
66816+#endif
66817 show_map_vma(m, v, is_pid);
66818 m_cache_vma(m, v);
66819 return 0;
66820@@ -594,12 +629,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
66821 .private = &mss,
66822 };
66823
66824+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66825+ if (current->exec_id != m->exec_id) {
66826+ gr_log_badprocpid("smaps");
66827+ return 0;
66828+ }
66829+#endif
66830 memset(&mss, 0, sizeof mss);
66831- mss.vma = vma;
66832- /* mmap_sem is held in m_start */
66833- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
66834- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
66835-
66836+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66837+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
66838+#endif
66839+ mss.vma = vma;
66840+ /* mmap_sem is held in m_start */
66841+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
66842+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
66843+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66844+ }
66845+#endif
66846 show_map_vma(m, vma, is_pid);
66847
66848 seq_printf(m,
66849@@ -617,7 +663,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
66850 "KernelPageSize: %8lu kB\n"
66851 "MMUPageSize: %8lu kB\n"
66852 "Locked: %8lu kB\n",
66853+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66854+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
66855+#else
66856 (vma->vm_end - vma->vm_start) >> 10,
66857+#endif
66858 mss.resident >> 10,
66859 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
66860 mss.shared_clean >> 10,
66861@@ -1447,6 +1497,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
66862 char buffer[64];
66863 int nid;
66864
66865+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66866+ if (current->exec_id != m->exec_id) {
66867+ gr_log_badprocpid("numa_maps");
66868+ return 0;
66869+ }
66870+#endif
66871+
66872 if (!mm)
66873 return 0;
66874
66875@@ -1468,11 +1525,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
66876 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
66877 }
66878
66879+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66880+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
66881+#else
66882 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
66883+#endif
66884
66885 if (file) {
66886 seq_puts(m, " file=");
66887- seq_path(m, &file->f_path, "\n\t= ");
66888+ seq_path(m, &file->f_path, "\n\t\\= ");
66889 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
66890 seq_puts(m, " heap");
66891 } else {
66892diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
66893index 599ec2e..f1413ae 100644
66894--- a/fs/proc/task_nommu.c
66895+++ b/fs/proc/task_nommu.c
66896@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
66897 else
66898 bytes += kobjsize(mm);
66899
66900- if (current->fs && current->fs->users > 1)
66901+ if (current->fs && atomic_read(&current->fs->users) > 1)
66902 sbytes += kobjsize(current->fs);
66903 else
66904 bytes += kobjsize(current->fs);
66905@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
66906
66907 if (file) {
66908 seq_pad(m, ' ');
66909- seq_path(m, &file->f_path, "");
66910+ seq_path(m, &file->f_path, "\n\\");
66911 } else if (mm) {
66912 pid_t tid = pid_of_stack(priv, vma, is_pid);
66913
66914diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
66915index a90d6d35..d08047c 100644
66916--- a/fs/proc/vmcore.c
66917+++ b/fs/proc/vmcore.c
66918@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
66919 nr_bytes = count;
66920
66921 /* If pfn is not ram, return zeros for sparse dump files */
66922- if (pfn_is_ram(pfn) == 0)
66923- memset(buf, 0, nr_bytes);
66924- else {
66925+ if (pfn_is_ram(pfn) == 0) {
66926+ if (userbuf) {
66927+ if (clear_user((char __force_user *)buf, nr_bytes))
66928+ return -EFAULT;
66929+ } else
66930+ memset(buf, 0, nr_bytes);
66931+ } else {
66932 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
66933 offset, userbuf);
66934 if (tmp < 0)
66935@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
66936 static int copy_to(void *target, void *src, size_t size, int userbuf)
66937 {
66938 if (userbuf) {
66939- if (copy_to_user((char __user *) target, src, size))
66940+ if (copy_to_user((char __force_user *) target, src, size))
66941 return -EFAULT;
66942 } else {
66943 memcpy(target, src, size);
66944@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
66945 if (*fpos < m->offset + m->size) {
66946 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
66947 start = m->paddr + *fpos - m->offset;
66948- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
66949+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
66950 if (tmp < 0)
66951 return tmp;
66952 buflen -= tsz;
66953@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
66954 static ssize_t read_vmcore(struct file *file, char __user *buffer,
66955 size_t buflen, loff_t *fpos)
66956 {
66957- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
66958+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
66959 }
66960
66961 /*
66962diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
66963index d3fb2b6..43a8140 100644
66964--- a/fs/qnx6/qnx6.h
66965+++ b/fs/qnx6/qnx6.h
66966@@ -74,7 +74,7 @@ enum {
66967 BYTESEX_BE,
66968 };
66969
66970-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
66971+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
66972 {
66973 if (sbi->s_bytesex == BYTESEX_LE)
66974 return le64_to_cpu((__force __le64)n);
66975@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
66976 return (__force __fs64)cpu_to_be64(n);
66977 }
66978
66979-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
66980+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
66981 {
66982 if (sbi->s_bytesex == BYTESEX_LE)
66983 return le32_to_cpu((__force __le32)n);
66984diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
66985index bb2869f..d34ada8 100644
66986--- a/fs/quota/netlink.c
66987+++ b/fs/quota/netlink.c
66988@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
66989 void quota_send_warning(struct kqid qid, dev_t dev,
66990 const char warntype)
66991 {
66992- static atomic_t seq;
66993+ static atomic_unchecked_t seq;
66994 struct sk_buff *skb;
66995 void *msg_head;
66996 int ret;
66997@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
66998 "VFS: Not enough memory to send quota warning.\n");
66999 return;
67000 }
67001- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
67002+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
67003 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
67004 if (!msg_head) {
67005 printk(KERN_ERR
67006diff --git a/fs/read_write.c b/fs/read_write.c
67007index 7d9318c..51b336f 100644
67008--- a/fs/read_write.c
67009+++ b/fs/read_write.c
67010@@ -495,7 +495,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
67011
67012 old_fs = get_fs();
67013 set_fs(get_ds());
67014- p = (__force const char __user *)buf;
67015+ p = (const char __force_user *)buf;
67016 if (count > MAX_RW_COUNT)
67017 count = MAX_RW_COUNT;
67018 if (file->f_op->write)
67019diff --git a/fs/readdir.c b/fs/readdir.c
67020index 33fd922..e0d6094 100644
67021--- a/fs/readdir.c
67022+++ b/fs/readdir.c
67023@@ -18,6 +18,7 @@
67024 #include <linux/security.h>
67025 #include <linux/syscalls.h>
67026 #include <linux/unistd.h>
67027+#include <linux/namei.h>
67028
67029 #include <asm/uaccess.h>
67030
67031@@ -71,6 +72,7 @@ struct old_linux_dirent {
67032 struct readdir_callback {
67033 struct dir_context ctx;
67034 struct old_linux_dirent __user * dirent;
67035+ struct file * file;
67036 int result;
67037 };
67038
67039@@ -88,6 +90,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
67040 buf->result = -EOVERFLOW;
67041 return -EOVERFLOW;
67042 }
67043+
67044+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67045+ return 0;
67046+
67047 buf->result++;
67048 dirent = buf->dirent;
67049 if (!access_ok(VERIFY_WRITE, dirent,
67050@@ -119,6 +125,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
67051 if (!f.file)
67052 return -EBADF;
67053
67054+ buf.file = f.file;
67055 error = iterate_dir(f.file, &buf.ctx);
67056 if (buf.result)
67057 error = buf.result;
67058@@ -144,6 +151,7 @@ struct getdents_callback {
67059 struct dir_context ctx;
67060 struct linux_dirent __user * current_dir;
67061 struct linux_dirent __user * previous;
67062+ struct file * file;
67063 int count;
67064 int error;
67065 };
67066@@ -165,6 +173,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
67067 buf->error = -EOVERFLOW;
67068 return -EOVERFLOW;
67069 }
67070+
67071+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67072+ return 0;
67073+
67074 dirent = buf->previous;
67075 if (dirent) {
67076 if (__put_user(offset, &dirent->d_off))
67077@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
67078 if (!f.file)
67079 return -EBADF;
67080
67081+ buf.file = f.file;
67082 error = iterate_dir(f.file, &buf.ctx);
67083 if (error >= 0)
67084 error = buf.error;
67085@@ -228,6 +241,7 @@ struct getdents_callback64 {
67086 struct dir_context ctx;
67087 struct linux_dirent64 __user * current_dir;
67088 struct linux_dirent64 __user * previous;
67089+ struct file *file;
67090 int count;
67091 int error;
67092 };
67093@@ -243,6 +257,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
67094 buf->error = -EINVAL; /* only used if we fail.. */
67095 if (reclen > buf->count)
67096 return -EINVAL;
67097+
67098+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
67099+ return 0;
67100+
67101 dirent = buf->previous;
67102 if (dirent) {
67103 if (__put_user(offset, &dirent->d_off))
67104@@ -290,6 +308,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
67105 if (!f.file)
67106 return -EBADF;
67107
67108+ buf.file = f.file;
67109 error = iterate_dir(f.file, &buf.ctx);
67110 if (error >= 0)
67111 error = buf.error;
67112diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
67113index 9c02d96..6562c10 100644
67114--- a/fs/reiserfs/do_balan.c
67115+++ b/fs/reiserfs/do_balan.c
67116@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
67117 return;
67118 }
67119
67120- atomic_inc(&fs_generation(tb->tb_sb));
67121+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
67122 do_balance_starts(tb);
67123
67124 /*
67125diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
67126index aca73dd..e3c558d 100644
67127--- a/fs/reiserfs/item_ops.c
67128+++ b/fs/reiserfs/item_ops.c
67129@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
67130 }
67131
67132 static struct item_operations errcatch_ops = {
67133- errcatch_bytes_number,
67134- errcatch_decrement_key,
67135- errcatch_is_left_mergeable,
67136- errcatch_print_item,
67137- errcatch_check_item,
67138+ .bytes_number = errcatch_bytes_number,
67139+ .decrement_key = errcatch_decrement_key,
67140+ .is_left_mergeable = errcatch_is_left_mergeable,
67141+ .print_item = errcatch_print_item,
67142+ .check_item = errcatch_check_item,
67143
67144- errcatch_create_vi,
67145- errcatch_check_left,
67146- errcatch_check_right,
67147- errcatch_part_size,
67148- errcatch_unit_num,
67149- errcatch_print_vi
67150+ .create_vi = errcatch_create_vi,
67151+ .check_left = errcatch_check_left,
67152+ .check_right = errcatch_check_right,
67153+ .part_size = errcatch_part_size,
67154+ .unit_num = errcatch_unit_num,
67155+ .print_vi = errcatch_print_vi
67156 };
67157
67158 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
67159diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
67160index 621b9f3..af527fd 100644
67161--- a/fs/reiserfs/procfs.c
67162+++ b/fs/reiserfs/procfs.c
67163@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
67164 "SMALL_TAILS " : "NO_TAILS ",
67165 replay_only(sb) ? "REPLAY_ONLY " : "",
67166 convert_reiserfs(sb) ? "CONV " : "",
67167- atomic_read(&r->s_generation_counter),
67168+ atomic_read_unchecked(&r->s_generation_counter),
67169 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
67170 SF(s_do_balance), SF(s_unneeded_left_neighbor),
67171 SF(s_good_search_by_key_reada), SF(s_bmaps),
67172diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
67173index 1894d96..1dfd1c2 100644
67174--- a/fs/reiserfs/reiserfs.h
67175+++ b/fs/reiserfs/reiserfs.h
67176@@ -576,7 +576,7 @@ struct reiserfs_sb_info {
67177 /* Comment? -Hans */
67178 wait_queue_head_t s_wait;
67179 /* increased by one every time the tree gets re-balanced */
67180- atomic_t s_generation_counter;
67181+ atomic_unchecked_t s_generation_counter;
67182
67183 /* File system properties. Currently holds on-disk FS format */
67184 unsigned long s_properties;
67185@@ -2297,7 +2297,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
67186 #define REISERFS_USER_MEM 1 /* user memory mode */
67187
67188 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
67189-#define get_generation(s) atomic_read (&fs_generation(s))
67190+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
67191 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
67192 #define __fs_changed(gen,s) (gen != get_generation (s))
67193 #define fs_changed(gen,s) \
67194diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
67195index f1376c9..f9378e9 100644
67196--- a/fs/reiserfs/super.c
67197+++ b/fs/reiserfs/super.c
67198@@ -1857,6 +1857,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
67199 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
67200 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
67201 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
67202+#ifdef CONFIG_REISERFS_FS_XATTR
67203+ /* turn on user xattrs by default */
67204+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
67205+#endif
67206 /* no preallocation minimum, be smart in reiserfs_file_write instead */
67207 sbi->s_alloc_options.preallocmin = 0;
67208 /* Preallocate by 16 blocks (17-1) at once */
67209diff --git a/fs/select.c b/fs/select.c
67210index 467bb1c..cf9d65a 100644
67211--- a/fs/select.c
67212+++ b/fs/select.c
67213@@ -20,6 +20,7 @@
67214 #include <linux/export.h>
67215 #include <linux/slab.h>
67216 #include <linux/poll.h>
67217+#include <linux/security.h>
67218 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
67219 #include <linux/file.h>
67220 #include <linux/fdtable.h>
67221@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
67222 struct poll_list *walk = head;
67223 unsigned long todo = nfds;
67224
67225+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
67226 if (nfds > rlimit(RLIMIT_NOFILE))
67227 return -EINVAL;
67228
67229diff --git a/fs/seq_file.c b/fs/seq_file.c
67230index 3857b72..0b7281e 100644
67231--- a/fs/seq_file.c
67232+++ b/fs/seq_file.c
67233@@ -12,6 +12,8 @@
67234 #include <linux/slab.h>
67235 #include <linux/cred.h>
67236 #include <linux/mm.h>
67237+#include <linux/sched.h>
67238+#include <linux/grsecurity.h>
67239
67240 #include <asm/uaccess.h>
67241 #include <asm/page.h>
67242@@ -34,12 +36,7 @@ static void seq_set_overflow(struct seq_file *m)
67243
67244 static void *seq_buf_alloc(unsigned long size)
67245 {
67246- void *buf;
67247-
67248- buf = kmalloc(size, GFP_KERNEL | __GFP_NOWARN);
67249- if (!buf && size > PAGE_SIZE)
67250- buf = vmalloc(size);
67251- return buf;
67252+ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
67253 }
67254
67255 /**
67256@@ -72,6 +69,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
67257 #ifdef CONFIG_USER_NS
67258 p->user_ns = file->f_cred->user_ns;
67259 #endif
67260+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
67261+ p->exec_id = current->exec_id;
67262+#endif
67263
67264 /*
67265 * Wrappers around seq_open(e.g. swaps_open) need to be
67266@@ -94,6 +94,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
67267 }
67268 EXPORT_SYMBOL(seq_open);
67269
67270+
67271+int seq_open_restrict(struct file *file, const struct seq_operations *op)
67272+{
67273+ if (gr_proc_is_restricted())
67274+ return -EACCES;
67275+
67276+ return seq_open(file, op);
67277+}
67278+EXPORT_SYMBOL(seq_open_restrict);
67279+
67280 static int traverse(struct seq_file *m, loff_t offset)
67281 {
67282 loff_t pos = 0, index;
67283@@ -165,7 +175,7 @@ Eoverflow:
67284 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
67285 {
67286 struct seq_file *m = file->private_data;
67287- size_t copied = 0;
67288+ ssize_t copied = 0;
67289 loff_t pos;
67290 size_t n;
67291 void *p;
67292@@ -596,7 +606,7 @@ static void single_stop(struct seq_file *p, void *v)
67293 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
67294 void *data)
67295 {
67296- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
67297+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
67298 int res = -ENOMEM;
67299
67300 if (op) {
67301@@ -632,6 +642,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
67302 }
67303 EXPORT_SYMBOL(single_open_size);
67304
67305+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
67306+ void *data)
67307+{
67308+ if (gr_proc_is_restricted())
67309+ return -EACCES;
67310+
67311+ return single_open(file, show, data);
67312+}
67313+EXPORT_SYMBOL(single_open_restrict);
67314+
67315+
67316 int single_release(struct inode *inode, struct file *file)
67317 {
67318 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
67319diff --git a/fs/splice.c b/fs/splice.c
67320index 75c6058..770d40c 100644
67321--- a/fs/splice.c
67322+++ b/fs/splice.c
67323@@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67324 pipe_lock(pipe);
67325
67326 for (;;) {
67327- if (!pipe->readers) {
67328+ if (!atomic_read(&pipe->readers)) {
67329 send_sig(SIGPIPE, current, 0);
67330 if (!ret)
67331 ret = -EPIPE;
67332@@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67333 page_nr++;
67334 ret += buf->len;
67335
67336- if (pipe->files)
67337+ if (atomic_read(&pipe->files))
67338 do_wakeup = 1;
67339
67340 if (!--spd->nr_pages)
67341@@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
67342 do_wakeup = 0;
67343 }
67344
67345- pipe->waiting_writers++;
67346+ atomic_inc(&pipe->waiting_writers);
67347 pipe_wait(pipe);
67348- pipe->waiting_writers--;
67349+ atomic_dec(&pipe->waiting_writers);
67350 }
67351
67352 pipe_unlock(pipe);
67353@@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
67354 old_fs = get_fs();
67355 set_fs(get_ds());
67356 /* The cast to a user pointer is valid due to the set_fs() */
67357- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
67358+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
67359 set_fs(old_fs);
67360
67361 return res;
67362@@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
67363 old_fs = get_fs();
67364 set_fs(get_ds());
67365 /* The cast to a user pointer is valid due to the set_fs() */
67366- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
67367+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
67368 set_fs(old_fs);
67369
67370 return res;
67371@@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
67372 goto err;
67373
67374 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
67375- vec[i].iov_base = (void __user *) page_address(page);
67376+ vec[i].iov_base = (void __force_user *) page_address(page);
67377 vec[i].iov_len = this_len;
67378 spd.pages[i] = page;
67379 spd.nr_pages++;
67380@@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
67381 ops->release(pipe, buf);
67382 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
67383 pipe->nrbufs--;
67384- if (pipe->files)
67385+ if (atomic_read(&pipe->files))
67386 sd->need_wakeup = true;
67387 }
67388
67389@@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
67390 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
67391 {
67392 while (!pipe->nrbufs) {
67393- if (!pipe->writers)
67394+ if (!atomic_read(&pipe->writers))
67395 return 0;
67396
67397- if (!pipe->waiting_writers && sd->num_spliced)
67398+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
67399 return 0;
67400
67401 if (sd->flags & SPLICE_F_NONBLOCK)
67402@@ -1040,7 +1040,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
67403 ops->release(pipe, buf);
67404 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
67405 pipe->nrbufs--;
67406- if (pipe->files)
67407+ if (atomic_read(&pipe->files))
67408 sd.need_wakeup = true;
67409 } else {
67410 buf->offset += ret;
67411@@ -1200,7 +1200,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
67412 * out of the pipe right after the splice_to_pipe(). So set
67413 * PIPE_READERS appropriately.
67414 */
67415- pipe->readers = 1;
67416+ atomic_set(&pipe->readers, 1);
67417
67418 current->splice_pipe = pipe;
67419 }
67420@@ -1497,6 +1497,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
67421
67422 partial[buffers].offset = off;
67423 partial[buffers].len = plen;
67424+ partial[buffers].private = 0;
67425
67426 off = 0;
67427 len -= plen;
67428@@ -1733,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67429 ret = -ERESTARTSYS;
67430 break;
67431 }
67432- if (!pipe->writers)
67433+ if (!atomic_read(&pipe->writers))
67434 break;
67435- if (!pipe->waiting_writers) {
67436+ if (!atomic_read(&pipe->waiting_writers)) {
67437 if (flags & SPLICE_F_NONBLOCK) {
67438 ret = -EAGAIN;
67439 break;
67440@@ -1767,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67441 pipe_lock(pipe);
67442
67443 while (pipe->nrbufs >= pipe->buffers) {
67444- if (!pipe->readers) {
67445+ if (!atomic_read(&pipe->readers)) {
67446 send_sig(SIGPIPE, current, 0);
67447 ret = -EPIPE;
67448 break;
67449@@ -1780,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
67450 ret = -ERESTARTSYS;
67451 break;
67452 }
67453- pipe->waiting_writers++;
67454+ atomic_inc(&pipe->waiting_writers);
67455 pipe_wait(pipe);
67456- pipe->waiting_writers--;
67457+ atomic_dec(&pipe->waiting_writers);
67458 }
67459
67460 pipe_unlock(pipe);
67461@@ -1818,14 +1819,14 @@ retry:
67462 pipe_double_lock(ipipe, opipe);
67463
67464 do {
67465- if (!opipe->readers) {
67466+ if (!atomic_read(&opipe->readers)) {
67467 send_sig(SIGPIPE, current, 0);
67468 if (!ret)
67469 ret = -EPIPE;
67470 break;
67471 }
67472
67473- if (!ipipe->nrbufs && !ipipe->writers)
67474+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
67475 break;
67476
67477 /*
67478@@ -1922,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
67479 pipe_double_lock(ipipe, opipe);
67480
67481 do {
67482- if (!opipe->readers) {
67483+ if (!atomic_read(&opipe->readers)) {
67484 send_sig(SIGPIPE, current, 0);
67485 if (!ret)
67486 ret = -EPIPE;
67487@@ -1967,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
67488 * return EAGAIN if we have the potential of some data in the
67489 * future, otherwise just return 0
67490 */
67491- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
67492+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
67493 ret = -EAGAIN;
67494
67495 pipe_unlock(ipipe);
67496diff --git a/fs/stat.c b/fs/stat.c
67497index ae0c3ce..9ee641c 100644
67498--- a/fs/stat.c
67499+++ b/fs/stat.c
67500@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
67501 stat->gid = inode->i_gid;
67502 stat->rdev = inode->i_rdev;
67503 stat->size = i_size_read(inode);
67504- stat->atime = inode->i_atime;
67505- stat->mtime = inode->i_mtime;
67506+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
67507+ stat->atime = inode->i_ctime;
67508+ stat->mtime = inode->i_ctime;
67509+ } else {
67510+ stat->atime = inode->i_atime;
67511+ stat->mtime = inode->i_mtime;
67512+ }
67513 stat->ctime = inode->i_ctime;
67514 stat->blksize = (1 << inode->i_blkbits);
67515 stat->blocks = inode->i_blocks;
67516@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
67517 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
67518 {
67519 struct inode *inode = path->dentry->d_inode;
67520+ int retval;
67521
67522- if (inode->i_op->getattr)
67523- return inode->i_op->getattr(path->mnt, path->dentry, stat);
67524+ if (inode->i_op->getattr) {
67525+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
67526+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
67527+ stat->atime = stat->ctime;
67528+ stat->mtime = stat->ctime;
67529+ }
67530+ return retval;
67531+ }
67532
67533 generic_fillattr(inode, stat);
67534 return 0;
67535diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
67536index 0b45ff4..847de5b 100644
67537--- a/fs/sysfs/dir.c
67538+++ b/fs/sysfs/dir.c
67539@@ -41,9 +41,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
67540 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
67541 {
67542 struct kernfs_node *parent, *kn;
67543+ const char *name;
67544+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
67545+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
67546+ const char *parent_name;
67547+#endif
67548
67549 BUG_ON(!kobj);
67550
67551+ name = kobject_name(kobj);
67552+
67553 if (kobj->parent)
67554 parent = kobj->parent->sd;
67555 else
67556@@ -52,11 +59,22 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
67557 if (!parent)
67558 return -ENOENT;
67559
67560- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
67561- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
67562+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
67563+ parent_name = parent->name;
67564+ mode = S_IRWXU;
67565+
67566+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
67567+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
67568+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
67569+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
67570+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
67571+#endif
67572+
67573+ kn = kernfs_create_dir_ns(parent, name,
67574+ mode, kobj, ns);
67575 if (IS_ERR(kn)) {
67576 if (PTR_ERR(kn) == -EEXIST)
67577- sysfs_warn_dup(parent, kobject_name(kobj));
67578+ sysfs_warn_dup(parent, name);
67579 return PTR_ERR(kn);
67580 }
67581
67582diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
67583index 69d4889..a810bd4 100644
67584--- a/fs/sysv/sysv.h
67585+++ b/fs/sysv/sysv.h
67586@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
67587 #endif
67588 }
67589
67590-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
67591+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
67592 {
67593 if (sbi->s_bytesex == BYTESEX_PDP)
67594 return PDP_swab((__force __u32)n);
67595diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
67596index fb08b0c..65fcc7e 100644
67597--- a/fs/ubifs/io.c
67598+++ b/fs/ubifs/io.c
67599@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
67600 return err;
67601 }
67602
67603-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
67604+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
67605 {
67606 int err;
67607
67608diff --git a/fs/udf/misc.c b/fs/udf/misc.c
67609index c175b4d..8f36a16 100644
67610--- a/fs/udf/misc.c
67611+++ b/fs/udf/misc.c
67612@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
67613
67614 u8 udf_tag_checksum(const struct tag *t)
67615 {
67616- u8 *data = (u8 *)t;
67617+ const u8 *data = (const u8 *)t;
67618 u8 checksum = 0;
67619 int i;
67620 for (i = 0; i < sizeof(struct tag); ++i)
67621diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
67622index 8d974c4..b82f6ec 100644
67623--- a/fs/ufs/swab.h
67624+++ b/fs/ufs/swab.h
67625@@ -22,7 +22,7 @@ enum {
67626 BYTESEX_BE
67627 };
67628
67629-static inline u64
67630+static inline u64 __intentional_overflow(-1)
67631 fs64_to_cpu(struct super_block *sbp, __fs64 n)
67632 {
67633 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
67634@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
67635 return (__force __fs64)cpu_to_be64(n);
67636 }
67637
67638-static inline u32
67639+static inline u32 __intentional_overflow(-1)
67640 fs32_to_cpu(struct super_block *sbp, __fs32 n)
67641 {
67642 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
67643diff --git a/fs/utimes.c b/fs/utimes.c
67644index aa138d6..5f3a811 100644
67645--- a/fs/utimes.c
67646+++ b/fs/utimes.c
67647@@ -1,6 +1,7 @@
67648 #include <linux/compiler.h>
67649 #include <linux/file.h>
67650 #include <linux/fs.h>
67651+#include <linux/security.h>
67652 #include <linux/linkage.h>
67653 #include <linux/mount.h>
67654 #include <linux/namei.h>
67655@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
67656 }
67657 }
67658 retry_deleg:
67659+
67660+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
67661+ error = -EACCES;
67662+ goto mnt_drop_write_and_out;
67663+ }
67664+
67665 mutex_lock(&inode->i_mutex);
67666 error = notify_change(path->dentry, &newattrs, &delegated_inode);
67667 mutex_unlock(&inode->i_mutex);
67668diff --git a/fs/xattr.c b/fs/xattr.c
67669index 64e83ef..b6be154 100644
67670--- a/fs/xattr.c
67671+++ b/fs/xattr.c
67672@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
67673 return rc;
67674 }
67675
67676+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
67677+ssize_t
67678+pax_getxattr(struct dentry *dentry, void *value, size_t size)
67679+{
67680+ struct inode *inode = dentry->d_inode;
67681+ ssize_t error;
67682+
67683+ error = inode_permission(inode, MAY_EXEC);
67684+ if (error)
67685+ return error;
67686+
67687+ if (inode->i_op->getxattr)
67688+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
67689+ else
67690+ error = -EOPNOTSUPP;
67691+
67692+ return error;
67693+}
67694+EXPORT_SYMBOL(pax_getxattr);
67695+#endif
67696+
67697 ssize_t
67698 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
67699 {
67700@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
67701 * Extended attribute SET operations
67702 */
67703 static long
67704-setxattr(struct dentry *d, const char __user *name, const void __user *value,
67705+setxattr(struct path *path, const char __user *name, const void __user *value,
67706 size_t size, int flags)
67707 {
67708 int error;
67709@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
67710 posix_acl_fix_xattr_from_user(kvalue, size);
67711 }
67712
67713- error = vfs_setxattr(d, kname, kvalue, size, flags);
67714+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
67715+ error = -EACCES;
67716+ goto out;
67717+ }
67718+
67719+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
67720 out:
67721 if (vvalue)
67722 vfree(vvalue);
67723@@ -376,7 +402,7 @@ retry:
67724 return error;
67725 error = mnt_want_write(path.mnt);
67726 if (!error) {
67727- error = setxattr(path.dentry, name, value, size, flags);
67728+ error = setxattr(&path, name, value, size, flags);
67729 mnt_drop_write(path.mnt);
67730 }
67731 path_put(&path);
67732@@ -405,16 +431,14 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
67733 const void __user *,value, size_t, size, int, flags)
67734 {
67735 struct fd f = fdget(fd);
67736- struct dentry *dentry;
67737 int error = -EBADF;
67738
67739 if (!f.file)
67740 return error;
67741- dentry = f.file->f_path.dentry;
67742- audit_inode(NULL, dentry, 0);
67743+ audit_inode(NULL, f.file->f_path.dentry, 0);
67744 error = mnt_want_write_file(f.file);
67745 if (!error) {
67746- error = setxattr(dentry, name, value, size, flags);
67747+ error = setxattr(&f.file->f_path, name, value, size, flags);
67748 mnt_drop_write_file(f.file);
67749 }
67750 fdput(f);
67751@@ -600,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
67752 * Extended attribute REMOVE operations
67753 */
67754 static long
67755-removexattr(struct dentry *d, const char __user *name)
67756+removexattr(struct path *path, const char __user *name)
67757 {
67758 int error;
67759 char kname[XATTR_NAME_MAX + 1];
67760@@ -611,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
67761 if (error < 0)
67762 return error;
67763
67764- return vfs_removexattr(d, kname);
67765+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
67766+ return -EACCES;
67767+
67768+ return vfs_removexattr(path->dentry, kname);
67769 }
67770
67771 static int path_removexattr(const char __user *pathname,
67772@@ -625,7 +652,7 @@ retry:
67773 return error;
67774 error = mnt_want_write(path.mnt);
67775 if (!error) {
67776- error = removexattr(path.dentry, name);
67777+ error = removexattr(&path, name);
67778 mnt_drop_write(path.mnt);
67779 }
67780 path_put(&path);
67781@@ -651,16 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
67782 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
67783 {
67784 struct fd f = fdget(fd);
67785- struct dentry *dentry;
67786+ struct path *path;
67787 int error = -EBADF;
67788
67789 if (!f.file)
67790 return error;
67791- dentry = f.file->f_path.dentry;
67792- audit_inode(NULL, dentry, 0);
67793+ path = &f.file->f_path;
67794+ audit_inode(NULL, path->dentry, 0);
67795 error = mnt_want_write_file(f.file);
67796 if (!error) {
67797- error = removexattr(dentry, name);
67798+ error = removexattr(path, name);
67799 mnt_drop_write_file(f.file);
67800 }
67801 fdput(f);
67802diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
67803index 79c9819..22226b4 100644
67804--- a/fs/xfs/libxfs/xfs_bmap.c
67805+++ b/fs/xfs/libxfs/xfs_bmap.c
67806@@ -583,7 +583,7 @@ xfs_bmap_validate_ret(
67807
67808 #else
67809 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
67810-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
67811+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
67812 #endif /* DEBUG */
67813
67814 /*
67815diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
67816index f1b69ed..3d0222f 100644
67817--- a/fs/xfs/xfs_dir2_readdir.c
67818+++ b/fs/xfs/xfs_dir2_readdir.c
67819@@ -159,7 +159,12 @@ xfs_dir2_sf_getdents(
67820 ino = dp->d_ops->sf_get_ino(sfp, sfep);
67821 filetype = dp->d_ops->sf_get_ftype(sfep);
67822 ctx->pos = off & 0x7fffffff;
67823- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
67824+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
67825+ char name[sfep->namelen];
67826+ memcpy(name, sfep->name, sfep->namelen);
67827+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
67828+ return 0;
67829+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
67830 xfs_dir3_get_dtype(dp->i_mount, filetype)))
67831 return 0;
67832 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
67833diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
67834index 24c926b6..8726af88 100644
67835--- a/fs/xfs/xfs_ioctl.c
67836+++ b/fs/xfs/xfs_ioctl.c
67837@@ -122,7 +122,7 @@ xfs_find_handle(
67838 }
67839
67840 error = -EFAULT;
67841- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
67842+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
67843 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
67844 goto out_put;
67845
67846diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
67847index 6a51619..9592e1b 100644
67848--- a/fs/xfs/xfs_linux.h
67849+++ b/fs/xfs/xfs_linux.h
67850@@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
67851 * of the compiler which do not like us using do_div in the middle
67852 * of large functions.
67853 */
67854-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
67855+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
67856 {
67857 __u32 mod;
67858
67859@@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
67860 return 0;
67861 }
67862 #else
67863-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
67864+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
67865 {
67866 __u32 mod;
67867
67868diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
67869new file mode 100644
67870index 0000000..f27264e
67871--- /dev/null
67872+++ b/grsecurity/Kconfig
67873@@ -0,0 +1,1166 @@
67874+#
67875+# grecurity configuration
67876+#
67877+menu "Memory Protections"
67878+depends on GRKERNSEC
67879+
67880+config GRKERNSEC_KMEM
67881+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
67882+ default y if GRKERNSEC_CONFIG_AUTO
67883+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
67884+ help
67885+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
67886+ be written to or read from to modify or leak the contents of the running
67887+ kernel. /dev/port will also not be allowed to be opened, writing to
67888+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
67889+ If you have module support disabled, enabling this will close up several
67890+ ways that are currently used to insert malicious code into the running
67891+ kernel.
67892+
67893+ Even with this feature enabled, we still highly recommend that
67894+ you use the RBAC system, as it is still possible for an attacker to
67895+ modify the running kernel through other more obscure methods.
67896+
67897+ It is highly recommended that you say Y here if you meet all the
67898+ conditions above.
67899+
67900+config GRKERNSEC_VM86
67901+ bool "Restrict VM86 mode"
67902+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
67903+ depends on X86_32
67904+
67905+ help
67906+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
67907+ make use of a special execution mode on 32bit x86 processors called
67908+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
67909+ video cards and will still work with this option enabled. The purpose
67910+ of the option is to prevent exploitation of emulation errors in
67911+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
67912+ Nearly all users should be able to enable this option.
67913+
67914+config GRKERNSEC_IO
67915+ bool "Disable privileged I/O"
67916+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
67917+ depends on X86
67918+ select RTC_CLASS
67919+ select RTC_INTF_DEV
67920+ select RTC_DRV_CMOS
67921+
67922+ help
67923+ If you say Y here, all ioperm and iopl calls will return an error.
67924+ Ioperm and iopl can be used to modify the running kernel.
67925+ Unfortunately, some programs need this access to operate properly,
67926+ the most notable of which are XFree86 and hwclock. hwclock can be
67927+ remedied by having RTC support in the kernel, so real-time
67928+ clock support is enabled if this option is enabled, to ensure
67929+ that hwclock operates correctly. If hwclock still does not work,
67930+ either update udev or symlink /dev/rtc to /dev/rtc0.
67931+
67932+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
67933+ you may not be able to boot into a graphical environment with this
67934+ option enabled. In this case, you should use the RBAC system instead.
67935+
67936+config GRKERNSEC_BPF_HARDEN
67937+ bool "Harden BPF interpreter"
67938+ default y if GRKERNSEC_CONFIG_AUTO
67939+ help
67940+ Unlike previous versions of grsecurity that hardened both the BPF
67941+ interpreted code against corruption at rest as well as the JIT code
67942+ against JIT-spray attacks and attacker-controlled immediate values
67943+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
67944+ and will ensure the interpreted code is read-only at rest. This feature
67945+ may be removed at a later time when eBPF stabilizes to entirely revert
67946+ back to the more secure pre-3.16 BPF interpreter/JIT.
67947+
67948+ If you're using KERNEXEC, it's recommended that you enable this option
67949+ to supplement the hardening of the kernel.
67950+
67951+config GRKERNSEC_PERF_HARDEN
67952+ bool "Disable unprivileged PERF_EVENTS usage by default"
67953+ default y if GRKERNSEC_CONFIG_AUTO
67954+ depends on PERF_EVENTS
67955+ help
67956+ If you say Y here, the range of acceptable values for the
67957+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
67958+ default to a new value: 3. When the sysctl is set to this value, no
67959+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
67960+
67961+ Though PERF_EVENTS can be used legitimately for performance monitoring
67962+ and low-level application profiling, it is forced on regardless of
67963+ configuration, has been at fault for several vulnerabilities, and
67964+ creates new opportunities for side channels and other information leaks.
67965+
67966+ This feature puts PERF_EVENTS into a secure default state and permits
67967+ the administrator to change out of it temporarily if unprivileged
67968+ application profiling is needed.
67969+
67970+config GRKERNSEC_RAND_THREADSTACK
67971+ bool "Insert random gaps between thread stacks"
67972+ default y if GRKERNSEC_CONFIG_AUTO
67973+ depends on PAX_RANDMMAP && !PPC
67974+ help
67975+ If you say Y here, a random-sized gap will be enforced between allocated
67976+ thread stacks. Glibc's NPTL and other threading libraries that
67977+ pass MAP_STACK to the kernel for thread stack allocation are supported.
67978+ The implementation currently provides 8 bits of entropy for the gap.
67979+
67980+ Many distributions do not compile threaded remote services with the
67981+ -fstack-check argument to GCC, causing the variable-sized stack-based
67982+ allocator, alloca(), to not probe the stack on allocation. This
67983+ permits an unbounded alloca() to skip over any guard page and potentially
67984+ modify another thread's stack reliably. An enforced random gap
67985+ reduces the reliability of such an attack and increases the chance
67986+ that such a read/write to another thread's stack instead lands in
67987+ an unmapped area, causing a crash and triggering grsecurity's
67988+ anti-bruteforcing logic.
67989+
67990+config GRKERNSEC_PROC_MEMMAP
67991+ bool "Harden ASLR against information leaks and entropy reduction"
67992+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
67993+ depends on PAX_NOEXEC || PAX_ASLR
67994+ help
67995+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
67996+ give no information about the addresses of its mappings if
67997+ PaX features that rely on random addresses are enabled on the task.
67998+ In addition to sanitizing this information and disabling other
67999+ dangerous sources of information, this option causes reads of sensitive
68000+ /proc/<pid> entries where the file descriptor was opened in a different
68001+ task than the one performing the read. Such attempts are logged.
68002+ This option also limits argv/env strings for suid/sgid binaries
68003+ to 512KB to prevent a complete exhaustion of the stack entropy provided
68004+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
68005+ binaries to prevent alternative mmap layouts from being abused.
68006+
68007+ If you use PaX it is essential that you say Y here as it closes up
68008+ several holes that make full ASLR useless locally.
68009+
68010+
68011+config GRKERNSEC_KSTACKOVERFLOW
68012+ bool "Prevent kernel stack overflows"
68013+ default y if GRKERNSEC_CONFIG_AUTO
68014+ depends on !IA64 && 64BIT
68015+ help
68016+ If you say Y here, the kernel's process stacks will be allocated
68017+ with vmalloc instead of the kernel's default allocator. This
68018+ introduces guard pages that in combination with the alloca checking
68019+ of the STACKLEAK feature prevents all forms of kernel process stack
68020+ overflow abuse. Note that this is different from kernel stack
68021+ buffer overflows.
68022+
68023+config GRKERNSEC_BRUTE
68024+ bool "Deter exploit bruteforcing"
68025+ default y if GRKERNSEC_CONFIG_AUTO
68026+ help
68027+ If you say Y here, attempts to bruteforce exploits against forking
68028+ daemons such as apache or sshd, as well as against suid/sgid binaries
68029+ will be deterred. When a child of a forking daemon is killed by PaX
68030+ or crashes due to an illegal instruction or other suspicious signal,
68031+ the parent process will be delayed 30 seconds upon every subsequent
68032+ fork until the administrator is able to assess the situation and
68033+ restart the daemon.
68034+ In the suid/sgid case, the attempt is logged, the user has all their
68035+ existing instances of the suid/sgid binary terminated and will
68036+ be unable to execute any suid/sgid binaries for 15 minutes.
68037+
68038+ It is recommended that you also enable signal logging in the auditing
68039+ section so that logs are generated when a process triggers a suspicious
68040+ signal.
68041+ If the sysctl option is enabled, a sysctl option with name
68042+ "deter_bruteforce" is created.
68043+
68044+config GRKERNSEC_MODHARDEN
68045+ bool "Harden module auto-loading"
68046+ default y if GRKERNSEC_CONFIG_AUTO
68047+ depends on MODULES
68048+ help
68049+ If you say Y here, module auto-loading in response to use of some
68050+ feature implemented by an unloaded module will be restricted to
68051+ root users. Enabling this option helps defend against attacks
68052+ by unprivileged users who abuse the auto-loading behavior to
68053+ cause a vulnerable module to load that is then exploited.
68054+
68055+ If this option prevents a legitimate use of auto-loading for a
68056+ non-root user, the administrator can execute modprobe manually
68057+ with the exact name of the module mentioned in the alert log.
68058+ Alternatively, the administrator can add the module to the list
68059+ of modules loaded at boot by modifying init scripts.
68060+
68061+ Modification of init scripts will most likely be needed on
68062+ Ubuntu servers with encrypted home directory support enabled,
68063+ as the first non-root user logging in will cause the ecb(aes),
68064+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
68065+
68066+config GRKERNSEC_HIDESYM
68067+ bool "Hide kernel symbols"
68068+ default y if GRKERNSEC_CONFIG_AUTO
68069+ select PAX_USERCOPY_SLABS
68070+ help
68071+ If you say Y here, getting information on loaded modules, and
68072+ displaying all kernel symbols through a syscall will be restricted
68073+ to users with CAP_SYS_MODULE. For software compatibility reasons,
68074+ /proc/kallsyms will be restricted to the root user. The RBAC
68075+ system can hide that entry even from root.
68076+
68077+ This option also prevents leaking of kernel addresses through
68078+ several /proc entries.
68079+
68080+ Note that this option is only effective provided the following
68081+ conditions are met:
68082+ 1) The kernel using grsecurity is not precompiled by some distribution
68083+ 2) You have also enabled GRKERNSEC_DMESG
68084+ 3) You are using the RBAC system and hiding other files such as your
68085+ kernel image and System.map. Alternatively, enabling this option
68086+ causes the permissions on /boot, /lib/modules, and the kernel
68087+ source directory to change at compile time to prevent
68088+ reading by non-root users.
68089+ If the above conditions are met, this option will aid in providing a
68090+ useful protection against local kernel exploitation of overflows
68091+ and arbitrary read/write vulnerabilities.
68092+
68093+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
68094+ in addition to this feature.
68095+
68096+config GRKERNSEC_RANDSTRUCT
68097+ bool "Randomize layout of sensitive kernel structures"
68098+ default y if GRKERNSEC_CONFIG_AUTO
68099+ select GRKERNSEC_HIDESYM
68100+ select MODVERSIONS if MODULES
68101+ help
68102+ If you say Y here, the layouts of a number of sensitive kernel
68103+ structures (task, fs, cred, etc) and all structures composed entirely
68104+ of function pointers (aka "ops" structs) will be randomized at compile-time.
68105+ This can introduce the requirement of an additional infoleak
68106+ vulnerability for exploits targeting these structure types.
68107+
68108+ Enabling this feature will introduce some performance impact, slightly
68109+ increase memory usage, and prevent the use of forensic tools like
68110+ Volatility against the system (unless the kernel source tree isn't
68111+ cleaned after kernel installation).
68112+
68113+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
68114+ It remains after a make clean to allow for external modules to be compiled
68115+ with the existing seed and will be removed by a make mrproper or
68116+ make distclean.
68117+
68118+ Note that the implementation requires gcc 4.6.4. or newer. You may need
68119+ to install the supporting headers explicitly in addition to the normal
68120+ gcc package.
68121+
68122+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
68123+ bool "Use cacheline-aware structure randomization"
68124+ depends on GRKERNSEC_RANDSTRUCT
68125+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
68126+ help
68127+ If you say Y here, the RANDSTRUCT randomization will make a best effort
68128+ at restricting randomization to cacheline-sized groups of elements. It
68129+ will further not randomize bitfields in structures. This reduces the
68130+ performance hit of RANDSTRUCT at the cost of weakened randomization.
68131+
68132+config GRKERNSEC_KERN_LOCKOUT
68133+ bool "Active kernel exploit response"
68134+ default y if GRKERNSEC_CONFIG_AUTO
68135+ depends on X86 || ARM || PPC || SPARC
68136+ help
68137+ If you say Y here, when a PaX alert is triggered due to suspicious
68138+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
68139+ or an OOPS occurs due to bad memory accesses, instead of just
68140+ terminating the offending process (and potentially allowing
68141+ a subsequent exploit from the same user), we will take one of two
68142+ actions:
68143+ If the user was root, we will panic the system
68144+ If the user was non-root, we will log the attempt, terminate
68145+ all processes owned by the user, then prevent them from creating
68146+ any new processes until the system is restarted
68147+ This deters repeated kernel exploitation/bruteforcing attempts
68148+ and is useful for later forensics.
68149+
68150+config GRKERNSEC_OLD_ARM_USERLAND
68151+ bool "Old ARM userland compatibility"
68152+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
68153+ help
68154+ If you say Y here, stubs of executable code to perform such operations
68155+ as "compare-exchange" will be placed at fixed locations in the ARM vector
68156+ table. This is unfortunately needed for old ARM userland meant to run
68157+ across a wide range of processors. Without this option enabled,
68158+ the get_tls and data memory barrier stubs will be emulated by the kernel,
68159+ which is enough for Linaro userlands or other userlands designed for v6
68160+ and newer ARM CPUs. It's recommended that you try without this option enabled
68161+ first, and only enable it if your userland does not boot (it will likely fail
68162+ at init time).
68163+
68164+endmenu
68165+menu "Role Based Access Control Options"
68166+depends on GRKERNSEC
68167+
68168+config GRKERNSEC_RBAC_DEBUG
68169+ bool
68170+
68171+config GRKERNSEC_NO_RBAC
68172+ bool "Disable RBAC system"
68173+ help
68174+ If you say Y here, the /dev/grsec device will be removed from the kernel,
68175+ preventing the RBAC system from being enabled. You should only say Y
68176+ here if you have no intention of using the RBAC system, so as to prevent
68177+ an attacker with root access from misusing the RBAC system to hide files
68178+ and processes when loadable module support and /dev/[k]mem have been
68179+ locked down.
68180+
68181+config GRKERNSEC_ACL_HIDEKERN
68182+ bool "Hide kernel processes"
68183+ help
68184+ If you say Y here, all kernel threads will be hidden to all
68185+ processes but those whose subject has the "view hidden processes"
68186+ flag.
68187+
68188+config GRKERNSEC_ACL_MAXTRIES
68189+ int "Maximum tries before password lockout"
68190+ default 3
68191+ help
68192+ This option enforces the maximum number of times a user can attempt
68193+ to authorize themselves with the grsecurity RBAC system before being
68194+ denied the ability to attempt authorization again for a specified time.
68195+ The lower the number, the harder it will be to brute-force a password.
68196+
68197+config GRKERNSEC_ACL_TIMEOUT
68198+ int "Time to wait after max password tries, in seconds"
68199+ default 30
68200+ help
68201+ This option specifies the time the user must wait after attempting to
68202+ authorize to the RBAC system with the maximum number of invalid
68203+ passwords. The higher the number, the harder it will be to brute-force
68204+ a password.
68205+
68206+endmenu
68207+menu "Filesystem Protections"
68208+depends on GRKERNSEC
68209+
68210+config GRKERNSEC_PROC
68211+ bool "Proc restrictions"
68212+ default y if GRKERNSEC_CONFIG_AUTO
68213+ help
68214+ If you say Y here, the permissions of the /proc filesystem
68215+ will be altered to enhance system security and privacy. You MUST
68216+ choose either a user only restriction or a user and group restriction.
68217+ Depending upon the option you choose, you can either restrict users to
68218+ see only the processes they themselves run, or choose a group that can
68219+ view all processes and files normally restricted to root if you choose
68220+ the "restrict to user only" option. NOTE: If you're running identd or
68221+ ntpd as a non-root user, you will have to run it as the group you
68222+ specify here.
68223+
68224+config GRKERNSEC_PROC_USER
68225+ bool "Restrict /proc to user only"
68226+ depends on GRKERNSEC_PROC
68227+ help
68228+ If you say Y here, non-root users will only be able to view their own
68229+ processes, and restricts them from viewing network-related information,
68230+ and viewing kernel symbol and module information.
68231+
68232+config GRKERNSEC_PROC_USERGROUP
68233+ bool "Allow special group"
68234+ default y if GRKERNSEC_CONFIG_AUTO
68235+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
68236+ help
68237+ If you say Y here, you will be able to select a group that will be
68238+ able to view all processes and network-related information. If you've
68239+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
68240+ remain hidden. This option is useful if you want to run identd as
68241+ a non-root user. The group you select may also be chosen at boot time
68242+ via "grsec_proc_gid=" on the kernel commandline.
68243+
68244+config GRKERNSEC_PROC_GID
68245+ int "GID for special group"
68246+ depends on GRKERNSEC_PROC_USERGROUP
68247+ default 1001
68248+
68249+config GRKERNSEC_PROC_ADD
68250+ bool "Additional restrictions"
68251+ default y if GRKERNSEC_CONFIG_AUTO
68252+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
68253+ help
68254+ If you say Y here, additional restrictions will be placed on
68255+ /proc that keep normal users from viewing device information and
68256+ slabinfo information that could be useful for exploits.
68257+
68258+config GRKERNSEC_LINK
68259+ bool "Linking restrictions"
68260+ default y if GRKERNSEC_CONFIG_AUTO
68261+ help
68262+ If you say Y here, /tmp race exploits will be prevented, since users
68263+ will no longer be able to follow symlinks owned by other users in
68264+ world-writable +t directories (e.g. /tmp), unless the owner of the
68265+ symlink is the owner of the directory. users will also not be
68266+ able to hardlink to files they do not own. If the sysctl option is
68267+ enabled, a sysctl option with name "linking_restrictions" is created.
68268+
68269+config GRKERNSEC_SYMLINKOWN
68270+ bool "Kernel-enforced SymlinksIfOwnerMatch"
68271+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
68272+ help
68273+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
68274+ that prevents it from being used as a security feature. As Apache
68275+ verifies the symlink by performing a stat() against the target of
68276+ the symlink before it is followed, an attacker can setup a symlink
68277+ to point to a same-owned file, then replace the symlink with one
68278+ that targets another user's file just after Apache "validates" the
68279+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
68280+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
68281+ will be in place for the group you specify. If the sysctl option
68282+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
68283+ created.
68284+
68285+config GRKERNSEC_SYMLINKOWN_GID
68286+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
68287+ depends on GRKERNSEC_SYMLINKOWN
68288+ default 1006
68289+ help
68290+ Setting this GID determines what group kernel-enforced
68291+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
68292+ is enabled, a sysctl option with name "symlinkown_gid" is created.
68293+
68294+config GRKERNSEC_FIFO
68295+ bool "FIFO restrictions"
68296+ default y if GRKERNSEC_CONFIG_AUTO
68297+ help
68298+ If you say Y here, users will not be able to write to FIFOs they don't
68299+ own in world-writable +t directories (e.g. /tmp), unless the owner of
68300+ the FIFO is the same owner of the directory it's held in. If the sysctl
68301+ option is enabled, a sysctl option with name "fifo_restrictions" is
68302+ created.
68303+
68304+config GRKERNSEC_SYSFS_RESTRICT
68305+ bool "Sysfs/debugfs restriction"
68306+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
68307+ depends on SYSFS
68308+ help
68309+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
68310+ any filesystem normally mounted under it (e.g. debugfs) will be
68311+ mostly accessible only by root. These filesystems generally provide access
68312+ to hardware and debug information that isn't appropriate for unprivileged
68313+ users of the system. Sysfs and debugfs have also become a large source
68314+ of new vulnerabilities, ranging from infoleaks to local compromise.
68315+ There has been very little oversight with an eye toward security involved
68316+ in adding new exporters of information to these filesystems, so their
68317+ use is discouraged.
68318+ For reasons of compatibility, a few directories have been whitelisted
68319+ for access by non-root users:
68320+ /sys/fs/selinux
68321+ /sys/fs/fuse
68322+ /sys/devices/system/cpu
68323+
68324+config GRKERNSEC_ROFS
68325+ bool "Runtime read-only mount protection"
68326+ depends on SYSCTL
68327+ help
68328+ If you say Y here, a sysctl option with name "romount_protect" will
68329+ be created. By setting this option to 1 at runtime, filesystems
68330+ will be protected in the following ways:
68331+ * No new writable mounts will be allowed
68332+ * Existing read-only mounts won't be able to be remounted read/write
68333+ * Write operations will be denied on all block devices
68334+ This option acts independently of grsec_lock: once it is set to 1,
68335+ it cannot be turned off. Therefore, please be mindful of the resulting
68336+ behavior if this option is enabled in an init script on a read-only
68337+ filesystem.
68338+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
68339+ and GRKERNSEC_IO should be enabled and module loading disabled via
68340+ config or at runtime.
68341+ This feature is mainly intended for secure embedded systems.
68342+
68343+
68344+config GRKERNSEC_DEVICE_SIDECHANNEL
68345+ bool "Eliminate stat/notify-based device sidechannels"
68346+ default y if GRKERNSEC_CONFIG_AUTO
68347+ help
68348+ If you say Y here, timing analyses on block or character
68349+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
68350+ will be thwarted for unprivileged users. If a process without
68351+ CAP_MKNOD stats such a device, the last access and last modify times
68352+ will match the device's create time. No access or modify events
68353+ will be triggered through inotify/dnotify/fanotify for such devices.
68354+ This feature will prevent attacks that may at a minimum
68355+ allow an attacker to determine the administrator's password length.
68356+
68357+config GRKERNSEC_CHROOT
68358+ bool "Chroot jail restrictions"
68359+ default y if GRKERNSEC_CONFIG_AUTO
68360+ help
68361+ If you say Y here, you will be able to choose several options that will
68362+ make breaking out of a chrooted jail much more difficult. If you
68363+ encounter no software incompatibilities with the following options, it
68364+ is recommended that you enable each one.
68365+
68366+ Note that the chroot restrictions are not intended to apply to "chroots"
68367+ to directories that are simple bind mounts of the global root filesystem.
68368+ For several other reasons, a user shouldn't expect any significant
68369+ security by performing such a chroot.
68370+
68371+config GRKERNSEC_CHROOT_MOUNT
68372+ bool "Deny mounts"
68373+ default y if GRKERNSEC_CONFIG_AUTO
68374+ depends on GRKERNSEC_CHROOT
68375+ help
68376+ If you say Y here, processes inside a chroot will not be able to
68377+ mount or remount filesystems. If the sysctl option is enabled, a
68378+ sysctl option with name "chroot_deny_mount" is created.
68379+
68380+config GRKERNSEC_CHROOT_DOUBLE
68381+ bool "Deny double-chroots"
68382+ default y if GRKERNSEC_CONFIG_AUTO
68383+ depends on GRKERNSEC_CHROOT
68384+ help
68385+ If you say Y here, processes inside a chroot will not be able to chroot
68386+ again outside the chroot. This is a widely used method of breaking
68387+ out of a chroot jail and should not be allowed. If the sysctl
68388+ option is enabled, a sysctl option with name
68389+ "chroot_deny_chroot" is created.
68390+
68391+config GRKERNSEC_CHROOT_PIVOT
68392+ bool "Deny pivot_root in chroot"
68393+ default y if GRKERNSEC_CONFIG_AUTO
68394+ depends on GRKERNSEC_CHROOT
68395+ help
68396+ If you say Y here, processes inside a chroot will not be able to use
68397+ a function called pivot_root() that was introduced in Linux 2.3.41. It
68398+ works similar to chroot in that it changes the root filesystem. This
68399+ function could be misused in a chrooted process to attempt to break out
68400+ of the chroot, and therefore should not be allowed. If the sysctl
68401+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
68402+ created.
68403+
68404+config GRKERNSEC_CHROOT_CHDIR
68405+ bool "Enforce chdir(\"/\") on all chroots"
68406+ default y if GRKERNSEC_CONFIG_AUTO
68407+ depends on GRKERNSEC_CHROOT
68408+ help
68409+ If you say Y here, the current working directory of all newly-chrooted
68410+ applications will be set to the the root directory of the chroot.
68411+ The man page on chroot(2) states:
68412+ Note that this call does not change the current working
68413+ directory, so that `.' can be outside the tree rooted at
68414+ `/'. In particular, the super-user can escape from a
68415+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
68416+
68417+ It is recommended that you say Y here, since it's not known to break
68418+ any software. If the sysctl option is enabled, a sysctl option with
68419+ name "chroot_enforce_chdir" is created.
68420+
68421+config GRKERNSEC_CHROOT_CHMOD
68422+ bool "Deny (f)chmod +s"
68423+ default y if GRKERNSEC_CONFIG_AUTO
68424+ depends on GRKERNSEC_CHROOT
68425+ help
68426+ If you say Y here, processes inside a chroot will not be able to chmod
68427+ or fchmod files to make them have suid or sgid bits. This protects
68428+ against another published method of breaking a chroot. If the sysctl
68429+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
68430+ created.
68431+
68432+config GRKERNSEC_CHROOT_FCHDIR
68433+ bool "Deny fchdir and fhandle out of chroot"
68434+ default y if GRKERNSEC_CONFIG_AUTO
68435+ depends on GRKERNSEC_CHROOT
68436+ help
68437+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
68438+ to a file descriptor of the chrooting process that points to a directory
68439+ outside the filesystem will be stopped. Additionally, this option prevents
68440+ use of the recently-created syscall for opening files by a guessable "file
68441+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
68442+ with name "chroot_deny_fchdir" is created.
68443+
68444+config GRKERNSEC_CHROOT_MKNOD
68445+ bool "Deny mknod"
68446+ default y if GRKERNSEC_CONFIG_AUTO
68447+ depends on GRKERNSEC_CHROOT
68448+ help
68449+ If you say Y here, processes inside a chroot will not be allowed to
68450+ mknod. The problem with using mknod inside a chroot is that it
68451+ would allow an attacker to create a device entry that is the same
68452+ as one on the physical root of your system, which could range from
68453+ anything from the console device to a device for your harddrive (which
68454+ they could then use to wipe the drive or steal data). It is recommended
68455+ that you say Y here, unless you run into software incompatibilities.
68456+ If the sysctl option is enabled, a sysctl option with name
68457+ "chroot_deny_mknod" is created.
68458+
68459+config GRKERNSEC_CHROOT_SHMAT
68460+ bool "Deny shmat() out of chroot"
68461+ default y if GRKERNSEC_CONFIG_AUTO
68462+ depends on GRKERNSEC_CHROOT
68463+ help
68464+ If you say Y here, processes inside a chroot will not be able to attach
68465+ to shared memory segments that were created outside of the chroot jail.
68466+ It is recommended that you say Y here. If the sysctl option is enabled,
68467+ a sysctl option with name "chroot_deny_shmat" is created.
68468+
68469+config GRKERNSEC_CHROOT_UNIX
68470+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
68471+ default y if GRKERNSEC_CONFIG_AUTO
68472+ depends on GRKERNSEC_CHROOT
68473+ help
68474+ If you say Y here, processes inside a chroot will not be able to
68475+ connect to abstract (meaning not belonging to a filesystem) Unix
68476+ domain sockets that were bound outside of a chroot. It is recommended
68477+ that you say Y here. If the sysctl option is enabled, a sysctl option
68478+ with name "chroot_deny_unix" is created.
68479+
68480+config GRKERNSEC_CHROOT_FINDTASK
68481+ bool "Protect outside processes"
68482+ default y if GRKERNSEC_CONFIG_AUTO
68483+ depends on GRKERNSEC_CHROOT
68484+ help
68485+ If you say Y here, processes inside a chroot will not be able to
68486+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
68487+ getsid, or view any process outside of the chroot. If the sysctl
68488+ option is enabled, a sysctl option with name "chroot_findtask" is
68489+ created.
68490+
68491+config GRKERNSEC_CHROOT_NICE
68492+ bool "Restrict priority changes"
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 raise
68497+ the priority of processes in the chroot, or alter the priority of
68498+ processes outside the chroot. This provides more security than simply
68499+ removing CAP_SYS_NICE from the process' capability set. If the
68500+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
68501+ is created.
68502+
68503+config GRKERNSEC_CHROOT_SYSCTL
68504+ bool "Deny sysctl writes"
68505+ default y if GRKERNSEC_CONFIG_AUTO
68506+ depends on GRKERNSEC_CHROOT
68507+ help
68508+ If you say Y here, an attacker in a chroot will not be able to
68509+ write to sysctl entries, either by sysctl(2) or through a /proc
68510+ interface. It is strongly recommended that you say Y here. If the
68511+ sysctl option is enabled, a sysctl option with name
68512+ "chroot_deny_sysctl" is created.
68513+
68514+config GRKERNSEC_CHROOT_CAPS
68515+ bool "Capability restrictions"
68516+ default y if GRKERNSEC_CONFIG_AUTO
68517+ depends on GRKERNSEC_CHROOT
68518+ help
68519+ If you say Y here, the capabilities on all processes within a
68520+ chroot jail will be lowered to stop module insertion, raw i/o,
68521+ system and net admin tasks, rebooting the system, modifying immutable
68522+ files, modifying IPC owned by another, and changing the system time.
68523+ This is left an option because it can break some apps. Disable this
68524+ if your chrooted apps are having problems performing those kinds of
68525+ tasks. If the sysctl option is enabled, a sysctl option with
68526+ name "chroot_caps" is created.
68527+
68528+config GRKERNSEC_CHROOT_INITRD
68529+ bool "Exempt initrd tasks from restrictions"
68530+ default y if GRKERNSEC_CONFIG_AUTO
68531+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
68532+ help
68533+ If you say Y here, tasks started prior to init will be exempted from
68534+ grsecurity's chroot restrictions. This option is mainly meant to
68535+ resolve Plymouth's performing privileged operations unnecessarily
68536+ in a chroot.
68537+
68538+endmenu
68539+menu "Kernel Auditing"
68540+depends on GRKERNSEC
68541+
68542+config GRKERNSEC_AUDIT_GROUP
68543+ bool "Single group for auditing"
68544+ help
68545+ If you say Y here, the exec and chdir logging features will only operate
68546+ on a group you specify. This option is recommended if you only want to
68547+ watch certain users instead of having a large amount of logs from the
68548+ entire system. If the sysctl option is enabled, a sysctl option with
68549+ name "audit_group" is created.
68550+
68551+config GRKERNSEC_AUDIT_GID
68552+ int "GID for auditing"
68553+ depends on GRKERNSEC_AUDIT_GROUP
68554+ default 1007
68555+
68556+config GRKERNSEC_EXECLOG
68557+ bool "Exec logging"
68558+ help
68559+ If you say Y here, all execve() calls will be logged (since the
68560+ other exec*() calls are frontends to execve(), all execution
68561+ will be logged). Useful for shell-servers that like to keep track
68562+ of their users. If the sysctl option is enabled, a sysctl option with
68563+ name "exec_logging" is created.
68564+ WARNING: This option when enabled will produce a LOT of logs, especially
68565+ on an active system.
68566+
68567+config GRKERNSEC_RESLOG
68568+ bool "Resource logging"
68569+ default y if GRKERNSEC_CONFIG_AUTO
68570+ help
68571+ If you say Y here, all attempts to overstep resource limits will
68572+ be logged with the resource name, the requested size, and the current
68573+ limit. It is highly recommended that you say Y here. If the sysctl
68574+ option is enabled, a sysctl option with name "resource_logging" is
68575+ created. If the RBAC system is enabled, the sysctl value is ignored.
68576+
68577+config GRKERNSEC_CHROOT_EXECLOG
68578+ bool "Log execs within chroot"
68579+ help
68580+ If you say Y here, all executions inside a chroot jail will be logged
68581+ to syslog. This can cause a large amount of logs if certain
68582+ applications (eg. djb's daemontools) are installed on the system, and
68583+ is therefore left as an option. If the sysctl option is enabled, a
68584+ sysctl option with name "chroot_execlog" is created.
68585+
68586+config GRKERNSEC_AUDIT_PTRACE
68587+ bool "Ptrace logging"
68588+ help
68589+ If you say Y here, all attempts to attach to a process via ptrace
68590+ will be logged. If the sysctl option is enabled, a sysctl option
68591+ with name "audit_ptrace" is created.
68592+
68593+config GRKERNSEC_AUDIT_CHDIR
68594+ bool "Chdir logging"
68595+ help
68596+ If you say Y here, all chdir() calls will be logged. If the sysctl
68597+ option is enabled, a sysctl option with name "audit_chdir" is created.
68598+
68599+config GRKERNSEC_AUDIT_MOUNT
68600+ bool "(Un)Mount logging"
68601+ help
68602+ If you say Y here, all mounts and unmounts will be logged. If the
68603+ sysctl option is enabled, a sysctl option with name "audit_mount" is
68604+ created.
68605+
68606+config GRKERNSEC_SIGNAL
68607+ bool "Signal logging"
68608+ default y if GRKERNSEC_CONFIG_AUTO
68609+ help
68610+ If you say Y here, certain important signals will be logged, such as
68611+ SIGSEGV, which will as a result inform you of when a error in a program
68612+ occurred, which in some cases could mean a possible exploit attempt.
68613+ If the sysctl option is enabled, a sysctl option with name
68614+ "signal_logging" is created.
68615+
68616+config GRKERNSEC_FORKFAIL
68617+ bool "Fork failure logging"
68618+ help
68619+ If you say Y here, all failed fork() attempts will be logged.
68620+ This could suggest a fork bomb, or someone attempting to overstep
68621+ their process limit. If the sysctl option is enabled, a sysctl option
68622+ with name "forkfail_logging" is created.
68623+
68624+config GRKERNSEC_TIME
68625+ bool "Time change logging"
68626+ default y if GRKERNSEC_CONFIG_AUTO
68627+ help
68628+ If you say Y here, any changes of the system clock will be logged.
68629+ If the sysctl option is enabled, a sysctl option with name
68630+ "timechange_logging" is created.
68631+
68632+config GRKERNSEC_PROC_IPADDR
68633+ bool "/proc/<pid>/ipaddr support"
68634+ default y if GRKERNSEC_CONFIG_AUTO
68635+ help
68636+ If you say Y here, a new entry will be added to each /proc/<pid>
68637+ directory that contains the IP address of the person using the task.
68638+ The IP is carried across local TCP and AF_UNIX stream sockets.
68639+ This information can be useful for IDS/IPSes to perform remote response
68640+ to a local attack. The entry is readable by only the owner of the
68641+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
68642+ the RBAC system), and thus does not create privacy concerns.
68643+
68644+config GRKERNSEC_RWXMAP_LOG
68645+ bool 'Denied RWX mmap/mprotect logging'
68646+ default y if GRKERNSEC_CONFIG_AUTO
68647+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
68648+ help
68649+ If you say Y here, calls to mmap() and mprotect() with explicit
68650+ usage of PROT_WRITE and PROT_EXEC together will be logged when
68651+ denied by the PAX_MPROTECT feature. This feature will also
68652+ log other problematic scenarios that can occur when PAX_MPROTECT
68653+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
68654+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
68655+ is created.
68656+
68657+endmenu
68658+
68659+menu "Executable Protections"
68660+depends on GRKERNSEC
68661+
68662+config GRKERNSEC_DMESG
68663+ bool "Dmesg(8) restriction"
68664+ default y if GRKERNSEC_CONFIG_AUTO
68665+ help
68666+ If you say Y here, non-root users will not be able to use dmesg(8)
68667+ to view the contents of the kernel's circular log buffer.
68668+ The kernel's log buffer often contains kernel addresses and other
68669+ identifying information useful to an attacker in fingerprinting a
68670+ system for a targeted exploit.
68671+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
68672+ created.
68673+
68674+config GRKERNSEC_HARDEN_PTRACE
68675+ bool "Deter ptrace-based process snooping"
68676+ default y if GRKERNSEC_CONFIG_AUTO
68677+ help
68678+ If you say Y here, TTY sniffers and other malicious monitoring
68679+ programs implemented through ptrace will be defeated. If you
68680+ have been using the RBAC system, this option has already been
68681+ enabled for several years for all users, with the ability to make
68682+ fine-grained exceptions.
68683+
68684+ This option only affects the ability of non-root users to ptrace
68685+ processes that are not a descendent of the ptracing process.
68686+ This means that strace ./binary and gdb ./binary will still work,
68687+ but attaching to arbitrary processes will not. If the sysctl
68688+ option is enabled, a sysctl option with name "harden_ptrace" is
68689+ created.
68690+
68691+config GRKERNSEC_PTRACE_READEXEC
68692+ bool "Require read access to ptrace sensitive binaries"
68693+ default y if GRKERNSEC_CONFIG_AUTO
68694+ help
68695+ If you say Y here, unprivileged users will not be able to ptrace unreadable
68696+ binaries. This option is useful in environments that
68697+ remove the read bits (e.g. file mode 4711) from suid binaries to
68698+ prevent infoleaking of their contents. This option adds
68699+ consistency to the use of that file mode, as the binary could normally
68700+ be read out when run without privileges while ptracing.
68701+
68702+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
68703+ is created.
68704+
68705+config GRKERNSEC_SETXID
68706+ bool "Enforce consistent multithreaded privileges"
68707+ default y if GRKERNSEC_CONFIG_AUTO
68708+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
68709+ help
68710+ If you say Y here, a change from a root uid to a non-root uid
68711+ in a multithreaded application will cause the resulting uids,
68712+ gids, supplementary groups, and capabilities in that thread
68713+ to be propagated to the other threads of the process. In most
68714+ cases this is unnecessary, as glibc will emulate this behavior
68715+ on behalf of the application. Other libcs do not act in the
68716+ same way, allowing the other threads of the process to continue
68717+ running with root privileges. If the sysctl option is enabled,
68718+ a sysctl option with name "consistent_setxid" is created.
68719+
68720+config GRKERNSEC_HARDEN_IPC
68721+ bool "Disallow access to overly-permissive IPC objects"
68722+ default y if GRKERNSEC_CONFIG_AUTO
68723+ depends on SYSVIPC
68724+ help
68725+ If you say Y here, access to overly-permissive IPC objects (shared
68726+ memory, message queues, and semaphores) will be denied for processes
68727+ given the following criteria beyond normal permission checks:
68728+ 1) If the IPC object is world-accessible and the euid doesn't match
68729+ that of the creator or current uid for the IPC object
68730+ 2) If the IPC object is group-accessible and the egid doesn't
68731+ match that of the creator or current gid for the IPC object
68732+ It's a common error to grant too much permission to these objects,
68733+ with impact ranging from denial of service and information leaking to
68734+ privilege escalation. This feature was developed in response to
68735+ research by Tim Brown:
68736+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
68737+ who found hundreds of such insecure usages. Processes with
68738+ CAP_IPC_OWNER are still permitted to access these IPC objects.
68739+ If the sysctl option is enabled, a sysctl option with name
68740+ "harden_ipc" is created.
68741+
68742+config GRKERNSEC_TPE
68743+ bool "Trusted Path Execution (TPE)"
68744+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
68745+ help
68746+ If you say Y here, you will be able to choose a gid to add to the
68747+ supplementary groups of users you want to mark as "untrusted."
68748+ These users will not be able to execute any files that are not in
68749+ root-owned directories writable only by root. If the sysctl option
68750+ is enabled, a sysctl option with name "tpe" is created.
68751+
68752+config GRKERNSEC_TPE_ALL
68753+ bool "Partially restrict all non-root users"
68754+ depends on GRKERNSEC_TPE
68755+ help
68756+ If you say Y here, all non-root users will be covered under
68757+ a weaker TPE restriction. This is separate from, and in addition to,
68758+ the main TPE options that you have selected elsewhere. Thus, if a
68759+ "trusted" GID is chosen, this restriction applies to even that GID.
68760+ Under this restriction, all non-root users will only be allowed to
68761+ execute files in directories they own that are not group or
68762+ world-writable, or in directories owned by root and writable only by
68763+ root. If the sysctl option is enabled, a sysctl option with name
68764+ "tpe_restrict_all" is created.
68765+
68766+config GRKERNSEC_TPE_INVERT
68767+ bool "Invert GID option"
68768+ depends on GRKERNSEC_TPE
68769+ help
68770+ If you say Y here, the group you specify in the TPE configuration will
68771+ decide what group TPE restrictions will be *disabled* for. This
68772+ option is useful if you want TPE restrictions to be applied to most
68773+ users on the system. If the sysctl option is enabled, a sysctl option
68774+ with name "tpe_invert" is created. Unlike other sysctl options, this
68775+ entry will default to on for backward-compatibility.
68776+
68777+config GRKERNSEC_TPE_GID
68778+ int
68779+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
68780+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
68781+
68782+config GRKERNSEC_TPE_UNTRUSTED_GID
68783+ int "GID for TPE-untrusted users"
68784+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
68785+ default 1005
68786+ help
68787+ Setting this GID determines what group TPE restrictions will be
68788+ *enabled* for. If the sysctl option is enabled, a sysctl option
68789+ with name "tpe_gid" is created.
68790+
68791+config GRKERNSEC_TPE_TRUSTED_GID
68792+ int "GID for TPE-trusted users"
68793+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
68794+ default 1005
68795+ help
68796+ Setting this GID determines what group TPE restrictions will be
68797+ *disabled* for. If the sysctl option is enabled, a sysctl option
68798+ with name "tpe_gid" is created.
68799+
68800+endmenu
68801+menu "Network Protections"
68802+depends on GRKERNSEC
68803+
68804+config GRKERNSEC_BLACKHOLE
68805+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
68806+ default y if GRKERNSEC_CONFIG_AUTO
68807+ depends on NET
68808+ help
68809+ If you say Y here, neither TCP resets nor ICMP
68810+ destination-unreachable packets will be sent in response to packets
68811+ sent to ports for which no associated listening process exists.
68812+ It will also prevent the sending of ICMP protocol unreachable packets
68813+ in response to packets with unknown protocols.
68814+ This feature supports both IPV4 and IPV6 and exempts the
68815+ loopback interface from blackholing. Enabling this feature
68816+ makes a host more resilient to DoS attacks and reduces network
68817+ visibility against scanners.
68818+
68819+ The blackhole feature as-implemented is equivalent to the FreeBSD
68820+ blackhole feature, as it prevents RST responses to all packets, not
68821+ just SYNs. Under most application behavior this causes no
68822+ problems, but applications (like haproxy) may not close certain
68823+ connections in a way that cleanly terminates them on the remote
68824+ end, leaving the remote host in LAST_ACK state. Because of this
68825+ side-effect and to prevent intentional LAST_ACK DoSes, this
68826+ feature also adds automatic mitigation against such attacks.
68827+ The mitigation drastically reduces the amount of time a socket
68828+ can spend in LAST_ACK state. If you're using haproxy and not
68829+ all servers it connects to have this option enabled, consider
68830+ disabling this feature on the haproxy host.
68831+
68832+ If the sysctl option is enabled, two sysctl options with names
68833+ "ip_blackhole" and "lastack_retries" will be created.
68834+ While "ip_blackhole" takes the standard zero/non-zero on/off
68835+ toggle, "lastack_retries" uses the same kinds of values as
68836+ "tcp_retries1" and "tcp_retries2". The default value of 4
68837+ prevents a socket from lasting more than 45 seconds in LAST_ACK
68838+ state.
68839+
68840+config GRKERNSEC_NO_SIMULT_CONNECT
68841+ bool "Disable TCP Simultaneous Connect"
68842+ default y if GRKERNSEC_CONFIG_AUTO
68843+ depends on NET
68844+ help
68845+ If you say Y here, a feature by Willy Tarreau will be enabled that
68846+ removes a weakness in Linux's strict implementation of TCP that
68847+ allows two clients to connect to each other without either entering
68848+ a listening state. The weakness allows an attacker to easily prevent
68849+ a client from connecting to a known server provided the source port
68850+ for the connection is guessed correctly.
68851+
68852+ As the weakness could be used to prevent an antivirus or IPS from
68853+ fetching updates, or prevent an SSL gateway from fetching a CRL,
68854+ it should be eliminated by enabling this option. Though Linux is
68855+ one of few operating systems supporting simultaneous connect, it
68856+ has no legitimate use in practice and is rarely supported by firewalls.
68857+
68858+config GRKERNSEC_SOCKET
68859+ bool "Socket restrictions"
68860+ depends on NET
68861+ help
68862+ If you say Y here, you will be able to choose from several options.
68863+ If you assign a GID on your system and add it to the supplementary
68864+ groups of users you want to restrict socket access to, this patch
68865+ will perform up to three things, based on the option(s) you choose.
68866+
68867+config GRKERNSEC_SOCKET_ALL
68868+ bool "Deny any sockets to group"
68869+ depends on GRKERNSEC_SOCKET
68870+ help
68871+ If you say Y here, you will be able to choose a GID of whose users will
68872+ be unable to connect to other hosts from your machine or run server
68873+ applications from your machine. If the sysctl option is enabled, a
68874+ sysctl option with name "socket_all" is created.
68875+
68876+config GRKERNSEC_SOCKET_ALL_GID
68877+ int "GID to deny all sockets for"
68878+ depends on GRKERNSEC_SOCKET_ALL
68879+ default 1004
68880+ help
68881+ Here you can choose the GID to disable socket access for. Remember to
68882+ add the users you want socket access disabled for to the GID
68883+ specified here. If the sysctl option is enabled, a sysctl option
68884+ with name "socket_all_gid" is created.
68885+
68886+config GRKERNSEC_SOCKET_CLIENT
68887+ bool "Deny client sockets to group"
68888+ depends on GRKERNSEC_SOCKET
68889+ help
68890+ If you say Y here, you will be able to choose a GID of whose users will
68891+ be unable to connect to other hosts from your machine, but will be
68892+ able to run servers. If this option is enabled, all users in the group
68893+ you specify will have to use passive mode when initiating ftp transfers
68894+ from the shell on your machine. If the sysctl option is enabled, a
68895+ sysctl option with name "socket_client" is created.
68896+
68897+config GRKERNSEC_SOCKET_CLIENT_GID
68898+ int "GID to deny client sockets for"
68899+ depends on GRKERNSEC_SOCKET_CLIENT
68900+ default 1003
68901+ help
68902+ Here you can choose the GID to disable client socket access for.
68903+ Remember to add the users you want client socket access disabled for to
68904+ the GID specified here. If the sysctl option is enabled, a sysctl
68905+ option with name "socket_client_gid" is created.
68906+
68907+config GRKERNSEC_SOCKET_SERVER
68908+ bool "Deny server sockets to group"
68909+ depends on GRKERNSEC_SOCKET
68910+ help
68911+ If you say Y here, you will be able to choose a GID of whose users will
68912+ be unable to run server applications from your machine. If the sysctl
68913+ option is enabled, a sysctl option with name "socket_server" is created.
68914+
68915+config GRKERNSEC_SOCKET_SERVER_GID
68916+ int "GID to deny server sockets for"
68917+ depends on GRKERNSEC_SOCKET_SERVER
68918+ default 1002
68919+ help
68920+ Here you can choose the GID to disable server socket access for.
68921+ Remember to add the users you want server socket access disabled for to
68922+ the GID specified here. If the sysctl option is enabled, a sysctl
68923+ option with name "socket_server_gid" is created.
68924+
68925+endmenu
68926+
68927+menu "Physical Protections"
68928+depends on GRKERNSEC
68929+
68930+config GRKERNSEC_DENYUSB
68931+ bool "Deny new USB connections after toggle"
68932+ default y if GRKERNSEC_CONFIG_AUTO
68933+ depends on SYSCTL && USB_SUPPORT
68934+ help
68935+ If you say Y here, a new sysctl option with name "deny_new_usb"
68936+ will be created. Setting its value to 1 will prevent any new
68937+ USB devices from being recognized by the OS. Any attempted USB
68938+ device insertion will be logged. This option is intended to be
68939+ used against custom USB devices designed to exploit vulnerabilities
68940+ in various USB device drivers.
68941+
68942+ For greatest effectiveness, this sysctl should be set after any
68943+ relevant init scripts. This option is safe to enable in distros
68944+ as each user can choose whether or not to toggle the sysctl.
68945+
68946+config GRKERNSEC_DENYUSB_FORCE
68947+ bool "Reject all USB devices not connected at boot"
68948+ select USB
68949+ depends on GRKERNSEC_DENYUSB
68950+ help
68951+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
68952+ that doesn't involve a sysctl entry. This option should only be
68953+ enabled if you're sure you want to deny all new USB connections
68954+ at runtime and don't want to modify init scripts. This should not
68955+ be enabled by distros. It forces the core USB code to be built
68956+ into the kernel image so that all devices connected at boot time
68957+ can be recognized and new USB device connections can be prevented
68958+ prior to init running.
68959+
68960+endmenu
68961+
68962+menu "Sysctl Support"
68963+depends on GRKERNSEC && SYSCTL
68964+
68965+config GRKERNSEC_SYSCTL
68966+ bool "Sysctl support"
68967+ default y if GRKERNSEC_CONFIG_AUTO
68968+ help
68969+ If you say Y here, you will be able to change the options that
68970+ grsecurity runs with at bootup, without having to recompile your
68971+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
68972+ to enable (1) or disable (0) various features. All the sysctl entries
68973+ are mutable until the "grsec_lock" entry is set to a non-zero value.
68974+ All features enabled in the kernel configuration are disabled at boot
68975+ if you do not say Y to the "Turn on features by default" option.
68976+ All options should be set at startup, and the grsec_lock entry should
68977+ be set to a non-zero value after all the options are set.
68978+ *THIS IS EXTREMELY IMPORTANT*
68979+
68980+config GRKERNSEC_SYSCTL_DISTRO
68981+ bool "Extra sysctl support for distro makers (READ HELP)"
68982+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
68983+ help
68984+ If you say Y here, additional sysctl options will be created
68985+ for features that affect processes running as root. Therefore,
68986+ it is critical when using this option that the grsec_lock entry be
68987+ enabled after boot. Only distros with prebuilt kernel packages
68988+ with this option enabled that can ensure grsec_lock is enabled
68989+ after boot should use this option.
68990+ *Failure to set grsec_lock after boot makes all grsec features
68991+ this option covers useless*
68992+
68993+ Currently this option creates the following sysctl entries:
68994+ "Disable Privileged I/O": "disable_priv_io"
68995+
68996+config GRKERNSEC_SYSCTL_ON
68997+ bool "Turn on features by default"
68998+ default y if GRKERNSEC_CONFIG_AUTO
68999+ depends on GRKERNSEC_SYSCTL
69000+ help
69001+ If you say Y here, instead of having all features enabled in the
69002+ kernel configuration disabled at boot time, the features will be
69003+ enabled at boot time. It is recommended you say Y here unless
69004+ there is some reason you would want all sysctl-tunable features to
69005+ be disabled by default. As mentioned elsewhere, it is important
69006+ to enable the grsec_lock entry once you have finished modifying
69007+ the sysctl entries.
69008+
69009+endmenu
69010+menu "Logging Options"
69011+depends on GRKERNSEC
69012+
69013+config GRKERNSEC_FLOODTIME
69014+ int "Seconds in between log messages (minimum)"
69015+ default 10
69016+ help
69017+ This option allows you to enforce the number of seconds between
69018+ grsecurity log messages. The default should be suitable for most
69019+ people, however, if you choose to change it, choose a value small enough
69020+ to allow informative logs to be produced, but large enough to
69021+ prevent flooding.
69022+
69023+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
69024+ any rate limiting on grsecurity log messages.
69025+
69026+config GRKERNSEC_FLOODBURST
69027+ int "Number of messages in a burst (maximum)"
69028+ default 6
69029+ help
69030+ This option allows you to choose the maximum number of messages allowed
69031+ within the flood time interval you chose in a separate option. The
69032+ default should be suitable for most people, however if you find that
69033+ many of your logs are being interpreted as flooding, you may want to
69034+ raise this value.
69035+
69036+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
69037+ any rate limiting on grsecurity log messages.
69038+
69039+endmenu
69040diff --git a/grsecurity/Makefile b/grsecurity/Makefile
69041new file mode 100644
69042index 0000000..30ababb
69043--- /dev/null
69044+++ b/grsecurity/Makefile
69045@@ -0,0 +1,54 @@
69046+# grsecurity – access control and security hardening for Linux
69047+# All code in this directory and various hooks located throughout the Linux kernel are
69048+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
69049+# http://www.grsecurity.net spender@grsecurity.net
69050+#
69051+# This program is free software; you can redistribute it and/or
69052+# modify it under the terms of the GNU General Public License version 2
69053+# as published by the Free Software Foundation.
69054+#
69055+# This program is distributed in the hope that it will be useful,
69056+# but WITHOUT ANY WARRANTY; without even the implied warranty of
69057+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69058+# GNU General Public License for more details.
69059+#
69060+# You should have received a copy of the GNU General Public License
69061+# along with this program; if not, write to the Free Software
69062+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
69063+
69064+KBUILD_CFLAGS += -Werror
69065+
69066+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
69067+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
69068+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
69069+ grsec_usb.o grsec_ipc.o grsec_proc.o
69070+
69071+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
69072+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
69073+ gracl_learn.o grsec_log.o gracl_policy.o
69074+ifdef CONFIG_COMPAT
69075+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
69076+endif
69077+
69078+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
69079+
69080+ifdef CONFIG_NET
69081+obj-y += grsec_sock.o
69082+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
69083+endif
69084+
69085+ifndef CONFIG_GRKERNSEC
69086+obj-y += grsec_disabled.o
69087+endif
69088+
69089+ifdef CONFIG_GRKERNSEC_HIDESYM
69090+extra-y := grsec_hidesym.o
69091+$(obj)/grsec_hidesym.o:
69092+ @-chmod -f 500 /boot
69093+ @-chmod -f 500 /lib/modules
69094+ @-chmod -f 500 /lib64/modules
69095+ @-chmod -f 500 /lib32/modules
69096+ @-chmod -f 700 .
69097+ @-chmod -f 700 $(objtree)
69098+ @echo ' grsec: protected kernel image paths'
69099+endif
69100diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
69101new file mode 100644
69102index 0000000..6ae3aa0
69103--- /dev/null
69104+++ b/grsecurity/gracl.c
69105@@ -0,0 +1,2703 @@
69106+#include <linux/kernel.h>
69107+#include <linux/module.h>
69108+#include <linux/sched.h>
69109+#include <linux/mm.h>
69110+#include <linux/file.h>
69111+#include <linux/fs.h>
69112+#include <linux/namei.h>
69113+#include <linux/mount.h>
69114+#include <linux/tty.h>
69115+#include <linux/proc_fs.h>
69116+#include <linux/lglock.h>
69117+#include <linux/slab.h>
69118+#include <linux/vmalloc.h>
69119+#include <linux/types.h>
69120+#include <linux/sysctl.h>
69121+#include <linux/netdevice.h>
69122+#include <linux/ptrace.h>
69123+#include <linux/gracl.h>
69124+#include <linux/gralloc.h>
69125+#include <linux/security.h>
69126+#include <linux/grinternal.h>
69127+#include <linux/pid_namespace.h>
69128+#include <linux/stop_machine.h>
69129+#include <linux/fdtable.h>
69130+#include <linux/percpu.h>
69131+#include <linux/lglock.h>
69132+#include <linux/hugetlb.h>
69133+#include <linux/posix-timers.h>
69134+#include <linux/prefetch.h>
69135+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69136+#include <linux/magic.h>
69137+#include <linux/pagemap.h>
69138+#include "../fs/btrfs/async-thread.h"
69139+#include "../fs/btrfs/ctree.h"
69140+#include "../fs/btrfs/btrfs_inode.h"
69141+#endif
69142+#include "../fs/mount.h"
69143+
69144+#include <asm/uaccess.h>
69145+#include <asm/errno.h>
69146+#include <asm/mman.h>
69147+
69148+#define FOR_EACH_ROLE_START(role) \
69149+ role = running_polstate.role_list; \
69150+ while (role) {
69151+
69152+#define FOR_EACH_ROLE_END(role) \
69153+ role = role->prev; \
69154+ }
69155+
69156+extern struct path gr_real_root;
69157+
69158+static struct gr_policy_state running_polstate;
69159+struct gr_policy_state *polstate = &running_polstate;
69160+extern struct gr_alloc_state *current_alloc_state;
69161+
69162+extern char *gr_shared_page[4];
69163+DEFINE_RWLOCK(gr_inode_lock);
69164+
69165+static unsigned int gr_status __read_only = GR_STATUS_INIT;
69166+
69167+#ifdef CONFIG_NET
69168+extern struct vfsmount *sock_mnt;
69169+#endif
69170+
69171+extern struct vfsmount *pipe_mnt;
69172+extern struct vfsmount *shm_mnt;
69173+
69174+#ifdef CONFIG_HUGETLBFS
69175+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
69176+#endif
69177+
69178+extern u16 acl_sp_role_value;
69179+extern struct acl_object_label *fakefs_obj_rw;
69180+extern struct acl_object_label *fakefs_obj_rwx;
69181+
69182+int gr_acl_is_enabled(void)
69183+{
69184+ return (gr_status & GR_READY);
69185+}
69186+
69187+void gr_enable_rbac_system(void)
69188+{
69189+ pax_open_kernel();
69190+ gr_status |= GR_READY;
69191+ pax_close_kernel();
69192+}
69193+
69194+int gr_rbac_disable(void *unused)
69195+{
69196+ pax_open_kernel();
69197+ gr_status &= ~GR_READY;
69198+ pax_close_kernel();
69199+
69200+ return 0;
69201+}
69202+
69203+static inline dev_t __get_dev(const struct dentry *dentry)
69204+{
69205+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
69206+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
69207+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
69208+ else
69209+#endif
69210+ return dentry->d_sb->s_dev;
69211+}
69212+
69213+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
69214+{
69215+ return __get_dev(dentry);
69216+}
69217+
69218+static char gr_task_roletype_to_char(struct task_struct *task)
69219+{
69220+ switch (task->role->roletype &
69221+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
69222+ GR_ROLE_SPECIAL)) {
69223+ case GR_ROLE_DEFAULT:
69224+ return 'D';
69225+ case GR_ROLE_USER:
69226+ return 'U';
69227+ case GR_ROLE_GROUP:
69228+ return 'G';
69229+ case GR_ROLE_SPECIAL:
69230+ return 'S';
69231+ }
69232+
69233+ return 'X';
69234+}
69235+
69236+char gr_roletype_to_char(void)
69237+{
69238+ return gr_task_roletype_to_char(current);
69239+}
69240+
69241+__inline__ int
69242+gr_acl_tpe_check(void)
69243+{
69244+ if (unlikely(!(gr_status & GR_READY)))
69245+ return 0;
69246+ if (current->role->roletype & GR_ROLE_TPE)
69247+ return 1;
69248+ else
69249+ return 0;
69250+}
69251+
69252+int
69253+gr_handle_rawio(const struct inode *inode)
69254+{
69255+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
69256+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
69257+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
69258+ !capable(CAP_SYS_RAWIO))
69259+ return 1;
69260+#endif
69261+ return 0;
69262+}
69263+
69264+int
69265+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
69266+{
69267+ if (likely(lena != lenb))
69268+ return 0;
69269+
69270+ return !memcmp(a, b, lena);
69271+}
69272+
69273+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
69274+{
69275+ *buflen -= namelen;
69276+ if (*buflen < 0)
69277+ return -ENAMETOOLONG;
69278+ *buffer -= namelen;
69279+ memcpy(*buffer, str, namelen);
69280+ return 0;
69281+}
69282+
69283+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
69284+{
69285+ return prepend(buffer, buflen, name->name, name->len);
69286+}
69287+
69288+static int prepend_path(const struct path *path, struct path *root,
69289+ char **buffer, int *buflen)
69290+{
69291+ struct dentry *dentry = path->dentry;
69292+ struct vfsmount *vfsmnt = path->mnt;
69293+ struct mount *mnt = real_mount(vfsmnt);
69294+ bool slash = false;
69295+ int error = 0;
69296+
69297+ while (dentry != root->dentry || vfsmnt != root->mnt) {
69298+ struct dentry * parent;
69299+
69300+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
69301+ /* Global root? */
69302+ if (!mnt_has_parent(mnt)) {
69303+ goto out;
69304+ }
69305+ dentry = mnt->mnt_mountpoint;
69306+ mnt = mnt->mnt_parent;
69307+ vfsmnt = &mnt->mnt;
69308+ continue;
69309+ }
69310+ parent = dentry->d_parent;
69311+ prefetch(parent);
69312+ spin_lock(&dentry->d_lock);
69313+ error = prepend_name(buffer, buflen, &dentry->d_name);
69314+ spin_unlock(&dentry->d_lock);
69315+ if (!error)
69316+ error = prepend(buffer, buflen, "/", 1);
69317+ if (error)
69318+ break;
69319+
69320+ slash = true;
69321+ dentry = parent;
69322+ }
69323+
69324+out:
69325+ if (!error && !slash)
69326+ error = prepend(buffer, buflen, "/", 1);
69327+
69328+ return error;
69329+}
69330+
69331+/* this must be called with mount_lock and rename_lock held */
69332+
69333+static char *__our_d_path(const struct path *path, struct path *root,
69334+ char *buf, int buflen)
69335+{
69336+ char *res = buf + buflen;
69337+ int error;
69338+
69339+ prepend(&res, &buflen, "\0", 1);
69340+ error = prepend_path(path, root, &res, &buflen);
69341+ if (error)
69342+ return ERR_PTR(error);
69343+
69344+ return res;
69345+}
69346+
69347+static char *
69348+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
69349+{
69350+ char *retval;
69351+
69352+ retval = __our_d_path(path, root, buf, buflen);
69353+ if (unlikely(IS_ERR(retval)))
69354+ retval = strcpy(buf, "<path too long>");
69355+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
69356+ retval[1] = '\0';
69357+
69358+ return retval;
69359+}
69360+
69361+static char *
69362+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
69363+ char *buf, int buflen)
69364+{
69365+ struct path path;
69366+ char *res;
69367+
69368+ path.dentry = (struct dentry *)dentry;
69369+ path.mnt = (struct vfsmount *)vfsmnt;
69370+
69371+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
69372+ by the RBAC system */
69373+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
69374+
69375+ return res;
69376+}
69377+
69378+static char *
69379+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
69380+ char *buf, int buflen)
69381+{
69382+ char *res;
69383+ struct path path;
69384+ struct path root;
69385+ struct task_struct *reaper = init_pid_ns.child_reaper;
69386+
69387+ path.dentry = (struct dentry *)dentry;
69388+ path.mnt = (struct vfsmount *)vfsmnt;
69389+
69390+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
69391+ get_fs_root(reaper->fs, &root);
69392+
69393+ read_seqlock_excl(&mount_lock);
69394+ write_seqlock(&rename_lock);
69395+ res = gen_full_path(&path, &root, buf, buflen);
69396+ write_sequnlock(&rename_lock);
69397+ read_sequnlock_excl(&mount_lock);
69398+
69399+ path_put(&root);
69400+ return res;
69401+}
69402+
69403+char *
69404+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
69405+{
69406+ char *ret;
69407+ read_seqlock_excl(&mount_lock);
69408+ write_seqlock(&rename_lock);
69409+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
69410+ PAGE_SIZE);
69411+ write_sequnlock(&rename_lock);
69412+ read_sequnlock_excl(&mount_lock);
69413+ return ret;
69414+}
69415+
69416+static char *
69417+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
69418+{
69419+ char *ret;
69420+ char *buf;
69421+ int buflen;
69422+
69423+ read_seqlock_excl(&mount_lock);
69424+ write_seqlock(&rename_lock);
69425+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
69426+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
69427+ buflen = (int)(ret - buf);
69428+ if (buflen >= 5)
69429+ prepend(&ret, &buflen, "/proc", 5);
69430+ else
69431+ ret = strcpy(buf, "<path too long>");
69432+ write_sequnlock(&rename_lock);
69433+ read_sequnlock_excl(&mount_lock);
69434+ return ret;
69435+}
69436+
69437+char *
69438+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
69439+{
69440+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
69441+ PAGE_SIZE);
69442+}
69443+
69444+char *
69445+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
69446+{
69447+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
69448+ PAGE_SIZE);
69449+}
69450+
69451+char *
69452+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
69453+{
69454+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
69455+ PAGE_SIZE);
69456+}
69457+
69458+char *
69459+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
69460+{
69461+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
69462+ PAGE_SIZE);
69463+}
69464+
69465+char *
69466+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
69467+{
69468+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
69469+ PAGE_SIZE);
69470+}
69471+
69472+__inline__ __u32
69473+to_gr_audit(const __u32 reqmode)
69474+{
69475+ /* masks off auditable permission flags, then shifts them to create
69476+ auditing flags, and adds the special case of append auditing if
69477+ we're requesting write */
69478+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
69479+}
69480+
69481+struct acl_role_label *
69482+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
69483+ const gid_t gid)
69484+{
69485+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
69486+ struct acl_role_label *match;
69487+ struct role_allowed_ip *ipp;
69488+ unsigned int x;
69489+ u32 curr_ip = task->signal->saved_ip;
69490+
69491+ match = state->acl_role_set.r_hash[index];
69492+
69493+ while (match) {
69494+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
69495+ for (x = 0; x < match->domain_child_num; x++) {
69496+ if (match->domain_children[x] == uid)
69497+ goto found;
69498+ }
69499+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
69500+ break;
69501+ match = match->next;
69502+ }
69503+found:
69504+ if (match == NULL) {
69505+ try_group:
69506+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
69507+ match = state->acl_role_set.r_hash[index];
69508+
69509+ while (match) {
69510+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
69511+ for (x = 0; x < match->domain_child_num; x++) {
69512+ if (match->domain_children[x] == gid)
69513+ goto found2;
69514+ }
69515+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
69516+ break;
69517+ match = match->next;
69518+ }
69519+found2:
69520+ if (match == NULL)
69521+ match = state->default_role;
69522+ if (match->allowed_ips == NULL)
69523+ return match;
69524+ else {
69525+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
69526+ if (likely
69527+ ((ntohl(curr_ip) & ipp->netmask) ==
69528+ (ntohl(ipp->addr) & ipp->netmask)))
69529+ return match;
69530+ }
69531+ match = state->default_role;
69532+ }
69533+ } else if (match->allowed_ips == NULL) {
69534+ return match;
69535+ } else {
69536+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
69537+ if (likely
69538+ ((ntohl(curr_ip) & ipp->netmask) ==
69539+ (ntohl(ipp->addr) & ipp->netmask)))
69540+ return match;
69541+ }
69542+ goto try_group;
69543+ }
69544+
69545+ return match;
69546+}
69547+
69548+static struct acl_role_label *
69549+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
69550+ const gid_t gid)
69551+{
69552+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
69553+}
69554+
69555+struct acl_subject_label *
69556+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
69557+ const struct acl_role_label *role)
69558+{
69559+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
69560+ struct acl_subject_label *match;
69561+
69562+ match = role->subj_hash[index];
69563+
69564+ while (match && (match->inode != ino || match->device != dev ||
69565+ (match->mode & GR_DELETED))) {
69566+ match = match->next;
69567+ }
69568+
69569+ if (match && !(match->mode & GR_DELETED))
69570+ return match;
69571+ else
69572+ return NULL;
69573+}
69574+
69575+struct acl_subject_label *
69576+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
69577+ const struct acl_role_label *role)
69578+{
69579+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
69580+ struct acl_subject_label *match;
69581+
69582+ match = role->subj_hash[index];
69583+
69584+ while (match && (match->inode != ino || match->device != dev ||
69585+ !(match->mode & GR_DELETED))) {
69586+ match = match->next;
69587+ }
69588+
69589+ if (match && (match->mode & GR_DELETED))
69590+ return match;
69591+ else
69592+ return NULL;
69593+}
69594+
69595+static struct acl_object_label *
69596+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
69597+ const struct acl_subject_label *subj)
69598+{
69599+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
69600+ struct acl_object_label *match;
69601+
69602+ match = subj->obj_hash[index];
69603+
69604+ while (match && (match->inode != ino || match->device != dev ||
69605+ (match->mode & GR_DELETED))) {
69606+ match = match->next;
69607+ }
69608+
69609+ if (match && !(match->mode & GR_DELETED))
69610+ return match;
69611+ else
69612+ return NULL;
69613+}
69614+
69615+static struct acl_object_label *
69616+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
69617+ const struct acl_subject_label *subj)
69618+{
69619+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
69620+ struct acl_object_label *match;
69621+
69622+ match = subj->obj_hash[index];
69623+
69624+ while (match && (match->inode != ino || match->device != dev ||
69625+ !(match->mode & GR_DELETED))) {
69626+ match = match->next;
69627+ }
69628+
69629+ if (match && (match->mode & GR_DELETED))
69630+ return match;
69631+
69632+ match = subj->obj_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 name_entry *
69646+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
69647+{
69648+ unsigned int len = strlen(name);
69649+ unsigned int key = full_name_hash(name, len);
69650+ unsigned int index = key % state->name_set.n_size;
69651+ struct name_entry *match;
69652+
69653+ match = state->name_set.n_hash[index];
69654+
69655+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
69656+ match = match->next;
69657+
69658+ return match;
69659+}
69660+
69661+static struct name_entry *
69662+lookup_name_entry(const char *name)
69663+{
69664+ return __lookup_name_entry(&running_polstate, name);
69665+}
69666+
69667+static struct name_entry *
69668+lookup_name_entry_create(const char *name)
69669+{
69670+ unsigned int len = strlen(name);
69671+ unsigned int key = full_name_hash(name, len);
69672+ unsigned int index = key % running_polstate.name_set.n_size;
69673+ struct name_entry *match;
69674+
69675+ match = running_polstate.name_set.n_hash[index];
69676+
69677+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
69678+ !match->deleted))
69679+ match = match->next;
69680+
69681+ if (match && match->deleted)
69682+ return match;
69683+
69684+ match = running_polstate.name_set.n_hash[index];
69685+
69686+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
69687+ match->deleted))
69688+ match = match->next;
69689+
69690+ if (match && !match->deleted)
69691+ return match;
69692+ else
69693+ return NULL;
69694+}
69695+
69696+static struct inodev_entry *
69697+lookup_inodev_entry(const ino_t ino, const dev_t dev)
69698+{
69699+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
69700+ struct inodev_entry *match;
69701+
69702+ match = running_polstate.inodev_set.i_hash[index];
69703+
69704+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
69705+ match = match->next;
69706+
69707+ return match;
69708+}
69709+
69710+void
69711+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
69712+{
69713+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
69714+ state->inodev_set.i_size);
69715+ struct inodev_entry **curr;
69716+
69717+ entry->prev = NULL;
69718+
69719+ curr = &state->inodev_set.i_hash[index];
69720+ if (*curr != NULL)
69721+ (*curr)->prev = entry;
69722+
69723+ entry->next = *curr;
69724+ *curr = entry;
69725+
69726+ return;
69727+}
69728+
69729+static void
69730+insert_inodev_entry(struct inodev_entry *entry)
69731+{
69732+ __insert_inodev_entry(&running_polstate, entry);
69733+}
69734+
69735+void
69736+insert_acl_obj_label(struct acl_object_label *obj,
69737+ struct acl_subject_label *subj)
69738+{
69739+ unsigned int index =
69740+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
69741+ struct acl_object_label **curr;
69742+
69743+ obj->prev = NULL;
69744+
69745+ curr = &subj->obj_hash[index];
69746+ if (*curr != NULL)
69747+ (*curr)->prev = obj;
69748+
69749+ obj->next = *curr;
69750+ *curr = obj;
69751+
69752+ return;
69753+}
69754+
69755+void
69756+insert_acl_subj_label(struct acl_subject_label *obj,
69757+ struct acl_role_label *role)
69758+{
69759+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
69760+ struct acl_subject_label **curr;
69761+
69762+ obj->prev = NULL;
69763+
69764+ curr = &role->subj_hash[index];
69765+ if (*curr != NULL)
69766+ (*curr)->prev = obj;
69767+
69768+ obj->next = *curr;
69769+ *curr = obj;
69770+
69771+ return;
69772+}
69773+
69774+/* derived from glibc fnmatch() 0: match, 1: no match*/
69775+
69776+static int
69777+glob_match(const char *p, const char *n)
69778+{
69779+ char c;
69780+
69781+ while ((c = *p++) != '\0') {
69782+ switch (c) {
69783+ case '?':
69784+ if (*n == '\0')
69785+ return 1;
69786+ else if (*n == '/')
69787+ return 1;
69788+ break;
69789+ case '\\':
69790+ if (*n != c)
69791+ return 1;
69792+ break;
69793+ case '*':
69794+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
69795+ if (*n == '/')
69796+ return 1;
69797+ else if (c == '?') {
69798+ if (*n == '\0')
69799+ return 1;
69800+ else
69801+ ++n;
69802+ }
69803+ }
69804+ if (c == '\0') {
69805+ return 0;
69806+ } else {
69807+ const char *endp;
69808+
69809+ if ((endp = strchr(n, '/')) == NULL)
69810+ endp = n + strlen(n);
69811+
69812+ if (c == '[') {
69813+ for (--p; n < endp; ++n)
69814+ if (!glob_match(p, n))
69815+ return 0;
69816+ } else if (c == '/') {
69817+ while (*n != '\0' && *n != '/')
69818+ ++n;
69819+ if (*n == '/' && !glob_match(p, n + 1))
69820+ return 0;
69821+ } else {
69822+ for (--p; n < endp; ++n)
69823+ if (*n == c && !glob_match(p, n))
69824+ return 0;
69825+ }
69826+
69827+ return 1;
69828+ }
69829+ case '[':
69830+ {
69831+ int not;
69832+ char cold;
69833+
69834+ if (*n == '\0' || *n == '/')
69835+ return 1;
69836+
69837+ not = (*p == '!' || *p == '^');
69838+ if (not)
69839+ ++p;
69840+
69841+ c = *p++;
69842+ for (;;) {
69843+ unsigned char fn = (unsigned char)*n;
69844+
69845+ if (c == '\0')
69846+ return 1;
69847+ else {
69848+ if (c == fn)
69849+ goto matched;
69850+ cold = c;
69851+ c = *p++;
69852+
69853+ if (c == '-' && *p != ']') {
69854+ unsigned char cend = *p++;
69855+
69856+ if (cend == '\0')
69857+ return 1;
69858+
69859+ if (cold <= fn && fn <= cend)
69860+ goto matched;
69861+
69862+ c = *p++;
69863+ }
69864+ }
69865+
69866+ if (c == ']')
69867+ break;
69868+ }
69869+ if (!not)
69870+ return 1;
69871+ break;
69872+ matched:
69873+ while (c != ']') {
69874+ if (c == '\0')
69875+ return 1;
69876+
69877+ c = *p++;
69878+ }
69879+ if (not)
69880+ return 1;
69881+ }
69882+ break;
69883+ default:
69884+ if (c != *n)
69885+ return 1;
69886+ }
69887+
69888+ ++n;
69889+ }
69890+
69891+ if (*n == '\0')
69892+ return 0;
69893+
69894+ if (*n == '/')
69895+ return 0;
69896+
69897+ return 1;
69898+}
69899+
69900+static struct acl_object_label *
69901+chk_glob_label(struct acl_object_label *globbed,
69902+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
69903+{
69904+ struct acl_object_label *tmp;
69905+
69906+ if (*path == NULL)
69907+ *path = gr_to_filename_nolock(dentry, mnt);
69908+
69909+ tmp = globbed;
69910+
69911+ while (tmp) {
69912+ if (!glob_match(tmp->filename, *path))
69913+ return tmp;
69914+ tmp = tmp->next;
69915+ }
69916+
69917+ return NULL;
69918+}
69919+
69920+static struct acl_object_label *
69921+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
69922+ const ino_t curr_ino, const dev_t curr_dev,
69923+ const struct acl_subject_label *subj, char **path, const int checkglob)
69924+{
69925+ struct acl_subject_label *tmpsubj;
69926+ struct acl_object_label *retval;
69927+ struct acl_object_label *retval2;
69928+
69929+ tmpsubj = (struct acl_subject_label *) subj;
69930+ read_lock(&gr_inode_lock);
69931+ do {
69932+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
69933+ if (retval) {
69934+ if (checkglob && retval->globbed) {
69935+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
69936+ if (retval2)
69937+ retval = retval2;
69938+ }
69939+ break;
69940+ }
69941+ } while ((tmpsubj = tmpsubj->parent_subject));
69942+ read_unlock(&gr_inode_lock);
69943+
69944+ return retval;
69945+}
69946+
69947+static __inline__ struct acl_object_label *
69948+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
69949+ struct dentry *curr_dentry,
69950+ const struct acl_subject_label *subj, char **path, const int checkglob)
69951+{
69952+ int newglob = checkglob;
69953+ ino_t inode;
69954+ dev_t device;
69955+
69956+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
69957+ as we don't want a / * rule to match instead of the / object
69958+ don't do this for create lookups that call this function though, since they're looking up
69959+ on the parent and thus need globbing checks on all paths
69960+ */
69961+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
69962+ newglob = GR_NO_GLOB;
69963+
69964+ spin_lock(&curr_dentry->d_lock);
69965+ inode = curr_dentry->d_inode->i_ino;
69966+ device = __get_dev(curr_dentry);
69967+ spin_unlock(&curr_dentry->d_lock);
69968+
69969+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
69970+}
69971+
69972+#ifdef CONFIG_HUGETLBFS
69973+static inline bool
69974+is_hugetlbfs_mnt(const struct vfsmount *mnt)
69975+{
69976+ int i;
69977+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
69978+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
69979+ return true;
69980+ }
69981+
69982+ return false;
69983+}
69984+#endif
69985+
69986+static struct acl_object_label *
69987+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
69988+ const struct acl_subject_label *subj, char *path, const int checkglob)
69989+{
69990+ struct dentry *dentry = (struct dentry *) l_dentry;
69991+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
69992+ struct mount *real_mnt = real_mount(mnt);
69993+ struct acl_object_label *retval;
69994+ struct dentry *parent;
69995+
69996+ read_seqlock_excl(&mount_lock);
69997+ write_seqlock(&rename_lock);
69998+
69999+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
70000+#ifdef CONFIG_NET
70001+ mnt == sock_mnt ||
70002+#endif
70003+#ifdef CONFIG_HUGETLBFS
70004+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
70005+#endif
70006+ /* ignore Eric Biederman */
70007+ IS_PRIVATE(l_dentry->d_inode))) {
70008+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
70009+ goto out;
70010+ }
70011+
70012+ for (;;) {
70013+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70014+ break;
70015+
70016+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70017+ if (!mnt_has_parent(real_mnt))
70018+ break;
70019+
70020+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70021+ if (retval != NULL)
70022+ goto out;
70023+
70024+ dentry = real_mnt->mnt_mountpoint;
70025+ real_mnt = real_mnt->mnt_parent;
70026+ mnt = &real_mnt->mnt;
70027+ continue;
70028+ }
70029+
70030+ parent = dentry->d_parent;
70031+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70032+ if (retval != NULL)
70033+ goto out;
70034+
70035+ dentry = parent;
70036+ }
70037+
70038+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
70039+
70040+ /* gr_real_root is pinned so we don't have to hold a reference */
70041+ if (retval == NULL)
70042+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
70043+out:
70044+ write_sequnlock(&rename_lock);
70045+ read_sequnlock_excl(&mount_lock);
70046+
70047+ BUG_ON(retval == NULL);
70048+
70049+ return retval;
70050+}
70051+
70052+static __inline__ struct acl_object_label *
70053+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70054+ const struct acl_subject_label *subj)
70055+{
70056+ char *path = NULL;
70057+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
70058+}
70059+
70060+static __inline__ struct acl_object_label *
70061+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70062+ const struct acl_subject_label *subj)
70063+{
70064+ char *path = NULL;
70065+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
70066+}
70067+
70068+static __inline__ struct acl_object_label *
70069+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70070+ const struct acl_subject_label *subj, char *path)
70071+{
70072+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
70073+}
70074+
70075+struct acl_subject_label *
70076+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
70077+ const struct acl_role_label *role)
70078+{
70079+ struct dentry *dentry = (struct dentry *) l_dentry;
70080+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
70081+ struct mount *real_mnt = real_mount(mnt);
70082+ struct acl_subject_label *retval;
70083+ struct dentry *parent;
70084+
70085+ read_seqlock_excl(&mount_lock);
70086+ write_seqlock(&rename_lock);
70087+
70088+ for (;;) {
70089+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
70090+ break;
70091+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
70092+ if (!mnt_has_parent(real_mnt))
70093+ break;
70094+
70095+ spin_lock(&dentry->d_lock);
70096+ read_lock(&gr_inode_lock);
70097+ retval =
70098+ lookup_acl_subj_label(dentry->d_inode->i_ino,
70099+ __get_dev(dentry), role);
70100+ read_unlock(&gr_inode_lock);
70101+ spin_unlock(&dentry->d_lock);
70102+ if (retval != NULL)
70103+ goto out;
70104+
70105+ dentry = real_mnt->mnt_mountpoint;
70106+ real_mnt = real_mnt->mnt_parent;
70107+ mnt = &real_mnt->mnt;
70108+ continue;
70109+ }
70110+
70111+ spin_lock(&dentry->d_lock);
70112+ read_lock(&gr_inode_lock);
70113+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
70114+ __get_dev(dentry), role);
70115+ read_unlock(&gr_inode_lock);
70116+ parent = dentry->d_parent;
70117+ spin_unlock(&dentry->d_lock);
70118+
70119+ if (retval != NULL)
70120+ goto out;
70121+
70122+ dentry = parent;
70123+ }
70124+
70125+ spin_lock(&dentry->d_lock);
70126+ read_lock(&gr_inode_lock);
70127+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
70128+ __get_dev(dentry), role);
70129+ read_unlock(&gr_inode_lock);
70130+ spin_unlock(&dentry->d_lock);
70131+
70132+ if (unlikely(retval == NULL)) {
70133+ /* gr_real_root is pinned, we don't need to hold a reference */
70134+ read_lock(&gr_inode_lock);
70135+ retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino,
70136+ __get_dev(gr_real_root.dentry), role);
70137+ read_unlock(&gr_inode_lock);
70138+ }
70139+out:
70140+ write_sequnlock(&rename_lock);
70141+ read_sequnlock_excl(&mount_lock);
70142+
70143+ BUG_ON(retval == NULL);
70144+
70145+ return retval;
70146+}
70147+
70148+void
70149+assign_special_role(const char *rolename)
70150+{
70151+ struct acl_object_label *obj;
70152+ struct acl_role_label *r;
70153+ struct acl_role_label *assigned = NULL;
70154+ struct task_struct *tsk;
70155+ struct file *filp;
70156+
70157+ FOR_EACH_ROLE_START(r)
70158+ if (!strcmp(rolename, r->rolename) &&
70159+ (r->roletype & GR_ROLE_SPECIAL)) {
70160+ assigned = r;
70161+ break;
70162+ }
70163+ FOR_EACH_ROLE_END(r)
70164+
70165+ if (!assigned)
70166+ return;
70167+
70168+ read_lock(&tasklist_lock);
70169+ read_lock(&grsec_exec_file_lock);
70170+
70171+ tsk = current->real_parent;
70172+ if (tsk == NULL)
70173+ goto out_unlock;
70174+
70175+ filp = tsk->exec_file;
70176+ if (filp == NULL)
70177+ goto out_unlock;
70178+
70179+ tsk->is_writable = 0;
70180+ tsk->inherited = 0;
70181+
70182+ tsk->acl_sp_role = 1;
70183+ tsk->acl_role_id = ++acl_sp_role_value;
70184+ tsk->role = assigned;
70185+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
70186+
70187+ /* ignore additional mmap checks for processes that are writable
70188+ by the default ACL */
70189+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
70190+ if (unlikely(obj->mode & GR_WRITE))
70191+ tsk->is_writable = 1;
70192+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
70193+ if (unlikely(obj->mode & GR_WRITE))
70194+ tsk->is_writable = 1;
70195+
70196+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70197+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
70198+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
70199+#endif
70200+
70201+out_unlock:
70202+ read_unlock(&grsec_exec_file_lock);
70203+ read_unlock(&tasklist_lock);
70204+ return;
70205+}
70206+
70207+
70208+static void
70209+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
70210+{
70211+ struct task_struct *task = current;
70212+ const struct cred *cred = current_cred();
70213+
70214+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
70215+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70216+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70217+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
70218+
70219+ return;
70220+}
70221+
70222+static void
70223+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
70224+{
70225+ struct task_struct *task = current;
70226+ const struct cred *cred = current_cred();
70227+
70228+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70229+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70230+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70231+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
70232+
70233+ return;
70234+}
70235+
70236+static void
70237+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
70238+{
70239+ struct task_struct *task = current;
70240+ const struct cred *cred = current_cred();
70241+
70242+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
70243+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
70244+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
70245+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
70246+
70247+ return;
70248+}
70249+
70250+static void
70251+gr_set_proc_res(struct task_struct *task)
70252+{
70253+ struct acl_subject_label *proc;
70254+ unsigned short i;
70255+
70256+ proc = task->acl;
70257+
70258+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
70259+ return;
70260+
70261+ for (i = 0; i < RLIM_NLIMITS; i++) {
70262+ if (!(proc->resmask & (1U << i)))
70263+ continue;
70264+
70265+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
70266+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
70267+
70268+ if (i == RLIMIT_CPU)
70269+ update_rlimit_cpu(task, proc->res[i].rlim_cur);
70270+ }
70271+
70272+ return;
70273+}
70274+
70275+/* both of the below must be called with
70276+ rcu_read_lock();
70277+ read_lock(&tasklist_lock);
70278+ read_lock(&grsec_exec_file_lock);
70279+*/
70280+
70281+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
70282+{
70283+ char *tmpname;
70284+ struct acl_subject_label *tmpsubj;
70285+ struct file *filp;
70286+ struct name_entry *nmatch;
70287+
70288+ filp = task->exec_file;
70289+ if (filp == NULL)
70290+ return NULL;
70291+
70292+ /* the following is to apply the correct subject
70293+ on binaries running when the RBAC system
70294+ is enabled, when the binaries have been
70295+ replaced or deleted since their execution
70296+ -----
70297+ when the RBAC system starts, the inode/dev
70298+ from exec_file will be one the RBAC system
70299+ is unaware of. It only knows the inode/dev
70300+ of the present file on disk, or the absence
70301+ of it.
70302+ */
70303+
70304+ if (filename)
70305+ nmatch = __lookup_name_entry(state, filename);
70306+ else {
70307+ preempt_disable();
70308+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
70309+
70310+ nmatch = __lookup_name_entry(state, tmpname);
70311+ preempt_enable();
70312+ }
70313+ tmpsubj = NULL;
70314+ if (nmatch) {
70315+ if (nmatch->deleted)
70316+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
70317+ else
70318+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
70319+ }
70320+ /* this also works for the reload case -- if we don't match a potentially inherited subject
70321+ then we fall back to a normal lookup based on the binary's ino/dev
70322+ */
70323+ if (tmpsubj == NULL)
70324+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
70325+
70326+ return tmpsubj;
70327+}
70328+
70329+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
70330+{
70331+ return __gr_get_subject_for_task(&running_polstate, task, filename);
70332+}
70333+
70334+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
70335+{
70336+ struct acl_object_label *obj;
70337+ struct file *filp;
70338+
70339+ filp = task->exec_file;
70340+
70341+ task->acl = subj;
70342+ task->is_writable = 0;
70343+ /* ignore additional mmap checks for processes that are writable
70344+ by the default ACL */
70345+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
70346+ if (unlikely(obj->mode & GR_WRITE))
70347+ task->is_writable = 1;
70348+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
70349+ if (unlikely(obj->mode & GR_WRITE))
70350+ task->is_writable = 1;
70351+
70352+ gr_set_proc_res(task);
70353+
70354+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70355+ 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);
70356+#endif
70357+}
70358+
70359+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
70360+{
70361+ __gr_apply_subject_to_task(&running_polstate, task, subj);
70362+}
70363+
70364+__u32
70365+gr_search_file(const struct dentry * dentry, const __u32 mode,
70366+ const struct vfsmount * mnt)
70367+{
70368+ __u32 retval = mode;
70369+ struct acl_subject_label *curracl;
70370+ struct acl_object_label *currobj;
70371+
70372+ if (unlikely(!(gr_status & GR_READY)))
70373+ return (mode & ~GR_AUDITS);
70374+
70375+ curracl = current->acl;
70376+
70377+ currobj = chk_obj_label(dentry, mnt, curracl);
70378+ retval = currobj->mode & mode;
70379+
70380+ /* if we're opening a specified transfer file for writing
70381+ (e.g. /dev/initctl), then transfer our role to init
70382+ */
70383+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
70384+ current->role->roletype & GR_ROLE_PERSIST)) {
70385+ struct task_struct *task = init_pid_ns.child_reaper;
70386+
70387+ if (task->role != current->role) {
70388+ struct acl_subject_label *subj;
70389+
70390+ task->acl_sp_role = 0;
70391+ task->acl_role_id = current->acl_role_id;
70392+ task->role = current->role;
70393+ rcu_read_lock();
70394+ read_lock(&grsec_exec_file_lock);
70395+ subj = gr_get_subject_for_task(task, NULL);
70396+ gr_apply_subject_to_task(task, subj);
70397+ read_unlock(&grsec_exec_file_lock);
70398+ rcu_read_unlock();
70399+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
70400+ }
70401+ }
70402+
70403+ if (unlikely
70404+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
70405+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
70406+ __u32 new_mode = mode;
70407+
70408+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
70409+
70410+ retval = new_mode;
70411+
70412+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
70413+ new_mode |= GR_INHERIT;
70414+
70415+ if (!(mode & GR_NOLEARN))
70416+ gr_log_learn(dentry, mnt, new_mode);
70417+ }
70418+
70419+ return retval;
70420+}
70421+
70422+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
70423+ const struct dentry *parent,
70424+ const struct vfsmount *mnt)
70425+{
70426+ struct name_entry *match;
70427+ struct acl_object_label *matchpo;
70428+ struct acl_subject_label *curracl;
70429+ char *path;
70430+
70431+ if (unlikely(!(gr_status & GR_READY)))
70432+ return NULL;
70433+
70434+ preempt_disable();
70435+ path = gr_to_filename_rbac(new_dentry, mnt);
70436+ match = lookup_name_entry_create(path);
70437+
70438+ curracl = current->acl;
70439+
70440+ if (match) {
70441+ read_lock(&gr_inode_lock);
70442+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
70443+ read_unlock(&gr_inode_lock);
70444+
70445+ if (matchpo) {
70446+ preempt_enable();
70447+ return matchpo;
70448+ }
70449+ }
70450+
70451+ // lookup parent
70452+
70453+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
70454+
70455+ preempt_enable();
70456+ return matchpo;
70457+}
70458+
70459+__u32
70460+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
70461+ const struct vfsmount * mnt, const __u32 mode)
70462+{
70463+ struct acl_object_label *matchpo;
70464+ __u32 retval;
70465+
70466+ if (unlikely(!(gr_status & GR_READY)))
70467+ return (mode & ~GR_AUDITS);
70468+
70469+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
70470+
70471+ retval = matchpo->mode & mode;
70472+
70473+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
70474+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
70475+ __u32 new_mode = mode;
70476+
70477+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
70478+
70479+ gr_log_learn(new_dentry, mnt, new_mode);
70480+ return new_mode;
70481+ }
70482+
70483+ return retval;
70484+}
70485+
70486+__u32
70487+gr_check_link(const struct dentry * new_dentry,
70488+ const struct dentry * parent_dentry,
70489+ const struct vfsmount * parent_mnt,
70490+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
70491+{
70492+ struct acl_object_label *obj;
70493+ __u32 oldmode, newmode;
70494+ __u32 needmode;
70495+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
70496+ GR_DELETE | GR_INHERIT;
70497+
70498+ if (unlikely(!(gr_status & GR_READY)))
70499+ return (GR_CREATE | GR_LINK);
70500+
70501+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
70502+ oldmode = obj->mode;
70503+
70504+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
70505+ newmode = obj->mode;
70506+
70507+ needmode = newmode & checkmodes;
70508+
70509+ // old name for hardlink must have at least the permissions of the new name
70510+ if ((oldmode & needmode) != needmode)
70511+ goto bad;
70512+
70513+ // if old name had restrictions/auditing, make sure the new name does as well
70514+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
70515+
70516+ // don't allow hardlinking of suid/sgid/fcapped files without permission
70517+ if (is_privileged_binary(old_dentry))
70518+ needmode |= GR_SETID;
70519+
70520+ if ((newmode & needmode) != needmode)
70521+ goto bad;
70522+
70523+ // enforce minimum permissions
70524+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
70525+ return newmode;
70526+bad:
70527+ needmode = oldmode;
70528+ if (is_privileged_binary(old_dentry))
70529+ needmode |= GR_SETID;
70530+
70531+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
70532+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
70533+ return (GR_CREATE | GR_LINK);
70534+ } else if (newmode & GR_SUPPRESS)
70535+ return GR_SUPPRESS;
70536+ else
70537+ return 0;
70538+}
70539+
70540+int
70541+gr_check_hidden_task(const struct task_struct *task)
70542+{
70543+ if (unlikely(!(gr_status & GR_READY)))
70544+ return 0;
70545+
70546+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
70547+ return 1;
70548+
70549+ return 0;
70550+}
70551+
70552+int
70553+gr_check_protected_task(const struct task_struct *task)
70554+{
70555+ if (unlikely(!(gr_status & GR_READY) || !task))
70556+ return 0;
70557+
70558+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
70559+ task->acl != current->acl)
70560+ return 1;
70561+
70562+ return 0;
70563+}
70564+
70565+int
70566+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
70567+{
70568+ struct task_struct *p;
70569+ int ret = 0;
70570+
70571+ if (unlikely(!(gr_status & GR_READY) || !pid))
70572+ return ret;
70573+
70574+ read_lock(&tasklist_lock);
70575+ do_each_pid_task(pid, type, p) {
70576+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
70577+ p->acl != current->acl) {
70578+ ret = 1;
70579+ goto out;
70580+ }
70581+ } while_each_pid_task(pid, type, p);
70582+out:
70583+ read_unlock(&tasklist_lock);
70584+
70585+ return ret;
70586+}
70587+
70588+void
70589+gr_copy_label(struct task_struct *tsk)
70590+{
70591+ struct task_struct *p = current;
70592+
70593+ tsk->inherited = p->inherited;
70594+ tsk->acl_sp_role = 0;
70595+ tsk->acl_role_id = p->acl_role_id;
70596+ tsk->acl = p->acl;
70597+ tsk->role = p->role;
70598+ tsk->signal->used_accept = 0;
70599+ tsk->signal->curr_ip = p->signal->curr_ip;
70600+ tsk->signal->saved_ip = p->signal->saved_ip;
70601+ if (p->exec_file)
70602+ get_file(p->exec_file);
70603+ tsk->exec_file = p->exec_file;
70604+ tsk->is_writable = p->is_writable;
70605+ if (unlikely(p->signal->used_accept)) {
70606+ p->signal->curr_ip = 0;
70607+ p->signal->saved_ip = 0;
70608+ }
70609+
70610+ return;
70611+}
70612+
70613+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
70614+
70615+int
70616+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
70617+{
70618+ unsigned int i;
70619+ __u16 num;
70620+ uid_t *uidlist;
70621+ uid_t curuid;
70622+ int realok = 0;
70623+ int effectiveok = 0;
70624+ int fsok = 0;
70625+ uid_t globalreal, globaleffective, globalfs;
70626+
70627+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
70628+ struct user_struct *user;
70629+
70630+ if (!uid_valid(real))
70631+ goto skipit;
70632+
70633+ /* find user based on global namespace */
70634+
70635+ globalreal = GR_GLOBAL_UID(real);
70636+
70637+ user = find_user(make_kuid(&init_user_ns, globalreal));
70638+ if (user == NULL)
70639+ goto skipit;
70640+
70641+ if (gr_process_kernel_setuid_ban(user)) {
70642+ /* for find_user */
70643+ free_uid(user);
70644+ return 1;
70645+ }
70646+
70647+ /* for find_user */
70648+ free_uid(user);
70649+
70650+skipit:
70651+#endif
70652+
70653+ if (unlikely(!(gr_status & GR_READY)))
70654+ return 0;
70655+
70656+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
70657+ gr_log_learn_uid_change(real, effective, fs);
70658+
70659+ num = current->acl->user_trans_num;
70660+ uidlist = current->acl->user_transitions;
70661+
70662+ if (uidlist == NULL)
70663+ return 0;
70664+
70665+ if (!uid_valid(real)) {
70666+ realok = 1;
70667+ globalreal = (uid_t)-1;
70668+ } else {
70669+ globalreal = GR_GLOBAL_UID(real);
70670+ }
70671+ if (!uid_valid(effective)) {
70672+ effectiveok = 1;
70673+ globaleffective = (uid_t)-1;
70674+ } else {
70675+ globaleffective = GR_GLOBAL_UID(effective);
70676+ }
70677+ if (!uid_valid(fs)) {
70678+ fsok = 1;
70679+ globalfs = (uid_t)-1;
70680+ } else {
70681+ globalfs = GR_GLOBAL_UID(fs);
70682+ }
70683+
70684+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
70685+ for (i = 0; i < num; i++) {
70686+ curuid = uidlist[i];
70687+ if (globalreal == curuid)
70688+ realok = 1;
70689+ if (globaleffective == curuid)
70690+ effectiveok = 1;
70691+ if (globalfs == curuid)
70692+ fsok = 1;
70693+ }
70694+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
70695+ for (i = 0; i < num; i++) {
70696+ curuid = uidlist[i];
70697+ if (globalreal == curuid)
70698+ break;
70699+ if (globaleffective == curuid)
70700+ break;
70701+ if (globalfs == curuid)
70702+ break;
70703+ }
70704+ /* not in deny list */
70705+ if (i == num) {
70706+ realok = 1;
70707+ effectiveok = 1;
70708+ fsok = 1;
70709+ }
70710+ }
70711+
70712+ if (realok && effectiveok && fsok)
70713+ return 0;
70714+ else {
70715+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
70716+ return 1;
70717+ }
70718+}
70719+
70720+int
70721+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
70722+{
70723+ unsigned int i;
70724+ __u16 num;
70725+ gid_t *gidlist;
70726+ gid_t curgid;
70727+ int realok = 0;
70728+ int effectiveok = 0;
70729+ int fsok = 0;
70730+ gid_t globalreal, globaleffective, globalfs;
70731+
70732+ if (unlikely(!(gr_status & GR_READY)))
70733+ return 0;
70734+
70735+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
70736+ gr_log_learn_gid_change(real, effective, fs);
70737+
70738+ num = current->acl->group_trans_num;
70739+ gidlist = current->acl->group_transitions;
70740+
70741+ if (gidlist == NULL)
70742+ return 0;
70743+
70744+ if (!gid_valid(real)) {
70745+ realok = 1;
70746+ globalreal = (gid_t)-1;
70747+ } else {
70748+ globalreal = GR_GLOBAL_GID(real);
70749+ }
70750+ if (!gid_valid(effective)) {
70751+ effectiveok = 1;
70752+ globaleffective = (gid_t)-1;
70753+ } else {
70754+ globaleffective = GR_GLOBAL_GID(effective);
70755+ }
70756+ if (!gid_valid(fs)) {
70757+ fsok = 1;
70758+ globalfs = (gid_t)-1;
70759+ } else {
70760+ globalfs = GR_GLOBAL_GID(fs);
70761+ }
70762+
70763+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
70764+ for (i = 0; i < num; i++) {
70765+ curgid = gidlist[i];
70766+ if (globalreal == curgid)
70767+ realok = 1;
70768+ if (globaleffective == curgid)
70769+ effectiveok = 1;
70770+ if (globalfs == curgid)
70771+ fsok = 1;
70772+ }
70773+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
70774+ for (i = 0; i < num; i++) {
70775+ curgid = gidlist[i];
70776+ if (globalreal == curgid)
70777+ break;
70778+ if (globaleffective == curgid)
70779+ break;
70780+ if (globalfs == curgid)
70781+ break;
70782+ }
70783+ /* not in deny list */
70784+ if (i == num) {
70785+ realok = 1;
70786+ effectiveok = 1;
70787+ fsok = 1;
70788+ }
70789+ }
70790+
70791+ if (realok && effectiveok && fsok)
70792+ return 0;
70793+ else {
70794+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
70795+ return 1;
70796+ }
70797+}
70798+
70799+extern int gr_acl_is_capable(const int cap);
70800+
70801+void
70802+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
70803+{
70804+ struct acl_role_label *role = task->role;
70805+ struct acl_subject_label *subj = NULL;
70806+ struct acl_object_label *obj;
70807+ struct file *filp;
70808+ uid_t uid;
70809+ gid_t gid;
70810+
70811+ if (unlikely(!(gr_status & GR_READY)))
70812+ return;
70813+
70814+ uid = GR_GLOBAL_UID(kuid);
70815+ gid = GR_GLOBAL_GID(kgid);
70816+
70817+ filp = task->exec_file;
70818+
70819+ /* kernel process, we'll give them the kernel role */
70820+ if (unlikely(!filp)) {
70821+ task->role = running_polstate.kernel_role;
70822+ task->acl = running_polstate.kernel_role->root_label;
70823+ return;
70824+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
70825+ /* save the current ip at time of role lookup so that the proper
70826+ IP will be learned for role_allowed_ip */
70827+ task->signal->saved_ip = task->signal->curr_ip;
70828+ role = lookup_acl_role_label(task, uid, gid);
70829+ }
70830+
70831+ /* don't change the role if we're not a privileged process */
70832+ if (role && task->role != role &&
70833+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
70834+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
70835+ return;
70836+
70837+ /* perform subject lookup in possibly new role
70838+ we can use this result below in the case where role == task->role
70839+ */
70840+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
70841+
70842+ /* if we changed uid/gid, but result in the same role
70843+ and are using inheritance, don't lose the inherited subject
70844+ if current subject is other than what normal lookup
70845+ would result in, we arrived via inheritance, don't
70846+ lose subject
70847+ */
70848+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
70849+ (subj == task->acl)))
70850+ task->acl = subj;
70851+
70852+ /* leave task->inherited unaffected */
70853+
70854+ task->role = role;
70855+
70856+ task->is_writable = 0;
70857+
70858+ /* ignore additional mmap checks for processes that are writable
70859+ by the default ACL */
70860+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
70861+ if (unlikely(obj->mode & GR_WRITE))
70862+ task->is_writable = 1;
70863+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
70864+ if (unlikely(obj->mode & GR_WRITE))
70865+ task->is_writable = 1;
70866+
70867+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70868+ 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);
70869+#endif
70870+
70871+ gr_set_proc_res(task);
70872+
70873+ return;
70874+}
70875+
70876+int
70877+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
70878+ const int unsafe_flags)
70879+{
70880+ struct task_struct *task = current;
70881+ struct acl_subject_label *newacl;
70882+ struct acl_object_label *obj;
70883+ __u32 retmode;
70884+
70885+ if (unlikely(!(gr_status & GR_READY)))
70886+ return 0;
70887+
70888+ newacl = chk_subj_label(dentry, mnt, task->role);
70889+
70890+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
70891+ did an exec
70892+ */
70893+ rcu_read_lock();
70894+ read_lock(&tasklist_lock);
70895+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
70896+ (task->parent->acl->mode & GR_POVERRIDE))) {
70897+ read_unlock(&tasklist_lock);
70898+ rcu_read_unlock();
70899+ goto skip_check;
70900+ }
70901+ read_unlock(&tasklist_lock);
70902+ rcu_read_unlock();
70903+
70904+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
70905+ !(task->role->roletype & GR_ROLE_GOD) &&
70906+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
70907+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
70908+ if (unsafe_flags & LSM_UNSAFE_SHARE)
70909+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
70910+ else
70911+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
70912+ return -EACCES;
70913+ }
70914+
70915+skip_check:
70916+
70917+ obj = chk_obj_label(dentry, mnt, task->acl);
70918+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
70919+
70920+ if (!(task->acl->mode & GR_INHERITLEARN) &&
70921+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
70922+ if (obj->nested)
70923+ task->acl = obj->nested;
70924+ else
70925+ task->acl = newacl;
70926+ task->inherited = 0;
70927+ } else {
70928+ task->inherited = 1;
70929+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
70930+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
70931+ }
70932+
70933+ task->is_writable = 0;
70934+
70935+ /* ignore additional mmap checks for processes that are writable
70936+ by the default ACL */
70937+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
70938+ if (unlikely(obj->mode & GR_WRITE))
70939+ task->is_writable = 1;
70940+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
70941+ if (unlikely(obj->mode & GR_WRITE))
70942+ task->is_writable = 1;
70943+
70944+ gr_set_proc_res(task);
70945+
70946+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
70947+ 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);
70948+#endif
70949+ return 0;
70950+}
70951+
70952+/* always called with valid inodev ptr */
70953+static void
70954+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
70955+{
70956+ struct acl_object_label *matchpo;
70957+ struct acl_subject_label *matchps;
70958+ struct acl_subject_label *subj;
70959+ struct acl_role_label *role;
70960+ unsigned int x;
70961+
70962+ FOR_EACH_ROLE_START(role)
70963+ FOR_EACH_SUBJECT_START(role, subj, x)
70964+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
70965+ matchpo->mode |= GR_DELETED;
70966+ FOR_EACH_SUBJECT_END(subj,x)
70967+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
70968+ /* nested subjects aren't in the role's subj_hash table */
70969+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
70970+ matchpo->mode |= GR_DELETED;
70971+ FOR_EACH_NESTED_SUBJECT_END(subj)
70972+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
70973+ matchps->mode |= GR_DELETED;
70974+ FOR_EACH_ROLE_END(role)
70975+
70976+ inodev->nentry->deleted = 1;
70977+
70978+ return;
70979+}
70980+
70981+void
70982+gr_handle_delete(const ino_t ino, const dev_t dev)
70983+{
70984+ struct inodev_entry *inodev;
70985+
70986+ if (unlikely(!(gr_status & GR_READY)))
70987+ return;
70988+
70989+ write_lock(&gr_inode_lock);
70990+ inodev = lookup_inodev_entry(ino, dev);
70991+ if (inodev != NULL)
70992+ do_handle_delete(inodev, ino, dev);
70993+ write_unlock(&gr_inode_lock);
70994+
70995+ return;
70996+}
70997+
70998+static void
70999+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
71000+ const ino_t newinode, const dev_t newdevice,
71001+ struct acl_subject_label *subj)
71002+{
71003+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
71004+ struct acl_object_label *match;
71005+
71006+ match = subj->obj_hash[index];
71007+
71008+ while (match && (match->inode != oldinode ||
71009+ match->device != olddevice ||
71010+ !(match->mode & GR_DELETED)))
71011+ match = match->next;
71012+
71013+ if (match && (match->inode == oldinode)
71014+ && (match->device == olddevice)
71015+ && (match->mode & GR_DELETED)) {
71016+ if (match->prev == NULL) {
71017+ subj->obj_hash[index] = match->next;
71018+ if (match->next != NULL)
71019+ match->next->prev = NULL;
71020+ } else {
71021+ match->prev->next = match->next;
71022+ if (match->next != NULL)
71023+ match->next->prev = match->prev;
71024+ }
71025+ match->prev = NULL;
71026+ match->next = NULL;
71027+ match->inode = newinode;
71028+ match->device = newdevice;
71029+ match->mode &= ~GR_DELETED;
71030+
71031+ insert_acl_obj_label(match, subj);
71032+ }
71033+
71034+ return;
71035+}
71036+
71037+static void
71038+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
71039+ const ino_t newinode, const dev_t newdevice,
71040+ struct acl_role_label *role)
71041+{
71042+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
71043+ struct acl_subject_label *match;
71044+
71045+ match = role->subj_hash[index];
71046+
71047+ while (match && (match->inode != oldinode ||
71048+ match->device != olddevice ||
71049+ !(match->mode & GR_DELETED)))
71050+ match = match->next;
71051+
71052+ if (match && (match->inode == oldinode)
71053+ && (match->device == olddevice)
71054+ && (match->mode & GR_DELETED)) {
71055+ if (match->prev == NULL) {
71056+ role->subj_hash[index] = match->next;
71057+ if (match->next != NULL)
71058+ match->next->prev = NULL;
71059+ } else {
71060+ match->prev->next = match->next;
71061+ if (match->next != NULL)
71062+ match->next->prev = match->prev;
71063+ }
71064+ match->prev = NULL;
71065+ match->next = NULL;
71066+ match->inode = newinode;
71067+ match->device = newdevice;
71068+ match->mode &= ~GR_DELETED;
71069+
71070+ insert_acl_subj_label(match, role);
71071+ }
71072+
71073+ return;
71074+}
71075+
71076+static void
71077+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
71078+ const ino_t newinode, const dev_t newdevice)
71079+{
71080+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
71081+ struct inodev_entry *match;
71082+
71083+ match = running_polstate.inodev_set.i_hash[index];
71084+
71085+ while (match && (match->nentry->inode != oldinode ||
71086+ match->nentry->device != olddevice || !match->nentry->deleted))
71087+ match = match->next;
71088+
71089+ if (match && (match->nentry->inode == oldinode)
71090+ && (match->nentry->device == olddevice) &&
71091+ match->nentry->deleted) {
71092+ if (match->prev == NULL) {
71093+ running_polstate.inodev_set.i_hash[index] = match->next;
71094+ if (match->next != NULL)
71095+ match->next->prev = NULL;
71096+ } else {
71097+ match->prev->next = match->next;
71098+ if (match->next != NULL)
71099+ match->next->prev = match->prev;
71100+ }
71101+ match->prev = NULL;
71102+ match->next = NULL;
71103+ match->nentry->inode = newinode;
71104+ match->nentry->device = newdevice;
71105+ match->nentry->deleted = 0;
71106+
71107+ insert_inodev_entry(match);
71108+ }
71109+
71110+ return;
71111+}
71112+
71113+static void
71114+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
71115+{
71116+ struct acl_subject_label *subj;
71117+ struct acl_role_label *role;
71118+ unsigned int x;
71119+
71120+ FOR_EACH_ROLE_START(role)
71121+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
71122+
71123+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
71124+ if ((subj->inode == ino) && (subj->device == dev)) {
71125+ subj->inode = ino;
71126+ subj->device = dev;
71127+ }
71128+ /* nested subjects aren't in the role's subj_hash table */
71129+ update_acl_obj_label(matchn->inode, matchn->device,
71130+ ino, dev, subj);
71131+ FOR_EACH_NESTED_SUBJECT_END(subj)
71132+ FOR_EACH_SUBJECT_START(role, subj, x)
71133+ update_acl_obj_label(matchn->inode, matchn->device,
71134+ ino, dev, subj);
71135+ FOR_EACH_SUBJECT_END(subj,x)
71136+ FOR_EACH_ROLE_END(role)
71137+
71138+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
71139+
71140+ return;
71141+}
71142+
71143+static void
71144+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
71145+ const struct vfsmount *mnt)
71146+{
71147+ ino_t ino = dentry->d_inode->i_ino;
71148+ dev_t dev = __get_dev(dentry);
71149+
71150+ __do_handle_create(matchn, ino, dev);
71151+
71152+ return;
71153+}
71154+
71155+void
71156+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
71157+{
71158+ struct name_entry *matchn;
71159+
71160+ if (unlikely(!(gr_status & GR_READY)))
71161+ return;
71162+
71163+ preempt_disable();
71164+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
71165+
71166+ if (unlikely((unsigned long)matchn)) {
71167+ write_lock(&gr_inode_lock);
71168+ do_handle_create(matchn, dentry, mnt);
71169+ write_unlock(&gr_inode_lock);
71170+ }
71171+ preempt_enable();
71172+
71173+ return;
71174+}
71175+
71176+void
71177+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
71178+{
71179+ struct name_entry *matchn;
71180+
71181+ if (unlikely(!(gr_status & GR_READY)))
71182+ return;
71183+
71184+ preempt_disable();
71185+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
71186+
71187+ if (unlikely((unsigned long)matchn)) {
71188+ write_lock(&gr_inode_lock);
71189+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
71190+ write_unlock(&gr_inode_lock);
71191+ }
71192+ preempt_enable();
71193+
71194+ return;
71195+}
71196+
71197+void
71198+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
71199+ struct dentry *old_dentry,
71200+ struct dentry *new_dentry,
71201+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
71202+{
71203+ struct name_entry *matchn;
71204+ struct name_entry *matchn2 = NULL;
71205+ struct inodev_entry *inodev;
71206+ struct inode *inode = new_dentry->d_inode;
71207+ ino_t old_ino = old_dentry->d_inode->i_ino;
71208+ dev_t old_dev = __get_dev(old_dentry);
71209+ unsigned int exchange = flags & RENAME_EXCHANGE;
71210+
71211+ /* vfs_rename swaps the name and parent link for old_dentry and
71212+ new_dentry
71213+ at this point, old_dentry has the new name, parent link, and inode
71214+ for the renamed file
71215+ if a file is being replaced by a rename, new_dentry has the inode
71216+ and name for the replaced file
71217+ */
71218+
71219+ if (unlikely(!(gr_status & GR_READY)))
71220+ return;
71221+
71222+ preempt_disable();
71223+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
71224+
71225+ /* exchange cases:
71226+ a filename exists for the source, but not dest
71227+ do a recreate on source
71228+ a filename exists for the dest, but not source
71229+ do a recreate on dest
71230+ a filename exists for both source and dest
71231+ delete source and dest, then create source and dest
71232+ a filename exists for neither source nor dest
71233+ no updates needed
71234+
71235+ the name entry lookups get us the old inode/dev associated with
71236+ each name, so do the deletes first (if possible) so that when
71237+ we do the create, we pick up on the right entries
71238+ */
71239+
71240+ if (exchange)
71241+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
71242+
71243+ /* we wouldn't have to check d_inode if it weren't for
71244+ NFS silly-renaming
71245+ */
71246+
71247+ write_lock(&gr_inode_lock);
71248+ if (unlikely((replace || exchange) && inode)) {
71249+ ino_t new_ino = inode->i_ino;
71250+ dev_t new_dev = __get_dev(new_dentry);
71251+
71252+ inodev = lookup_inodev_entry(new_ino, new_dev);
71253+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
71254+ do_handle_delete(inodev, new_ino, new_dev);
71255+ }
71256+
71257+ inodev = lookup_inodev_entry(old_ino, old_dev);
71258+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
71259+ do_handle_delete(inodev, old_ino, old_dev);
71260+
71261+ if (unlikely(matchn != NULL))
71262+ do_handle_create(matchn, old_dentry, mnt);
71263+
71264+ if (unlikely(matchn2 != NULL))
71265+ do_handle_create(matchn2, new_dentry, mnt);
71266+
71267+ write_unlock(&gr_inode_lock);
71268+ preempt_enable();
71269+
71270+ return;
71271+}
71272+
71273+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
71274+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
71275+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
71276+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
71277+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
71278+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
71279+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
71280+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
71281+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
71282+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
71283+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
71284+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
71285+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
71286+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
71287+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
71288+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
71289+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
71290+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
71291+};
71292+
71293+void
71294+gr_learn_resource(const struct task_struct *task,
71295+ const int res, const unsigned long wanted, const int gt)
71296+{
71297+ struct acl_subject_label *acl;
71298+ const struct cred *cred;
71299+
71300+ if (unlikely((gr_status & GR_READY) &&
71301+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
71302+ goto skip_reslog;
71303+
71304+ gr_log_resource(task, res, wanted, gt);
71305+skip_reslog:
71306+
71307+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
71308+ return;
71309+
71310+ acl = task->acl;
71311+
71312+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
71313+ !(acl->resmask & (1U << (unsigned short) res))))
71314+ return;
71315+
71316+ if (wanted >= acl->res[res].rlim_cur) {
71317+ unsigned long res_add;
71318+
71319+ res_add = wanted + res_learn_bumps[res];
71320+
71321+ acl->res[res].rlim_cur = res_add;
71322+
71323+ if (wanted > acl->res[res].rlim_max)
71324+ acl->res[res].rlim_max = res_add;
71325+
71326+ /* only log the subject filename, since resource logging is supported for
71327+ single-subject learning only */
71328+ rcu_read_lock();
71329+ cred = __task_cred(task);
71330+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
71331+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
71332+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
71333+ "", (unsigned long) res, &task->signal->saved_ip);
71334+ rcu_read_unlock();
71335+ }
71336+
71337+ return;
71338+}
71339+EXPORT_SYMBOL_GPL(gr_learn_resource);
71340+#endif
71341+
71342+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
71343+void
71344+pax_set_initial_flags(struct linux_binprm *bprm)
71345+{
71346+ struct task_struct *task = current;
71347+ struct acl_subject_label *proc;
71348+ unsigned long flags;
71349+
71350+ if (unlikely(!(gr_status & GR_READY)))
71351+ return;
71352+
71353+ flags = pax_get_flags(task);
71354+
71355+ proc = task->acl;
71356+
71357+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
71358+ flags &= ~MF_PAX_PAGEEXEC;
71359+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
71360+ flags &= ~MF_PAX_SEGMEXEC;
71361+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
71362+ flags &= ~MF_PAX_RANDMMAP;
71363+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
71364+ flags &= ~MF_PAX_EMUTRAMP;
71365+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
71366+ flags &= ~MF_PAX_MPROTECT;
71367+
71368+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
71369+ flags |= MF_PAX_PAGEEXEC;
71370+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
71371+ flags |= MF_PAX_SEGMEXEC;
71372+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
71373+ flags |= MF_PAX_RANDMMAP;
71374+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
71375+ flags |= MF_PAX_EMUTRAMP;
71376+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
71377+ flags |= MF_PAX_MPROTECT;
71378+
71379+ pax_set_flags(task, flags);
71380+
71381+ return;
71382+}
71383+#endif
71384+
71385+int
71386+gr_handle_proc_ptrace(struct task_struct *task)
71387+{
71388+ struct file *filp;
71389+ struct task_struct *tmp = task;
71390+ struct task_struct *curtemp = current;
71391+ __u32 retmode;
71392+
71393+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
71394+ if (unlikely(!(gr_status & GR_READY)))
71395+ return 0;
71396+#endif
71397+
71398+ read_lock(&tasklist_lock);
71399+ read_lock(&grsec_exec_file_lock);
71400+ filp = task->exec_file;
71401+
71402+ while (task_pid_nr(tmp) > 0) {
71403+ if (tmp == curtemp)
71404+ break;
71405+ tmp = tmp->real_parent;
71406+ }
71407+
71408+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
71409+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
71410+ read_unlock(&grsec_exec_file_lock);
71411+ read_unlock(&tasklist_lock);
71412+ return 1;
71413+ }
71414+
71415+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71416+ if (!(gr_status & GR_READY)) {
71417+ read_unlock(&grsec_exec_file_lock);
71418+ read_unlock(&tasklist_lock);
71419+ return 0;
71420+ }
71421+#endif
71422+
71423+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
71424+ read_unlock(&grsec_exec_file_lock);
71425+ read_unlock(&tasklist_lock);
71426+
71427+ if (retmode & GR_NOPTRACE)
71428+ return 1;
71429+
71430+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
71431+ && (current->acl != task->acl || (current->acl != current->role->root_label
71432+ && task_pid_nr(current) != task_pid_nr(task))))
71433+ return 1;
71434+
71435+ return 0;
71436+}
71437+
71438+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
71439+{
71440+ if (unlikely(!(gr_status & GR_READY)))
71441+ return;
71442+
71443+ if (!(current->role->roletype & GR_ROLE_GOD))
71444+ return;
71445+
71446+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
71447+ p->role->rolename, gr_task_roletype_to_char(p),
71448+ p->acl->filename);
71449+}
71450+
71451+int
71452+gr_handle_ptrace(struct task_struct *task, const long request)
71453+{
71454+ struct task_struct *tmp = task;
71455+ struct task_struct *curtemp = current;
71456+ __u32 retmode;
71457+
71458+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
71459+ if (unlikely(!(gr_status & GR_READY)))
71460+ return 0;
71461+#endif
71462+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
71463+ read_lock(&tasklist_lock);
71464+ while (task_pid_nr(tmp) > 0) {
71465+ if (tmp == curtemp)
71466+ break;
71467+ tmp = tmp->real_parent;
71468+ }
71469+
71470+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
71471+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
71472+ read_unlock(&tasklist_lock);
71473+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71474+ return 1;
71475+ }
71476+ read_unlock(&tasklist_lock);
71477+ }
71478+
71479+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
71480+ if (!(gr_status & GR_READY))
71481+ return 0;
71482+#endif
71483+
71484+ read_lock(&grsec_exec_file_lock);
71485+ if (unlikely(!task->exec_file)) {
71486+ read_unlock(&grsec_exec_file_lock);
71487+ return 0;
71488+ }
71489+
71490+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
71491+ read_unlock(&grsec_exec_file_lock);
71492+
71493+ if (retmode & GR_NOPTRACE) {
71494+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71495+ return 1;
71496+ }
71497+
71498+ if (retmode & GR_PTRACERD) {
71499+ switch (request) {
71500+ case PTRACE_SEIZE:
71501+ case PTRACE_POKETEXT:
71502+ case PTRACE_POKEDATA:
71503+ case PTRACE_POKEUSR:
71504+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
71505+ case PTRACE_SETREGS:
71506+ case PTRACE_SETFPREGS:
71507+#endif
71508+#ifdef CONFIG_X86
71509+ case PTRACE_SETFPXREGS:
71510+#endif
71511+#ifdef CONFIG_ALTIVEC
71512+ case PTRACE_SETVRREGS:
71513+#endif
71514+ return 1;
71515+ default:
71516+ return 0;
71517+ }
71518+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
71519+ !(current->role->roletype & GR_ROLE_GOD) &&
71520+ (current->acl != task->acl)) {
71521+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
71522+ return 1;
71523+ }
71524+
71525+ return 0;
71526+}
71527+
71528+static int is_writable_mmap(const struct file *filp)
71529+{
71530+ struct task_struct *task = current;
71531+ struct acl_object_label *obj, *obj2;
71532+
71533+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
71534+ !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))) {
71535+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
71536+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
71537+ task->role->root_label);
71538+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
71539+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
71540+ return 1;
71541+ }
71542+ }
71543+ return 0;
71544+}
71545+
71546+int
71547+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
71548+{
71549+ __u32 mode;
71550+
71551+ if (unlikely(!file || !(prot & PROT_EXEC)))
71552+ return 1;
71553+
71554+ if (is_writable_mmap(file))
71555+ return 0;
71556+
71557+ mode =
71558+ gr_search_file(file->f_path.dentry,
71559+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
71560+ file->f_path.mnt);
71561+
71562+ if (!gr_tpe_allow(file))
71563+ return 0;
71564+
71565+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
71566+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71567+ return 0;
71568+ } else if (unlikely(!(mode & GR_EXEC))) {
71569+ return 0;
71570+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
71571+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71572+ return 1;
71573+ }
71574+
71575+ return 1;
71576+}
71577+
71578+int
71579+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
71580+{
71581+ __u32 mode;
71582+
71583+ if (unlikely(!file || !(prot & PROT_EXEC)))
71584+ return 1;
71585+
71586+ if (is_writable_mmap(file))
71587+ return 0;
71588+
71589+ mode =
71590+ gr_search_file(file->f_path.dentry,
71591+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
71592+ file->f_path.mnt);
71593+
71594+ if (!gr_tpe_allow(file))
71595+ return 0;
71596+
71597+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
71598+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71599+ return 0;
71600+ } else if (unlikely(!(mode & GR_EXEC))) {
71601+ return 0;
71602+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
71603+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
71604+ return 1;
71605+ }
71606+
71607+ return 1;
71608+}
71609+
71610+void
71611+gr_acl_handle_psacct(struct task_struct *task, const long code)
71612+{
71613+ unsigned long runtime, cputime;
71614+ cputime_t utime, stime;
71615+ unsigned int wday, cday;
71616+ __u8 whr, chr;
71617+ __u8 wmin, cmin;
71618+ __u8 wsec, csec;
71619+ struct timespec curtime, starttime;
71620+
71621+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
71622+ !(task->acl->mode & GR_PROCACCT)))
71623+ return;
71624+
71625+ curtime = ns_to_timespec(ktime_get_ns());
71626+ starttime = ns_to_timespec(task->start_time);
71627+ runtime = curtime.tv_sec - starttime.tv_sec;
71628+ wday = runtime / (60 * 60 * 24);
71629+ runtime -= wday * (60 * 60 * 24);
71630+ whr = runtime / (60 * 60);
71631+ runtime -= whr * (60 * 60);
71632+ wmin = runtime / 60;
71633+ runtime -= wmin * 60;
71634+ wsec = runtime;
71635+
71636+ task_cputime(task, &utime, &stime);
71637+ cputime = cputime_to_secs(utime + stime);
71638+ cday = cputime / (60 * 60 * 24);
71639+ cputime -= cday * (60 * 60 * 24);
71640+ chr = cputime / (60 * 60);
71641+ cputime -= chr * (60 * 60);
71642+ cmin = cputime / 60;
71643+ cputime -= cmin * 60;
71644+ csec = cputime;
71645+
71646+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
71647+
71648+ return;
71649+}
71650+
71651+#ifdef CONFIG_TASKSTATS
71652+int gr_is_taskstats_denied(int pid)
71653+{
71654+ struct task_struct *task;
71655+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71656+ const struct cred *cred;
71657+#endif
71658+ int ret = 0;
71659+
71660+ /* restrict taskstats viewing to un-chrooted root users
71661+ who have the 'view' subject flag if the RBAC system is enabled
71662+ */
71663+
71664+ rcu_read_lock();
71665+ read_lock(&tasklist_lock);
71666+ task = find_task_by_vpid(pid);
71667+ if (task) {
71668+#ifdef CONFIG_GRKERNSEC_CHROOT
71669+ if (proc_is_chrooted(task))
71670+ ret = -EACCES;
71671+#endif
71672+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71673+ cred = __task_cred(task);
71674+#ifdef CONFIG_GRKERNSEC_PROC_USER
71675+ if (gr_is_global_nonroot(cred->uid))
71676+ ret = -EACCES;
71677+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71678+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
71679+ ret = -EACCES;
71680+#endif
71681+#endif
71682+ if (gr_status & GR_READY) {
71683+ if (!(task->acl->mode & GR_VIEW))
71684+ ret = -EACCES;
71685+ }
71686+ } else
71687+ ret = -ENOENT;
71688+
71689+ read_unlock(&tasklist_lock);
71690+ rcu_read_unlock();
71691+
71692+ return ret;
71693+}
71694+#endif
71695+
71696+/* AUXV entries are filled via a descendant of search_binary_handler
71697+ after we've already applied the subject for the target
71698+*/
71699+int gr_acl_enable_at_secure(void)
71700+{
71701+ if (unlikely(!(gr_status & GR_READY)))
71702+ return 0;
71703+
71704+ if (current->acl->mode & GR_ATSECURE)
71705+ return 1;
71706+
71707+ return 0;
71708+}
71709+
71710+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
71711+{
71712+ struct task_struct *task = current;
71713+ struct dentry *dentry = file->f_path.dentry;
71714+ struct vfsmount *mnt = file->f_path.mnt;
71715+ struct acl_object_label *obj, *tmp;
71716+ struct acl_subject_label *subj;
71717+ unsigned int bufsize;
71718+ int is_not_root;
71719+ char *path;
71720+ dev_t dev = __get_dev(dentry);
71721+
71722+ if (unlikely(!(gr_status & GR_READY)))
71723+ return 1;
71724+
71725+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
71726+ return 1;
71727+
71728+ /* ignore Eric Biederman */
71729+ if (IS_PRIVATE(dentry->d_inode))
71730+ return 1;
71731+
71732+ subj = task->acl;
71733+ read_lock(&gr_inode_lock);
71734+ do {
71735+ obj = lookup_acl_obj_label(ino, dev, subj);
71736+ if (obj != NULL) {
71737+ read_unlock(&gr_inode_lock);
71738+ return (obj->mode & GR_FIND) ? 1 : 0;
71739+ }
71740+ } while ((subj = subj->parent_subject));
71741+ read_unlock(&gr_inode_lock);
71742+
71743+ /* this is purely an optimization since we're looking for an object
71744+ for the directory we're doing a readdir on
71745+ if it's possible for any globbed object to match the entry we're
71746+ filling into the directory, then the object we find here will be
71747+ an anchor point with attached globbed objects
71748+ */
71749+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
71750+ if (obj->globbed == NULL)
71751+ return (obj->mode & GR_FIND) ? 1 : 0;
71752+
71753+ is_not_root = ((obj->filename[0] == '/') &&
71754+ (obj->filename[1] == '\0')) ? 0 : 1;
71755+ bufsize = PAGE_SIZE - namelen - is_not_root;
71756+
71757+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
71758+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
71759+ return 1;
71760+
71761+ preempt_disable();
71762+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
71763+ bufsize);
71764+
71765+ bufsize = strlen(path);
71766+
71767+ /* if base is "/", don't append an additional slash */
71768+ if (is_not_root)
71769+ *(path + bufsize) = '/';
71770+ memcpy(path + bufsize + is_not_root, name, namelen);
71771+ *(path + bufsize + namelen + is_not_root) = '\0';
71772+
71773+ tmp = obj->globbed;
71774+ while (tmp) {
71775+ if (!glob_match(tmp->filename, path)) {
71776+ preempt_enable();
71777+ return (tmp->mode & GR_FIND) ? 1 : 0;
71778+ }
71779+ tmp = tmp->next;
71780+ }
71781+ preempt_enable();
71782+ return (obj->mode & GR_FIND) ? 1 : 0;
71783+}
71784+
71785+void gr_put_exec_file(struct task_struct *task)
71786+{
71787+ struct file *filp;
71788+
71789+ write_lock(&grsec_exec_file_lock);
71790+ filp = task->exec_file;
71791+ task->exec_file = NULL;
71792+ write_unlock(&grsec_exec_file_lock);
71793+
71794+ if (filp)
71795+ fput(filp);
71796+
71797+ return;
71798+}
71799+
71800+
71801+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
71802+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
71803+#endif
71804+#ifdef CONFIG_SECURITY
71805+EXPORT_SYMBOL_GPL(gr_check_user_change);
71806+EXPORT_SYMBOL_GPL(gr_check_group_change);
71807+#endif
71808+
71809diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
71810new file mode 100644
71811index 0000000..18ffbbd
71812--- /dev/null
71813+++ b/grsecurity/gracl_alloc.c
71814@@ -0,0 +1,105 @@
71815+#include <linux/kernel.h>
71816+#include <linux/mm.h>
71817+#include <linux/slab.h>
71818+#include <linux/vmalloc.h>
71819+#include <linux/gracl.h>
71820+#include <linux/grsecurity.h>
71821+
71822+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
71823+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
71824+
71825+static __inline__ int
71826+alloc_pop(void)
71827+{
71828+ if (current_alloc_state->alloc_stack_next == 1)
71829+ return 0;
71830+
71831+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
71832+
71833+ current_alloc_state->alloc_stack_next--;
71834+
71835+ return 1;
71836+}
71837+
71838+static __inline__ int
71839+alloc_push(void *buf)
71840+{
71841+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
71842+ return 1;
71843+
71844+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
71845+
71846+ current_alloc_state->alloc_stack_next++;
71847+
71848+ return 0;
71849+}
71850+
71851+void *
71852+acl_alloc(unsigned long len)
71853+{
71854+ void *ret = NULL;
71855+
71856+ if (!len || len > PAGE_SIZE)
71857+ goto out;
71858+
71859+ ret = kmalloc(len, GFP_KERNEL);
71860+
71861+ if (ret) {
71862+ if (alloc_push(ret)) {
71863+ kfree(ret);
71864+ ret = NULL;
71865+ }
71866+ }
71867+
71868+out:
71869+ return ret;
71870+}
71871+
71872+void *
71873+acl_alloc_num(unsigned long num, unsigned long len)
71874+{
71875+ if (!len || (num > (PAGE_SIZE / len)))
71876+ return NULL;
71877+
71878+ return acl_alloc(num * len);
71879+}
71880+
71881+void
71882+acl_free_all(void)
71883+{
71884+ if (!current_alloc_state->alloc_stack)
71885+ return;
71886+
71887+ while (alloc_pop()) ;
71888+
71889+ if (current_alloc_state->alloc_stack) {
71890+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
71891+ kfree(current_alloc_state->alloc_stack);
71892+ else
71893+ vfree(current_alloc_state->alloc_stack);
71894+ }
71895+
71896+ current_alloc_state->alloc_stack = NULL;
71897+ current_alloc_state->alloc_stack_size = 1;
71898+ current_alloc_state->alloc_stack_next = 1;
71899+
71900+ return;
71901+}
71902+
71903+int
71904+acl_alloc_stack_init(unsigned long size)
71905+{
71906+ if ((size * sizeof (void *)) <= PAGE_SIZE)
71907+ current_alloc_state->alloc_stack =
71908+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
71909+ else
71910+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
71911+
71912+ current_alloc_state->alloc_stack_size = size;
71913+ current_alloc_state->alloc_stack_next = 1;
71914+
71915+ if (!current_alloc_state->alloc_stack)
71916+ return 0;
71917+ else
71918+ return 1;
71919+}
71920diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
71921new file mode 100644
71922index 0000000..1a94c11
71923--- /dev/null
71924+++ b/grsecurity/gracl_cap.c
71925@@ -0,0 +1,127 @@
71926+#include <linux/kernel.h>
71927+#include <linux/module.h>
71928+#include <linux/sched.h>
71929+#include <linux/gracl.h>
71930+#include <linux/grsecurity.h>
71931+#include <linux/grinternal.h>
71932+
71933+extern const char *captab_log[];
71934+extern int captab_log_entries;
71935+
71936+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
71937+{
71938+ struct acl_subject_label *curracl;
71939+
71940+ if (!gr_acl_is_enabled())
71941+ return 1;
71942+
71943+ curracl = task->acl;
71944+
71945+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
71946+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
71947+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
71948+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
71949+ gr_to_filename(task->exec_file->f_path.dentry,
71950+ task->exec_file->f_path.mnt) : curracl->filename,
71951+ curracl->filename, 0UL,
71952+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
71953+ return 1;
71954+ }
71955+
71956+ return 0;
71957+}
71958+
71959+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
71960+{
71961+ struct acl_subject_label *curracl;
71962+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
71963+ kernel_cap_t cap_audit = __cap_empty_set;
71964+
71965+ if (!gr_acl_is_enabled())
71966+ return 1;
71967+
71968+ curracl = task->acl;
71969+
71970+ cap_drop = curracl->cap_lower;
71971+ cap_mask = curracl->cap_mask;
71972+ cap_audit = curracl->cap_invert_audit;
71973+
71974+ while ((curracl = curracl->parent_subject)) {
71975+ /* if the cap isn't specified in the current computed mask but is specified in the
71976+ current level subject, and is lowered in the current level subject, then add
71977+ it to the set of dropped capabilities
71978+ otherwise, add the current level subject's mask to the current computed mask
71979+ */
71980+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
71981+ cap_raise(cap_mask, cap);
71982+ if (cap_raised(curracl->cap_lower, cap))
71983+ cap_raise(cap_drop, cap);
71984+ if (cap_raised(curracl->cap_invert_audit, cap))
71985+ cap_raise(cap_audit, cap);
71986+ }
71987+ }
71988+
71989+ if (!cap_raised(cap_drop, cap)) {
71990+ if (cap_raised(cap_audit, cap))
71991+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
71992+ return 1;
71993+ }
71994+
71995+ /* only learn the capability use if the process has the capability in the
71996+ general case, the two uses in sys.c of gr_learn_cap are an exception
71997+ to this rule to ensure any role transition involves what the full-learned
71998+ policy believes in a privileged process
71999+ */
72000+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
72001+ return 1;
72002+
72003+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
72004+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
72005+
72006+ return 0;
72007+}
72008+
72009+int
72010+gr_acl_is_capable(const int cap)
72011+{
72012+ return gr_task_acl_is_capable(current, current_cred(), cap);
72013+}
72014+
72015+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
72016+{
72017+ struct acl_subject_label *curracl;
72018+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
72019+
72020+ if (!gr_acl_is_enabled())
72021+ return 1;
72022+
72023+ curracl = task->acl;
72024+
72025+ cap_drop = curracl->cap_lower;
72026+ cap_mask = curracl->cap_mask;
72027+
72028+ while ((curracl = curracl->parent_subject)) {
72029+ /* if the cap isn't specified in the current computed mask but is specified in the
72030+ current level subject, and is lowered in the current level subject, then add
72031+ it to the set of dropped capabilities
72032+ otherwise, add the current level subject's mask to the current computed mask
72033+ */
72034+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
72035+ cap_raise(cap_mask, cap);
72036+ if (cap_raised(curracl->cap_lower, cap))
72037+ cap_raise(cap_drop, cap);
72038+ }
72039+ }
72040+
72041+ if (!cap_raised(cap_drop, cap))
72042+ return 1;
72043+
72044+ return 0;
72045+}
72046+
72047+int
72048+gr_acl_is_capable_nolog(const int cap)
72049+{
72050+ return gr_task_acl_is_capable_nolog(current, cap);
72051+}
72052+
72053diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
72054new file mode 100644
72055index 0000000..ca25605
72056--- /dev/null
72057+++ b/grsecurity/gracl_compat.c
72058@@ -0,0 +1,270 @@
72059+#include <linux/kernel.h>
72060+#include <linux/gracl.h>
72061+#include <linux/compat.h>
72062+#include <linux/gracl_compat.h>
72063+
72064+#include <asm/uaccess.h>
72065+
72066+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
72067+{
72068+ struct gr_arg_wrapper_compat uwrapcompat;
72069+
72070+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
72071+ return -EFAULT;
72072+
72073+ if (((uwrapcompat.version != GRSECURITY_VERSION) &&
72074+ (uwrapcompat.version != 0x2901)) ||
72075+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
72076+ return -EINVAL;
72077+
72078+ uwrap->arg = compat_ptr(uwrapcompat.arg);
72079+ uwrap->version = uwrapcompat.version;
72080+ uwrap->size = sizeof(struct gr_arg);
72081+
72082+ return 0;
72083+}
72084+
72085+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
72086+{
72087+ struct gr_arg_compat argcompat;
72088+
72089+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
72090+ return -EFAULT;
72091+
72092+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
72093+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
72094+ arg->role_db.num_roles = argcompat.role_db.num_roles;
72095+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
72096+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
72097+ arg->role_db.num_objects = argcompat.role_db.num_objects;
72098+
72099+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
72100+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
72101+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
72102+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
72103+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
72104+ arg->segv_device = argcompat.segv_device;
72105+ arg->segv_inode = argcompat.segv_inode;
72106+ arg->segv_uid = argcompat.segv_uid;
72107+ arg->num_sprole_pws = argcompat.num_sprole_pws;
72108+ arg->mode = argcompat.mode;
72109+
72110+ return 0;
72111+}
72112+
72113+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
72114+{
72115+ struct acl_object_label_compat objcompat;
72116+
72117+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
72118+ return -EFAULT;
72119+
72120+ obj->filename = compat_ptr(objcompat.filename);
72121+ obj->inode = objcompat.inode;
72122+ obj->device = objcompat.device;
72123+ obj->mode = objcompat.mode;
72124+
72125+ obj->nested = compat_ptr(objcompat.nested);
72126+ obj->globbed = compat_ptr(objcompat.globbed);
72127+
72128+ obj->prev = compat_ptr(objcompat.prev);
72129+ obj->next = compat_ptr(objcompat.next);
72130+
72131+ return 0;
72132+}
72133+
72134+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
72135+{
72136+ unsigned int i;
72137+ struct acl_subject_label_compat subjcompat;
72138+
72139+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
72140+ return -EFAULT;
72141+
72142+ subj->filename = compat_ptr(subjcompat.filename);
72143+ subj->inode = subjcompat.inode;
72144+ subj->device = subjcompat.device;
72145+ subj->mode = subjcompat.mode;
72146+ subj->cap_mask = subjcompat.cap_mask;
72147+ subj->cap_lower = subjcompat.cap_lower;
72148+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
72149+
72150+ for (i = 0; i < GR_NLIMITS; i++) {
72151+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
72152+ subj->res[i].rlim_cur = RLIM_INFINITY;
72153+ else
72154+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
72155+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
72156+ subj->res[i].rlim_max = RLIM_INFINITY;
72157+ else
72158+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
72159+ }
72160+ subj->resmask = subjcompat.resmask;
72161+
72162+ subj->user_trans_type = subjcompat.user_trans_type;
72163+ subj->group_trans_type = subjcompat.group_trans_type;
72164+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
72165+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
72166+ subj->user_trans_num = subjcompat.user_trans_num;
72167+ subj->group_trans_num = subjcompat.group_trans_num;
72168+
72169+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
72170+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
72171+ subj->ip_type = subjcompat.ip_type;
72172+ subj->ips = compat_ptr(subjcompat.ips);
72173+ subj->ip_num = subjcompat.ip_num;
72174+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
72175+
72176+ subj->crashes = subjcompat.crashes;
72177+ subj->expires = subjcompat.expires;
72178+
72179+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
72180+ subj->hash = compat_ptr(subjcompat.hash);
72181+ subj->prev = compat_ptr(subjcompat.prev);
72182+ subj->next = compat_ptr(subjcompat.next);
72183+
72184+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
72185+ subj->obj_hash_size = subjcompat.obj_hash_size;
72186+ subj->pax_flags = subjcompat.pax_flags;
72187+
72188+ return 0;
72189+}
72190+
72191+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
72192+{
72193+ struct acl_role_label_compat rolecompat;
72194+
72195+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
72196+ return -EFAULT;
72197+
72198+ role->rolename = compat_ptr(rolecompat.rolename);
72199+ role->uidgid = rolecompat.uidgid;
72200+ role->roletype = rolecompat.roletype;
72201+
72202+ role->auth_attempts = rolecompat.auth_attempts;
72203+ role->expires = rolecompat.expires;
72204+
72205+ role->root_label = compat_ptr(rolecompat.root_label);
72206+ role->hash = compat_ptr(rolecompat.hash);
72207+
72208+ role->prev = compat_ptr(rolecompat.prev);
72209+ role->next = compat_ptr(rolecompat.next);
72210+
72211+ role->transitions = compat_ptr(rolecompat.transitions);
72212+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
72213+ role->domain_children = compat_ptr(rolecompat.domain_children);
72214+ role->domain_child_num = rolecompat.domain_child_num;
72215+
72216+ role->umask = rolecompat.umask;
72217+
72218+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
72219+ role->subj_hash_size = rolecompat.subj_hash_size;
72220+
72221+ return 0;
72222+}
72223+
72224+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
72225+{
72226+ struct role_allowed_ip_compat roleip_compat;
72227+
72228+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
72229+ return -EFAULT;
72230+
72231+ roleip->addr = roleip_compat.addr;
72232+ roleip->netmask = roleip_compat.netmask;
72233+
72234+ roleip->prev = compat_ptr(roleip_compat.prev);
72235+ roleip->next = compat_ptr(roleip_compat.next);
72236+
72237+ return 0;
72238+}
72239+
72240+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
72241+{
72242+ struct role_transition_compat trans_compat;
72243+
72244+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
72245+ return -EFAULT;
72246+
72247+ trans->rolename = compat_ptr(trans_compat.rolename);
72248+
72249+ trans->prev = compat_ptr(trans_compat.prev);
72250+ trans->next = compat_ptr(trans_compat.next);
72251+
72252+ return 0;
72253+
72254+}
72255+
72256+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
72257+{
72258+ struct gr_hash_struct_compat hash_compat;
72259+
72260+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
72261+ return -EFAULT;
72262+
72263+ hash->table = compat_ptr(hash_compat.table);
72264+ hash->nametable = compat_ptr(hash_compat.nametable);
72265+ hash->first = compat_ptr(hash_compat.first);
72266+
72267+ hash->table_size = hash_compat.table_size;
72268+ hash->used_size = hash_compat.used_size;
72269+
72270+ hash->type = hash_compat.type;
72271+
72272+ return 0;
72273+}
72274+
72275+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
72276+{
72277+ compat_uptr_t ptrcompat;
72278+
72279+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
72280+ return -EFAULT;
72281+
72282+ *(void **)ptr = compat_ptr(ptrcompat);
72283+
72284+ return 0;
72285+}
72286+
72287+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
72288+{
72289+ struct acl_ip_label_compat ip_compat;
72290+
72291+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
72292+ return -EFAULT;
72293+
72294+ ip->iface = compat_ptr(ip_compat.iface);
72295+ ip->addr = ip_compat.addr;
72296+ ip->netmask = ip_compat.netmask;
72297+ ip->low = ip_compat.low;
72298+ ip->high = ip_compat.high;
72299+ ip->mode = ip_compat.mode;
72300+ ip->type = ip_compat.type;
72301+
72302+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
72303+
72304+ ip->prev = compat_ptr(ip_compat.prev);
72305+ ip->next = compat_ptr(ip_compat.next);
72306+
72307+ return 0;
72308+}
72309+
72310+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
72311+{
72312+ struct sprole_pw_compat pw_compat;
72313+
72314+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
72315+ return -EFAULT;
72316+
72317+ pw->rolename = compat_ptr(pw_compat.rolename);
72318+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
72319+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
72320+
72321+ return 0;
72322+}
72323+
72324+size_t get_gr_arg_wrapper_size_compat(void)
72325+{
72326+ return sizeof(struct gr_arg_wrapper_compat);
72327+}
72328+
72329diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
72330new file mode 100644
72331index 0000000..4008fdc
72332--- /dev/null
72333+++ b/grsecurity/gracl_fs.c
72334@@ -0,0 +1,445 @@
72335+#include <linux/kernel.h>
72336+#include <linux/sched.h>
72337+#include <linux/types.h>
72338+#include <linux/fs.h>
72339+#include <linux/file.h>
72340+#include <linux/stat.h>
72341+#include <linux/grsecurity.h>
72342+#include <linux/grinternal.h>
72343+#include <linux/gracl.h>
72344+
72345+umode_t
72346+gr_acl_umask(void)
72347+{
72348+ if (unlikely(!gr_acl_is_enabled()))
72349+ return 0;
72350+
72351+ return current->role->umask;
72352+}
72353+
72354+__u32
72355+gr_acl_handle_hidden_file(const struct dentry * dentry,
72356+ const struct vfsmount * mnt)
72357+{
72358+ __u32 mode;
72359+
72360+ if (unlikely(d_is_negative(dentry)))
72361+ return GR_FIND;
72362+
72363+ mode =
72364+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
72365+
72366+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
72367+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
72368+ return mode;
72369+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
72370+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
72371+ return 0;
72372+ } else if (unlikely(!(mode & GR_FIND)))
72373+ return 0;
72374+
72375+ return GR_FIND;
72376+}
72377+
72378+__u32
72379+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
72380+ int acc_mode)
72381+{
72382+ __u32 reqmode = GR_FIND;
72383+ __u32 mode;
72384+
72385+ if (unlikely(d_is_negative(dentry)))
72386+ return reqmode;
72387+
72388+ if (acc_mode & MAY_APPEND)
72389+ reqmode |= GR_APPEND;
72390+ else if (acc_mode & MAY_WRITE)
72391+ reqmode |= GR_WRITE;
72392+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
72393+ reqmode |= GR_READ;
72394+
72395+ mode =
72396+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
72397+ mnt);
72398+
72399+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72400+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
72401+ reqmode & GR_READ ? " reading" : "",
72402+ reqmode & GR_WRITE ? " writing" : reqmode &
72403+ GR_APPEND ? " appending" : "");
72404+ return reqmode;
72405+ } else
72406+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72407+ {
72408+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
72409+ reqmode & GR_READ ? " reading" : "",
72410+ reqmode & GR_WRITE ? " writing" : reqmode &
72411+ GR_APPEND ? " appending" : "");
72412+ return 0;
72413+ } else if (unlikely((mode & reqmode) != reqmode))
72414+ return 0;
72415+
72416+ return reqmode;
72417+}
72418+
72419+__u32
72420+gr_acl_handle_creat(const struct dentry * dentry,
72421+ const struct dentry * p_dentry,
72422+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
72423+ const int imode)
72424+{
72425+ __u32 reqmode = GR_WRITE | GR_CREATE;
72426+ __u32 mode;
72427+
72428+ if (acc_mode & MAY_APPEND)
72429+ reqmode |= GR_APPEND;
72430+ // if a directory was required or the directory already exists, then
72431+ // don't count this open as a read
72432+ if ((acc_mode & MAY_READ) &&
72433+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
72434+ reqmode |= GR_READ;
72435+ if ((open_flags & O_CREAT) &&
72436+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
72437+ reqmode |= GR_SETID;
72438+
72439+ mode =
72440+ gr_check_create(dentry, p_dentry, p_mnt,
72441+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
72442+
72443+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72444+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
72445+ reqmode & GR_READ ? " reading" : "",
72446+ reqmode & GR_WRITE ? " writing" : reqmode &
72447+ GR_APPEND ? " appending" : "");
72448+ return reqmode;
72449+ } else
72450+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72451+ {
72452+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
72453+ reqmode & GR_READ ? " reading" : "",
72454+ reqmode & GR_WRITE ? " writing" : reqmode &
72455+ GR_APPEND ? " appending" : "");
72456+ return 0;
72457+ } else if (unlikely((mode & reqmode) != reqmode))
72458+ return 0;
72459+
72460+ return reqmode;
72461+}
72462+
72463+__u32
72464+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
72465+ const int fmode)
72466+{
72467+ __u32 mode, reqmode = GR_FIND;
72468+
72469+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
72470+ reqmode |= GR_EXEC;
72471+ if (fmode & S_IWOTH)
72472+ reqmode |= GR_WRITE;
72473+ if (fmode & S_IROTH)
72474+ reqmode |= GR_READ;
72475+
72476+ mode =
72477+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
72478+ mnt);
72479+
72480+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
72481+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
72482+ reqmode & GR_READ ? " reading" : "",
72483+ reqmode & GR_WRITE ? " writing" : "",
72484+ reqmode & GR_EXEC ? " executing" : "");
72485+ return reqmode;
72486+ } else
72487+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
72488+ {
72489+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
72490+ reqmode & GR_READ ? " reading" : "",
72491+ reqmode & GR_WRITE ? " writing" : "",
72492+ reqmode & GR_EXEC ? " executing" : "");
72493+ return 0;
72494+ } else if (unlikely((mode & reqmode) != reqmode))
72495+ return 0;
72496+
72497+ return reqmode;
72498+}
72499+
72500+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
72501+{
72502+ __u32 mode;
72503+
72504+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
72505+
72506+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
72507+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
72508+ return mode;
72509+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
72510+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
72511+ return 0;
72512+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
72513+ return 0;
72514+
72515+ return (reqmode);
72516+}
72517+
72518+__u32
72519+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
72520+{
72521+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
72522+}
72523+
72524+__u32
72525+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
72526+{
72527+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
72528+}
72529+
72530+__u32
72531+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
72532+{
72533+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
72534+}
72535+
72536+__u32
72537+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
72538+{
72539+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
72540+}
72541+
72542+__u32
72543+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
72544+ umode_t *modeptr)
72545+{
72546+ umode_t mode;
72547+
72548+ *modeptr &= ~gr_acl_umask();
72549+ mode = *modeptr;
72550+
72551+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
72552+ return 1;
72553+
72554+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
72555+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
72556+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
72557+ GR_CHMOD_ACL_MSG);
72558+ } else {
72559+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
72560+ }
72561+}
72562+
72563+__u32
72564+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
72565+{
72566+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
72567+}
72568+
72569+__u32
72570+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
72571+{
72572+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
72573+}
72574+
72575+__u32
72576+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
72577+{
72578+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
72579+}
72580+
72581+__u32
72582+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
72583+{
72584+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
72585+}
72586+
72587+__u32
72588+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
72589+{
72590+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
72591+ GR_UNIXCONNECT_ACL_MSG);
72592+}
72593+
72594+/* hardlinks require at minimum create and link permission,
72595+ any additional privilege required is based on the
72596+ privilege of the file being linked to
72597+*/
72598+__u32
72599+gr_acl_handle_link(const struct dentry * new_dentry,
72600+ const struct dentry * parent_dentry,
72601+ const struct vfsmount * parent_mnt,
72602+ const struct dentry * old_dentry,
72603+ const struct vfsmount * old_mnt, const struct filename *to)
72604+{
72605+ __u32 mode;
72606+ __u32 needmode = GR_CREATE | GR_LINK;
72607+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
72608+
72609+ mode =
72610+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
72611+ old_mnt);
72612+
72613+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
72614+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
72615+ return mode;
72616+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
72617+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
72618+ return 0;
72619+ } else if (unlikely((mode & needmode) != needmode))
72620+ return 0;
72621+
72622+ return 1;
72623+}
72624+
72625+__u32
72626+gr_acl_handle_symlink(const struct dentry * new_dentry,
72627+ const struct dentry * parent_dentry,
72628+ const struct vfsmount * parent_mnt, const struct filename *from)
72629+{
72630+ __u32 needmode = GR_WRITE | GR_CREATE;
72631+ __u32 mode;
72632+
72633+ mode =
72634+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
72635+ GR_CREATE | GR_AUDIT_CREATE |
72636+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
72637+
72638+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
72639+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
72640+ return mode;
72641+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
72642+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
72643+ return 0;
72644+ } else if (unlikely((mode & needmode) != needmode))
72645+ return 0;
72646+
72647+ return (GR_WRITE | GR_CREATE);
72648+}
72649+
72650+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)
72651+{
72652+ __u32 mode;
72653+
72654+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
72655+
72656+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
72657+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
72658+ return mode;
72659+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
72660+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
72661+ return 0;
72662+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
72663+ return 0;
72664+
72665+ return (reqmode);
72666+}
72667+
72668+__u32
72669+gr_acl_handle_mknod(const struct dentry * new_dentry,
72670+ const struct dentry * parent_dentry,
72671+ const struct vfsmount * parent_mnt,
72672+ const int mode)
72673+{
72674+ __u32 reqmode = GR_WRITE | GR_CREATE;
72675+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
72676+ reqmode |= GR_SETID;
72677+
72678+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
72679+ reqmode, GR_MKNOD_ACL_MSG);
72680+}
72681+
72682+__u32
72683+gr_acl_handle_mkdir(const struct dentry *new_dentry,
72684+ const struct dentry *parent_dentry,
72685+ const struct vfsmount *parent_mnt)
72686+{
72687+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
72688+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
72689+}
72690+
72691+#define RENAME_CHECK_SUCCESS(old, new) \
72692+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
72693+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
72694+
72695+int
72696+gr_acl_handle_rename(struct dentry *new_dentry,
72697+ struct dentry *parent_dentry,
72698+ const struct vfsmount *parent_mnt,
72699+ struct dentry *old_dentry,
72700+ struct inode *old_parent_inode,
72701+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
72702+{
72703+ __u32 comp1, comp2;
72704+ int error = 0;
72705+
72706+ if (unlikely(!gr_acl_is_enabled()))
72707+ return 0;
72708+
72709+ if (flags & RENAME_EXCHANGE) {
72710+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
72711+ GR_AUDIT_READ | GR_AUDIT_WRITE |
72712+ GR_SUPPRESS, parent_mnt);
72713+ comp2 =
72714+ gr_search_file(old_dentry,
72715+ GR_READ | GR_WRITE | GR_AUDIT_READ |
72716+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
72717+ } else if (d_is_negative(new_dentry)) {
72718+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
72719+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
72720+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
72721+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
72722+ GR_DELETE | GR_AUDIT_DELETE |
72723+ GR_AUDIT_READ | GR_AUDIT_WRITE |
72724+ GR_SUPPRESS, old_mnt);
72725+ } else {
72726+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
72727+ GR_CREATE | GR_DELETE |
72728+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
72729+ GR_AUDIT_READ | GR_AUDIT_WRITE |
72730+ GR_SUPPRESS, parent_mnt);
72731+ comp2 =
72732+ gr_search_file(old_dentry,
72733+ GR_READ | GR_WRITE | GR_AUDIT_READ |
72734+ GR_DELETE | GR_AUDIT_DELETE |
72735+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
72736+ }
72737+
72738+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
72739+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
72740+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
72741+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
72742+ && !(comp2 & GR_SUPPRESS)) {
72743+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
72744+ error = -EACCES;
72745+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
72746+ error = -EACCES;
72747+
72748+ return error;
72749+}
72750+
72751+void
72752+gr_acl_handle_exit(void)
72753+{
72754+ u16 id;
72755+ char *rolename;
72756+
72757+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
72758+ !(current->role->roletype & GR_ROLE_PERSIST))) {
72759+ id = current->acl_role_id;
72760+ rolename = current->role->rolename;
72761+ gr_set_acls(1);
72762+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
72763+ }
72764+
72765+ gr_put_exec_file(current);
72766+ return;
72767+}
72768+
72769+int
72770+gr_acl_handle_procpidmem(const struct task_struct *task)
72771+{
72772+ if (unlikely(!gr_acl_is_enabled()))
72773+ return 0;
72774+
72775+ if (task != current && task->acl->mode & GR_PROTPROCFD)
72776+ return -EACCES;
72777+
72778+ return 0;
72779+}
72780diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
72781new file mode 100644
72782index 0000000..f056b81
72783--- /dev/null
72784+++ b/grsecurity/gracl_ip.c
72785@@ -0,0 +1,386 @@
72786+#include <linux/kernel.h>
72787+#include <asm/uaccess.h>
72788+#include <asm/errno.h>
72789+#include <net/sock.h>
72790+#include <linux/file.h>
72791+#include <linux/fs.h>
72792+#include <linux/net.h>
72793+#include <linux/in.h>
72794+#include <linux/skbuff.h>
72795+#include <linux/ip.h>
72796+#include <linux/udp.h>
72797+#include <linux/types.h>
72798+#include <linux/sched.h>
72799+#include <linux/netdevice.h>
72800+#include <linux/inetdevice.h>
72801+#include <linux/gracl.h>
72802+#include <linux/grsecurity.h>
72803+#include <linux/grinternal.h>
72804+
72805+#define GR_BIND 0x01
72806+#define GR_CONNECT 0x02
72807+#define GR_INVERT 0x04
72808+#define GR_BINDOVERRIDE 0x08
72809+#define GR_CONNECTOVERRIDE 0x10
72810+#define GR_SOCK_FAMILY 0x20
72811+
72812+static const char * gr_protocols[IPPROTO_MAX] = {
72813+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
72814+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
72815+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
72816+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
72817+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
72818+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
72819+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
72820+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
72821+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
72822+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
72823+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
72824+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
72825+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
72826+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
72827+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
72828+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
72829+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
72830+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
72831+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
72832+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
72833+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
72834+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
72835+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
72836+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
72837+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
72838+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
72839+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
72840+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
72841+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
72842+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
72843+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
72844+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
72845+ };
72846+
72847+static const char * gr_socktypes[SOCK_MAX] = {
72848+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
72849+ "unknown:7", "unknown:8", "unknown:9", "packet"
72850+ };
72851+
72852+static const char * gr_sockfamilies[AF_MAX+1] = {
72853+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
72854+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
72855+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
72856+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
72857+ };
72858+
72859+const char *
72860+gr_proto_to_name(unsigned char proto)
72861+{
72862+ return gr_protocols[proto];
72863+}
72864+
72865+const char *
72866+gr_socktype_to_name(unsigned char type)
72867+{
72868+ return gr_socktypes[type];
72869+}
72870+
72871+const char *
72872+gr_sockfamily_to_name(unsigned char family)
72873+{
72874+ return gr_sockfamilies[family];
72875+}
72876+
72877+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
72878+
72879+int
72880+gr_search_socket(const int domain, const int type, const int protocol)
72881+{
72882+ struct acl_subject_label *curr;
72883+ const struct cred *cred = current_cred();
72884+
72885+ if (unlikely(!gr_acl_is_enabled()))
72886+ goto exit;
72887+
72888+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
72889+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
72890+ goto exit; // let the kernel handle it
72891+
72892+ curr = current->acl;
72893+
72894+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
72895+ /* the family is allowed, if this is PF_INET allow it only if
72896+ the extra sock type/protocol checks pass */
72897+ if (domain == PF_INET)
72898+ goto inet_check;
72899+ goto exit;
72900+ } else {
72901+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
72902+ __u32 fakeip = 0;
72903+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
72904+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
72905+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
72906+ gr_to_filename(current->exec_file->f_path.dentry,
72907+ current->exec_file->f_path.mnt) :
72908+ curr->filename, curr->filename,
72909+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
72910+ &current->signal->saved_ip);
72911+ goto exit;
72912+ }
72913+ goto exit_fail;
72914+ }
72915+
72916+inet_check:
72917+ /* the rest of this checking is for IPv4 only */
72918+ if (!curr->ips)
72919+ goto exit;
72920+
72921+ if ((curr->ip_type & (1U << type)) &&
72922+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
72923+ goto exit;
72924+
72925+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
72926+ /* we don't place acls on raw sockets , and sometimes
72927+ dgram/ip sockets are opened for ioctl and not
72928+ bind/connect, so we'll fake a bind learn log */
72929+ if (type == SOCK_RAW || type == SOCK_PACKET) {
72930+ __u32 fakeip = 0;
72931+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
72932+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
72933+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
72934+ gr_to_filename(current->exec_file->f_path.dentry,
72935+ current->exec_file->f_path.mnt) :
72936+ curr->filename, curr->filename,
72937+ &fakeip, 0, type,
72938+ protocol, GR_CONNECT, &current->signal->saved_ip);
72939+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
72940+ __u32 fakeip = 0;
72941+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
72942+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
72943+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
72944+ gr_to_filename(current->exec_file->f_path.dentry,
72945+ current->exec_file->f_path.mnt) :
72946+ curr->filename, curr->filename,
72947+ &fakeip, 0, type,
72948+ protocol, GR_BIND, &current->signal->saved_ip);
72949+ }
72950+ /* we'll log when they use connect or bind */
72951+ goto exit;
72952+ }
72953+
72954+exit_fail:
72955+ if (domain == PF_INET)
72956+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
72957+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
72958+ else if (rcu_access_pointer(net_families[domain]) != NULL)
72959+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
72960+ gr_socktype_to_name(type), protocol);
72961+
72962+ return 0;
72963+exit:
72964+ return 1;
72965+}
72966+
72967+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)
72968+{
72969+ if ((ip->mode & mode) &&
72970+ (ip_port >= ip->low) &&
72971+ (ip_port <= ip->high) &&
72972+ ((ntohl(ip_addr) & our_netmask) ==
72973+ (ntohl(our_addr) & our_netmask))
72974+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
72975+ && (ip->type & (1U << type))) {
72976+ if (ip->mode & GR_INVERT)
72977+ return 2; // specifically denied
72978+ else
72979+ return 1; // allowed
72980+ }
72981+
72982+ return 0; // not specifically allowed, may continue parsing
72983+}
72984+
72985+static int
72986+gr_search_connectbind(const int full_mode, struct sock *sk,
72987+ struct sockaddr_in *addr, const int type)
72988+{
72989+ char iface[IFNAMSIZ] = {0};
72990+ struct acl_subject_label *curr;
72991+ struct acl_ip_label *ip;
72992+ struct inet_sock *isk;
72993+ struct net_device *dev;
72994+ struct in_device *idev;
72995+ unsigned long i;
72996+ int ret;
72997+ int mode = full_mode & (GR_BIND | GR_CONNECT);
72998+ __u32 ip_addr = 0;
72999+ __u32 our_addr;
73000+ __u32 our_netmask;
73001+ char *p;
73002+ __u16 ip_port = 0;
73003+ const struct cred *cred = current_cred();
73004+
73005+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
73006+ return 0;
73007+
73008+ curr = current->acl;
73009+ isk = inet_sk(sk);
73010+
73011+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
73012+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
73013+ addr->sin_addr.s_addr = curr->inaddr_any_override;
73014+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
73015+ struct sockaddr_in saddr;
73016+ int err;
73017+
73018+ saddr.sin_family = AF_INET;
73019+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
73020+ saddr.sin_port = isk->inet_sport;
73021+
73022+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73023+ if (err)
73024+ return err;
73025+
73026+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
73027+ if (err)
73028+ return err;
73029+ }
73030+
73031+ if (!curr->ips)
73032+ return 0;
73033+
73034+ ip_addr = addr->sin_addr.s_addr;
73035+ ip_port = ntohs(addr->sin_port);
73036+
73037+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
73038+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
73039+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
73040+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
73041+ gr_to_filename(current->exec_file->f_path.dentry,
73042+ current->exec_file->f_path.mnt) :
73043+ curr->filename, curr->filename,
73044+ &ip_addr, ip_port, type,
73045+ sk->sk_protocol, mode, &current->signal->saved_ip);
73046+ return 0;
73047+ }
73048+
73049+ for (i = 0; i < curr->ip_num; i++) {
73050+ ip = *(curr->ips + i);
73051+ if (ip->iface != NULL) {
73052+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
73053+ p = strchr(iface, ':');
73054+ if (p != NULL)
73055+ *p = '\0';
73056+ dev = dev_get_by_name(sock_net(sk), iface);
73057+ if (dev == NULL)
73058+ continue;
73059+ idev = in_dev_get(dev);
73060+ if (idev == NULL) {
73061+ dev_put(dev);
73062+ continue;
73063+ }
73064+ rcu_read_lock();
73065+ for_ifa(idev) {
73066+ if (!strcmp(ip->iface, ifa->ifa_label)) {
73067+ our_addr = ifa->ifa_address;
73068+ our_netmask = 0xffffffff;
73069+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73070+ if (ret == 1) {
73071+ rcu_read_unlock();
73072+ in_dev_put(idev);
73073+ dev_put(dev);
73074+ return 0;
73075+ } else if (ret == 2) {
73076+ rcu_read_unlock();
73077+ in_dev_put(idev);
73078+ dev_put(dev);
73079+ goto denied;
73080+ }
73081+ }
73082+ } endfor_ifa(idev);
73083+ rcu_read_unlock();
73084+ in_dev_put(idev);
73085+ dev_put(dev);
73086+ } else {
73087+ our_addr = ip->addr;
73088+ our_netmask = ip->netmask;
73089+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
73090+ if (ret == 1)
73091+ return 0;
73092+ else if (ret == 2)
73093+ goto denied;
73094+ }
73095+ }
73096+
73097+denied:
73098+ if (mode == GR_BIND)
73099+ 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));
73100+ else if (mode == GR_CONNECT)
73101+ 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));
73102+
73103+ return -EACCES;
73104+}
73105+
73106+int
73107+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
73108+{
73109+ /* always allow disconnection of dgram sockets with connect */
73110+ if (addr->sin_family == AF_UNSPEC)
73111+ return 0;
73112+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
73113+}
73114+
73115+int
73116+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
73117+{
73118+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
73119+}
73120+
73121+int gr_search_listen(struct socket *sock)
73122+{
73123+ struct sock *sk = sock->sk;
73124+ struct sockaddr_in addr;
73125+
73126+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73127+ addr.sin_port = inet_sk(sk)->inet_sport;
73128+
73129+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73130+}
73131+
73132+int gr_search_accept(struct socket *sock)
73133+{
73134+ struct sock *sk = sock->sk;
73135+ struct sockaddr_in addr;
73136+
73137+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
73138+ addr.sin_port = inet_sk(sk)->inet_sport;
73139+
73140+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
73141+}
73142+
73143+int
73144+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
73145+{
73146+ if (addr)
73147+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
73148+ else {
73149+ struct sockaddr_in sin;
73150+ const struct inet_sock *inet = inet_sk(sk);
73151+
73152+ sin.sin_addr.s_addr = inet->inet_daddr;
73153+ sin.sin_port = inet->inet_dport;
73154+
73155+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73156+ }
73157+}
73158+
73159+int
73160+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
73161+{
73162+ struct sockaddr_in sin;
73163+
73164+ if (unlikely(skb->len < sizeof (struct udphdr)))
73165+ return 0; // skip this packet
73166+
73167+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
73168+ sin.sin_port = udp_hdr(skb)->source;
73169+
73170+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
73171+}
73172diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
73173new file mode 100644
73174index 0000000..25f54ef
73175--- /dev/null
73176+++ b/grsecurity/gracl_learn.c
73177@@ -0,0 +1,207 @@
73178+#include <linux/kernel.h>
73179+#include <linux/mm.h>
73180+#include <linux/sched.h>
73181+#include <linux/poll.h>
73182+#include <linux/string.h>
73183+#include <linux/file.h>
73184+#include <linux/types.h>
73185+#include <linux/vmalloc.h>
73186+#include <linux/grinternal.h>
73187+
73188+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
73189+ size_t count, loff_t *ppos);
73190+extern int gr_acl_is_enabled(void);
73191+
73192+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
73193+static int gr_learn_attached;
73194+
73195+/* use a 512k buffer */
73196+#define LEARN_BUFFER_SIZE (512 * 1024)
73197+
73198+static DEFINE_SPINLOCK(gr_learn_lock);
73199+static DEFINE_MUTEX(gr_learn_user_mutex);
73200+
73201+/* we need to maintain two buffers, so that the kernel context of grlearn
73202+ uses a semaphore around the userspace copying, and the other kernel contexts
73203+ use a spinlock when copying into the buffer, since they cannot sleep
73204+*/
73205+static char *learn_buffer;
73206+static char *learn_buffer_user;
73207+static int learn_buffer_len;
73208+static int learn_buffer_user_len;
73209+
73210+static ssize_t
73211+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
73212+{
73213+ DECLARE_WAITQUEUE(wait, current);
73214+ ssize_t retval = 0;
73215+
73216+ add_wait_queue(&learn_wait, &wait);
73217+ set_current_state(TASK_INTERRUPTIBLE);
73218+ do {
73219+ mutex_lock(&gr_learn_user_mutex);
73220+ spin_lock(&gr_learn_lock);
73221+ if (learn_buffer_len)
73222+ break;
73223+ spin_unlock(&gr_learn_lock);
73224+ mutex_unlock(&gr_learn_user_mutex);
73225+ if (file->f_flags & O_NONBLOCK) {
73226+ retval = -EAGAIN;
73227+ goto out;
73228+ }
73229+ if (signal_pending(current)) {
73230+ retval = -ERESTARTSYS;
73231+ goto out;
73232+ }
73233+
73234+ schedule();
73235+ } while (1);
73236+
73237+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
73238+ learn_buffer_user_len = learn_buffer_len;
73239+ retval = learn_buffer_len;
73240+ learn_buffer_len = 0;
73241+
73242+ spin_unlock(&gr_learn_lock);
73243+
73244+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
73245+ retval = -EFAULT;
73246+
73247+ mutex_unlock(&gr_learn_user_mutex);
73248+out:
73249+ set_current_state(TASK_RUNNING);
73250+ remove_wait_queue(&learn_wait, &wait);
73251+ return retval;
73252+}
73253+
73254+static unsigned int
73255+poll_learn(struct file * file, poll_table * wait)
73256+{
73257+ poll_wait(file, &learn_wait, wait);
73258+
73259+ if (learn_buffer_len)
73260+ return (POLLIN | POLLRDNORM);
73261+
73262+ return 0;
73263+}
73264+
73265+void
73266+gr_clear_learn_entries(void)
73267+{
73268+ char *tmp;
73269+
73270+ mutex_lock(&gr_learn_user_mutex);
73271+ spin_lock(&gr_learn_lock);
73272+ tmp = learn_buffer;
73273+ learn_buffer = NULL;
73274+ spin_unlock(&gr_learn_lock);
73275+ if (tmp)
73276+ vfree(tmp);
73277+ if (learn_buffer_user != NULL) {
73278+ vfree(learn_buffer_user);
73279+ learn_buffer_user = NULL;
73280+ }
73281+ learn_buffer_len = 0;
73282+ mutex_unlock(&gr_learn_user_mutex);
73283+
73284+ return;
73285+}
73286+
73287+void
73288+gr_add_learn_entry(const char *fmt, ...)
73289+{
73290+ va_list args;
73291+ unsigned int len;
73292+
73293+ if (!gr_learn_attached)
73294+ return;
73295+
73296+ spin_lock(&gr_learn_lock);
73297+
73298+ /* leave a gap at the end so we know when it's "full" but don't have to
73299+ compute the exact length of the string we're trying to append
73300+ */
73301+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
73302+ spin_unlock(&gr_learn_lock);
73303+ wake_up_interruptible(&learn_wait);
73304+ return;
73305+ }
73306+ if (learn_buffer == NULL) {
73307+ spin_unlock(&gr_learn_lock);
73308+ return;
73309+ }
73310+
73311+ va_start(args, fmt);
73312+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
73313+ va_end(args);
73314+
73315+ learn_buffer_len += len + 1;
73316+
73317+ spin_unlock(&gr_learn_lock);
73318+ wake_up_interruptible(&learn_wait);
73319+
73320+ return;
73321+}
73322+
73323+static int
73324+open_learn(struct inode *inode, struct file *file)
73325+{
73326+ if (file->f_mode & FMODE_READ && gr_learn_attached)
73327+ return -EBUSY;
73328+ if (file->f_mode & FMODE_READ) {
73329+ int retval = 0;
73330+ mutex_lock(&gr_learn_user_mutex);
73331+ if (learn_buffer == NULL)
73332+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
73333+ if (learn_buffer_user == NULL)
73334+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
73335+ if (learn_buffer == NULL) {
73336+ retval = -ENOMEM;
73337+ goto out_error;
73338+ }
73339+ if (learn_buffer_user == NULL) {
73340+ retval = -ENOMEM;
73341+ goto out_error;
73342+ }
73343+ learn_buffer_len = 0;
73344+ learn_buffer_user_len = 0;
73345+ gr_learn_attached = 1;
73346+out_error:
73347+ mutex_unlock(&gr_learn_user_mutex);
73348+ return retval;
73349+ }
73350+ return 0;
73351+}
73352+
73353+static int
73354+close_learn(struct inode *inode, struct file *file)
73355+{
73356+ if (file->f_mode & FMODE_READ) {
73357+ char *tmp = NULL;
73358+ mutex_lock(&gr_learn_user_mutex);
73359+ spin_lock(&gr_learn_lock);
73360+ tmp = learn_buffer;
73361+ learn_buffer = NULL;
73362+ spin_unlock(&gr_learn_lock);
73363+ if (tmp)
73364+ vfree(tmp);
73365+ if (learn_buffer_user != NULL) {
73366+ vfree(learn_buffer_user);
73367+ learn_buffer_user = NULL;
73368+ }
73369+ learn_buffer_len = 0;
73370+ learn_buffer_user_len = 0;
73371+ gr_learn_attached = 0;
73372+ mutex_unlock(&gr_learn_user_mutex);
73373+ }
73374+
73375+ return 0;
73376+}
73377+
73378+const struct file_operations grsec_fops = {
73379+ .read = read_learn,
73380+ .write = write_grsec_handler,
73381+ .open = open_learn,
73382+ .release = close_learn,
73383+ .poll = poll_learn,
73384+};
73385diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
73386new file mode 100644
73387index 0000000..3f8ade0
73388--- /dev/null
73389+++ b/grsecurity/gracl_policy.c
73390@@ -0,0 +1,1782 @@
73391+#include <linux/kernel.h>
73392+#include <linux/module.h>
73393+#include <linux/sched.h>
73394+#include <linux/mm.h>
73395+#include <linux/file.h>
73396+#include <linux/fs.h>
73397+#include <linux/namei.h>
73398+#include <linux/mount.h>
73399+#include <linux/tty.h>
73400+#include <linux/proc_fs.h>
73401+#include <linux/lglock.h>
73402+#include <linux/slab.h>
73403+#include <linux/vmalloc.h>
73404+#include <linux/types.h>
73405+#include <linux/sysctl.h>
73406+#include <linux/netdevice.h>
73407+#include <linux/ptrace.h>
73408+#include <linux/gracl.h>
73409+#include <linux/gralloc.h>
73410+#include <linux/security.h>
73411+#include <linux/grinternal.h>
73412+#include <linux/pid_namespace.h>
73413+#include <linux/stop_machine.h>
73414+#include <linux/fdtable.h>
73415+#include <linux/percpu.h>
73416+#include <linux/lglock.h>
73417+#include <linux/hugetlb.h>
73418+#include <linux/posix-timers.h>
73419+#include "../fs/mount.h"
73420+
73421+#include <asm/uaccess.h>
73422+#include <asm/errno.h>
73423+#include <asm/mman.h>
73424+
73425+extern struct gr_policy_state *polstate;
73426+
73427+#define FOR_EACH_ROLE_START(role) \
73428+ role = polstate->role_list; \
73429+ while (role) {
73430+
73431+#define FOR_EACH_ROLE_END(role) \
73432+ role = role->prev; \
73433+ }
73434+
73435+struct path gr_real_root;
73436+
73437+extern struct gr_alloc_state *current_alloc_state;
73438+
73439+u16 acl_sp_role_value;
73440+
73441+static DEFINE_MUTEX(gr_dev_mutex);
73442+
73443+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
73444+extern void gr_clear_learn_entries(void);
73445+
73446+struct gr_arg *gr_usermode __read_only;
73447+unsigned char *gr_system_salt __read_only;
73448+unsigned char *gr_system_sum __read_only;
73449+
73450+static unsigned int gr_auth_attempts = 0;
73451+static unsigned long gr_auth_expires = 0UL;
73452+
73453+struct acl_object_label *fakefs_obj_rw;
73454+struct acl_object_label *fakefs_obj_rwx;
73455+
73456+extern int gr_init_uidset(void);
73457+extern void gr_free_uidset(void);
73458+extern void gr_remove_uid(uid_t uid);
73459+extern int gr_find_uid(uid_t uid);
73460+
73461+extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
73462+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
73463+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
73464+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
73465+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);
73466+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
73467+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
73468+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
73469+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
73470+extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
73471+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
73472+extern void assign_special_role(const char *rolename);
73473+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
73474+extern int gr_rbac_disable(void *unused);
73475+extern void gr_enable_rbac_system(void);
73476+
73477+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
73478+{
73479+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
73480+ return -EFAULT;
73481+
73482+ return 0;
73483+}
73484+
73485+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
73486+{
73487+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
73488+ return -EFAULT;
73489+
73490+ return 0;
73491+}
73492+
73493+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
73494+{
73495+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
73496+ return -EFAULT;
73497+
73498+ return 0;
73499+}
73500+
73501+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
73502+{
73503+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
73504+ return -EFAULT;
73505+
73506+ return 0;
73507+}
73508+
73509+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
73510+{
73511+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
73512+ return -EFAULT;
73513+
73514+ return 0;
73515+}
73516+
73517+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
73518+{
73519+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
73520+ return -EFAULT;
73521+
73522+ return 0;
73523+}
73524+
73525+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
73526+{
73527+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
73528+ return -EFAULT;
73529+
73530+ return 0;
73531+}
73532+
73533+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
73534+{
73535+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
73536+ return -EFAULT;
73537+
73538+ return 0;
73539+}
73540+
73541+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
73542+{
73543+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
73544+ return -EFAULT;
73545+
73546+ return 0;
73547+}
73548+
73549+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
73550+{
73551+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
73552+ return -EFAULT;
73553+
73554+ if (((uwrap->version != GRSECURITY_VERSION) &&
73555+ (uwrap->version != 0x2901)) ||
73556+ (uwrap->size != sizeof(struct gr_arg)))
73557+ return -EINVAL;
73558+
73559+ return 0;
73560+}
73561+
73562+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
73563+{
73564+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
73565+ return -EFAULT;
73566+
73567+ return 0;
73568+}
73569+
73570+static size_t get_gr_arg_wrapper_size_normal(void)
73571+{
73572+ return sizeof(struct gr_arg_wrapper);
73573+}
73574+
73575+#ifdef CONFIG_COMPAT
73576+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
73577+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
73578+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
73579+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
73580+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
73581+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
73582+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
73583+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
73584+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
73585+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
73586+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
73587+extern size_t get_gr_arg_wrapper_size_compat(void);
73588+
73589+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
73590+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
73591+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
73592+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
73593+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
73594+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
73595+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
73596+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
73597+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
73598+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
73599+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
73600+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
73601+
73602+#else
73603+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
73604+#define copy_gr_arg copy_gr_arg_normal
73605+#define copy_gr_hash_struct copy_gr_hash_struct_normal
73606+#define copy_acl_object_label copy_acl_object_label_normal
73607+#define copy_acl_subject_label copy_acl_subject_label_normal
73608+#define copy_acl_role_label copy_acl_role_label_normal
73609+#define copy_acl_ip_label copy_acl_ip_label_normal
73610+#define copy_pointer_from_array copy_pointer_from_array_normal
73611+#define copy_sprole_pw copy_sprole_pw_normal
73612+#define copy_role_transition copy_role_transition_normal
73613+#define copy_role_allowed_ip copy_role_allowed_ip_normal
73614+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
73615+#endif
73616+
73617+static struct acl_subject_label *
73618+lookup_subject_map(const struct acl_subject_label *userp)
73619+{
73620+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
73621+ struct subject_map *match;
73622+
73623+ match = polstate->subj_map_set.s_hash[index];
73624+
73625+ while (match && match->user != userp)
73626+ match = match->next;
73627+
73628+ if (match != NULL)
73629+ return match->kernel;
73630+ else
73631+ return NULL;
73632+}
73633+
73634+static void
73635+insert_subj_map_entry(struct subject_map *subjmap)
73636+{
73637+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
73638+ struct subject_map **curr;
73639+
73640+ subjmap->prev = NULL;
73641+
73642+ curr = &polstate->subj_map_set.s_hash[index];
73643+ if (*curr != NULL)
73644+ (*curr)->prev = subjmap;
73645+
73646+ subjmap->next = *curr;
73647+ *curr = subjmap;
73648+
73649+ return;
73650+}
73651+
73652+static void
73653+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
73654+{
73655+ unsigned int index =
73656+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
73657+ struct acl_role_label **curr;
73658+ struct acl_role_label *tmp, *tmp2;
73659+
73660+ curr = &polstate->acl_role_set.r_hash[index];
73661+
73662+ /* simple case, slot is empty, just set it to our role */
73663+ if (*curr == NULL) {
73664+ *curr = role;
73665+ } else {
73666+ /* example:
73667+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
73668+ 2 -> 3
73669+ */
73670+ /* first check to see if we can already be reached via this slot */
73671+ tmp = *curr;
73672+ while (tmp && tmp != role)
73673+ tmp = tmp->next;
73674+ if (tmp == role) {
73675+ /* we don't need to add ourselves to this slot's chain */
73676+ return;
73677+ }
73678+ /* we need to add ourselves to this chain, two cases */
73679+ if (role->next == NULL) {
73680+ /* simple case, append the current chain to our role */
73681+ role->next = *curr;
73682+ *curr = role;
73683+ } else {
73684+ /* 1 -> 2 -> 3 -> 4
73685+ 2 -> 3 -> 4
73686+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
73687+ */
73688+ /* trickier case: walk our role's chain until we find
73689+ the role for the start of the current slot's chain */
73690+ tmp = role;
73691+ tmp2 = *curr;
73692+ while (tmp->next && tmp->next != tmp2)
73693+ tmp = tmp->next;
73694+ if (tmp->next == tmp2) {
73695+ /* from example above, we found 3, so just
73696+ replace this slot's chain with ours */
73697+ *curr = role;
73698+ } else {
73699+ /* we didn't find a subset of our role's chain
73700+ in the current slot's chain, so append their
73701+ chain to ours, and set us as the first role in
73702+ the slot's chain
73703+
73704+ we could fold this case with the case above,
73705+ but making it explicit for clarity
73706+ */
73707+ tmp->next = tmp2;
73708+ *curr = role;
73709+ }
73710+ }
73711+ }
73712+
73713+ return;
73714+}
73715+
73716+static void
73717+insert_acl_role_label(struct acl_role_label *role)
73718+{
73719+ int i;
73720+
73721+ if (polstate->role_list == NULL) {
73722+ polstate->role_list = role;
73723+ role->prev = NULL;
73724+ } else {
73725+ role->prev = polstate->role_list;
73726+ polstate->role_list = role;
73727+ }
73728+
73729+ /* used for hash chains */
73730+ role->next = NULL;
73731+
73732+ if (role->roletype & GR_ROLE_DOMAIN) {
73733+ for (i = 0; i < role->domain_child_num; i++)
73734+ __insert_acl_role_label(role, role->domain_children[i]);
73735+ } else
73736+ __insert_acl_role_label(role, role->uidgid);
73737+}
73738+
73739+static int
73740+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
73741+{
73742+ struct name_entry **curr, *nentry;
73743+ struct inodev_entry *ientry;
73744+ unsigned int len = strlen(name);
73745+ unsigned int key = full_name_hash(name, len);
73746+ unsigned int index = key % polstate->name_set.n_size;
73747+
73748+ curr = &polstate->name_set.n_hash[index];
73749+
73750+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
73751+ curr = &((*curr)->next);
73752+
73753+ if (*curr != NULL)
73754+ return 1;
73755+
73756+ nentry = acl_alloc(sizeof (struct name_entry));
73757+ if (nentry == NULL)
73758+ return 0;
73759+ ientry = acl_alloc(sizeof (struct inodev_entry));
73760+ if (ientry == NULL)
73761+ return 0;
73762+ ientry->nentry = nentry;
73763+
73764+ nentry->key = key;
73765+ nentry->name = name;
73766+ nentry->inode = inode;
73767+ nentry->device = device;
73768+ nentry->len = len;
73769+ nentry->deleted = deleted;
73770+
73771+ nentry->prev = NULL;
73772+ curr = &polstate->name_set.n_hash[index];
73773+ if (*curr != NULL)
73774+ (*curr)->prev = nentry;
73775+ nentry->next = *curr;
73776+ *curr = nentry;
73777+
73778+ /* insert us into the table searchable by inode/dev */
73779+ __insert_inodev_entry(polstate, ientry);
73780+
73781+ return 1;
73782+}
73783+
73784+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
73785+
73786+static void *
73787+create_table(__u32 * len, int elementsize)
73788+{
73789+ unsigned int table_sizes[] = {
73790+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
73791+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
73792+ 4194301, 8388593, 16777213, 33554393, 67108859
73793+ };
73794+ void *newtable = NULL;
73795+ unsigned int pwr = 0;
73796+
73797+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
73798+ table_sizes[pwr] <= *len)
73799+ pwr++;
73800+
73801+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
73802+ return newtable;
73803+
73804+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
73805+ newtable =
73806+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
73807+ else
73808+ newtable = vmalloc(table_sizes[pwr] * elementsize);
73809+
73810+ *len = table_sizes[pwr];
73811+
73812+ return newtable;
73813+}
73814+
73815+static int
73816+init_variables(const struct gr_arg *arg, bool reload)
73817+{
73818+ struct task_struct *reaper = init_pid_ns.child_reaper;
73819+ unsigned int stacksize;
73820+
73821+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
73822+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
73823+ polstate->name_set.n_size = arg->role_db.num_objects;
73824+ polstate->inodev_set.i_size = arg->role_db.num_objects;
73825+
73826+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
73827+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
73828+ return 1;
73829+
73830+ if (!reload) {
73831+ if (!gr_init_uidset())
73832+ return 1;
73833+ }
73834+
73835+ /* set up the stack that holds allocation info */
73836+
73837+ stacksize = arg->role_db.num_pointers + 5;
73838+
73839+ if (!acl_alloc_stack_init(stacksize))
73840+ return 1;
73841+
73842+ if (!reload) {
73843+ /* grab reference for the real root dentry and vfsmount */
73844+ get_fs_root(reaper->fs, &gr_real_root);
73845+
73846+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
73847+ 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);
73848+#endif
73849+
73850+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
73851+ if (fakefs_obj_rw == NULL)
73852+ return 1;
73853+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
73854+
73855+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
73856+ if (fakefs_obj_rwx == NULL)
73857+ return 1;
73858+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
73859+ }
73860+
73861+ polstate->subj_map_set.s_hash =
73862+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
73863+ polstate->acl_role_set.r_hash =
73864+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
73865+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
73866+ polstate->inodev_set.i_hash =
73867+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
73868+
73869+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
73870+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
73871+ return 1;
73872+
73873+ memset(polstate->subj_map_set.s_hash, 0,
73874+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
73875+ memset(polstate->acl_role_set.r_hash, 0,
73876+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
73877+ memset(polstate->name_set.n_hash, 0,
73878+ sizeof (struct name_entry *) * polstate->name_set.n_size);
73879+ memset(polstate->inodev_set.i_hash, 0,
73880+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
73881+
73882+ return 0;
73883+}
73884+
73885+/* free information not needed after startup
73886+ currently contains user->kernel pointer mappings for subjects
73887+*/
73888+
73889+static void
73890+free_init_variables(void)
73891+{
73892+ __u32 i;
73893+
73894+ if (polstate->subj_map_set.s_hash) {
73895+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
73896+ if (polstate->subj_map_set.s_hash[i]) {
73897+ kfree(polstate->subj_map_set.s_hash[i]);
73898+ polstate->subj_map_set.s_hash[i] = NULL;
73899+ }
73900+ }
73901+
73902+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
73903+ PAGE_SIZE)
73904+ kfree(polstate->subj_map_set.s_hash);
73905+ else
73906+ vfree(polstate->subj_map_set.s_hash);
73907+ }
73908+
73909+ return;
73910+}
73911+
73912+static void
73913+free_variables(bool reload)
73914+{
73915+ struct acl_subject_label *s;
73916+ struct acl_role_label *r;
73917+ struct task_struct *task, *task2;
73918+ unsigned int x;
73919+
73920+ if (!reload) {
73921+ gr_clear_learn_entries();
73922+
73923+ read_lock(&tasklist_lock);
73924+ do_each_thread(task2, task) {
73925+ task->acl_sp_role = 0;
73926+ task->acl_role_id = 0;
73927+ task->inherited = 0;
73928+ task->acl = NULL;
73929+ task->role = NULL;
73930+ } while_each_thread(task2, task);
73931+ read_unlock(&tasklist_lock);
73932+
73933+ kfree(fakefs_obj_rw);
73934+ fakefs_obj_rw = NULL;
73935+ kfree(fakefs_obj_rwx);
73936+ fakefs_obj_rwx = NULL;
73937+
73938+ /* release the reference to the real root dentry and vfsmount */
73939+ path_put(&gr_real_root);
73940+ memset(&gr_real_root, 0, sizeof(gr_real_root));
73941+ }
73942+
73943+ /* free all object hash tables */
73944+
73945+ FOR_EACH_ROLE_START(r)
73946+ if (r->subj_hash == NULL)
73947+ goto next_role;
73948+ FOR_EACH_SUBJECT_START(r, s, x)
73949+ if (s->obj_hash == NULL)
73950+ break;
73951+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
73952+ kfree(s->obj_hash);
73953+ else
73954+ vfree(s->obj_hash);
73955+ FOR_EACH_SUBJECT_END(s, x)
73956+ FOR_EACH_NESTED_SUBJECT_START(r, s)
73957+ if (s->obj_hash == NULL)
73958+ break;
73959+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
73960+ kfree(s->obj_hash);
73961+ else
73962+ vfree(s->obj_hash);
73963+ FOR_EACH_NESTED_SUBJECT_END(s)
73964+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
73965+ kfree(r->subj_hash);
73966+ else
73967+ vfree(r->subj_hash);
73968+ r->subj_hash = NULL;
73969+next_role:
73970+ FOR_EACH_ROLE_END(r)
73971+
73972+ acl_free_all();
73973+
73974+ if (polstate->acl_role_set.r_hash) {
73975+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
73976+ PAGE_SIZE)
73977+ kfree(polstate->acl_role_set.r_hash);
73978+ else
73979+ vfree(polstate->acl_role_set.r_hash);
73980+ }
73981+ if (polstate->name_set.n_hash) {
73982+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
73983+ PAGE_SIZE)
73984+ kfree(polstate->name_set.n_hash);
73985+ else
73986+ vfree(polstate->name_set.n_hash);
73987+ }
73988+
73989+ if (polstate->inodev_set.i_hash) {
73990+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
73991+ PAGE_SIZE)
73992+ kfree(polstate->inodev_set.i_hash);
73993+ else
73994+ vfree(polstate->inodev_set.i_hash);
73995+ }
73996+
73997+ if (!reload)
73998+ gr_free_uidset();
73999+
74000+ memset(&polstate->name_set, 0, sizeof (struct name_db));
74001+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
74002+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
74003+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
74004+
74005+ polstate->default_role = NULL;
74006+ polstate->kernel_role = NULL;
74007+ polstate->role_list = NULL;
74008+
74009+ return;
74010+}
74011+
74012+static struct acl_subject_label *
74013+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
74014+
74015+static int alloc_and_copy_string(char **name, unsigned int maxlen)
74016+{
74017+ unsigned int len = strnlen_user(*name, maxlen);
74018+ char *tmp;
74019+
74020+ if (!len || len >= maxlen)
74021+ return -EINVAL;
74022+
74023+ if ((tmp = (char *) acl_alloc(len)) == NULL)
74024+ return -ENOMEM;
74025+
74026+ if (copy_from_user(tmp, *name, len))
74027+ return -EFAULT;
74028+
74029+ tmp[len-1] = '\0';
74030+ *name = tmp;
74031+
74032+ return 0;
74033+}
74034+
74035+static int
74036+copy_user_glob(struct acl_object_label *obj)
74037+{
74038+ struct acl_object_label *g_tmp, **guser;
74039+ int error;
74040+
74041+ if (obj->globbed == NULL)
74042+ return 0;
74043+
74044+ guser = &obj->globbed;
74045+ while (*guser) {
74046+ g_tmp = (struct acl_object_label *)
74047+ acl_alloc(sizeof (struct acl_object_label));
74048+ if (g_tmp == NULL)
74049+ return -ENOMEM;
74050+
74051+ if (copy_acl_object_label(g_tmp, *guser))
74052+ return -EFAULT;
74053+
74054+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
74055+ if (error)
74056+ return error;
74057+
74058+ *guser = g_tmp;
74059+ guser = &(g_tmp->next);
74060+ }
74061+
74062+ return 0;
74063+}
74064+
74065+static int
74066+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
74067+ struct acl_role_label *role)
74068+{
74069+ struct acl_object_label *o_tmp;
74070+ int ret;
74071+
74072+ while (userp) {
74073+ if ((o_tmp = (struct acl_object_label *)
74074+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
74075+ return -ENOMEM;
74076+
74077+ if (copy_acl_object_label(o_tmp, userp))
74078+ return -EFAULT;
74079+
74080+ userp = o_tmp->prev;
74081+
74082+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
74083+ if (ret)
74084+ return ret;
74085+
74086+ insert_acl_obj_label(o_tmp, subj);
74087+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
74088+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
74089+ return -ENOMEM;
74090+
74091+ ret = copy_user_glob(o_tmp);
74092+ if (ret)
74093+ return ret;
74094+
74095+ if (o_tmp->nested) {
74096+ int already_copied;
74097+
74098+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
74099+ if (IS_ERR(o_tmp->nested))
74100+ return PTR_ERR(o_tmp->nested);
74101+
74102+ /* insert into nested subject list if we haven't copied this one yet
74103+ to prevent duplicate entries */
74104+ if (!already_copied) {
74105+ o_tmp->nested->next = role->hash->first;
74106+ role->hash->first = o_tmp->nested;
74107+ }
74108+ }
74109+ }
74110+
74111+ return 0;
74112+}
74113+
74114+static __u32
74115+count_user_subjs(struct acl_subject_label *userp)
74116+{
74117+ struct acl_subject_label s_tmp;
74118+ __u32 num = 0;
74119+
74120+ while (userp) {
74121+ if (copy_acl_subject_label(&s_tmp, userp))
74122+ break;
74123+
74124+ userp = s_tmp.prev;
74125+ }
74126+
74127+ return num;
74128+}
74129+
74130+static int
74131+copy_user_allowedips(struct acl_role_label *rolep)
74132+{
74133+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
74134+
74135+ ruserip = rolep->allowed_ips;
74136+
74137+ while (ruserip) {
74138+ rlast = rtmp;
74139+
74140+ if ((rtmp = (struct role_allowed_ip *)
74141+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
74142+ return -ENOMEM;
74143+
74144+ if (copy_role_allowed_ip(rtmp, ruserip))
74145+ return -EFAULT;
74146+
74147+ ruserip = rtmp->prev;
74148+
74149+ if (!rlast) {
74150+ rtmp->prev = NULL;
74151+ rolep->allowed_ips = rtmp;
74152+ } else {
74153+ rlast->next = rtmp;
74154+ rtmp->prev = rlast;
74155+ }
74156+
74157+ if (!ruserip)
74158+ rtmp->next = NULL;
74159+ }
74160+
74161+ return 0;
74162+}
74163+
74164+static int
74165+copy_user_transitions(struct acl_role_label *rolep)
74166+{
74167+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
74168+ int error;
74169+
74170+ rusertp = rolep->transitions;
74171+
74172+ while (rusertp) {
74173+ rlast = rtmp;
74174+
74175+ if ((rtmp = (struct role_transition *)
74176+ acl_alloc(sizeof (struct role_transition))) == NULL)
74177+ return -ENOMEM;
74178+
74179+ if (copy_role_transition(rtmp, rusertp))
74180+ return -EFAULT;
74181+
74182+ rusertp = rtmp->prev;
74183+
74184+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
74185+ if (error)
74186+ return error;
74187+
74188+ if (!rlast) {
74189+ rtmp->prev = NULL;
74190+ rolep->transitions = rtmp;
74191+ } else {
74192+ rlast->next = rtmp;
74193+ rtmp->prev = rlast;
74194+ }
74195+
74196+ if (!rusertp)
74197+ rtmp->next = NULL;
74198+ }
74199+
74200+ return 0;
74201+}
74202+
74203+static __u32 count_user_objs(const struct acl_object_label __user *userp)
74204+{
74205+ struct acl_object_label o_tmp;
74206+ __u32 num = 0;
74207+
74208+ while (userp) {
74209+ if (copy_acl_object_label(&o_tmp, userp))
74210+ break;
74211+
74212+ userp = o_tmp.prev;
74213+ num++;
74214+ }
74215+
74216+ return num;
74217+}
74218+
74219+static struct acl_subject_label *
74220+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
74221+{
74222+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
74223+ __u32 num_objs;
74224+ struct acl_ip_label **i_tmp, *i_utmp2;
74225+ struct gr_hash_struct ghash;
74226+ struct subject_map *subjmap;
74227+ unsigned int i_num;
74228+ int err;
74229+
74230+ if (already_copied != NULL)
74231+ *already_copied = 0;
74232+
74233+ s_tmp = lookup_subject_map(userp);
74234+
74235+ /* we've already copied this subject into the kernel, just return
74236+ the reference to it, and don't copy it over again
74237+ */
74238+ if (s_tmp) {
74239+ if (already_copied != NULL)
74240+ *already_copied = 1;
74241+ return(s_tmp);
74242+ }
74243+
74244+ if ((s_tmp = (struct acl_subject_label *)
74245+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
74246+ return ERR_PTR(-ENOMEM);
74247+
74248+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
74249+ if (subjmap == NULL)
74250+ return ERR_PTR(-ENOMEM);
74251+
74252+ subjmap->user = userp;
74253+ subjmap->kernel = s_tmp;
74254+ insert_subj_map_entry(subjmap);
74255+
74256+ if (copy_acl_subject_label(s_tmp, userp))
74257+ return ERR_PTR(-EFAULT);
74258+
74259+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
74260+ if (err)
74261+ return ERR_PTR(err);
74262+
74263+ if (!strcmp(s_tmp->filename, "/"))
74264+ role->root_label = s_tmp;
74265+
74266+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
74267+ return ERR_PTR(-EFAULT);
74268+
74269+ /* copy user and group transition tables */
74270+
74271+ if (s_tmp->user_trans_num) {
74272+ uid_t *uidlist;
74273+
74274+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
74275+ if (uidlist == NULL)
74276+ return ERR_PTR(-ENOMEM);
74277+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
74278+ return ERR_PTR(-EFAULT);
74279+
74280+ s_tmp->user_transitions = uidlist;
74281+ }
74282+
74283+ if (s_tmp->group_trans_num) {
74284+ gid_t *gidlist;
74285+
74286+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
74287+ if (gidlist == NULL)
74288+ return ERR_PTR(-ENOMEM);
74289+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
74290+ return ERR_PTR(-EFAULT);
74291+
74292+ s_tmp->group_transitions = gidlist;
74293+ }
74294+
74295+ /* set up object hash table */
74296+ num_objs = count_user_objs(ghash.first);
74297+
74298+ s_tmp->obj_hash_size = num_objs;
74299+ s_tmp->obj_hash =
74300+ (struct acl_object_label **)
74301+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
74302+
74303+ if (!s_tmp->obj_hash)
74304+ return ERR_PTR(-ENOMEM);
74305+
74306+ memset(s_tmp->obj_hash, 0,
74307+ s_tmp->obj_hash_size *
74308+ sizeof (struct acl_object_label *));
74309+
74310+ /* add in objects */
74311+ err = copy_user_objs(ghash.first, s_tmp, role);
74312+
74313+ if (err)
74314+ return ERR_PTR(err);
74315+
74316+ /* set pointer for parent subject */
74317+ if (s_tmp->parent_subject) {
74318+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
74319+
74320+ if (IS_ERR(s_tmp2))
74321+ return s_tmp2;
74322+
74323+ s_tmp->parent_subject = s_tmp2;
74324+ }
74325+
74326+ /* add in ip acls */
74327+
74328+ if (!s_tmp->ip_num) {
74329+ s_tmp->ips = NULL;
74330+ goto insert;
74331+ }
74332+
74333+ i_tmp =
74334+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
74335+ sizeof (struct acl_ip_label *));
74336+
74337+ if (!i_tmp)
74338+ return ERR_PTR(-ENOMEM);
74339+
74340+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
74341+ *(i_tmp + i_num) =
74342+ (struct acl_ip_label *)
74343+ acl_alloc(sizeof (struct acl_ip_label));
74344+ if (!*(i_tmp + i_num))
74345+ return ERR_PTR(-ENOMEM);
74346+
74347+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
74348+ return ERR_PTR(-EFAULT);
74349+
74350+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
74351+ return ERR_PTR(-EFAULT);
74352+
74353+ if ((*(i_tmp + i_num))->iface == NULL)
74354+ continue;
74355+
74356+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
74357+ if (err)
74358+ return ERR_PTR(err);
74359+ }
74360+
74361+ s_tmp->ips = i_tmp;
74362+
74363+insert:
74364+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
74365+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
74366+ return ERR_PTR(-ENOMEM);
74367+
74368+ return s_tmp;
74369+}
74370+
74371+static int
74372+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
74373+{
74374+ struct acl_subject_label s_pre;
74375+ struct acl_subject_label * ret;
74376+ int err;
74377+
74378+ while (userp) {
74379+ if (copy_acl_subject_label(&s_pre, userp))
74380+ return -EFAULT;
74381+
74382+ ret = do_copy_user_subj(userp, role, NULL);
74383+
74384+ err = PTR_ERR(ret);
74385+ if (IS_ERR(ret))
74386+ return err;
74387+
74388+ insert_acl_subj_label(ret, role);
74389+
74390+ userp = s_pre.prev;
74391+ }
74392+
74393+ return 0;
74394+}
74395+
74396+static int
74397+copy_user_acl(struct gr_arg *arg)
74398+{
74399+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
74400+ struct acl_subject_label *subj_list;
74401+ struct sprole_pw *sptmp;
74402+ struct gr_hash_struct *ghash;
74403+ uid_t *domainlist;
74404+ unsigned int r_num;
74405+ int err = 0;
74406+ __u16 i;
74407+ __u32 num_subjs;
74408+
74409+ /* we need a default and kernel role */
74410+ if (arg->role_db.num_roles < 2)
74411+ return -EINVAL;
74412+
74413+ /* copy special role authentication info from userspace */
74414+
74415+ polstate->num_sprole_pws = arg->num_sprole_pws;
74416+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
74417+
74418+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
74419+ return -ENOMEM;
74420+
74421+ for (i = 0; i < polstate->num_sprole_pws; i++) {
74422+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
74423+ if (!sptmp)
74424+ return -ENOMEM;
74425+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
74426+ return -EFAULT;
74427+
74428+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
74429+ if (err)
74430+ return err;
74431+
74432+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
74433+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
74434+#endif
74435+
74436+ polstate->acl_special_roles[i] = sptmp;
74437+ }
74438+
74439+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
74440+
74441+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
74442+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
74443+
74444+ if (!r_tmp)
74445+ return -ENOMEM;
74446+
74447+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
74448+ return -EFAULT;
74449+
74450+ if (copy_acl_role_label(r_tmp, r_utmp2))
74451+ return -EFAULT;
74452+
74453+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
74454+ if (err)
74455+ return err;
74456+
74457+ if (!strcmp(r_tmp->rolename, "default")
74458+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
74459+ polstate->default_role = r_tmp;
74460+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
74461+ polstate->kernel_role = r_tmp;
74462+ }
74463+
74464+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
74465+ return -ENOMEM;
74466+
74467+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
74468+ return -EFAULT;
74469+
74470+ r_tmp->hash = ghash;
74471+
74472+ num_subjs = count_user_subjs(r_tmp->hash->first);
74473+
74474+ r_tmp->subj_hash_size = num_subjs;
74475+ r_tmp->subj_hash =
74476+ (struct acl_subject_label **)
74477+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
74478+
74479+ if (!r_tmp->subj_hash)
74480+ return -ENOMEM;
74481+
74482+ err = copy_user_allowedips(r_tmp);
74483+ if (err)
74484+ return err;
74485+
74486+ /* copy domain info */
74487+ if (r_tmp->domain_children != NULL) {
74488+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
74489+ if (domainlist == NULL)
74490+ return -ENOMEM;
74491+
74492+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
74493+ return -EFAULT;
74494+
74495+ r_tmp->domain_children = domainlist;
74496+ }
74497+
74498+ err = copy_user_transitions(r_tmp);
74499+ if (err)
74500+ return err;
74501+
74502+ memset(r_tmp->subj_hash, 0,
74503+ r_tmp->subj_hash_size *
74504+ sizeof (struct acl_subject_label *));
74505+
74506+ /* acquire the list of subjects, then NULL out
74507+ the list prior to parsing the subjects for this role,
74508+ as during this parsing the list is replaced with a list
74509+ of *nested* subjects for the role
74510+ */
74511+ subj_list = r_tmp->hash->first;
74512+
74513+ /* set nested subject list to null */
74514+ r_tmp->hash->first = NULL;
74515+
74516+ err = copy_user_subjs(subj_list, r_tmp);
74517+
74518+ if (err)
74519+ return err;
74520+
74521+ insert_acl_role_label(r_tmp);
74522+ }
74523+
74524+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
74525+ return -EINVAL;
74526+
74527+ return err;
74528+}
74529+
74530+static int gracl_reload_apply_policies(void *reload)
74531+{
74532+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
74533+ struct task_struct *task, *task2;
74534+ struct acl_role_label *role, *rtmp;
74535+ struct acl_subject_label *subj;
74536+ const struct cred *cred;
74537+ int role_applied;
74538+ int ret = 0;
74539+
74540+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
74541+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
74542+
74543+ /* first make sure we'll be able to apply the new policy cleanly */
74544+ do_each_thread(task2, task) {
74545+ if (task->exec_file == NULL)
74546+ continue;
74547+ role_applied = 0;
74548+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
74549+ /* preserve special roles */
74550+ FOR_EACH_ROLE_START(role)
74551+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
74552+ rtmp = task->role;
74553+ task->role = role;
74554+ role_applied = 1;
74555+ break;
74556+ }
74557+ FOR_EACH_ROLE_END(role)
74558+ }
74559+ if (!role_applied) {
74560+ cred = __task_cred(task);
74561+ rtmp = task->role;
74562+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
74563+ }
74564+ /* this handles non-nested inherited subjects, nested subjects will still
74565+ be dropped currently */
74566+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
74567+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
74568+ /* change the role back so that we've made no modifications to the policy */
74569+ task->role = rtmp;
74570+
74571+ if (subj == NULL || task->tmpacl == NULL) {
74572+ ret = -EINVAL;
74573+ goto out;
74574+ }
74575+ } while_each_thread(task2, task);
74576+
74577+ /* now actually apply the policy */
74578+
74579+ do_each_thread(task2, task) {
74580+ if (task->exec_file) {
74581+ role_applied = 0;
74582+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
74583+ /* preserve special roles */
74584+ FOR_EACH_ROLE_START(role)
74585+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
74586+ task->role = role;
74587+ role_applied = 1;
74588+ break;
74589+ }
74590+ FOR_EACH_ROLE_END(role)
74591+ }
74592+ if (!role_applied) {
74593+ cred = __task_cred(task);
74594+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
74595+ }
74596+ /* this handles non-nested inherited subjects, nested subjects will still
74597+ be dropped currently */
74598+ if (!reload_state->oldmode && task->inherited)
74599+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
74600+ else {
74601+ /* looked up and tagged to the task previously */
74602+ subj = task->tmpacl;
74603+ }
74604+ /* subj will be non-null */
74605+ __gr_apply_subject_to_task(polstate, task, subj);
74606+ if (reload_state->oldmode) {
74607+ task->acl_role_id = 0;
74608+ task->acl_sp_role = 0;
74609+ task->inherited = 0;
74610+ }
74611+ } else {
74612+ // it's a kernel process
74613+ task->role = polstate->kernel_role;
74614+ task->acl = polstate->kernel_role->root_label;
74615+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
74616+ task->acl->mode &= ~GR_PROCFIND;
74617+#endif
74618+ }
74619+ } while_each_thread(task2, task);
74620+
74621+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
74622+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
74623+
74624+out:
74625+
74626+ return ret;
74627+}
74628+
74629+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
74630+{
74631+ struct gr_reload_state new_reload_state = { };
74632+ int err;
74633+
74634+ new_reload_state.oldpolicy_ptr = polstate;
74635+ new_reload_state.oldalloc_ptr = current_alloc_state;
74636+ new_reload_state.oldmode = oldmode;
74637+
74638+ current_alloc_state = &new_reload_state.newalloc;
74639+ polstate = &new_reload_state.newpolicy;
74640+
74641+ /* everything relevant is now saved off, copy in the new policy */
74642+ if (init_variables(args, true)) {
74643+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
74644+ err = -ENOMEM;
74645+ goto error;
74646+ }
74647+
74648+ err = copy_user_acl(args);
74649+ free_init_variables();
74650+ if (err)
74651+ goto error;
74652+ /* the new policy is copied in, with the old policy available via saved_state
74653+ first go through applying roles, making sure to preserve special roles
74654+ then apply new subjects, making sure to preserve inherited and nested subjects,
74655+ though currently only inherited subjects will be preserved
74656+ */
74657+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
74658+ if (err)
74659+ goto error;
74660+
74661+ /* we've now applied the new policy, so restore the old policy state to free it */
74662+ polstate = &new_reload_state.oldpolicy;
74663+ current_alloc_state = &new_reload_state.oldalloc;
74664+ free_variables(true);
74665+
74666+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
74667+ to running_polstate/current_alloc_state inside stop_machine
74668+ */
74669+ err = 0;
74670+ goto out;
74671+error:
74672+ /* on error of loading the new policy, we'll just keep the previous
74673+ policy set around
74674+ */
74675+ free_variables(true);
74676+
74677+ /* doesn't affect runtime, but maintains consistent state */
74678+out:
74679+ polstate = new_reload_state.oldpolicy_ptr;
74680+ current_alloc_state = new_reload_state.oldalloc_ptr;
74681+
74682+ return err;
74683+}
74684+
74685+static int
74686+gracl_init(struct gr_arg *args)
74687+{
74688+ int error = 0;
74689+
74690+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
74691+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
74692+
74693+ if (init_variables(args, false)) {
74694+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
74695+ error = -ENOMEM;
74696+ goto out;
74697+ }
74698+
74699+ error = copy_user_acl(args);
74700+ free_init_variables();
74701+ if (error)
74702+ goto out;
74703+
74704+ error = gr_set_acls(0);
74705+ if (error)
74706+ goto out;
74707+
74708+ gr_enable_rbac_system();
74709+
74710+ return 0;
74711+
74712+out:
74713+ free_variables(false);
74714+ return error;
74715+}
74716+
74717+static int
74718+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
74719+ unsigned char **sum)
74720+{
74721+ struct acl_role_label *r;
74722+ struct role_allowed_ip *ipp;
74723+ struct role_transition *trans;
74724+ unsigned int i;
74725+ int found = 0;
74726+ u32 curr_ip = current->signal->curr_ip;
74727+
74728+ current->signal->saved_ip = curr_ip;
74729+
74730+ /* check transition table */
74731+
74732+ for (trans = current->role->transitions; trans; trans = trans->next) {
74733+ if (!strcmp(rolename, trans->rolename)) {
74734+ found = 1;
74735+ break;
74736+ }
74737+ }
74738+
74739+ if (!found)
74740+ return 0;
74741+
74742+ /* handle special roles that do not require authentication
74743+ and check ip */
74744+
74745+ FOR_EACH_ROLE_START(r)
74746+ if (!strcmp(rolename, r->rolename) &&
74747+ (r->roletype & GR_ROLE_SPECIAL)) {
74748+ found = 0;
74749+ if (r->allowed_ips != NULL) {
74750+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
74751+ if ((ntohl(curr_ip) & ipp->netmask) ==
74752+ (ntohl(ipp->addr) & ipp->netmask))
74753+ found = 1;
74754+ }
74755+ } else
74756+ found = 2;
74757+ if (!found)
74758+ return 0;
74759+
74760+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
74761+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
74762+ *salt = NULL;
74763+ *sum = NULL;
74764+ return 1;
74765+ }
74766+ }
74767+ FOR_EACH_ROLE_END(r)
74768+
74769+ for (i = 0; i < polstate->num_sprole_pws; i++) {
74770+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
74771+ *salt = polstate->acl_special_roles[i]->salt;
74772+ *sum = polstate->acl_special_roles[i]->sum;
74773+ return 1;
74774+ }
74775+ }
74776+
74777+ return 0;
74778+}
74779+
74780+int gr_check_secure_terminal(struct task_struct *task)
74781+{
74782+ struct task_struct *p, *p2, *p3;
74783+ struct files_struct *files;
74784+ struct fdtable *fdt;
74785+ struct file *our_file = NULL, *file;
74786+ int i;
74787+
74788+ if (task->signal->tty == NULL)
74789+ return 1;
74790+
74791+ files = get_files_struct(task);
74792+ if (files != NULL) {
74793+ rcu_read_lock();
74794+ fdt = files_fdtable(files);
74795+ for (i=0; i < fdt->max_fds; i++) {
74796+ file = fcheck_files(files, i);
74797+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
74798+ get_file(file);
74799+ our_file = file;
74800+ }
74801+ }
74802+ rcu_read_unlock();
74803+ put_files_struct(files);
74804+ }
74805+
74806+ if (our_file == NULL)
74807+ return 1;
74808+
74809+ read_lock(&tasklist_lock);
74810+ do_each_thread(p2, p) {
74811+ files = get_files_struct(p);
74812+ if (files == NULL ||
74813+ (p->signal && p->signal->tty == task->signal->tty)) {
74814+ if (files != NULL)
74815+ put_files_struct(files);
74816+ continue;
74817+ }
74818+ rcu_read_lock();
74819+ fdt = files_fdtable(files);
74820+ for (i=0; i < fdt->max_fds; i++) {
74821+ file = fcheck_files(files, i);
74822+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
74823+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
74824+ p3 = task;
74825+ while (task_pid_nr(p3) > 0) {
74826+ if (p3 == p)
74827+ break;
74828+ p3 = p3->real_parent;
74829+ }
74830+ if (p3 == p)
74831+ break;
74832+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
74833+ gr_handle_alertkill(p);
74834+ rcu_read_unlock();
74835+ put_files_struct(files);
74836+ read_unlock(&tasklist_lock);
74837+ fput(our_file);
74838+ return 0;
74839+ }
74840+ }
74841+ rcu_read_unlock();
74842+ put_files_struct(files);
74843+ } while_each_thread(p2, p);
74844+ read_unlock(&tasklist_lock);
74845+
74846+ fput(our_file);
74847+ return 1;
74848+}
74849+
74850+ssize_t
74851+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
74852+{
74853+ struct gr_arg_wrapper uwrap;
74854+ unsigned char *sprole_salt = NULL;
74855+ unsigned char *sprole_sum = NULL;
74856+ int error = 0;
74857+ int error2 = 0;
74858+ size_t req_count = 0;
74859+ unsigned char oldmode = 0;
74860+
74861+ mutex_lock(&gr_dev_mutex);
74862+
74863+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
74864+ error = -EPERM;
74865+ goto out;
74866+ }
74867+
74868+#ifdef CONFIG_COMPAT
74869+ pax_open_kernel();
74870+ if (is_compat_task()) {
74871+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
74872+ copy_gr_arg = &copy_gr_arg_compat;
74873+ copy_acl_object_label = &copy_acl_object_label_compat;
74874+ copy_acl_subject_label = &copy_acl_subject_label_compat;
74875+ copy_acl_role_label = &copy_acl_role_label_compat;
74876+ copy_acl_ip_label = &copy_acl_ip_label_compat;
74877+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
74878+ copy_role_transition = &copy_role_transition_compat;
74879+ copy_sprole_pw = &copy_sprole_pw_compat;
74880+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
74881+ copy_pointer_from_array = &copy_pointer_from_array_compat;
74882+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
74883+ } else {
74884+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
74885+ copy_gr_arg = &copy_gr_arg_normal;
74886+ copy_acl_object_label = &copy_acl_object_label_normal;
74887+ copy_acl_subject_label = &copy_acl_subject_label_normal;
74888+ copy_acl_role_label = &copy_acl_role_label_normal;
74889+ copy_acl_ip_label = &copy_acl_ip_label_normal;
74890+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
74891+ copy_role_transition = &copy_role_transition_normal;
74892+ copy_sprole_pw = &copy_sprole_pw_normal;
74893+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
74894+ copy_pointer_from_array = &copy_pointer_from_array_normal;
74895+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
74896+ }
74897+ pax_close_kernel();
74898+#endif
74899+
74900+ req_count = get_gr_arg_wrapper_size();
74901+
74902+ if (count != req_count) {
74903+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
74904+ error = -EINVAL;
74905+ goto out;
74906+ }
74907+
74908+
74909+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
74910+ gr_auth_expires = 0;
74911+ gr_auth_attempts = 0;
74912+ }
74913+
74914+ error = copy_gr_arg_wrapper(buf, &uwrap);
74915+ if (error)
74916+ goto out;
74917+
74918+ error = copy_gr_arg(uwrap.arg, gr_usermode);
74919+ if (error)
74920+ goto out;
74921+
74922+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
74923+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
74924+ time_after(gr_auth_expires, get_seconds())) {
74925+ error = -EBUSY;
74926+ goto out;
74927+ }
74928+
74929+ /* if non-root trying to do anything other than use a special role,
74930+ do not attempt authentication, do not count towards authentication
74931+ locking
74932+ */
74933+
74934+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
74935+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
74936+ gr_is_global_nonroot(current_uid())) {
74937+ error = -EPERM;
74938+ goto out;
74939+ }
74940+
74941+ /* ensure pw and special role name are null terminated */
74942+
74943+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
74944+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
74945+
74946+ /* Okay.
74947+ * We have our enough of the argument structure..(we have yet
74948+ * to copy_from_user the tables themselves) . Copy the tables
74949+ * only if we need them, i.e. for loading operations. */
74950+
74951+ switch (gr_usermode->mode) {
74952+ case GR_STATUS:
74953+ if (gr_acl_is_enabled()) {
74954+ error = 1;
74955+ if (!gr_check_secure_terminal(current))
74956+ error = 3;
74957+ } else
74958+ error = 2;
74959+ goto out;
74960+ case GR_SHUTDOWN:
74961+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
74962+ stop_machine(gr_rbac_disable, NULL, NULL);
74963+ free_variables(false);
74964+ memset(gr_usermode, 0, sizeof(struct gr_arg));
74965+ memset(gr_system_salt, 0, GR_SALT_LEN);
74966+ memset(gr_system_sum, 0, GR_SHA_LEN);
74967+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
74968+ } else if (gr_acl_is_enabled()) {
74969+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
74970+ error = -EPERM;
74971+ } else {
74972+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
74973+ error = -EAGAIN;
74974+ }
74975+ break;
74976+ case GR_ENABLE:
74977+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
74978+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
74979+ else {
74980+ if (gr_acl_is_enabled())
74981+ error = -EAGAIN;
74982+ else
74983+ error = error2;
74984+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
74985+ }
74986+ break;
74987+ case GR_OLDRELOAD:
74988+ oldmode = 1;
74989+ case GR_RELOAD:
74990+ if (!gr_acl_is_enabled()) {
74991+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
74992+ error = -EAGAIN;
74993+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
74994+ error2 = gracl_reload(gr_usermode, oldmode);
74995+ if (!error2)
74996+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
74997+ else {
74998+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
74999+ error = error2;
75000+ }
75001+ } else {
75002+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
75003+ error = -EPERM;
75004+ }
75005+ break;
75006+ case GR_SEGVMOD:
75007+ if (unlikely(!gr_acl_is_enabled())) {
75008+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
75009+ error = -EAGAIN;
75010+ break;
75011+ }
75012+
75013+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
75014+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
75015+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
75016+ struct acl_subject_label *segvacl;
75017+ segvacl =
75018+ lookup_acl_subj_label(gr_usermode->segv_inode,
75019+ gr_usermode->segv_device,
75020+ current->role);
75021+ if (segvacl) {
75022+ segvacl->crashes = 0;
75023+ segvacl->expires = 0;
75024+ }
75025+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
75026+ gr_remove_uid(gr_usermode->segv_uid);
75027+ }
75028+ } else {
75029+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
75030+ error = -EPERM;
75031+ }
75032+ break;
75033+ case GR_SPROLE:
75034+ case GR_SPROLEPAM:
75035+ if (unlikely(!gr_acl_is_enabled())) {
75036+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
75037+ error = -EAGAIN;
75038+ break;
75039+ }
75040+
75041+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
75042+ current->role->expires = 0;
75043+ current->role->auth_attempts = 0;
75044+ }
75045+
75046+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
75047+ time_after(current->role->expires, get_seconds())) {
75048+ error = -EBUSY;
75049+ goto out;
75050+ }
75051+
75052+ if (lookup_special_role_auth
75053+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
75054+ && ((!sprole_salt && !sprole_sum)
75055+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
75056+ char *p = "";
75057+ assign_special_role(gr_usermode->sp_role);
75058+ read_lock(&tasklist_lock);
75059+ if (current->real_parent)
75060+ p = current->real_parent->role->rolename;
75061+ read_unlock(&tasklist_lock);
75062+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
75063+ p, acl_sp_role_value);
75064+ } else {
75065+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
75066+ error = -EPERM;
75067+ if(!(current->role->auth_attempts++))
75068+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75069+
75070+ goto out;
75071+ }
75072+ break;
75073+ case GR_UNSPROLE:
75074+ if (unlikely(!gr_acl_is_enabled())) {
75075+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
75076+ error = -EAGAIN;
75077+ break;
75078+ }
75079+
75080+ if (current->role->roletype & GR_ROLE_SPECIAL) {
75081+ char *p = "";
75082+ int i = 0;
75083+
75084+ read_lock(&tasklist_lock);
75085+ if (current->real_parent) {
75086+ p = current->real_parent->role->rolename;
75087+ i = current->real_parent->acl_role_id;
75088+ }
75089+ read_unlock(&tasklist_lock);
75090+
75091+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
75092+ gr_set_acls(1);
75093+ } else {
75094+ error = -EPERM;
75095+ goto out;
75096+ }
75097+ break;
75098+ default:
75099+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
75100+ error = -EINVAL;
75101+ break;
75102+ }
75103+
75104+ if (error != -EPERM)
75105+ goto out;
75106+
75107+ if(!(gr_auth_attempts++))
75108+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
75109+
75110+ out:
75111+ mutex_unlock(&gr_dev_mutex);
75112+
75113+ if (!error)
75114+ error = req_count;
75115+
75116+ return error;
75117+}
75118+
75119+int
75120+gr_set_acls(const int type)
75121+{
75122+ struct task_struct *task, *task2;
75123+ struct acl_role_label *role = current->role;
75124+ struct acl_subject_label *subj;
75125+ __u16 acl_role_id = current->acl_role_id;
75126+ const struct cred *cred;
75127+ int ret;
75128+
75129+ rcu_read_lock();
75130+ read_lock(&tasklist_lock);
75131+ read_lock(&grsec_exec_file_lock);
75132+ do_each_thread(task2, task) {
75133+ /* check to see if we're called from the exit handler,
75134+ if so, only replace ACLs that have inherited the admin
75135+ ACL */
75136+
75137+ if (type && (task->role != role ||
75138+ task->acl_role_id != acl_role_id))
75139+ continue;
75140+
75141+ task->acl_role_id = 0;
75142+ task->acl_sp_role = 0;
75143+ task->inherited = 0;
75144+
75145+ if (task->exec_file) {
75146+ cred = __task_cred(task);
75147+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75148+ subj = __gr_get_subject_for_task(polstate, task, NULL);
75149+ if (subj == NULL) {
75150+ ret = -EINVAL;
75151+ read_unlock(&grsec_exec_file_lock);
75152+ read_unlock(&tasklist_lock);
75153+ rcu_read_unlock();
75154+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
75155+ return ret;
75156+ }
75157+ __gr_apply_subject_to_task(polstate, task, subj);
75158+ } else {
75159+ // it's a kernel process
75160+ task->role = polstate->kernel_role;
75161+ task->acl = polstate->kernel_role->root_label;
75162+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
75163+ task->acl->mode &= ~GR_PROCFIND;
75164+#endif
75165+ }
75166+ } while_each_thread(task2, task);
75167+ read_unlock(&grsec_exec_file_lock);
75168+ read_unlock(&tasklist_lock);
75169+ rcu_read_unlock();
75170+
75171+ return 0;
75172+}
75173diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
75174new file mode 100644
75175index 0000000..39645c9
75176--- /dev/null
75177+++ b/grsecurity/gracl_res.c
75178@@ -0,0 +1,68 @@
75179+#include <linux/kernel.h>
75180+#include <linux/sched.h>
75181+#include <linux/gracl.h>
75182+#include <linux/grinternal.h>
75183+
75184+static const char *restab_log[] = {
75185+ [RLIMIT_CPU] = "RLIMIT_CPU",
75186+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
75187+ [RLIMIT_DATA] = "RLIMIT_DATA",
75188+ [RLIMIT_STACK] = "RLIMIT_STACK",
75189+ [RLIMIT_CORE] = "RLIMIT_CORE",
75190+ [RLIMIT_RSS] = "RLIMIT_RSS",
75191+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
75192+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
75193+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
75194+ [RLIMIT_AS] = "RLIMIT_AS",
75195+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
75196+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
75197+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
75198+ [RLIMIT_NICE] = "RLIMIT_NICE",
75199+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
75200+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
75201+ [GR_CRASH_RES] = "RLIMIT_CRASH"
75202+};
75203+
75204+void
75205+gr_log_resource(const struct task_struct *task,
75206+ const int res, const unsigned long wanted, const int gt)
75207+{
75208+ const struct cred *cred;
75209+ unsigned long rlim;
75210+
75211+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
75212+ return;
75213+
75214+ // not yet supported resource
75215+ if (unlikely(!restab_log[res]))
75216+ return;
75217+
75218+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
75219+ rlim = task_rlimit_max(task, res);
75220+ else
75221+ rlim = task_rlimit(task, res);
75222+
75223+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
75224+ return;
75225+
75226+ rcu_read_lock();
75227+ cred = __task_cred(task);
75228+
75229+ if (res == RLIMIT_NPROC &&
75230+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
75231+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
75232+ goto out_rcu_unlock;
75233+ else if (res == RLIMIT_MEMLOCK &&
75234+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
75235+ goto out_rcu_unlock;
75236+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
75237+ goto out_rcu_unlock;
75238+ rcu_read_unlock();
75239+
75240+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
75241+
75242+ return;
75243+out_rcu_unlock:
75244+ rcu_read_unlock();
75245+ return;
75246+}
75247diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
75248new file mode 100644
75249index 0000000..2040e61
75250--- /dev/null
75251+++ b/grsecurity/gracl_segv.c
75252@@ -0,0 +1,313 @@
75253+#include <linux/kernel.h>
75254+#include <linux/mm.h>
75255+#include <asm/uaccess.h>
75256+#include <asm/errno.h>
75257+#include <asm/mman.h>
75258+#include <net/sock.h>
75259+#include <linux/file.h>
75260+#include <linux/fs.h>
75261+#include <linux/net.h>
75262+#include <linux/in.h>
75263+#include <linux/slab.h>
75264+#include <linux/types.h>
75265+#include <linux/sched.h>
75266+#include <linux/timer.h>
75267+#include <linux/gracl.h>
75268+#include <linux/grsecurity.h>
75269+#include <linux/grinternal.h>
75270+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
75271+#include <linux/magic.h>
75272+#include <linux/pagemap.h>
75273+#include "../fs/btrfs/async-thread.h"
75274+#include "../fs/btrfs/ctree.h"
75275+#include "../fs/btrfs/btrfs_inode.h"
75276+#endif
75277+
75278+static struct crash_uid *uid_set;
75279+static unsigned short uid_used;
75280+static DEFINE_SPINLOCK(gr_uid_lock);
75281+extern rwlock_t gr_inode_lock;
75282+extern struct acl_subject_label *
75283+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
75284+ struct acl_role_label *role);
75285+
75286+static inline dev_t __get_dev(const struct dentry *dentry)
75287+{
75288+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
75289+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
75290+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
75291+ else
75292+#endif
75293+ return dentry->d_sb->s_dev;
75294+}
75295+
75296+int
75297+gr_init_uidset(void)
75298+{
75299+ uid_set =
75300+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
75301+ uid_used = 0;
75302+
75303+ return uid_set ? 1 : 0;
75304+}
75305+
75306+void
75307+gr_free_uidset(void)
75308+{
75309+ if (uid_set) {
75310+ struct crash_uid *tmpset;
75311+ spin_lock(&gr_uid_lock);
75312+ tmpset = uid_set;
75313+ uid_set = NULL;
75314+ uid_used = 0;
75315+ spin_unlock(&gr_uid_lock);
75316+ if (tmpset)
75317+ kfree(tmpset);
75318+ }
75319+
75320+ return;
75321+}
75322+
75323+int
75324+gr_find_uid(const uid_t uid)
75325+{
75326+ struct crash_uid *tmp = uid_set;
75327+ uid_t buid;
75328+ int low = 0, high = uid_used - 1, mid;
75329+
75330+ while (high >= low) {
75331+ mid = (low + high) >> 1;
75332+ buid = tmp[mid].uid;
75333+ if (buid == uid)
75334+ return mid;
75335+ if (buid > uid)
75336+ high = mid - 1;
75337+ if (buid < uid)
75338+ low = mid + 1;
75339+ }
75340+
75341+ return -1;
75342+}
75343+
75344+static __inline__ void
75345+gr_insertsort(void)
75346+{
75347+ unsigned short i, j;
75348+ struct crash_uid index;
75349+
75350+ for (i = 1; i < uid_used; i++) {
75351+ index = uid_set[i];
75352+ j = i;
75353+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
75354+ uid_set[j] = uid_set[j - 1];
75355+ j--;
75356+ }
75357+ uid_set[j] = index;
75358+ }
75359+
75360+ return;
75361+}
75362+
75363+static __inline__ void
75364+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
75365+{
75366+ int loc;
75367+ uid_t uid = GR_GLOBAL_UID(kuid);
75368+
75369+ if (uid_used == GR_UIDTABLE_MAX)
75370+ return;
75371+
75372+ loc = gr_find_uid(uid);
75373+
75374+ if (loc >= 0) {
75375+ uid_set[loc].expires = expires;
75376+ return;
75377+ }
75378+
75379+ uid_set[uid_used].uid = uid;
75380+ uid_set[uid_used].expires = expires;
75381+ uid_used++;
75382+
75383+ gr_insertsort();
75384+
75385+ return;
75386+}
75387+
75388+void
75389+gr_remove_uid(const unsigned short loc)
75390+{
75391+ unsigned short i;
75392+
75393+ for (i = loc + 1; i < uid_used; i++)
75394+ uid_set[i - 1] = uid_set[i];
75395+
75396+ uid_used--;
75397+
75398+ return;
75399+}
75400+
75401+int
75402+gr_check_crash_uid(const kuid_t kuid)
75403+{
75404+ int loc;
75405+ int ret = 0;
75406+ uid_t uid;
75407+
75408+ if (unlikely(!gr_acl_is_enabled()))
75409+ return 0;
75410+
75411+ uid = GR_GLOBAL_UID(kuid);
75412+
75413+ spin_lock(&gr_uid_lock);
75414+ loc = gr_find_uid(uid);
75415+
75416+ if (loc < 0)
75417+ goto out_unlock;
75418+
75419+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
75420+ gr_remove_uid(loc);
75421+ else
75422+ ret = 1;
75423+
75424+out_unlock:
75425+ spin_unlock(&gr_uid_lock);
75426+ return ret;
75427+}
75428+
75429+static __inline__ int
75430+proc_is_setxid(const struct cred *cred)
75431+{
75432+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
75433+ !uid_eq(cred->uid, cred->fsuid))
75434+ return 1;
75435+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
75436+ !gid_eq(cred->gid, cred->fsgid))
75437+ return 1;
75438+
75439+ return 0;
75440+}
75441+
75442+extern int gr_fake_force_sig(int sig, struct task_struct *t);
75443+
75444+void
75445+gr_handle_crash(struct task_struct *task, const int sig)
75446+{
75447+ struct acl_subject_label *curr;
75448+ struct task_struct *tsk, *tsk2;
75449+ const struct cred *cred;
75450+ const struct cred *cred2;
75451+
75452+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
75453+ return;
75454+
75455+ if (unlikely(!gr_acl_is_enabled()))
75456+ return;
75457+
75458+ curr = task->acl;
75459+
75460+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
75461+ return;
75462+
75463+ if (time_before_eq(curr->expires, get_seconds())) {
75464+ curr->expires = 0;
75465+ curr->crashes = 0;
75466+ }
75467+
75468+ curr->crashes++;
75469+
75470+ if (!curr->expires)
75471+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
75472+
75473+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
75474+ time_after(curr->expires, get_seconds())) {
75475+ rcu_read_lock();
75476+ cred = __task_cred(task);
75477+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
75478+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
75479+ spin_lock(&gr_uid_lock);
75480+ gr_insert_uid(cred->uid, curr->expires);
75481+ spin_unlock(&gr_uid_lock);
75482+ curr->expires = 0;
75483+ curr->crashes = 0;
75484+ read_lock(&tasklist_lock);
75485+ do_each_thread(tsk2, tsk) {
75486+ cred2 = __task_cred(tsk);
75487+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
75488+ gr_fake_force_sig(SIGKILL, tsk);
75489+ } while_each_thread(tsk2, tsk);
75490+ read_unlock(&tasklist_lock);
75491+ } else {
75492+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
75493+ read_lock(&tasklist_lock);
75494+ read_lock(&grsec_exec_file_lock);
75495+ do_each_thread(tsk2, tsk) {
75496+ if (likely(tsk != task)) {
75497+ // if this thread has the same subject as the one that triggered
75498+ // RES_CRASH and it's the same binary, kill it
75499+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
75500+ gr_fake_force_sig(SIGKILL, tsk);
75501+ }
75502+ } while_each_thread(tsk2, tsk);
75503+ read_unlock(&grsec_exec_file_lock);
75504+ read_unlock(&tasklist_lock);
75505+ }
75506+ rcu_read_unlock();
75507+ }
75508+
75509+ return;
75510+}
75511+
75512+int
75513+gr_check_crash_exec(const struct file *filp)
75514+{
75515+ struct acl_subject_label *curr;
75516+
75517+ if (unlikely(!gr_acl_is_enabled()))
75518+ return 0;
75519+
75520+ read_lock(&gr_inode_lock);
75521+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
75522+ __get_dev(filp->f_path.dentry),
75523+ current->role);
75524+ read_unlock(&gr_inode_lock);
75525+
75526+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
75527+ (!curr->crashes && !curr->expires))
75528+ return 0;
75529+
75530+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
75531+ time_after(curr->expires, get_seconds()))
75532+ return 1;
75533+ else if (time_before_eq(curr->expires, get_seconds())) {
75534+ curr->crashes = 0;
75535+ curr->expires = 0;
75536+ }
75537+
75538+ return 0;
75539+}
75540+
75541+void
75542+gr_handle_alertkill(struct task_struct *task)
75543+{
75544+ struct acl_subject_label *curracl;
75545+ __u32 curr_ip;
75546+ struct task_struct *p, *p2;
75547+
75548+ if (unlikely(!gr_acl_is_enabled()))
75549+ return;
75550+
75551+ curracl = task->acl;
75552+ curr_ip = task->signal->curr_ip;
75553+
75554+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
75555+ read_lock(&tasklist_lock);
75556+ do_each_thread(p2, p) {
75557+ if (p->signal->curr_ip == curr_ip)
75558+ gr_fake_force_sig(SIGKILL, p);
75559+ } while_each_thread(p2, p);
75560+ read_unlock(&tasklist_lock);
75561+ } else if (curracl->mode & GR_KILLPROC)
75562+ gr_fake_force_sig(SIGKILL, task);
75563+
75564+ return;
75565+}
75566diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
75567new file mode 100644
75568index 0000000..6b0c9cc
75569--- /dev/null
75570+++ b/grsecurity/gracl_shm.c
75571@@ -0,0 +1,40 @@
75572+#include <linux/kernel.h>
75573+#include <linux/mm.h>
75574+#include <linux/sched.h>
75575+#include <linux/file.h>
75576+#include <linux/ipc.h>
75577+#include <linux/gracl.h>
75578+#include <linux/grsecurity.h>
75579+#include <linux/grinternal.h>
75580+
75581+int
75582+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
75583+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
75584+{
75585+ struct task_struct *task;
75586+
75587+ if (!gr_acl_is_enabled())
75588+ return 1;
75589+
75590+ rcu_read_lock();
75591+ read_lock(&tasklist_lock);
75592+
75593+ task = find_task_by_vpid(shm_cprid);
75594+
75595+ if (unlikely(!task))
75596+ task = find_task_by_vpid(shm_lapid);
75597+
75598+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
75599+ (task_pid_nr(task) == shm_lapid)) &&
75600+ (task->acl->mode & GR_PROTSHM) &&
75601+ (task->acl != current->acl))) {
75602+ read_unlock(&tasklist_lock);
75603+ rcu_read_unlock();
75604+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
75605+ return 0;
75606+ }
75607+ read_unlock(&tasklist_lock);
75608+ rcu_read_unlock();
75609+
75610+ return 1;
75611+}
75612diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
75613new file mode 100644
75614index 0000000..bc0be01
75615--- /dev/null
75616+++ b/grsecurity/grsec_chdir.c
75617@@ -0,0 +1,19 @@
75618+#include <linux/kernel.h>
75619+#include <linux/sched.h>
75620+#include <linux/fs.h>
75621+#include <linux/file.h>
75622+#include <linux/grsecurity.h>
75623+#include <linux/grinternal.h>
75624+
75625+void
75626+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
75627+{
75628+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
75629+ if ((grsec_enable_chdir && grsec_enable_group &&
75630+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
75631+ !grsec_enable_group)) {
75632+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
75633+ }
75634+#endif
75635+ return;
75636+}
75637diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
75638new file mode 100644
75639index 0000000..6d99cec
75640--- /dev/null
75641+++ b/grsecurity/grsec_chroot.c
75642@@ -0,0 +1,385 @@
75643+#include <linux/kernel.h>
75644+#include <linux/module.h>
75645+#include <linux/sched.h>
75646+#include <linux/file.h>
75647+#include <linux/fs.h>
75648+#include <linux/mount.h>
75649+#include <linux/types.h>
75650+#include "../fs/mount.h"
75651+#include <linux/grsecurity.h>
75652+#include <linux/grinternal.h>
75653+
75654+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75655+int gr_init_ran;
75656+#endif
75657+
75658+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
75659+{
75660+#ifdef CONFIG_GRKERNSEC
75661+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
75662+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
75663+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75664+ && gr_init_ran
75665+#endif
75666+ )
75667+ task->gr_is_chrooted = 1;
75668+ else {
75669+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
75670+ if (task_pid_nr(task) == 1 && !gr_init_ran)
75671+ gr_init_ran = 1;
75672+#endif
75673+ task->gr_is_chrooted = 0;
75674+ }
75675+
75676+ task->gr_chroot_dentry = path->dentry;
75677+#endif
75678+ return;
75679+}
75680+
75681+void gr_clear_chroot_entries(struct task_struct *task)
75682+{
75683+#ifdef CONFIG_GRKERNSEC
75684+ task->gr_is_chrooted = 0;
75685+ task->gr_chroot_dentry = NULL;
75686+#endif
75687+ return;
75688+}
75689+
75690+int
75691+gr_handle_chroot_unix(const pid_t pid)
75692+{
75693+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
75694+ struct task_struct *p;
75695+
75696+ if (unlikely(!grsec_enable_chroot_unix))
75697+ return 1;
75698+
75699+ if (likely(!proc_is_chrooted(current)))
75700+ return 1;
75701+
75702+ rcu_read_lock();
75703+ read_lock(&tasklist_lock);
75704+ p = find_task_by_vpid_unrestricted(pid);
75705+ if (unlikely(p && !have_same_root(current, p))) {
75706+ read_unlock(&tasklist_lock);
75707+ rcu_read_unlock();
75708+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
75709+ return 0;
75710+ }
75711+ read_unlock(&tasklist_lock);
75712+ rcu_read_unlock();
75713+#endif
75714+ return 1;
75715+}
75716+
75717+int
75718+gr_handle_chroot_nice(void)
75719+{
75720+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
75721+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
75722+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
75723+ return -EPERM;
75724+ }
75725+#endif
75726+ return 0;
75727+}
75728+
75729+int
75730+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
75731+{
75732+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
75733+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
75734+ && proc_is_chrooted(current)) {
75735+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
75736+ return -EACCES;
75737+ }
75738+#endif
75739+ return 0;
75740+}
75741+
75742+int
75743+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
75744+{
75745+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
75746+ struct task_struct *p;
75747+ int ret = 0;
75748+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
75749+ return ret;
75750+
75751+ read_lock(&tasklist_lock);
75752+ do_each_pid_task(pid, type, p) {
75753+ if (!have_same_root(current, p)) {
75754+ ret = 1;
75755+ goto out;
75756+ }
75757+ } while_each_pid_task(pid, type, p);
75758+out:
75759+ read_unlock(&tasklist_lock);
75760+ return ret;
75761+#endif
75762+ return 0;
75763+}
75764+
75765+int
75766+gr_pid_is_chrooted(struct task_struct *p)
75767+{
75768+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
75769+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
75770+ return 0;
75771+
75772+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
75773+ !have_same_root(current, p)) {
75774+ return 1;
75775+ }
75776+#endif
75777+ return 0;
75778+}
75779+
75780+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
75781+
75782+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
75783+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
75784+{
75785+ struct path path, currentroot;
75786+ int ret = 0;
75787+
75788+ path.dentry = (struct dentry *)u_dentry;
75789+ path.mnt = (struct vfsmount *)u_mnt;
75790+ get_fs_root(current->fs, &currentroot);
75791+ if (path_is_under(&path, &currentroot))
75792+ ret = 1;
75793+ path_put(&currentroot);
75794+
75795+ return ret;
75796+}
75797+#endif
75798+
75799+int
75800+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
75801+{
75802+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
75803+ if (!grsec_enable_chroot_fchdir)
75804+ return 1;
75805+
75806+ if (!proc_is_chrooted(current))
75807+ return 1;
75808+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
75809+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
75810+ return 0;
75811+ }
75812+#endif
75813+ return 1;
75814+}
75815+
75816+int
75817+gr_chroot_fhandle(void)
75818+{
75819+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
75820+ if (!grsec_enable_chroot_fchdir)
75821+ return 1;
75822+
75823+ if (!proc_is_chrooted(current))
75824+ return 1;
75825+ else {
75826+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
75827+ return 0;
75828+ }
75829+#endif
75830+ return 1;
75831+}
75832+
75833+int
75834+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
75835+ const u64 shm_createtime)
75836+{
75837+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
75838+ struct task_struct *p;
75839+
75840+ if (unlikely(!grsec_enable_chroot_shmat))
75841+ return 1;
75842+
75843+ if (likely(!proc_is_chrooted(current)))
75844+ return 1;
75845+
75846+ rcu_read_lock();
75847+ read_lock(&tasklist_lock);
75848+
75849+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
75850+ if (time_before_eq64(p->start_time, shm_createtime)) {
75851+ if (have_same_root(current, p)) {
75852+ goto allow;
75853+ } else {
75854+ read_unlock(&tasklist_lock);
75855+ rcu_read_unlock();
75856+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
75857+ return 0;
75858+ }
75859+ }
75860+ /* creator exited, pid reuse, fall through to next check */
75861+ }
75862+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
75863+ if (unlikely(!have_same_root(current, p))) {
75864+ read_unlock(&tasklist_lock);
75865+ rcu_read_unlock();
75866+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
75867+ return 0;
75868+ }
75869+ }
75870+
75871+allow:
75872+ read_unlock(&tasklist_lock);
75873+ rcu_read_unlock();
75874+#endif
75875+ return 1;
75876+}
75877+
75878+void
75879+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
75880+{
75881+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
75882+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
75883+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
75884+#endif
75885+ return;
75886+}
75887+
75888+int
75889+gr_handle_chroot_mknod(const struct dentry *dentry,
75890+ const struct vfsmount *mnt, const int mode)
75891+{
75892+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
75893+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
75894+ proc_is_chrooted(current)) {
75895+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
75896+ return -EPERM;
75897+ }
75898+#endif
75899+ return 0;
75900+}
75901+
75902+int
75903+gr_handle_chroot_mount(const struct dentry *dentry,
75904+ const struct vfsmount *mnt, const char *dev_name)
75905+{
75906+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
75907+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
75908+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
75909+ return -EPERM;
75910+ }
75911+#endif
75912+ return 0;
75913+}
75914+
75915+int
75916+gr_handle_chroot_pivot(void)
75917+{
75918+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
75919+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
75920+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
75921+ return -EPERM;
75922+ }
75923+#endif
75924+ return 0;
75925+}
75926+
75927+int
75928+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
75929+{
75930+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
75931+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
75932+ !gr_is_outside_chroot(dentry, mnt)) {
75933+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
75934+ return -EPERM;
75935+ }
75936+#endif
75937+ return 0;
75938+}
75939+
75940+extern const char *captab_log[];
75941+extern int captab_log_entries;
75942+
75943+int
75944+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
75945+{
75946+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
75947+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
75948+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
75949+ if (cap_raised(chroot_caps, cap)) {
75950+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
75951+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
75952+ }
75953+ return 0;
75954+ }
75955+ }
75956+#endif
75957+ return 1;
75958+}
75959+
75960+int
75961+gr_chroot_is_capable(const int cap)
75962+{
75963+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
75964+ return gr_task_chroot_is_capable(current, current_cred(), cap);
75965+#endif
75966+ return 1;
75967+}
75968+
75969+int
75970+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
75971+{
75972+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
75973+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
75974+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
75975+ if (cap_raised(chroot_caps, cap)) {
75976+ return 0;
75977+ }
75978+ }
75979+#endif
75980+ return 1;
75981+}
75982+
75983+int
75984+gr_chroot_is_capable_nolog(const int cap)
75985+{
75986+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
75987+ return gr_task_chroot_is_capable_nolog(current, cap);
75988+#endif
75989+ return 1;
75990+}
75991+
75992+int
75993+gr_handle_chroot_sysctl(const int op)
75994+{
75995+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
75996+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
75997+ proc_is_chrooted(current))
75998+ return -EACCES;
75999+#endif
76000+ return 0;
76001+}
76002+
76003+void
76004+gr_handle_chroot_chdir(const struct path *path)
76005+{
76006+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
76007+ if (grsec_enable_chroot_chdir)
76008+ set_fs_pwd(current->fs, path);
76009+#endif
76010+ return;
76011+}
76012+
76013+int
76014+gr_handle_chroot_chmod(const struct dentry *dentry,
76015+ const struct vfsmount *mnt, const int mode)
76016+{
76017+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
76018+ /* allow chmod +s on directories, but not files */
76019+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
76020+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
76021+ proc_is_chrooted(current)) {
76022+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
76023+ return -EPERM;
76024+ }
76025+#endif
76026+ return 0;
76027+}
76028diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
76029new file mode 100644
76030index 0000000..0f9ac91
76031--- /dev/null
76032+++ b/grsecurity/grsec_disabled.c
76033@@ -0,0 +1,440 @@
76034+#include <linux/kernel.h>
76035+#include <linux/module.h>
76036+#include <linux/sched.h>
76037+#include <linux/file.h>
76038+#include <linux/fs.h>
76039+#include <linux/kdev_t.h>
76040+#include <linux/net.h>
76041+#include <linux/in.h>
76042+#include <linux/ip.h>
76043+#include <linux/skbuff.h>
76044+#include <linux/sysctl.h>
76045+
76046+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
76047+void
76048+pax_set_initial_flags(struct linux_binprm *bprm)
76049+{
76050+ return;
76051+}
76052+#endif
76053+
76054+#ifdef CONFIG_SYSCTL
76055+__u32
76056+gr_handle_sysctl(const struct ctl_table * table, const int op)
76057+{
76058+ return 0;
76059+}
76060+#endif
76061+
76062+#ifdef CONFIG_TASKSTATS
76063+int gr_is_taskstats_denied(int pid)
76064+{
76065+ return 0;
76066+}
76067+#endif
76068+
76069+int
76070+gr_acl_is_enabled(void)
76071+{
76072+ return 0;
76073+}
76074+
76075+int
76076+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
76077+{
76078+ return 0;
76079+}
76080+
76081+void
76082+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
76083+{
76084+ return;
76085+}
76086+
76087+int
76088+gr_handle_rawio(const struct inode *inode)
76089+{
76090+ return 0;
76091+}
76092+
76093+void
76094+gr_acl_handle_psacct(struct task_struct *task, const long code)
76095+{
76096+ return;
76097+}
76098+
76099+int
76100+gr_handle_ptrace(struct task_struct *task, const long request)
76101+{
76102+ return 0;
76103+}
76104+
76105+int
76106+gr_handle_proc_ptrace(struct task_struct *task)
76107+{
76108+ return 0;
76109+}
76110+
76111+int
76112+gr_set_acls(const int type)
76113+{
76114+ return 0;
76115+}
76116+
76117+int
76118+gr_check_hidden_task(const struct task_struct *tsk)
76119+{
76120+ return 0;
76121+}
76122+
76123+int
76124+gr_check_protected_task(const struct task_struct *task)
76125+{
76126+ return 0;
76127+}
76128+
76129+int
76130+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
76131+{
76132+ return 0;
76133+}
76134+
76135+void
76136+gr_copy_label(struct task_struct *tsk)
76137+{
76138+ return;
76139+}
76140+
76141+void
76142+gr_set_pax_flags(struct task_struct *task)
76143+{
76144+ return;
76145+}
76146+
76147+int
76148+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
76149+ const int unsafe_share)
76150+{
76151+ return 0;
76152+}
76153+
76154+void
76155+gr_handle_delete(const ino_t ino, const dev_t dev)
76156+{
76157+ return;
76158+}
76159+
76160+void
76161+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
76162+{
76163+ return;
76164+}
76165+
76166+void
76167+gr_handle_crash(struct task_struct *task, const int sig)
76168+{
76169+ return;
76170+}
76171+
76172+int
76173+gr_check_crash_exec(const struct file *filp)
76174+{
76175+ return 0;
76176+}
76177+
76178+int
76179+gr_check_crash_uid(const kuid_t uid)
76180+{
76181+ return 0;
76182+}
76183+
76184+void
76185+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
76186+ struct dentry *old_dentry,
76187+ struct dentry *new_dentry,
76188+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
76189+{
76190+ return;
76191+}
76192+
76193+int
76194+gr_search_socket(const int family, const int type, const int protocol)
76195+{
76196+ return 1;
76197+}
76198+
76199+int
76200+gr_search_connectbind(const int mode, const struct socket *sock,
76201+ const struct sockaddr_in *addr)
76202+{
76203+ return 0;
76204+}
76205+
76206+void
76207+gr_handle_alertkill(struct task_struct *task)
76208+{
76209+ return;
76210+}
76211+
76212+__u32
76213+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
76214+{
76215+ return 1;
76216+}
76217+
76218+__u32
76219+gr_acl_handle_hidden_file(const struct dentry * dentry,
76220+ const struct vfsmount * mnt)
76221+{
76222+ return 1;
76223+}
76224+
76225+__u32
76226+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
76227+ int acc_mode)
76228+{
76229+ return 1;
76230+}
76231+
76232+__u32
76233+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
76234+{
76235+ return 1;
76236+}
76237+
76238+__u32
76239+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
76240+{
76241+ return 1;
76242+}
76243+
76244+int
76245+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
76246+ unsigned int *vm_flags)
76247+{
76248+ return 1;
76249+}
76250+
76251+__u32
76252+gr_acl_handle_truncate(const struct dentry * dentry,
76253+ const struct vfsmount * mnt)
76254+{
76255+ return 1;
76256+}
76257+
76258+__u32
76259+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
76260+{
76261+ return 1;
76262+}
76263+
76264+__u32
76265+gr_acl_handle_access(const struct dentry * dentry,
76266+ const struct vfsmount * mnt, const int fmode)
76267+{
76268+ return 1;
76269+}
76270+
76271+__u32
76272+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
76273+ umode_t *mode)
76274+{
76275+ return 1;
76276+}
76277+
76278+__u32
76279+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
76280+{
76281+ return 1;
76282+}
76283+
76284+__u32
76285+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
76286+{
76287+ return 1;
76288+}
76289+
76290+__u32
76291+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
76292+{
76293+ return 1;
76294+}
76295+
76296+void
76297+grsecurity_init(void)
76298+{
76299+ return;
76300+}
76301+
76302+umode_t gr_acl_umask(void)
76303+{
76304+ return 0;
76305+}
76306+
76307+__u32
76308+gr_acl_handle_mknod(const struct dentry * new_dentry,
76309+ const struct dentry * parent_dentry,
76310+ const struct vfsmount * parent_mnt,
76311+ const int mode)
76312+{
76313+ return 1;
76314+}
76315+
76316+__u32
76317+gr_acl_handle_mkdir(const struct dentry * new_dentry,
76318+ const struct dentry * parent_dentry,
76319+ const struct vfsmount * parent_mnt)
76320+{
76321+ return 1;
76322+}
76323+
76324+__u32
76325+gr_acl_handle_symlink(const struct dentry * new_dentry,
76326+ const struct dentry * parent_dentry,
76327+ const struct vfsmount * parent_mnt, const struct filename *from)
76328+{
76329+ return 1;
76330+}
76331+
76332+__u32
76333+gr_acl_handle_link(const struct dentry * new_dentry,
76334+ const struct dentry * parent_dentry,
76335+ const struct vfsmount * parent_mnt,
76336+ const struct dentry * old_dentry,
76337+ const struct vfsmount * old_mnt, const struct filename *to)
76338+{
76339+ return 1;
76340+}
76341+
76342+int
76343+gr_acl_handle_rename(const struct dentry *new_dentry,
76344+ const struct dentry *parent_dentry,
76345+ const struct vfsmount *parent_mnt,
76346+ const struct dentry *old_dentry,
76347+ const struct inode *old_parent_inode,
76348+ const struct vfsmount *old_mnt, const struct filename *newname,
76349+ unsigned int flags)
76350+{
76351+ return 0;
76352+}
76353+
76354+int
76355+gr_acl_handle_filldir(const struct file *file, const char *name,
76356+ const int namelen, const ino_t ino)
76357+{
76358+ return 1;
76359+}
76360+
76361+int
76362+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
76363+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
76364+{
76365+ return 1;
76366+}
76367+
76368+int
76369+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
76370+{
76371+ return 0;
76372+}
76373+
76374+int
76375+gr_search_accept(const struct socket *sock)
76376+{
76377+ return 0;
76378+}
76379+
76380+int
76381+gr_search_listen(const struct socket *sock)
76382+{
76383+ return 0;
76384+}
76385+
76386+int
76387+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
76388+{
76389+ return 0;
76390+}
76391+
76392+__u32
76393+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
76394+{
76395+ return 1;
76396+}
76397+
76398+__u32
76399+gr_acl_handle_creat(const struct dentry * dentry,
76400+ const struct dentry * p_dentry,
76401+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
76402+ const int imode)
76403+{
76404+ return 1;
76405+}
76406+
76407+void
76408+gr_acl_handle_exit(void)
76409+{
76410+ return;
76411+}
76412+
76413+int
76414+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
76415+{
76416+ return 1;
76417+}
76418+
76419+void
76420+gr_set_role_label(const kuid_t uid, const kgid_t gid)
76421+{
76422+ return;
76423+}
76424+
76425+int
76426+gr_acl_handle_procpidmem(const struct task_struct *task)
76427+{
76428+ return 0;
76429+}
76430+
76431+int
76432+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
76433+{
76434+ return 0;
76435+}
76436+
76437+int
76438+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
76439+{
76440+ return 0;
76441+}
76442+
76443+int
76444+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
76445+{
76446+ return 0;
76447+}
76448+
76449+int
76450+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
76451+{
76452+ return 0;
76453+}
76454+
76455+int gr_acl_enable_at_secure(void)
76456+{
76457+ return 0;
76458+}
76459+
76460+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
76461+{
76462+ return dentry->d_sb->s_dev;
76463+}
76464+
76465+void gr_put_exec_file(struct task_struct *task)
76466+{
76467+ return;
76468+}
76469+
76470+#ifdef CONFIG_SECURITY
76471+EXPORT_SYMBOL_GPL(gr_check_user_change);
76472+EXPORT_SYMBOL_GPL(gr_check_group_change);
76473+#endif
76474diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
76475new file mode 100644
76476index 0000000..14638ff
76477--- /dev/null
76478+++ b/grsecurity/grsec_exec.c
76479@@ -0,0 +1,188 @@
76480+#include <linux/kernel.h>
76481+#include <linux/sched.h>
76482+#include <linux/file.h>
76483+#include <linux/binfmts.h>
76484+#include <linux/fs.h>
76485+#include <linux/types.h>
76486+#include <linux/grdefs.h>
76487+#include <linux/grsecurity.h>
76488+#include <linux/grinternal.h>
76489+#include <linux/capability.h>
76490+#include <linux/module.h>
76491+#include <linux/compat.h>
76492+
76493+#include <asm/uaccess.h>
76494+
76495+#ifdef CONFIG_GRKERNSEC_EXECLOG
76496+static char gr_exec_arg_buf[132];
76497+static DEFINE_MUTEX(gr_exec_arg_mutex);
76498+#endif
76499+
76500+struct user_arg_ptr {
76501+#ifdef CONFIG_COMPAT
76502+ bool is_compat;
76503+#endif
76504+ union {
76505+ const char __user *const __user *native;
76506+#ifdef CONFIG_COMPAT
76507+ const compat_uptr_t __user *compat;
76508+#endif
76509+ } ptr;
76510+};
76511+
76512+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
76513+
76514+void
76515+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
76516+{
76517+#ifdef CONFIG_GRKERNSEC_EXECLOG
76518+ char *grarg = gr_exec_arg_buf;
76519+ unsigned int i, x, execlen = 0;
76520+ char c;
76521+
76522+ if (!((grsec_enable_execlog && grsec_enable_group &&
76523+ in_group_p(grsec_audit_gid))
76524+ || (grsec_enable_execlog && !grsec_enable_group)))
76525+ return;
76526+
76527+ mutex_lock(&gr_exec_arg_mutex);
76528+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
76529+
76530+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
76531+ const char __user *p;
76532+ unsigned int len;
76533+
76534+ p = get_user_arg_ptr(argv, i);
76535+ if (IS_ERR(p))
76536+ goto log;
76537+
76538+ len = strnlen_user(p, 128 - execlen);
76539+ if (len > 128 - execlen)
76540+ len = 128 - execlen;
76541+ else if (len > 0)
76542+ len--;
76543+ if (copy_from_user(grarg + execlen, p, len))
76544+ goto log;
76545+
76546+ /* rewrite unprintable characters */
76547+ for (x = 0; x < len; x++) {
76548+ c = *(grarg + execlen + x);
76549+ if (c < 32 || c > 126)
76550+ *(grarg + execlen + x) = ' ';
76551+ }
76552+
76553+ execlen += len;
76554+ *(grarg + execlen) = ' ';
76555+ *(grarg + execlen + 1) = '\0';
76556+ execlen++;
76557+ }
76558+
76559+ log:
76560+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
76561+ bprm->file->f_path.mnt, grarg);
76562+ mutex_unlock(&gr_exec_arg_mutex);
76563+#endif
76564+ return;
76565+}
76566+
76567+#ifdef CONFIG_GRKERNSEC
76568+extern int gr_acl_is_capable(const int cap);
76569+extern int gr_acl_is_capable_nolog(const int cap);
76570+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76571+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
76572+extern int gr_chroot_is_capable(const int cap);
76573+extern int gr_chroot_is_capable_nolog(const int cap);
76574+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
76575+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
76576+#endif
76577+
76578+const char *captab_log[] = {
76579+ "CAP_CHOWN",
76580+ "CAP_DAC_OVERRIDE",
76581+ "CAP_DAC_READ_SEARCH",
76582+ "CAP_FOWNER",
76583+ "CAP_FSETID",
76584+ "CAP_KILL",
76585+ "CAP_SETGID",
76586+ "CAP_SETUID",
76587+ "CAP_SETPCAP",
76588+ "CAP_LINUX_IMMUTABLE",
76589+ "CAP_NET_BIND_SERVICE",
76590+ "CAP_NET_BROADCAST",
76591+ "CAP_NET_ADMIN",
76592+ "CAP_NET_RAW",
76593+ "CAP_IPC_LOCK",
76594+ "CAP_IPC_OWNER",
76595+ "CAP_SYS_MODULE",
76596+ "CAP_SYS_RAWIO",
76597+ "CAP_SYS_CHROOT",
76598+ "CAP_SYS_PTRACE",
76599+ "CAP_SYS_PACCT",
76600+ "CAP_SYS_ADMIN",
76601+ "CAP_SYS_BOOT",
76602+ "CAP_SYS_NICE",
76603+ "CAP_SYS_RESOURCE",
76604+ "CAP_SYS_TIME",
76605+ "CAP_SYS_TTY_CONFIG",
76606+ "CAP_MKNOD",
76607+ "CAP_LEASE",
76608+ "CAP_AUDIT_WRITE",
76609+ "CAP_AUDIT_CONTROL",
76610+ "CAP_SETFCAP",
76611+ "CAP_MAC_OVERRIDE",
76612+ "CAP_MAC_ADMIN",
76613+ "CAP_SYSLOG",
76614+ "CAP_WAKE_ALARM",
76615+ "CAP_BLOCK_SUSPEND"
76616+};
76617+
76618+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
76619+
76620+int gr_is_capable(const int cap)
76621+{
76622+#ifdef CONFIG_GRKERNSEC
76623+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
76624+ return 1;
76625+ return 0;
76626+#else
76627+ return 1;
76628+#endif
76629+}
76630+
76631+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
76632+{
76633+#ifdef CONFIG_GRKERNSEC
76634+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
76635+ return 1;
76636+ return 0;
76637+#else
76638+ return 1;
76639+#endif
76640+}
76641+
76642+int gr_is_capable_nolog(const int cap)
76643+{
76644+#ifdef CONFIG_GRKERNSEC
76645+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
76646+ return 1;
76647+ return 0;
76648+#else
76649+ return 1;
76650+#endif
76651+}
76652+
76653+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
76654+{
76655+#ifdef CONFIG_GRKERNSEC
76656+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
76657+ return 1;
76658+ return 0;
76659+#else
76660+ return 1;
76661+#endif
76662+}
76663+
76664+EXPORT_SYMBOL_GPL(gr_is_capable);
76665+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
76666+EXPORT_SYMBOL_GPL(gr_task_is_capable);
76667+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
76668diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
76669new file mode 100644
76670index 0000000..06cc6ea
76671--- /dev/null
76672+++ b/grsecurity/grsec_fifo.c
76673@@ -0,0 +1,24 @@
76674+#include <linux/kernel.h>
76675+#include <linux/sched.h>
76676+#include <linux/fs.h>
76677+#include <linux/file.h>
76678+#include <linux/grinternal.h>
76679+
76680+int
76681+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
76682+ const struct dentry *dir, const int flag, const int acc_mode)
76683+{
76684+#ifdef CONFIG_GRKERNSEC_FIFO
76685+ const struct cred *cred = current_cred();
76686+
76687+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
76688+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
76689+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
76690+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
76691+ if (!inode_permission(dentry->d_inode, acc_mode))
76692+ 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));
76693+ return -EACCES;
76694+ }
76695+#endif
76696+ return 0;
76697+}
76698diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
76699new file mode 100644
76700index 0000000..8ca18bf
76701--- /dev/null
76702+++ b/grsecurity/grsec_fork.c
76703@@ -0,0 +1,23 @@
76704+#include <linux/kernel.h>
76705+#include <linux/sched.h>
76706+#include <linux/grsecurity.h>
76707+#include <linux/grinternal.h>
76708+#include <linux/errno.h>
76709+
76710+void
76711+gr_log_forkfail(const int retval)
76712+{
76713+#ifdef CONFIG_GRKERNSEC_FORKFAIL
76714+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
76715+ switch (retval) {
76716+ case -EAGAIN:
76717+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
76718+ break;
76719+ case -ENOMEM:
76720+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
76721+ break;
76722+ }
76723+ }
76724+#endif
76725+ return;
76726+}
76727diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
76728new file mode 100644
76729index 0000000..b7cb191
76730--- /dev/null
76731+++ b/grsecurity/grsec_init.c
76732@@ -0,0 +1,286 @@
76733+#include <linux/kernel.h>
76734+#include <linux/sched.h>
76735+#include <linux/mm.h>
76736+#include <linux/gracl.h>
76737+#include <linux/slab.h>
76738+#include <linux/vmalloc.h>
76739+#include <linux/percpu.h>
76740+#include <linux/module.h>
76741+
76742+int grsec_enable_ptrace_readexec;
76743+int grsec_enable_setxid;
76744+int grsec_enable_symlinkown;
76745+kgid_t grsec_symlinkown_gid;
76746+int grsec_enable_brute;
76747+int grsec_enable_link;
76748+int grsec_enable_dmesg;
76749+int grsec_enable_harden_ptrace;
76750+int grsec_enable_harden_ipc;
76751+int grsec_enable_fifo;
76752+int grsec_enable_execlog;
76753+int grsec_enable_signal;
76754+int grsec_enable_forkfail;
76755+int grsec_enable_audit_ptrace;
76756+int grsec_enable_time;
76757+int grsec_enable_group;
76758+kgid_t grsec_audit_gid;
76759+int grsec_enable_chdir;
76760+int grsec_enable_mount;
76761+int grsec_enable_rofs;
76762+int grsec_deny_new_usb;
76763+int grsec_enable_chroot_findtask;
76764+int grsec_enable_chroot_mount;
76765+int grsec_enable_chroot_shmat;
76766+int grsec_enable_chroot_fchdir;
76767+int grsec_enable_chroot_double;
76768+int grsec_enable_chroot_pivot;
76769+int grsec_enable_chroot_chdir;
76770+int grsec_enable_chroot_chmod;
76771+int grsec_enable_chroot_mknod;
76772+int grsec_enable_chroot_nice;
76773+int grsec_enable_chroot_execlog;
76774+int grsec_enable_chroot_caps;
76775+int grsec_enable_chroot_sysctl;
76776+int grsec_enable_chroot_unix;
76777+int grsec_enable_tpe;
76778+kgid_t grsec_tpe_gid;
76779+int grsec_enable_blackhole;
76780+#ifdef CONFIG_IPV6_MODULE
76781+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
76782+#endif
76783+int grsec_lastack_retries;
76784+int grsec_enable_tpe_all;
76785+int grsec_enable_tpe_invert;
76786+int grsec_enable_socket_all;
76787+kgid_t grsec_socket_all_gid;
76788+int grsec_enable_socket_client;
76789+kgid_t grsec_socket_client_gid;
76790+int grsec_enable_socket_server;
76791+kgid_t grsec_socket_server_gid;
76792+int grsec_resource_logging;
76793+int grsec_disable_privio;
76794+int grsec_enable_log_rwxmaps;
76795+int grsec_lock;
76796+
76797+DEFINE_SPINLOCK(grsec_alert_lock);
76798+unsigned long grsec_alert_wtime = 0;
76799+unsigned long grsec_alert_fyet = 0;
76800+
76801+DEFINE_SPINLOCK(grsec_audit_lock);
76802+
76803+DEFINE_RWLOCK(grsec_exec_file_lock);
76804+
76805+char *gr_shared_page[4];
76806+
76807+char *gr_alert_log_fmt;
76808+char *gr_audit_log_fmt;
76809+char *gr_alert_log_buf;
76810+char *gr_audit_log_buf;
76811+
76812+extern struct gr_arg *gr_usermode;
76813+extern unsigned char *gr_system_salt;
76814+extern unsigned char *gr_system_sum;
76815+
76816+void __init
76817+grsecurity_init(void)
76818+{
76819+ int j;
76820+ /* create the per-cpu shared pages */
76821+
76822+#ifdef CONFIG_X86
76823+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
76824+#endif
76825+
76826+ for (j = 0; j < 4; j++) {
76827+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
76828+ if (gr_shared_page[j] == NULL) {
76829+ panic("Unable to allocate grsecurity shared page");
76830+ return;
76831+ }
76832+ }
76833+
76834+ /* allocate log buffers */
76835+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
76836+ if (!gr_alert_log_fmt) {
76837+ panic("Unable to allocate grsecurity alert log format buffer");
76838+ return;
76839+ }
76840+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
76841+ if (!gr_audit_log_fmt) {
76842+ panic("Unable to allocate grsecurity audit log format buffer");
76843+ return;
76844+ }
76845+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
76846+ if (!gr_alert_log_buf) {
76847+ panic("Unable to allocate grsecurity alert log buffer");
76848+ return;
76849+ }
76850+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
76851+ if (!gr_audit_log_buf) {
76852+ panic("Unable to allocate grsecurity audit log buffer");
76853+ return;
76854+ }
76855+
76856+ /* allocate memory for authentication structure */
76857+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
76858+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
76859+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
76860+
76861+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
76862+ panic("Unable to allocate grsecurity authentication structure");
76863+ return;
76864+ }
76865+
76866+#ifdef CONFIG_GRKERNSEC_IO
76867+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
76868+ grsec_disable_privio = 1;
76869+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
76870+ grsec_disable_privio = 1;
76871+#else
76872+ grsec_disable_privio = 0;
76873+#endif
76874+#endif
76875+
76876+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
76877+ /* for backward compatibility, tpe_invert always defaults to on if
76878+ enabled in the kernel
76879+ */
76880+ grsec_enable_tpe_invert = 1;
76881+#endif
76882+
76883+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
76884+#ifndef CONFIG_GRKERNSEC_SYSCTL
76885+ grsec_lock = 1;
76886+#endif
76887+
76888+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
76889+ grsec_enable_log_rwxmaps = 1;
76890+#endif
76891+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
76892+ grsec_enable_group = 1;
76893+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
76894+#endif
76895+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
76896+ grsec_enable_ptrace_readexec = 1;
76897+#endif
76898+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
76899+ grsec_enable_chdir = 1;
76900+#endif
76901+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
76902+ grsec_enable_harden_ptrace = 1;
76903+#endif
76904+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
76905+ grsec_enable_harden_ipc = 1;
76906+#endif
76907+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
76908+ grsec_enable_mount = 1;
76909+#endif
76910+#ifdef CONFIG_GRKERNSEC_LINK
76911+ grsec_enable_link = 1;
76912+#endif
76913+#ifdef CONFIG_GRKERNSEC_BRUTE
76914+ grsec_enable_brute = 1;
76915+#endif
76916+#ifdef CONFIG_GRKERNSEC_DMESG
76917+ grsec_enable_dmesg = 1;
76918+#endif
76919+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76920+ grsec_enable_blackhole = 1;
76921+ grsec_lastack_retries = 4;
76922+#endif
76923+#ifdef CONFIG_GRKERNSEC_FIFO
76924+ grsec_enable_fifo = 1;
76925+#endif
76926+#ifdef CONFIG_GRKERNSEC_EXECLOG
76927+ grsec_enable_execlog = 1;
76928+#endif
76929+#ifdef CONFIG_GRKERNSEC_SETXID
76930+ grsec_enable_setxid = 1;
76931+#endif
76932+#ifdef CONFIG_GRKERNSEC_SIGNAL
76933+ grsec_enable_signal = 1;
76934+#endif
76935+#ifdef CONFIG_GRKERNSEC_FORKFAIL
76936+ grsec_enable_forkfail = 1;
76937+#endif
76938+#ifdef CONFIG_GRKERNSEC_TIME
76939+ grsec_enable_time = 1;
76940+#endif
76941+#ifdef CONFIG_GRKERNSEC_RESLOG
76942+ grsec_resource_logging = 1;
76943+#endif
76944+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
76945+ grsec_enable_chroot_findtask = 1;
76946+#endif
76947+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
76948+ grsec_enable_chroot_unix = 1;
76949+#endif
76950+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
76951+ grsec_enable_chroot_mount = 1;
76952+#endif
76953+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
76954+ grsec_enable_chroot_fchdir = 1;
76955+#endif
76956+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
76957+ grsec_enable_chroot_shmat = 1;
76958+#endif
76959+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
76960+ grsec_enable_audit_ptrace = 1;
76961+#endif
76962+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
76963+ grsec_enable_chroot_double = 1;
76964+#endif
76965+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
76966+ grsec_enable_chroot_pivot = 1;
76967+#endif
76968+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
76969+ grsec_enable_chroot_chdir = 1;
76970+#endif
76971+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
76972+ grsec_enable_chroot_chmod = 1;
76973+#endif
76974+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
76975+ grsec_enable_chroot_mknod = 1;
76976+#endif
76977+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
76978+ grsec_enable_chroot_nice = 1;
76979+#endif
76980+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
76981+ grsec_enable_chroot_execlog = 1;
76982+#endif
76983+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
76984+ grsec_enable_chroot_caps = 1;
76985+#endif
76986+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
76987+ grsec_enable_chroot_sysctl = 1;
76988+#endif
76989+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
76990+ grsec_enable_symlinkown = 1;
76991+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
76992+#endif
76993+#ifdef CONFIG_GRKERNSEC_TPE
76994+ grsec_enable_tpe = 1;
76995+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
76996+#ifdef CONFIG_GRKERNSEC_TPE_ALL
76997+ grsec_enable_tpe_all = 1;
76998+#endif
76999+#endif
77000+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
77001+ grsec_enable_socket_all = 1;
77002+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
77003+#endif
77004+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
77005+ grsec_enable_socket_client = 1;
77006+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
77007+#endif
77008+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
77009+ grsec_enable_socket_server = 1;
77010+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
77011+#endif
77012+#endif
77013+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
77014+ grsec_deny_new_usb = 1;
77015+#endif
77016+
77017+ return;
77018+}
77019diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
77020new file mode 100644
77021index 0000000..1773300
77022--- /dev/null
77023+++ b/grsecurity/grsec_ipc.c
77024@@ -0,0 +1,48 @@
77025+#include <linux/kernel.h>
77026+#include <linux/mm.h>
77027+#include <linux/sched.h>
77028+#include <linux/file.h>
77029+#include <linux/ipc.h>
77030+#include <linux/ipc_namespace.h>
77031+#include <linux/grsecurity.h>
77032+#include <linux/grinternal.h>
77033+
77034+int
77035+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
77036+{
77037+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
77038+ int write;
77039+ int orig_granted_mode;
77040+ kuid_t euid;
77041+ kgid_t egid;
77042+
77043+ if (!grsec_enable_harden_ipc)
77044+ return 1;
77045+
77046+ euid = current_euid();
77047+ egid = current_egid();
77048+
77049+ write = requested_mode & 00002;
77050+ orig_granted_mode = ipcp->mode;
77051+
77052+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
77053+ orig_granted_mode >>= 6;
77054+ else {
77055+ /* if likely wrong permissions, lock to user */
77056+ if (orig_granted_mode & 0007)
77057+ orig_granted_mode = 0;
77058+ /* otherwise do a egid-only check */
77059+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
77060+ orig_granted_mode >>= 3;
77061+ /* otherwise, no access */
77062+ else
77063+ orig_granted_mode = 0;
77064+ }
77065+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
77066+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
77067+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
77068+ return 0;
77069+ }
77070+#endif
77071+ return 1;
77072+}
77073diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
77074new file mode 100644
77075index 0000000..5e05e20
77076--- /dev/null
77077+++ b/grsecurity/grsec_link.c
77078@@ -0,0 +1,58 @@
77079+#include <linux/kernel.h>
77080+#include <linux/sched.h>
77081+#include <linux/fs.h>
77082+#include <linux/file.h>
77083+#include <linux/grinternal.h>
77084+
77085+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
77086+{
77087+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
77088+ const struct inode *link_inode = link->dentry->d_inode;
77089+
77090+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
77091+ /* ignore root-owned links, e.g. /proc/self */
77092+ gr_is_global_nonroot(link_inode->i_uid) && target &&
77093+ !uid_eq(link_inode->i_uid, target->i_uid)) {
77094+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
77095+ return 1;
77096+ }
77097+#endif
77098+ return 0;
77099+}
77100+
77101+int
77102+gr_handle_follow_link(const struct inode *parent,
77103+ const struct inode *inode,
77104+ const struct dentry *dentry, const struct vfsmount *mnt)
77105+{
77106+#ifdef CONFIG_GRKERNSEC_LINK
77107+ const struct cred *cred = current_cred();
77108+
77109+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
77110+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
77111+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
77112+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
77113+ return -EACCES;
77114+ }
77115+#endif
77116+ return 0;
77117+}
77118+
77119+int
77120+gr_handle_hardlink(const struct dentry *dentry,
77121+ const struct vfsmount *mnt,
77122+ struct inode *inode, const int mode, const struct filename *to)
77123+{
77124+#ifdef CONFIG_GRKERNSEC_LINK
77125+ const struct cred *cred = current_cred();
77126+
77127+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
77128+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
77129+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
77130+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
77131+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
77132+ return -EPERM;
77133+ }
77134+#endif
77135+ return 0;
77136+}
77137diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
77138new file mode 100644
77139index 0000000..dbe0a6b
77140--- /dev/null
77141+++ b/grsecurity/grsec_log.c
77142@@ -0,0 +1,341 @@
77143+#include <linux/kernel.h>
77144+#include <linux/sched.h>
77145+#include <linux/file.h>
77146+#include <linux/tty.h>
77147+#include <linux/fs.h>
77148+#include <linux/mm.h>
77149+#include <linux/grinternal.h>
77150+
77151+#ifdef CONFIG_TREE_PREEMPT_RCU
77152+#define DISABLE_PREEMPT() preempt_disable()
77153+#define ENABLE_PREEMPT() preempt_enable()
77154+#else
77155+#define DISABLE_PREEMPT()
77156+#define ENABLE_PREEMPT()
77157+#endif
77158+
77159+#define BEGIN_LOCKS(x) \
77160+ DISABLE_PREEMPT(); \
77161+ rcu_read_lock(); \
77162+ read_lock(&tasklist_lock); \
77163+ read_lock(&grsec_exec_file_lock); \
77164+ if (x != GR_DO_AUDIT) \
77165+ spin_lock(&grsec_alert_lock); \
77166+ else \
77167+ spin_lock(&grsec_audit_lock)
77168+
77169+#define END_LOCKS(x) \
77170+ if (x != GR_DO_AUDIT) \
77171+ spin_unlock(&grsec_alert_lock); \
77172+ else \
77173+ spin_unlock(&grsec_audit_lock); \
77174+ read_unlock(&grsec_exec_file_lock); \
77175+ read_unlock(&tasklist_lock); \
77176+ rcu_read_unlock(); \
77177+ ENABLE_PREEMPT(); \
77178+ if (x == GR_DONT_AUDIT) \
77179+ gr_handle_alertkill(current)
77180+
77181+enum {
77182+ FLOODING,
77183+ NO_FLOODING
77184+};
77185+
77186+extern char *gr_alert_log_fmt;
77187+extern char *gr_audit_log_fmt;
77188+extern char *gr_alert_log_buf;
77189+extern char *gr_audit_log_buf;
77190+
77191+static int gr_log_start(int audit)
77192+{
77193+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
77194+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
77195+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77196+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
77197+ unsigned long curr_secs = get_seconds();
77198+
77199+ if (audit == GR_DO_AUDIT)
77200+ goto set_fmt;
77201+
77202+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
77203+ grsec_alert_wtime = curr_secs;
77204+ grsec_alert_fyet = 0;
77205+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
77206+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
77207+ grsec_alert_fyet++;
77208+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
77209+ grsec_alert_wtime = curr_secs;
77210+ grsec_alert_fyet++;
77211+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
77212+ return FLOODING;
77213+ }
77214+ else return FLOODING;
77215+
77216+set_fmt:
77217+#endif
77218+ memset(buf, 0, PAGE_SIZE);
77219+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
77220+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
77221+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
77222+ } else if (current->signal->curr_ip) {
77223+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
77224+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
77225+ } else if (gr_acl_is_enabled()) {
77226+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
77227+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
77228+ } else {
77229+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
77230+ strcpy(buf, fmt);
77231+ }
77232+
77233+ return NO_FLOODING;
77234+}
77235+
77236+static void gr_log_middle(int audit, const char *msg, va_list ap)
77237+ __attribute__ ((format (printf, 2, 0)));
77238+
77239+static void gr_log_middle(int audit, const char *msg, va_list ap)
77240+{
77241+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77242+ unsigned int len = strlen(buf);
77243+
77244+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
77245+
77246+ return;
77247+}
77248+
77249+static void gr_log_middle_varargs(int audit, const char *msg, ...)
77250+ __attribute__ ((format (printf, 2, 3)));
77251+
77252+static void gr_log_middle_varargs(int audit, const char *msg, ...)
77253+{
77254+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77255+ unsigned int len = strlen(buf);
77256+ va_list ap;
77257+
77258+ va_start(ap, msg);
77259+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
77260+ va_end(ap);
77261+
77262+ return;
77263+}
77264+
77265+static void gr_log_end(int audit, int append_default)
77266+{
77267+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
77268+ if (append_default) {
77269+ struct task_struct *task = current;
77270+ struct task_struct *parent = task->real_parent;
77271+ const struct cred *cred = __task_cred(task);
77272+ const struct cred *pcred = __task_cred(parent);
77273+ unsigned int len = strlen(buf);
77274+
77275+ 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));
77276+ }
77277+
77278+ printk("%s\n", buf);
77279+
77280+ return;
77281+}
77282+
77283+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
77284+{
77285+ int logtype;
77286+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
77287+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
77288+ void *voidptr = NULL;
77289+ int num1 = 0, num2 = 0;
77290+ unsigned long ulong1 = 0, ulong2 = 0;
77291+ struct dentry *dentry = NULL;
77292+ struct vfsmount *mnt = NULL;
77293+ struct file *file = NULL;
77294+ struct task_struct *task = NULL;
77295+ struct vm_area_struct *vma = NULL;
77296+ const struct cred *cred, *pcred;
77297+ va_list ap;
77298+
77299+ BEGIN_LOCKS(audit);
77300+ logtype = gr_log_start(audit);
77301+ if (logtype == FLOODING) {
77302+ END_LOCKS(audit);
77303+ return;
77304+ }
77305+ va_start(ap, argtypes);
77306+ switch (argtypes) {
77307+ case GR_TTYSNIFF:
77308+ task = va_arg(ap, struct task_struct *);
77309+ 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));
77310+ break;
77311+ case GR_SYSCTL_HIDDEN:
77312+ str1 = va_arg(ap, char *);
77313+ gr_log_middle_varargs(audit, msg, result, str1);
77314+ break;
77315+ case GR_RBAC:
77316+ dentry = va_arg(ap, struct dentry *);
77317+ mnt = va_arg(ap, struct vfsmount *);
77318+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
77319+ break;
77320+ case GR_RBAC_STR:
77321+ dentry = va_arg(ap, struct dentry *);
77322+ mnt = va_arg(ap, struct vfsmount *);
77323+ str1 = va_arg(ap, char *);
77324+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
77325+ break;
77326+ case GR_STR_RBAC:
77327+ str1 = va_arg(ap, char *);
77328+ dentry = va_arg(ap, struct dentry *);
77329+ mnt = va_arg(ap, struct vfsmount *);
77330+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
77331+ break;
77332+ case GR_RBAC_MODE2:
77333+ dentry = va_arg(ap, struct dentry *);
77334+ mnt = va_arg(ap, struct vfsmount *);
77335+ str1 = va_arg(ap, char *);
77336+ str2 = va_arg(ap, char *);
77337+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
77338+ break;
77339+ case GR_RBAC_MODE3:
77340+ dentry = va_arg(ap, struct dentry *);
77341+ mnt = va_arg(ap, struct vfsmount *);
77342+ str1 = va_arg(ap, char *);
77343+ str2 = va_arg(ap, char *);
77344+ str3 = va_arg(ap, char *);
77345+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
77346+ break;
77347+ case GR_FILENAME:
77348+ dentry = va_arg(ap, struct dentry *);
77349+ mnt = va_arg(ap, struct vfsmount *);
77350+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
77351+ break;
77352+ case GR_STR_FILENAME:
77353+ str1 = va_arg(ap, char *);
77354+ dentry = va_arg(ap, struct dentry *);
77355+ mnt = va_arg(ap, struct vfsmount *);
77356+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
77357+ break;
77358+ case GR_FILENAME_STR:
77359+ dentry = va_arg(ap, struct dentry *);
77360+ mnt = va_arg(ap, struct vfsmount *);
77361+ str1 = va_arg(ap, char *);
77362+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
77363+ break;
77364+ case GR_FILENAME_TWO_INT:
77365+ dentry = va_arg(ap, struct dentry *);
77366+ mnt = va_arg(ap, struct vfsmount *);
77367+ num1 = va_arg(ap, int);
77368+ num2 = va_arg(ap, int);
77369+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
77370+ break;
77371+ case GR_FILENAME_TWO_INT_STR:
77372+ dentry = va_arg(ap, struct dentry *);
77373+ mnt = va_arg(ap, struct vfsmount *);
77374+ num1 = va_arg(ap, int);
77375+ num2 = va_arg(ap, int);
77376+ str1 = va_arg(ap, char *);
77377+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
77378+ break;
77379+ case GR_TEXTREL:
77380+ file = va_arg(ap, struct file *);
77381+ ulong1 = va_arg(ap, unsigned long);
77382+ ulong2 = va_arg(ap, unsigned long);
77383+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
77384+ break;
77385+ case GR_PTRACE:
77386+ task = va_arg(ap, struct task_struct *);
77387+ 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));
77388+ break;
77389+ case GR_RESOURCE:
77390+ task = va_arg(ap, struct task_struct *);
77391+ cred = __task_cred(task);
77392+ pcred = __task_cred(task->real_parent);
77393+ ulong1 = va_arg(ap, unsigned long);
77394+ str1 = va_arg(ap, char *);
77395+ ulong2 = va_arg(ap, unsigned long);
77396+ 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));
77397+ break;
77398+ case GR_CAP:
77399+ task = va_arg(ap, struct task_struct *);
77400+ cred = __task_cred(task);
77401+ pcred = __task_cred(task->real_parent);
77402+ str1 = va_arg(ap, char *);
77403+ 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));
77404+ break;
77405+ case GR_SIG:
77406+ str1 = va_arg(ap, char *);
77407+ voidptr = va_arg(ap, void *);
77408+ gr_log_middle_varargs(audit, msg, str1, voidptr);
77409+ break;
77410+ case GR_SIG2:
77411+ task = va_arg(ap, struct task_struct *);
77412+ cred = __task_cred(task);
77413+ pcred = __task_cred(task->real_parent);
77414+ num1 = va_arg(ap, int);
77415+ 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));
77416+ break;
77417+ case GR_CRASH1:
77418+ task = va_arg(ap, struct task_struct *);
77419+ cred = __task_cred(task);
77420+ pcred = __task_cred(task->real_parent);
77421+ ulong1 = va_arg(ap, unsigned long);
77422+ 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);
77423+ break;
77424+ case GR_CRASH2:
77425+ task = va_arg(ap, struct task_struct *);
77426+ cred = __task_cred(task);
77427+ pcred = __task_cred(task->real_parent);
77428+ ulong1 = va_arg(ap, unsigned long);
77429+ 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);
77430+ break;
77431+ case GR_RWXMAP:
77432+ file = va_arg(ap, struct file *);
77433+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
77434+ break;
77435+ case GR_RWXMAPVMA:
77436+ vma = va_arg(ap, struct vm_area_struct *);
77437+ if (vma->vm_file)
77438+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
77439+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
77440+ str1 = "<stack>";
77441+ else if (vma->vm_start <= current->mm->brk &&
77442+ vma->vm_end >= current->mm->start_brk)
77443+ str1 = "<heap>";
77444+ else
77445+ str1 = "<anonymous mapping>";
77446+ gr_log_middle_varargs(audit, msg, str1);
77447+ break;
77448+ case GR_PSACCT:
77449+ {
77450+ unsigned int wday, cday;
77451+ __u8 whr, chr;
77452+ __u8 wmin, cmin;
77453+ __u8 wsec, csec;
77454+ char cur_tty[64] = { 0 };
77455+ char parent_tty[64] = { 0 };
77456+
77457+ task = va_arg(ap, struct task_struct *);
77458+ wday = va_arg(ap, unsigned int);
77459+ cday = va_arg(ap, unsigned int);
77460+ whr = va_arg(ap, int);
77461+ chr = va_arg(ap, int);
77462+ wmin = va_arg(ap, int);
77463+ cmin = va_arg(ap, int);
77464+ wsec = va_arg(ap, int);
77465+ csec = va_arg(ap, int);
77466+ ulong1 = va_arg(ap, unsigned long);
77467+ cred = __task_cred(task);
77468+ pcred = __task_cred(task->real_parent);
77469+
77470+ 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));
77471+ }
77472+ break;
77473+ default:
77474+ gr_log_middle(audit, msg, ap);
77475+ }
77476+ va_end(ap);
77477+ // these don't need DEFAULTSECARGS printed on the end
77478+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
77479+ gr_log_end(audit, 0);
77480+ else
77481+ gr_log_end(audit, 1);
77482+ END_LOCKS(audit);
77483+}
77484diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
77485new file mode 100644
77486index 0000000..0e39d8c
77487--- /dev/null
77488+++ b/grsecurity/grsec_mem.c
77489@@ -0,0 +1,48 @@
77490+#include <linux/kernel.h>
77491+#include <linux/sched.h>
77492+#include <linux/mm.h>
77493+#include <linux/mman.h>
77494+#include <linux/module.h>
77495+#include <linux/grinternal.h>
77496+
77497+void gr_handle_msr_write(void)
77498+{
77499+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
77500+ return;
77501+}
77502+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
77503+
77504+void
77505+gr_handle_ioperm(void)
77506+{
77507+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
77508+ return;
77509+}
77510+
77511+void
77512+gr_handle_iopl(void)
77513+{
77514+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
77515+ return;
77516+}
77517+
77518+void
77519+gr_handle_mem_readwrite(u64 from, u64 to)
77520+{
77521+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
77522+ return;
77523+}
77524+
77525+void
77526+gr_handle_vm86(void)
77527+{
77528+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
77529+ return;
77530+}
77531+
77532+void
77533+gr_log_badprocpid(const char *entry)
77534+{
77535+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
77536+ return;
77537+}
77538diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
77539new file mode 100644
77540index 0000000..6f9eb73
77541--- /dev/null
77542+++ b/grsecurity/grsec_mount.c
77543@@ -0,0 +1,65 @@
77544+#include <linux/kernel.h>
77545+#include <linux/sched.h>
77546+#include <linux/mount.h>
77547+#include <linux/major.h>
77548+#include <linux/grsecurity.h>
77549+#include <linux/grinternal.h>
77550+
77551+void
77552+gr_log_remount(const char *devname, const int retval)
77553+{
77554+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77555+ if (grsec_enable_mount && (retval >= 0))
77556+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
77557+#endif
77558+ return;
77559+}
77560+
77561+void
77562+gr_log_unmount(const char *devname, const int retval)
77563+{
77564+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77565+ if (grsec_enable_mount && (retval >= 0))
77566+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
77567+#endif
77568+ return;
77569+}
77570+
77571+void
77572+gr_log_mount(const char *from, struct path *to, const int retval)
77573+{
77574+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
77575+ if (grsec_enable_mount && (retval >= 0))
77576+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
77577+#endif
77578+ return;
77579+}
77580+
77581+int
77582+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
77583+{
77584+#ifdef CONFIG_GRKERNSEC_ROFS
77585+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
77586+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
77587+ return -EPERM;
77588+ } else
77589+ return 0;
77590+#endif
77591+ return 0;
77592+}
77593+
77594+int
77595+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
77596+{
77597+#ifdef CONFIG_GRKERNSEC_ROFS
77598+ struct inode *inode = dentry->d_inode;
77599+
77600+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
77601+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
77602+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
77603+ return -EPERM;
77604+ } else
77605+ return 0;
77606+#endif
77607+ return 0;
77608+}
77609diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
77610new file mode 100644
77611index 0000000..6ee9d50
77612--- /dev/null
77613+++ b/grsecurity/grsec_pax.c
77614@@ -0,0 +1,45 @@
77615+#include <linux/kernel.h>
77616+#include <linux/sched.h>
77617+#include <linux/mm.h>
77618+#include <linux/file.h>
77619+#include <linux/grinternal.h>
77620+#include <linux/grsecurity.h>
77621+
77622+void
77623+gr_log_textrel(struct vm_area_struct * vma)
77624+{
77625+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77626+ if (grsec_enable_log_rwxmaps)
77627+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
77628+#endif
77629+ return;
77630+}
77631+
77632+void gr_log_ptgnustack(struct file *file)
77633+{
77634+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77635+ if (grsec_enable_log_rwxmaps)
77636+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
77637+#endif
77638+ return;
77639+}
77640+
77641+void
77642+gr_log_rwxmmap(struct file *file)
77643+{
77644+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77645+ if (grsec_enable_log_rwxmaps)
77646+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
77647+#endif
77648+ return;
77649+}
77650+
77651+void
77652+gr_log_rwxmprotect(struct vm_area_struct *vma)
77653+{
77654+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
77655+ if (grsec_enable_log_rwxmaps)
77656+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
77657+#endif
77658+ return;
77659+}
77660diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
77661new file mode 100644
77662index 0000000..2005a3a
77663--- /dev/null
77664+++ b/grsecurity/grsec_proc.c
77665@@ -0,0 +1,20 @@
77666+#include <linux/kernel.h>
77667+#include <linux/sched.h>
77668+#include <linux/grsecurity.h>
77669+#include <linux/grinternal.h>
77670+
77671+int gr_proc_is_restricted(void)
77672+{
77673+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
77674+ const struct cred *cred = current_cred();
77675+#endif
77676+
77677+#ifdef CONFIG_GRKERNSEC_PROC_USER
77678+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
77679+ return -EACCES;
77680+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
77681+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
77682+ return -EACCES;
77683+#endif
77684+ return 0;
77685+}
77686diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
77687new file mode 100644
77688index 0000000..f7f29aa
77689--- /dev/null
77690+++ b/grsecurity/grsec_ptrace.c
77691@@ -0,0 +1,30 @@
77692+#include <linux/kernel.h>
77693+#include <linux/sched.h>
77694+#include <linux/grinternal.h>
77695+#include <linux/security.h>
77696+
77697+void
77698+gr_audit_ptrace(struct task_struct *task)
77699+{
77700+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
77701+ if (grsec_enable_audit_ptrace)
77702+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
77703+#endif
77704+ return;
77705+}
77706+
77707+int
77708+gr_ptrace_readexec(struct file *file, int unsafe_flags)
77709+{
77710+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
77711+ const struct dentry *dentry = file->f_path.dentry;
77712+ const struct vfsmount *mnt = file->f_path.mnt;
77713+
77714+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
77715+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
77716+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
77717+ return -EACCES;
77718+ }
77719+#endif
77720+ return 0;
77721+}
77722diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
77723new file mode 100644
77724index 0000000..3860c7e
77725--- /dev/null
77726+++ b/grsecurity/grsec_sig.c
77727@@ -0,0 +1,236 @@
77728+#include <linux/kernel.h>
77729+#include <linux/sched.h>
77730+#include <linux/fs.h>
77731+#include <linux/delay.h>
77732+#include <linux/grsecurity.h>
77733+#include <linux/grinternal.h>
77734+#include <linux/hardirq.h>
77735+
77736+char *signames[] = {
77737+ [SIGSEGV] = "Segmentation fault",
77738+ [SIGILL] = "Illegal instruction",
77739+ [SIGABRT] = "Abort",
77740+ [SIGBUS] = "Invalid alignment/Bus error"
77741+};
77742+
77743+void
77744+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
77745+{
77746+#ifdef CONFIG_GRKERNSEC_SIGNAL
77747+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
77748+ (sig == SIGABRT) || (sig == SIGBUS))) {
77749+ if (task_pid_nr(t) == task_pid_nr(current)) {
77750+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
77751+ } else {
77752+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
77753+ }
77754+ }
77755+#endif
77756+ return;
77757+}
77758+
77759+int
77760+gr_handle_signal(const struct task_struct *p, const int sig)
77761+{
77762+#ifdef CONFIG_GRKERNSEC
77763+ /* ignore the 0 signal for protected task checks */
77764+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
77765+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
77766+ return -EPERM;
77767+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
77768+ return -EPERM;
77769+ }
77770+#endif
77771+ return 0;
77772+}
77773+
77774+#ifdef CONFIG_GRKERNSEC
77775+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
77776+
77777+int gr_fake_force_sig(int sig, struct task_struct *t)
77778+{
77779+ unsigned long int flags;
77780+ int ret, blocked, ignored;
77781+ struct k_sigaction *action;
77782+
77783+ spin_lock_irqsave(&t->sighand->siglock, flags);
77784+ action = &t->sighand->action[sig-1];
77785+ ignored = action->sa.sa_handler == SIG_IGN;
77786+ blocked = sigismember(&t->blocked, sig);
77787+ if (blocked || ignored) {
77788+ action->sa.sa_handler = SIG_DFL;
77789+ if (blocked) {
77790+ sigdelset(&t->blocked, sig);
77791+ recalc_sigpending_and_wake(t);
77792+ }
77793+ }
77794+ if (action->sa.sa_handler == SIG_DFL)
77795+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
77796+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
77797+
77798+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
77799+
77800+ return ret;
77801+}
77802+#endif
77803+
77804+#define GR_USER_BAN_TIME (15 * 60)
77805+#define GR_DAEMON_BRUTE_TIME (30 * 60)
77806+
77807+void gr_handle_brute_attach(int dumpable)
77808+{
77809+#ifdef CONFIG_GRKERNSEC_BRUTE
77810+ struct task_struct *p = current;
77811+ kuid_t uid = GLOBAL_ROOT_UID;
77812+ int daemon = 0;
77813+
77814+ if (!grsec_enable_brute)
77815+ return;
77816+
77817+ rcu_read_lock();
77818+ read_lock(&tasklist_lock);
77819+ read_lock(&grsec_exec_file_lock);
77820+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
77821+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
77822+ p->real_parent->brute = 1;
77823+ daemon = 1;
77824+ } else {
77825+ const struct cred *cred = __task_cred(p), *cred2;
77826+ struct task_struct *tsk, *tsk2;
77827+
77828+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
77829+ struct user_struct *user;
77830+
77831+ uid = cred->uid;
77832+
77833+ /* this is put upon execution past expiration */
77834+ user = find_user(uid);
77835+ if (user == NULL)
77836+ goto unlock;
77837+ user->suid_banned = 1;
77838+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
77839+ if (user->suid_ban_expires == ~0UL)
77840+ user->suid_ban_expires--;
77841+
77842+ /* only kill other threads of the same binary, from the same user */
77843+ do_each_thread(tsk2, tsk) {
77844+ cred2 = __task_cred(tsk);
77845+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
77846+ gr_fake_force_sig(SIGKILL, tsk);
77847+ } while_each_thread(tsk2, tsk);
77848+ }
77849+ }
77850+unlock:
77851+ read_unlock(&grsec_exec_file_lock);
77852+ read_unlock(&tasklist_lock);
77853+ rcu_read_unlock();
77854+
77855+ if (gr_is_global_nonroot(uid))
77856+ 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);
77857+ else if (daemon)
77858+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
77859+
77860+#endif
77861+ return;
77862+}
77863+
77864+void gr_handle_brute_check(void)
77865+{
77866+#ifdef CONFIG_GRKERNSEC_BRUTE
77867+ struct task_struct *p = current;
77868+
77869+ if (unlikely(p->brute)) {
77870+ if (!grsec_enable_brute)
77871+ p->brute = 0;
77872+ else if (time_before(get_seconds(), p->brute_expires))
77873+ msleep(30 * 1000);
77874+ }
77875+#endif
77876+ return;
77877+}
77878+
77879+void gr_handle_kernel_exploit(void)
77880+{
77881+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
77882+ const struct cred *cred;
77883+ struct task_struct *tsk, *tsk2;
77884+ struct user_struct *user;
77885+ kuid_t uid;
77886+
77887+ if (in_irq() || in_serving_softirq() || in_nmi())
77888+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
77889+
77890+ uid = current_uid();
77891+
77892+ if (gr_is_global_root(uid))
77893+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
77894+ else {
77895+ /* kill all the processes of this user, hold a reference
77896+ to their creds struct, and prevent them from creating
77897+ another process until system reset
77898+ */
77899+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
77900+ GR_GLOBAL_UID(uid));
77901+ /* we intentionally leak this ref */
77902+ user = get_uid(current->cred->user);
77903+ if (user)
77904+ user->kernel_banned = 1;
77905+
77906+ /* kill all processes of this user */
77907+ read_lock(&tasklist_lock);
77908+ do_each_thread(tsk2, tsk) {
77909+ cred = __task_cred(tsk);
77910+ if (uid_eq(cred->uid, uid))
77911+ gr_fake_force_sig(SIGKILL, tsk);
77912+ } while_each_thread(tsk2, tsk);
77913+ read_unlock(&tasklist_lock);
77914+ }
77915+#endif
77916+}
77917+
77918+#ifdef CONFIG_GRKERNSEC_BRUTE
77919+static bool suid_ban_expired(struct user_struct *user)
77920+{
77921+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
77922+ user->suid_banned = 0;
77923+ user->suid_ban_expires = 0;
77924+ free_uid(user);
77925+ return true;
77926+ }
77927+
77928+ return false;
77929+}
77930+#endif
77931+
77932+int gr_process_kernel_exec_ban(void)
77933+{
77934+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
77935+ if (unlikely(current->cred->user->kernel_banned))
77936+ return -EPERM;
77937+#endif
77938+ return 0;
77939+}
77940+
77941+int gr_process_kernel_setuid_ban(struct user_struct *user)
77942+{
77943+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
77944+ if (unlikely(user->kernel_banned))
77945+ gr_fake_force_sig(SIGKILL, current);
77946+#endif
77947+ return 0;
77948+}
77949+
77950+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
77951+{
77952+#ifdef CONFIG_GRKERNSEC_BRUTE
77953+ struct user_struct *user = current->cred->user;
77954+ if (unlikely(user->suid_banned)) {
77955+ if (suid_ban_expired(user))
77956+ return 0;
77957+ /* disallow execution of suid binaries only */
77958+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
77959+ return -EPERM;
77960+ }
77961+#endif
77962+ return 0;
77963+}
77964diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
77965new file mode 100644
77966index 0000000..e3650b6
77967--- /dev/null
77968+++ b/grsecurity/grsec_sock.c
77969@@ -0,0 +1,244 @@
77970+#include <linux/kernel.h>
77971+#include <linux/module.h>
77972+#include <linux/sched.h>
77973+#include <linux/file.h>
77974+#include <linux/net.h>
77975+#include <linux/in.h>
77976+#include <linux/ip.h>
77977+#include <net/sock.h>
77978+#include <net/inet_sock.h>
77979+#include <linux/grsecurity.h>
77980+#include <linux/grinternal.h>
77981+#include <linux/gracl.h>
77982+
77983+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
77984+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
77985+
77986+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
77987+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
77988+
77989+#ifdef CONFIG_UNIX_MODULE
77990+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
77991+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
77992+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
77993+EXPORT_SYMBOL_GPL(gr_handle_create);
77994+#endif
77995+
77996+#ifdef CONFIG_GRKERNSEC
77997+#define gr_conn_table_size 32749
77998+struct conn_table_entry {
77999+ struct conn_table_entry *next;
78000+ struct signal_struct *sig;
78001+};
78002+
78003+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
78004+DEFINE_SPINLOCK(gr_conn_table_lock);
78005+
78006+extern const char * gr_socktype_to_name(unsigned char type);
78007+extern const char * gr_proto_to_name(unsigned char proto);
78008+extern const char * gr_sockfamily_to_name(unsigned char family);
78009+
78010+static __inline__ int
78011+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
78012+{
78013+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
78014+}
78015+
78016+static __inline__ int
78017+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
78018+ __u16 sport, __u16 dport)
78019+{
78020+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
78021+ sig->gr_sport == sport && sig->gr_dport == dport))
78022+ return 1;
78023+ else
78024+ return 0;
78025+}
78026+
78027+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
78028+{
78029+ struct conn_table_entry **match;
78030+ unsigned int index;
78031+
78032+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78033+ sig->gr_sport, sig->gr_dport,
78034+ gr_conn_table_size);
78035+
78036+ newent->sig = sig;
78037+
78038+ match = &gr_conn_table[index];
78039+ newent->next = *match;
78040+ *match = newent;
78041+
78042+ return;
78043+}
78044+
78045+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
78046+{
78047+ struct conn_table_entry *match, *last = NULL;
78048+ unsigned int index;
78049+
78050+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
78051+ sig->gr_sport, sig->gr_dport,
78052+ gr_conn_table_size);
78053+
78054+ match = gr_conn_table[index];
78055+ while (match && !conn_match(match->sig,
78056+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
78057+ sig->gr_dport)) {
78058+ last = match;
78059+ match = match->next;
78060+ }
78061+
78062+ if (match) {
78063+ if (last)
78064+ last->next = match->next;
78065+ else
78066+ gr_conn_table[index] = NULL;
78067+ kfree(match);
78068+ }
78069+
78070+ return;
78071+}
78072+
78073+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
78074+ __u16 sport, __u16 dport)
78075+{
78076+ struct conn_table_entry *match;
78077+ unsigned int index;
78078+
78079+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
78080+
78081+ match = gr_conn_table[index];
78082+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
78083+ match = match->next;
78084+
78085+ if (match)
78086+ return match->sig;
78087+ else
78088+ return NULL;
78089+}
78090+
78091+#endif
78092+
78093+void gr_update_task_in_ip_table(const struct inet_sock *inet)
78094+{
78095+#ifdef CONFIG_GRKERNSEC
78096+ struct signal_struct *sig = current->signal;
78097+ struct conn_table_entry *newent;
78098+
78099+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
78100+ if (newent == NULL)
78101+ return;
78102+ /* no bh lock needed since we are called with bh disabled */
78103+ spin_lock(&gr_conn_table_lock);
78104+ gr_del_task_from_ip_table_nolock(sig);
78105+ sig->gr_saddr = inet->inet_rcv_saddr;
78106+ sig->gr_daddr = inet->inet_daddr;
78107+ sig->gr_sport = inet->inet_sport;
78108+ sig->gr_dport = inet->inet_dport;
78109+ gr_add_to_task_ip_table_nolock(sig, newent);
78110+ spin_unlock(&gr_conn_table_lock);
78111+#endif
78112+ return;
78113+}
78114+
78115+void gr_del_task_from_ip_table(struct task_struct *task)
78116+{
78117+#ifdef CONFIG_GRKERNSEC
78118+ spin_lock_bh(&gr_conn_table_lock);
78119+ gr_del_task_from_ip_table_nolock(task->signal);
78120+ spin_unlock_bh(&gr_conn_table_lock);
78121+#endif
78122+ return;
78123+}
78124+
78125+void
78126+gr_attach_curr_ip(const struct sock *sk)
78127+{
78128+#ifdef CONFIG_GRKERNSEC
78129+ struct signal_struct *p, *set;
78130+ const struct inet_sock *inet = inet_sk(sk);
78131+
78132+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
78133+ return;
78134+
78135+ set = current->signal;
78136+
78137+ spin_lock_bh(&gr_conn_table_lock);
78138+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
78139+ inet->inet_dport, inet->inet_sport);
78140+ if (unlikely(p != NULL)) {
78141+ set->curr_ip = p->curr_ip;
78142+ set->used_accept = 1;
78143+ gr_del_task_from_ip_table_nolock(p);
78144+ spin_unlock_bh(&gr_conn_table_lock);
78145+ return;
78146+ }
78147+ spin_unlock_bh(&gr_conn_table_lock);
78148+
78149+ set->curr_ip = inet->inet_daddr;
78150+ set->used_accept = 1;
78151+#endif
78152+ return;
78153+}
78154+
78155+int
78156+gr_handle_sock_all(const int family, const int type, const int protocol)
78157+{
78158+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
78159+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
78160+ (family != AF_UNIX)) {
78161+ if (family == AF_INET)
78162+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
78163+ else
78164+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
78165+ return -EACCES;
78166+ }
78167+#endif
78168+ return 0;
78169+}
78170+
78171+int
78172+gr_handle_sock_server(const struct sockaddr *sck)
78173+{
78174+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78175+ if (grsec_enable_socket_server &&
78176+ in_group_p(grsec_socket_server_gid) &&
78177+ sck && (sck->sa_family != AF_UNIX) &&
78178+ (sck->sa_family != AF_LOCAL)) {
78179+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
78180+ return -EACCES;
78181+ }
78182+#endif
78183+ return 0;
78184+}
78185+
78186+int
78187+gr_handle_sock_server_other(const struct sock *sck)
78188+{
78189+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78190+ if (grsec_enable_socket_server &&
78191+ in_group_p(grsec_socket_server_gid) &&
78192+ sck && (sck->sk_family != AF_UNIX) &&
78193+ (sck->sk_family != AF_LOCAL)) {
78194+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
78195+ return -EACCES;
78196+ }
78197+#endif
78198+ return 0;
78199+}
78200+
78201+int
78202+gr_handle_sock_client(const struct sockaddr *sck)
78203+{
78204+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
78205+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
78206+ sck && (sck->sa_family != AF_UNIX) &&
78207+ (sck->sa_family != AF_LOCAL)) {
78208+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
78209+ return -EACCES;
78210+ }
78211+#endif
78212+ return 0;
78213+}
78214diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
78215new file mode 100644
78216index 0000000..8159888
78217--- /dev/null
78218+++ b/grsecurity/grsec_sysctl.c
78219@@ -0,0 +1,479 @@
78220+#include <linux/kernel.h>
78221+#include <linux/sched.h>
78222+#include <linux/sysctl.h>
78223+#include <linux/grsecurity.h>
78224+#include <linux/grinternal.h>
78225+
78226+int
78227+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
78228+{
78229+#ifdef CONFIG_GRKERNSEC_SYSCTL
78230+ if (dirname == NULL || name == NULL)
78231+ return 0;
78232+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
78233+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
78234+ return -EACCES;
78235+ }
78236+#endif
78237+ return 0;
78238+}
78239+
78240+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
78241+static int __maybe_unused __read_only one = 1;
78242+#endif
78243+
78244+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
78245+ defined(CONFIG_GRKERNSEC_DENYUSB)
78246+struct ctl_table grsecurity_table[] = {
78247+#ifdef CONFIG_GRKERNSEC_SYSCTL
78248+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
78249+#ifdef CONFIG_GRKERNSEC_IO
78250+ {
78251+ .procname = "disable_priv_io",
78252+ .data = &grsec_disable_privio,
78253+ .maxlen = sizeof(int),
78254+ .mode = 0600,
78255+ .proc_handler = &proc_dointvec,
78256+ },
78257+#endif
78258+#endif
78259+#ifdef CONFIG_GRKERNSEC_LINK
78260+ {
78261+ .procname = "linking_restrictions",
78262+ .data = &grsec_enable_link,
78263+ .maxlen = sizeof(int),
78264+ .mode = 0600,
78265+ .proc_handler = &proc_dointvec,
78266+ },
78267+#endif
78268+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
78269+ {
78270+ .procname = "enforce_symlinksifowner",
78271+ .data = &grsec_enable_symlinkown,
78272+ .maxlen = sizeof(int),
78273+ .mode = 0600,
78274+ .proc_handler = &proc_dointvec,
78275+ },
78276+ {
78277+ .procname = "symlinkown_gid",
78278+ .data = &grsec_symlinkown_gid,
78279+ .maxlen = sizeof(int),
78280+ .mode = 0600,
78281+ .proc_handler = &proc_dointvec,
78282+ },
78283+#endif
78284+#ifdef CONFIG_GRKERNSEC_BRUTE
78285+ {
78286+ .procname = "deter_bruteforce",
78287+ .data = &grsec_enable_brute,
78288+ .maxlen = sizeof(int),
78289+ .mode = 0600,
78290+ .proc_handler = &proc_dointvec,
78291+ },
78292+#endif
78293+#ifdef CONFIG_GRKERNSEC_FIFO
78294+ {
78295+ .procname = "fifo_restrictions",
78296+ .data = &grsec_enable_fifo,
78297+ .maxlen = sizeof(int),
78298+ .mode = 0600,
78299+ .proc_handler = &proc_dointvec,
78300+ },
78301+#endif
78302+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
78303+ {
78304+ .procname = "ptrace_readexec",
78305+ .data = &grsec_enable_ptrace_readexec,
78306+ .maxlen = sizeof(int),
78307+ .mode = 0600,
78308+ .proc_handler = &proc_dointvec,
78309+ },
78310+#endif
78311+#ifdef CONFIG_GRKERNSEC_SETXID
78312+ {
78313+ .procname = "consistent_setxid",
78314+ .data = &grsec_enable_setxid,
78315+ .maxlen = sizeof(int),
78316+ .mode = 0600,
78317+ .proc_handler = &proc_dointvec,
78318+ },
78319+#endif
78320+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78321+ {
78322+ .procname = "ip_blackhole",
78323+ .data = &grsec_enable_blackhole,
78324+ .maxlen = sizeof(int),
78325+ .mode = 0600,
78326+ .proc_handler = &proc_dointvec,
78327+ },
78328+ {
78329+ .procname = "lastack_retries",
78330+ .data = &grsec_lastack_retries,
78331+ .maxlen = sizeof(int),
78332+ .mode = 0600,
78333+ .proc_handler = &proc_dointvec,
78334+ },
78335+#endif
78336+#ifdef CONFIG_GRKERNSEC_EXECLOG
78337+ {
78338+ .procname = "exec_logging",
78339+ .data = &grsec_enable_execlog,
78340+ .maxlen = sizeof(int),
78341+ .mode = 0600,
78342+ .proc_handler = &proc_dointvec,
78343+ },
78344+#endif
78345+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78346+ {
78347+ .procname = "rwxmap_logging",
78348+ .data = &grsec_enable_log_rwxmaps,
78349+ .maxlen = sizeof(int),
78350+ .mode = 0600,
78351+ .proc_handler = &proc_dointvec,
78352+ },
78353+#endif
78354+#ifdef CONFIG_GRKERNSEC_SIGNAL
78355+ {
78356+ .procname = "signal_logging",
78357+ .data = &grsec_enable_signal,
78358+ .maxlen = sizeof(int),
78359+ .mode = 0600,
78360+ .proc_handler = &proc_dointvec,
78361+ },
78362+#endif
78363+#ifdef CONFIG_GRKERNSEC_FORKFAIL
78364+ {
78365+ .procname = "forkfail_logging",
78366+ .data = &grsec_enable_forkfail,
78367+ .maxlen = sizeof(int),
78368+ .mode = 0600,
78369+ .proc_handler = &proc_dointvec,
78370+ },
78371+#endif
78372+#ifdef CONFIG_GRKERNSEC_TIME
78373+ {
78374+ .procname = "timechange_logging",
78375+ .data = &grsec_enable_time,
78376+ .maxlen = sizeof(int),
78377+ .mode = 0600,
78378+ .proc_handler = &proc_dointvec,
78379+ },
78380+#endif
78381+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
78382+ {
78383+ .procname = "chroot_deny_shmat",
78384+ .data = &grsec_enable_chroot_shmat,
78385+ .maxlen = sizeof(int),
78386+ .mode = 0600,
78387+ .proc_handler = &proc_dointvec,
78388+ },
78389+#endif
78390+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
78391+ {
78392+ .procname = "chroot_deny_unix",
78393+ .data = &grsec_enable_chroot_unix,
78394+ .maxlen = sizeof(int),
78395+ .mode = 0600,
78396+ .proc_handler = &proc_dointvec,
78397+ },
78398+#endif
78399+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
78400+ {
78401+ .procname = "chroot_deny_mount",
78402+ .data = &grsec_enable_chroot_mount,
78403+ .maxlen = sizeof(int),
78404+ .mode = 0600,
78405+ .proc_handler = &proc_dointvec,
78406+ },
78407+#endif
78408+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
78409+ {
78410+ .procname = "chroot_deny_fchdir",
78411+ .data = &grsec_enable_chroot_fchdir,
78412+ .maxlen = sizeof(int),
78413+ .mode = 0600,
78414+ .proc_handler = &proc_dointvec,
78415+ },
78416+#endif
78417+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
78418+ {
78419+ .procname = "chroot_deny_chroot",
78420+ .data = &grsec_enable_chroot_double,
78421+ .maxlen = sizeof(int),
78422+ .mode = 0600,
78423+ .proc_handler = &proc_dointvec,
78424+ },
78425+#endif
78426+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
78427+ {
78428+ .procname = "chroot_deny_pivot",
78429+ .data = &grsec_enable_chroot_pivot,
78430+ .maxlen = sizeof(int),
78431+ .mode = 0600,
78432+ .proc_handler = &proc_dointvec,
78433+ },
78434+#endif
78435+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
78436+ {
78437+ .procname = "chroot_enforce_chdir",
78438+ .data = &grsec_enable_chroot_chdir,
78439+ .maxlen = sizeof(int),
78440+ .mode = 0600,
78441+ .proc_handler = &proc_dointvec,
78442+ },
78443+#endif
78444+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
78445+ {
78446+ .procname = "chroot_deny_chmod",
78447+ .data = &grsec_enable_chroot_chmod,
78448+ .maxlen = sizeof(int),
78449+ .mode = 0600,
78450+ .proc_handler = &proc_dointvec,
78451+ },
78452+#endif
78453+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
78454+ {
78455+ .procname = "chroot_deny_mknod",
78456+ .data = &grsec_enable_chroot_mknod,
78457+ .maxlen = sizeof(int),
78458+ .mode = 0600,
78459+ .proc_handler = &proc_dointvec,
78460+ },
78461+#endif
78462+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
78463+ {
78464+ .procname = "chroot_restrict_nice",
78465+ .data = &grsec_enable_chroot_nice,
78466+ .maxlen = sizeof(int),
78467+ .mode = 0600,
78468+ .proc_handler = &proc_dointvec,
78469+ },
78470+#endif
78471+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
78472+ {
78473+ .procname = "chroot_execlog",
78474+ .data = &grsec_enable_chroot_execlog,
78475+ .maxlen = sizeof(int),
78476+ .mode = 0600,
78477+ .proc_handler = &proc_dointvec,
78478+ },
78479+#endif
78480+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
78481+ {
78482+ .procname = "chroot_caps",
78483+ .data = &grsec_enable_chroot_caps,
78484+ .maxlen = sizeof(int),
78485+ .mode = 0600,
78486+ .proc_handler = &proc_dointvec,
78487+ },
78488+#endif
78489+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
78490+ {
78491+ .procname = "chroot_deny_sysctl",
78492+ .data = &grsec_enable_chroot_sysctl,
78493+ .maxlen = sizeof(int),
78494+ .mode = 0600,
78495+ .proc_handler = &proc_dointvec,
78496+ },
78497+#endif
78498+#ifdef CONFIG_GRKERNSEC_TPE
78499+ {
78500+ .procname = "tpe",
78501+ .data = &grsec_enable_tpe,
78502+ .maxlen = sizeof(int),
78503+ .mode = 0600,
78504+ .proc_handler = &proc_dointvec,
78505+ },
78506+ {
78507+ .procname = "tpe_gid",
78508+ .data = &grsec_tpe_gid,
78509+ .maxlen = sizeof(int),
78510+ .mode = 0600,
78511+ .proc_handler = &proc_dointvec,
78512+ },
78513+#endif
78514+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
78515+ {
78516+ .procname = "tpe_invert",
78517+ .data = &grsec_enable_tpe_invert,
78518+ .maxlen = sizeof(int),
78519+ .mode = 0600,
78520+ .proc_handler = &proc_dointvec,
78521+ },
78522+#endif
78523+#ifdef CONFIG_GRKERNSEC_TPE_ALL
78524+ {
78525+ .procname = "tpe_restrict_all",
78526+ .data = &grsec_enable_tpe_all,
78527+ .maxlen = sizeof(int),
78528+ .mode = 0600,
78529+ .proc_handler = &proc_dointvec,
78530+ },
78531+#endif
78532+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
78533+ {
78534+ .procname = "socket_all",
78535+ .data = &grsec_enable_socket_all,
78536+ .maxlen = sizeof(int),
78537+ .mode = 0600,
78538+ .proc_handler = &proc_dointvec,
78539+ },
78540+ {
78541+ .procname = "socket_all_gid",
78542+ .data = &grsec_socket_all_gid,
78543+ .maxlen = sizeof(int),
78544+ .mode = 0600,
78545+ .proc_handler = &proc_dointvec,
78546+ },
78547+#endif
78548+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
78549+ {
78550+ .procname = "socket_client",
78551+ .data = &grsec_enable_socket_client,
78552+ .maxlen = sizeof(int),
78553+ .mode = 0600,
78554+ .proc_handler = &proc_dointvec,
78555+ },
78556+ {
78557+ .procname = "socket_client_gid",
78558+ .data = &grsec_socket_client_gid,
78559+ .maxlen = sizeof(int),
78560+ .mode = 0600,
78561+ .proc_handler = &proc_dointvec,
78562+ },
78563+#endif
78564+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78565+ {
78566+ .procname = "socket_server",
78567+ .data = &grsec_enable_socket_server,
78568+ .maxlen = sizeof(int),
78569+ .mode = 0600,
78570+ .proc_handler = &proc_dointvec,
78571+ },
78572+ {
78573+ .procname = "socket_server_gid",
78574+ .data = &grsec_socket_server_gid,
78575+ .maxlen = sizeof(int),
78576+ .mode = 0600,
78577+ .proc_handler = &proc_dointvec,
78578+ },
78579+#endif
78580+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
78581+ {
78582+ .procname = "audit_group",
78583+ .data = &grsec_enable_group,
78584+ .maxlen = sizeof(int),
78585+ .mode = 0600,
78586+ .proc_handler = &proc_dointvec,
78587+ },
78588+ {
78589+ .procname = "audit_gid",
78590+ .data = &grsec_audit_gid,
78591+ .maxlen = sizeof(int),
78592+ .mode = 0600,
78593+ .proc_handler = &proc_dointvec,
78594+ },
78595+#endif
78596+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
78597+ {
78598+ .procname = "audit_chdir",
78599+ .data = &grsec_enable_chdir,
78600+ .maxlen = sizeof(int),
78601+ .mode = 0600,
78602+ .proc_handler = &proc_dointvec,
78603+ },
78604+#endif
78605+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
78606+ {
78607+ .procname = "audit_mount",
78608+ .data = &grsec_enable_mount,
78609+ .maxlen = sizeof(int),
78610+ .mode = 0600,
78611+ .proc_handler = &proc_dointvec,
78612+ },
78613+#endif
78614+#ifdef CONFIG_GRKERNSEC_DMESG
78615+ {
78616+ .procname = "dmesg",
78617+ .data = &grsec_enable_dmesg,
78618+ .maxlen = sizeof(int),
78619+ .mode = 0600,
78620+ .proc_handler = &proc_dointvec,
78621+ },
78622+#endif
78623+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
78624+ {
78625+ .procname = "chroot_findtask",
78626+ .data = &grsec_enable_chroot_findtask,
78627+ .maxlen = sizeof(int),
78628+ .mode = 0600,
78629+ .proc_handler = &proc_dointvec,
78630+ },
78631+#endif
78632+#ifdef CONFIG_GRKERNSEC_RESLOG
78633+ {
78634+ .procname = "resource_logging",
78635+ .data = &grsec_resource_logging,
78636+ .maxlen = sizeof(int),
78637+ .mode = 0600,
78638+ .proc_handler = &proc_dointvec,
78639+ },
78640+#endif
78641+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
78642+ {
78643+ .procname = "audit_ptrace",
78644+ .data = &grsec_enable_audit_ptrace,
78645+ .maxlen = sizeof(int),
78646+ .mode = 0600,
78647+ .proc_handler = &proc_dointvec,
78648+ },
78649+#endif
78650+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
78651+ {
78652+ .procname = "harden_ptrace",
78653+ .data = &grsec_enable_harden_ptrace,
78654+ .maxlen = sizeof(int),
78655+ .mode = 0600,
78656+ .proc_handler = &proc_dointvec,
78657+ },
78658+#endif
78659+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
78660+ {
78661+ .procname = "harden_ipc",
78662+ .data = &grsec_enable_harden_ipc,
78663+ .maxlen = sizeof(int),
78664+ .mode = 0600,
78665+ .proc_handler = &proc_dointvec,
78666+ },
78667+#endif
78668+ {
78669+ .procname = "grsec_lock",
78670+ .data = &grsec_lock,
78671+ .maxlen = sizeof(int),
78672+ .mode = 0600,
78673+ .proc_handler = &proc_dointvec,
78674+ },
78675+#endif
78676+#ifdef CONFIG_GRKERNSEC_ROFS
78677+ {
78678+ .procname = "romount_protect",
78679+ .data = &grsec_enable_rofs,
78680+ .maxlen = sizeof(int),
78681+ .mode = 0600,
78682+ .proc_handler = &proc_dointvec_minmax,
78683+ .extra1 = &one,
78684+ .extra2 = &one,
78685+ },
78686+#endif
78687+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
78688+ {
78689+ .procname = "deny_new_usb",
78690+ .data = &grsec_deny_new_usb,
78691+ .maxlen = sizeof(int),
78692+ .mode = 0600,
78693+ .proc_handler = &proc_dointvec,
78694+ },
78695+#endif
78696+ { }
78697+};
78698+#endif
78699diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
78700new file mode 100644
78701index 0000000..61b514e
78702--- /dev/null
78703+++ b/grsecurity/grsec_time.c
78704@@ -0,0 +1,16 @@
78705+#include <linux/kernel.h>
78706+#include <linux/sched.h>
78707+#include <linux/grinternal.h>
78708+#include <linux/module.h>
78709+
78710+void
78711+gr_log_timechange(void)
78712+{
78713+#ifdef CONFIG_GRKERNSEC_TIME
78714+ if (grsec_enable_time)
78715+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
78716+#endif
78717+ return;
78718+}
78719+
78720+EXPORT_SYMBOL_GPL(gr_log_timechange);
78721diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
78722new file mode 100644
78723index 0000000..d1953de
78724--- /dev/null
78725+++ b/grsecurity/grsec_tpe.c
78726@@ -0,0 +1,78 @@
78727+#include <linux/kernel.h>
78728+#include <linux/sched.h>
78729+#include <linux/file.h>
78730+#include <linux/fs.h>
78731+#include <linux/grinternal.h>
78732+
78733+extern int gr_acl_tpe_check(void);
78734+
78735+int
78736+gr_tpe_allow(const struct file *file)
78737+{
78738+#ifdef CONFIG_GRKERNSEC
78739+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
78740+ struct inode *file_inode = file->f_path.dentry->d_inode;
78741+ const struct cred *cred = current_cred();
78742+ char *msg = NULL;
78743+ char *msg2 = NULL;
78744+
78745+ // never restrict root
78746+ if (gr_is_global_root(cred->uid))
78747+ return 1;
78748+
78749+ if (grsec_enable_tpe) {
78750+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
78751+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
78752+ msg = "not being in trusted group";
78753+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
78754+ msg = "being in untrusted group";
78755+#else
78756+ if (in_group_p(grsec_tpe_gid))
78757+ msg = "being in untrusted group";
78758+#endif
78759+ }
78760+ if (!msg && gr_acl_tpe_check())
78761+ msg = "being in untrusted role";
78762+
78763+ // not in any affected group/role
78764+ if (!msg)
78765+ goto next_check;
78766+
78767+ if (gr_is_global_nonroot(inode->i_uid))
78768+ msg2 = "file in non-root-owned directory";
78769+ else if (inode->i_mode & S_IWOTH)
78770+ msg2 = "file in world-writable directory";
78771+ else if (inode->i_mode & S_IWGRP)
78772+ msg2 = "file in group-writable directory";
78773+ else if (file_inode->i_mode & S_IWOTH)
78774+ msg2 = "file is world-writable";
78775+
78776+ if (msg && msg2) {
78777+ char fullmsg[70] = {0};
78778+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
78779+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
78780+ return 0;
78781+ }
78782+ msg = NULL;
78783+next_check:
78784+#ifdef CONFIG_GRKERNSEC_TPE_ALL
78785+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
78786+ return 1;
78787+
78788+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
78789+ msg = "directory not owned by user";
78790+ else if (inode->i_mode & S_IWOTH)
78791+ msg = "file in world-writable directory";
78792+ else if (inode->i_mode & S_IWGRP)
78793+ msg = "file in group-writable directory";
78794+ else if (file_inode->i_mode & S_IWOTH)
78795+ msg = "file is world-writable";
78796+
78797+ if (msg) {
78798+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
78799+ return 0;
78800+ }
78801+#endif
78802+#endif
78803+ return 1;
78804+}
78805diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
78806new file mode 100644
78807index 0000000..ae02d8e
78808--- /dev/null
78809+++ b/grsecurity/grsec_usb.c
78810@@ -0,0 +1,15 @@
78811+#include <linux/kernel.h>
78812+#include <linux/grinternal.h>
78813+#include <linux/module.h>
78814+
78815+int gr_handle_new_usb(void)
78816+{
78817+#ifdef CONFIG_GRKERNSEC_DENYUSB
78818+ if (grsec_deny_new_usb) {
78819+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
78820+ return 1;
78821+ }
78822+#endif
78823+ return 0;
78824+}
78825+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
78826diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
78827new file mode 100644
78828index 0000000..158b330
78829--- /dev/null
78830+++ b/grsecurity/grsum.c
78831@@ -0,0 +1,64 @@
78832+#include <linux/err.h>
78833+#include <linux/kernel.h>
78834+#include <linux/sched.h>
78835+#include <linux/mm.h>
78836+#include <linux/scatterlist.h>
78837+#include <linux/crypto.h>
78838+#include <linux/gracl.h>
78839+
78840+
78841+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
78842+#error "crypto and sha256 must be built into the kernel"
78843+#endif
78844+
78845+int
78846+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
78847+{
78848+ struct crypto_hash *tfm;
78849+ struct hash_desc desc;
78850+ struct scatterlist sg[2];
78851+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
78852+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
78853+ unsigned long *sumptr = (unsigned long *)sum;
78854+ int cryptres;
78855+ int retval = 1;
78856+ volatile int mismatched = 0;
78857+ volatile int dummy = 0;
78858+ unsigned int i;
78859+
78860+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
78861+ if (IS_ERR(tfm)) {
78862+ /* should never happen, since sha256 should be built in */
78863+ memset(entry->pw, 0, GR_PW_LEN);
78864+ return 1;
78865+ }
78866+
78867+ sg_init_table(sg, 2);
78868+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
78869+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
78870+
78871+ desc.tfm = tfm;
78872+ desc.flags = 0;
78873+
78874+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
78875+ temp_sum);
78876+
78877+ memset(entry->pw, 0, GR_PW_LEN);
78878+
78879+ if (cryptres)
78880+ goto out;
78881+
78882+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
78883+ if (sumptr[i] != tmpsumptr[i])
78884+ mismatched = 1;
78885+ else
78886+ dummy = 1; // waste a cycle
78887+
78888+ if (!mismatched)
78889+ retval = dummy - 1;
78890+
78891+out:
78892+ crypto_free_hash(tfm);
78893+
78894+ return retval;
78895+}
78896diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
78897index 77ff547..181834f 100644
78898--- a/include/asm-generic/4level-fixup.h
78899+++ b/include/asm-generic/4level-fixup.h
78900@@ -13,8 +13,10 @@
78901 #define pmd_alloc(mm, pud, address) \
78902 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
78903 NULL: pmd_offset(pud, address))
78904+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
78905
78906 #define pud_alloc(mm, pgd, address) (pgd)
78907+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
78908 #define pud_offset(pgd, start) (pgd)
78909 #define pud_none(pud) 0
78910 #define pud_bad(pud) 0
78911diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
78912index b7babf0..1e4b4f1 100644
78913--- a/include/asm-generic/atomic-long.h
78914+++ b/include/asm-generic/atomic-long.h
78915@@ -22,6 +22,12 @@
78916
78917 typedef atomic64_t atomic_long_t;
78918
78919+#ifdef CONFIG_PAX_REFCOUNT
78920+typedef atomic64_unchecked_t atomic_long_unchecked_t;
78921+#else
78922+typedef atomic64_t atomic_long_unchecked_t;
78923+#endif
78924+
78925 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
78926
78927 static inline long atomic_long_read(atomic_long_t *l)
78928@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
78929 return (long)atomic64_read(v);
78930 }
78931
78932+#ifdef CONFIG_PAX_REFCOUNT
78933+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
78934+{
78935+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
78936+
78937+ return (long)atomic64_read_unchecked(v);
78938+}
78939+#endif
78940+
78941 static inline void atomic_long_set(atomic_long_t *l, long i)
78942 {
78943 atomic64_t *v = (atomic64_t *)l;
78944@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
78945 atomic64_set(v, i);
78946 }
78947
78948+#ifdef CONFIG_PAX_REFCOUNT
78949+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
78950+{
78951+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
78952+
78953+ atomic64_set_unchecked(v, i);
78954+}
78955+#endif
78956+
78957 static inline void atomic_long_inc(atomic_long_t *l)
78958 {
78959 atomic64_t *v = (atomic64_t *)l;
78960@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
78961 atomic64_inc(v);
78962 }
78963
78964+#ifdef CONFIG_PAX_REFCOUNT
78965+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
78966+{
78967+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
78968+
78969+ atomic64_inc_unchecked(v);
78970+}
78971+#endif
78972+
78973 static inline void atomic_long_dec(atomic_long_t *l)
78974 {
78975 atomic64_t *v = (atomic64_t *)l;
78976@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
78977 atomic64_dec(v);
78978 }
78979
78980+#ifdef CONFIG_PAX_REFCOUNT
78981+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
78982+{
78983+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
78984+
78985+ atomic64_dec_unchecked(v);
78986+}
78987+#endif
78988+
78989 static inline void atomic_long_add(long i, atomic_long_t *l)
78990 {
78991 atomic64_t *v = (atomic64_t *)l;
78992@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
78993 atomic64_add(i, v);
78994 }
78995
78996+#ifdef CONFIG_PAX_REFCOUNT
78997+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
78998+{
78999+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79000+
79001+ atomic64_add_unchecked(i, v);
79002+}
79003+#endif
79004+
79005 static inline void atomic_long_sub(long i, atomic_long_t *l)
79006 {
79007 atomic64_t *v = (atomic64_t *)l;
79008@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
79009 atomic64_sub(i, v);
79010 }
79011
79012+#ifdef CONFIG_PAX_REFCOUNT
79013+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
79014+{
79015+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79016+
79017+ atomic64_sub_unchecked(i, v);
79018+}
79019+#endif
79020+
79021 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
79022 {
79023 atomic64_t *v = (atomic64_t *)l;
79024@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
79025 return atomic64_add_negative(i, v);
79026 }
79027
79028-static inline long atomic_long_add_return(long i, atomic_long_t *l)
79029+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
79030 {
79031 atomic64_t *v = (atomic64_t *)l;
79032
79033 return (long)atomic64_add_return(i, v);
79034 }
79035
79036+#ifdef CONFIG_PAX_REFCOUNT
79037+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
79038+{
79039+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79040+
79041+ return (long)atomic64_add_return_unchecked(i, v);
79042+}
79043+#endif
79044+
79045 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
79046 {
79047 atomic64_t *v = (atomic64_t *)l;
79048@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
79049 return (long)atomic64_inc_return(v);
79050 }
79051
79052+#ifdef CONFIG_PAX_REFCOUNT
79053+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79054+{
79055+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
79056+
79057+ return (long)atomic64_inc_return_unchecked(v);
79058+}
79059+#endif
79060+
79061 static inline long atomic_long_dec_return(atomic_long_t *l)
79062 {
79063 atomic64_t *v = (atomic64_t *)l;
79064@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79065
79066 typedef atomic_t atomic_long_t;
79067
79068+#ifdef CONFIG_PAX_REFCOUNT
79069+typedef atomic_unchecked_t atomic_long_unchecked_t;
79070+#else
79071+typedef atomic_t atomic_long_unchecked_t;
79072+#endif
79073+
79074 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
79075 static inline long atomic_long_read(atomic_long_t *l)
79076 {
79077@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
79078 return (long)atomic_read(v);
79079 }
79080
79081+#ifdef CONFIG_PAX_REFCOUNT
79082+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
79083+{
79084+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79085+
79086+ return (long)atomic_read_unchecked(v);
79087+}
79088+#endif
79089+
79090 static inline void atomic_long_set(atomic_long_t *l, long i)
79091 {
79092 atomic_t *v = (atomic_t *)l;
79093@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
79094 atomic_set(v, i);
79095 }
79096
79097+#ifdef CONFIG_PAX_REFCOUNT
79098+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
79099+{
79100+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79101+
79102+ atomic_set_unchecked(v, i);
79103+}
79104+#endif
79105+
79106 static inline void atomic_long_inc(atomic_long_t *l)
79107 {
79108 atomic_t *v = (atomic_t *)l;
79109@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
79110 atomic_inc(v);
79111 }
79112
79113+#ifdef CONFIG_PAX_REFCOUNT
79114+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
79115+{
79116+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79117+
79118+ atomic_inc_unchecked(v);
79119+}
79120+#endif
79121+
79122 static inline void atomic_long_dec(atomic_long_t *l)
79123 {
79124 atomic_t *v = (atomic_t *)l;
79125@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
79126 atomic_dec(v);
79127 }
79128
79129+#ifdef CONFIG_PAX_REFCOUNT
79130+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
79131+{
79132+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79133+
79134+ atomic_dec_unchecked(v);
79135+}
79136+#endif
79137+
79138 static inline void atomic_long_add(long i, atomic_long_t *l)
79139 {
79140 atomic_t *v = (atomic_t *)l;
79141@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
79142 atomic_add(i, v);
79143 }
79144
79145+#ifdef CONFIG_PAX_REFCOUNT
79146+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
79147+{
79148+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79149+
79150+ atomic_add_unchecked(i, v);
79151+}
79152+#endif
79153+
79154 static inline void atomic_long_sub(long i, atomic_long_t *l)
79155 {
79156 atomic_t *v = (atomic_t *)l;
79157@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
79158 atomic_sub(i, v);
79159 }
79160
79161+#ifdef CONFIG_PAX_REFCOUNT
79162+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
79163+{
79164+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79165+
79166+ atomic_sub_unchecked(i, v);
79167+}
79168+#endif
79169+
79170 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
79171 {
79172 atomic_t *v = (atomic_t *)l;
79173@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
79174 return atomic_add_negative(i, v);
79175 }
79176
79177-static inline long atomic_long_add_return(long i, atomic_long_t *l)
79178+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
79179 {
79180 atomic_t *v = (atomic_t *)l;
79181
79182 return (long)atomic_add_return(i, v);
79183 }
79184
79185+#ifdef CONFIG_PAX_REFCOUNT
79186+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
79187+{
79188+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79189+
79190+ return (long)atomic_add_return_unchecked(i, v);
79191+}
79192+
79193+#endif
79194+
79195 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
79196 {
79197 atomic_t *v = (atomic_t *)l;
79198@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
79199 return (long)atomic_inc_return(v);
79200 }
79201
79202+#ifdef CONFIG_PAX_REFCOUNT
79203+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
79204+{
79205+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
79206+
79207+ return (long)atomic_inc_return_unchecked(v);
79208+}
79209+#endif
79210+
79211 static inline long atomic_long_dec_return(atomic_long_t *l)
79212 {
79213 atomic_t *v = (atomic_t *)l;
79214@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
79215
79216 #endif /* BITS_PER_LONG == 64 */
79217
79218+#ifdef CONFIG_PAX_REFCOUNT
79219+static inline void pax_refcount_needs_these_functions(void)
79220+{
79221+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
79222+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
79223+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
79224+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
79225+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
79226+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
79227+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
79228+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
79229+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
79230+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
79231+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
79232+#ifdef CONFIG_X86
79233+ atomic_clear_mask_unchecked(0, NULL);
79234+ atomic_set_mask_unchecked(0, NULL);
79235+#endif
79236+
79237+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
79238+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
79239+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
79240+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
79241+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
79242+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
79243+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
79244+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
79245+}
79246+#else
79247+#define atomic_read_unchecked(v) atomic_read(v)
79248+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
79249+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
79250+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
79251+#define atomic_inc_unchecked(v) atomic_inc(v)
79252+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
79253+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
79254+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
79255+#define atomic_dec_unchecked(v) atomic_dec(v)
79256+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
79257+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
79258+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
79259+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
79260+
79261+#define atomic_long_read_unchecked(v) atomic_long_read(v)
79262+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
79263+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
79264+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
79265+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
79266+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
79267+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
79268+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
79269+#endif
79270+
79271 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
79272diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
79273index 30ad9c8..c70c170 100644
79274--- a/include/asm-generic/atomic64.h
79275+++ b/include/asm-generic/atomic64.h
79276@@ -16,6 +16,8 @@ typedef struct {
79277 long long counter;
79278 } atomic64_t;
79279
79280+typedef atomic64_t atomic64_unchecked_t;
79281+
79282 #define ATOMIC64_INIT(i) { (i) }
79283
79284 extern long long atomic64_read(const atomic64_t *v);
79285@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
79286 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
79287 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
79288
79289+#define atomic64_read_unchecked(v) atomic64_read(v)
79290+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
79291+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
79292+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
79293+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
79294+#define atomic64_inc_unchecked(v) atomic64_inc(v)
79295+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
79296+#define atomic64_dec_unchecked(v) atomic64_dec(v)
79297+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
79298+
79299 #endif /* _ASM_GENERIC_ATOMIC64_H */
79300diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
79301index 1402fa8..025a736 100644
79302--- a/include/asm-generic/barrier.h
79303+++ b/include/asm-generic/barrier.h
79304@@ -74,7 +74,7 @@
79305 do { \
79306 compiletime_assert_atomic_type(*p); \
79307 smp_mb(); \
79308- ACCESS_ONCE(*p) = (v); \
79309+ ACCESS_ONCE_RW(*p) = (v); \
79310 } while (0)
79311
79312 #define smp_load_acquire(p) \
79313diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
79314index a60a7cc..0fe12f2 100644
79315--- a/include/asm-generic/bitops/__fls.h
79316+++ b/include/asm-generic/bitops/__fls.h
79317@@ -9,7 +9,7 @@
79318 *
79319 * Undefined if no set bit exists, so code should check against 0 first.
79320 */
79321-static __always_inline unsigned long __fls(unsigned long word)
79322+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
79323 {
79324 int num = BITS_PER_LONG - 1;
79325
79326diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
79327index 0576d1f..dad6c71 100644
79328--- a/include/asm-generic/bitops/fls.h
79329+++ b/include/asm-generic/bitops/fls.h
79330@@ -9,7 +9,7 @@
79331 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
79332 */
79333
79334-static __always_inline int fls(int x)
79335+static __always_inline int __intentional_overflow(-1) fls(int x)
79336 {
79337 int r = 32;
79338
79339diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
79340index b097cf8..3d40e14 100644
79341--- a/include/asm-generic/bitops/fls64.h
79342+++ b/include/asm-generic/bitops/fls64.h
79343@@ -15,7 +15,7 @@
79344 * at position 64.
79345 */
79346 #if BITS_PER_LONG == 32
79347-static __always_inline int fls64(__u64 x)
79348+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
79349 {
79350 __u32 h = x >> 32;
79351 if (h)
79352@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
79353 return fls(x);
79354 }
79355 #elif BITS_PER_LONG == 64
79356-static __always_inline int fls64(__u64 x)
79357+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
79358 {
79359 if (x == 0)
79360 return 0;
79361diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
79362index 1bfcfe5..e04c5c9 100644
79363--- a/include/asm-generic/cache.h
79364+++ b/include/asm-generic/cache.h
79365@@ -6,7 +6,7 @@
79366 * cache lines need to provide their own cache.h.
79367 */
79368
79369-#define L1_CACHE_SHIFT 5
79370-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
79371+#define L1_CACHE_SHIFT 5UL
79372+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
79373
79374 #endif /* __ASM_GENERIC_CACHE_H */
79375diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
79376index 0d68a1e..b74a761 100644
79377--- a/include/asm-generic/emergency-restart.h
79378+++ b/include/asm-generic/emergency-restart.h
79379@@ -1,7 +1,7 @@
79380 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
79381 #define _ASM_GENERIC_EMERGENCY_RESTART_H
79382
79383-static inline void machine_emergency_restart(void)
79384+static inline __noreturn void machine_emergency_restart(void)
79385 {
79386 machine_restart(NULL);
79387 }
79388diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
79389index b8fdc57..c6d5a5c 100644
79390--- a/include/asm-generic/io.h
79391+++ b/include/asm-generic/io.h
79392@@ -289,7 +289,7 @@ static inline void pci_iounmap(struct pci_dev *dev, void __iomem *p)
79393 * These are pretty trivial
79394 */
79395 #ifndef virt_to_phys
79396-static inline unsigned long virt_to_phys(volatile void *address)
79397+static inline unsigned long __intentional_overflow(-1) virt_to_phys(volatile void *address)
79398 {
79399 return __pa((unsigned long)address);
79400 }
79401diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
79402index 90f99c7..00ce236 100644
79403--- a/include/asm-generic/kmap_types.h
79404+++ b/include/asm-generic/kmap_types.h
79405@@ -2,9 +2,9 @@
79406 #define _ASM_GENERIC_KMAP_TYPES_H
79407
79408 #ifdef __WITH_KM_FENCE
79409-# define KM_TYPE_NR 41
79410+# define KM_TYPE_NR 42
79411 #else
79412-# define KM_TYPE_NR 20
79413+# define KM_TYPE_NR 21
79414 #endif
79415
79416 #endif
79417diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
79418index 9ceb03b..62b0b8f 100644
79419--- a/include/asm-generic/local.h
79420+++ b/include/asm-generic/local.h
79421@@ -23,24 +23,37 @@ typedef struct
79422 atomic_long_t a;
79423 } local_t;
79424
79425+typedef struct {
79426+ atomic_long_unchecked_t a;
79427+} local_unchecked_t;
79428+
79429 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
79430
79431 #define local_read(l) atomic_long_read(&(l)->a)
79432+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
79433 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
79434+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
79435 #define local_inc(l) atomic_long_inc(&(l)->a)
79436+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
79437 #define local_dec(l) atomic_long_dec(&(l)->a)
79438+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
79439 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
79440+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
79441 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
79442+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
79443
79444 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
79445 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
79446 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
79447 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
79448 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
79449+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
79450 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
79451 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
79452+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
79453
79454 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
79455+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
79456 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
79457 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
79458 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
79459diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
79460index 725612b..9cc513a 100644
79461--- a/include/asm-generic/pgtable-nopmd.h
79462+++ b/include/asm-generic/pgtable-nopmd.h
79463@@ -1,14 +1,19 @@
79464 #ifndef _PGTABLE_NOPMD_H
79465 #define _PGTABLE_NOPMD_H
79466
79467-#ifndef __ASSEMBLY__
79468-
79469 #include <asm-generic/pgtable-nopud.h>
79470
79471-struct mm_struct;
79472-
79473 #define __PAGETABLE_PMD_FOLDED
79474
79475+#define PMD_SHIFT PUD_SHIFT
79476+#define PTRS_PER_PMD 1
79477+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
79478+#define PMD_MASK (~(PMD_SIZE-1))
79479+
79480+#ifndef __ASSEMBLY__
79481+
79482+struct mm_struct;
79483+
79484 /*
79485 * Having the pmd type consist of a pud gets the size right, and allows
79486 * us to conceptually access the pud entry that this pmd is folded into
79487@@ -16,11 +21,6 @@ struct mm_struct;
79488 */
79489 typedef struct { pud_t pud; } pmd_t;
79490
79491-#define PMD_SHIFT PUD_SHIFT
79492-#define PTRS_PER_PMD 1
79493-#define PMD_SIZE (1UL << PMD_SHIFT)
79494-#define PMD_MASK (~(PMD_SIZE-1))
79495-
79496 /*
79497 * The "pud_xxx()" functions here are trivial for a folded two-level
79498 * setup: the pmd is never bad, and a pmd always exists (as it's folded
79499diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
79500index 810431d..0ec4804f 100644
79501--- a/include/asm-generic/pgtable-nopud.h
79502+++ b/include/asm-generic/pgtable-nopud.h
79503@@ -1,10 +1,15 @@
79504 #ifndef _PGTABLE_NOPUD_H
79505 #define _PGTABLE_NOPUD_H
79506
79507-#ifndef __ASSEMBLY__
79508-
79509 #define __PAGETABLE_PUD_FOLDED
79510
79511+#define PUD_SHIFT PGDIR_SHIFT
79512+#define PTRS_PER_PUD 1
79513+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
79514+#define PUD_MASK (~(PUD_SIZE-1))
79515+
79516+#ifndef __ASSEMBLY__
79517+
79518 /*
79519 * Having the pud type consist of a pgd gets the size right, and allows
79520 * us to conceptually access the pgd entry that this pud is folded into
79521@@ -12,11 +17,6 @@
79522 */
79523 typedef struct { pgd_t pgd; } pud_t;
79524
79525-#define PUD_SHIFT PGDIR_SHIFT
79526-#define PTRS_PER_PUD 1
79527-#define PUD_SIZE (1UL << PUD_SHIFT)
79528-#define PUD_MASK (~(PUD_SIZE-1))
79529-
79530 /*
79531 * The "pgd_xxx()" functions here are trivial for a folded two-level
79532 * setup: the pud is never bad, and a pud always exists (as it's folded
79533@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
79534 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
79535
79536 #define pgd_populate(mm, pgd, pud) do { } while (0)
79537+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
79538 /*
79539 * (puds are folded into pgds so this doesn't get actually called,
79540 * but the define is needed for a generic inline function.)
79541diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
79542index 752e30d..87f172d 100644
79543--- a/include/asm-generic/pgtable.h
79544+++ b/include/asm-generic/pgtable.h
79545@@ -828,6 +828,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
79546 }
79547 #endif /* CONFIG_NUMA_BALANCING */
79548
79549+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
79550+#ifdef CONFIG_PAX_KERNEXEC
79551+#error KERNEXEC requires pax_open_kernel
79552+#else
79553+static inline unsigned long pax_open_kernel(void) { return 0; }
79554+#endif
79555+#endif
79556+
79557+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
79558+#ifdef CONFIG_PAX_KERNEXEC
79559+#error KERNEXEC requires pax_close_kernel
79560+#else
79561+static inline unsigned long pax_close_kernel(void) { return 0; }
79562+#endif
79563+#endif
79564+
79565 #endif /* CONFIG_MMU */
79566
79567 #endif /* !__ASSEMBLY__ */
79568diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
79569index 72d8803..cb9749c 100644
79570--- a/include/asm-generic/uaccess.h
79571+++ b/include/asm-generic/uaccess.h
79572@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
79573 return __clear_user(to, n);
79574 }
79575
79576+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
79577+#ifdef CONFIG_PAX_MEMORY_UDEREF
79578+#error UDEREF requires pax_open_userland
79579+#else
79580+static inline unsigned long pax_open_userland(void) { return 0; }
79581+#endif
79582+#endif
79583+
79584+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
79585+#ifdef CONFIG_PAX_MEMORY_UDEREF
79586+#error UDEREF requires pax_close_userland
79587+#else
79588+static inline unsigned long pax_close_userland(void) { return 0; }
79589+#endif
79590+#endif
79591+
79592 #endif /* __ASM_GENERIC_UACCESS_H */
79593diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
79594index aa70cbd..fd72c7a 100644
79595--- a/include/asm-generic/vmlinux.lds.h
79596+++ b/include/asm-generic/vmlinux.lds.h
79597@@ -233,6 +233,7 @@
79598 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
79599 VMLINUX_SYMBOL(__start_rodata) = .; \
79600 *(.rodata) *(.rodata.*) \
79601+ *(.data..read_only) \
79602 *(__vermagic) /* Kernel version magic */ \
79603 . = ALIGN(8); \
79604 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
79605@@ -724,17 +725,18 @@
79606 * section in the linker script will go there too. @phdr should have
79607 * a leading colon.
79608 *
79609- * Note that this macros defines __per_cpu_load as an absolute symbol.
79610+ * Note that this macros defines per_cpu_load as an absolute symbol.
79611 * If there is no need to put the percpu section at a predetermined
79612 * address, use PERCPU_SECTION.
79613 */
79614 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
79615- VMLINUX_SYMBOL(__per_cpu_load) = .; \
79616- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
79617+ per_cpu_load = .; \
79618+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
79619 - LOAD_OFFSET) { \
79620+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
79621 PERCPU_INPUT(cacheline) \
79622 } phdr \
79623- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
79624+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
79625
79626 /**
79627 * PERCPU_SECTION - define output section for percpu area, simple version
79628diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
79629index 623a59c..1e79ab9 100644
79630--- a/include/crypto/algapi.h
79631+++ b/include/crypto/algapi.h
79632@@ -34,7 +34,7 @@ struct crypto_type {
79633 unsigned int maskclear;
79634 unsigned int maskset;
79635 unsigned int tfmsize;
79636-};
79637+} __do_const;
79638
79639 struct crypto_instance {
79640 struct crypto_alg alg;
79641diff --git a/include/drm/drmP.h b/include/drm/drmP.h
79642index 53ed876..5bb09be 100644
79643--- a/include/drm/drmP.h
79644+++ b/include/drm/drmP.h
79645@@ -59,6 +59,7 @@
79646
79647 #include <asm/mman.h>
79648 #include <asm/pgalloc.h>
79649+#include <asm/local.h>
79650 #include <asm/uaccess.h>
79651
79652 #include <uapi/drm/drm.h>
79653@@ -223,10 +224,12 @@ void drm_err(const char *func, const char *format, ...);
79654 * \param cmd command.
79655 * \param arg argument.
79656 */
79657-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
79658+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
79659+ struct drm_file *file_priv);
79660+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
79661 struct drm_file *file_priv);
79662
79663-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
79664+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
79665 unsigned long arg);
79666
79667 #define DRM_IOCTL_NR(n) _IOC_NR(n)
79668@@ -242,10 +245,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
79669 struct drm_ioctl_desc {
79670 unsigned int cmd;
79671 int flags;
79672- drm_ioctl_t *func;
79673+ drm_ioctl_t func;
79674 unsigned int cmd_drv;
79675 const char *name;
79676-};
79677+} __do_const;
79678
79679 /**
79680 * Creates a driver or general drm_ioctl_desc array entry for the given
79681@@ -629,7 +632,8 @@ struct drm_info_list {
79682 int (*show)(struct seq_file*, void*); /** show callback */
79683 u32 driver_features; /**< Required driver features for this entry */
79684 void *data;
79685-};
79686+} __do_const;
79687+typedef struct drm_info_list __no_const drm_info_list_no_const;
79688
79689 /**
79690 * debugfs node structure. This structure represents a debugfs file.
79691@@ -713,7 +717,7 @@ struct drm_device {
79692
79693 /** \name Usage Counters */
79694 /*@{ */
79695- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
79696+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
79697 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
79698 int buf_use; /**< Buffers in use -- cannot alloc */
79699 atomic_t buf_alloc; /**< Buffer allocation in progress */
79700diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
79701index a3d75fe..6802f9c 100644
79702--- a/include/drm/drm_crtc_helper.h
79703+++ b/include/drm/drm_crtc_helper.h
79704@@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
79705 struct drm_connector *connector);
79706 /* disable encoder when not in use - more explicit than dpms off */
79707 void (*disable)(struct drm_encoder *encoder);
79708-};
79709+} __no_const;
79710
79711 /**
79712 * drm_connector_helper_funcs - helper operations for connectors
79713diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
79714index a70d456..6ea07cd 100644
79715--- a/include/drm/i915_pciids.h
79716+++ b/include/drm/i915_pciids.h
79717@@ -37,7 +37,7 @@
79718 */
79719 #define INTEL_VGA_DEVICE(id, info) { \
79720 0x8086, id, \
79721- ~0, ~0, \
79722+ PCI_ANY_ID, PCI_ANY_ID, \
79723 0x030000, 0xff0000, \
79724 (unsigned long) info }
79725
79726diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
79727index 72dcbe8..8db58d7 100644
79728--- a/include/drm/ttm/ttm_memory.h
79729+++ b/include/drm/ttm/ttm_memory.h
79730@@ -48,7 +48,7 @@
79731
79732 struct ttm_mem_shrink {
79733 int (*do_shrink) (struct ttm_mem_shrink *);
79734-};
79735+} __no_const;
79736
79737 /**
79738 * struct ttm_mem_global - Global memory accounting structure.
79739diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
79740index 49a8284..9643967 100644
79741--- a/include/drm/ttm/ttm_page_alloc.h
79742+++ b/include/drm/ttm/ttm_page_alloc.h
79743@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
79744 */
79745 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
79746
79747+struct device;
79748 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
79749 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
79750
79751diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
79752index 4b840e8..155d235 100644
79753--- a/include/keys/asymmetric-subtype.h
79754+++ b/include/keys/asymmetric-subtype.h
79755@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
79756 /* Verify the signature on a key of this subtype (optional) */
79757 int (*verify_signature)(const struct key *key,
79758 const struct public_key_signature *sig);
79759-};
79760+} __do_const;
79761
79762 /**
79763 * asymmetric_key_subtype - Get the subtype from an asymmetric key
79764diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
79765index c1da539..1dcec55 100644
79766--- a/include/linux/atmdev.h
79767+++ b/include/linux/atmdev.h
79768@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
79769 #endif
79770
79771 struct k_atm_aal_stats {
79772-#define __HANDLE_ITEM(i) atomic_t i
79773+#define __HANDLE_ITEM(i) atomic_unchecked_t i
79774 __AAL_STAT_ITEMS
79775 #undef __HANDLE_ITEM
79776 };
79777@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
79778 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
79779 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
79780 struct module *owner;
79781-};
79782+} __do_const ;
79783
79784 struct atmphy_ops {
79785 int (*start)(struct atm_dev *dev);
79786diff --git a/include/linux/audit.h b/include/linux/audit.h
79787index e58fe7d..be9f6d8 100644
79788--- a/include/linux/audit.h
79789+++ b/include/linux/audit.h
79790@@ -215,7 +215,7 @@ static inline void audit_ptrace(struct task_struct *t)
79791 extern unsigned int audit_serial(void);
79792 extern int auditsc_get_stamp(struct audit_context *ctx,
79793 struct timespec *t, unsigned int *serial);
79794-extern int audit_set_loginuid(kuid_t loginuid);
79795+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
79796
79797 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
79798 {
79799diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
79800index 61f29e5..e67c658 100644
79801--- a/include/linux/binfmts.h
79802+++ b/include/linux/binfmts.h
79803@@ -44,7 +44,7 @@ struct linux_binprm {
79804 unsigned interp_flags;
79805 unsigned interp_data;
79806 unsigned long loader, exec;
79807-};
79808+} __randomize_layout;
79809
79810 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
79811 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
79812@@ -73,8 +73,10 @@ struct linux_binfmt {
79813 int (*load_binary)(struct linux_binprm *);
79814 int (*load_shlib)(struct file *);
79815 int (*core_dump)(struct coredump_params *cprm);
79816+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
79817+ void (*handle_mmap)(struct file *);
79818 unsigned long min_coredump; /* minimal dump size */
79819-};
79820+} __do_const __randomize_layout;
79821
79822 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
79823
79824diff --git a/include/linux/bitops.h b/include/linux/bitops.h
79825index 5d858e0..336c1d9 100644
79826--- a/include/linux/bitops.h
79827+++ b/include/linux/bitops.h
79828@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
79829 * @word: value to rotate
79830 * @shift: bits to roll
79831 */
79832-static inline __u32 rol32(__u32 word, unsigned int shift)
79833+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
79834 {
79835 return (word << shift) | (word >> (32 - shift));
79836 }
79837@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
79838 * @word: value to rotate
79839 * @shift: bits to roll
79840 */
79841-static inline __u32 ror32(__u32 word, unsigned int shift)
79842+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
79843 {
79844 return (word >> shift) | (word << (32 - shift));
79845 }
79846@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
79847 return (__s32)(value << shift) >> shift;
79848 }
79849
79850-static inline unsigned fls_long(unsigned long l)
79851+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
79852 {
79853 if (sizeof(l) == 4)
79854 return fls(l);
79855diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
79856index aac0f9e..73c9869 100644
79857--- a/include/linux/blkdev.h
79858+++ b/include/linux/blkdev.h
79859@@ -1615,7 +1615,7 @@ struct block_device_operations {
79860 /* this callback is with swap_lock and sometimes page table lock held */
79861 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
79862 struct module *owner;
79863-};
79864+} __do_const;
79865
79866 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
79867 unsigned long);
79868diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
79869index afc1343..9735539 100644
79870--- a/include/linux/blktrace_api.h
79871+++ b/include/linux/blktrace_api.h
79872@@ -25,7 +25,7 @@ struct blk_trace {
79873 struct dentry *dropped_file;
79874 struct dentry *msg_file;
79875 struct list_head running_list;
79876- atomic_t dropped;
79877+ atomic_unchecked_t dropped;
79878 };
79879
79880 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
79881diff --git a/include/linux/cache.h b/include/linux/cache.h
79882index 17e7e82..1d7da26 100644
79883--- a/include/linux/cache.h
79884+++ b/include/linux/cache.h
79885@@ -16,6 +16,14 @@
79886 #define __read_mostly
79887 #endif
79888
79889+#ifndef __read_only
79890+#ifdef CONFIG_PAX_KERNEXEC
79891+#error KERNEXEC requires __read_only
79892+#else
79893+#define __read_only __read_mostly
79894+#endif
79895+#endif
79896+
79897 #ifndef ____cacheline_aligned
79898 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
79899 #endif
79900diff --git a/include/linux/capability.h b/include/linux/capability.h
79901index aa93e5e..985a1b0 100644
79902--- a/include/linux/capability.h
79903+++ b/include/linux/capability.h
79904@@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
79905 extern bool capable(int cap);
79906 extern bool ns_capable(struct user_namespace *ns, int cap);
79907 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
79908+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
79909 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
79910+extern bool capable_nolog(int cap);
79911+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
79912
79913 /* audit system wants to get cap info from files as well */
79914 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
79915
79916+extern int is_privileged_binary(const struct dentry *dentry);
79917+
79918 #endif /* !_LINUX_CAPABILITY_H */
79919diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
79920index 8609d57..86e4d79 100644
79921--- a/include/linux/cdrom.h
79922+++ b/include/linux/cdrom.h
79923@@ -87,7 +87,6 @@ struct cdrom_device_ops {
79924
79925 /* driver specifications */
79926 const int capability; /* capability flags */
79927- int n_minors; /* number of active minor devices */
79928 /* handle uniform packets for scsi type devices (scsi,atapi) */
79929 int (*generic_packet) (struct cdrom_device_info *,
79930 struct packet_command *);
79931diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
79932index 4ce9056..86caac6 100644
79933--- a/include/linux/cleancache.h
79934+++ b/include/linux/cleancache.h
79935@@ -31,7 +31,7 @@ struct cleancache_ops {
79936 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
79937 void (*invalidate_inode)(int, struct cleancache_filekey);
79938 void (*invalidate_fs)(int);
79939-};
79940+} __no_const;
79941
79942 extern struct cleancache_ops *
79943 cleancache_register_ops(struct cleancache_ops *ops);
79944diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
79945index 2839c63..5b06b6b 100644
79946--- a/include/linux/clk-provider.h
79947+++ b/include/linux/clk-provider.h
79948@@ -191,6 +191,7 @@ struct clk_ops {
79949 void (*init)(struct clk_hw *hw);
79950 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
79951 };
79952+typedef struct clk_ops __no_const clk_ops_no_const;
79953
79954 /**
79955 * struct clk_init_data - holds init data that's common to all clocks and is
79956diff --git a/include/linux/compat.h b/include/linux/compat.h
79957index e649426..a74047b 100644
79958--- a/include/linux/compat.h
79959+++ b/include/linux/compat.h
79960@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
79961 compat_size_t __user *len_ptr);
79962
79963 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
79964-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
79965+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
79966 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
79967 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
79968 compat_ssize_t msgsz, int msgflg);
79969@@ -436,7 +436,7 @@ extern int compat_ptrace_request(struct task_struct *child,
79970 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
79971 compat_ulong_t addr, compat_ulong_t data);
79972 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
79973- compat_long_t addr, compat_long_t data);
79974+ compat_ulong_t addr, compat_ulong_t data);
79975
79976 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
79977 /*
79978diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
79979index d1a5582..4424efa 100644
79980--- a/include/linux/compiler-gcc4.h
79981+++ b/include/linux/compiler-gcc4.h
79982@@ -39,9 +39,34 @@
79983 # define __compiletime_warning(message) __attribute__((warning(message)))
79984 # define __compiletime_error(message) __attribute__((error(message)))
79985 #endif /* __CHECKER__ */
79986+
79987+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
79988+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
79989+#define __bos0(ptr) __bos((ptr), 0)
79990+#define __bos1(ptr) __bos((ptr), 1)
79991 #endif /* GCC_VERSION >= 40300 */
79992
79993 #if GCC_VERSION >= 40500
79994+
79995+#ifdef RANDSTRUCT_PLUGIN
79996+#define __randomize_layout __attribute__((randomize_layout))
79997+#define __no_randomize_layout __attribute__((no_randomize_layout))
79998+#endif
79999+
80000+#ifdef CONSTIFY_PLUGIN
80001+#define __no_const __attribute__((no_const))
80002+#define __do_const __attribute__((do_const))
80003+#endif
80004+
80005+#ifdef SIZE_OVERFLOW_PLUGIN
80006+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
80007+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
80008+#endif
80009+
80010+#ifdef LATENT_ENTROPY_PLUGIN
80011+#define __latent_entropy __attribute__((latent_entropy))
80012+#endif
80013+
80014 /*
80015 * Mark a position in code as unreachable. This can be used to
80016 * suppress control flow warnings after asm blocks that transfer
80017diff --git a/include/linux/compiler.h b/include/linux/compiler.h
80018index d5ad7b1..3b74638 100644
80019--- a/include/linux/compiler.h
80020+++ b/include/linux/compiler.h
80021@@ -5,11 +5,14 @@
80022
80023 #ifdef __CHECKER__
80024 # define __user __attribute__((noderef, address_space(1)))
80025+# define __force_user __force __user
80026 # define __kernel __attribute__((address_space(0)))
80027+# define __force_kernel __force __kernel
80028 # define __safe __attribute__((safe))
80029 # define __force __attribute__((force))
80030 # define __nocast __attribute__((nocast))
80031 # define __iomem __attribute__((noderef, address_space(2)))
80032+# define __force_iomem __force __iomem
80033 # define __must_hold(x) __attribute__((context(x,1,1)))
80034 # define __acquires(x) __attribute__((context(x,0,1)))
80035 # define __releases(x) __attribute__((context(x,1,0)))
80036@@ -17,20 +20,37 @@
80037 # define __release(x) __context__(x,-1)
80038 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
80039 # define __percpu __attribute__((noderef, address_space(3)))
80040+# define __force_percpu __force __percpu
80041 #ifdef CONFIG_SPARSE_RCU_POINTER
80042 # define __rcu __attribute__((noderef, address_space(4)))
80043+# define __force_rcu __force __rcu
80044 #else
80045 # define __rcu
80046+# define __force_rcu
80047 #endif
80048 extern void __chk_user_ptr(const volatile void __user *);
80049 extern void __chk_io_ptr(const volatile void __iomem *);
80050 #else
80051-# define __user
80052-# define __kernel
80053+# ifdef CHECKER_PLUGIN
80054+//# define __user
80055+//# define __force_user
80056+//# define __kernel
80057+//# define __force_kernel
80058+# else
80059+# ifdef STRUCTLEAK_PLUGIN
80060+# define __user __attribute__((user))
80061+# else
80062+# define __user
80063+# endif
80064+# define __force_user
80065+# define __kernel
80066+# define __force_kernel
80067+# endif
80068 # define __safe
80069 # define __force
80070 # define __nocast
80071 # define __iomem
80072+# define __force_iomem
80073 # define __chk_user_ptr(x) (void)0
80074 # define __chk_io_ptr(x) (void)0
80075 # define __builtin_warning(x, y...) (1)
80076@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
80077 # define __release(x) (void)0
80078 # define __cond_lock(x,c) (c)
80079 # define __percpu
80080+# define __force_percpu
80081 # define __rcu
80082+# define __force_rcu
80083 #endif
80084
80085 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
80086@@ -286,6 +308,34 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80087 # define __attribute_const__ /* unimplemented */
80088 #endif
80089
80090+#ifndef __randomize_layout
80091+# define __randomize_layout
80092+#endif
80093+
80094+#ifndef __no_randomize_layout
80095+# define __no_randomize_layout
80096+#endif
80097+
80098+#ifndef __no_const
80099+# define __no_const
80100+#endif
80101+
80102+#ifndef __do_const
80103+# define __do_const
80104+#endif
80105+
80106+#ifndef __size_overflow
80107+# define __size_overflow(...)
80108+#endif
80109+
80110+#ifndef __intentional_overflow
80111+# define __intentional_overflow(...)
80112+#endif
80113+
80114+#ifndef __latent_entropy
80115+# define __latent_entropy
80116+#endif
80117+
80118 /*
80119 * Tell gcc if a function is cold. The compiler will assume any path
80120 * directly leading to the call is unlikely.
80121@@ -295,6 +345,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80122 #define __cold
80123 #endif
80124
80125+#ifndef __alloc_size
80126+#define __alloc_size(...)
80127+#endif
80128+
80129+#ifndef __bos
80130+#define __bos(ptr, arg)
80131+#endif
80132+
80133+#ifndef __bos0
80134+#define __bos0(ptr)
80135+#endif
80136+
80137+#ifndef __bos1
80138+#define __bos1(ptr)
80139+#endif
80140+
80141 /* Simple shorthand for a section definition */
80142 #ifndef __section
80143 # define __section(S) __attribute__ ((__section__(#S)))
80144@@ -378,7 +444,8 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
80145 * use is to mediate communication between process-level code and irq/NMI
80146 * handlers, all running on the same CPU.
80147 */
80148-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
80149+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
80150+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
80151
80152 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
80153 #ifdef CONFIG_KPROBES
80154diff --git a/include/linux/completion.h b/include/linux/completion.h
80155index 5d5aaae..0ea9b84 100644
80156--- a/include/linux/completion.h
80157+++ b/include/linux/completion.h
80158@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
80159
80160 extern void wait_for_completion(struct completion *);
80161 extern void wait_for_completion_io(struct completion *);
80162-extern int wait_for_completion_interruptible(struct completion *x);
80163-extern int wait_for_completion_killable(struct completion *x);
80164+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
80165+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
80166 extern unsigned long wait_for_completion_timeout(struct completion *x,
80167- unsigned long timeout);
80168+ unsigned long timeout) __intentional_overflow(-1);
80169 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
80170- unsigned long timeout);
80171+ unsigned long timeout) __intentional_overflow(-1);
80172 extern long wait_for_completion_interruptible_timeout(
80173- struct completion *x, unsigned long timeout);
80174+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
80175 extern long wait_for_completion_killable_timeout(
80176- struct completion *x, unsigned long timeout);
80177+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
80178 extern bool try_wait_for_completion(struct completion *x);
80179 extern bool completion_done(struct completion *x);
80180
80181diff --git a/include/linux/configfs.h b/include/linux/configfs.h
80182index 34025df..d94bbbc 100644
80183--- a/include/linux/configfs.h
80184+++ b/include/linux/configfs.h
80185@@ -125,7 +125,7 @@ struct configfs_attribute {
80186 const char *ca_name;
80187 struct module *ca_owner;
80188 umode_t ca_mode;
80189-};
80190+} __do_const;
80191
80192 /*
80193 * Users often need to create attribute structures for their configurable
80194diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
80195index 503b085b..1638c9e 100644
80196--- a/include/linux/cpufreq.h
80197+++ b/include/linux/cpufreq.h
80198@@ -206,6 +206,7 @@ struct global_attr {
80199 ssize_t (*store)(struct kobject *a, struct attribute *b,
80200 const char *c, size_t count);
80201 };
80202+typedef struct global_attr __no_const global_attr_no_const;
80203
80204 #define define_one_global_ro(_name) \
80205 static struct global_attr _name = \
80206@@ -273,7 +274,7 @@ struct cpufreq_driver {
80207 bool boost_supported;
80208 bool boost_enabled;
80209 int (*set_boost) (int state);
80210-};
80211+} __do_const;
80212
80213 /* flags */
80214 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
80215diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
80216index 25e0df6..952dffd 100644
80217--- a/include/linux/cpuidle.h
80218+++ b/include/linux/cpuidle.h
80219@@ -50,7 +50,8 @@ struct cpuidle_state {
80220 int index);
80221
80222 int (*enter_dead) (struct cpuidle_device *dev, int index);
80223-};
80224+} __do_const;
80225+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
80226
80227 /* Idle State Flags */
80228 #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */
80229@@ -209,7 +210,7 @@ struct cpuidle_governor {
80230 void (*reflect) (struct cpuidle_device *dev, int index);
80231
80232 struct module *owner;
80233-};
80234+} __do_const;
80235
80236 #ifdef CONFIG_CPU_IDLE
80237 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
80238diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
80239index 0a9a6da..ea597ca 100644
80240--- a/include/linux/cpumask.h
80241+++ b/include/linux/cpumask.h
80242@@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
80243 }
80244
80245 /* Valid inputs for n are -1 and 0. */
80246-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80247+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
80248 {
80249 return n+1;
80250 }
80251
80252-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80253+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
80254 {
80255 return n+1;
80256 }
80257
80258-static inline unsigned int cpumask_next_and(int n,
80259+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
80260 const struct cpumask *srcp,
80261 const struct cpumask *andp)
80262 {
80263@@ -174,7 +174,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
80264 *
80265 * Returns >= nr_cpu_ids if no further cpus set.
80266 */
80267-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80268+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
80269 {
80270 /* -1 is a legal arg here. */
80271 if (n != -1)
80272@@ -189,7 +189,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
80273 *
80274 * Returns >= nr_cpu_ids if no further cpus unset.
80275 */
80276-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80277+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
80278 {
80279 /* -1 is a legal arg here. */
80280 if (n != -1)
80281@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
80282 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
80283 }
80284
80285-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
80286+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
80287 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
80288 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
80289
80290diff --git a/include/linux/cred.h b/include/linux/cred.h
80291index b2d0820..2ecafd3 100644
80292--- a/include/linux/cred.h
80293+++ b/include/linux/cred.h
80294@@ -35,7 +35,7 @@ struct group_info {
80295 int nblocks;
80296 kgid_t small_block[NGROUPS_SMALL];
80297 kgid_t *blocks[0];
80298-};
80299+} __randomize_layout;
80300
80301 /**
80302 * get_group_info - Get a reference to a group info structure
80303@@ -136,7 +136,7 @@ struct cred {
80304 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
80305 struct group_info *group_info; /* supplementary groups for euid/fsgid */
80306 struct rcu_head rcu; /* RCU deletion hook */
80307-};
80308+} __randomize_layout;
80309
80310 extern void __put_cred(struct cred *);
80311 extern void exit_creds(struct task_struct *);
80312@@ -194,6 +194,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
80313 static inline void validate_process_creds(void)
80314 {
80315 }
80316+static inline void validate_task_creds(struct task_struct *task)
80317+{
80318+}
80319 #endif
80320
80321 /**
80322@@ -331,6 +334,7 @@ static inline void put_cred(const struct cred *_cred)
80323
80324 #define task_uid(task) (task_cred_xxx((task), uid))
80325 #define task_euid(task) (task_cred_xxx((task), euid))
80326+#define task_securebits(task) (task_cred_xxx((task), securebits))
80327
80328 #define current_cred_xxx(xxx) \
80329 ({ \
80330diff --git a/include/linux/crypto.h b/include/linux/crypto.h
80331index d45e949..51cf5ea 100644
80332--- a/include/linux/crypto.h
80333+++ b/include/linux/crypto.h
80334@@ -373,7 +373,7 @@ struct cipher_tfm {
80335 const u8 *key, unsigned int keylen);
80336 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
80337 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
80338-};
80339+} __no_const;
80340
80341 struct hash_tfm {
80342 int (*init)(struct hash_desc *desc);
80343@@ -394,13 +394,13 @@ struct compress_tfm {
80344 int (*cot_decompress)(struct crypto_tfm *tfm,
80345 const u8 *src, unsigned int slen,
80346 u8 *dst, unsigned int *dlen);
80347-};
80348+} __no_const;
80349
80350 struct rng_tfm {
80351 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
80352 unsigned int dlen);
80353 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
80354-};
80355+} __no_const;
80356
80357 #define crt_ablkcipher crt_u.ablkcipher
80358 #define crt_aead crt_u.aead
80359diff --git a/include/linux/ctype.h b/include/linux/ctype.h
80360index 653589e..4ef254a 100644
80361--- a/include/linux/ctype.h
80362+++ b/include/linux/ctype.h
80363@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
80364 * Fast implementation of tolower() for internal usage. Do not use in your
80365 * code.
80366 */
80367-static inline char _tolower(const char c)
80368+static inline unsigned char _tolower(const unsigned char c)
80369 {
80370 return c | 0x20;
80371 }
80372diff --git a/include/linux/dcache.h b/include/linux/dcache.h
80373index 1c2f1b8..c67151e 100644
80374--- a/include/linux/dcache.h
80375+++ b/include/linux/dcache.h
80376@@ -133,7 +133,7 @@ struct dentry {
80377 struct hlist_node d_alias; /* inode alias list */
80378 struct rcu_head d_rcu;
80379 } d_u;
80380-};
80381+} __randomize_layout;
80382
80383 /*
80384 * dentry->d_lock spinlock nesting subclasses:
80385diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
80386index 7925bf0..d5143d2 100644
80387--- a/include/linux/decompress/mm.h
80388+++ b/include/linux/decompress/mm.h
80389@@ -77,7 +77,7 @@ static void free(void *where)
80390 * warnings when not needed (indeed large_malloc / large_free are not
80391 * needed by inflate */
80392
80393-#define malloc(a) kmalloc(a, GFP_KERNEL)
80394+#define malloc(a) kmalloc((a), GFP_KERNEL)
80395 #define free(a) kfree(a)
80396
80397 #define large_malloc(a) vmalloc(a)
80398diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
80399index f1863dc..5c26074 100644
80400--- a/include/linux/devfreq.h
80401+++ b/include/linux/devfreq.h
80402@@ -114,7 +114,7 @@ struct devfreq_governor {
80403 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
80404 int (*event_handler)(struct devfreq *devfreq,
80405 unsigned int event, void *data);
80406-};
80407+} __do_const;
80408
80409 /**
80410 * struct devfreq - Device devfreq structure
80411diff --git a/include/linux/device.h b/include/linux/device.h
80412index ce1f2160..189bc33 100644
80413--- a/include/linux/device.h
80414+++ b/include/linux/device.h
80415@@ -311,7 +311,7 @@ struct subsys_interface {
80416 struct list_head node;
80417 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
80418 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
80419-};
80420+} __do_const;
80421
80422 int subsys_interface_register(struct subsys_interface *sif);
80423 void subsys_interface_unregister(struct subsys_interface *sif);
80424@@ -507,7 +507,7 @@ struct device_type {
80425 void (*release)(struct device *dev);
80426
80427 const struct dev_pm_ops *pm;
80428-};
80429+} __do_const;
80430
80431 /* interface for exporting device attributes */
80432 struct device_attribute {
80433@@ -517,11 +517,12 @@ struct device_attribute {
80434 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
80435 const char *buf, size_t count);
80436 };
80437+typedef struct device_attribute __no_const device_attribute_no_const;
80438
80439 struct dev_ext_attribute {
80440 struct device_attribute attr;
80441 void *var;
80442-};
80443+} __do_const;
80444
80445 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
80446 char *buf);
80447diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
80448index d5d3881..7ed54af 100644
80449--- a/include/linux/dma-mapping.h
80450+++ b/include/linux/dma-mapping.h
80451@@ -60,7 +60,7 @@ struct dma_map_ops {
80452 u64 (*get_required_mask)(struct device *dev);
80453 #endif
80454 int is_phys;
80455-};
80456+} __do_const;
80457
80458 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
80459
80460diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
80461index 653a1fd..9133cd1 100644
80462--- a/include/linux/dmaengine.h
80463+++ b/include/linux/dmaengine.h
80464@@ -1136,9 +1136,9 @@ struct dma_pinned_list {
80465 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
80466 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
80467
80468-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
80469+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
80470 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
80471-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
80472+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
80473 struct dma_pinned_list *pinned_list, struct page *page,
80474 unsigned int offset, size_t len);
80475
80476diff --git a/include/linux/efi.h b/include/linux/efi.h
80477index 0949f9c..04cb9a5 100644
80478--- a/include/linux/efi.h
80479+++ b/include/linux/efi.h
80480@@ -1050,6 +1050,7 @@ struct efivar_operations {
80481 efi_set_variable_nonblocking_t *set_variable_nonblocking;
80482 efi_query_variable_store_t *query_variable_store;
80483 };
80484+typedef struct efivar_operations __no_const efivar_operations_no_const;
80485
80486 struct efivars {
80487 /*
80488diff --git a/include/linux/elf.h b/include/linux/elf.h
80489index 67a5fa7..b817372 100644
80490--- a/include/linux/elf.h
80491+++ b/include/linux/elf.h
80492@@ -24,6 +24,7 @@ extern Elf32_Dyn _DYNAMIC [];
80493 #define elf_note elf32_note
80494 #define elf_addr_t Elf32_Off
80495 #define Elf_Half Elf32_Half
80496+#define elf_dyn Elf32_Dyn
80497
80498 #else
80499
80500@@ -34,6 +35,7 @@ extern Elf64_Dyn _DYNAMIC [];
80501 #define elf_note elf64_note
80502 #define elf_addr_t Elf64_Off
80503 #define Elf_Half Elf64_Half
80504+#define elf_dyn Elf64_Dyn
80505
80506 #endif
80507
80508diff --git a/include/linux/err.h b/include/linux/err.h
80509index a729120..6ede2c9 100644
80510--- a/include/linux/err.h
80511+++ b/include/linux/err.h
80512@@ -20,12 +20,12 @@
80513
80514 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
80515
80516-static inline void * __must_check ERR_PTR(long error)
80517+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
80518 {
80519 return (void *) error;
80520 }
80521
80522-static inline long __must_check PTR_ERR(__force const void *ptr)
80523+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
80524 {
80525 return (long) ptr;
80526 }
80527diff --git a/include/linux/extcon.h b/include/linux/extcon.h
80528index 36f49c4..a2a1f4c 100644
80529--- a/include/linux/extcon.h
80530+++ b/include/linux/extcon.h
80531@@ -135,7 +135,7 @@ struct extcon_dev {
80532 /* /sys/class/extcon/.../mutually_exclusive/... */
80533 struct attribute_group attr_g_muex;
80534 struct attribute **attrs_muex;
80535- struct device_attribute *d_attrs_muex;
80536+ device_attribute_no_const *d_attrs_muex;
80537 };
80538
80539 /**
80540diff --git a/include/linux/fb.h b/include/linux/fb.h
80541index 09bb7a1..d98870a 100644
80542--- a/include/linux/fb.h
80543+++ b/include/linux/fb.h
80544@@ -305,7 +305,7 @@ struct fb_ops {
80545 /* called at KDB enter and leave time to prepare the console */
80546 int (*fb_debug_enter)(struct fb_info *info);
80547 int (*fb_debug_leave)(struct fb_info *info);
80548-};
80549+} __do_const;
80550
80551 #ifdef CONFIG_FB_TILEBLITTING
80552 #define FB_TILE_CURSOR_NONE 0
80553diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
80554index 230f87b..1fd0485 100644
80555--- a/include/linux/fdtable.h
80556+++ b/include/linux/fdtable.h
80557@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
80558 void put_files_struct(struct files_struct *fs);
80559 void reset_files_struct(struct files_struct *);
80560 int unshare_files(struct files_struct **);
80561-struct files_struct *dup_fd(struct files_struct *, int *);
80562+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
80563 void do_close_on_exec(struct files_struct *);
80564 int iterate_fd(struct files_struct *, unsigned,
80565 int (*)(const void *, struct file *, unsigned),
80566diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
80567index 8293262..2b3b8bd 100644
80568--- a/include/linux/frontswap.h
80569+++ b/include/linux/frontswap.h
80570@@ -11,7 +11,7 @@ struct frontswap_ops {
80571 int (*load)(unsigned, pgoff_t, struct page *);
80572 void (*invalidate_page)(unsigned, pgoff_t);
80573 void (*invalidate_area)(unsigned);
80574-};
80575+} __no_const;
80576
80577 extern bool frontswap_enabled;
80578 extern struct frontswap_ops *
80579diff --git a/include/linux/fs.h b/include/linux/fs.h
80580index 9ab779e..0c636f2 100644
80581--- a/include/linux/fs.h
80582+++ b/include/linux/fs.h
80583@@ -412,7 +412,7 @@ struct address_space {
80584 spinlock_t private_lock; /* for use by the address_space */
80585 struct list_head private_list; /* ditto */
80586 void *private_data; /* ditto */
80587-} __attribute__((aligned(sizeof(long))));
80588+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
80589 /*
80590 * On most architectures that alignment is already the case; but
80591 * must be enforced here for CRIS, to let the least significant bit
80592@@ -455,7 +455,7 @@ struct block_device {
80593 int bd_fsfreeze_count;
80594 /* Mutex for freeze */
80595 struct mutex bd_fsfreeze_mutex;
80596-};
80597+} __randomize_layout;
80598
80599 /*
80600 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
80601@@ -624,7 +624,7 @@ struct inode {
80602 #endif
80603
80604 void *i_private; /* fs or device private pointer */
80605-};
80606+} __randomize_layout;
80607
80608 static inline int inode_unhashed(struct inode *inode)
80609 {
80610@@ -820,7 +820,7 @@ struct file {
80611 struct list_head f_tfile_llink;
80612 #endif /* #ifdef CONFIG_EPOLL */
80613 struct address_space *f_mapping;
80614-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
80615+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
80616
80617 struct file_handle {
80618 __u32 handle_bytes;
80619@@ -945,7 +945,7 @@ struct file_lock {
80620 int state; /* state of grant or error if -ve */
80621 } afs;
80622 } fl_u;
80623-};
80624+} __randomize_layout;
80625
80626 /* The following constant reflects the upper bound of the file/locking space */
80627 #ifndef OFFSET_MAX
80628@@ -1287,7 +1287,7 @@ struct super_block {
80629 * Indicates how deep in a filesystem stack this SB is
80630 */
80631 int s_stack_depth;
80632-};
80633+} __randomize_layout;
80634
80635 extern struct timespec current_fs_time(struct super_block *sb);
80636
80637@@ -1514,7 +1514,8 @@ struct file_operations {
80638 long (*fallocate)(struct file *file, int mode, loff_t offset,
80639 loff_t len);
80640 int (*show_fdinfo)(struct seq_file *m, struct file *f);
80641-};
80642+} __do_const __randomize_layout;
80643+typedef struct file_operations __no_const file_operations_no_const;
80644
80645 struct inode_operations {
80646 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
80647@@ -2823,4 +2824,14 @@ static inline bool dir_relax(struct inode *inode)
80648 return !IS_DEADDIR(inode);
80649 }
80650
80651+static inline bool is_sidechannel_device(const struct inode *inode)
80652+{
80653+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
80654+ umode_t mode = inode->i_mode;
80655+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
80656+#else
80657+ return false;
80658+#endif
80659+}
80660+
80661 #endif /* _LINUX_FS_H */
80662diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
80663index 0efc3e6..fd23610 100644
80664--- a/include/linux/fs_struct.h
80665+++ b/include/linux/fs_struct.h
80666@@ -6,13 +6,13 @@
80667 #include <linux/seqlock.h>
80668
80669 struct fs_struct {
80670- int users;
80671+ atomic_t users;
80672 spinlock_t lock;
80673 seqcount_t seq;
80674 int umask;
80675 int in_exec;
80676 struct path root, pwd;
80677-};
80678+} __randomize_layout;
80679
80680 extern struct kmem_cache *fs_cachep;
80681
80682diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
80683index 7714849..a4a5c7a 100644
80684--- a/include/linux/fscache-cache.h
80685+++ b/include/linux/fscache-cache.h
80686@@ -113,7 +113,7 @@ struct fscache_operation {
80687 fscache_operation_release_t release;
80688 };
80689
80690-extern atomic_t fscache_op_debug_id;
80691+extern atomic_unchecked_t fscache_op_debug_id;
80692 extern void fscache_op_work_func(struct work_struct *work);
80693
80694 extern void fscache_enqueue_operation(struct fscache_operation *);
80695@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
80696 INIT_WORK(&op->work, fscache_op_work_func);
80697 atomic_set(&op->usage, 1);
80698 op->state = FSCACHE_OP_ST_INITIALISED;
80699- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
80700+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
80701 op->processor = processor;
80702 op->release = release;
80703 INIT_LIST_HEAD(&op->pend_link);
80704diff --git a/include/linux/fscache.h b/include/linux/fscache.h
80705index 115bb81..e7b812b 100644
80706--- a/include/linux/fscache.h
80707+++ b/include/linux/fscache.h
80708@@ -152,7 +152,7 @@ struct fscache_cookie_def {
80709 * - this is mandatory for any object that may have data
80710 */
80711 void (*now_uncached)(void *cookie_netfs_data);
80712-};
80713+} __do_const;
80714
80715 /*
80716 * fscache cached network filesystem type
80717diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
80718index 1c804b0..1432c2b 100644
80719--- a/include/linux/fsnotify.h
80720+++ b/include/linux/fsnotify.h
80721@@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
80722 struct inode *inode = file_inode(file);
80723 __u32 mask = FS_ACCESS;
80724
80725+ if (is_sidechannel_device(inode))
80726+ return;
80727+
80728 if (S_ISDIR(inode->i_mode))
80729 mask |= FS_ISDIR;
80730
80731@@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
80732 struct inode *inode = file_inode(file);
80733 __u32 mask = FS_MODIFY;
80734
80735+ if (is_sidechannel_device(inode))
80736+ return;
80737+
80738 if (S_ISDIR(inode->i_mode))
80739 mask |= FS_ISDIR;
80740
80741@@ -315,7 +321,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
80742 */
80743 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
80744 {
80745- return kstrdup(name, GFP_KERNEL);
80746+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
80747 }
80748
80749 /*
80750diff --git a/include/linux/genhd.h b/include/linux/genhd.h
80751index ec274e0..e678159 100644
80752--- a/include/linux/genhd.h
80753+++ b/include/linux/genhd.h
80754@@ -194,7 +194,7 @@ struct gendisk {
80755 struct kobject *slave_dir;
80756
80757 struct timer_rand_state *random;
80758- atomic_t sync_io; /* RAID */
80759+ atomic_unchecked_t sync_io; /* RAID */
80760 struct disk_events *ev;
80761 #ifdef CONFIG_BLK_DEV_INTEGRITY
80762 struct blk_integrity *integrity;
80763@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
80764 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
80765
80766 /* drivers/char/random.c */
80767-extern void add_disk_randomness(struct gendisk *disk);
80768+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
80769 extern void rand_initialize_disk(struct gendisk *disk);
80770
80771 static inline sector_t get_start_sect(struct block_device *bdev)
80772diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
80773index 667c311..abac2a7 100644
80774--- a/include/linux/genl_magic_func.h
80775+++ b/include/linux/genl_magic_func.h
80776@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
80777 },
80778
80779 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
80780-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
80781+static struct genl_ops ZZZ_genl_ops[] = {
80782 #include GENL_MAGIC_INCLUDE_FILE
80783 };
80784
80785diff --git a/include/linux/gfp.h b/include/linux/gfp.h
80786index 41b30fd..a3718cf 100644
80787--- a/include/linux/gfp.h
80788+++ b/include/linux/gfp.h
80789@@ -34,6 +34,13 @@ struct vm_area_struct;
80790 #define ___GFP_NO_KSWAPD 0x400000u
80791 #define ___GFP_OTHER_NODE 0x800000u
80792 #define ___GFP_WRITE 0x1000000u
80793+
80794+#ifdef CONFIG_PAX_USERCOPY_SLABS
80795+#define ___GFP_USERCOPY 0x2000000u
80796+#else
80797+#define ___GFP_USERCOPY 0
80798+#endif
80799+
80800 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
80801
80802 /*
80803@@ -90,6 +97,7 @@ struct vm_area_struct;
80804 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
80805 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
80806 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
80807+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
80808
80809 /*
80810 * This may seem redundant, but it's a way of annotating false positives vs.
80811@@ -97,7 +105,7 @@ struct vm_area_struct;
80812 */
80813 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
80814
80815-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
80816+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
80817 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
80818
80819 /* This equals 0, but use constants in case they ever change */
80820@@ -155,6 +163,8 @@ struct vm_area_struct;
80821 /* 4GB DMA on some platforms */
80822 #define GFP_DMA32 __GFP_DMA32
80823
80824+#define GFP_USERCOPY __GFP_USERCOPY
80825+
80826 /* Convert GFP flags to their corresponding migrate type */
80827 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
80828 {
80829diff --git a/include/linux/gracl.h b/include/linux/gracl.h
80830new file mode 100644
80831index 0000000..edb2cb6
80832--- /dev/null
80833+++ b/include/linux/gracl.h
80834@@ -0,0 +1,340 @@
80835+#ifndef GR_ACL_H
80836+#define GR_ACL_H
80837+
80838+#include <linux/grdefs.h>
80839+#include <linux/resource.h>
80840+#include <linux/capability.h>
80841+#include <linux/dcache.h>
80842+#include <asm/resource.h>
80843+
80844+/* Major status information */
80845+
80846+#define GR_VERSION "grsecurity 3.0"
80847+#define GRSECURITY_VERSION 0x3000
80848+
80849+enum {
80850+ GR_SHUTDOWN = 0,
80851+ GR_ENABLE = 1,
80852+ GR_SPROLE = 2,
80853+ GR_OLDRELOAD = 3,
80854+ GR_SEGVMOD = 4,
80855+ GR_STATUS = 5,
80856+ GR_UNSPROLE = 6,
80857+ GR_PASSSET = 7,
80858+ GR_SPROLEPAM = 8,
80859+ GR_RELOAD = 9,
80860+};
80861+
80862+/* Password setup definitions
80863+ * kernel/grhash.c */
80864+enum {
80865+ GR_PW_LEN = 128,
80866+ GR_SALT_LEN = 16,
80867+ GR_SHA_LEN = 32,
80868+};
80869+
80870+enum {
80871+ GR_SPROLE_LEN = 64,
80872+};
80873+
80874+enum {
80875+ GR_NO_GLOB = 0,
80876+ GR_REG_GLOB,
80877+ GR_CREATE_GLOB
80878+};
80879+
80880+#define GR_NLIMITS 32
80881+
80882+/* Begin Data Structures */
80883+
80884+struct sprole_pw {
80885+ unsigned char *rolename;
80886+ unsigned char salt[GR_SALT_LEN];
80887+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
80888+};
80889+
80890+struct name_entry {
80891+ __u32 key;
80892+ ino_t inode;
80893+ dev_t device;
80894+ char *name;
80895+ __u16 len;
80896+ __u8 deleted;
80897+ struct name_entry *prev;
80898+ struct name_entry *next;
80899+};
80900+
80901+struct inodev_entry {
80902+ struct name_entry *nentry;
80903+ struct inodev_entry *prev;
80904+ struct inodev_entry *next;
80905+};
80906+
80907+struct acl_role_db {
80908+ struct acl_role_label **r_hash;
80909+ __u32 r_size;
80910+};
80911+
80912+struct inodev_db {
80913+ struct inodev_entry **i_hash;
80914+ __u32 i_size;
80915+};
80916+
80917+struct name_db {
80918+ struct name_entry **n_hash;
80919+ __u32 n_size;
80920+};
80921+
80922+struct crash_uid {
80923+ uid_t uid;
80924+ unsigned long expires;
80925+};
80926+
80927+struct gr_hash_struct {
80928+ void **table;
80929+ void **nametable;
80930+ void *first;
80931+ __u32 table_size;
80932+ __u32 used_size;
80933+ int type;
80934+};
80935+
80936+/* Userspace Grsecurity ACL data structures */
80937+
80938+struct acl_subject_label {
80939+ char *filename;
80940+ ino_t inode;
80941+ dev_t device;
80942+ __u32 mode;
80943+ kernel_cap_t cap_mask;
80944+ kernel_cap_t cap_lower;
80945+ kernel_cap_t cap_invert_audit;
80946+
80947+ struct rlimit res[GR_NLIMITS];
80948+ __u32 resmask;
80949+
80950+ __u8 user_trans_type;
80951+ __u8 group_trans_type;
80952+ uid_t *user_transitions;
80953+ gid_t *group_transitions;
80954+ __u16 user_trans_num;
80955+ __u16 group_trans_num;
80956+
80957+ __u32 sock_families[2];
80958+ __u32 ip_proto[8];
80959+ __u32 ip_type;
80960+ struct acl_ip_label **ips;
80961+ __u32 ip_num;
80962+ __u32 inaddr_any_override;
80963+
80964+ __u32 crashes;
80965+ unsigned long expires;
80966+
80967+ struct acl_subject_label *parent_subject;
80968+ struct gr_hash_struct *hash;
80969+ struct acl_subject_label *prev;
80970+ struct acl_subject_label *next;
80971+
80972+ struct acl_object_label **obj_hash;
80973+ __u32 obj_hash_size;
80974+ __u16 pax_flags;
80975+};
80976+
80977+struct role_allowed_ip {
80978+ __u32 addr;
80979+ __u32 netmask;
80980+
80981+ struct role_allowed_ip *prev;
80982+ struct role_allowed_ip *next;
80983+};
80984+
80985+struct role_transition {
80986+ char *rolename;
80987+
80988+ struct role_transition *prev;
80989+ struct role_transition *next;
80990+};
80991+
80992+struct acl_role_label {
80993+ char *rolename;
80994+ uid_t uidgid;
80995+ __u16 roletype;
80996+
80997+ __u16 auth_attempts;
80998+ unsigned long expires;
80999+
81000+ struct acl_subject_label *root_label;
81001+ struct gr_hash_struct *hash;
81002+
81003+ struct acl_role_label *prev;
81004+ struct acl_role_label *next;
81005+
81006+ struct role_transition *transitions;
81007+ struct role_allowed_ip *allowed_ips;
81008+ uid_t *domain_children;
81009+ __u16 domain_child_num;
81010+
81011+ umode_t umask;
81012+
81013+ struct acl_subject_label **subj_hash;
81014+ __u32 subj_hash_size;
81015+};
81016+
81017+struct user_acl_role_db {
81018+ struct acl_role_label **r_table;
81019+ __u32 num_pointers; /* Number of allocations to track */
81020+ __u32 num_roles; /* Number of roles */
81021+ __u32 num_domain_children; /* Number of domain children */
81022+ __u32 num_subjects; /* Number of subjects */
81023+ __u32 num_objects; /* Number of objects */
81024+};
81025+
81026+struct acl_object_label {
81027+ char *filename;
81028+ ino_t inode;
81029+ dev_t device;
81030+ __u32 mode;
81031+
81032+ struct acl_subject_label *nested;
81033+ struct acl_object_label *globbed;
81034+
81035+ /* next two structures not used */
81036+
81037+ struct acl_object_label *prev;
81038+ struct acl_object_label *next;
81039+};
81040+
81041+struct acl_ip_label {
81042+ char *iface;
81043+ __u32 addr;
81044+ __u32 netmask;
81045+ __u16 low, high;
81046+ __u8 mode;
81047+ __u32 type;
81048+ __u32 proto[8];
81049+
81050+ /* next two structures not used */
81051+
81052+ struct acl_ip_label *prev;
81053+ struct acl_ip_label *next;
81054+};
81055+
81056+struct gr_arg {
81057+ struct user_acl_role_db role_db;
81058+ unsigned char pw[GR_PW_LEN];
81059+ unsigned char salt[GR_SALT_LEN];
81060+ unsigned char sum[GR_SHA_LEN];
81061+ unsigned char sp_role[GR_SPROLE_LEN];
81062+ struct sprole_pw *sprole_pws;
81063+ dev_t segv_device;
81064+ ino_t segv_inode;
81065+ uid_t segv_uid;
81066+ __u16 num_sprole_pws;
81067+ __u16 mode;
81068+};
81069+
81070+struct gr_arg_wrapper {
81071+ struct gr_arg *arg;
81072+ __u32 version;
81073+ __u32 size;
81074+};
81075+
81076+struct subject_map {
81077+ struct acl_subject_label *user;
81078+ struct acl_subject_label *kernel;
81079+ struct subject_map *prev;
81080+ struct subject_map *next;
81081+};
81082+
81083+struct acl_subj_map_db {
81084+ struct subject_map **s_hash;
81085+ __u32 s_size;
81086+};
81087+
81088+struct gr_policy_state {
81089+ struct sprole_pw **acl_special_roles;
81090+ __u16 num_sprole_pws;
81091+ struct acl_role_label *kernel_role;
81092+ struct acl_role_label *role_list;
81093+ struct acl_role_label *default_role;
81094+ struct acl_role_db acl_role_set;
81095+ struct acl_subj_map_db subj_map_set;
81096+ struct name_db name_set;
81097+ struct inodev_db inodev_set;
81098+};
81099+
81100+struct gr_alloc_state {
81101+ unsigned long alloc_stack_next;
81102+ unsigned long alloc_stack_size;
81103+ void **alloc_stack;
81104+};
81105+
81106+struct gr_reload_state {
81107+ struct gr_policy_state oldpolicy;
81108+ struct gr_alloc_state oldalloc;
81109+ struct gr_policy_state newpolicy;
81110+ struct gr_alloc_state newalloc;
81111+ struct gr_policy_state *oldpolicy_ptr;
81112+ struct gr_alloc_state *oldalloc_ptr;
81113+ unsigned char oldmode;
81114+};
81115+
81116+/* End Data Structures Section */
81117+
81118+/* Hash functions generated by empirical testing by Brad Spengler
81119+ Makes good use of the low bits of the inode. Generally 0-1 times
81120+ in loop for successful match. 0-3 for unsuccessful match.
81121+ Shift/add algorithm with modulus of table size and an XOR*/
81122+
81123+static __inline__ unsigned int
81124+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
81125+{
81126+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
81127+}
81128+
81129+ static __inline__ unsigned int
81130+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
81131+{
81132+ return ((const unsigned long)userp % sz);
81133+}
81134+
81135+static __inline__ unsigned int
81136+gr_fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
81137+{
81138+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
81139+}
81140+
81141+static __inline__ unsigned int
81142+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
81143+{
81144+ return full_name_hash((const unsigned char *)name, len) % sz;
81145+}
81146+
81147+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
81148+ subj = NULL; \
81149+ iter = 0; \
81150+ while (iter < role->subj_hash_size) { \
81151+ if (subj == NULL) \
81152+ subj = role->subj_hash[iter]; \
81153+ if (subj == NULL) { \
81154+ iter++; \
81155+ continue; \
81156+ }
81157+
81158+#define FOR_EACH_SUBJECT_END(subj,iter) \
81159+ subj = subj->next; \
81160+ if (subj == NULL) \
81161+ iter++; \
81162+ }
81163+
81164+
81165+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
81166+ subj = role->hash->first; \
81167+ while (subj != NULL) {
81168+
81169+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
81170+ subj = subj->next; \
81171+ }
81172+
81173+#endif
81174+
81175diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
81176new file mode 100644
81177index 0000000..33ebd1f
81178--- /dev/null
81179+++ b/include/linux/gracl_compat.h
81180@@ -0,0 +1,156 @@
81181+#ifndef GR_ACL_COMPAT_H
81182+#define GR_ACL_COMPAT_H
81183+
81184+#include <linux/resource.h>
81185+#include <asm/resource.h>
81186+
81187+struct sprole_pw_compat {
81188+ compat_uptr_t rolename;
81189+ unsigned char salt[GR_SALT_LEN];
81190+ unsigned char sum[GR_SHA_LEN];
81191+};
81192+
81193+struct gr_hash_struct_compat {
81194+ compat_uptr_t table;
81195+ compat_uptr_t nametable;
81196+ compat_uptr_t first;
81197+ __u32 table_size;
81198+ __u32 used_size;
81199+ int type;
81200+};
81201+
81202+struct acl_subject_label_compat {
81203+ compat_uptr_t filename;
81204+ compat_ino_t inode;
81205+ __u32 device;
81206+ __u32 mode;
81207+ kernel_cap_t cap_mask;
81208+ kernel_cap_t cap_lower;
81209+ kernel_cap_t cap_invert_audit;
81210+
81211+ struct compat_rlimit res[GR_NLIMITS];
81212+ __u32 resmask;
81213+
81214+ __u8 user_trans_type;
81215+ __u8 group_trans_type;
81216+ compat_uptr_t user_transitions;
81217+ compat_uptr_t group_transitions;
81218+ __u16 user_trans_num;
81219+ __u16 group_trans_num;
81220+
81221+ __u32 sock_families[2];
81222+ __u32 ip_proto[8];
81223+ __u32 ip_type;
81224+ compat_uptr_t ips;
81225+ __u32 ip_num;
81226+ __u32 inaddr_any_override;
81227+
81228+ __u32 crashes;
81229+ compat_ulong_t expires;
81230+
81231+ compat_uptr_t parent_subject;
81232+ compat_uptr_t hash;
81233+ compat_uptr_t prev;
81234+ compat_uptr_t next;
81235+
81236+ compat_uptr_t obj_hash;
81237+ __u32 obj_hash_size;
81238+ __u16 pax_flags;
81239+};
81240+
81241+struct role_allowed_ip_compat {
81242+ __u32 addr;
81243+ __u32 netmask;
81244+
81245+ compat_uptr_t prev;
81246+ compat_uptr_t next;
81247+};
81248+
81249+struct role_transition_compat {
81250+ compat_uptr_t rolename;
81251+
81252+ compat_uptr_t prev;
81253+ compat_uptr_t next;
81254+};
81255+
81256+struct acl_role_label_compat {
81257+ compat_uptr_t rolename;
81258+ uid_t uidgid;
81259+ __u16 roletype;
81260+
81261+ __u16 auth_attempts;
81262+ compat_ulong_t expires;
81263+
81264+ compat_uptr_t root_label;
81265+ compat_uptr_t hash;
81266+
81267+ compat_uptr_t prev;
81268+ compat_uptr_t next;
81269+
81270+ compat_uptr_t transitions;
81271+ compat_uptr_t allowed_ips;
81272+ compat_uptr_t domain_children;
81273+ __u16 domain_child_num;
81274+
81275+ umode_t umask;
81276+
81277+ compat_uptr_t subj_hash;
81278+ __u32 subj_hash_size;
81279+};
81280+
81281+struct user_acl_role_db_compat {
81282+ compat_uptr_t r_table;
81283+ __u32 num_pointers;
81284+ __u32 num_roles;
81285+ __u32 num_domain_children;
81286+ __u32 num_subjects;
81287+ __u32 num_objects;
81288+};
81289+
81290+struct acl_object_label_compat {
81291+ compat_uptr_t filename;
81292+ compat_ino_t inode;
81293+ __u32 device;
81294+ __u32 mode;
81295+
81296+ compat_uptr_t nested;
81297+ compat_uptr_t globbed;
81298+
81299+ compat_uptr_t prev;
81300+ compat_uptr_t next;
81301+};
81302+
81303+struct acl_ip_label_compat {
81304+ compat_uptr_t iface;
81305+ __u32 addr;
81306+ __u32 netmask;
81307+ __u16 low, high;
81308+ __u8 mode;
81309+ __u32 type;
81310+ __u32 proto[8];
81311+
81312+ compat_uptr_t prev;
81313+ compat_uptr_t next;
81314+};
81315+
81316+struct gr_arg_compat {
81317+ struct user_acl_role_db_compat role_db;
81318+ unsigned char pw[GR_PW_LEN];
81319+ unsigned char salt[GR_SALT_LEN];
81320+ unsigned char sum[GR_SHA_LEN];
81321+ unsigned char sp_role[GR_SPROLE_LEN];
81322+ compat_uptr_t sprole_pws;
81323+ __u32 segv_device;
81324+ compat_ino_t segv_inode;
81325+ uid_t segv_uid;
81326+ __u16 num_sprole_pws;
81327+ __u16 mode;
81328+};
81329+
81330+struct gr_arg_wrapper_compat {
81331+ compat_uptr_t arg;
81332+ __u32 version;
81333+ __u32 size;
81334+};
81335+
81336+#endif
81337diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
81338new file mode 100644
81339index 0000000..323ecf2
81340--- /dev/null
81341+++ b/include/linux/gralloc.h
81342@@ -0,0 +1,9 @@
81343+#ifndef __GRALLOC_H
81344+#define __GRALLOC_H
81345+
81346+void acl_free_all(void);
81347+int acl_alloc_stack_init(unsigned long size);
81348+void *acl_alloc(unsigned long len);
81349+void *acl_alloc_num(unsigned long num, unsigned long len);
81350+
81351+#endif
81352diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
81353new file mode 100644
81354index 0000000..be66033
81355--- /dev/null
81356+++ b/include/linux/grdefs.h
81357@@ -0,0 +1,140 @@
81358+#ifndef GRDEFS_H
81359+#define GRDEFS_H
81360+
81361+/* Begin grsecurity status declarations */
81362+
81363+enum {
81364+ GR_READY = 0x01,
81365+ GR_STATUS_INIT = 0x00 // disabled state
81366+};
81367+
81368+/* Begin ACL declarations */
81369+
81370+/* Role flags */
81371+
81372+enum {
81373+ GR_ROLE_USER = 0x0001,
81374+ GR_ROLE_GROUP = 0x0002,
81375+ GR_ROLE_DEFAULT = 0x0004,
81376+ GR_ROLE_SPECIAL = 0x0008,
81377+ GR_ROLE_AUTH = 0x0010,
81378+ GR_ROLE_NOPW = 0x0020,
81379+ GR_ROLE_GOD = 0x0040,
81380+ GR_ROLE_LEARN = 0x0080,
81381+ GR_ROLE_TPE = 0x0100,
81382+ GR_ROLE_DOMAIN = 0x0200,
81383+ GR_ROLE_PAM = 0x0400,
81384+ GR_ROLE_PERSIST = 0x0800
81385+};
81386+
81387+/* ACL Subject and Object mode flags */
81388+enum {
81389+ GR_DELETED = 0x80000000
81390+};
81391+
81392+/* ACL Object-only mode flags */
81393+enum {
81394+ GR_READ = 0x00000001,
81395+ GR_APPEND = 0x00000002,
81396+ GR_WRITE = 0x00000004,
81397+ GR_EXEC = 0x00000008,
81398+ GR_FIND = 0x00000010,
81399+ GR_INHERIT = 0x00000020,
81400+ GR_SETID = 0x00000040,
81401+ GR_CREATE = 0x00000080,
81402+ GR_DELETE = 0x00000100,
81403+ GR_LINK = 0x00000200,
81404+ GR_AUDIT_READ = 0x00000400,
81405+ GR_AUDIT_APPEND = 0x00000800,
81406+ GR_AUDIT_WRITE = 0x00001000,
81407+ GR_AUDIT_EXEC = 0x00002000,
81408+ GR_AUDIT_FIND = 0x00004000,
81409+ GR_AUDIT_INHERIT= 0x00008000,
81410+ GR_AUDIT_SETID = 0x00010000,
81411+ GR_AUDIT_CREATE = 0x00020000,
81412+ GR_AUDIT_DELETE = 0x00040000,
81413+ GR_AUDIT_LINK = 0x00080000,
81414+ GR_PTRACERD = 0x00100000,
81415+ GR_NOPTRACE = 0x00200000,
81416+ GR_SUPPRESS = 0x00400000,
81417+ GR_NOLEARN = 0x00800000,
81418+ GR_INIT_TRANSFER= 0x01000000
81419+};
81420+
81421+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
81422+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
81423+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
81424+
81425+/* ACL subject-only mode flags */
81426+enum {
81427+ GR_KILL = 0x00000001,
81428+ GR_VIEW = 0x00000002,
81429+ GR_PROTECTED = 0x00000004,
81430+ GR_LEARN = 0x00000008,
81431+ GR_OVERRIDE = 0x00000010,
81432+ /* just a placeholder, this mode is only used in userspace */
81433+ GR_DUMMY = 0x00000020,
81434+ GR_PROTSHM = 0x00000040,
81435+ GR_KILLPROC = 0x00000080,
81436+ GR_KILLIPPROC = 0x00000100,
81437+ /* just a placeholder, this mode is only used in userspace */
81438+ GR_NOTROJAN = 0x00000200,
81439+ GR_PROTPROCFD = 0x00000400,
81440+ GR_PROCACCT = 0x00000800,
81441+ GR_RELAXPTRACE = 0x00001000,
81442+ //GR_NESTED = 0x00002000,
81443+ GR_INHERITLEARN = 0x00004000,
81444+ GR_PROCFIND = 0x00008000,
81445+ GR_POVERRIDE = 0x00010000,
81446+ GR_KERNELAUTH = 0x00020000,
81447+ GR_ATSECURE = 0x00040000,
81448+ GR_SHMEXEC = 0x00080000
81449+};
81450+
81451+enum {
81452+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
81453+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
81454+ GR_PAX_ENABLE_MPROTECT = 0x0004,
81455+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
81456+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
81457+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
81458+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
81459+ GR_PAX_DISABLE_MPROTECT = 0x0400,
81460+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
81461+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
81462+};
81463+
81464+enum {
81465+ GR_ID_USER = 0x01,
81466+ GR_ID_GROUP = 0x02,
81467+};
81468+
81469+enum {
81470+ GR_ID_ALLOW = 0x01,
81471+ GR_ID_DENY = 0x02,
81472+};
81473+
81474+#define GR_CRASH_RES 31
81475+#define GR_UIDTABLE_MAX 500
81476+
81477+/* begin resource learning section */
81478+enum {
81479+ GR_RLIM_CPU_BUMP = 60,
81480+ GR_RLIM_FSIZE_BUMP = 50000,
81481+ GR_RLIM_DATA_BUMP = 10000,
81482+ GR_RLIM_STACK_BUMP = 1000,
81483+ GR_RLIM_CORE_BUMP = 10000,
81484+ GR_RLIM_RSS_BUMP = 500000,
81485+ GR_RLIM_NPROC_BUMP = 1,
81486+ GR_RLIM_NOFILE_BUMP = 5,
81487+ GR_RLIM_MEMLOCK_BUMP = 50000,
81488+ GR_RLIM_AS_BUMP = 500000,
81489+ GR_RLIM_LOCKS_BUMP = 2,
81490+ GR_RLIM_SIGPENDING_BUMP = 5,
81491+ GR_RLIM_MSGQUEUE_BUMP = 10000,
81492+ GR_RLIM_NICE_BUMP = 1,
81493+ GR_RLIM_RTPRIO_BUMP = 1,
81494+ GR_RLIM_RTTIME_BUMP = 1000000
81495+};
81496+
81497+#endif
81498diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
81499new file mode 100644
81500index 0000000..d25522e
81501--- /dev/null
81502+++ b/include/linux/grinternal.h
81503@@ -0,0 +1,229 @@
81504+#ifndef __GRINTERNAL_H
81505+#define __GRINTERNAL_H
81506+
81507+#ifdef CONFIG_GRKERNSEC
81508+
81509+#include <linux/fs.h>
81510+#include <linux/mnt_namespace.h>
81511+#include <linux/nsproxy.h>
81512+#include <linux/gracl.h>
81513+#include <linux/grdefs.h>
81514+#include <linux/grmsg.h>
81515+
81516+void gr_add_learn_entry(const char *fmt, ...)
81517+ __attribute__ ((format (printf, 1, 2)));
81518+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
81519+ const struct vfsmount *mnt);
81520+__u32 gr_check_create(const struct dentry *new_dentry,
81521+ const struct dentry *parent,
81522+ const struct vfsmount *mnt, const __u32 mode);
81523+int gr_check_protected_task(const struct task_struct *task);
81524+__u32 to_gr_audit(const __u32 reqmode);
81525+int gr_set_acls(const int type);
81526+int gr_acl_is_enabled(void);
81527+char gr_roletype_to_char(void);
81528+
81529+void gr_handle_alertkill(struct task_struct *task);
81530+char *gr_to_filename(const struct dentry *dentry,
81531+ const struct vfsmount *mnt);
81532+char *gr_to_filename1(const struct dentry *dentry,
81533+ const struct vfsmount *mnt);
81534+char *gr_to_filename2(const struct dentry *dentry,
81535+ const struct vfsmount *mnt);
81536+char *gr_to_filename3(const struct dentry *dentry,
81537+ const struct vfsmount *mnt);
81538+
81539+extern int grsec_enable_ptrace_readexec;
81540+extern int grsec_enable_harden_ptrace;
81541+extern int grsec_enable_link;
81542+extern int grsec_enable_fifo;
81543+extern int grsec_enable_execve;
81544+extern int grsec_enable_shm;
81545+extern int grsec_enable_execlog;
81546+extern int grsec_enable_signal;
81547+extern int grsec_enable_audit_ptrace;
81548+extern int grsec_enable_forkfail;
81549+extern int grsec_enable_time;
81550+extern int grsec_enable_rofs;
81551+extern int grsec_deny_new_usb;
81552+extern int grsec_enable_chroot_shmat;
81553+extern int grsec_enable_chroot_mount;
81554+extern int grsec_enable_chroot_double;
81555+extern int grsec_enable_chroot_pivot;
81556+extern int grsec_enable_chroot_chdir;
81557+extern int grsec_enable_chroot_chmod;
81558+extern int grsec_enable_chroot_mknod;
81559+extern int grsec_enable_chroot_fchdir;
81560+extern int grsec_enable_chroot_nice;
81561+extern int grsec_enable_chroot_execlog;
81562+extern int grsec_enable_chroot_caps;
81563+extern int grsec_enable_chroot_sysctl;
81564+extern int grsec_enable_chroot_unix;
81565+extern int grsec_enable_symlinkown;
81566+extern kgid_t grsec_symlinkown_gid;
81567+extern int grsec_enable_tpe;
81568+extern kgid_t grsec_tpe_gid;
81569+extern int grsec_enable_tpe_all;
81570+extern int grsec_enable_tpe_invert;
81571+extern int grsec_enable_socket_all;
81572+extern kgid_t grsec_socket_all_gid;
81573+extern int grsec_enable_socket_client;
81574+extern kgid_t grsec_socket_client_gid;
81575+extern int grsec_enable_socket_server;
81576+extern kgid_t grsec_socket_server_gid;
81577+extern kgid_t grsec_audit_gid;
81578+extern int grsec_enable_group;
81579+extern int grsec_enable_log_rwxmaps;
81580+extern int grsec_enable_mount;
81581+extern int grsec_enable_chdir;
81582+extern int grsec_resource_logging;
81583+extern int grsec_enable_blackhole;
81584+extern int grsec_lastack_retries;
81585+extern int grsec_enable_brute;
81586+extern int grsec_enable_harden_ipc;
81587+extern int grsec_lock;
81588+
81589+extern spinlock_t grsec_alert_lock;
81590+extern unsigned long grsec_alert_wtime;
81591+extern unsigned long grsec_alert_fyet;
81592+
81593+extern spinlock_t grsec_audit_lock;
81594+
81595+extern rwlock_t grsec_exec_file_lock;
81596+
81597+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
81598+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
81599+ (tsk)->exec_file->f_path.mnt) : "/")
81600+
81601+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
81602+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
81603+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
81604+
81605+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
81606+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
81607+ (tsk)->exec_file->f_path.mnt) : "/")
81608+
81609+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
81610+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
81611+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
81612+
81613+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
81614+
81615+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
81616+
81617+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
81618+{
81619+ if (file1 && file2) {
81620+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
81621+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
81622+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
81623+ return true;
81624+ }
81625+
81626+ return false;
81627+}
81628+
81629+#define GR_CHROOT_CAPS {{ \
81630+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
81631+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
81632+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
81633+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
81634+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
81635+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
81636+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
81637+
81638+#define security_learn(normal_msg,args...) \
81639+({ \
81640+ read_lock(&grsec_exec_file_lock); \
81641+ gr_add_learn_entry(normal_msg "\n", ## args); \
81642+ read_unlock(&grsec_exec_file_lock); \
81643+})
81644+
81645+enum {
81646+ GR_DO_AUDIT,
81647+ GR_DONT_AUDIT,
81648+ /* used for non-audit messages that we shouldn't kill the task on */
81649+ GR_DONT_AUDIT_GOOD
81650+};
81651+
81652+enum {
81653+ GR_TTYSNIFF,
81654+ GR_RBAC,
81655+ GR_RBAC_STR,
81656+ GR_STR_RBAC,
81657+ GR_RBAC_MODE2,
81658+ GR_RBAC_MODE3,
81659+ GR_FILENAME,
81660+ GR_SYSCTL_HIDDEN,
81661+ GR_NOARGS,
81662+ GR_ONE_INT,
81663+ GR_ONE_INT_TWO_STR,
81664+ GR_ONE_STR,
81665+ GR_STR_INT,
81666+ GR_TWO_STR_INT,
81667+ GR_TWO_INT,
81668+ GR_TWO_U64,
81669+ GR_THREE_INT,
81670+ GR_FIVE_INT_TWO_STR,
81671+ GR_TWO_STR,
81672+ GR_THREE_STR,
81673+ GR_FOUR_STR,
81674+ GR_STR_FILENAME,
81675+ GR_FILENAME_STR,
81676+ GR_FILENAME_TWO_INT,
81677+ GR_FILENAME_TWO_INT_STR,
81678+ GR_TEXTREL,
81679+ GR_PTRACE,
81680+ GR_RESOURCE,
81681+ GR_CAP,
81682+ GR_SIG,
81683+ GR_SIG2,
81684+ GR_CRASH1,
81685+ GR_CRASH2,
81686+ GR_PSACCT,
81687+ GR_RWXMAP,
81688+ GR_RWXMAPVMA
81689+};
81690+
81691+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
81692+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
81693+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
81694+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
81695+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
81696+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
81697+#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)
81698+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
81699+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
81700+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
81701+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
81702+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
81703+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
81704+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
81705+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
81706+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
81707+#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)
81708+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
81709+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
81710+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
81711+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
81712+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
81713+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
81714+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
81715+#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)
81716+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
81717+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
81718+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
81719+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
81720+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
81721+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
81722+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
81723+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
81724+#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)
81725+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
81726+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
81727+
81728+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
81729+
81730+#endif
81731+
81732+#endif
81733diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
81734new file mode 100644
81735index 0000000..b02ba9d
81736--- /dev/null
81737+++ b/include/linux/grmsg.h
81738@@ -0,0 +1,117 @@
81739+#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"
81740+#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"
81741+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
81742+#define GR_STOPMOD_MSG "denied modification of module state by "
81743+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
81744+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
81745+#define GR_IOPERM_MSG "denied use of ioperm() by "
81746+#define GR_IOPL_MSG "denied use of iopl() by "
81747+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
81748+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
81749+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
81750+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
81751+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
81752+#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"
81753+#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"
81754+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
81755+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
81756+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
81757+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
81758+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
81759+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
81760+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
81761+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
81762+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
81763+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
81764+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
81765+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
81766+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
81767+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
81768+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
81769+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
81770+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
81771+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
81772+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
81773+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
81774+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
81775+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
81776+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
81777+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
81778+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
81779+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
81780+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
81781+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
81782+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
81783+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
81784+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
81785+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
81786+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
81787+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
81788+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
81789+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
81790+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
81791+#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"
81792+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
81793+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
81794+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
81795+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
81796+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
81797+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
81798+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
81799+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
81800+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
81801+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
81802+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
81803+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
81804+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
81805+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
81806+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
81807+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
81808+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
81809+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
81810+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
81811+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
81812+#define GR_FAILFORK_MSG "failed fork with errno %s by "
81813+#define GR_NICE_CHROOT_MSG "denied priority change by "
81814+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
81815+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
81816+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
81817+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
81818+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
81819+#define GR_TIME_MSG "time set by "
81820+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
81821+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
81822+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
81823+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
81824+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
81825+#define GR_BIND_MSG "denied bind() by "
81826+#define GR_CONNECT_MSG "denied connect() by "
81827+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
81828+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
81829+#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"
81830+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
81831+#define GR_CAP_ACL_MSG "use of %s denied for "
81832+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
81833+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
81834+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
81835+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
81836+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
81837+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
81838+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
81839+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
81840+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
81841+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
81842+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
81843+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
81844+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
81845+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
81846+#define GR_VM86_MSG "denied use of vm86 by "
81847+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
81848+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
81849+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
81850+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
81851+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
81852+#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 "
81853+#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 "
81854+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
81855+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
81856diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
81857new file mode 100644
81858index 0000000..c3b0738
81859--- /dev/null
81860+++ b/include/linux/grsecurity.h
81861@@ -0,0 +1,244 @@
81862+#ifndef GR_SECURITY_H
81863+#define GR_SECURITY_H
81864+#include <linux/fs.h>
81865+#include <linux/fs_struct.h>
81866+#include <linux/binfmts.h>
81867+#include <linux/gracl.h>
81868+
81869+/* notify of brain-dead configs */
81870+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81871+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
81872+#endif
81873+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
81874+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
81875+#endif
81876+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
81877+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
81878+#endif
81879+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
81880+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
81881+#endif
81882+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
81883+#error "CONFIG_PAX enabled, but no PaX options are enabled."
81884+#endif
81885+
81886+int gr_handle_new_usb(void);
81887+
81888+void gr_handle_brute_attach(int dumpable);
81889+void gr_handle_brute_check(void);
81890+void gr_handle_kernel_exploit(void);
81891+
81892+char gr_roletype_to_char(void);
81893+
81894+int gr_proc_is_restricted(void);
81895+
81896+int gr_acl_enable_at_secure(void);
81897+
81898+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
81899+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
81900+
81901+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
81902+
81903+void gr_del_task_from_ip_table(struct task_struct *p);
81904+
81905+int gr_pid_is_chrooted(struct task_struct *p);
81906+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
81907+int gr_handle_chroot_nice(void);
81908+int gr_handle_chroot_sysctl(const int op);
81909+int gr_handle_chroot_setpriority(struct task_struct *p,
81910+ const int niceval);
81911+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
81912+int gr_chroot_fhandle(void);
81913+int gr_handle_chroot_chroot(const struct dentry *dentry,
81914+ const struct vfsmount *mnt);
81915+void gr_handle_chroot_chdir(const struct path *path);
81916+int gr_handle_chroot_chmod(const struct dentry *dentry,
81917+ const struct vfsmount *mnt, const int mode);
81918+int gr_handle_chroot_mknod(const struct dentry *dentry,
81919+ const struct vfsmount *mnt, const int mode);
81920+int gr_handle_chroot_mount(const struct dentry *dentry,
81921+ const struct vfsmount *mnt,
81922+ const char *dev_name);
81923+int gr_handle_chroot_pivot(void);
81924+int gr_handle_chroot_unix(const pid_t pid);
81925+
81926+int gr_handle_rawio(const struct inode *inode);
81927+
81928+void gr_handle_ioperm(void);
81929+void gr_handle_iopl(void);
81930+void gr_handle_msr_write(void);
81931+
81932+umode_t gr_acl_umask(void);
81933+
81934+int gr_tpe_allow(const struct file *file);
81935+
81936+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
81937+void gr_clear_chroot_entries(struct task_struct *task);
81938+
81939+void gr_log_forkfail(const int retval);
81940+void gr_log_timechange(void);
81941+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
81942+void gr_log_chdir(const struct dentry *dentry,
81943+ const struct vfsmount *mnt);
81944+void gr_log_chroot_exec(const struct dentry *dentry,
81945+ const struct vfsmount *mnt);
81946+void gr_log_remount(const char *devname, const int retval);
81947+void gr_log_unmount(const char *devname, const int retval);
81948+void gr_log_mount(const char *from, struct path *to, const int retval);
81949+void gr_log_textrel(struct vm_area_struct *vma);
81950+void gr_log_ptgnustack(struct file *file);
81951+void gr_log_rwxmmap(struct file *file);
81952+void gr_log_rwxmprotect(struct vm_area_struct *vma);
81953+
81954+int gr_handle_follow_link(const struct inode *parent,
81955+ const struct inode *inode,
81956+ const struct dentry *dentry,
81957+ const struct vfsmount *mnt);
81958+int gr_handle_fifo(const struct dentry *dentry,
81959+ const struct vfsmount *mnt,
81960+ const struct dentry *dir, const int flag,
81961+ const int acc_mode);
81962+int gr_handle_hardlink(const struct dentry *dentry,
81963+ const struct vfsmount *mnt,
81964+ struct inode *inode,
81965+ const int mode, const struct filename *to);
81966+
81967+int gr_is_capable(const int cap);
81968+int gr_is_capable_nolog(const int cap);
81969+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
81970+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
81971+
81972+void gr_copy_label(struct task_struct *tsk);
81973+void gr_handle_crash(struct task_struct *task, const int sig);
81974+int gr_handle_signal(const struct task_struct *p, const int sig);
81975+int gr_check_crash_uid(const kuid_t uid);
81976+int gr_check_protected_task(const struct task_struct *task);
81977+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
81978+int gr_acl_handle_mmap(const struct file *file,
81979+ const unsigned long prot);
81980+int gr_acl_handle_mprotect(const struct file *file,
81981+ const unsigned long prot);
81982+int gr_check_hidden_task(const struct task_struct *tsk);
81983+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
81984+ const struct vfsmount *mnt);
81985+__u32 gr_acl_handle_utime(const struct dentry *dentry,
81986+ const struct vfsmount *mnt);
81987+__u32 gr_acl_handle_access(const struct dentry *dentry,
81988+ const struct vfsmount *mnt, const int fmode);
81989+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
81990+ const struct vfsmount *mnt, umode_t *mode);
81991+__u32 gr_acl_handle_chown(const struct dentry *dentry,
81992+ const struct vfsmount *mnt);
81993+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
81994+ const struct vfsmount *mnt);
81995+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
81996+ const struct vfsmount *mnt);
81997+int gr_handle_ptrace(struct task_struct *task, const long request);
81998+int gr_handle_proc_ptrace(struct task_struct *task);
81999+__u32 gr_acl_handle_execve(const struct dentry *dentry,
82000+ const struct vfsmount *mnt);
82001+int gr_check_crash_exec(const struct file *filp);
82002+int gr_acl_is_enabled(void);
82003+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
82004+ const kgid_t gid);
82005+int gr_set_proc_label(const struct dentry *dentry,
82006+ const struct vfsmount *mnt,
82007+ const int unsafe_flags);
82008+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
82009+ const struct vfsmount *mnt);
82010+__u32 gr_acl_handle_open(const struct dentry *dentry,
82011+ const struct vfsmount *mnt, int acc_mode);
82012+__u32 gr_acl_handle_creat(const struct dentry *dentry,
82013+ const struct dentry *p_dentry,
82014+ const struct vfsmount *p_mnt,
82015+ int open_flags, int acc_mode, const int imode);
82016+void gr_handle_create(const struct dentry *dentry,
82017+ const struct vfsmount *mnt);
82018+void gr_handle_proc_create(const struct dentry *dentry,
82019+ const struct inode *inode);
82020+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
82021+ const struct dentry *parent_dentry,
82022+ const struct vfsmount *parent_mnt,
82023+ const int mode);
82024+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
82025+ const struct dentry *parent_dentry,
82026+ const struct vfsmount *parent_mnt);
82027+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
82028+ const struct vfsmount *mnt);
82029+void gr_handle_delete(const ino_t ino, const dev_t dev);
82030+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
82031+ const struct vfsmount *mnt);
82032+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
82033+ const struct dentry *parent_dentry,
82034+ const struct vfsmount *parent_mnt,
82035+ const struct filename *from);
82036+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
82037+ const struct dentry *parent_dentry,
82038+ const struct vfsmount *parent_mnt,
82039+ const struct dentry *old_dentry,
82040+ const struct vfsmount *old_mnt, const struct filename *to);
82041+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
82042+int gr_acl_handle_rename(struct dentry *new_dentry,
82043+ struct dentry *parent_dentry,
82044+ const struct vfsmount *parent_mnt,
82045+ struct dentry *old_dentry,
82046+ struct inode *old_parent_inode,
82047+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
82048+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
82049+ struct dentry *old_dentry,
82050+ struct dentry *new_dentry,
82051+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
82052+__u32 gr_check_link(const struct dentry *new_dentry,
82053+ const struct dentry *parent_dentry,
82054+ const struct vfsmount *parent_mnt,
82055+ const struct dentry *old_dentry,
82056+ const struct vfsmount *old_mnt);
82057+int gr_acl_handle_filldir(const struct file *file, const char *name,
82058+ const unsigned int namelen, const ino_t ino);
82059+
82060+__u32 gr_acl_handle_unix(const struct dentry *dentry,
82061+ const struct vfsmount *mnt);
82062+void gr_acl_handle_exit(void);
82063+void gr_acl_handle_psacct(struct task_struct *task, const long code);
82064+int gr_acl_handle_procpidmem(const struct task_struct *task);
82065+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
82066+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
82067+void gr_audit_ptrace(struct task_struct *task);
82068+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
82069+void gr_put_exec_file(struct task_struct *task);
82070+
82071+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
82072+
82073+#ifdef CONFIG_GRKERNSEC_RESLOG
82074+extern void gr_log_resource(const struct task_struct *task, const int res,
82075+ const unsigned long wanted, const int gt);
82076+#else
82077+static inline void gr_log_resource(const struct task_struct *task, const int res,
82078+ const unsigned long wanted, const int gt)
82079+{
82080+}
82081+#endif
82082+
82083+#ifdef CONFIG_GRKERNSEC
82084+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
82085+void gr_handle_vm86(void);
82086+void gr_handle_mem_readwrite(u64 from, u64 to);
82087+
82088+void gr_log_badprocpid(const char *entry);
82089+
82090+extern int grsec_enable_dmesg;
82091+extern int grsec_disable_privio;
82092+
82093+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
82094+extern kgid_t grsec_proc_gid;
82095+#endif
82096+
82097+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
82098+extern int grsec_enable_chroot_findtask;
82099+#endif
82100+#ifdef CONFIG_GRKERNSEC_SETXID
82101+extern int grsec_enable_setxid;
82102+#endif
82103+#endif
82104+
82105+#endif
82106diff --git a/include/linux/grsock.h b/include/linux/grsock.h
82107new file mode 100644
82108index 0000000..e7ffaaf
82109--- /dev/null
82110+++ b/include/linux/grsock.h
82111@@ -0,0 +1,19 @@
82112+#ifndef __GRSOCK_H
82113+#define __GRSOCK_H
82114+
82115+extern void gr_attach_curr_ip(const struct sock *sk);
82116+extern int gr_handle_sock_all(const int family, const int type,
82117+ const int protocol);
82118+extern int gr_handle_sock_server(const struct sockaddr *sck);
82119+extern int gr_handle_sock_server_other(const struct sock *sck);
82120+extern int gr_handle_sock_client(const struct sockaddr *sck);
82121+extern int gr_search_connect(struct socket * sock,
82122+ struct sockaddr_in * addr);
82123+extern int gr_search_bind(struct socket * sock,
82124+ struct sockaddr_in * addr);
82125+extern int gr_search_listen(struct socket * sock);
82126+extern int gr_search_accept(struct socket * sock);
82127+extern int gr_search_socket(const int domain, const int type,
82128+ const int protocol);
82129+
82130+#endif
82131diff --git a/include/linux/hash.h b/include/linux/hash.h
82132index d0494c3..69b7715 100644
82133--- a/include/linux/hash.h
82134+++ b/include/linux/hash.h
82135@@ -87,7 +87,7 @@ static inline u32 hash32_ptr(const void *ptr)
82136 struct fast_hash_ops {
82137 u32 (*hash)(const void *data, u32 len, u32 seed);
82138 u32 (*hash2)(const u32 *data, u32 len, u32 seed);
82139-};
82140+} __no_const;
82141
82142 /**
82143 * arch_fast_hash - Caclulates a hash over a given buffer that can have
82144diff --git a/include/linux/highmem.h b/include/linux/highmem.h
82145index 9286a46..373f27f 100644
82146--- a/include/linux/highmem.h
82147+++ b/include/linux/highmem.h
82148@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
82149 kunmap_atomic(kaddr);
82150 }
82151
82152+static inline void sanitize_highpage(struct page *page)
82153+{
82154+ void *kaddr;
82155+ unsigned long flags;
82156+
82157+ local_irq_save(flags);
82158+ kaddr = kmap_atomic(page);
82159+ clear_page(kaddr);
82160+ kunmap_atomic(kaddr);
82161+ local_irq_restore(flags);
82162+}
82163+
82164 static inline void zero_user_segments(struct page *page,
82165 unsigned start1, unsigned end1,
82166 unsigned start2, unsigned end2)
82167diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
82168index 1c7b89a..7dda400 100644
82169--- a/include/linux/hwmon-sysfs.h
82170+++ b/include/linux/hwmon-sysfs.h
82171@@ -25,7 +25,8 @@
82172 struct sensor_device_attribute{
82173 struct device_attribute dev_attr;
82174 int index;
82175-};
82176+} __do_const;
82177+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
82178 #define to_sensor_dev_attr(_dev_attr) \
82179 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
82180
82181@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
82182 struct device_attribute dev_attr;
82183 u8 index;
82184 u8 nr;
82185-};
82186+} __do_const;
82187+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
82188 #define to_sensor_dev_attr_2(_dev_attr) \
82189 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
82190
82191diff --git a/include/linux/i2c.h b/include/linux/i2c.h
82192index b556e0a..c10a515 100644
82193--- a/include/linux/i2c.h
82194+++ b/include/linux/i2c.h
82195@@ -378,6 +378,7 @@ struct i2c_algorithm {
82196 /* To determine what the adapter supports */
82197 u32 (*functionality) (struct i2c_adapter *);
82198 };
82199+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
82200
82201 /**
82202 * struct i2c_bus_recovery_info - I2C bus recovery information
82203diff --git a/include/linux/i2o.h b/include/linux/i2o.h
82204index d23c3c2..eb63c81 100644
82205--- a/include/linux/i2o.h
82206+++ b/include/linux/i2o.h
82207@@ -565,7 +565,7 @@ struct i2o_controller {
82208 struct i2o_device *exec; /* Executive */
82209 #if BITS_PER_LONG == 64
82210 spinlock_t context_list_lock; /* lock for context_list */
82211- atomic_t context_list_counter; /* needed for unique contexts */
82212+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
82213 struct list_head context_list; /* list of context id's
82214 and pointers */
82215 #endif
82216diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
82217index aff7ad8..3942bbd 100644
82218--- a/include/linux/if_pppox.h
82219+++ b/include/linux/if_pppox.h
82220@@ -76,7 +76,7 @@ struct pppox_proto {
82221 int (*ioctl)(struct socket *sock, unsigned int cmd,
82222 unsigned long arg);
82223 struct module *owner;
82224-};
82225+} __do_const;
82226
82227 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
82228 extern void unregister_pppox_proto(int proto_num);
82229diff --git a/include/linux/init.h b/include/linux/init.h
82230index 2df8e8d..3e1280d 100644
82231--- a/include/linux/init.h
82232+++ b/include/linux/init.h
82233@@ -37,9 +37,17 @@
82234 * section.
82235 */
82236
82237+#define add_init_latent_entropy __latent_entropy
82238+
82239+#ifdef CONFIG_MEMORY_HOTPLUG
82240+#define add_meminit_latent_entropy
82241+#else
82242+#define add_meminit_latent_entropy __latent_entropy
82243+#endif
82244+
82245 /* These are for everybody (although not all archs will actually
82246 discard it in modules) */
82247-#define __init __section(.init.text) __cold notrace
82248+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
82249 #define __initdata __section(.init.data)
82250 #define __initconst __constsection(.init.rodata)
82251 #define __exitdata __section(.exit.data)
82252@@ -100,7 +108,7 @@
82253 #define __cpuexitconst
82254
82255 /* Used for MEMORY_HOTPLUG */
82256-#define __meminit __section(.meminit.text) __cold notrace
82257+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
82258 #define __meminitdata __section(.meminit.data)
82259 #define __meminitconst __constsection(.meminit.rodata)
82260 #define __memexit __section(.memexit.text) __exitused __cold notrace
82261diff --git a/include/linux/init_task.h b/include/linux/init_task.h
82262index 77fc43f..73caf92 100644
82263--- a/include/linux/init_task.h
82264+++ b/include/linux/init_task.h
82265@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
82266
82267 #define INIT_TASK_COMM "swapper"
82268
82269+#ifdef CONFIG_X86
82270+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
82271+#else
82272+#define INIT_TASK_THREAD_INFO
82273+#endif
82274+
82275 #ifdef CONFIG_RT_MUTEXES
82276 # define INIT_RT_MUTEXES(tsk) \
82277 .pi_waiters = RB_ROOT, \
82278@@ -205,6 +211,7 @@ extern struct task_group root_task_group;
82279 RCU_POINTER_INITIALIZER(cred, &init_cred), \
82280 .comm = INIT_TASK_COMM, \
82281 .thread = INIT_THREAD, \
82282+ INIT_TASK_THREAD_INFO \
82283 .fs = &init_fs, \
82284 .files = &init_files, \
82285 .signal = &init_signals, \
82286diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
82287index 69517a2..6b12d37 100644
82288--- a/include/linux/interrupt.h
82289+++ b/include/linux/interrupt.h
82290@@ -413,8 +413,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
82291
82292 struct softirq_action
82293 {
82294- void (*action)(struct softirq_action *);
82295-};
82296+ void (*action)(void);
82297+} __no_const;
82298
82299 asmlinkage void do_softirq(void);
82300 asmlinkage void __do_softirq(void);
82301@@ -428,7 +428,7 @@ static inline void do_softirq_own_stack(void)
82302 }
82303 #endif
82304
82305-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
82306+extern void open_softirq(int nr, void (*action)(void));
82307 extern void softirq_init(void);
82308 extern void __raise_softirq_irqoff(unsigned int nr);
82309
82310diff --git a/include/linux/iommu.h b/include/linux/iommu.h
82311index e6a7c9f..5804745 100644
82312--- a/include/linux/iommu.h
82313+++ b/include/linux/iommu.h
82314@@ -133,7 +133,7 @@ struct iommu_ops {
82315 u32 (*domain_get_windows)(struct iommu_domain *domain);
82316
82317 unsigned long pgsize_bitmap;
82318-};
82319+} __do_const;
82320
82321 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
82322 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
82323diff --git a/include/linux/ioport.h b/include/linux/ioport.h
82324index 2c525022..345b106 100644
82325--- a/include/linux/ioport.h
82326+++ b/include/linux/ioport.h
82327@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
82328 int adjust_resource(struct resource *res, resource_size_t start,
82329 resource_size_t size);
82330 resource_size_t resource_alignment(struct resource *res);
82331-static inline resource_size_t resource_size(const struct resource *res)
82332+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
82333 {
82334 return res->end - res->start + 1;
82335 }
82336diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
82337index 35e7eca..6afb7ad 100644
82338--- a/include/linux/ipc_namespace.h
82339+++ b/include/linux/ipc_namespace.h
82340@@ -69,7 +69,7 @@ struct ipc_namespace {
82341 struct user_namespace *user_ns;
82342
82343 unsigned int proc_inum;
82344-};
82345+} __randomize_layout;
82346
82347 extern struct ipc_namespace init_ipc_ns;
82348 extern atomic_t nr_ipc_ns;
82349diff --git a/include/linux/irq.h b/include/linux/irq.h
82350index 03f48d9..e86af0c 100644
82351--- a/include/linux/irq.h
82352+++ b/include/linux/irq.h
82353@@ -352,7 +352,8 @@ struct irq_chip {
82354 void (*irq_release_resources)(struct irq_data *data);
82355
82356 unsigned long flags;
82357-};
82358+} __do_const;
82359+typedef struct irq_chip __no_const irq_chip_no_const;
82360
82361 /*
82362 * irq_chip specific flags
82363diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
82364index 13eed92..3261c86 100644
82365--- a/include/linux/irqchip/arm-gic.h
82366+++ b/include/linux/irqchip/arm-gic.h
82367@@ -91,9 +91,11 @@
82368
82369 #ifndef __ASSEMBLY__
82370
82371+#include <linux/irq.h>
82372+
82373 struct device_node;
82374
82375-extern struct irq_chip gic_arch_extn;
82376+extern irq_chip_no_const gic_arch_extn;
82377
82378 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
82379 u32 offset, struct device_node *);
82380diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
82381index c367cbd..c9b79e6 100644
82382--- a/include/linux/jiffies.h
82383+++ b/include/linux/jiffies.h
82384@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
82385 /*
82386 * Convert various time units to each other:
82387 */
82388-extern unsigned int jiffies_to_msecs(const unsigned long j);
82389-extern unsigned int jiffies_to_usecs(const unsigned long j);
82390+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
82391+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
82392
82393-static inline u64 jiffies_to_nsecs(const unsigned long j)
82394+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
82395 {
82396 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
82397 }
82398
82399-extern unsigned long msecs_to_jiffies(const unsigned int m);
82400-extern unsigned long usecs_to_jiffies(const unsigned int u);
82401+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
82402+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
82403 extern unsigned long timespec_to_jiffies(const struct timespec *value);
82404 extern void jiffies_to_timespec(const unsigned long jiffies,
82405- struct timespec *value);
82406-extern unsigned long timeval_to_jiffies(const struct timeval *value);
82407+ struct timespec *value) __intentional_overflow(-1);
82408+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
82409 extern void jiffies_to_timeval(const unsigned long jiffies,
82410 struct timeval *value);
82411
82412diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
82413index 6883e19..e854fcb 100644
82414--- a/include/linux/kallsyms.h
82415+++ b/include/linux/kallsyms.h
82416@@ -15,7 +15,8 @@
82417
82418 struct module;
82419
82420-#ifdef CONFIG_KALLSYMS
82421+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
82422+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
82423 /* Lookup the address for a symbol. Returns 0 if not found. */
82424 unsigned long kallsyms_lookup_name(const char *name);
82425
82426@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
82427 /* Stupid that this does nothing, but I didn't create this mess. */
82428 #define __print_symbol(fmt, addr)
82429 #endif /*CONFIG_KALLSYMS*/
82430+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
82431+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
82432+extern unsigned long kallsyms_lookup_name(const char *name);
82433+extern void __print_symbol(const char *fmt, unsigned long address);
82434+extern int sprint_backtrace(char *buffer, unsigned long address);
82435+extern int sprint_symbol(char *buffer, unsigned long address);
82436+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
82437+const char *kallsyms_lookup(unsigned long addr,
82438+ unsigned long *symbolsize,
82439+ unsigned long *offset,
82440+ char **modname, char *namebuf);
82441+extern int kallsyms_lookup_size_offset(unsigned long addr,
82442+ unsigned long *symbolsize,
82443+ unsigned long *offset);
82444+#endif
82445
82446 /* This macro allows us to keep printk typechecking */
82447 static __printf(1, 2)
82448diff --git a/include/linux/key-type.h b/include/linux/key-type.h
82449index ff9f1d3..6712be5 100644
82450--- a/include/linux/key-type.h
82451+++ b/include/linux/key-type.h
82452@@ -152,7 +152,7 @@ struct key_type {
82453 /* internal fields */
82454 struct list_head link; /* link in types list */
82455 struct lock_class_key lock_class; /* key->sem lock class */
82456-};
82457+} __do_const;
82458
82459 extern struct key_type key_type_keyring;
82460
82461diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
82462index e465bb1..19f605f 100644
82463--- a/include/linux/kgdb.h
82464+++ b/include/linux/kgdb.h
82465@@ -52,7 +52,7 @@ extern int kgdb_connected;
82466 extern int kgdb_io_module_registered;
82467
82468 extern atomic_t kgdb_setting_breakpoint;
82469-extern atomic_t kgdb_cpu_doing_single_step;
82470+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
82471
82472 extern struct task_struct *kgdb_usethread;
82473 extern struct task_struct *kgdb_contthread;
82474@@ -254,7 +254,7 @@ struct kgdb_arch {
82475 void (*correct_hw_break)(void);
82476
82477 void (*enable_nmi)(bool on);
82478-};
82479+} __do_const;
82480
82481 /**
82482 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
82483@@ -279,7 +279,7 @@ struct kgdb_io {
82484 void (*pre_exception) (void);
82485 void (*post_exception) (void);
82486 int is_console;
82487-};
82488+} __do_const;
82489
82490 extern struct kgdb_arch arch_kgdb_ops;
82491
82492diff --git a/include/linux/kmod.h b/include/linux/kmod.h
82493index 0555cc6..40116ce 100644
82494--- a/include/linux/kmod.h
82495+++ b/include/linux/kmod.h
82496@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
82497 * usually useless though. */
82498 extern __printf(2, 3)
82499 int __request_module(bool wait, const char *name, ...);
82500+extern __printf(3, 4)
82501+int ___request_module(bool wait, char *param_name, const char *name, ...);
82502 #define request_module(mod...) __request_module(true, mod)
82503 #define request_module_nowait(mod...) __request_module(false, mod)
82504 #define try_then_request_module(x, mod...) \
82505@@ -57,6 +59,9 @@ struct subprocess_info {
82506 struct work_struct work;
82507 struct completion *complete;
82508 char *path;
82509+#ifdef CONFIG_GRKERNSEC
82510+ char *origpath;
82511+#endif
82512 char **argv;
82513 char **envp;
82514 int wait;
82515diff --git a/include/linux/kobject.h b/include/linux/kobject.h
82516index 2d61b90..a1d0a13 100644
82517--- a/include/linux/kobject.h
82518+++ b/include/linux/kobject.h
82519@@ -118,7 +118,7 @@ struct kobj_type {
82520 struct attribute **default_attrs;
82521 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
82522 const void *(*namespace)(struct kobject *kobj);
82523-};
82524+} __do_const;
82525
82526 struct kobj_uevent_env {
82527 char *argv[3];
82528@@ -142,6 +142,7 @@ struct kobj_attribute {
82529 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
82530 const char *buf, size_t count);
82531 };
82532+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
82533
82534 extern const struct sysfs_ops kobj_sysfs_ops;
82535
82536@@ -169,7 +170,7 @@ struct kset {
82537 spinlock_t list_lock;
82538 struct kobject kobj;
82539 const struct kset_uevent_ops *uevent_ops;
82540-};
82541+} __randomize_layout;
82542
82543 extern void kset_init(struct kset *kset);
82544 extern int __must_check kset_register(struct kset *kset);
82545diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
82546index df32d25..fb52e27 100644
82547--- a/include/linux/kobject_ns.h
82548+++ b/include/linux/kobject_ns.h
82549@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
82550 const void *(*netlink_ns)(struct sock *sk);
82551 const void *(*initial_ns)(void);
82552 void (*drop_ns)(void *);
82553-};
82554+} __do_const;
82555
82556 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
82557 int kobj_ns_type_registered(enum kobj_ns_type type);
82558diff --git a/include/linux/kref.h b/include/linux/kref.h
82559index 484604d..0f6c5b6 100644
82560--- a/include/linux/kref.h
82561+++ b/include/linux/kref.h
82562@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
82563 static inline int kref_sub(struct kref *kref, unsigned int count,
82564 void (*release)(struct kref *kref))
82565 {
82566- WARN_ON(release == NULL);
82567+ BUG_ON(release == NULL);
82568
82569 if (atomic_sub_and_test((int) count, &kref->refcount)) {
82570 release(kref);
82571diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
82572index a6059bd..8126d5c 100644
82573--- a/include/linux/kvm_host.h
82574+++ b/include/linux/kvm_host.h
82575@@ -460,7 +460,7 @@ static inline void kvm_irqfd_exit(void)
82576 {
82577 }
82578 #endif
82579-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
82580+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
82581 struct module *module);
82582 void kvm_exit(void);
82583
82584@@ -629,7 +629,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
82585 struct kvm_guest_debug *dbg);
82586 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
82587
82588-int kvm_arch_init(void *opaque);
82589+int kvm_arch_init(const void *opaque);
82590 void kvm_arch_exit(void);
82591
82592 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
82593diff --git a/include/linux/libata.h b/include/linux/libata.h
82594index bd5fefe..2a8a8d2 100644
82595--- a/include/linux/libata.h
82596+++ b/include/linux/libata.h
82597@@ -976,7 +976,7 @@ struct ata_port_operations {
82598 * fields must be pointers.
82599 */
82600 const struct ata_port_operations *inherits;
82601-};
82602+} __do_const;
82603
82604 struct ata_port_info {
82605 unsigned long flags;
82606diff --git a/include/linux/linkage.h b/include/linux/linkage.h
82607index a6a42dd..6c5ebce 100644
82608--- a/include/linux/linkage.h
82609+++ b/include/linux/linkage.h
82610@@ -36,6 +36,7 @@
82611 #endif
82612
82613 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
82614+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
82615 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
82616
82617 /*
82618diff --git a/include/linux/list.h b/include/linux/list.h
82619index f33f831..1ffe5e2 100644
82620--- a/include/linux/list.h
82621+++ b/include/linux/list.h
82622@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
82623 extern void list_del(struct list_head *entry);
82624 #endif
82625
82626+extern void __pax_list_add(struct list_head *new,
82627+ struct list_head *prev,
82628+ struct list_head *next);
82629+static inline void pax_list_add(struct list_head *new, struct list_head *head)
82630+{
82631+ __pax_list_add(new, head, head->next);
82632+}
82633+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
82634+{
82635+ __pax_list_add(new, head->prev, head);
82636+}
82637+extern void pax_list_del(struct list_head *entry);
82638+
82639 /**
82640 * list_replace - replace old entry by new one
82641 * @old : the element to be replaced
82642@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
82643 INIT_LIST_HEAD(entry);
82644 }
82645
82646+extern void pax_list_del_init(struct list_head *entry);
82647+
82648 /**
82649 * list_move - delete from one list and add as another's head
82650 * @list: the entry to move
82651diff --git a/include/linux/lockref.h b/include/linux/lockref.h
82652index 4bfde0e..d6e2e09 100644
82653--- a/include/linux/lockref.h
82654+++ b/include/linux/lockref.h
82655@@ -47,4 +47,36 @@ static inline int __lockref_is_dead(const struct lockref *l)
82656 return ((int)l->count < 0);
82657 }
82658
82659+static inline unsigned int __lockref_read(struct lockref *lockref)
82660+{
82661+ return lockref->count;
82662+}
82663+
82664+static inline void __lockref_set(struct lockref *lockref, unsigned int count)
82665+{
82666+ lockref->count = count;
82667+}
82668+
82669+static inline void __lockref_inc(struct lockref *lockref)
82670+{
82671+
82672+#ifdef CONFIG_PAX_REFCOUNT
82673+ atomic_inc((atomic_t *)&lockref->count);
82674+#else
82675+ lockref->count++;
82676+#endif
82677+
82678+}
82679+
82680+static inline void __lockref_dec(struct lockref *lockref)
82681+{
82682+
82683+#ifdef CONFIG_PAX_REFCOUNT
82684+ atomic_dec((atomic_t *)&lockref->count);
82685+#else
82686+ lockref->count--;
82687+#endif
82688+
82689+}
82690+
82691 #endif /* __LINUX_LOCKREF_H */
82692diff --git a/include/linux/math64.h b/include/linux/math64.h
82693index c45c089..298841c 100644
82694--- a/include/linux/math64.h
82695+++ b/include/linux/math64.h
82696@@ -15,7 +15,7 @@
82697 * This is commonly provided by 32bit archs to provide an optimized 64bit
82698 * divide.
82699 */
82700-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82701+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82702 {
82703 *remainder = dividend % divisor;
82704 return dividend / divisor;
82705@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
82706 /**
82707 * div64_u64 - unsigned 64bit divide with 64bit divisor
82708 */
82709-static inline u64 div64_u64(u64 dividend, u64 divisor)
82710+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
82711 {
82712 return dividend / divisor;
82713 }
82714@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
82715 #define div64_ul(x, y) div_u64((x), (y))
82716
82717 #ifndef div_u64_rem
82718-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82719+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
82720 {
82721 *remainder = do_div(dividend, divisor);
82722 return dividend;
82723@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
82724 #endif
82725
82726 #ifndef div64_u64
82727-extern u64 div64_u64(u64 dividend, u64 divisor);
82728+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
82729 #endif
82730
82731 #ifndef div64_s64
82732@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
82733 * divide.
82734 */
82735 #ifndef div_u64
82736-static inline u64 div_u64(u64 dividend, u32 divisor)
82737+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
82738 {
82739 u32 remainder;
82740 return div_u64_rem(dividend, divisor, &remainder);
82741diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
82742index 3d385c8..deacb6a 100644
82743--- a/include/linux/mempolicy.h
82744+++ b/include/linux/mempolicy.h
82745@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
82746 }
82747
82748 #define vma_policy(vma) ((vma)->vm_policy)
82749+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
82750+{
82751+ vma->vm_policy = pol;
82752+}
82753
82754 static inline void mpol_get(struct mempolicy *pol)
82755 {
82756@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
82757 }
82758
82759 #define vma_policy(vma) NULL
82760+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
82761+{
82762+}
82763
82764 static inline int
82765 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
82766diff --git a/include/linux/mm.h b/include/linux/mm.h
82767index b464611..77cbfc1 100644
82768--- a/include/linux/mm.h
82769+++ b/include/linux/mm.h
82770@@ -128,6 +128,11 @@ extern unsigned int kobjsize(const void *objp);
82771 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
82772 #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */
82773 #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
82774+
82775+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
82776+#define VM_PAGEEXEC 0x02000000 /* vma->vm_page_prot needs special handling */
82777+#endif
82778+
82779 #define VM_DONTDUMP 0x04000000 /* Do not include in the core dump */
82780
82781 #ifdef CONFIG_MEM_SOFT_DIRTY
82782@@ -238,8 +243,8 @@ struct vm_operations_struct {
82783 /* called by access_process_vm when get_user_pages() fails, typically
82784 * for use by special VMAs that can switch between memory and hardware
82785 */
82786- int (*access)(struct vm_area_struct *vma, unsigned long addr,
82787- void *buf, int len, int write);
82788+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
82789+ void *buf, size_t len, int write);
82790
82791 /* Called by the /proc/PID/maps code to ask the vma whether it
82792 * has a special name. Returning non-NULL will also cause this
82793@@ -275,6 +280,7 @@ struct vm_operations_struct {
82794 int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
82795 unsigned long size, pgoff_t pgoff);
82796 };
82797+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
82798
82799 struct mmu_gather;
82800 struct inode;
82801@@ -1165,8 +1171,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
82802 unsigned long *pfn);
82803 int follow_phys(struct vm_area_struct *vma, unsigned long address,
82804 unsigned int flags, unsigned long *prot, resource_size_t *phys);
82805-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
82806- void *buf, int len, int write);
82807+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
82808+ void *buf, size_t len, int write);
82809
82810 static inline void unmap_shared_mapping_range(struct address_space *mapping,
82811 loff_t const holebegin, loff_t const holelen)
82812@@ -1206,9 +1212,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
82813 }
82814 #endif
82815
82816-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
82817-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
82818- void *buf, int len, int write);
82819+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
82820+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
82821+ void *buf, size_t len, int write);
82822
82823 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
82824 unsigned long start, unsigned long nr_pages,
82825@@ -1240,34 +1246,6 @@ int set_page_dirty_lock(struct page *page);
82826 int clear_page_dirty_for_io(struct page *page);
82827 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
82828
82829-/* Is the vma a continuation of the stack vma above it? */
82830-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
82831-{
82832- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
82833-}
82834-
82835-static inline int stack_guard_page_start(struct vm_area_struct *vma,
82836- unsigned long addr)
82837-{
82838- return (vma->vm_flags & VM_GROWSDOWN) &&
82839- (vma->vm_start == addr) &&
82840- !vma_growsdown(vma->vm_prev, addr);
82841-}
82842-
82843-/* Is the vma a continuation of the stack vma below it? */
82844-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
82845-{
82846- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
82847-}
82848-
82849-static inline int stack_guard_page_end(struct vm_area_struct *vma,
82850- unsigned long addr)
82851-{
82852- return (vma->vm_flags & VM_GROWSUP) &&
82853- (vma->vm_end == addr) &&
82854- !vma_growsup(vma->vm_next, addr);
82855-}
82856-
82857 extern struct task_struct *task_of_stack(struct task_struct *task,
82858 struct vm_area_struct *vma, bool in_group);
82859
82860@@ -1385,8 +1363,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
82861 {
82862 return 0;
82863 }
82864+
82865+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
82866+ unsigned long address)
82867+{
82868+ return 0;
82869+}
82870 #else
82871 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
82872+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
82873 #endif
82874
82875 #ifdef __PAGETABLE_PMD_FOLDED
82876@@ -1395,8 +1380,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
82877 {
82878 return 0;
82879 }
82880+
82881+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
82882+ unsigned long address)
82883+{
82884+ return 0;
82885+}
82886 #else
82887 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
82888+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
82889 #endif
82890
82891 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
82892@@ -1414,11 +1406,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
82893 NULL: pud_offset(pgd, address);
82894 }
82895
82896+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
82897+{
82898+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
82899+ NULL: pud_offset(pgd, address);
82900+}
82901+
82902 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
82903 {
82904 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
82905 NULL: pmd_offset(pud, address);
82906 }
82907+
82908+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
82909+{
82910+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
82911+ NULL: pmd_offset(pud, address);
82912+}
82913 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
82914
82915 #if USE_SPLIT_PTE_PTLOCKS
82916@@ -1801,12 +1805,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
82917 bool *need_rmap_locks);
82918 extern void exit_mmap(struct mm_struct *);
82919
82920+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
82921+extern void gr_learn_resource(const struct task_struct *task, const int res,
82922+ const unsigned long wanted, const int gt);
82923+#else
82924+static inline void gr_learn_resource(const struct task_struct *task, const int res,
82925+ const unsigned long wanted, const int gt)
82926+{
82927+}
82928+#endif
82929+
82930 static inline int check_data_rlimit(unsigned long rlim,
82931 unsigned long new,
82932 unsigned long start,
82933 unsigned long end_data,
82934 unsigned long start_data)
82935 {
82936+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
82937 if (rlim < RLIM_INFINITY) {
82938 if (((new - start) + (end_data - start_data)) > rlim)
82939 return -ENOSPC;
82940@@ -1831,7 +1846,7 @@ extern int install_special_mapping(struct mm_struct *mm,
82941 unsigned long addr, unsigned long len,
82942 unsigned long flags, struct page **pages);
82943
82944-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
82945+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
82946
82947 extern unsigned long mmap_region(struct file *file, unsigned long addr,
82948 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
82949@@ -1839,6 +1854,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
82950 unsigned long len, unsigned long prot, unsigned long flags,
82951 unsigned long pgoff, unsigned long *populate);
82952 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
82953+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
82954
82955 #ifdef CONFIG_MMU
82956 extern int __mm_populate(unsigned long addr, unsigned long len,
82957@@ -1867,10 +1883,11 @@ struct vm_unmapped_area_info {
82958 unsigned long high_limit;
82959 unsigned long align_mask;
82960 unsigned long align_offset;
82961+ unsigned long threadstack_offset;
82962 };
82963
82964-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
82965-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
82966+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
82967+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
82968
82969 /*
82970 * Search for an unmapped address range.
82971@@ -1882,7 +1899,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
82972 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
82973 */
82974 static inline unsigned long
82975-vm_unmapped_area(struct vm_unmapped_area_info *info)
82976+vm_unmapped_area(const struct vm_unmapped_area_info *info)
82977 {
82978 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
82979 return unmapped_area(info);
82980@@ -1944,6 +1961,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
82981 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
82982 struct vm_area_struct **pprev);
82983
82984+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
82985+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
82986+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
82987+
82988 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
82989 NULL if none. Assume start_addr < end_addr. */
82990 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
82991@@ -1973,10 +1994,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
82992 }
82993
82994 #ifdef CONFIG_MMU
82995-pgprot_t vm_get_page_prot(unsigned long vm_flags);
82996+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
82997 void vma_set_page_prot(struct vm_area_struct *vma);
82998 #else
82999-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
83000+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
83001 {
83002 return __pgprot(0);
83003 }
83004@@ -2038,6 +2059,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
83005 static inline void vm_stat_account(struct mm_struct *mm,
83006 unsigned long flags, struct file *file, long pages)
83007 {
83008+
83009+#ifdef CONFIG_PAX_RANDMMAP
83010+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
83011+#endif
83012+
83013 mm->total_vm += pages;
83014 }
83015 #endif /* CONFIG_PROC_FS */
83016@@ -2126,7 +2152,7 @@ extern int unpoison_memory(unsigned long pfn);
83017 extern int sysctl_memory_failure_early_kill;
83018 extern int sysctl_memory_failure_recovery;
83019 extern void shake_page(struct page *p, int access);
83020-extern atomic_long_t num_poisoned_pages;
83021+extern atomic_long_unchecked_t num_poisoned_pages;
83022 extern int soft_offline_page(struct page *page, int flags);
83023
83024 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
83025@@ -2161,5 +2187,11 @@ void __init setup_nr_node_ids(void);
83026 static inline void setup_nr_node_ids(void) {}
83027 #endif
83028
83029+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
83030+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
83031+#else
83032+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
83033+#endif
83034+
83035 #endif /* __KERNEL__ */
83036 #endif /* _LINUX_MM_H */
83037diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
83038index 6e0b286..90d9c0d 100644
83039--- a/include/linux/mm_types.h
83040+++ b/include/linux/mm_types.h
83041@@ -308,7 +308,9 @@ struct vm_area_struct {
83042 #ifdef CONFIG_NUMA
83043 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
83044 #endif
83045-};
83046+
83047+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
83048+} __randomize_layout;
83049
83050 struct core_thread {
83051 struct task_struct *task;
83052@@ -454,7 +456,25 @@ struct mm_struct {
83053 bool tlb_flush_pending;
83054 #endif
83055 struct uprobes_state uprobes_state;
83056-};
83057+
83058+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
83059+ unsigned long pax_flags;
83060+#endif
83061+
83062+#ifdef CONFIG_PAX_DLRESOLVE
83063+ unsigned long call_dl_resolve;
83064+#endif
83065+
83066+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
83067+ unsigned long call_syscall;
83068+#endif
83069+
83070+#ifdef CONFIG_PAX_ASLR
83071+ unsigned long delta_mmap; /* randomized offset */
83072+ unsigned long delta_stack; /* randomized offset */
83073+#endif
83074+
83075+} __randomize_layout;
83076
83077 static inline void mm_init_cpumask(struct mm_struct *mm)
83078 {
83079diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
83080index c5d5278..f0b68c8 100644
83081--- a/include/linux/mmiotrace.h
83082+++ b/include/linux/mmiotrace.h
83083@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
83084 /* Called from ioremap.c */
83085 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
83086 void __iomem *addr);
83087-extern void mmiotrace_iounmap(volatile void __iomem *addr);
83088+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
83089
83090 /* For anyone to insert markers. Remember trailing newline. */
83091 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
83092@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
83093 {
83094 }
83095
83096-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
83097+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
83098 {
83099 }
83100
83101diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
83102index ffe66e3..b310722 100644
83103--- a/include/linux/mmzone.h
83104+++ b/include/linux/mmzone.h
83105@@ -527,7 +527,7 @@ struct zone {
83106
83107 ZONE_PADDING(_pad3_)
83108 /* Zone statistics */
83109- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83110+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
83111 } ____cacheline_internodealigned_in_smp;
83112
83113 enum zone_flags {
83114diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
83115index 44eeef0..a92d3f9 100644
83116--- a/include/linux/mod_devicetable.h
83117+++ b/include/linux/mod_devicetable.h
83118@@ -139,7 +139,7 @@ struct usb_device_id {
83119 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
83120 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
83121
83122-#define HID_ANY_ID (~0)
83123+#define HID_ANY_ID (~0U)
83124 #define HID_BUS_ANY 0xffff
83125 #define HID_GROUP_ANY 0x0000
83126
83127@@ -475,7 +475,7 @@ struct dmi_system_id {
83128 const char *ident;
83129 struct dmi_strmatch matches[4];
83130 void *driver_data;
83131-};
83132+} __do_const;
83133 /*
83134 * struct dmi_device_id appears during expansion of
83135 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
83136diff --git a/include/linux/module.h b/include/linux/module.h
83137index 71f282a..b2387e2 100644
83138--- a/include/linux/module.h
83139+++ b/include/linux/module.h
83140@@ -17,9 +17,11 @@
83141 #include <linux/moduleparam.h>
83142 #include <linux/jump_label.h>
83143 #include <linux/export.h>
83144+#include <linux/fs.h>
83145
83146 #include <linux/percpu.h>
83147 #include <asm/module.h>
83148+#include <asm/pgtable.h>
83149
83150 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
83151 #define MODULE_SIG_STRING "~Module signature appended~\n"
83152@@ -42,7 +44,7 @@ struct module_kobject {
83153 struct kobject *drivers_dir;
83154 struct module_param_attrs *mp;
83155 struct completion *kobj_completion;
83156-};
83157+} __randomize_layout;
83158
83159 struct module_attribute {
83160 struct attribute attr;
83161@@ -54,12 +56,13 @@ struct module_attribute {
83162 int (*test)(struct module *);
83163 void (*free)(struct module *);
83164 };
83165+typedef struct module_attribute __no_const module_attribute_no_const;
83166
83167 struct module_version_attribute {
83168 struct module_attribute mattr;
83169 const char *module_name;
83170 const char *version;
83171-} __attribute__ ((__aligned__(sizeof(void *))));
83172+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
83173
83174 extern ssize_t __modver_version_show(struct module_attribute *,
83175 struct module_kobject *, char *);
83176@@ -235,7 +238,7 @@ struct module {
83177
83178 /* Sysfs stuff. */
83179 struct module_kobject mkobj;
83180- struct module_attribute *modinfo_attrs;
83181+ module_attribute_no_const *modinfo_attrs;
83182 const char *version;
83183 const char *srcversion;
83184 struct kobject *holders_dir;
83185@@ -284,19 +287,16 @@ struct module {
83186 int (*init)(void);
83187
83188 /* If this is non-NULL, vfree after init() returns */
83189- void *module_init;
83190+ void *module_init_rx, *module_init_rw;
83191
83192 /* Here is the actual code + data, vfree'd on unload. */
83193- void *module_core;
83194+ void *module_core_rx, *module_core_rw;
83195
83196 /* Here are the sizes of the init and core sections */
83197- unsigned int init_size, core_size;
83198+ unsigned int init_size_rw, core_size_rw;
83199
83200 /* The size of the executable code in each section. */
83201- unsigned int init_text_size, core_text_size;
83202-
83203- /* Size of RO sections of the module (text+rodata) */
83204- unsigned int init_ro_size, core_ro_size;
83205+ unsigned int init_size_rx, core_size_rx;
83206
83207 /* Arch-specific module values */
83208 struct mod_arch_specific arch;
83209@@ -352,6 +352,10 @@ struct module {
83210 #ifdef CONFIG_EVENT_TRACING
83211 struct ftrace_event_call **trace_events;
83212 unsigned int num_trace_events;
83213+ struct file_operations trace_id;
83214+ struct file_operations trace_enable;
83215+ struct file_operations trace_format;
83216+ struct file_operations trace_filter;
83217 #endif
83218 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
83219 unsigned int num_ftrace_callsites;
83220@@ -375,7 +379,7 @@ struct module {
83221 ctor_fn_t *ctors;
83222 unsigned int num_ctors;
83223 #endif
83224-};
83225+} __randomize_layout;
83226 #ifndef MODULE_ARCH_INIT
83227 #define MODULE_ARCH_INIT {}
83228 #endif
83229@@ -396,18 +400,48 @@ bool is_module_address(unsigned long addr);
83230 bool is_module_percpu_address(unsigned long addr);
83231 bool is_module_text_address(unsigned long addr);
83232
83233+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
83234+{
83235+
83236+#ifdef CONFIG_PAX_KERNEXEC
83237+ if (ktla_ktva(addr) >= (unsigned long)start &&
83238+ ktla_ktva(addr) < (unsigned long)start + size)
83239+ return 1;
83240+#endif
83241+
83242+ return ((void *)addr >= start && (void *)addr < start + size);
83243+}
83244+
83245+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
83246+{
83247+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
83248+}
83249+
83250+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
83251+{
83252+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
83253+}
83254+
83255+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
83256+{
83257+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
83258+}
83259+
83260+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
83261+{
83262+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
83263+}
83264+
83265 static inline bool within_module_core(unsigned long addr,
83266 const struct module *mod)
83267 {
83268- return (unsigned long)mod->module_core <= addr &&
83269- addr < (unsigned long)mod->module_core + mod->core_size;
83270+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
83271 }
83272
83273 static inline bool within_module_init(unsigned long addr,
83274 const struct module *mod)
83275 {
83276- return (unsigned long)mod->module_init <= addr &&
83277- addr < (unsigned long)mod->module_init + mod->init_size;
83278+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
83279 }
83280
83281 static inline bool within_module(unsigned long addr, const struct module *mod)
83282diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
83283index 7eeb9bb..68f37e0 100644
83284--- a/include/linux/moduleloader.h
83285+++ b/include/linux/moduleloader.h
83286@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
83287 sections. Returns NULL on failure. */
83288 void *module_alloc(unsigned long size);
83289
83290+#ifdef CONFIG_PAX_KERNEXEC
83291+void *module_alloc_exec(unsigned long size);
83292+#else
83293+#define module_alloc_exec(x) module_alloc(x)
83294+#endif
83295+
83296 /* Free memory returned from module_alloc. */
83297 void module_free(struct module *mod, void *module_region);
83298
83299+#ifdef CONFIG_PAX_KERNEXEC
83300+void module_free_exec(struct module *mod, void *module_region);
83301+#else
83302+#define module_free_exec(x, y) module_free((x), (y))
83303+#endif
83304+
83305 /*
83306 * Apply the given relocation to the (simplified) ELF. Return -error
83307 * or 0.
83308@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
83309 unsigned int relsec,
83310 struct module *me)
83311 {
83312+#ifdef CONFIG_MODULES
83313 printk(KERN_ERR "module %s: REL relocation unsupported\n",
83314 module_name(me));
83315+#endif
83316 return -ENOEXEC;
83317 }
83318 #endif
83319@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
83320 unsigned int relsec,
83321 struct module *me)
83322 {
83323+#ifdef CONFIG_MODULES
83324 printk(KERN_ERR "module %s: REL relocation unsupported\n",
83325 module_name(me));
83326+#endif
83327 return -ENOEXEC;
83328 }
83329 #endif
83330diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
83331index 1c9effa..1160bdd 100644
83332--- a/include/linux/moduleparam.h
83333+++ b/include/linux/moduleparam.h
83334@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
83335 * @len is usually just sizeof(string).
83336 */
83337 #define module_param_string(name, string, len, perm) \
83338- static const struct kparam_string __param_string_##name \
83339+ static const struct kparam_string __param_string_##name __used \
83340 = { len, string }; \
83341 __module_param_call(MODULE_PARAM_PREFIX, name, \
83342 &param_ops_string, \
83343@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
83344 */
83345 #define module_param_array_named(name, array, type, nump, perm) \
83346 param_check_##type(name, &(array)[0]); \
83347- static const struct kparam_array __param_arr_##name \
83348+ static const struct kparam_array __param_arr_##name __used \
83349 = { .max = ARRAY_SIZE(array), .num = nump, \
83350 .ops = &param_ops_##type, \
83351 .elemsize = sizeof(array[0]), .elem = array }; \
83352diff --git a/include/linux/mount.h b/include/linux/mount.h
83353index c2c561d..a5f2a8c 100644
83354--- a/include/linux/mount.h
83355+++ b/include/linux/mount.h
83356@@ -66,7 +66,7 @@ struct vfsmount {
83357 struct dentry *mnt_root; /* root of the mounted tree */
83358 struct super_block *mnt_sb; /* pointer to superblock */
83359 int mnt_flags;
83360-};
83361+} __randomize_layout;
83362
83363 struct file; /* forward dec */
83364 struct path;
83365diff --git a/include/linux/namei.h b/include/linux/namei.h
83366index 492de72..1bddcd4 100644
83367--- a/include/linux/namei.h
83368+++ b/include/linux/namei.h
83369@@ -19,7 +19,7 @@ struct nameidata {
83370 unsigned seq, m_seq;
83371 int last_type;
83372 unsigned depth;
83373- char *saved_names[MAX_NESTED_LINKS + 1];
83374+ const char *saved_names[MAX_NESTED_LINKS + 1];
83375 };
83376
83377 /*
83378@@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
83379
83380 extern void nd_jump_link(struct nameidata *nd, struct path *path);
83381
83382-static inline void nd_set_link(struct nameidata *nd, char *path)
83383+static inline void nd_set_link(struct nameidata *nd, const char *path)
83384 {
83385 nd->saved_names[nd->depth] = path;
83386 }
83387
83388-static inline char *nd_get_link(struct nameidata *nd)
83389+static inline const char *nd_get_link(const struct nameidata *nd)
83390 {
83391 return nd->saved_names[nd->depth];
83392 }
83393diff --git a/include/linux/net.h b/include/linux/net.h
83394index 17d8339..81656c0 100644
83395--- a/include/linux/net.h
83396+++ b/include/linux/net.h
83397@@ -192,7 +192,7 @@ struct net_proto_family {
83398 int (*create)(struct net *net, struct socket *sock,
83399 int protocol, int kern);
83400 struct module *owner;
83401-};
83402+} __do_const;
83403
83404 struct iovec;
83405 struct kvec;
83406diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
83407index 74fd5d3..86a1e4f 100644
83408--- a/include/linux/netdevice.h
83409+++ b/include/linux/netdevice.h
83410@@ -1156,6 +1156,7 @@ struct net_device_ops {
83411 bool (*ndo_gso_check) (struct sk_buff *skb,
83412 struct net_device *dev);
83413 };
83414+typedef struct net_device_ops __no_const net_device_ops_no_const;
83415
83416 /**
83417 * enum net_device_priv_flags - &struct net_device priv_flags
83418@@ -1498,10 +1499,10 @@ struct net_device {
83419
83420 struct net_device_stats stats;
83421
83422- atomic_long_t rx_dropped;
83423- atomic_long_t tx_dropped;
83424+ atomic_long_unchecked_t rx_dropped;
83425+ atomic_long_unchecked_t tx_dropped;
83426
83427- atomic_t carrier_changes;
83428+ atomic_unchecked_t carrier_changes;
83429
83430 #ifdef CONFIG_WIRELESS_EXT
83431 const struct iw_handler_def * wireless_handlers;
83432diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
83433index 2517ece..0bbfcfb 100644
83434--- a/include/linux/netfilter.h
83435+++ b/include/linux/netfilter.h
83436@@ -85,7 +85,7 @@ struct nf_sockopt_ops {
83437 #endif
83438 /* Use the module struct to lock set/get code in place */
83439 struct module *owner;
83440-};
83441+} __do_const;
83442
83443 /* Function to register/unregister hook points. */
83444 int nf_register_hook(struct nf_hook_ops *reg);
83445diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
83446index e955d47..04a5338 100644
83447--- a/include/linux/netfilter/nfnetlink.h
83448+++ b/include/linux/netfilter/nfnetlink.h
83449@@ -19,7 +19,7 @@ struct nfnl_callback {
83450 const struct nlattr * const cda[]);
83451 const struct nla_policy *policy; /* netlink attribute policy */
83452 const u_int16_t attr_count; /* number of nlattr's */
83453-};
83454+} __do_const;
83455
83456 struct nfnetlink_subsystem {
83457 const char *name;
83458diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
83459new file mode 100644
83460index 0000000..33f4af8
83461--- /dev/null
83462+++ b/include/linux/netfilter/xt_gradm.h
83463@@ -0,0 +1,9 @@
83464+#ifndef _LINUX_NETFILTER_XT_GRADM_H
83465+#define _LINUX_NETFILTER_XT_GRADM_H 1
83466+
83467+struct xt_gradm_mtinfo {
83468+ __u16 flags;
83469+ __u16 invflags;
83470+};
83471+
83472+#endif
83473diff --git a/include/linux/nls.h b/include/linux/nls.h
83474index 520681b..2b7fabb 100644
83475--- a/include/linux/nls.h
83476+++ b/include/linux/nls.h
83477@@ -31,7 +31,7 @@ struct nls_table {
83478 const unsigned char *charset2upper;
83479 struct module *owner;
83480 struct nls_table *next;
83481-};
83482+} __do_const;
83483
83484 /* this value hold the maximum octet of charset */
83485 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
83486@@ -46,7 +46,7 @@ enum utf16_endian {
83487 /* nls_base.c */
83488 extern int __register_nls(struct nls_table *, struct module *);
83489 extern int unregister_nls(struct nls_table *);
83490-extern struct nls_table *load_nls(char *);
83491+extern struct nls_table *load_nls(const char *);
83492 extern void unload_nls(struct nls_table *);
83493 extern struct nls_table *load_nls_default(void);
83494 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
83495diff --git a/include/linux/notifier.h b/include/linux/notifier.h
83496index d14a4c3..a078786 100644
83497--- a/include/linux/notifier.h
83498+++ b/include/linux/notifier.h
83499@@ -54,7 +54,8 @@ struct notifier_block {
83500 notifier_fn_t notifier_call;
83501 struct notifier_block __rcu *next;
83502 int priority;
83503-};
83504+} __do_const;
83505+typedef struct notifier_block __no_const notifier_block_no_const;
83506
83507 struct atomic_notifier_head {
83508 spinlock_t lock;
83509diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
83510index b2a0f15..4d7da32 100644
83511--- a/include/linux/oprofile.h
83512+++ b/include/linux/oprofile.h
83513@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
83514 int oprofilefs_create_ro_ulong(struct dentry * root,
83515 char const * name, ulong * val);
83516
83517-/** Create a file for read-only access to an atomic_t. */
83518+/** Create a file for read-only access to an atomic_unchecked_t. */
83519 int oprofilefs_create_ro_atomic(struct dentry * root,
83520- char const * name, atomic_t * val);
83521+ char const * name, atomic_unchecked_t * val);
83522
83523 /** create a directory */
83524 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
83525diff --git a/include/linux/padata.h b/include/linux/padata.h
83526index 4386946..f50c615 100644
83527--- a/include/linux/padata.h
83528+++ b/include/linux/padata.h
83529@@ -129,7 +129,7 @@ struct parallel_data {
83530 struct padata_serial_queue __percpu *squeue;
83531 atomic_t reorder_objects;
83532 atomic_t refcnt;
83533- atomic_t seq_nr;
83534+ atomic_unchecked_t seq_nr;
83535 struct padata_cpumask cpumask;
83536 spinlock_t lock ____cacheline_aligned;
83537 unsigned int processed;
83538diff --git a/include/linux/path.h b/include/linux/path.h
83539index d137218..be0c176 100644
83540--- a/include/linux/path.h
83541+++ b/include/linux/path.h
83542@@ -1,13 +1,15 @@
83543 #ifndef _LINUX_PATH_H
83544 #define _LINUX_PATH_H
83545
83546+#include <linux/compiler.h>
83547+
83548 struct dentry;
83549 struct vfsmount;
83550
83551 struct path {
83552 struct vfsmount *mnt;
83553 struct dentry *dentry;
83554-};
83555+} __randomize_layout;
83556
83557 extern void path_get(const struct path *);
83558 extern void path_put(const struct path *);
83559diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
83560index 2706ee9..e691f7c 100644
83561--- a/include/linux/pci_hotplug.h
83562+++ b/include/linux/pci_hotplug.h
83563@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
83564 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
83565 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
83566 int (*reset_slot) (struct hotplug_slot *slot, int probe);
83567-};
83568+} __do_const;
83569+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
83570
83571 /**
83572 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
83573diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
83574index 893a0d0..d5f996e 100644
83575--- a/include/linux/perf_event.h
83576+++ b/include/linux/perf_event.h
83577@@ -341,8 +341,8 @@ struct perf_event {
83578
83579 enum perf_event_active_state state;
83580 unsigned int attach_state;
83581- local64_t count;
83582- atomic64_t child_count;
83583+ local64_t count; /* PaX: fix it one day */
83584+ atomic64_unchecked_t child_count;
83585
83586 /*
83587 * These are the total time in nanoseconds that the event
83588@@ -393,8 +393,8 @@ struct perf_event {
83589 * These accumulate total time (in nanoseconds) that children
83590 * events have been enabled and running, respectively.
83591 */
83592- atomic64_t child_total_time_enabled;
83593- atomic64_t child_total_time_running;
83594+ atomic64_unchecked_t child_total_time_enabled;
83595+ atomic64_unchecked_t child_total_time_running;
83596
83597 /*
83598 * Protect attach/detach and child_list:
83599@@ -734,7 +734,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
83600 entry->ip[entry->nr++] = ip;
83601 }
83602
83603-extern int sysctl_perf_event_paranoid;
83604+extern int sysctl_perf_event_legitimately_concerned;
83605 extern int sysctl_perf_event_mlock;
83606 extern int sysctl_perf_event_sample_rate;
83607 extern int sysctl_perf_cpu_time_max_percent;
83608@@ -749,19 +749,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
83609 loff_t *ppos);
83610
83611
83612+static inline bool perf_paranoid_any(void)
83613+{
83614+ return sysctl_perf_event_legitimately_concerned > 2;
83615+}
83616+
83617 static inline bool perf_paranoid_tracepoint_raw(void)
83618 {
83619- return sysctl_perf_event_paranoid > -1;
83620+ return sysctl_perf_event_legitimately_concerned > -1;
83621 }
83622
83623 static inline bool perf_paranoid_cpu(void)
83624 {
83625- return sysctl_perf_event_paranoid > 0;
83626+ return sysctl_perf_event_legitimately_concerned > 0;
83627 }
83628
83629 static inline bool perf_paranoid_kernel(void)
83630 {
83631- return sysctl_perf_event_paranoid > 1;
83632+ return sysctl_perf_event_legitimately_concerned > 1;
83633 }
83634
83635 extern void perf_event_init(void);
83636@@ -892,7 +897,7 @@ struct perf_pmu_events_attr {
83637 struct device_attribute attr;
83638 u64 id;
83639 const char *event_str;
83640-};
83641+} __do_const;
83642
83643 #define PMU_EVENT_ATTR(_name, _var, _id, _show) \
83644 static struct perf_pmu_events_attr _var = { \
83645diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
83646index 1997ffc..4f1f44d 100644
83647--- a/include/linux/pid_namespace.h
83648+++ b/include/linux/pid_namespace.h
83649@@ -44,7 +44,7 @@ struct pid_namespace {
83650 int hide_pid;
83651 int reboot; /* group exit code if this pidns was rebooted */
83652 unsigned int proc_inum;
83653-};
83654+} __randomize_layout;
83655
83656 extern struct pid_namespace init_pid_ns;
83657
83658diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
83659index eb8b8ac..62649e1 100644
83660--- a/include/linux/pipe_fs_i.h
83661+++ b/include/linux/pipe_fs_i.h
83662@@ -47,10 +47,10 @@ struct pipe_inode_info {
83663 struct mutex mutex;
83664 wait_queue_head_t wait;
83665 unsigned int nrbufs, curbuf, buffers;
83666- unsigned int readers;
83667- unsigned int writers;
83668- unsigned int files;
83669- unsigned int waiting_writers;
83670+ atomic_t readers;
83671+ atomic_t writers;
83672+ atomic_t files;
83673+ atomic_t waiting_writers;
83674 unsigned int r_counter;
83675 unsigned int w_counter;
83676 struct page *tmp_page;
83677diff --git a/include/linux/pm.h b/include/linux/pm.h
83678index 383fd68..7a11504 100644
83679--- a/include/linux/pm.h
83680+++ b/include/linux/pm.h
83681@@ -621,6 +621,7 @@ struct dev_pm_domain {
83682 struct dev_pm_ops ops;
83683 void (*detach)(struct device *dev, bool power_off);
83684 };
83685+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
83686
83687 /*
83688 * The PM_EVENT_ messages are also used by drivers implementing the legacy
83689diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
83690index 2e0e06d..824cc9b 100644
83691--- a/include/linux/pm_domain.h
83692+++ b/include/linux/pm_domain.h
83693@@ -36,11 +36,11 @@ struct gpd_dev_ops {
83694 int (*save_state)(struct device *dev);
83695 int (*restore_state)(struct device *dev);
83696 bool (*active_wakeup)(struct device *dev);
83697-};
83698+} __no_const;
83699
83700 struct gpd_cpuidle_data {
83701 unsigned int saved_exit_latency;
83702- struct cpuidle_state *idle_state;
83703+ cpuidle_state_no_const *idle_state;
83704 };
83705
83706 struct generic_pm_domain {
83707diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
83708index 367f49b..d2f5a14 100644
83709--- a/include/linux/pm_runtime.h
83710+++ b/include/linux/pm_runtime.h
83711@@ -125,7 +125,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
83712
83713 static inline void pm_runtime_mark_last_busy(struct device *dev)
83714 {
83715- ACCESS_ONCE(dev->power.last_busy) = jiffies;
83716+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
83717 }
83718
83719 #else /* !CONFIG_PM_RUNTIME */
83720diff --git a/include/linux/pnp.h b/include/linux/pnp.h
83721index 195aafc..49a7bc2 100644
83722--- a/include/linux/pnp.h
83723+++ b/include/linux/pnp.h
83724@@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
83725 struct pnp_fixup {
83726 char id[7];
83727 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
83728-};
83729+} __do_const;
83730
83731 /* config parameters */
83732 #define PNP_CONFIG_NORMAL 0x0001
83733diff --git a/include/linux/poison.h b/include/linux/poison.h
83734index 2110a81..13a11bb 100644
83735--- a/include/linux/poison.h
83736+++ b/include/linux/poison.h
83737@@ -19,8 +19,8 @@
83738 * under normal circumstances, used to verify that nobody uses
83739 * non-initialized list entries.
83740 */
83741-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
83742-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
83743+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
83744+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
83745
83746 /********** include/linux/timer.h **********/
83747 /*
83748diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
83749index d8b187c3..9a9257a 100644
83750--- a/include/linux/power/smartreflex.h
83751+++ b/include/linux/power/smartreflex.h
83752@@ -238,7 +238,7 @@ struct omap_sr_class_data {
83753 int (*notify)(struct omap_sr *sr, u32 status);
83754 u8 notify_flags;
83755 u8 class_type;
83756-};
83757+} __do_const;
83758
83759 /**
83760 * struct omap_sr_nvalue_table - Smartreflex n-target value info
83761diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
83762index 4ea1d37..80f4b33 100644
83763--- a/include/linux/ppp-comp.h
83764+++ b/include/linux/ppp-comp.h
83765@@ -84,7 +84,7 @@ struct compressor {
83766 struct module *owner;
83767 /* Extra skb space needed by the compressor algorithm */
83768 unsigned int comp_extra;
83769-};
83770+} __do_const;
83771
83772 /*
83773 * The return value from decompress routine is the length of the
83774diff --git a/include/linux/preempt.h b/include/linux/preempt.h
83775index de83b4e..c4b997d 100644
83776--- a/include/linux/preempt.h
83777+++ b/include/linux/preempt.h
83778@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
83779 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
83780 #endif
83781
83782+#define raw_preempt_count_add(val) __preempt_count_add(val)
83783+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
83784+
83785 #define __preempt_count_inc() __preempt_count_add(1)
83786 #define __preempt_count_dec() __preempt_count_sub(1)
83787
83788 #define preempt_count_inc() preempt_count_add(1)
83789+#define raw_preempt_count_inc() raw_preempt_count_add(1)
83790 #define preempt_count_dec() preempt_count_sub(1)
83791+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
83792
83793 #ifdef CONFIG_PREEMPT_COUNT
83794
83795@@ -41,6 +46,12 @@ do { \
83796 barrier(); \
83797 } while (0)
83798
83799+#define raw_preempt_disable() \
83800+do { \
83801+ raw_preempt_count_inc(); \
83802+ barrier(); \
83803+} while (0)
83804+
83805 #define sched_preempt_enable_no_resched() \
83806 do { \
83807 barrier(); \
83808@@ -49,6 +60,12 @@ do { \
83809
83810 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
83811
83812+#define raw_preempt_enable_no_resched() \
83813+do { \
83814+ barrier(); \
83815+ raw_preempt_count_dec(); \
83816+} while (0)
83817+
83818 #ifdef CONFIG_PREEMPT
83819 #define preempt_enable() \
83820 do { \
83821@@ -113,8 +130,10 @@ do { \
83822 * region.
83823 */
83824 #define preempt_disable() barrier()
83825+#define raw_preempt_disable() barrier()
83826 #define sched_preempt_enable_no_resched() barrier()
83827 #define preempt_enable_no_resched() barrier()
83828+#define raw_preempt_enable_no_resched() barrier()
83829 #define preempt_enable() barrier()
83830 #define preempt_check_resched() do { } while (0)
83831
83832@@ -128,11 +147,13 @@ do { \
83833 /*
83834 * Modules have no business playing preemption tricks.
83835 */
83836+#ifndef CONFIG_PAX_KERNEXEC
83837 #undef sched_preempt_enable_no_resched
83838 #undef preempt_enable_no_resched
83839 #undef preempt_enable_no_resched_notrace
83840 #undef preempt_check_resched
83841 #endif
83842+#endif
83843
83844 #define preempt_set_need_resched() \
83845 do { \
83846diff --git a/include/linux/printk.h b/include/linux/printk.h
83847index d78125f..7f36596 100644
83848--- a/include/linux/printk.h
83849+++ b/include/linux/printk.h
83850@@ -124,6 +124,8 @@ static inline __printf(1, 2) __cold
83851 void early_printk(const char *s, ...) { }
83852 #endif
83853
83854+extern int kptr_restrict;
83855+
83856 #ifdef CONFIG_PRINTK
83857 asmlinkage __printf(5, 0)
83858 int vprintk_emit(int facility, int level,
83859@@ -158,7 +160,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
83860
83861 extern int printk_delay_msec;
83862 extern int dmesg_restrict;
83863-extern int kptr_restrict;
83864
83865 extern void wake_up_klogd(void);
83866
83867diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
83868index b97bf2e..f14c92d4 100644
83869--- a/include/linux/proc_fs.h
83870+++ b/include/linux/proc_fs.h
83871@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
83872 extern struct proc_dir_entry *proc_symlink(const char *,
83873 struct proc_dir_entry *, const char *);
83874 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
83875+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
83876 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
83877 struct proc_dir_entry *, void *);
83878+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
83879+ struct proc_dir_entry *, void *);
83880 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
83881 struct proc_dir_entry *);
83882
83883@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
83884 return proc_create_data(name, mode, parent, proc_fops, NULL);
83885 }
83886
83887+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
83888+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
83889+{
83890+#ifdef CONFIG_GRKERNSEC_PROC_USER
83891+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
83892+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
83893+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
83894+#else
83895+ return proc_create_data(name, mode, parent, proc_fops, NULL);
83896+#endif
83897+}
83898+
83899+
83900 extern void proc_set_size(struct proc_dir_entry *, loff_t);
83901 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
83902 extern void *PDE_DATA(const struct inode *);
83903@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
83904 struct proc_dir_entry *parent,const char *dest) { return NULL;}
83905 static inline struct proc_dir_entry *proc_mkdir(const char *name,
83906 struct proc_dir_entry *parent) {return NULL;}
83907+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
83908+ struct proc_dir_entry *parent) { return NULL; }
83909 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
83910 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
83911+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
83912+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
83913 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
83914 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
83915 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
83916@@ -79,7 +99,7 @@ struct net;
83917 static inline struct proc_dir_entry *proc_net_mkdir(
83918 struct net *net, const char *name, struct proc_dir_entry *parent)
83919 {
83920- return proc_mkdir_data(name, 0, parent, net);
83921+ return proc_mkdir_data_restrict(name, 0, parent, net);
83922 }
83923
83924 #endif /* _LINUX_PROC_FS_H */
83925diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
83926index 34a1e10..70f6bde 100644
83927--- a/include/linux/proc_ns.h
83928+++ b/include/linux/proc_ns.h
83929@@ -14,7 +14,7 @@ struct proc_ns_operations {
83930 void (*put)(void *ns);
83931 int (*install)(struct nsproxy *nsproxy, void *ns);
83932 unsigned int (*inum)(void *ns);
83933-};
83934+} __do_const __randomize_layout;
83935
83936 struct proc_ns {
83937 void *ns;
83938diff --git a/include/linux/quota.h b/include/linux/quota.h
83939index 80d345a..9e89a9a 100644
83940--- a/include/linux/quota.h
83941+++ b/include/linux/quota.h
83942@@ -70,7 +70,7 @@ struct kqid { /* Type in which we store the quota identifier */
83943
83944 extern bool qid_eq(struct kqid left, struct kqid right);
83945 extern bool qid_lt(struct kqid left, struct kqid right);
83946-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
83947+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
83948 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
83949 extern bool qid_valid(struct kqid qid);
83950
83951diff --git a/include/linux/random.h b/include/linux/random.h
83952index b05856e..0a9f14e 100644
83953--- a/include/linux/random.h
83954+++ b/include/linux/random.h
83955@@ -9,9 +9,19 @@
83956 #include <uapi/linux/random.h>
83957
83958 extern void add_device_randomness(const void *, unsigned int);
83959+
83960+static inline void add_latent_entropy(void)
83961+{
83962+
83963+#ifdef LATENT_ENTROPY_PLUGIN
83964+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
83965+#endif
83966+
83967+}
83968+
83969 extern void add_input_randomness(unsigned int type, unsigned int code,
83970- unsigned int value);
83971-extern void add_interrupt_randomness(int irq, int irq_flags);
83972+ unsigned int value) __latent_entropy;
83973+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
83974
83975 extern void get_random_bytes(void *buf, int nbytes);
83976 extern void get_random_bytes_arch(void *buf, int nbytes);
83977@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
83978 extern const struct file_operations random_fops, urandom_fops;
83979 #endif
83980
83981-unsigned int get_random_int(void);
83982+unsigned int __intentional_overflow(-1) get_random_int(void);
83983 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
83984
83985-u32 prandom_u32(void);
83986+u32 prandom_u32(void) __intentional_overflow(-1);
83987 void prandom_bytes(void *buf, size_t nbytes);
83988 void prandom_seed(u32 seed);
83989 void prandom_reseed_late(void);
83990@@ -37,6 +47,11 @@ struct rnd_state {
83991 u32 prandom_u32_state(struct rnd_state *state);
83992 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
83993
83994+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
83995+{
83996+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
83997+}
83998+
83999 /**
84000 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
84001 * @ep_ro: right open interval endpoint
84002@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
84003 *
84004 * Returns: pseudo-random number in interval [0, ep_ro)
84005 */
84006-static inline u32 prandom_u32_max(u32 ep_ro)
84007+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
84008 {
84009 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
84010 }
84011diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
84012index 378c5ee..aa84a47 100644
84013--- a/include/linux/rbtree_augmented.h
84014+++ b/include/linux/rbtree_augmented.h
84015@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
84016 old->rbaugmented = rbcompute(old); \
84017 } \
84018 rbstatic const struct rb_augment_callbacks rbname = { \
84019- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
84020+ .propagate = rbname ## _propagate, \
84021+ .copy = rbname ## _copy, \
84022+ .rotate = rbname ## _rotate \
84023 };
84024
84025
84026diff --git a/include/linux/rculist.h b/include/linux/rculist.h
84027index 372ad5e..d4373f8 100644
84028--- a/include/linux/rculist.h
84029+++ b/include/linux/rculist.h
84030@@ -29,8 +29,8 @@
84031 */
84032 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
84033 {
84034- ACCESS_ONCE(list->next) = list;
84035- ACCESS_ONCE(list->prev) = list;
84036+ ACCESS_ONCE_RW(list->next) = list;
84037+ ACCESS_ONCE_RW(list->prev) = list;
84038 }
84039
84040 /*
84041@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
84042 struct list_head *prev, struct list_head *next);
84043 #endif
84044
84045+void __pax_list_add_rcu(struct list_head *new,
84046+ struct list_head *prev, struct list_head *next);
84047+
84048 /**
84049 * list_add_rcu - add a new entry to rcu-protected list
84050 * @new: new entry to be added
84051@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
84052 __list_add_rcu(new, head, head->next);
84053 }
84054
84055+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
84056+{
84057+ __pax_list_add_rcu(new, head, head->next);
84058+}
84059+
84060 /**
84061 * list_add_tail_rcu - add a new entry to rcu-protected list
84062 * @new: new entry to be added
84063@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
84064 __list_add_rcu(new, head->prev, head);
84065 }
84066
84067+static inline void pax_list_add_tail_rcu(struct list_head *new,
84068+ struct list_head *head)
84069+{
84070+ __pax_list_add_rcu(new, head->prev, head);
84071+}
84072+
84073 /**
84074 * list_del_rcu - deletes entry from list without re-initialization
84075 * @entry: the element to delete from the list.
84076@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
84077 entry->prev = LIST_POISON2;
84078 }
84079
84080+extern void pax_list_del_rcu(struct list_head *entry);
84081+
84082 /**
84083 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
84084 * @n: the element to delete from the hash list.
84085diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
84086index 53ff1a7..c40f0ab 100644
84087--- a/include/linux/rcupdate.h
84088+++ b/include/linux/rcupdate.h
84089@@ -332,7 +332,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
84090 #define rcu_note_voluntary_context_switch(t) \
84091 do { \
84092 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
84093- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
84094+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
84095 } while (0)
84096 #else /* #ifdef CONFIG_TASKS_RCU */
84097 #define TASKS_RCU(x) do { } while (0)
84098diff --git a/include/linux/reboot.h b/include/linux/reboot.h
84099index 67fc8fc..a90f7d8 100644
84100--- a/include/linux/reboot.h
84101+++ b/include/linux/reboot.h
84102@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
84103 */
84104
84105 extern void migrate_to_reboot_cpu(void);
84106-extern void machine_restart(char *cmd);
84107-extern void machine_halt(void);
84108-extern void machine_power_off(void);
84109+extern void machine_restart(char *cmd) __noreturn;
84110+extern void machine_halt(void) __noreturn;
84111+extern void machine_power_off(void) __noreturn;
84112
84113 extern void machine_shutdown(void);
84114 struct pt_regs;
84115@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
84116 */
84117
84118 extern void kernel_restart_prepare(char *cmd);
84119-extern void kernel_restart(char *cmd);
84120-extern void kernel_halt(void);
84121-extern void kernel_power_off(void);
84122+extern void kernel_restart(char *cmd) __noreturn;
84123+extern void kernel_halt(void) __noreturn;
84124+extern void kernel_power_off(void) __noreturn;
84125
84126 extern int C_A_D; /* for sysctl */
84127 void ctrl_alt_del(void);
84128@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
84129 * Emergency restart, callable from an interrupt handler.
84130 */
84131
84132-extern void emergency_restart(void);
84133+extern void emergency_restart(void) __noreturn;
84134 #include <asm/emergency-restart.h>
84135
84136 #endif /* _LINUX_REBOOT_H */
84137diff --git a/include/linux/regset.h b/include/linux/regset.h
84138index 8e0c9fe..ac4d221 100644
84139--- a/include/linux/regset.h
84140+++ b/include/linux/regset.h
84141@@ -161,7 +161,8 @@ struct user_regset {
84142 unsigned int align;
84143 unsigned int bias;
84144 unsigned int core_note_type;
84145-};
84146+} __do_const;
84147+typedef struct user_regset __no_const user_regset_no_const;
84148
84149 /**
84150 * struct user_regset_view - available regsets
84151diff --git a/include/linux/relay.h b/include/linux/relay.h
84152index d7c8359..818daf5 100644
84153--- a/include/linux/relay.h
84154+++ b/include/linux/relay.h
84155@@ -157,7 +157,7 @@ struct rchan_callbacks
84156 * The callback should return 0 if successful, negative if not.
84157 */
84158 int (*remove_buf_file)(struct dentry *dentry);
84159-};
84160+} __no_const;
84161
84162 /*
84163 * CONFIG_RELAY kernel API, kernel/relay.c
84164diff --git a/include/linux/rio.h b/include/linux/rio.h
84165index 6bda06f..bf39a9b 100644
84166--- a/include/linux/rio.h
84167+++ b/include/linux/rio.h
84168@@ -358,7 +358,7 @@ struct rio_ops {
84169 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
84170 u64 rstart, u32 size, u32 flags);
84171 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
84172-};
84173+} __no_const;
84174
84175 #define RIO_RESOURCE_MEM 0x00000100
84176 #define RIO_RESOURCE_DOORBELL 0x00000200
84177diff --git a/include/linux/rmap.h b/include/linux/rmap.h
84178index c0c2bce..4813524 100644
84179--- a/include/linux/rmap.h
84180+++ b/include/linux/rmap.h
84181@@ -144,8 +144,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
84182 void anon_vma_init(void); /* create anon_vma_cachep */
84183 int anon_vma_prepare(struct vm_area_struct *);
84184 void unlink_anon_vmas(struct vm_area_struct *);
84185-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
84186-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
84187+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
84188+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
84189
84190 static inline void anon_vma_merge(struct vm_area_struct *vma,
84191 struct vm_area_struct *next)
84192diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
84193index ed8f9e7..999bc96 100644
84194--- a/include/linux/scatterlist.h
84195+++ b/include/linux/scatterlist.h
84196@@ -1,6 +1,7 @@
84197 #ifndef _LINUX_SCATTERLIST_H
84198 #define _LINUX_SCATTERLIST_H
84199
84200+#include <linux/sched.h>
84201 #include <linux/string.h>
84202 #include <linux/bug.h>
84203 #include <linux/mm.h>
84204@@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
84205 #ifdef CONFIG_DEBUG_SG
84206 BUG_ON(!virt_addr_valid(buf));
84207 #endif
84208+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84209+ if (object_starts_on_stack(buf)) {
84210+ void *adjbuf = buf - current->stack + current->lowmem_stack;
84211+ sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
84212+ } else
84213+#endif
84214 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
84215 }
84216
84217diff --git a/include/linux/sched.h b/include/linux/sched.h
84218index 5e344bb..0743255 100644
84219--- a/include/linux/sched.h
84220+++ b/include/linux/sched.h
84221@@ -133,6 +133,7 @@ struct fs_struct;
84222 struct perf_event_context;
84223 struct blk_plug;
84224 struct filename;
84225+struct linux_binprm;
84226
84227 #define VMACACHE_BITS 2
84228 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
84229@@ -376,7 +377,7 @@ extern char __sched_text_start[], __sched_text_end[];
84230 extern int in_sched_functions(unsigned long addr);
84231
84232 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
84233-extern signed long schedule_timeout(signed long timeout);
84234+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
84235 extern signed long schedule_timeout_interruptible(signed long timeout);
84236 extern signed long schedule_timeout_killable(signed long timeout);
84237 extern signed long schedule_timeout_uninterruptible(signed long timeout);
84238@@ -387,6 +388,19 @@ struct nsproxy;
84239 struct user_namespace;
84240
84241 #ifdef CONFIG_MMU
84242+
84243+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
84244+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
84245+#else
84246+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
84247+{
84248+ return 0;
84249+}
84250+#endif
84251+
84252+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
84253+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
84254+
84255 extern void arch_pick_mmap_layout(struct mm_struct *mm);
84256 extern unsigned long
84257 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
84258@@ -685,6 +699,17 @@ struct signal_struct {
84259 #ifdef CONFIG_TASKSTATS
84260 struct taskstats *stats;
84261 #endif
84262+
84263+#ifdef CONFIG_GRKERNSEC
84264+ u32 curr_ip;
84265+ u32 saved_ip;
84266+ u32 gr_saddr;
84267+ u32 gr_daddr;
84268+ u16 gr_sport;
84269+ u16 gr_dport;
84270+ u8 used_accept:1;
84271+#endif
84272+
84273 #ifdef CONFIG_AUDIT
84274 unsigned audit_tty;
84275 unsigned audit_tty_log_passwd;
84276@@ -711,7 +736,7 @@ struct signal_struct {
84277 struct mutex cred_guard_mutex; /* guard against foreign influences on
84278 * credential calculations
84279 * (notably. ptrace) */
84280-};
84281+} __randomize_layout;
84282
84283 /*
84284 * Bits in flags field of signal_struct.
84285@@ -764,6 +789,14 @@ struct user_struct {
84286 struct key *session_keyring; /* UID's default session keyring */
84287 #endif
84288
84289+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
84290+ unsigned char kernel_banned;
84291+#endif
84292+#ifdef CONFIG_GRKERNSEC_BRUTE
84293+ unsigned char suid_banned;
84294+ unsigned long suid_ban_expires;
84295+#endif
84296+
84297 /* Hash table maintenance information */
84298 struct hlist_node uidhash_node;
84299 kuid_t uid;
84300@@ -771,7 +804,7 @@ struct user_struct {
84301 #ifdef CONFIG_PERF_EVENTS
84302 atomic_long_t locked_vm;
84303 #endif
84304-};
84305+} __randomize_layout;
84306
84307 extern int uids_sysfs_init(void);
84308
84309@@ -1235,6 +1268,9 @@ enum perf_event_task_context {
84310 struct task_struct {
84311 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
84312 void *stack;
84313+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84314+ void *lowmem_stack;
84315+#endif
84316 atomic_t usage;
84317 unsigned int flags; /* per process flags, defined below */
84318 unsigned int ptrace;
84319@@ -1362,8 +1398,8 @@ struct task_struct {
84320 struct list_head thread_node;
84321
84322 struct completion *vfork_done; /* for vfork() */
84323- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
84324- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
84325+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
84326+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
84327
84328 cputime_t utime, stime, utimescaled, stimescaled;
84329 cputime_t gtime;
84330@@ -1388,11 +1424,6 @@ struct task_struct {
84331 struct task_cputime cputime_expires;
84332 struct list_head cpu_timers[3];
84333
84334-/* process credentials */
84335- const struct cred __rcu *real_cred; /* objective and real subjective task
84336- * credentials (COW) */
84337- const struct cred __rcu *cred; /* effective (overridable) subjective task
84338- * credentials (COW) */
84339 char comm[TASK_COMM_LEN]; /* executable name excluding path
84340 - access with [gs]et_task_comm (which lock
84341 it with task_lock())
84342@@ -1410,6 +1441,10 @@ struct task_struct {
84343 #endif
84344 /* CPU-specific state of this task */
84345 struct thread_struct thread;
84346+/* thread_info moved to task_struct */
84347+#ifdef CONFIG_X86
84348+ struct thread_info tinfo;
84349+#endif
84350 /* filesystem information */
84351 struct fs_struct *fs;
84352 /* open file information */
84353@@ -1484,6 +1519,10 @@ struct task_struct {
84354 gfp_t lockdep_reclaim_gfp;
84355 #endif
84356
84357+/* process credentials */
84358+ const struct cred __rcu *real_cred; /* objective and real subjective task
84359+ * credentials (COW) */
84360+
84361 /* journalling filesystem info */
84362 void *journal_info;
84363
84364@@ -1522,6 +1561,10 @@ struct task_struct {
84365 /* cg_list protected by css_set_lock and tsk->alloc_lock */
84366 struct list_head cg_list;
84367 #endif
84368+
84369+ const struct cred __rcu *cred; /* effective (overridable) subjective task
84370+ * credentials (COW) */
84371+
84372 #ifdef CONFIG_FUTEX
84373 struct robust_list_head __user *robust_list;
84374 #ifdef CONFIG_COMPAT
84375@@ -1635,7 +1678,7 @@ struct task_struct {
84376 * Number of functions that haven't been traced
84377 * because of depth overrun.
84378 */
84379- atomic_t trace_overrun;
84380+ atomic_unchecked_t trace_overrun;
84381 /* Pause for the tracing */
84382 atomic_t tracing_graph_pause;
84383 #endif
84384@@ -1661,7 +1704,78 @@ struct task_struct {
84385 unsigned int sequential_io;
84386 unsigned int sequential_io_avg;
84387 #endif
84388-};
84389+
84390+#ifdef CONFIG_GRKERNSEC
84391+ /* grsecurity */
84392+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
84393+ u64 exec_id;
84394+#endif
84395+#ifdef CONFIG_GRKERNSEC_SETXID
84396+ const struct cred *delayed_cred;
84397+#endif
84398+ struct dentry *gr_chroot_dentry;
84399+ struct acl_subject_label *acl;
84400+ struct acl_subject_label *tmpacl;
84401+ struct acl_role_label *role;
84402+ struct file *exec_file;
84403+ unsigned long brute_expires;
84404+ u16 acl_role_id;
84405+ u8 inherited;
84406+ /* is this the task that authenticated to the special role */
84407+ u8 acl_sp_role;
84408+ u8 is_writable;
84409+ u8 brute;
84410+ u8 gr_is_chrooted;
84411+#endif
84412+
84413+} __randomize_layout;
84414+
84415+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
84416+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
84417+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
84418+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
84419+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
84420+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
84421+
84422+#ifdef CONFIG_PAX_SOFTMODE
84423+extern int pax_softmode;
84424+#endif
84425+
84426+extern int pax_check_flags(unsigned long *);
84427+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
84428+
84429+/* if tsk != current then task_lock must be held on it */
84430+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
84431+static inline unsigned long pax_get_flags(struct task_struct *tsk)
84432+{
84433+ if (likely(tsk->mm))
84434+ return tsk->mm->pax_flags;
84435+ else
84436+ return 0UL;
84437+}
84438+
84439+/* if tsk != current then task_lock must be held on it */
84440+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
84441+{
84442+ if (likely(tsk->mm)) {
84443+ tsk->mm->pax_flags = flags;
84444+ return 0;
84445+ }
84446+ return -EINVAL;
84447+}
84448+#endif
84449+
84450+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
84451+extern void pax_set_initial_flags(struct linux_binprm *bprm);
84452+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
84453+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
84454+#endif
84455+
84456+struct path;
84457+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
84458+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
84459+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
84460+extern void pax_report_refcount_overflow(struct pt_regs *regs);
84461
84462 /* Future-safe accessor for struct task_struct's cpus_allowed. */
84463 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
84464@@ -1743,7 +1857,7 @@ struct pid_namespace;
84465 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
84466 struct pid_namespace *ns);
84467
84468-static inline pid_t task_pid_nr(struct task_struct *tsk)
84469+static inline pid_t task_pid_nr(const struct task_struct *tsk)
84470 {
84471 return tsk->pid;
84472 }
84473@@ -2106,6 +2220,25 @@ extern u64 sched_clock_cpu(int cpu);
84474
84475 extern void sched_clock_init(void);
84476
84477+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
84478+static inline void populate_stack(void)
84479+{
84480+ struct task_struct *curtask = current;
84481+ int c;
84482+ int *ptr = curtask->stack;
84483+ int *end = curtask->stack + THREAD_SIZE;
84484+
84485+ while (ptr < end) {
84486+ c = *(volatile int *)ptr;
84487+ ptr += PAGE_SIZE/sizeof(int);
84488+ }
84489+}
84490+#else
84491+static inline void populate_stack(void)
84492+{
84493+}
84494+#endif
84495+
84496 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
84497 static inline void sched_clock_tick(void)
84498 {
84499@@ -2239,7 +2372,9 @@ void yield(void);
84500 extern struct exec_domain default_exec_domain;
84501
84502 union thread_union {
84503+#ifndef CONFIG_X86
84504 struct thread_info thread_info;
84505+#endif
84506 unsigned long stack[THREAD_SIZE/sizeof(long)];
84507 };
84508
84509@@ -2272,6 +2407,7 @@ extern struct pid_namespace init_pid_ns;
84510 */
84511
84512 extern struct task_struct *find_task_by_vpid(pid_t nr);
84513+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
84514 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
84515 struct pid_namespace *ns);
84516
84517@@ -2436,7 +2572,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
84518 extern void exit_itimers(struct signal_struct *);
84519 extern void flush_itimer_signals(void);
84520
84521-extern void do_group_exit(int);
84522+extern __noreturn void do_group_exit(int);
84523
84524 extern int do_execve(struct filename *,
84525 const char __user * const __user *,
84526@@ -2653,9 +2789,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
84527 #define task_stack_end_corrupted(task) \
84528 (*(end_of_stack(task)) != STACK_END_MAGIC)
84529
84530-static inline int object_is_on_stack(void *obj)
84531+static inline int object_starts_on_stack(const void *obj)
84532 {
84533- void *stack = task_stack_page(current);
84534+ const void *stack = task_stack_page(current);
84535
84536 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
84537 }
84538diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
84539index 596a0e0..bea77ec 100644
84540--- a/include/linux/sched/sysctl.h
84541+++ b/include/linux/sched/sysctl.h
84542@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
84543 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
84544
84545 extern int sysctl_max_map_count;
84546+extern unsigned long sysctl_heap_stack_gap;
84547
84548 extern unsigned int sysctl_sched_latency;
84549 extern unsigned int sysctl_sched_min_granularity;
84550diff --git a/include/linux/security.h b/include/linux/security.h
84551index ba96471..74fb3f6 100644
84552--- a/include/linux/security.h
84553+++ b/include/linux/security.h
84554@@ -27,6 +27,7 @@
84555 #include <linux/slab.h>
84556 #include <linux/err.h>
84557 #include <linux/string.h>
84558+#include <linux/grsecurity.h>
84559
84560 struct linux_binprm;
84561 struct cred;
84562@@ -116,8 +117,6 @@ struct seq_file;
84563
84564 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
84565
84566-void reset_security_ops(void);
84567-
84568 #ifdef CONFIG_MMU
84569 extern unsigned long mmap_min_addr;
84570 extern unsigned long dac_mmap_min_addr;
84571@@ -1729,7 +1728,7 @@ struct security_operations {
84572 struct audit_context *actx);
84573 void (*audit_rule_free) (void *lsmrule);
84574 #endif /* CONFIG_AUDIT */
84575-};
84576+} __randomize_layout;
84577
84578 /* prototypes */
84579 extern int security_init(void);
84580diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
84581index dc368b8..e895209 100644
84582--- a/include/linux/semaphore.h
84583+++ b/include/linux/semaphore.h
84584@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
84585 }
84586
84587 extern void down(struct semaphore *sem);
84588-extern int __must_check down_interruptible(struct semaphore *sem);
84589+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
84590 extern int __must_check down_killable(struct semaphore *sem);
84591 extern int __must_check down_trylock(struct semaphore *sem);
84592 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
84593diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
84594index 52e0097..383f21d 100644
84595--- a/include/linux/seq_file.h
84596+++ b/include/linux/seq_file.h
84597@@ -27,6 +27,9 @@ struct seq_file {
84598 struct mutex lock;
84599 const struct seq_operations *op;
84600 int poll_event;
84601+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
84602+ u64 exec_id;
84603+#endif
84604 #ifdef CONFIG_USER_NS
84605 struct user_namespace *user_ns;
84606 #endif
84607@@ -39,6 +42,7 @@ struct seq_operations {
84608 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
84609 int (*show) (struct seq_file *m, void *v);
84610 };
84611+typedef struct seq_operations __no_const seq_operations_no_const;
84612
84613 #define SEQ_SKIP 1
84614
84615@@ -96,6 +100,7 @@ void seq_pad(struct seq_file *m, char c);
84616
84617 char *mangle_path(char *s, const char *p, const char *esc);
84618 int seq_open(struct file *, const struct seq_operations *);
84619+int seq_open_restrict(struct file *, const struct seq_operations *);
84620 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
84621 loff_t seq_lseek(struct file *, loff_t, int);
84622 int seq_release(struct inode *, struct file *);
84623@@ -138,6 +143,7 @@ static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
84624 }
84625
84626 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
84627+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
84628 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
84629 int single_release(struct inode *, struct file *);
84630 void *__seq_open_private(struct file *, const struct seq_operations *, int);
84631diff --git a/include/linux/shm.h b/include/linux/shm.h
84632index 6fb8016..ab4465e 100644
84633--- a/include/linux/shm.h
84634+++ b/include/linux/shm.h
84635@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
84636 /* The task created the shm object. NULL if the task is dead. */
84637 struct task_struct *shm_creator;
84638 struct list_head shm_clist; /* list by creator */
84639+#ifdef CONFIG_GRKERNSEC
84640+ u64 shm_createtime;
84641+ pid_t shm_lapid;
84642+#endif
84643 };
84644
84645 /* shm_mode upper byte flags */
84646diff --git a/include/linux/signal.h b/include/linux/signal.h
84647index ab1e039..ad4229e 100644
84648--- a/include/linux/signal.h
84649+++ b/include/linux/signal.h
84650@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
84651 * know it'll be handled, so that they don't get converted to
84652 * SIGKILL or just silently dropped.
84653 */
84654- kernel_sigaction(sig, (__force __sighandler_t)2);
84655+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
84656 }
84657
84658 static inline void disallow_signal(int sig)
84659diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
84660index 6c8b6f6..5a0f4bd 100644
84661--- a/include/linux/skbuff.h
84662+++ b/include/linux/skbuff.h
84663@@ -773,7 +773,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
84664 struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
84665 int node);
84666 struct sk_buff *build_skb(void *data, unsigned int frag_size);
84667-static inline struct sk_buff *alloc_skb(unsigned int size,
84668+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
84669 gfp_t priority)
84670 {
84671 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
84672@@ -1962,7 +1962,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
84673 return skb->inner_transport_header - skb->inner_network_header;
84674 }
84675
84676-static inline int skb_network_offset(const struct sk_buff *skb)
84677+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
84678 {
84679 return skb_network_header(skb) - skb->data;
84680 }
84681@@ -2022,7 +2022,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
84682 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
84683 */
84684 #ifndef NET_SKB_PAD
84685-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
84686+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
84687 #endif
84688
84689 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
84690@@ -2629,7 +2629,7 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
84691 int *err);
84692 unsigned int datagram_poll(struct file *file, struct socket *sock,
84693 struct poll_table_struct *wait);
84694-int skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
84695+int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from, int offset,
84696 struct iovec *to, int size);
84697 int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen,
84698 struct iovec *iov);
84699@@ -3091,6 +3091,9 @@ static inline void nf_reset(struct sk_buff *skb)
84700 nf_bridge_put(skb->nf_bridge);
84701 skb->nf_bridge = NULL;
84702 #endif
84703+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
84704+ skb->nf_trace = 0;
84705+#endif
84706 }
84707
84708 static inline void nf_reset_trace(struct sk_buff *skb)
84709diff --git a/include/linux/slab.h b/include/linux/slab.h
84710index c265bec..4867d28 100644
84711--- a/include/linux/slab.h
84712+++ b/include/linux/slab.h
84713@@ -14,15 +14,29 @@
84714 #include <linux/gfp.h>
84715 #include <linux/types.h>
84716 #include <linux/workqueue.h>
84717-
84718+#include <linux/err.h>
84719
84720 /*
84721 * Flags to pass to kmem_cache_create().
84722 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
84723 */
84724 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
84725+
84726+#ifdef CONFIG_PAX_USERCOPY_SLABS
84727+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
84728+#else
84729+#define SLAB_USERCOPY 0x00000000UL
84730+#endif
84731+
84732 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
84733 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
84734+
84735+#ifdef CONFIG_PAX_MEMORY_SANITIZE
84736+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
84737+#else
84738+#define SLAB_NO_SANITIZE 0x00000000UL
84739+#endif
84740+
84741 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
84742 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
84743 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
84744@@ -98,10 +112,13 @@
84745 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
84746 * Both make kfree a no-op.
84747 */
84748-#define ZERO_SIZE_PTR ((void *)16)
84749+#define ZERO_SIZE_PTR \
84750+({ \
84751+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
84752+ (void *)(-MAX_ERRNO-1L); \
84753+})
84754
84755-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
84756- (unsigned long)ZERO_SIZE_PTR)
84757+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
84758
84759 #include <linux/kmemleak.h>
84760
84761@@ -144,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
84762 void kfree(const void *);
84763 void kzfree(const void *);
84764 size_t ksize(const void *);
84765+const char *check_heap_object(const void *ptr, unsigned long n);
84766+bool is_usercopy_object(const void *ptr);
84767
84768 /*
84769 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
84770@@ -236,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
84771 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
84772 #endif
84773
84774+#ifdef CONFIG_PAX_USERCOPY_SLABS
84775+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
84776+#endif
84777+
84778 /*
84779 * Figure out which kmalloc slab an allocation of a certain size
84780 * belongs to.
84781@@ -244,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
84782 * 2 = 120 .. 192 bytes
84783 * n = 2^(n-1) .. 2^n -1
84784 */
84785-static __always_inline int kmalloc_index(size_t size)
84786+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
84787 {
84788 if (!size)
84789 return 0;
84790@@ -287,11 +310,11 @@ static __always_inline int kmalloc_index(size_t size)
84791 }
84792 #endif /* !CONFIG_SLOB */
84793
84794-void *__kmalloc(size_t size, gfp_t flags);
84795+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
84796 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
84797
84798 #ifdef CONFIG_NUMA
84799-void *__kmalloc_node(size_t size, gfp_t flags, int node);
84800+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
84801 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
84802 #else
84803 static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
84804diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
84805index b869d16..1453c73 100644
84806--- a/include/linux/slab_def.h
84807+++ b/include/linux/slab_def.h
84808@@ -40,7 +40,7 @@ struct kmem_cache {
84809 /* 4) cache creation/removal */
84810 const char *name;
84811 struct list_head list;
84812- int refcount;
84813+ atomic_t refcount;
84814 int object_size;
84815 int align;
84816
84817@@ -56,10 +56,14 @@ struct kmem_cache {
84818 unsigned long node_allocs;
84819 unsigned long node_frees;
84820 unsigned long node_overflow;
84821- atomic_t allochit;
84822- atomic_t allocmiss;
84823- atomic_t freehit;
84824- atomic_t freemiss;
84825+ atomic_unchecked_t allochit;
84826+ atomic_unchecked_t allocmiss;
84827+ atomic_unchecked_t freehit;
84828+ atomic_unchecked_t freemiss;
84829+#ifdef CONFIG_PAX_MEMORY_SANITIZE
84830+ atomic_unchecked_t sanitized;
84831+ atomic_unchecked_t not_sanitized;
84832+#endif
84833
84834 /*
84835 * If debugging is enabled, then the allocator can add additional
84836diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
84837index d82abd4..408c3a0 100644
84838--- a/include/linux/slub_def.h
84839+++ b/include/linux/slub_def.h
84840@@ -74,7 +74,7 @@ struct kmem_cache {
84841 struct kmem_cache_order_objects max;
84842 struct kmem_cache_order_objects min;
84843 gfp_t allocflags; /* gfp flags to use on each alloc */
84844- int refcount; /* Refcount for slab cache destroy */
84845+ atomic_t refcount; /* Refcount for slab cache destroy */
84846 void (*ctor)(void *);
84847 int inuse; /* Offset to metadata */
84848 int align; /* Alignment */
84849diff --git a/include/linux/smp.h b/include/linux/smp.h
84850index 93dff5f..933c561 100644
84851--- a/include/linux/smp.h
84852+++ b/include/linux/smp.h
84853@@ -176,7 +176,9 @@ static inline void wake_up_all_idle_cpus(void) { }
84854 #endif
84855
84856 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
84857+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
84858 #define put_cpu() preempt_enable()
84859+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
84860
84861 /*
84862 * Callback to arch code if there's nosmp or maxcpus=0 on the
84863diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
84864index 46cca4c..3323536 100644
84865--- a/include/linux/sock_diag.h
84866+++ b/include/linux/sock_diag.h
84867@@ -11,7 +11,7 @@ struct sock;
84868 struct sock_diag_handler {
84869 __u8 family;
84870 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
84871-};
84872+} __do_const;
84873
84874 int sock_diag_register(const struct sock_diag_handler *h);
84875 void sock_diag_unregister(const struct sock_diag_handler *h);
84876diff --git a/include/linux/sonet.h b/include/linux/sonet.h
84877index 680f9a3..f13aeb0 100644
84878--- a/include/linux/sonet.h
84879+++ b/include/linux/sonet.h
84880@@ -7,7 +7,7 @@
84881 #include <uapi/linux/sonet.h>
84882
84883 struct k_sonet_stats {
84884-#define __HANDLE_ITEM(i) atomic_t i
84885+#define __HANDLE_ITEM(i) atomic_unchecked_t i
84886 __SONET_ITEMS
84887 #undef __HANDLE_ITEM
84888 };
84889diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
84890index 07d8e53..dc934c9 100644
84891--- a/include/linux/sunrpc/addr.h
84892+++ b/include/linux/sunrpc/addr.h
84893@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
84894 {
84895 switch (sap->sa_family) {
84896 case AF_INET:
84897- return ntohs(((struct sockaddr_in *)sap)->sin_port);
84898+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
84899 case AF_INET6:
84900- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
84901+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
84902 }
84903 return 0;
84904 }
84905@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
84906 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
84907 const struct sockaddr *src)
84908 {
84909- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
84910+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
84911 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
84912
84913 dsin->sin_family = ssin->sin_family;
84914@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
84915 if (sa->sa_family != AF_INET6)
84916 return 0;
84917
84918- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
84919+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
84920 }
84921
84922 #endif /* _LINUX_SUNRPC_ADDR_H */
84923diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
84924index 70736b9..37f33db 100644
84925--- a/include/linux/sunrpc/clnt.h
84926+++ b/include/linux/sunrpc/clnt.h
84927@@ -97,7 +97,7 @@ struct rpc_procinfo {
84928 unsigned int p_timer; /* Which RTT timer to use */
84929 u32 p_statidx; /* Which procedure to account */
84930 const char * p_name; /* name of procedure */
84931-};
84932+} __do_const;
84933
84934 #ifdef __KERNEL__
84935
84936diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
84937index 2167846..0648fc3 100644
84938--- a/include/linux/sunrpc/svc.h
84939+++ b/include/linux/sunrpc/svc.h
84940@@ -416,7 +416,7 @@ struct svc_procedure {
84941 unsigned int pc_count; /* call count */
84942 unsigned int pc_cachetype; /* cache info (NFS) */
84943 unsigned int pc_xdrressize; /* maximum size of XDR reply */
84944-};
84945+} __do_const;
84946
84947 /*
84948 * Function prototypes.
84949diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
84950index 975da75..318c083 100644
84951--- a/include/linux/sunrpc/svc_rdma.h
84952+++ b/include/linux/sunrpc/svc_rdma.h
84953@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
84954 extern unsigned int svcrdma_max_requests;
84955 extern unsigned int svcrdma_max_req_size;
84956
84957-extern atomic_t rdma_stat_recv;
84958-extern atomic_t rdma_stat_read;
84959-extern atomic_t rdma_stat_write;
84960-extern atomic_t rdma_stat_sq_starve;
84961-extern atomic_t rdma_stat_rq_starve;
84962-extern atomic_t rdma_stat_rq_poll;
84963-extern atomic_t rdma_stat_rq_prod;
84964-extern atomic_t rdma_stat_sq_poll;
84965-extern atomic_t rdma_stat_sq_prod;
84966+extern atomic_unchecked_t rdma_stat_recv;
84967+extern atomic_unchecked_t rdma_stat_read;
84968+extern atomic_unchecked_t rdma_stat_write;
84969+extern atomic_unchecked_t rdma_stat_sq_starve;
84970+extern atomic_unchecked_t rdma_stat_rq_starve;
84971+extern atomic_unchecked_t rdma_stat_rq_poll;
84972+extern atomic_unchecked_t rdma_stat_rq_prod;
84973+extern atomic_unchecked_t rdma_stat_sq_poll;
84974+extern atomic_unchecked_t rdma_stat_sq_prod;
84975
84976 #define RPCRDMA_VERSION 1
84977
84978diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
84979index 8d71d65..f79586e 100644
84980--- a/include/linux/sunrpc/svcauth.h
84981+++ b/include/linux/sunrpc/svcauth.h
84982@@ -120,7 +120,7 @@ struct auth_ops {
84983 int (*release)(struct svc_rqst *rq);
84984 void (*domain_release)(struct auth_domain *);
84985 int (*set_client)(struct svc_rqst *rq);
84986-};
84987+} __do_const;
84988
84989 #define SVC_GARBAGE 1
84990 #define SVC_SYSERR 2
84991diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
84992index e7a018e..49f8b17 100644
84993--- a/include/linux/swiotlb.h
84994+++ b/include/linux/swiotlb.h
84995@@ -60,7 +60,8 @@ extern void
84996
84997 extern void
84998 swiotlb_free_coherent(struct device *hwdev, size_t size,
84999- void *vaddr, dma_addr_t dma_handle);
85000+ void *vaddr, dma_addr_t dma_handle,
85001+ struct dma_attrs *attrs);
85002
85003 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
85004 unsigned long offset, size_t size,
85005diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
85006index bda9b81..629e06e 100644
85007--- a/include/linux/syscalls.h
85008+++ b/include/linux/syscalls.h
85009@@ -99,10 +99,16 @@ union bpf_attr;
85010 #define __MAP(n,...) __MAP##n(__VA_ARGS__)
85011
85012 #define __SC_DECL(t, a) t a
85013+#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))
85014 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
85015 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
85016 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
85017-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
85018+#define __SC_LONG(t, a) __typeof( \
85019+ __builtin_choose_expr( \
85020+ sizeof(t) > sizeof(int), \
85021+ (t) 0, \
85022+ __builtin_choose_expr(__TYPE_IS_U(t), 0UL, 0L) \
85023+ )) a
85024 #define __SC_CAST(t, a) (t) a
85025 #define __SC_ARGS(t, a) a
85026 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
85027@@ -384,11 +390,11 @@ asmlinkage long sys_sync(void);
85028 asmlinkage long sys_fsync(unsigned int fd);
85029 asmlinkage long sys_fdatasync(unsigned int fd);
85030 asmlinkage long sys_bdflush(int func, long data);
85031-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
85032- char __user *type, unsigned long flags,
85033+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
85034+ const char __user *type, unsigned long flags,
85035 void __user *data);
85036-asmlinkage long sys_umount(char __user *name, int flags);
85037-asmlinkage long sys_oldumount(char __user *name);
85038+asmlinkage long sys_umount(const char __user *name, int flags);
85039+asmlinkage long sys_oldumount(const char __user *name);
85040 asmlinkage long sys_truncate(const char __user *path, long length);
85041 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
85042 asmlinkage long sys_stat(const char __user *filename,
85043@@ -600,7 +606,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
85044 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
85045 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
85046 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
85047- struct sockaddr __user *, int);
85048+ struct sockaddr __user *, int) __intentional_overflow(0);
85049 asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
85050 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
85051 unsigned int vlen, unsigned flags);
85052diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
85053index 27b3b0b..e093dd9 100644
85054--- a/include/linux/syscore_ops.h
85055+++ b/include/linux/syscore_ops.h
85056@@ -16,7 +16,7 @@ struct syscore_ops {
85057 int (*suspend)(void);
85058 void (*resume)(void);
85059 void (*shutdown)(void);
85060-};
85061+} __do_const;
85062
85063 extern void register_syscore_ops(struct syscore_ops *ops);
85064 extern void unregister_syscore_ops(struct syscore_ops *ops);
85065diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
85066index b7361f8..341a15a 100644
85067--- a/include/linux/sysctl.h
85068+++ b/include/linux/sysctl.h
85069@@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
85070
85071 extern int proc_dostring(struct ctl_table *, int,
85072 void __user *, size_t *, loff_t *);
85073+extern int proc_dostring_modpriv(struct ctl_table *, int,
85074+ void __user *, size_t *, loff_t *);
85075 extern int proc_dointvec(struct ctl_table *, int,
85076 void __user *, size_t *, loff_t *);
85077 extern int proc_dointvec_minmax(struct ctl_table *, int,
85078@@ -113,7 +115,8 @@ struct ctl_table
85079 struct ctl_table_poll *poll;
85080 void *extra1;
85081 void *extra2;
85082-};
85083+} __do_const __randomize_layout;
85084+typedef struct ctl_table __no_const ctl_table_no_const;
85085
85086 struct ctl_node {
85087 struct rb_node node;
85088diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
85089index f97d0db..c1187dc 100644
85090--- a/include/linux/sysfs.h
85091+++ b/include/linux/sysfs.h
85092@@ -34,7 +34,8 @@ struct attribute {
85093 struct lock_class_key *key;
85094 struct lock_class_key skey;
85095 #endif
85096-};
85097+} __do_const;
85098+typedef struct attribute __no_const attribute_no_const;
85099
85100 /**
85101 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
85102@@ -63,7 +64,8 @@ struct attribute_group {
85103 struct attribute *, int);
85104 struct attribute **attrs;
85105 struct bin_attribute **bin_attrs;
85106-};
85107+} __do_const;
85108+typedef struct attribute_group __no_const attribute_group_no_const;
85109
85110 /**
85111 * Use these macros to make defining attributes easier. See include/linux/device.h
85112@@ -128,7 +130,8 @@ struct bin_attribute {
85113 char *, loff_t, size_t);
85114 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
85115 struct vm_area_struct *vma);
85116-};
85117+} __do_const;
85118+typedef struct bin_attribute __no_const bin_attribute_no_const;
85119
85120 /**
85121 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
85122diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
85123index 387fa7d..3fcde6b 100644
85124--- a/include/linux/sysrq.h
85125+++ b/include/linux/sysrq.h
85126@@ -16,6 +16,7 @@
85127
85128 #include <linux/errno.h>
85129 #include <linux/types.h>
85130+#include <linux/compiler.h>
85131
85132 /* Possible values of bitmask for enabling sysrq functions */
85133 /* 0x0001 is reserved for enable everything */
85134@@ -33,7 +34,7 @@ struct sysrq_key_op {
85135 char *help_msg;
85136 char *action_msg;
85137 int enable_mask;
85138-};
85139+} __do_const;
85140
85141 #ifdef CONFIG_MAGIC_SYSRQ
85142
85143diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
85144index ff307b5..f1a4468 100644
85145--- a/include/linux/thread_info.h
85146+++ b/include/linux/thread_info.h
85147@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
85148 #error "no set_restore_sigmask() provided and default one won't work"
85149 #endif
85150
85151+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
85152+
85153+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
85154+{
85155+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
85156+}
85157+
85158 #endif /* __KERNEL__ */
85159
85160 #endif /* _LINUX_THREAD_INFO_H */
85161diff --git a/include/linux/tty.h b/include/linux/tty.h
85162index 5171ef8..1048d83e 100644
85163--- a/include/linux/tty.h
85164+++ b/include/linux/tty.h
85165@@ -202,7 +202,7 @@ struct tty_port {
85166 const struct tty_port_operations *ops; /* Port operations */
85167 spinlock_t lock; /* Lock protecting tty field */
85168 int blocked_open; /* Waiting to open */
85169- int count; /* Usage count */
85170+ atomic_t count; /* Usage count */
85171 wait_queue_head_t open_wait; /* Open waiters */
85172 wait_queue_head_t close_wait; /* Close waiters */
85173 wait_queue_head_t delta_msr_wait; /* Modem status change */
85174@@ -290,7 +290,7 @@ struct tty_struct {
85175 /* If the tty has a pending do_SAK, queue it here - akpm */
85176 struct work_struct SAK_work;
85177 struct tty_port *port;
85178-};
85179+} __randomize_layout;
85180
85181 /* Each of a tty's open files has private_data pointing to tty_file_private */
85182 struct tty_file_private {
85183@@ -555,7 +555,7 @@ extern int tty_port_open(struct tty_port *port,
85184 struct tty_struct *tty, struct file *filp);
85185 static inline int tty_port_users(struct tty_port *port)
85186 {
85187- return port->count + port->blocked_open;
85188+ return atomic_read(&port->count) + port->blocked_open;
85189 }
85190
85191 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
85192diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
85193index 92e337c..f46757b 100644
85194--- a/include/linux/tty_driver.h
85195+++ b/include/linux/tty_driver.h
85196@@ -291,7 +291,7 @@ struct tty_operations {
85197 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
85198 #endif
85199 const struct file_operations *proc_fops;
85200-};
85201+} __do_const __randomize_layout;
85202
85203 struct tty_driver {
85204 int magic; /* magic number for this structure */
85205@@ -325,7 +325,7 @@ struct tty_driver {
85206
85207 const struct tty_operations *ops;
85208 struct list_head tty_drivers;
85209-};
85210+} __randomize_layout;
85211
85212 extern struct list_head tty_drivers;
85213
85214diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
85215index 00c9d68..bc0188b 100644
85216--- a/include/linux/tty_ldisc.h
85217+++ b/include/linux/tty_ldisc.h
85218@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
85219
85220 struct module *owner;
85221
85222- int refcount;
85223+ atomic_t refcount;
85224 };
85225
85226 struct tty_ldisc {
85227diff --git a/include/linux/types.h b/include/linux/types.h
85228index a0bb704..f511c77 100644
85229--- a/include/linux/types.h
85230+++ b/include/linux/types.h
85231@@ -177,10 +177,26 @@ typedef struct {
85232 int counter;
85233 } atomic_t;
85234
85235+#ifdef CONFIG_PAX_REFCOUNT
85236+typedef struct {
85237+ int counter;
85238+} atomic_unchecked_t;
85239+#else
85240+typedef atomic_t atomic_unchecked_t;
85241+#endif
85242+
85243 #ifdef CONFIG_64BIT
85244 typedef struct {
85245 long counter;
85246 } atomic64_t;
85247+
85248+#ifdef CONFIG_PAX_REFCOUNT
85249+typedef struct {
85250+ long counter;
85251+} atomic64_unchecked_t;
85252+#else
85253+typedef atomic64_t atomic64_unchecked_t;
85254+#endif
85255 #endif
85256
85257 struct list_head {
85258diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
85259index ecd3319..8a36ded 100644
85260--- a/include/linux/uaccess.h
85261+++ b/include/linux/uaccess.h
85262@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
85263 long ret; \
85264 mm_segment_t old_fs = get_fs(); \
85265 \
85266- set_fs(KERNEL_DS); \
85267 pagefault_disable(); \
85268- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
85269- pagefault_enable(); \
85270+ set_fs(KERNEL_DS); \
85271+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
85272 set_fs(old_fs); \
85273+ pagefault_enable(); \
85274 ret; \
85275 })
85276
85277diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
85278index 2d1f9b6..d7a9fce 100644
85279--- a/include/linux/uidgid.h
85280+++ b/include/linux/uidgid.h
85281@@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
85282
85283 #endif /* CONFIG_USER_NS */
85284
85285+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
85286+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
85287+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
85288+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
85289+
85290 #endif /* _LINUX_UIDGID_H */
85291diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
85292index baa8171..9ca98ba 100644
85293--- a/include/linux/uio_driver.h
85294+++ b/include/linux/uio_driver.h
85295@@ -67,7 +67,7 @@ struct uio_device {
85296 struct module *owner;
85297 struct device *dev;
85298 int minor;
85299- atomic_t event;
85300+ atomic_unchecked_t event;
85301 struct fasync_struct *async_queue;
85302 wait_queue_head_t wait;
85303 struct uio_info *info;
85304diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
85305index 99c1b4d..562e6f3 100644
85306--- a/include/linux/unaligned/access_ok.h
85307+++ b/include/linux/unaligned/access_ok.h
85308@@ -4,34 +4,34 @@
85309 #include <linux/kernel.h>
85310 #include <asm/byteorder.h>
85311
85312-static inline u16 get_unaligned_le16(const void *p)
85313+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
85314 {
85315- return le16_to_cpup((__le16 *)p);
85316+ return le16_to_cpup((const __le16 *)p);
85317 }
85318
85319-static inline u32 get_unaligned_le32(const void *p)
85320+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
85321 {
85322- return le32_to_cpup((__le32 *)p);
85323+ return le32_to_cpup((const __le32 *)p);
85324 }
85325
85326-static inline u64 get_unaligned_le64(const void *p)
85327+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
85328 {
85329- return le64_to_cpup((__le64 *)p);
85330+ return le64_to_cpup((const __le64 *)p);
85331 }
85332
85333-static inline u16 get_unaligned_be16(const void *p)
85334+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
85335 {
85336- return be16_to_cpup((__be16 *)p);
85337+ return be16_to_cpup((const __be16 *)p);
85338 }
85339
85340-static inline u32 get_unaligned_be32(const void *p)
85341+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
85342 {
85343- return be32_to_cpup((__be32 *)p);
85344+ return be32_to_cpup((const __be32 *)p);
85345 }
85346
85347-static inline u64 get_unaligned_be64(const void *p)
85348+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
85349 {
85350- return be64_to_cpup((__be64 *)p);
85351+ return be64_to_cpup((const __be64 *)p);
85352 }
85353
85354 static inline void put_unaligned_le16(u16 val, void *p)
85355diff --git a/include/linux/usb.h b/include/linux/usb.h
85356index 447a7e2..9cea7e9 100644
85357--- a/include/linux/usb.h
85358+++ b/include/linux/usb.h
85359@@ -571,7 +571,7 @@ struct usb_device {
85360 int maxchild;
85361
85362 u32 quirks;
85363- atomic_t urbnum;
85364+ atomic_unchecked_t urbnum;
85365
85366 unsigned long active_duration;
85367
85368@@ -1655,7 +1655,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
85369
85370 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
85371 __u8 request, __u8 requesttype, __u16 value, __u16 index,
85372- void *data, __u16 size, int timeout);
85373+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
85374 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
85375 void *data, int len, int *actual_length, int timeout);
85376 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
85377diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
85378index d5952bb..9a626d4 100644
85379--- a/include/linux/usb/renesas_usbhs.h
85380+++ b/include/linux/usb/renesas_usbhs.h
85381@@ -39,7 +39,7 @@ enum {
85382 */
85383 struct renesas_usbhs_driver_callback {
85384 int (*notify_hotplug)(struct platform_device *pdev);
85385-};
85386+} __no_const;
85387
85388 /*
85389 * callback functions for platform
85390diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
85391index e953726..8edb26a 100644
85392--- a/include/linux/user_namespace.h
85393+++ b/include/linux/user_namespace.h
85394@@ -33,7 +33,7 @@ struct user_namespace {
85395 struct key *persistent_keyring_register;
85396 struct rw_semaphore persistent_keyring_register_sem;
85397 #endif
85398-};
85399+} __randomize_layout;
85400
85401 extern struct user_namespace init_user_ns;
85402
85403diff --git a/include/linux/utsname.h b/include/linux/utsname.h
85404index 239e277..22a5cf5 100644
85405--- a/include/linux/utsname.h
85406+++ b/include/linux/utsname.h
85407@@ -24,7 +24,7 @@ struct uts_namespace {
85408 struct new_utsname name;
85409 struct user_namespace *user_ns;
85410 unsigned int proc_inum;
85411-};
85412+} __randomize_layout;
85413 extern struct uts_namespace init_uts_ns;
85414
85415 #ifdef CONFIG_UTS_NS
85416diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
85417index 6f8fbcf..4efc177 100644
85418--- a/include/linux/vermagic.h
85419+++ b/include/linux/vermagic.h
85420@@ -25,9 +25,42 @@
85421 #define MODULE_ARCH_VERMAGIC ""
85422 #endif
85423
85424+#ifdef CONFIG_PAX_REFCOUNT
85425+#define MODULE_PAX_REFCOUNT "REFCOUNT "
85426+#else
85427+#define MODULE_PAX_REFCOUNT ""
85428+#endif
85429+
85430+#ifdef CONSTIFY_PLUGIN
85431+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
85432+#else
85433+#define MODULE_CONSTIFY_PLUGIN ""
85434+#endif
85435+
85436+#ifdef STACKLEAK_PLUGIN
85437+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
85438+#else
85439+#define MODULE_STACKLEAK_PLUGIN ""
85440+#endif
85441+
85442+#ifdef RANDSTRUCT_PLUGIN
85443+#include <generated/randomize_layout_hash.h>
85444+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
85445+#else
85446+#define MODULE_RANDSTRUCT_PLUGIN
85447+#endif
85448+
85449+#ifdef CONFIG_GRKERNSEC
85450+#define MODULE_GRSEC "GRSEC "
85451+#else
85452+#define MODULE_GRSEC ""
85453+#endif
85454+
85455 #define VERMAGIC_STRING \
85456 UTS_RELEASE " " \
85457 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
85458 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
85459- MODULE_ARCH_VERMAGIC
85460+ MODULE_ARCH_VERMAGIC \
85461+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
85462+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
85463
85464diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
85465index b483abd..af305ad 100644
85466--- a/include/linux/vga_switcheroo.h
85467+++ b/include/linux/vga_switcheroo.h
85468@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
85469
85470 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
85471
85472-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
85473+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
85474 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
85475-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
85476+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
85477 #else
85478
85479 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
85480@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
85481
85482 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
85483
85484-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
85485+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
85486 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
85487-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
85488+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
85489
85490 #endif
85491 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
85492diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
85493index b87696f..1d11de7 100644
85494--- a/include/linux/vmalloc.h
85495+++ b/include/linux/vmalloc.h
85496@@ -16,6 +16,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
85497 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
85498 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
85499 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
85500+
85501+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
85502+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
85503+#endif
85504+
85505 /* bits [20..32] reserved for arch specific ioremap internals */
85506
85507 /*
85508@@ -82,6 +87,10 @@ extern void *vmap(struct page **pages, unsigned int count,
85509 unsigned long flags, pgprot_t prot);
85510 extern void vunmap(const void *addr);
85511
85512+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85513+extern void unmap_process_stacks(struct task_struct *task);
85514+#endif
85515+
85516 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
85517 unsigned long uaddr, void *kaddr,
85518 unsigned long size);
85519@@ -142,7 +151,7 @@ extern void free_vm_area(struct vm_struct *area);
85520
85521 /* for /dev/kmem */
85522 extern long vread(char *buf, char *addr, unsigned long count);
85523-extern long vwrite(char *buf, char *addr, unsigned long count);
85524+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
85525
85526 /*
85527 * Internals. Dont't use..
85528diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
85529index 82e7db7..f8ce3d0 100644
85530--- a/include/linux/vmstat.h
85531+++ b/include/linux/vmstat.h
85532@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
85533 /*
85534 * Zone based page accounting with per cpu differentials.
85535 */
85536-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
85537+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
85538
85539 static inline void zone_page_state_add(long x, struct zone *zone,
85540 enum zone_stat_item item)
85541 {
85542- atomic_long_add(x, &zone->vm_stat[item]);
85543- atomic_long_add(x, &vm_stat[item]);
85544+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
85545+ atomic_long_add_unchecked(x, &vm_stat[item]);
85546 }
85547
85548-static inline unsigned long global_page_state(enum zone_stat_item item)
85549+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
85550 {
85551- long x = atomic_long_read(&vm_stat[item]);
85552+ long x = atomic_long_read_unchecked(&vm_stat[item]);
85553 #ifdef CONFIG_SMP
85554 if (x < 0)
85555 x = 0;
85556@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
85557 return x;
85558 }
85559
85560-static inline unsigned long zone_page_state(struct zone *zone,
85561+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
85562 enum zone_stat_item item)
85563 {
85564- long x = atomic_long_read(&zone->vm_stat[item]);
85565+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
85566 #ifdef CONFIG_SMP
85567 if (x < 0)
85568 x = 0;
85569@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
85570 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
85571 enum zone_stat_item item)
85572 {
85573- long x = atomic_long_read(&zone->vm_stat[item]);
85574+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
85575
85576 #ifdef CONFIG_SMP
85577 int cpu;
85578@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
85579
85580 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
85581 {
85582- atomic_long_inc(&zone->vm_stat[item]);
85583- atomic_long_inc(&vm_stat[item]);
85584+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
85585+ atomic_long_inc_unchecked(&vm_stat[item]);
85586 }
85587
85588 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
85589 {
85590- atomic_long_dec(&zone->vm_stat[item]);
85591- atomic_long_dec(&vm_stat[item]);
85592+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
85593+ atomic_long_dec_unchecked(&vm_stat[item]);
85594 }
85595
85596 static inline void __inc_zone_page_state(struct page *page,
85597diff --git a/include/linux/xattr.h b/include/linux/xattr.h
85598index 91b0a68..0e9adf6 100644
85599--- a/include/linux/xattr.h
85600+++ b/include/linux/xattr.h
85601@@ -28,7 +28,7 @@ struct xattr_handler {
85602 size_t size, int handler_flags);
85603 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
85604 size_t size, int flags, int handler_flags);
85605-};
85606+} __do_const;
85607
85608 struct xattr {
85609 const char *name;
85610@@ -37,6 +37,9 @@ struct xattr {
85611 };
85612
85613 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
85614+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
85615+ssize_t pax_getxattr(struct dentry *, void *, size_t);
85616+#endif
85617 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
85618 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
85619 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
85620diff --git a/include/linux/zlib.h b/include/linux/zlib.h
85621index 92dbbd3..13ab0b3 100644
85622--- a/include/linux/zlib.h
85623+++ b/include/linux/zlib.h
85624@@ -31,6 +31,7 @@
85625 #define _ZLIB_H
85626
85627 #include <linux/zconf.h>
85628+#include <linux/compiler.h>
85629
85630 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
85631 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
85632@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
85633
85634 /* basic functions */
85635
85636-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
85637+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
85638 /*
85639 Returns the number of bytes that needs to be allocated for a per-
85640 stream workspace with the specified parameters. A pointer to this
85641diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
85642index eb76cfd..9fd0e7c 100644
85643--- a/include/media/v4l2-dev.h
85644+++ b/include/media/v4l2-dev.h
85645@@ -75,7 +75,7 @@ struct v4l2_file_operations {
85646 int (*mmap) (struct file *, struct vm_area_struct *);
85647 int (*open) (struct file *);
85648 int (*release) (struct file *);
85649-};
85650+} __do_const;
85651
85652 /*
85653 * Newer version of video_device, handled by videodev2.c
85654diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
85655index ffb69da..040393e 100644
85656--- a/include/media/v4l2-device.h
85657+++ b/include/media/v4l2-device.h
85658@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
85659 this function returns 0. If the name ends with a digit (e.g. cx18),
85660 then the name will be set to cx18-0 since cx180 looks really odd. */
85661 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
85662- atomic_t *instance);
85663+ atomic_unchecked_t *instance);
85664
85665 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
85666 Since the parent disappears this ensures that v4l2_dev doesn't have an
85667diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
85668index 2a25dec..bf6dd8a 100644
85669--- a/include/net/9p/transport.h
85670+++ b/include/net/9p/transport.h
85671@@ -62,7 +62,7 @@ struct p9_trans_module {
85672 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
85673 int (*zc_request)(struct p9_client *, struct p9_req_t *,
85674 char *, char *, int , int, int, int);
85675-};
85676+} __do_const;
85677
85678 void v9fs_register_trans(struct p9_trans_module *m);
85679 void v9fs_unregister_trans(struct p9_trans_module *m);
85680diff --git a/include/net/af_unix.h b/include/net/af_unix.h
85681index a175ba4..196eb8242 100644
85682--- a/include/net/af_unix.h
85683+++ b/include/net/af_unix.h
85684@@ -36,7 +36,7 @@ struct unix_skb_parms {
85685 u32 secid; /* Security ID */
85686 #endif
85687 u32 consumed;
85688-};
85689+} __randomize_layout;
85690
85691 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
85692 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
85693diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
85694index ead99f0..6263c4b 100644
85695--- a/include/net/bluetooth/l2cap.h
85696+++ b/include/net/bluetooth/l2cap.h
85697@@ -608,7 +608,7 @@ struct l2cap_ops {
85698 unsigned char *kdata,
85699 struct iovec *iov,
85700 int len);
85701-};
85702+} __do_const;
85703
85704 struct l2cap_conn {
85705 struct hci_conn *hcon;
85706diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
85707index f2ae33d..c457cf0 100644
85708--- a/include/net/caif/cfctrl.h
85709+++ b/include/net/caif/cfctrl.h
85710@@ -52,7 +52,7 @@ struct cfctrl_rsp {
85711 void (*radioset_rsp)(void);
85712 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
85713 struct cflayer *client_layer);
85714-};
85715+} __no_const;
85716
85717 /* Link Setup Parameters for CAIF-Links. */
85718 struct cfctrl_link_param {
85719@@ -101,8 +101,8 @@ struct cfctrl_request_info {
85720 struct cfctrl {
85721 struct cfsrvl serv;
85722 struct cfctrl_rsp res;
85723- atomic_t req_seq_no;
85724- atomic_t rsp_seq_no;
85725+ atomic_unchecked_t req_seq_no;
85726+ atomic_unchecked_t rsp_seq_no;
85727 struct list_head list;
85728 /* Protects from simultaneous access to first_req list */
85729 spinlock_t info_list_lock;
85730diff --git a/include/net/flow.h b/include/net/flow.h
85731index 8109a15..504466d 100644
85732--- a/include/net/flow.h
85733+++ b/include/net/flow.h
85734@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
85735
85736 void flow_cache_flush(struct net *net);
85737 void flow_cache_flush_deferred(struct net *net);
85738-extern atomic_t flow_cache_genid;
85739+extern atomic_unchecked_t flow_cache_genid;
85740
85741 #endif
85742diff --git a/include/net/genetlink.h b/include/net/genetlink.h
85743index af10c2c..a431cc5 100644
85744--- a/include/net/genetlink.h
85745+++ b/include/net/genetlink.h
85746@@ -120,7 +120,7 @@ struct genl_ops {
85747 u8 cmd;
85748 u8 internal_flags;
85749 u8 flags;
85750-};
85751+} __do_const;
85752
85753 int __genl_register_family(struct genl_family *family);
85754
85755diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
85756index 734d9b5..48a9a4b 100644
85757--- a/include/net/gro_cells.h
85758+++ b/include/net/gro_cells.h
85759@@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
85760 cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
85761
85762 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
85763- atomic_long_inc(&dev->rx_dropped);
85764+ atomic_long_inc_unchecked(&dev->rx_dropped);
85765 kfree_skb(skb);
85766 return;
85767 }
85768diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
85769index 848e85c..051c7de 100644
85770--- a/include/net/inet_connection_sock.h
85771+++ b/include/net/inet_connection_sock.h
85772@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
85773 int (*bind_conflict)(const struct sock *sk,
85774 const struct inet_bind_bucket *tb, bool relax);
85775 void (*mtu_reduced)(struct sock *sk);
85776-};
85777+} __do_const;
85778
85779 /** inet_connection_sock - INET connection oriented sock
85780 *
85781diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
85782index 80479ab..0c3f647 100644
85783--- a/include/net/inetpeer.h
85784+++ b/include/net/inetpeer.h
85785@@ -47,7 +47,7 @@ struct inet_peer {
85786 */
85787 union {
85788 struct {
85789- atomic_t rid; /* Frag reception counter */
85790+ atomic_unchecked_t rid; /* Frag reception counter */
85791 };
85792 struct rcu_head rcu;
85793 struct inet_peer *gc_next;
85794diff --git a/include/net/ip.h b/include/net/ip.h
85795index 0bb6207..a8878af 100644
85796--- a/include/net/ip.h
85797+++ b/include/net/ip.h
85798@@ -316,7 +316,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
85799 }
85800 }
85801
85802-u32 ip_idents_reserve(u32 hash, int segs);
85803+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
85804 void __ip_select_ident(struct iphdr *iph, int segs);
85805
85806 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
85807diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
85808index dc9d2a2..d985691 100644
85809--- a/include/net/ip_fib.h
85810+++ b/include/net/ip_fib.h
85811@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
85812
85813 #define FIB_RES_SADDR(net, res) \
85814 ((FIB_RES_NH(res).nh_saddr_genid == \
85815- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
85816+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
85817 FIB_RES_NH(res).nh_saddr : \
85818 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
85819 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
85820diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
85821index 615b20b..fd4cbd8 100644
85822--- a/include/net/ip_vs.h
85823+++ b/include/net/ip_vs.h
85824@@ -534,7 +534,7 @@ struct ip_vs_conn {
85825 struct ip_vs_conn *control; /* Master control connection */
85826 atomic_t n_control; /* Number of controlled ones */
85827 struct ip_vs_dest *dest; /* real server */
85828- atomic_t in_pkts; /* incoming packet counter */
85829+ atomic_unchecked_t in_pkts; /* incoming packet counter */
85830
85831 /* Packet transmitter for different forwarding methods. If it
85832 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
85833@@ -682,7 +682,7 @@ struct ip_vs_dest {
85834 __be16 port; /* port number of the server */
85835 union nf_inet_addr addr; /* IP address of the server */
85836 volatile unsigned int flags; /* dest status flags */
85837- atomic_t conn_flags; /* flags to copy to conn */
85838+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
85839 atomic_t weight; /* server weight */
85840
85841 atomic_t refcnt; /* reference counter */
85842@@ -928,11 +928,11 @@ struct netns_ipvs {
85843 /* ip_vs_lblc */
85844 int sysctl_lblc_expiration;
85845 struct ctl_table_header *lblc_ctl_header;
85846- struct ctl_table *lblc_ctl_table;
85847+ ctl_table_no_const *lblc_ctl_table;
85848 /* ip_vs_lblcr */
85849 int sysctl_lblcr_expiration;
85850 struct ctl_table_header *lblcr_ctl_header;
85851- struct ctl_table *lblcr_ctl_table;
85852+ ctl_table_no_const *lblcr_ctl_table;
85853 /* ip_vs_est */
85854 struct list_head est_list; /* estimator list */
85855 spinlock_t est_lock;
85856diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
85857index 8d4f588..2e37ad2 100644
85858--- a/include/net/irda/ircomm_tty.h
85859+++ b/include/net/irda/ircomm_tty.h
85860@@ -33,6 +33,7 @@
85861 #include <linux/termios.h>
85862 #include <linux/timer.h>
85863 #include <linux/tty.h> /* struct tty_struct */
85864+#include <asm/local.h>
85865
85866 #include <net/irda/irias_object.h>
85867 #include <net/irda/ircomm_core.h>
85868diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
85869index 714cc9a..ea05f3e 100644
85870--- a/include/net/iucv/af_iucv.h
85871+++ b/include/net/iucv/af_iucv.h
85872@@ -149,7 +149,7 @@ struct iucv_skb_cb {
85873 struct iucv_sock_list {
85874 struct hlist_head head;
85875 rwlock_t lock;
85876- atomic_t autobind_name;
85877+ atomic_unchecked_t autobind_name;
85878 };
85879
85880 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
85881diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
85882index f3be818..bf46196 100644
85883--- a/include/net/llc_c_ac.h
85884+++ b/include/net/llc_c_ac.h
85885@@ -87,7 +87,7 @@
85886 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
85887 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
85888
85889-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
85890+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
85891
85892 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
85893 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
85894diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
85895index 3948cf1..83b28c4 100644
85896--- a/include/net/llc_c_ev.h
85897+++ b/include/net/llc_c_ev.h
85898@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
85899 return (struct llc_conn_state_ev *)skb->cb;
85900 }
85901
85902-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
85903-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
85904+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
85905+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
85906
85907 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
85908 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
85909diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
85910index 0e79cfb..f46db31 100644
85911--- a/include/net/llc_c_st.h
85912+++ b/include/net/llc_c_st.h
85913@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
85914 u8 next_state;
85915 llc_conn_ev_qfyr_t *ev_qualifiers;
85916 llc_conn_action_t *ev_actions;
85917-};
85918+} __do_const;
85919
85920 struct llc_conn_state {
85921 u8 current_state;
85922diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
85923index a61b98c..aade1eb 100644
85924--- a/include/net/llc_s_ac.h
85925+++ b/include/net/llc_s_ac.h
85926@@ -23,7 +23,7 @@
85927 #define SAP_ACT_TEST_IND 9
85928
85929 /* All action functions must look like this */
85930-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
85931+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
85932
85933 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
85934 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
85935diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
85936index 567c681..cd73ac02 100644
85937--- a/include/net/llc_s_st.h
85938+++ b/include/net/llc_s_st.h
85939@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
85940 llc_sap_ev_t ev;
85941 u8 next_state;
85942 llc_sap_action_t *ev_actions;
85943-};
85944+} __do_const;
85945
85946 struct llc_sap_state {
85947 u8 curr_state;
85948diff --git a/include/net/mac80211.h b/include/net/mac80211.h
85949index 0ad1f47..aaea45b 100644
85950--- a/include/net/mac80211.h
85951+++ b/include/net/mac80211.h
85952@@ -4648,7 +4648,7 @@ struct rate_control_ops {
85953 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
85954
85955 u32 (*get_expected_throughput)(void *priv_sta);
85956-};
85957+} __do_const;
85958
85959 static inline int rate_supported(struct ieee80211_sta *sta,
85960 enum ieee80211_band band,
85961diff --git a/include/net/neighbour.h b/include/net/neighbour.h
85962index f60558d..e5ed9bd 100644
85963--- a/include/net/neighbour.h
85964+++ b/include/net/neighbour.h
85965@@ -163,7 +163,7 @@ struct neigh_ops {
85966 void (*error_report)(struct neighbour *, struct sk_buff *);
85967 int (*output)(struct neighbour *, struct sk_buff *);
85968 int (*connected_output)(struct neighbour *, struct sk_buff *);
85969-};
85970+} __do_const;
85971
85972 struct pneigh_entry {
85973 struct pneigh_entry *next;
85974@@ -217,7 +217,7 @@ struct neigh_table {
85975 struct neigh_statistics __percpu *stats;
85976 struct neigh_hash_table __rcu *nht;
85977 struct pneigh_entry **phash_buckets;
85978-};
85979+} __randomize_layout;
85980
85981 static inline int neigh_parms_family(struct neigh_parms *p)
85982 {
85983diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
85984index e0d6466..e2f3003 100644
85985--- a/include/net/net_namespace.h
85986+++ b/include/net/net_namespace.h
85987@@ -129,8 +129,8 @@ struct net {
85988 struct netns_ipvs *ipvs;
85989 #endif
85990 struct sock *diag_nlsk;
85991- atomic_t fnhe_genid;
85992-};
85993+ atomic_unchecked_t fnhe_genid;
85994+} __randomize_layout;
85995
85996 #include <linux/seq_file_net.h>
85997
85998@@ -286,7 +286,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
85999 #define __net_init __init
86000 #define __net_exit __exit_refok
86001 #define __net_initdata __initdata
86002+#ifdef CONSTIFY_PLUGIN
86003 #define __net_initconst __initconst
86004+#else
86005+#define __net_initconst __initdata
86006+#endif
86007 #endif
86008
86009 struct pernet_operations {
86010@@ -296,7 +300,7 @@ struct pernet_operations {
86011 void (*exit_batch)(struct list_head *net_exit_list);
86012 int *id;
86013 size_t size;
86014-};
86015+} __do_const;
86016
86017 /*
86018 * Use these carefully. If you implement a network device and it
86019@@ -344,12 +348,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
86020
86021 static inline int rt_genid_ipv4(struct net *net)
86022 {
86023- return atomic_read(&net->ipv4.rt_genid);
86024+ return atomic_read_unchecked(&net->ipv4.rt_genid);
86025 }
86026
86027 static inline void rt_genid_bump_ipv4(struct net *net)
86028 {
86029- atomic_inc(&net->ipv4.rt_genid);
86030+ atomic_inc_unchecked(&net->ipv4.rt_genid);
86031 }
86032
86033 extern void (*__fib6_flush_trees)(struct net *net);
86034@@ -376,12 +380,12 @@ static inline void rt_genid_bump_all(struct net *net)
86035
86036 static inline int fnhe_genid(struct net *net)
86037 {
86038- return atomic_read(&net->fnhe_genid);
86039+ return atomic_read_unchecked(&net->fnhe_genid);
86040 }
86041
86042 static inline void fnhe_genid_bump(struct net *net)
86043 {
86044- atomic_inc(&net->fnhe_genid);
86045+ atomic_inc_unchecked(&net->fnhe_genid);
86046 }
86047
86048 #endif /* __NET_NET_NAMESPACE_H */
86049diff --git a/include/net/netlink.h b/include/net/netlink.h
86050index 7b903e1..ad9ca4b 100644
86051--- a/include/net/netlink.h
86052+++ b/include/net/netlink.h
86053@@ -521,7 +521,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
86054 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
86055 {
86056 if (mark)
86057- skb_trim(skb, (unsigned char *) mark - skb->data);
86058+ skb_trim(skb, (const unsigned char *) mark - skb->data);
86059 }
86060
86061 /**
86062diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
86063index 29d6a94..235d3d84 100644
86064--- a/include/net/netns/conntrack.h
86065+++ b/include/net/netns/conntrack.h
86066@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
86067 struct nf_proto_net {
86068 #ifdef CONFIG_SYSCTL
86069 struct ctl_table_header *ctl_table_header;
86070- struct ctl_table *ctl_table;
86071+ ctl_table_no_const *ctl_table;
86072 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
86073 struct ctl_table_header *ctl_compat_header;
86074- struct ctl_table *ctl_compat_table;
86075+ ctl_table_no_const *ctl_compat_table;
86076 #endif
86077 #endif
86078 unsigned int users;
86079@@ -60,7 +60,7 @@ struct nf_ip_net {
86080 struct nf_icmp_net icmpv6;
86081 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
86082 struct ctl_table_header *ctl_table_header;
86083- struct ctl_table *ctl_table;
86084+ ctl_table_no_const *ctl_table;
86085 #endif
86086 };
86087
86088diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
86089index 24945ce..f19e42f 100644
86090--- a/include/net/netns/ipv4.h
86091+++ b/include/net/netns/ipv4.h
86092@@ -83,7 +83,7 @@ struct netns_ipv4 {
86093
86094 struct ping_group_range ping_group_range;
86095
86096- atomic_t dev_addr_genid;
86097+ atomic_unchecked_t dev_addr_genid;
86098
86099 #ifdef CONFIG_SYSCTL
86100 unsigned long *sysctl_local_reserved_ports;
86101@@ -97,6 +97,6 @@ struct netns_ipv4 {
86102 struct fib_rules_ops *mr_rules_ops;
86103 #endif
86104 #endif
86105- atomic_t rt_genid;
86106+ atomic_unchecked_t rt_genid;
86107 };
86108 #endif
86109diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
86110index 69ae41f..4f94868 100644
86111--- a/include/net/netns/ipv6.h
86112+++ b/include/net/netns/ipv6.h
86113@@ -75,8 +75,8 @@ struct netns_ipv6 {
86114 struct fib_rules_ops *mr6_rules_ops;
86115 #endif
86116 #endif
86117- atomic_t dev_addr_genid;
86118- atomic_t fib6_sernum;
86119+ atomic_unchecked_t dev_addr_genid;
86120+ atomic_unchecked_t fib6_sernum;
86121 };
86122
86123 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
86124diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
86125index 9da7982..099321b9 100644
86126--- a/include/net/netns/xfrm.h
86127+++ b/include/net/netns/xfrm.h
86128@@ -78,7 +78,7 @@ struct netns_xfrm {
86129
86130 /* flow cache part */
86131 struct flow_cache flow_cache_global;
86132- atomic_t flow_cache_genid;
86133+ atomic_unchecked_t flow_cache_genid;
86134 struct list_head flow_cache_gc_list;
86135 spinlock_t flow_cache_gc_lock;
86136 struct work_struct flow_cache_gc_work;
86137diff --git a/include/net/ping.h b/include/net/ping.h
86138index 026479b..d9b2829 100644
86139--- a/include/net/ping.h
86140+++ b/include/net/ping.h
86141@@ -54,7 +54,7 @@ struct ping_iter_state {
86142
86143 extern struct proto ping_prot;
86144 #if IS_ENABLED(CONFIG_IPV6)
86145-extern struct pingv6_ops pingv6_ops;
86146+extern struct pingv6_ops *pingv6_ops;
86147 #endif
86148
86149 struct pingfakehdr {
86150diff --git a/include/net/protocol.h b/include/net/protocol.h
86151index d6fcc1f..ca277058 100644
86152--- a/include/net/protocol.h
86153+++ b/include/net/protocol.h
86154@@ -49,7 +49,7 @@ struct net_protocol {
86155 * socket lookup?
86156 */
86157 icmp_strict_tag_validation:1;
86158-};
86159+} __do_const;
86160
86161 #if IS_ENABLED(CONFIG_IPV6)
86162 struct inet6_protocol {
86163@@ -62,7 +62,7 @@ struct inet6_protocol {
86164 u8 type, u8 code, int offset,
86165 __be32 info);
86166 unsigned int flags; /* INET6_PROTO_xxx */
86167-};
86168+} __do_const;
86169
86170 #define INET6_PROTO_NOPOLICY 0x1
86171 #define INET6_PROTO_FINAL 0x2
86172diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
86173index e21b9f9..0191ef0 100644
86174--- a/include/net/rtnetlink.h
86175+++ b/include/net/rtnetlink.h
86176@@ -93,7 +93,7 @@ struct rtnl_link_ops {
86177 int (*fill_slave_info)(struct sk_buff *skb,
86178 const struct net_device *dev,
86179 const struct net_device *slave_dev);
86180-};
86181+} __do_const;
86182
86183 int __rtnl_link_register(struct rtnl_link_ops *ops);
86184 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
86185diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
86186index 4a5b9a3..ca27d73 100644
86187--- a/include/net/sctp/checksum.h
86188+++ b/include/net/sctp/checksum.h
86189@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
86190 unsigned int offset)
86191 {
86192 struct sctphdr *sh = sctp_hdr(skb);
86193- __le32 ret, old = sh->checksum;
86194- const struct skb_checksum_ops ops = {
86195+ __le32 ret, old = sh->checksum;
86196+ static const struct skb_checksum_ops ops = {
86197 .update = sctp_csum_update,
86198 .combine = sctp_csum_combine,
86199 };
86200diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
86201index 72a31db..aaa63d9 100644
86202--- a/include/net/sctp/sm.h
86203+++ b/include/net/sctp/sm.h
86204@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
86205 typedef struct {
86206 sctp_state_fn_t *fn;
86207 const char *name;
86208-} sctp_sm_table_entry_t;
86209+} __do_const sctp_sm_table_entry_t;
86210
86211 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
86212 * currently in use.
86213@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
86214 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
86215
86216 /* Extern declarations for major data structures. */
86217-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
86218+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
86219
86220
86221 /* Get the size of a DATA chunk payload. */
86222diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
86223index 4ff3f67..89ae38e 100644
86224--- a/include/net/sctp/structs.h
86225+++ b/include/net/sctp/structs.h
86226@@ -509,7 +509,7 @@ struct sctp_pf {
86227 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
86228 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
86229 struct sctp_af *af;
86230-};
86231+} __do_const;
86232
86233
86234 /* Structure to track chunk fragments that have been acked, but peer
86235diff --git a/include/net/sock.h b/include/net/sock.h
86236index 7db3db1..a915cca 100644
86237--- a/include/net/sock.h
86238+++ b/include/net/sock.h
86239@@ -355,7 +355,7 @@ struct sock {
86240 unsigned int sk_napi_id;
86241 unsigned int sk_ll_usec;
86242 #endif
86243- atomic_t sk_drops;
86244+ atomic_unchecked_t sk_drops;
86245 int sk_rcvbuf;
86246
86247 struct sk_filter __rcu *sk_filter;
86248@@ -1048,7 +1048,7 @@ struct proto {
86249 void (*destroy_cgroup)(struct mem_cgroup *memcg);
86250 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
86251 #endif
86252-};
86253+} __randomize_layout;
86254
86255 /*
86256 * Bits in struct cg_proto.flags
86257@@ -1235,7 +1235,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
86258 return ret >> PAGE_SHIFT;
86259 }
86260
86261-static inline long
86262+static inline long __intentional_overflow(-1)
86263 sk_memory_allocated(const struct sock *sk)
86264 {
86265 struct proto *prot = sk->sk_prot;
86266@@ -1380,7 +1380,7 @@ struct sock_iocb {
86267 struct scm_cookie *scm;
86268 struct msghdr *msg, async_msg;
86269 struct kiocb *kiocb;
86270-};
86271+} __randomize_layout;
86272
86273 static inline struct sock_iocb *kiocb_to_siocb(struct kiocb *iocb)
86274 {
86275@@ -1820,7 +1820,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
86276 }
86277
86278 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
86279- char __user *from, char *to,
86280+ char __user *from, unsigned char *to,
86281 int copy, int offset)
86282 {
86283 if (skb->ip_summed == CHECKSUM_NONE) {
86284@@ -2092,7 +2092,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
86285 }
86286 }
86287
86288-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
86289+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
86290
86291 /**
86292 * sk_page_frag - return an appropriate page_frag
86293diff --git a/include/net/tcp.h b/include/net/tcp.h
86294index 4062b4f..9ff45e7 100644
86295--- a/include/net/tcp.h
86296+++ b/include/net/tcp.h
86297@@ -519,7 +519,7 @@ void tcp_retransmit_timer(struct sock *sk);
86298 void tcp_xmit_retransmit_queue(struct sock *);
86299 void tcp_simple_retransmit(struct sock *);
86300 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
86301-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
86302+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
86303
86304 void tcp_send_probe0(struct sock *);
86305 void tcp_send_partial(struct sock *);
86306@@ -692,8 +692,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
86307 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
86308 */
86309 struct tcp_skb_cb {
86310- __u32 seq; /* Starting sequence number */
86311- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
86312+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
86313+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
86314 union {
86315 /* Note : tcp_tw_isn is used in input path only
86316 * (isn chosen by tcp_timewait_state_process())
86317@@ -718,7 +718,7 @@ struct tcp_skb_cb {
86318
86319 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
86320 /* 1 byte hole */
86321- __u32 ack_seq; /* Sequence number ACK'd */
86322+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
86323 union {
86324 struct inet_skb_parm h4;
86325 #if IS_ENABLED(CONFIG_IPV6)
86326diff --git a/include/net/xfrm.h b/include/net/xfrm.h
86327index dc4865e..152ee4c 100644
86328--- a/include/net/xfrm.h
86329+++ b/include/net/xfrm.h
86330@@ -285,7 +285,6 @@ struct xfrm_dst;
86331 struct xfrm_policy_afinfo {
86332 unsigned short family;
86333 struct dst_ops *dst_ops;
86334- void (*garbage_collect)(struct net *net);
86335 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
86336 const xfrm_address_t *saddr,
86337 const xfrm_address_t *daddr);
86338@@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
86339 struct net_device *dev,
86340 const struct flowi *fl);
86341 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
86342-};
86343+} __do_const;
86344
86345 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
86346 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
86347@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
86348 int (*transport_finish)(struct sk_buff *skb,
86349 int async);
86350 void (*local_error)(struct sk_buff *skb, u32 mtu);
86351-};
86352+} __do_const;
86353
86354 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
86355 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
86356@@ -437,7 +436,7 @@ struct xfrm_mode {
86357 struct module *owner;
86358 unsigned int encap;
86359 int flags;
86360-};
86361+} __do_const;
86362
86363 /* Flags for xfrm_mode. */
86364 enum {
86365@@ -534,7 +533,7 @@ struct xfrm_policy {
86366 struct timer_list timer;
86367
86368 struct flow_cache_object flo;
86369- atomic_t genid;
86370+ atomic_unchecked_t genid;
86371 u32 priority;
86372 u32 index;
86373 struct xfrm_mark mark;
86374@@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
86375 }
86376
86377 void xfrm_garbage_collect(struct net *net);
86378+void xfrm_garbage_collect_deferred(struct net *net);
86379
86380 #else
86381
86382@@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
86383 static inline void xfrm_garbage_collect(struct net *net)
86384 {
86385 }
86386+static inline void xfrm_garbage_collect_deferred(struct net *net)
86387+{
86388+}
86389 #endif
86390
86391 static __inline__
86392diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
86393index 1017e0b..227aa4d 100644
86394--- a/include/rdma/iw_cm.h
86395+++ b/include/rdma/iw_cm.h
86396@@ -122,7 +122,7 @@ struct iw_cm_verbs {
86397 int backlog);
86398
86399 int (*destroy_listen)(struct iw_cm_id *cm_id);
86400-};
86401+} __no_const;
86402
86403 /**
86404 * iw_create_cm_id - Create an IW CM identifier.
86405diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
86406index 52beadf..598734c 100644
86407--- a/include/scsi/libfc.h
86408+++ b/include/scsi/libfc.h
86409@@ -771,6 +771,7 @@ struct libfc_function_template {
86410 */
86411 void (*disc_stop_final) (struct fc_lport *);
86412 };
86413+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
86414
86415 /**
86416 * struct fc_disc - Discovery context
86417@@ -875,7 +876,7 @@ struct fc_lport {
86418 struct fc_vport *vport;
86419
86420 /* Operational Information */
86421- struct libfc_function_template tt;
86422+ libfc_function_template_no_const tt;
86423 u8 link_up;
86424 u8 qfull;
86425 enum fc_lport_state state;
86426diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
86427index 27ecee7..5f42632 100644
86428--- a/include/scsi/scsi_device.h
86429+++ b/include/scsi/scsi_device.h
86430@@ -186,9 +186,9 @@ struct scsi_device {
86431 unsigned int max_device_blocked; /* what device_blocked counts down from */
86432 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
86433
86434- atomic_t iorequest_cnt;
86435- atomic_t iodone_cnt;
86436- atomic_t ioerr_cnt;
86437+ atomic_unchecked_t iorequest_cnt;
86438+ atomic_unchecked_t iodone_cnt;
86439+ atomic_unchecked_t ioerr_cnt;
86440
86441 struct device sdev_gendev,
86442 sdev_dev;
86443diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
86444index 007a0bc..7188db8 100644
86445--- a/include/scsi/scsi_transport_fc.h
86446+++ b/include/scsi/scsi_transport_fc.h
86447@@ -756,7 +756,8 @@ struct fc_function_template {
86448 unsigned long show_host_system_hostname:1;
86449
86450 unsigned long disable_target_scan:1;
86451-};
86452+} __do_const;
86453+typedef struct fc_function_template __no_const fc_function_template_no_const;
86454
86455
86456 /**
86457diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
86458index ae6c3b8..fd748ac 100644
86459--- a/include/sound/compress_driver.h
86460+++ b/include/sound/compress_driver.h
86461@@ -128,7 +128,7 @@ struct snd_compr_ops {
86462 struct snd_compr_caps *caps);
86463 int (*get_codec_caps) (struct snd_compr_stream *stream,
86464 struct snd_compr_codec_caps *codec);
86465-};
86466+} __no_const;
86467
86468 /**
86469 * struct snd_compr: Compressed device
86470diff --git a/include/sound/soc.h b/include/sound/soc.h
86471index 7ba7130..d46594d 100644
86472--- a/include/sound/soc.h
86473+++ b/include/sound/soc.h
86474@@ -853,7 +853,7 @@ struct snd_soc_codec_driver {
86475 enum snd_soc_dapm_type, int);
86476
86477 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
86478-};
86479+} __do_const;
86480
86481 /* SoC platform interface */
86482 struct snd_soc_platform_driver {
86483@@ -882,7 +882,7 @@ struct snd_soc_platform_driver {
86484 const struct snd_compr_ops *compr_ops;
86485
86486 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
86487-};
86488+} __do_const;
86489
86490 struct snd_soc_dai_link_component {
86491 const char *name;
86492diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
86493index 23c518a..d6ef510 100644
86494--- a/include/target/target_core_base.h
86495+++ b/include/target/target_core_base.h
86496@@ -764,7 +764,7 @@ struct se_device {
86497 atomic_long_t write_bytes;
86498 /* Active commands on this virtual SE device */
86499 atomic_t simple_cmds;
86500- atomic_t dev_ordered_id;
86501+ atomic_unchecked_t dev_ordered_id;
86502 atomic_t dev_ordered_sync;
86503 atomic_t dev_qf_count;
86504 int export_count;
86505diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
86506new file mode 100644
86507index 0000000..fb634b7
86508--- /dev/null
86509+++ b/include/trace/events/fs.h
86510@@ -0,0 +1,53 @@
86511+#undef TRACE_SYSTEM
86512+#define TRACE_SYSTEM fs
86513+
86514+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
86515+#define _TRACE_FS_H
86516+
86517+#include <linux/fs.h>
86518+#include <linux/tracepoint.h>
86519+
86520+TRACE_EVENT(do_sys_open,
86521+
86522+ TP_PROTO(const char *filename, int flags, int mode),
86523+
86524+ TP_ARGS(filename, flags, mode),
86525+
86526+ TP_STRUCT__entry(
86527+ __string( filename, filename )
86528+ __field( int, flags )
86529+ __field( int, mode )
86530+ ),
86531+
86532+ TP_fast_assign(
86533+ __assign_str(filename, filename);
86534+ __entry->flags = flags;
86535+ __entry->mode = mode;
86536+ ),
86537+
86538+ TP_printk("\"%s\" %x %o",
86539+ __get_str(filename), __entry->flags, __entry->mode)
86540+);
86541+
86542+TRACE_EVENT(open_exec,
86543+
86544+ TP_PROTO(const char *filename),
86545+
86546+ TP_ARGS(filename),
86547+
86548+ TP_STRUCT__entry(
86549+ __string( filename, filename )
86550+ ),
86551+
86552+ TP_fast_assign(
86553+ __assign_str(filename, filename);
86554+ ),
86555+
86556+ TP_printk("\"%s\"",
86557+ __get_str(filename))
86558+);
86559+
86560+#endif /* _TRACE_FS_H */
86561+
86562+/* This part must be outside protection */
86563+#include <trace/define_trace.h>
86564diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
86565index 3608beb..df39d8a 100644
86566--- a/include/trace/events/irq.h
86567+++ b/include/trace/events/irq.h
86568@@ -36,7 +36,7 @@ struct softirq_action;
86569 */
86570 TRACE_EVENT(irq_handler_entry,
86571
86572- TP_PROTO(int irq, struct irqaction *action),
86573+ TP_PROTO(int irq, const struct irqaction *action),
86574
86575 TP_ARGS(irq, action),
86576
86577@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
86578 */
86579 TRACE_EVENT(irq_handler_exit,
86580
86581- TP_PROTO(int irq, struct irqaction *action, int ret),
86582+ TP_PROTO(int irq, const struct irqaction *action, int ret),
86583
86584 TP_ARGS(irq, action, ret),
86585
86586diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
86587index 7caf44c..23c6f27 100644
86588--- a/include/uapi/linux/a.out.h
86589+++ b/include/uapi/linux/a.out.h
86590@@ -39,6 +39,14 @@ enum machine_type {
86591 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
86592 };
86593
86594+/* Constants for the N_FLAGS field */
86595+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
86596+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
86597+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
86598+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
86599+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
86600+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
86601+
86602 #if !defined (N_MAGIC)
86603 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
86604 #endif
86605diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
86606index 22b6ad3..aeba37e 100644
86607--- a/include/uapi/linux/bcache.h
86608+++ b/include/uapi/linux/bcache.h
86609@@ -5,6 +5,7 @@
86610 * Bcache on disk data structures
86611 */
86612
86613+#include <linux/compiler.h>
86614 #include <asm/types.h>
86615
86616 #define BITMASK(name, type, field, offset, size) \
86617@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
86618 /* Btree keys - all units are in sectors */
86619
86620 struct bkey {
86621- __u64 high;
86622- __u64 low;
86623+ __u64 high __intentional_overflow(-1);
86624+ __u64 low __intentional_overflow(-1);
86625 __u64 ptr[];
86626 };
86627
86628diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
86629index d876736..ccce5c0 100644
86630--- a/include/uapi/linux/byteorder/little_endian.h
86631+++ b/include/uapi/linux/byteorder/little_endian.h
86632@@ -42,51 +42,51 @@
86633
86634 static inline __le64 __cpu_to_le64p(const __u64 *p)
86635 {
86636- return (__force __le64)*p;
86637+ return (__force const __le64)*p;
86638 }
86639-static inline __u64 __le64_to_cpup(const __le64 *p)
86640+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
86641 {
86642- return (__force __u64)*p;
86643+ return (__force const __u64)*p;
86644 }
86645 static inline __le32 __cpu_to_le32p(const __u32 *p)
86646 {
86647- return (__force __le32)*p;
86648+ return (__force const __le32)*p;
86649 }
86650 static inline __u32 __le32_to_cpup(const __le32 *p)
86651 {
86652- return (__force __u32)*p;
86653+ return (__force const __u32)*p;
86654 }
86655 static inline __le16 __cpu_to_le16p(const __u16 *p)
86656 {
86657- return (__force __le16)*p;
86658+ return (__force const __le16)*p;
86659 }
86660 static inline __u16 __le16_to_cpup(const __le16 *p)
86661 {
86662- return (__force __u16)*p;
86663+ return (__force const __u16)*p;
86664 }
86665 static inline __be64 __cpu_to_be64p(const __u64 *p)
86666 {
86667- return (__force __be64)__swab64p(p);
86668+ return (__force const __be64)__swab64p(p);
86669 }
86670 static inline __u64 __be64_to_cpup(const __be64 *p)
86671 {
86672- return __swab64p((__u64 *)p);
86673+ return __swab64p((const __u64 *)p);
86674 }
86675 static inline __be32 __cpu_to_be32p(const __u32 *p)
86676 {
86677- return (__force __be32)__swab32p(p);
86678+ return (__force const __be32)__swab32p(p);
86679 }
86680-static inline __u32 __be32_to_cpup(const __be32 *p)
86681+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
86682 {
86683- return __swab32p((__u32 *)p);
86684+ return __swab32p((const __u32 *)p);
86685 }
86686 static inline __be16 __cpu_to_be16p(const __u16 *p)
86687 {
86688- return (__force __be16)__swab16p(p);
86689+ return (__force const __be16)__swab16p(p);
86690 }
86691 static inline __u16 __be16_to_cpup(const __be16 *p)
86692 {
86693- return __swab16p((__u16 *)p);
86694+ return __swab16p((const __u16 *)p);
86695 }
86696 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
86697 #define __le64_to_cpus(x) do { (void)(x); } while (0)
86698diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
86699index ea9bf25..5140c61 100644
86700--- a/include/uapi/linux/elf.h
86701+++ b/include/uapi/linux/elf.h
86702@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
86703 #define PT_GNU_EH_FRAME 0x6474e550
86704
86705 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
86706+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
86707+
86708+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
86709+
86710+/* Constants for the e_flags field */
86711+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
86712+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
86713+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
86714+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
86715+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
86716+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
86717
86718 /*
86719 * Extended Numbering
86720@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
86721 #define DT_DEBUG 21
86722 #define DT_TEXTREL 22
86723 #define DT_JMPREL 23
86724+#define DT_FLAGS 30
86725+ #define DF_TEXTREL 0x00000004
86726 #define DT_ENCODING 32
86727 #define OLD_DT_LOOS 0x60000000
86728 #define DT_LOOS 0x6000000d
86729@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
86730 #define PF_W 0x2
86731 #define PF_X 0x1
86732
86733+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
86734+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
86735+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
86736+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
86737+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
86738+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
86739+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
86740+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
86741+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
86742+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
86743+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
86744+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
86745+
86746 typedef struct elf32_phdr{
86747 Elf32_Word p_type;
86748 Elf32_Off p_offset;
86749@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
86750 #define EI_OSABI 7
86751 #define EI_PAD 8
86752
86753+#define EI_PAX 14
86754+
86755 #define ELFMAG0 0x7f /* EI_MAG */
86756 #define ELFMAG1 'E'
86757 #define ELFMAG2 'L'
86758diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
86759index aa169c4..6a2771d 100644
86760--- a/include/uapi/linux/personality.h
86761+++ b/include/uapi/linux/personality.h
86762@@ -30,6 +30,7 @@ enum {
86763 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
86764 ADDR_NO_RANDOMIZE | \
86765 ADDR_COMPAT_LAYOUT | \
86766+ ADDR_LIMIT_3GB | \
86767 MMAP_PAGE_ZERO)
86768
86769 /*
86770diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
86771index 7530e74..e714828 100644
86772--- a/include/uapi/linux/screen_info.h
86773+++ b/include/uapi/linux/screen_info.h
86774@@ -43,7 +43,8 @@ struct screen_info {
86775 __u16 pages; /* 0x32 */
86776 __u16 vesa_attributes; /* 0x34 */
86777 __u32 capabilities; /* 0x36 */
86778- __u8 _reserved[6]; /* 0x3a */
86779+ __u16 vesapm_size; /* 0x3a */
86780+ __u8 _reserved[4]; /* 0x3c */
86781 } __attribute__((packed));
86782
86783 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
86784diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
86785index 0e011eb..82681b1 100644
86786--- a/include/uapi/linux/swab.h
86787+++ b/include/uapi/linux/swab.h
86788@@ -43,7 +43,7 @@
86789 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
86790 */
86791
86792-static inline __attribute_const__ __u16 __fswab16(__u16 val)
86793+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
86794 {
86795 #ifdef __HAVE_BUILTIN_BSWAP16__
86796 return __builtin_bswap16(val);
86797@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
86798 #endif
86799 }
86800
86801-static inline __attribute_const__ __u32 __fswab32(__u32 val)
86802+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
86803 {
86804 #ifdef __HAVE_BUILTIN_BSWAP32__
86805 return __builtin_bswap32(val);
86806@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
86807 #endif
86808 }
86809
86810-static inline __attribute_const__ __u64 __fswab64(__u64 val)
86811+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
86812 {
86813 #ifdef __HAVE_BUILTIN_BSWAP64__
86814 return __builtin_bswap64(val);
86815diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
86816index 43aaba1..1c30b48 100644
86817--- a/include/uapi/linux/sysctl.h
86818+++ b/include/uapi/linux/sysctl.h
86819@@ -155,8 +155,6 @@ enum
86820 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
86821 };
86822
86823-
86824-
86825 /* CTL_VM names: */
86826 enum
86827 {
86828diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
86829index 1590c49..5eab462 100644
86830--- a/include/uapi/linux/xattr.h
86831+++ b/include/uapi/linux/xattr.h
86832@@ -73,5 +73,9 @@
86833 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
86834 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
86835
86836+/* User namespace */
86837+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
86838+#define XATTR_PAX_FLAGS_SUFFIX "flags"
86839+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
86840
86841 #endif /* _UAPI_LINUX_XATTR_H */
86842diff --git a/include/video/udlfb.h b/include/video/udlfb.h
86843index f9466fa..f4e2b81 100644
86844--- a/include/video/udlfb.h
86845+++ b/include/video/udlfb.h
86846@@ -53,10 +53,10 @@ struct dlfb_data {
86847 u32 pseudo_palette[256];
86848 int blank_mode; /*one of FB_BLANK_ */
86849 /* blit-only rendering path metrics, exposed through sysfs */
86850- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
86851- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
86852- atomic_t bytes_sent; /* to usb, after compression including overhead */
86853- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
86854+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
86855+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
86856+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
86857+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
86858 };
86859
86860 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
86861diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
86862index 30f5362..8ed8ac9 100644
86863--- a/include/video/uvesafb.h
86864+++ b/include/video/uvesafb.h
86865@@ -122,6 +122,7 @@ struct uvesafb_par {
86866 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
86867 u8 pmi_setpal; /* PMI for palette changes */
86868 u16 *pmi_base; /* protected mode interface location */
86869+ u8 *pmi_code; /* protected mode code location */
86870 void *pmi_start;
86871 void *pmi_pal;
86872 u8 *vbe_state_orig; /*
86873diff --git a/init/Kconfig b/init/Kconfig
86874index 2081a4d..98d1149 100644
86875--- a/init/Kconfig
86876+++ b/init/Kconfig
86877@@ -1150,6 +1150,7 @@ endif # CGROUPS
86878
86879 config CHECKPOINT_RESTORE
86880 bool "Checkpoint/restore support" if EXPERT
86881+ depends on !GRKERNSEC
86882 default n
86883 help
86884 Enables additional kernel features in a sake of checkpoint/restore.
86885@@ -1659,7 +1660,7 @@ config SLUB_DEBUG
86886
86887 config COMPAT_BRK
86888 bool "Disable heap randomization"
86889- default y
86890+ default n
86891 help
86892 Randomizing heap placement makes heap exploits harder, but it
86893 also breaks ancient binaries (including anything libc5 based).
86894@@ -1990,7 +1991,7 @@ config INIT_ALL_POSSIBLE
86895 config STOP_MACHINE
86896 bool
86897 default y
86898- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
86899+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
86900 help
86901 Need stop_machine() primitive.
86902
86903diff --git a/init/Makefile b/init/Makefile
86904index 7bc47ee..6da2dc7 100644
86905--- a/init/Makefile
86906+++ b/init/Makefile
86907@@ -2,6 +2,9 @@
86908 # Makefile for the linux kernel.
86909 #
86910
86911+ccflags-y := $(GCC_PLUGINS_CFLAGS)
86912+asflags-y := $(GCC_PLUGINS_AFLAGS)
86913+
86914 obj-y := main.o version.o mounts.o
86915 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
86916 obj-y += noinitramfs.o
86917diff --git a/init/do_mounts.c b/init/do_mounts.c
86918index 9b3565c..3f90cf9 100644
86919--- a/init/do_mounts.c
86920+++ b/init/do_mounts.c
86921@@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
86922 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
86923 {
86924 struct super_block *s;
86925- int err = sys_mount(name, "/root", fs, flags, data);
86926+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
86927 if (err)
86928 return err;
86929
86930- sys_chdir("/root");
86931+ sys_chdir((const char __force_user *)"/root");
86932 s = current->fs->pwd.dentry->d_sb;
86933 ROOT_DEV = s->s_dev;
86934 printk(KERN_INFO
86935@@ -485,18 +485,18 @@ void __init change_floppy(char *fmt, ...)
86936 va_start(args, fmt);
86937 vsprintf(buf, fmt, args);
86938 va_end(args);
86939- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
86940+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
86941 if (fd >= 0) {
86942 sys_ioctl(fd, FDEJECT, 0);
86943 sys_close(fd);
86944 }
86945 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
86946- fd = sys_open("/dev/console", O_RDWR, 0);
86947+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
86948 if (fd >= 0) {
86949 sys_ioctl(fd, TCGETS, (long)&termios);
86950 termios.c_lflag &= ~ICANON;
86951 sys_ioctl(fd, TCSETSF, (long)&termios);
86952- sys_read(fd, &c, 1);
86953+ sys_read(fd, (char __user *)&c, 1);
86954 termios.c_lflag |= ICANON;
86955 sys_ioctl(fd, TCSETSF, (long)&termios);
86956 sys_close(fd);
86957@@ -590,8 +590,8 @@ void __init prepare_namespace(void)
86958 mount_root();
86959 out:
86960 devtmpfs_mount("dev");
86961- sys_mount(".", "/", NULL, MS_MOVE, NULL);
86962- sys_chroot(".");
86963+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
86964+ sys_chroot((const char __force_user *)".");
86965 }
86966
86967 static bool is_tmpfs;
86968diff --git a/init/do_mounts.h b/init/do_mounts.h
86969index f5b978a..69dbfe8 100644
86970--- a/init/do_mounts.h
86971+++ b/init/do_mounts.h
86972@@ -15,15 +15,15 @@ extern int root_mountflags;
86973
86974 static inline int create_dev(char *name, dev_t dev)
86975 {
86976- sys_unlink(name);
86977- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
86978+ sys_unlink((char __force_user *)name);
86979+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
86980 }
86981
86982 #if BITS_PER_LONG == 32
86983 static inline u32 bstat(char *name)
86984 {
86985 struct stat64 stat;
86986- if (sys_stat64(name, &stat) != 0)
86987+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
86988 return 0;
86989 if (!S_ISBLK(stat.st_mode))
86990 return 0;
86991@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
86992 static inline u32 bstat(char *name)
86993 {
86994 struct stat stat;
86995- if (sys_newstat(name, &stat) != 0)
86996+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
86997 return 0;
86998 if (!S_ISBLK(stat.st_mode))
86999 return 0;
87000diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
87001index 3e0878e..8a9d7a0 100644
87002--- a/init/do_mounts_initrd.c
87003+++ b/init/do_mounts_initrd.c
87004@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
87005 {
87006 sys_unshare(CLONE_FS | CLONE_FILES);
87007 /* stdin/stdout/stderr for /linuxrc */
87008- sys_open("/dev/console", O_RDWR, 0);
87009+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
87010 sys_dup(0);
87011 sys_dup(0);
87012 /* move initrd over / and chdir/chroot in initrd root */
87013- sys_chdir("/root");
87014- sys_mount(".", "/", NULL, MS_MOVE, NULL);
87015- sys_chroot(".");
87016+ sys_chdir((const char __force_user *)"/root");
87017+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
87018+ sys_chroot((const char __force_user *)".");
87019 sys_setsid();
87020 return 0;
87021 }
87022@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
87023 create_dev("/dev/root.old", Root_RAM0);
87024 /* mount initrd on rootfs' /root */
87025 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
87026- sys_mkdir("/old", 0700);
87027- sys_chdir("/old");
87028+ sys_mkdir((const char __force_user *)"/old", 0700);
87029+ sys_chdir((const char __force_user *)"/old");
87030
87031 /* try loading default modules from initrd */
87032 load_default_modules();
87033@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
87034 current->flags &= ~PF_FREEZER_SKIP;
87035
87036 /* move initrd to rootfs' /old */
87037- sys_mount("..", ".", NULL, MS_MOVE, NULL);
87038+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
87039 /* switch root and cwd back to / of rootfs */
87040- sys_chroot("..");
87041+ sys_chroot((const char __force_user *)"..");
87042
87043 if (new_decode_dev(real_root_dev) == Root_RAM0) {
87044- sys_chdir("/old");
87045+ sys_chdir((const char __force_user *)"/old");
87046 return;
87047 }
87048
87049- sys_chdir("/");
87050+ sys_chdir((const char __force_user *)"/");
87051 ROOT_DEV = new_decode_dev(real_root_dev);
87052 mount_root();
87053
87054 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
87055- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
87056+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
87057 if (!error)
87058 printk("okay\n");
87059 else {
87060- int fd = sys_open("/dev/root.old", O_RDWR, 0);
87061+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
87062 if (error == -ENOENT)
87063 printk("/initrd does not exist. Ignored.\n");
87064 else
87065 printk("failed\n");
87066 printk(KERN_NOTICE "Unmounting old root\n");
87067- sys_umount("/old", MNT_DETACH);
87068+ sys_umount((char __force_user *)"/old", MNT_DETACH);
87069 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
87070 if (fd < 0) {
87071 error = fd;
87072@@ -127,11 +127,11 @@ int __init initrd_load(void)
87073 * mounted in the normal path.
87074 */
87075 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
87076- sys_unlink("/initrd.image");
87077+ sys_unlink((const char __force_user *)"/initrd.image");
87078 handle_initrd();
87079 return 1;
87080 }
87081 }
87082- sys_unlink("/initrd.image");
87083+ sys_unlink((const char __force_user *)"/initrd.image");
87084 return 0;
87085 }
87086diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
87087index 8cb6db5..d729f50 100644
87088--- a/init/do_mounts_md.c
87089+++ b/init/do_mounts_md.c
87090@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
87091 partitioned ? "_d" : "", minor,
87092 md_setup_args[ent].device_names);
87093
87094- fd = sys_open(name, 0, 0);
87095+ fd = sys_open((char __force_user *)name, 0, 0);
87096 if (fd < 0) {
87097 printk(KERN_ERR "md: open failed - cannot start "
87098 "array %s\n", name);
87099@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
87100 * array without it
87101 */
87102 sys_close(fd);
87103- fd = sys_open(name, 0, 0);
87104+ fd = sys_open((char __force_user *)name, 0, 0);
87105 sys_ioctl(fd, BLKRRPART, 0);
87106 }
87107 sys_close(fd);
87108@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
87109
87110 wait_for_device_probe();
87111
87112- fd = sys_open("/dev/md0", 0, 0);
87113+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
87114 if (fd >= 0) {
87115 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
87116 sys_close(fd);
87117diff --git a/init/init_task.c b/init/init_task.c
87118index ba0a7f36..2bcf1d5 100644
87119--- a/init/init_task.c
87120+++ b/init/init_task.c
87121@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
87122 * Initial thread structure. Alignment of this is handled by a special
87123 * linker map entry.
87124 */
87125+#ifdef CONFIG_X86
87126+union thread_union init_thread_union __init_task_data;
87127+#else
87128 union thread_union init_thread_union __init_task_data =
87129 { INIT_THREAD_INFO(init_task) };
87130+#endif
87131diff --git a/init/initramfs.c b/init/initramfs.c
87132index ad1bd77..dca2c1b 100644
87133--- a/init/initramfs.c
87134+++ b/init/initramfs.c
87135@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
87136
87137 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
87138 while (count) {
87139- ssize_t rv = sys_write(fd, p, count);
87140+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
87141
87142 if (rv < 0) {
87143 if (rv == -EINTR || rv == -EAGAIN)
87144@@ -107,7 +107,7 @@ static void __init free_hash(void)
87145 }
87146 }
87147
87148-static long __init do_utime(char *filename, time_t mtime)
87149+static long __init do_utime(char __force_user *filename, time_t mtime)
87150 {
87151 struct timespec t[2];
87152
87153@@ -142,7 +142,7 @@ static void __init dir_utime(void)
87154 struct dir_entry *de, *tmp;
87155 list_for_each_entry_safe(de, tmp, &dir_list, list) {
87156 list_del(&de->list);
87157- do_utime(de->name, de->mtime);
87158+ do_utime((char __force_user *)de->name, de->mtime);
87159 kfree(de->name);
87160 kfree(de);
87161 }
87162@@ -304,7 +304,7 @@ static int __init maybe_link(void)
87163 if (nlink >= 2) {
87164 char *old = find_link(major, minor, ino, mode, collected);
87165 if (old)
87166- return (sys_link(old, collected) < 0) ? -1 : 1;
87167+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
87168 }
87169 return 0;
87170 }
87171@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
87172 {
87173 struct stat st;
87174
87175- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
87176+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
87177 if (S_ISDIR(st.st_mode))
87178- sys_rmdir(path);
87179+ sys_rmdir((char __force_user *)path);
87180 else
87181- sys_unlink(path);
87182+ sys_unlink((char __force_user *)path);
87183 }
87184 }
87185
87186@@ -338,7 +338,7 @@ static int __init do_name(void)
87187 int openflags = O_WRONLY|O_CREAT;
87188 if (ml != 1)
87189 openflags |= O_TRUNC;
87190- wfd = sys_open(collected, openflags, mode);
87191+ wfd = sys_open((char __force_user *)collected, openflags, mode);
87192
87193 if (wfd >= 0) {
87194 sys_fchown(wfd, uid, gid);
87195@@ -350,17 +350,17 @@ static int __init do_name(void)
87196 }
87197 }
87198 } else if (S_ISDIR(mode)) {
87199- sys_mkdir(collected, mode);
87200- sys_chown(collected, uid, gid);
87201- sys_chmod(collected, mode);
87202+ sys_mkdir((char __force_user *)collected, mode);
87203+ sys_chown((char __force_user *)collected, uid, gid);
87204+ sys_chmod((char __force_user *)collected, mode);
87205 dir_add(collected, mtime);
87206 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
87207 S_ISFIFO(mode) || S_ISSOCK(mode)) {
87208 if (maybe_link() == 0) {
87209- sys_mknod(collected, mode, rdev);
87210- sys_chown(collected, uid, gid);
87211- sys_chmod(collected, mode);
87212- do_utime(collected, mtime);
87213+ sys_mknod((char __force_user *)collected, mode, rdev);
87214+ sys_chown((char __force_user *)collected, uid, gid);
87215+ sys_chmod((char __force_user *)collected, mode);
87216+ do_utime((char __force_user *)collected, mtime);
87217 }
87218 }
87219 return 0;
87220@@ -372,7 +372,7 @@ static int __init do_copy(void)
87221 if (xwrite(wfd, victim, body_len) != body_len)
87222 error("write error");
87223 sys_close(wfd);
87224- do_utime(vcollected, mtime);
87225+ do_utime((char __force_user *)vcollected, mtime);
87226 kfree(vcollected);
87227 eat(body_len);
87228 state = SkipIt;
87229@@ -390,9 +390,9 @@ static int __init do_symlink(void)
87230 {
87231 collected[N_ALIGN(name_len) + body_len] = '\0';
87232 clean_path(collected, 0);
87233- sys_symlink(collected + N_ALIGN(name_len), collected);
87234- sys_lchown(collected, uid, gid);
87235- do_utime(collected, mtime);
87236+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
87237+ sys_lchown((char __force_user *)collected, uid, gid);
87238+ do_utime((char __force_user *)collected, mtime);
87239 state = SkipIt;
87240 next_state = Reset;
87241 return 0;
87242diff --git a/init/main.c b/init/main.c
87243index 321d0ce..91b53e5 100644
87244--- a/init/main.c
87245+++ b/init/main.c
87246@@ -98,6 +98,8 @@ extern void radix_tree_init(void);
87247 static inline void mark_rodata_ro(void) { }
87248 #endif
87249
87250+extern void grsecurity_init(void);
87251+
87252 /*
87253 * Debug helper: via this flag we know that we are in 'early bootup code'
87254 * where only the boot processor is running with IRQ disabled. This means
87255@@ -159,6 +161,75 @@ static int __init set_reset_devices(char *str)
87256
87257 __setup("reset_devices", set_reset_devices);
87258
87259+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
87260+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
87261+static int __init setup_grsec_proc_gid(char *str)
87262+{
87263+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
87264+ return 1;
87265+}
87266+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
87267+#endif
87268+
87269+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
87270+unsigned long pax_user_shadow_base __read_only;
87271+EXPORT_SYMBOL(pax_user_shadow_base);
87272+extern char pax_enter_kernel_user[];
87273+extern char pax_exit_kernel_user[];
87274+#endif
87275+
87276+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
87277+static int __init setup_pax_nouderef(char *str)
87278+{
87279+#ifdef CONFIG_X86_32
87280+ unsigned int cpu;
87281+ struct desc_struct *gdt;
87282+
87283+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
87284+ gdt = get_cpu_gdt_table(cpu);
87285+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
87286+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
87287+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
87288+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
87289+ }
87290+ loadsegment(ds, __KERNEL_DS);
87291+ loadsegment(es, __KERNEL_DS);
87292+ loadsegment(ss, __KERNEL_DS);
87293+#else
87294+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
87295+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
87296+ clone_pgd_mask = ~(pgdval_t)0UL;
87297+ pax_user_shadow_base = 0UL;
87298+ setup_clear_cpu_cap(X86_FEATURE_PCID);
87299+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
87300+#endif
87301+
87302+ return 0;
87303+}
87304+early_param("pax_nouderef", setup_pax_nouderef);
87305+
87306+#ifdef CONFIG_X86_64
87307+static int __init setup_pax_weakuderef(char *str)
87308+{
87309+ if (clone_pgd_mask != ~(pgdval_t)0UL)
87310+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
87311+ return 1;
87312+}
87313+__setup("pax_weakuderef", setup_pax_weakuderef);
87314+#endif
87315+#endif
87316+
87317+#ifdef CONFIG_PAX_SOFTMODE
87318+int pax_softmode;
87319+
87320+static int __init setup_pax_softmode(char *str)
87321+{
87322+ get_option(&str, &pax_softmode);
87323+ return 1;
87324+}
87325+__setup("pax_softmode=", setup_pax_softmode);
87326+#endif
87327+
87328 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
87329 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
87330 static const char *panic_later, *panic_param;
87331@@ -728,7 +799,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
87332 struct blacklist_entry *entry;
87333 char *fn_name;
87334
87335- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
87336+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
87337 if (!fn_name)
87338 return false;
87339
87340@@ -780,7 +851,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
87341 {
87342 int count = preempt_count();
87343 int ret;
87344- char msgbuf[64];
87345+ const char *msg1 = "", *msg2 = "";
87346
87347 if (initcall_blacklisted(fn))
87348 return -EPERM;
87349@@ -790,18 +861,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
87350 else
87351 ret = fn();
87352
87353- msgbuf[0] = 0;
87354-
87355 if (preempt_count() != count) {
87356- sprintf(msgbuf, "preemption imbalance ");
87357+ msg1 = " preemption imbalance";
87358 preempt_count_set(count);
87359 }
87360 if (irqs_disabled()) {
87361- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
87362+ msg2 = " disabled interrupts";
87363 local_irq_enable();
87364 }
87365- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
87366+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
87367
87368+ add_latent_entropy();
87369 return ret;
87370 }
87371
87372@@ -907,8 +977,8 @@ static int run_init_process(const char *init_filename)
87373 {
87374 argv_init[0] = init_filename;
87375 return do_execve(getname_kernel(init_filename),
87376- (const char __user *const __user *)argv_init,
87377- (const char __user *const __user *)envp_init);
87378+ (const char __user *const __force_user *)argv_init,
87379+ (const char __user *const __force_user *)envp_init);
87380 }
87381
87382 static int try_to_run_init_process(const char *init_filename)
87383@@ -925,6 +995,10 @@ static int try_to_run_init_process(const char *init_filename)
87384 return ret;
87385 }
87386
87387+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
87388+extern int gr_init_ran;
87389+#endif
87390+
87391 static noinline void __init kernel_init_freeable(void);
87392
87393 static int __ref kernel_init(void *unused)
87394@@ -949,6 +1023,11 @@ static int __ref kernel_init(void *unused)
87395 ramdisk_execute_command, ret);
87396 }
87397
87398+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
87399+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
87400+ gr_init_ran = 1;
87401+#endif
87402+
87403 /*
87404 * We try each of these until one succeeds.
87405 *
87406@@ -1004,7 +1083,7 @@ static noinline void __init kernel_init_freeable(void)
87407 do_basic_setup();
87408
87409 /* Open the /dev/console on the rootfs, this should never fail */
87410- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
87411+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
87412 pr_err("Warning: unable to open an initial console.\n");
87413
87414 (void) sys_dup(0);
87415@@ -1017,11 +1096,13 @@ static noinline void __init kernel_init_freeable(void)
87416 if (!ramdisk_execute_command)
87417 ramdisk_execute_command = "/init";
87418
87419- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
87420+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
87421 ramdisk_execute_command = NULL;
87422 prepare_namespace();
87423 }
87424
87425+ grsecurity_init();
87426+
87427 /*
87428 * Ok, we have completed the initial bootup, and
87429 * we're essentially up and running. Get rid of the
87430diff --git a/ipc/compat.c b/ipc/compat.c
87431index 9b3c85f..1c4d897 100644
87432--- a/ipc/compat.c
87433+++ b/ipc/compat.c
87434@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
87435 COMPAT_SHMLBA);
87436 if (err < 0)
87437 return err;
87438- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
87439+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
87440 }
87441 case SHMDT:
87442 return sys_shmdt(compat_ptr(ptr));
87443diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
87444index e8075b2..76f2c6a 100644
87445--- a/ipc/ipc_sysctl.c
87446+++ b/ipc/ipc_sysctl.c
87447@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
87448 static int proc_ipc_dointvec(struct ctl_table *table, int write,
87449 void __user *buffer, size_t *lenp, loff_t *ppos)
87450 {
87451- struct ctl_table ipc_table;
87452+ ctl_table_no_const ipc_table;
87453
87454 memcpy(&ipc_table, table, sizeof(ipc_table));
87455 ipc_table.data = get_ipc(table);
87456@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
87457 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
87458 void __user *buffer, size_t *lenp, loff_t *ppos)
87459 {
87460- struct ctl_table ipc_table;
87461+ ctl_table_no_const ipc_table;
87462
87463 memcpy(&ipc_table, table, sizeof(ipc_table));
87464 ipc_table.data = get_ipc(table);
87465@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
87466 static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
87467 void __user *buffer, size_t *lenp, loff_t *ppos)
87468 {
87469- struct ctl_table ipc_table;
87470+ ctl_table_no_const ipc_table;
87471 size_t lenp_bef = *lenp;
87472 int rc;
87473
87474@@ -88,7 +88,7 @@ static int proc_ipc_callback_dointvec_minmax(struct ctl_table *table, int write,
87475 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
87476 void __user *buffer, size_t *lenp, loff_t *ppos)
87477 {
87478- struct ctl_table ipc_table;
87479+ ctl_table_no_const ipc_table;
87480 memcpy(&ipc_table, table, sizeof(ipc_table));
87481 ipc_table.data = get_ipc(table);
87482
87483@@ -122,7 +122,7 @@ static void ipc_auto_callback(int val)
87484 static int proc_ipcauto_dointvec_minmax(struct ctl_table *table, int write,
87485 void __user *buffer, size_t *lenp, loff_t *ppos)
87486 {
87487- struct ctl_table ipc_table;
87488+ ctl_table_no_const ipc_table;
87489 int oldval;
87490 int rc;
87491
87492diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
87493index 68d4e95..1477ded 100644
87494--- a/ipc/mq_sysctl.c
87495+++ b/ipc/mq_sysctl.c
87496@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
87497 static int proc_mq_dointvec(struct ctl_table *table, int write,
87498 void __user *buffer, size_t *lenp, loff_t *ppos)
87499 {
87500- struct ctl_table mq_table;
87501+ ctl_table_no_const mq_table;
87502 memcpy(&mq_table, table, sizeof(mq_table));
87503 mq_table.data = get_mq(table);
87504
87505@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
87506 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
87507 void __user *buffer, size_t *lenp, loff_t *ppos)
87508 {
87509- struct ctl_table mq_table;
87510+ ctl_table_no_const mq_table;
87511 memcpy(&mq_table, table, sizeof(mq_table));
87512 mq_table.data = get_mq(table);
87513
87514diff --git a/ipc/mqueue.c b/ipc/mqueue.c
87515index 4fcf39a..d3cc2ec 100644
87516--- a/ipc/mqueue.c
87517+++ b/ipc/mqueue.c
87518@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
87519 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
87520 info->attr.mq_msgsize);
87521
87522+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
87523 spin_lock(&mq_lock);
87524 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
87525 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
87526diff --git a/ipc/shm.c b/ipc/shm.c
87527index 0145479..3d27947 100644
87528--- a/ipc/shm.c
87529+++ b/ipc/shm.c
87530@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
87531 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
87532 #endif
87533
87534+#ifdef CONFIG_GRKERNSEC
87535+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
87536+ const u64 shm_createtime, const kuid_t cuid,
87537+ const int shmid);
87538+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
87539+ const u64 shm_createtime);
87540+#endif
87541+
87542 void shm_init_ns(struct ipc_namespace *ns)
87543 {
87544 ns->shm_ctlmax = SHMMAX;
87545@@ -559,6 +567,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
87546 shp->shm_lprid = 0;
87547 shp->shm_atim = shp->shm_dtim = 0;
87548 shp->shm_ctim = get_seconds();
87549+#ifdef CONFIG_GRKERNSEC
87550+ shp->shm_createtime = ktime_get_ns();
87551+#endif
87552 shp->shm_segsz = size;
87553 shp->shm_nattch = 0;
87554 shp->shm_file = file;
87555@@ -1095,6 +1106,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87556 f_mode = FMODE_READ | FMODE_WRITE;
87557 }
87558 if (shmflg & SHM_EXEC) {
87559+
87560+#ifdef CONFIG_PAX_MPROTECT
87561+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
87562+ goto out;
87563+#endif
87564+
87565 prot |= PROT_EXEC;
87566 acc_mode |= S_IXUGO;
87567 }
87568@@ -1119,6 +1136,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87569 if (err)
87570 goto out_unlock;
87571
87572+#ifdef CONFIG_GRKERNSEC
87573+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
87574+ shp->shm_perm.cuid, shmid) ||
87575+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
87576+ err = -EACCES;
87577+ goto out_unlock;
87578+ }
87579+#endif
87580+
87581 ipc_lock_object(&shp->shm_perm);
87582
87583 /* check if shm_destroy() is tearing down shp */
87584@@ -1131,6 +1157,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
87585 path = shp->shm_file->f_path;
87586 path_get(&path);
87587 shp->shm_nattch++;
87588+#ifdef CONFIG_GRKERNSEC
87589+ shp->shm_lapid = current->pid;
87590+#endif
87591 size = i_size_read(path.dentry->d_inode);
87592 ipc_unlock_object(&shp->shm_perm);
87593 rcu_read_unlock();
87594diff --git a/ipc/util.c b/ipc/util.c
87595index 88adc32..3867c68 100644
87596--- a/ipc/util.c
87597+++ b/ipc/util.c
87598@@ -71,6 +71,8 @@ struct ipc_proc_iface {
87599 int (*show)(struct seq_file *, void *);
87600 };
87601
87602+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
87603+
87604 static void ipc_memory_notifier(struct work_struct *work)
87605 {
87606 ipcns_notify(IPCNS_MEMCHANGED);
87607@@ -537,6 +539,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
87608 granted_mode >>= 6;
87609 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
87610 granted_mode >>= 3;
87611+
87612+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
87613+ return -1;
87614+
87615 /* is there some bit set in requested_mode but not in granted_mode? */
87616 if ((requested_mode & ~granted_mode & 0007) &&
87617 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
87618diff --git a/kernel/audit.c b/kernel/audit.c
87619index cebb11d..4e0295f 100644
87620--- a/kernel/audit.c
87621+++ b/kernel/audit.c
87622@@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
87623 3) suppressed due to audit_rate_limit
87624 4) suppressed due to audit_backlog_limit
87625 */
87626-static atomic_t audit_lost = ATOMIC_INIT(0);
87627+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
87628
87629 /* The netlink socket. */
87630 static struct sock *audit_sock;
87631@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
87632 unsigned long now;
87633 int print;
87634
87635- atomic_inc(&audit_lost);
87636+ atomic_inc_unchecked(&audit_lost);
87637
87638 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
87639
87640@@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
87641 if (print) {
87642 if (printk_ratelimit())
87643 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
87644- atomic_read(&audit_lost),
87645+ atomic_read_unchecked(&audit_lost),
87646 audit_rate_limit,
87647 audit_backlog_limit);
87648 audit_panic(message);
87649@@ -840,7 +840,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
87650 s.pid = audit_pid;
87651 s.rate_limit = audit_rate_limit;
87652 s.backlog_limit = audit_backlog_limit;
87653- s.lost = atomic_read(&audit_lost);
87654+ s.lost = atomic_read_unchecked(&audit_lost);
87655 s.backlog = skb_queue_len(&audit_skb_queue);
87656 s.version = AUDIT_VERSION_LATEST;
87657 s.backlog_wait_time = audit_backlog_wait_time;
87658diff --git a/kernel/auditsc.c b/kernel/auditsc.c
87659index e420a0c..38137fa 100644
87660--- a/kernel/auditsc.c
87661+++ b/kernel/auditsc.c
87662@@ -2014,7 +2014,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
87663 }
87664
87665 /* global counter which is incremented every time something logs in */
87666-static atomic_t session_id = ATOMIC_INIT(0);
87667+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
87668
87669 static int audit_set_loginuid_perm(kuid_t loginuid)
87670 {
87671@@ -2081,7 +2081,7 @@ int audit_set_loginuid(kuid_t loginuid)
87672
87673 /* are we setting or clearing? */
87674 if (uid_valid(loginuid))
87675- sessionid = (unsigned int)atomic_inc_return(&session_id);
87676+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
87677
87678 task->sessionid = sessionid;
87679 task->loginuid = loginuid;
87680diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
87681index d6594e4..00348e4 100644
87682--- a/kernel/bpf/core.c
87683+++ b/kernel/bpf/core.c
87684@@ -143,7 +143,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
87685 * random section of illegal instructions.
87686 */
87687 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
87688- hdr = module_alloc(size);
87689+ hdr = module_alloc_exec(size);
87690 if (hdr == NULL)
87691 return NULL;
87692
87693@@ -163,7 +163,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
87694
87695 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
87696 {
87697- module_free(NULL, hdr);
87698+ module_free_exec(NULL, hdr);
87699 }
87700 #endif /* CONFIG_BPF_JIT */
87701
87702diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
87703index ba61c8c..c60c486 100644
87704--- a/kernel/bpf/syscall.c
87705+++ b/kernel/bpf/syscall.c
87706@@ -539,11 +539,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
87707 int err;
87708
87709 /* the syscall is limited to root temporarily. This restriction will be
87710- * lifted when security audit is clean. Note that eBPF+tracing must have
87711- * this restriction, since it may pass kernel data to user space
87712+ * lifted by upstream when a half-assed security audit is clean. Note
87713+ * that eBPF+tracing must have this restriction, since it may pass
87714+ * kernel data to user space
87715 */
87716 if (!capable(CAP_SYS_ADMIN))
87717 return -EPERM;
87718+#ifdef CONFIG_GRKERNSEC
87719+ return -EPERM;
87720+#endif
87721
87722 if (!access_ok(VERIFY_READ, uattr, 1))
87723 return -EFAULT;
87724diff --git a/kernel/capability.c b/kernel/capability.c
87725index 989f5bf..d317ca0 100644
87726--- a/kernel/capability.c
87727+++ b/kernel/capability.c
87728@@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
87729 * before modification is attempted and the application
87730 * fails.
87731 */
87732+ if (tocopy > ARRAY_SIZE(kdata))
87733+ return -EFAULT;
87734+
87735 if (copy_to_user(dataptr, kdata, tocopy
87736 * sizeof(struct __user_cap_data_struct))) {
87737 return -EFAULT;
87738@@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
87739 int ret;
87740
87741 rcu_read_lock();
87742- ret = security_capable(__task_cred(t), ns, cap);
87743+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
87744+ gr_task_is_capable(t, __task_cred(t), cap);
87745 rcu_read_unlock();
87746
87747- return (ret == 0);
87748+ return ret;
87749 }
87750
87751 /**
87752@@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
87753 int ret;
87754
87755 rcu_read_lock();
87756- ret = security_capable_noaudit(__task_cred(t), ns, cap);
87757+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
87758 rcu_read_unlock();
87759
87760- return (ret == 0);
87761+ return ret;
87762 }
87763
87764 /**
87765@@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
87766 BUG();
87767 }
87768
87769- if (security_capable(current_cred(), ns, cap) == 0) {
87770+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
87771 current->flags |= PF_SUPERPRIV;
87772 return true;
87773 }
87774@@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
87775 }
87776 EXPORT_SYMBOL(ns_capable);
87777
87778+bool ns_capable_nolog(struct user_namespace *ns, int cap)
87779+{
87780+ if (unlikely(!cap_valid(cap))) {
87781+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
87782+ BUG();
87783+ }
87784+
87785+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
87786+ current->flags |= PF_SUPERPRIV;
87787+ return true;
87788+ }
87789+ return false;
87790+}
87791+EXPORT_SYMBOL(ns_capable_nolog);
87792+
87793 /**
87794 * file_ns_capable - Determine if the file's opener had a capability in effect
87795 * @file: The file we want to check
87796@@ -427,6 +446,12 @@ bool capable(int cap)
87797 }
87798 EXPORT_SYMBOL(capable);
87799
87800+bool capable_nolog(int cap)
87801+{
87802+ return ns_capable_nolog(&init_user_ns, cap);
87803+}
87804+EXPORT_SYMBOL(capable_nolog);
87805+
87806 /**
87807 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
87808 * @inode: The inode in question
87809@@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
87810 kgid_has_mapping(ns, inode->i_gid);
87811 }
87812 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
87813+
87814+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
87815+{
87816+ struct user_namespace *ns = current_user_ns();
87817+
87818+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
87819+ kgid_has_mapping(ns, inode->i_gid);
87820+}
87821+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
87822diff --git a/kernel/cgroup.c b/kernel/cgroup.c
87823index 136ecea..45157a6 100644
87824--- a/kernel/cgroup.c
87825+++ b/kernel/cgroup.c
87826@@ -5276,6 +5276,9 @@ static void cgroup_release_agent(struct work_struct *work)
87827 if (!pathbuf || !agentbuf)
87828 goto out;
87829
87830+ if (agentbuf[0] == '\0')
87831+ goto out;
87832+
87833 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
87834 if (!path)
87835 goto out;
87836@@ -5461,7 +5464,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
87837 struct task_struct *task;
87838 int count = 0;
87839
87840- seq_printf(seq, "css_set %p\n", cset);
87841+ seq_printf(seq, "css_set %pK\n", cset);
87842
87843 list_for_each_entry(task, &cset->tasks, cg_list) {
87844 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
87845diff --git a/kernel/compat.c b/kernel/compat.c
87846index ebb3c36..1df606e 100644
87847--- a/kernel/compat.c
87848+++ b/kernel/compat.c
87849@@ -13,6 +13,7 @@
87850
87851 #include <linux/linkage.h>
87852 #include <linux/compat.h>
87853+#include <linux/module.h>
87854 #include <linux/errno.h>
87855 #include <linux/time.h>
87856 #include <linux/signal.h>
87857@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
87858 mm_segment_t oldfs;
87859 long ret;
87860
87861- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
87862+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
87863 oldfs = get_fs();
87864 set_fs(KERNEL_DS);
87865 ret = hrtimer_nanosleep_restart(restart);
87866@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
87867 oldfs = get_fs();
87868 set_fs(KERNEL_DS);
87869 ret = hrtimer_nanosleep(&tu,
87870- rmtp ? (struct timespec __user *)&rmt : NULL,
87871+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
87872 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
87873 set_fs(oldfs);
87874
87875@@ -379,7 +380,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
87876 mm_segment_t old_fs = get_fs();
87877
87878 set_fs(KERNEL_DS);
87879- ret = sys_sigpending((old_sigset_t __user *) &s);
87880+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
87881 set_fs(old_fs);
87882 if (ret == 0)
87883 ret = put_user(s, set);
87884@@ -469,7 +470,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
87885 mm_segment_t old_fs = get_fs();
87886
87887 set_fs(KERNEL_DS);
87888- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
87889+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
87890 set_fs(old_fs);
87891
87892 if (!ret) {
87893@@ -551,8 +552,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
87894 set_fs (KERNEL_DS);
87895 ret = sys_wait4(pid,
87896 (stat_addr ?
87897- (unsigned int __user *) &status : NULL),
87898- options, (struct rusage __user *) &r);
87899+ (unsigned int __force_user *) &status : NULL),
87900+ options, (struct rusage __force_user *) &r);
87901 set_fs (old_fs);
87902
87903 if (ret > 0) {
87904@@ -578,8 +579,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
87905 memset(&info, 0, sizeof(info));
87906
87907 set_fs(KERNEL_DS);
87908- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
87909- uru ? (struct rusage __user *)&ru : NULL);
87910+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
87911+ uru ? (struct rusage __force_user *)&ru : NULL);
87912 set_fs(old_fs);
87913
87914 if ((ret < 0) || (info.si_signo == 0))
87915@@ -713,8 +714,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
87916 oldfs = get_fs();
87917 set_fs(KERNEL_DS);
87918 err = sys_timer_settime(timer_id, flags,
87919- (struct itimerspec __user *) &newts,
87920- (struct itimerspec __user *) &oldts);
87921+ (struct itimerspec __force_user *) &newts,
87922+ (struct itimerspec __force_user *) &oldts);
87923 set_fs(oldfs);
87924 if (!err && old && put_compat_itimerspec(old, &oldts))
87925 return -EFAULT;
87926@@ -731,7 +732,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
87927 oldfs = get_fs();
87928 set_fs(KERNEL_DS);
87929 err = sys_timer_gettime(timer_id,
87930- (struct itimerspec __user *) &ts);
87931+ (struct itimerspec __force_user *) &ts);
87932 set_fs(oldfs);
87933 if (!err && put_compat_itimerspec(setting, &ts))
87934 return -EFAULT;
87935@@ -750,7 +751,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
87936 oldfs = get_fs();
87937 set_fs(KERNEL_DS);
87938 err = sys_clock_settime(which_clock,
87939- (struct timespec __user *) &ts);
87940+ (struct timespec __force_user *) &ts);
87941 set_fs(oldfs);
87942 return err;
87943 }
87944@@ -765,7 +766,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
87945 oldfs = get_fs();
87946 set_fs(KERNEL_DS);
87947 err = sys_clock_gettime(which_clock,
87948- (struct timespec __user *) &ts);
87949+ (struct timespec __force_user *) &ts);
87950 set_fs(oldfs);
87951 if (!err && compat_put_timespec(&ts, tp))
87952 return -EFAULT;
87953@@ -785,7 +786,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
87954
87955 oldfs = get_fs();
87956 set_fs(KERNEL_DS);
87957- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
87958+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
87959 set_fs(oldfs);
87960
87961 err = compat_put_timex(utp, &txc);
87962@@ -805,7 +806,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
87963 oldfs = get_fs();
87964 set_fs(KERNEL_DS);
87965 err = sys_clock_getres(which_clock,
87966- (struct timespec __user *) &ts);
87967+ (struct timespec __force_user *) &ts);
87968 set_fs(oldfs);
87969 if (!err && tp && compat_put_timespec(&ts, tp))
87970 return -EFAULT;
87971@@ -819,7 +820,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
87972 struct timespec tu;
87973 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
87974
87975- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
87976+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
87977 oldfs = get_fs();
87978 set_fs(KERNEL_DS);
87979 err = clock_nanosleep_restart(restart);
87980@@ -851,8 +852,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
87981 oldfs = get_fs();
87982 set_fs(KERNEL_DS);
87983 err = sys_clock_nanosleep(which_clock, flags,
87984- (struct timespec __user *) &in,
87985- (struct timespec __user *) &out);
87986+ (struct timespec __force_user *) &in,
87987+ (struct timespec __force_user *) &out);
87988 set_fs(oldfs);
87989
87990 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
87991@@ -1146,7 +1147,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
87992 mm_segment_t old_fs = get_fs();
87993
87994 set_fs(KERNEL_DS);
87995- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
87996+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
87997 set_fs(old_fs);
87998 if (compat_put_timespec(&t, interval))
87999 return -EFAULT;
88000diff --git a/kernel/configs.c b/kernel/configs.c
88001index c18b1f1..b9a0132 100644
88002--- a/kernel/configs.c
88003+++ b/kernel/configs.c
88004@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
88005 struct proc_dir_entry *entry;
88006
88007 /* create the current config file */
88008+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
88009+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
88010+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
88011+ &ikconfig_file_ops);
88012+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
88013+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
88014+ &ikconfig_file_ops);
88015+#endif
88016+#else
88017 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
88018 &ikconfig_file_ops);
88019+#endif
88020+
88021 if (!entry)
88022 return -ENOMEM;
88023
88024diff --git a/kernel/cred.c b/kernel/cred.c
88025index e0573a4..26c0fd3 100644
88026--- a/kernel/cred.c
88027+++ b/kernel/cred.c
88028@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
88029 validate_creds(cred);
88030 alter_cred_subscribers(cred, -1);
88031 put_cred(cred);
88032+
88033+#ifdef CONFIG_GRKERNSEC_SETXID
88034+ cred = (struct cred *) tsk->delayed_cred;
88035+ if (cred != NULL) {
88036+ tsk->delayed_cred = NULL;
88037+ validate_creds(cred);
88038+ alter_cred_subscribers(cred, -1);
88039+ put_cred(cred);
88040+ }
88041+#endif
88042 }
88043
88044 /**
88045@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
88046 * Always returns 0 thus allowing this function to be tail-called at the end
88047 * of, say, sys_setgid().
88048 */
88049-int commit_creds(struct cred *new)
88050+static int __commit_creds(struct cred *new)
88051 {
88052 struct task_struct *task = current;
88053 const struct cred *old = task->real_cred;
88054@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
88055
88056 get_cred(new); /* we will require a ref for the subj creds too */
88057
88058+ gr_set_role_label(task, new->uid, new->gid);
88059+
88060 /* dumpability changes */
88061 if (!uid_eq(old->euid, new->euid) ||
88062 !gid_eq(old->egid, new->egid) ||
88063@@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
88064 put_cred(old);
88065 return 0;
88066 }
88067+#ifdef CONFIG_GRKERNSEC_SETXID
88068+extern int set_user(struct cred *new);
88069+
88070+void gr_delayed_cred_worker(void)
88071+{
88072+ const struct cred *new = current->delayed_cred;
88073+ struct cred *ncred;
88074+
88075+ current->delayed_cred = NULL;
88076+
88077+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
88078+ // from doing get_cred on it when queueing this
88079+ put_cred(new);
88080+ return;
88081+ } else if (new == NULL)
88082+ return;
88083+
88084+ ncred = prepare_creds();
88085+ if (!ncred)
88086+ goto die;
88087+ // uids
88088+ ncred->uid = new->uid;
88089+ ncred->euid = new->euid;
88090+ ncred->suid = new->suid;
88091+ ncred->fsuid = new->fsuid;
88092+ // gids
88093+ ncred->gid = new->gid;
88094+ ncred->egid = new->egid;
88095+ ncred->sgid = new->sgid;
88096+ ncred->fsgid = new->fsgid;
88097+ // groups
88098+ set_groups(ncred, new->group_info);
88099+ // caps
88100+ ncred->securebits = new->securebits;
88101+ ncred->cap_inheritable = new->cap_inheritable;
88102+ ncred->cap_permitted = new->cap_permitted;
88103+ ncred->cap_effective = new->cap_effective;
88104+ ncred->cap_bset = new->cap_bset;
88105+
88106+ if (set_user(ncred)) {
88107+ abort_creds(ncred);
88108+ goto die;
88109+ }
88110+
88111+ // from doing get_cred on it when queueing this
88112+ put_cred(new);
88113+
88114+ __commit_creds(ncred);
88115+ return;
88116+die:
88117+ // from doing get_cred on it when queueing this
88118+ put_cred(new);
88119+ do_group_exit(SIGKILL);
88120+}
88121+#endif
88122+
88123+int commit_creds(struct cred *new)
88124+{
88125+#ifdef CONFIG_GRKERNSEC_SETXID
88126+ int ret;
88127+ int schedule_it = 0;
88128+ struct task_struct *t;
88129+ unsigned oldsecurebits = current_cred()->securebits;
88130+
88131+ /* we won't get called with tasklist_lock held for writing
88132+ and interrupts disabled as the cred struct in that case is
88133+ init_cred
88134+ */
88135+ if (grsec_enable_setxid && !current_is_single_threaded() &&
88136+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
88137+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
88138+ schedule_it = 1;
88139+ }
88140+ ret = __commit_creds(new);
88141+ if (schedule_it) {
88142+ rcu_read_lock();
88143+ read_lock(&tasklist_lock);
88144+ for (t = next_thread(current); t != current;
88145+ t = next_thread(t)) {
88146+ /* we'll check if the thread has uid 0 in
88147+ * the delayed worker routine
88148+ */
88149+ if (task_securebits(t) == oldsecurebits &&
88150+ t->delayed_cred == NULL) {
88151+ t->delayed_cred = get_cred(new);
88152+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
88153+ set_tsk_need_resched(t);
88154+ }
88155+ }
88156+ read_unlock(&tasklist_lock);
88157+ rcu_read_unlock();
88158+ }
88159+
88160+ return ret;
88161+#else
88162+ return __commit_creds(new);
88163+#endif
88164+}
88165+
88166 EXPORT_SYMBOL(commit_creds);
88167
88168 /**
88169diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
88170index 1adf62b..7736e06 100644
88171--- a/kernel/debug/debug_core.c
88172+++ b/kernel/debug/debug_core.c
88173@@ -124,7 +124,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
88174 */
88175 static atomic_t masters_in_kgdb;
88176 static atomic_t slaves_in_kgdb;
88177-static atomic_t kgdb_break_tasklet_var;
88178+static atomic_unchecked_t kgdb_break_tasklet_var;
88179 atomic_t kgdb_setting_breakpoint;
88180
88181 struct task_struct *kgdb_usethread;
88182@@ -134,7 +134,7 @@ int kgdb_single_step;
88183 static pid_t kgdb_sstep_pid;
88184
88185 /* to keep track of the CPU which is doing the single stepping*/
88186-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
88187+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
88188
88189 /*
88190 * If you are debugging a problem where roundup (the collection of
88191@@ -549,7 +549,7 @@ return_normal:
88192 * kernel will only try for the value of sstep_tries before
88193 * giving up and continuing on.
88194 */
88195- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
88196+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
88197 (kgdb_info[cpu].task &&
88198 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
88199 atomic_set(&kgdb_active, -1);
88200@@ -647,8 +647,8 @@ cpu_master_loop:
88201 }
88202
88203 kgdb_restore:
88204- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
88205- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
88206+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
88207+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
88208 if (kgdb_info[sstep_cpu].task)
88209 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
88210 else
88211@@ -925,18 +925,18 @@ static void kgdb_unregister_callbacks(void)
88212 static void kgdb_tasklet_bpt(unsigned long ing)
88213 {
88214 kgdb_breakpoint();
88215- atomic_set(&kgdb_break_tasklet_var, 0);
88216+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
88217 }
88218
88219 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
88220
88221 void kgdb_schedule_breakpoint(void)
88222 {
88223- if (atomic_read(&kgdb_break_tasklet_var) ||
88224+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
88225 atomic_read(&kgdb_active) != -1 ||
88226 atomic_read(&kgdb_setting_breakpoint))
88227 return;
88228- atomic_inc(&kgdb_break_tasklet_var);
88229+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
88230 tasklet_schedule(&kgdb_tasklet_breakpoint);
88231 }
88232 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
88233diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
88234index 379650b..30c5180 100644
88235--- a/kernel/debug/kdb/kdb_main.c
88236+++ b/kernel/debug/kdb/kdb_main.c
88237@@ -1977,7 +1977,7 @@ static int kdb_lsmod(int argc, const char **argv)
88238 continue;
88239
88240 kdb_printf("%-20s%8u 0x%p ", mod->name,
88241- mod->core_size, (void *)mod);
88242+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
88243 #ifdef CONFIG_MODULE_UNLOAD
88244 kdb_printf("%4ld ", module_refcount(mod));
88245 #endif
88246@@ -1987,7 +1987,7 @@ static int kdb_lsmod(int argc, const char **argv)
88247 kdb_printf(" (Loading)");
88248 else
88249 kdb_printf(" (Live)");
88250- kdb_printf(" 0x%p", mod->module_core);
88251+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
88252
88253 #ifdef CONFIG_MODULE_UNLOAD
88254 {
88255diff --git a/kernel/events/core.c b/kernel/events/core.c
88256index 1cd5eef..e8b5af9 100644
88257--- a/kernel/events/core.c
88258+++ b/kernel/events/core.c
88259@@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
88260 * 0 - disallow raw tracepoint access for unpriv
88261 * 1 - disallow cpu events for unpriv
88262 * 2 - disallow kernel profiling for unpriv
88263+ * 3 - disallow all unpriv perf event use
88264 */
88265-int sysctl_perf_event_paranoid __read_mostly = 1;
88266+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
88267+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
88268+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
88269+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
88270+#else
88271+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
88272+#endif
88273
88274 /* Minimum for 512 kiB + 1 user control page */
88275 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
88276@@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
88277
88278 tmp *= sysctl_perf_cpu_time_max_percent;
88279 do_div(tmp, 100);
88280- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
88281+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
88282 }
88283
88284 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
88285@@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
88286 }
88287 }
88288
88289-static atomic64_t perf_event_id;
88290+static atomic64_unchecked_t perf_event_id;
88291
88292 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
88293 enum event_type_t event_type);
88294@@ -3102,7 +3109,7 @@ static void __perf_event_read(void *info)
88295
88296 static inline u64 perf_event_count(struct perf_event *event)
88297 {
88298- return local64_read(&event->count) + atomic64_read(&event->child_count);
88299+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
88300 }
88301
88302 static u64 perf_event_read(struct perf_event *event)
88303@@ -3528,9 +3535,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
88304 mutex_lock(&event->child_mutex);
88305 total += perf_event_read(event);
88306 *enabled += event->total_time_enabled +
88307- atomic64_read(&event->child_total_time_enabled);
88308+ atomic64_read_unchecked(&event->child_total_time_enabled);
88309 *running += event->total_time_running +
88310- atomic64_read(&event->child_total_time_running);
88311+ atomic64_read_unchecked(&event->child_total_time_running);
88312
88313 list_for_each_entry(child, &event->child_list, child_list) {
88314 total += perf_event_read(child);
88315@@ -3994,10 +4001,10 @@ void perf_event_update_userpage(struct perf_event *event)
88316 userpg->offset -= local64_read(&event->hw.prev_count);
88317
88318 userpg->time_enabled = enabled +
88319- atomic64_read(&event->child_total_time_enabled);
88320+ atomic64_read_unchecked(&event->child_total_time_enabled);
88321
88322 userpg->time_running = running +
88323- atomic64_read(&event->child_total_time_running);
88324+ atomic64_read_unchecked(&event->child_total_time_running);
88325
88326 arch_perf_update_userpage(userpg, now);
88327
88328@@ -4561,7 +4568,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
88329
88330 /* Data. */
88331 sp = perf_user_stack_pointer(regs);
88332- rem = __output_copy_user(handle, (void *) sp, dump_size);
88333+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
88334 dyn_size = dump_size - rem;
88335
88336 perf_output_skip(handle, rem);
88337@@ -4652,11 +4659,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
88338 values[n++] = perf_event_count(event);
88339 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
88340 values[n++] = enabled +
88341- atomic64_read(&event->child_total_time_enabled);
88342+ atomic64_read_unchecked(&event->child_total_time_enabled);
88343 }
88344 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
88345 values[n++] = running +
88346- atomic64_read(&event->child_total_time_running);
88347+ atomic64_read_unchecked(&event->child_total_time_running);
88348 }
88349 if (read_format & PERF_FORMAT_ID)
88350 values[n++] = primary_event_id(event);
88351@@ -6958,7 +6965,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
88352 event->parent = parent_event;
88353
88354 event->ns = get_pid_ns(task_active_pid_ns(current));
88355- event->id = atomic64_inc_return(&perf_event_id);
88356+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
88357
88358 event->state = PERF_EVENT_STATE_INACTIVE;
88359
88360@@ -7237,6 +7244,11 @@ SYSCALL_DEFINE5(perf_event_open,
88361 if (flags & ~PERF_FLAG_ALL)
88362 return -EINVAL;
88363
88364+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
88365+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
88366+ return -EACCES;
88367+#endif
88368+
88369 err = perf_copy_attr(attr_uptr, &attr);
88370 if (err)
88371 return err;
88372@@ -7592,10 +7604,10 @@ static void sync_child_event(struct perf_event *child_event,
88373 /*
88374 * Add back the child's count to the parent's count:
88375 */
88376- atomic64_add(child_val, &parent_event->child_count);
88377- atomic64_add(child_event->total_time_enabled,
88378+ atomic64_add_unchecked(child_val, &parent_event->child_count);
88379+ atomic64_add_unchecked(child_event->total_time_enabled,
88380 &parent_event->child_total_time_enabled);
88381- atomic64_add(child_event->total_time_running,
88382+ atomic64_add_unchecked(child_event->total_time_running,
88383 &parent_event->child_total_time_running);
88384
88385 /*
88386diff --git a/kernel/events/internal.h b/kernel/events/internal.h
88387index 569b2187..19940d9 100644
88388--- a/kernel/events/internal.h
88389+++ b/kernel/events/internal.h
88390@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
88391 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
88392 }
88393
88394-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
88395+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
88396 static inline unsigned long \
88397 func_name(struct perf_output_handle *handle, \
88398- const void *buf, unsigned long len) \
88399+ const void user *buf, unsigned long len) \
88400 { \
88401 unsigned long size, written; \
88402 \
88403@@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
88404 return 0;
88405 }
88406
88407-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
88408+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
88409
88410 static inline unsigned long
88411 memcpy_skip(void *dst, const void *src, unsigned long n)
88412@@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
88413 return 0;
88414 }
88415
88416-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
88417+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
88418
88419 #ifndef arch_perf_out_copy_user
88420 #define arch_perf_out_copy_user arch_perf_out_copy_user
88421@@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
88422 }
88423 #endif
88424
88425-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
88426+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
88427
88428 /* Callchain handling */
88429 extern struct perf_callchain_entry *
88430diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
88431index ed8f2cd..fe8030c 100644
88432--- a/kernel/events/uprobes.c
88433+++ b/kernel/events/uprobes.c
88434@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
88435 {
88436 struct page *page;
88437 uprobe_opcode_t opcode;
88438- int result;
88439+ long result;
88440
88441 pagefault_disable();
88442 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
88443diff --git a/kernel/exit.c b/kernel/exit.c
88444index 5d30019..934add5 100644
88445--- a/kernel/exit.c
88446+++ b/kernel/exit.c
88447@@ -174,6 +174,10 @@ void release_task(struct task_struct *p)
88448 struct task_struct *leader;
88449 int zap_leader;
88450 repeat:
88451+#ifdef CONFIG_NET
88452+ gr_del_task_from_ip_table(p);
88453+#endif
88454+
88455 /* don't need to get the RCU readlock here - the process is dead and
88456 * can't be modifying its own credentials. But shut RCU-lockdep up */
88457 rcu_read_lock();
88458@@ -670,6 +674,8 @@ void do_exit(long code)
88459 int group_dead;
88460 TASKS_RCU(int tasks_rcu_i);
88461
88462+ set_fs(USER_DS);
88463+
88464 profile_task_exit(tsk);
88465
88466 WARN_ON(blk_needs_flush_plug(tsk));
88467@@ -686,7 +692,6 @@ void do_exit(long code)
88468 * mm_release()->clear_child_tid() from writing to a user-controlled
88469 * kernel address.
88470 */
88471- set_fs(USER_DS);
88472
88473 ptrace_event(PTRACE_EVENT_EXIT, code);
88474
88475@@ -744,6 +749,9 @@ void do_exit(long code)
88476 tsk->exit_code = code;
88477 taskstats_exit(tsk, group_dead);
88478
88479+ gr_acl_handle_psacct(tsk, code);
88480+ gr_acl_handle_exit();
88481+
88482 exit_mm(tsk);
88483
88484 if (group_dead)
88485@@ -863,7 +871,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
88486 * Take down every thread in the group. This is called by fatal signals
88487 * as well as by sys_exit_group (below).
88488 */
88489-void
88490+__noreturn void
88491 do_group_exit(int exit_code)
88492 {
88493 struct signal_struct *sig = current->signal;
88494diff --git a/kernel/fork.c b/kernel/fork.c
88495index 9b7d746..5b898ab 100644
88496--- a/kernel/fork.c
88497+++ b/kernel/fork.c
88498@@ -183,6 +183,48 @@ void thread_info_cache_init(void)
88499 # endif
88500 #endif
88501
88502+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88503+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
88504+ int node, void **lowmem_stack)
88505+{
88506+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
88507+ void *ret = NULL;
88508+ unsigned int i;
88509+
88510+ *lowmem_stack = alloc_thread_info_node(tsk, node);
88511+ if (*lowmem_stack == NULL)
88512+ goto out;
88513+
88514+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
88515+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
88516+
88517+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
88518+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
88519+ if (ret == NULL) {
88520+ free_thread_info(*lowmem_stack);
88521+ *lowmem_stack = NULL;
88522+ }
88523+
88524+out:
88525+ return ret;
88526+}
88527+
88528+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
88529+{
88530+ unmap_process_stacks(tsk);
88531+}
88532+#else
88533+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
88534+ int node, void **lowmem_stack)
88535+{
88536+ return alloc_thread_info_node(tsk, node);
88537+}
88538+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
88539+{
88540+ free_thread_info(ti);
88541+}
88542+#endif
88543+
88544 /* SLAB cache for signal_struct structures (tsk->signal) */
88545 static struct kmem_cache *signal_cachep;
88546
88547@@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
88548 /* SLAB cache for mm_struct structures (tsk->mm) */
88549 static struct kmem_cache *mm_cachep;
88550
88551-static void account_kernel_stack(struct thread_info *ti, int account)
88552+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
88553 {
88554+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88555+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
88556+#else
88557 struct zone *zone = page_zone(virt_to_page(ti));
88558+#endif
88559
88560 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
88561 }
88562
88563 void free_task(struct task_struct *tsk)
88564 {
88565- account_kernel_stack(tsk->stack, -1);
88566+ account_kernel_stack(tsk, tsk->stack, -1);
88567 arch_release_thread_info(tsk->stack);
88568- free_thread_info(tsk->stack);
88569+ gr_free_thread_info(tsk, tsk->stack);
88570 rt_mutex_debug_task_free(tsk);
88571 ftrace_graph_exit_task(tsk);
88572 put_seccomp_filter(tsk);
88573@@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88574 {
88575 struct task_struct *tsk;
88576 struct thread_info *ti;
88577+ void *lowmem_stack;
88578 int node = tsk_fork_get_node(orig);
88579 int err;
88580
88581@@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88582 if (!tsk)
88583 return NULL;
88584
88585- ti = alloc_thread_info_node(tsk, node);
88586+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
88587 if (!ti)
88588 goto free_tsk;
88589
88590@@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88591 goto free_ti;
88592
88593 tsk->stack = ti;
88594+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
88595+ tsk->lowmem_stack = lowmem_stack;
88596+#endif
88597 #ifdef CONFIG_SECCOMP
88598 /*
88599 * We must handle setting up seccomp filters once we're under
88600@@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88601 set_task_stack_end_magic(tsk);
88602
88603 #ifdef CONFIG_CC_STACKPROTECTOR
88604- tsk->stack_canary = get_random_int();
88605+ tsk->stack_canary = pax_get_random_long();
88606 #endif
88607
88608 /*
88609@@ -352,24 +402,92 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
88610 tsk->splice_pipe = NULL;
88611 tsk->task_frag.page = NULL;
88612
88613- account_kernel_stack(ti, 1);
88614+ account_kernel_stack(tsk, ti, 1);
88615
88616 return tsk;
88617
88618 free_ti:
88619- free_thread_info(ti);
88620+ gr_free_thread_info(tsk, ti);
88621 free_tsk:
88622 free_task_struct(tsk);
88623 return NULL;
88624 }
88625
88626 #ifdef CONFIG_MMU
88627-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88628+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
88629+{
88630+ struct vm_area_struct *tmp;
88631+ unsigned long charge;
88632+ struct file *file;
88633+ int retval;
88634+
88635+ charge = 0;
88636+ if (mpnt->vm_flags & VM_ACCOUNT) {
88637+ unsigned long len = vma_pages(mpnt);
88638+
88639+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
88640+ goto fail_nomem;
88641+ charge = len;
88642+ }
88643+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
88644+ if (!tmp)
88645+ goto fail_nomem;
88646+ *tmp = *mpnt;
88647+ tmp->vm_mm = mm;
88648+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
88649+ retval = vma_dup_policy(mpnt, tmp);
88650+ if (retval)
88651+ goto fail_nomem_policy;
88652+ if (anon_vma_fork(tmp, mpnt))
88653+ goto fail_nomem_anon_vma_fork;
88654+ tmp->vm_flags &= ~VM_LOCKED;
88655+ tmp->vm_next = tmp->vm_prev = NULL;
88656+ tmp->vm_mirror = NULL;
88657+ file = tmp->vm_file;
88658+ if (file) {
88659+ struct inode *inode = file_inode(file);
88660+ struct address_space *mapping = file->f_mapping;
88661+
88662+ get_file(file);
88663+ if (tmp->vm_flags & VM_DENYWRITE)
88664+ atomic_dec(&inode->i_writecount);
88665+ mutex_lock(&mapping->i_mmap_mutex);
88666+ if (tmp->vm_flags & VM_SHARED)
88667+ atomic_inc(&mapping->i_mmap_writable);
88668+ flush_dcache_mmap_lock(mapping);
88669+ /* insert tmp into the share list, just after mpnt */
88670+ if (unlikely(tmp->vm_flags & VM_NONLINEAR))
88671+ vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
88672+ else
88673+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
88674+ flush_dcache_mmap_unlock(mapping);
88675+ mutex_unlock(&mapping->i_mmap_mutex);
88676+ }
88677+
88678+ /*
88679+ * Clear hugetlb-related page reserves for children. This only
88680+ * affects MAP_PRIVATE mappings. Faults generated by the child
88681+ * are not guaranteed to succeed, even if read-only
88682+ */
88683+ if (is_vm_hugetlb_page(tmp))
88684+ reset_vma_resv_huge_pages(tmp);
88685+
88686+ return tmp;
88687+
88688+fail_nomem_anon_vma_fork:
88689+ mpol_put(vma_policy(tmp));
88690+fail_nomem_policy:
88691+ kmem_cache_free(vm_area_cachep, tmp);
88692+fail_nomem:
88693+ vm_unacct_memory(charge);
88694+ return NULL;
88695+}
88696+
88697+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88698 {
88699 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
88700 struct rb_node **rb_link, *rb_parent;
88701 int retval;
88702- unsigned long charge;
88703
88704 uprobe_start_dup_mmap();
88705 down_write(&oldmm->mmap_sem);
88706@@ -397,55 +515,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88707
88708 prev = NULL;
88709 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
88710- struct file *file;
88711-
88712 if (mpnt->vm_flags & VM_DONTCOPY) {
88713 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
88714 -vma_pages(mpnt));
88715 continue;
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- INIT_LIST_HEAD(&tmp->anon_vma_chain);
88730- retval = vma_dup_policy(mpnt, tmp);
88731- if (retval)
88732- goto fail_nomem_policy;
88733- tmp->vm_mm = mm;
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- file = tmp->vm_file;
88739- if (file) {
88740- struct inode *inode = file_inode(file);
88741- struct address_space *mapping = file->f_mapping;
88742-
88743- get_file(file);
88744- if (tmp->vm_flags & VM_DENYWRITE)
88745- atomic_dec(&inode->i_writecount);
88746- mutex_lock(&mapping->i_mmap_mutex);
88747- if (tmp->vm_flags & VM_SHARED)
88748- atomic_inc(&mapping->i_mmap_writable);
88749- flush_dcache_mmap_lock(mapping);
88750- /* insert tmp into the share list, just after mpnt */
88751- if (unlikely(tmp->vm_flags & VM_NONLINEAR))
88752- vma_nonlinear_insert(tmp,
88753- &mapping->i_mmap_nonlinear);
88754- else
88755- vma_interval_tree_insert_after(tmp, mpnt,
88756- &mapping->i_mmap);
88757- flush_dcache_mmap_unlock(mapping);
88758- mutex_unlock(&mapping->i_mmap_mutex);
88759+ tmp = dup_vma(mm, oldmm, mpnt);
88760+ if (!tmp) {
88761+ retval = -ENOMEM;
88762+ goto out;
88763 }
88764
88765 /*
88766@@ -477,6 +555,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
88767 if (retval)
88768 goto out;
88769 }
88770+
88771+#ifdef CONFIG_PAX_SEGMEXEC
88772+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
88773+ struct vm_area_struct *mpnt_m;
88774+
88775+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
88776+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
88777+
88778+ if (!mpnt->vm_mirror)
88779+ continue;
88780+
88781+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
88782+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
88783+ mpnt->vm_mirror = mpnt_m;
88784+ } else {
88785+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
88786+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
88787+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
88788+ mpnt->vm_mirror->vm_mirror = mpnt;
88789+ }
88790+ }
88791+ BUG_ON(mpnt_m);
88792+ }
88793+#endif
88794+
88795 /* a new mm has just been created */
88796 arch_dup_mmap(oldmm, mm);
88797 retval = 0;
88798@@ -486,14 +589,6 @@ out:
88799 up_write(&oldmm->mmap_sem);
88800 uprobe_end_dup_mmap();
88801 return retval;
88802-fail_nomem_anon_vma_fork:
88803- mpol_put(vma_policy(tmp));
88804-fail_nomem_policy:
88805- kmem_cache_free(vm_area_cachep, tmp);
88806-fail_nomem:
88807- retval = -ENOMEM;
88808- vm_unacct_memory(charge);
88809- goto out;
88810 }
88811
88812 static inline int mm_alloc_pgd(struct mm_struct *mm)
88813@@ -734,8 +829,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
88814 return ERR_PTR(err);
88815
88816 mm = get_task_mm(task);
88817- if (mm && mm != current->mm &&
88818- !ptrace_may_access(task, mode)) {
88819+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
88820+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
88821 mmput(mm);
88822 mm = ERR_PTR(-EACCES);
88823 }
88824@@ -938,13 +1033,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
88825 spin_unlock(&fs->lock);
88826 return -EAGAIN;
88827 }
88828- fs->users++;
88829+ atomic_inc(&fs->users);
88830 spin_unlock(&fs->lock);
88831 return 0;
88832 }
88833 tsk->fs = copy_fs_struct(fs);
88834 if (!tsk->fs)
88835 return -ENOMEM;
88836+ /* Carry through gr_chroot_dentry and is_chrooted instead
88837+ of recomputing it here. Already copied when the task struct
88838+ is duplicated. This allows pivot_root to not be treated as
88839+ a chroot
88840+ */
88841+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
88842+
88843 return 0;
88844 }
88845
88846@@ -1179,7 +1281,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
88847 * parts of the process environment (as per the clone
88848 * flags). The actual kick-off is left to the caller.
88849 */
88850-static struct task_struct *copy_process(unsigned long clone_flags,
88851+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
88852 unsigned long stack_start,
88853 unsigned long stack_size,
88854 int __user *child_tidptr,
88855@@ -1250,6 +1352,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
88856 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
88857 #endif
88858 retval = -EAGAIN;
88859+
88860+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
88861+
88862 if (atomic_read(&p->real_cred->user->processes) >=
88863 task_rlimit(p, RLIMIT_NPROC)) {
88864 if (p->real_cred->user != INIT_USER &&
88865@@ -1499,6 +1604,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
88866 goto bad_fork_free_pid;
88867 }
88868
88869+ /* synchronizes with gr_set_acls()
88870+ we need to call this past the point of no return for fork()
88871+ */
88872+ gr_copy_label(p);
88873+
88874 if (likely(p->pid)) {
88875 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
88876
88877@@ -1589,6 +1699,8 @@ bad_fork_cleanup_count:
88878 bad_fork_free:
88879 free_task(p);
88880 fork_out:
88881+ gr_log_forkfail(retval);
88882+
88883 return ERR_PTR(retval);
88884 }
88885
88886@@ -1650,6 +1762,7 @@ long do_fork(unsigned long clone_flags,
88887
88888 p = copy_process(clone_flags, stack_start, stack_size,
88889 child_tidptr, NULL, trace);
88890+ add_latent_entropy();
88891 /*
88892 * Do this prior waking up the new thread - the thread pointer
88893 * might get invalid after that point, if the thread exits quickly.
88894@@ -1666,6 +1779,8 @@ long do_fork(unsigned long clone_flags,
88895 if (clone_flags & CLONE_PARENT_SETTID)
88896 put_user(nr, parent_tidptr);
88897
88898+ gr_handle_brute_check();
88899+
88900 if (clone_flags & CLONE_VFORK) {
88901 p->vfork_done = &vfork;
88902 init_completion(&vfork);
88903@@ -1784,7 +1899,7 @@ void __init proc_caches_init(void)
88904 mm_cachep = kmem_cache_create("mm_struct",
88905 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
88906 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
88907- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
88908+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
88909 mmap_init();
88910 nsproxy_cache_init();
88911 }
88912@@ -1824,7 +1939,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
88913 return 0;
88914
88915 /* don't need lock here; in the worst case we'll do useless copy */
88916- if (fs->users == 1)
88917+ if (atomic_read(&fs->users) == 1)
88918 return 0;
88919
88920 *new_fsp = copy_fs_struct(fs);
88921@@ -1936,7 +2051,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
88922 fs = current->fs;
88923 spin_lock(&fs->lock);
88924 current->fs = new_fs;
88925- if (--fs->users)
88926+ gr_set_chroot_entries(current, &current->fs->root);
88927+ if (atomic_dec_return(&fs->users))
88928 new_fs = NULL;
88929 else
88930 new_fs = fs;
88931diff --git a/kernel/futex.c b/kernel/futex.c
88932index 63678b5..512f9af 100644
88933--- a/kernel/futex.c
88934+++ b/kernel/futex.c
88935@@ -201,7 +201,7 @@ struct futex_pi_state {
88936 atomic_t refcount;
88937
88938 union futex_key key;
88939-};
88940+} __randomize_layout;
88941
88942 /**
88943 * struct futex_q - The hashed futex queue entry, one per waiting task
88944@@ -235,7 +235,7 @@ struct futex_q {
88945 struct rt_mutex_waiter *rt_waiter;
88946 union futex_key *requeue_pi_key;
88947 u32 bitset;
88948-};
88949+} __randomize_layout;
88950
88951 static const struct futex_q futex_q_init = {
88952 /* list gets initialized in queue_me()*/
88953@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
88954 struct page *page, *page_head;
88955 int err, ro = 0;
88956
88957+#ifdef CONFIG_PAX_SEGMEXEC
88958+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
88959+ return -EFAULT;
88960+#endif
88961+
88962 /*
88963 * The futex address must be "naturally" aligned.
88964 */
88965@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
88966
88967 static int get_futex_value_locked(u32 *dest, u32 __user *from)
88968 {
88969- int ret;
88970+ unsigned long ret;
88971
88972 pagefault_disable();
88973 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
88974@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
88975 {
88976 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
88977 u32 curval;
88978+ mm_segment_t oldfs;
88979
88980 /*
88981 * This will fail and we want it. Some arch implementations do
88982@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
88983 * implementation, the non-functional ones will return
88984 * -ENOSYS.
88985 */
88986+ oldfs = get_fs();
88987+ set_fs(USER_DS);
88988 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
88989 futex_cmpxchg_enabled = 1;
88990+ set_fs(oldfs);
88991 #endif
88992 }
88993
88994diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
88995index 55c8c93..9ba7ad6 100644
88996--- a/kernel/futex_compat.c
88997+++ b/kernel/futex_compat.c
88998@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
88999 return 0;
89000 }
89001
89002-static void __user *futex_uaddr(struct robust_list __user *entry,
89003+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
89004 compat_long_t futex_offset)
89005 {
89006 compat_uptr_t base = ptr_to_compat(entry);
89007diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
89008index b358a80..fc25240 100644
89009--- a/kernel/gcov/base.c
89010+++ b/kernel/gcov/base.c
89011@@ -114,11 +114,6 @@ void gcov_enable_events(void)
89012 }
89013
89014 #ifdef CONFIG_MODULES
89015-static inline int within(void *addr, void *start, unsigned long size)
89016-{
89017- return ((addr >= start) && (addr < start + size));
89018-}
89019-
89020 /* Update list and generate events when modules are unloaded. */
89021 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
89022 void *data)
89023@@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
89024
89025 /* Remove entries located in module from linked list. */
89026 while ((info = gcov_info_next(info))) {
89027- if (within(info, mod->module_core, mod->core_size)) {
89028+ if (within_module_core_rw((unsigned long)info, mod)) {
89029 gcov_info_unlink(prev, info);
89030 if (gcov_events_enabled)
89031 gcov_event(GCOV_REMOVE, info);
89032diff --git a/kernel/jump_label.c b/kernel/jump_label.c
89033index 9019f15..9a3c42e 100644
89034--- a/kernel/jump_label.c
89035+++ b/kernel/jump_label.c
89036@@ -14,6 +14,7 @@
89037 #include <linux/err.h>
89038 #include <linux/static_key.h>
89039 #include <linux/jump_label_ratelimit.h>
89040+#include <linux/mm.h>
89041
89042 #ifdef HAVE_JUMP_LABEL
89043
89044@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
89045
89046 size = (((unsigned long)stop - (unsigned long)start)
89047 / sizeof(struct jump_entry));
89048+ pax_open_kernel();
89049 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
89050+ pax_close_kernel();
89051 }
89052
89053 static void jump_label_update(struct static_key *key, int enable);
89054@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
89055 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
89056 struct jump_entry *iter;
89057
89058+ pax_open_kernel();
89059 for (iter = iter_start; iter < iter_stop; iter++) {
89060 if (within_module_init(iter->code, mod))
89061 iter->code = 0;
89062 }
89063+ pax_close_kernel();
89064 }
89065
89066 static int
89067diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
89068index 5c5987f..bc502b0 100644
89069--- a/kernel/kallsyms.c
89070+++ b/kernel/kallsyms.c
89071@@ -11,6 +11,9 @@
89072 * Changed the compression method from stem compression to "table lookup"
89073 * compression (see scripts/kallsyms.c for a more complete description)
89074 */
89075+#ifdef CONFIG_GRKERNSEC_HIDESYM
89076+#define __INCLUDED_BY_HIDESYM 1
89077+#endif
89078 #include <linux/kallsyms.h>
89079 #include <linux/module.h>
89080 #include <linux/init.h>
89081@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
89082
89083 static inline int is_kernel_inittext(unsigned long addr)
89084 {
89085+ if (system_state != SYSTEM_BOOTING)
89086+ return 0;
89087+
89088 if (addr >= (unsigned long)_sinittext
89089 && addr <= (unsigned long)_einittext)
89090 return 1;
89091 return 0;
89092 }
89093
89094+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89095+#ifdef CONFIG_MODULES
89096+static inline int is_module_text(unsigned long addr)
89097+{
89098+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
89099+ return 1;
89100+
89101+ addr = ktla_ktva(addr);
89102+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
89103+}
89104+#else
89105+static inline int is_module_text(unsigned long addr)
89106+{
89107+ return 0;
89108+}
89109+#endif
89110+#endif
89111+
89112 static inline int is_kernel_text(unsigned long addr)
89113 {
89114 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
89115@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
89116
89117 static inline int is_kernel(unsigned long addr)
89118 {
89119+
89120+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89121+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
89122+ return 1;
89123+
89124+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
89125+#else
89126 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
89127+#endif
89128+
89129 return 1;
89130 return in_gate_area_no_mm(addr);
89131 }
89132
89133 static int is_ksym_addr(unsigned long addr)
89134 {
89135+
89136+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
89137+ if (is_module_text(addr))
89138+ return 0;
89139+#endif
89140+
89141 if (all_var)
89142 return is_kernel(addr);
89143
89144@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
89145
89146 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
89147 {
89148- iter->name[0] = '\0';
89149 iter->nameoff = get_symbol_offset(new_pos);
89150 iter->pos = new_pos;
89151 }
89152@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
89153 {
89154 struct kallsym_iter *iter = m->private;
89155
89156+#ifdef CONFIG_GRKERNSEC_HIDESYM
89157+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
89158+ return 0;
89159+#endif
89160+
89161 /* Some debugging symbols have no name. Ignore them. */
89162 if (!iter->name[0])
89163 return 0;
89164@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
89165 */
89166 type = iter->exported ? toupper(iter->type) :
89167 tolower(iter->type);
89168+
89169 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
89170 type, iter->name, iter->module_name);
89171 } else
89172diff --git a/kernel/kcmp.c b/kernel/kcmp.c
89173index 0aa69ea..a7fcafb 100644
89174--- a/kernel/kcmp.c
89175+++ b/kernel/kcmp.c
89176@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
89177 struct task_struct *task1, *task2;
89178 int ret;
89179
89180+#ifdef CONFIG_GRKERNSEC
89181+ return -ENOSYS;
89182+#endif
89183+
89184 rcu_read_lock();
89185
89186 /*
89187diff --git a/kernel/kexec.c b/kernel/kexec.c
89188index 2abf9f6..c40cf85 100644
89189--- a/kernel/kexec.c
89190+++ b/kernel/kexec.c
89191@@ -1349,7 +1349,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
89192 compat_ulong_t, flags)
89193 {
89194 struct compat_kexec_segment in;
89195- struct kexec_segment out, __user *ksegments;
89196+ struct kexec_segment out;
89197+ struct kexec_segment __user *ksegments;
89198 unsigned long i, result;
89199
89200 /* Don't allow clients that don't understand the native
89201diff --git a/kernel/kmod.c b/kernel/kmod.c
89202index 80f7a6d..3c476d3 100644
89203--- a/kernel/kmod.c
89204+++ b/kernel/kmod.c
89205@@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
89206 kfree(info->argv);
89207 }
89208
89209-static int call_modprobe(char *module_name, int wait)
89210+static int call_modprobe(char *module_name, char *module_param, int wait)
89211 {
89212 struct subprocess_info *info;
89213 static char *envp[] = {
89214@@ -85,7 +85,7 @@ static int call_modprobe(char *module_name, int wait)
89215 NULL
89216 };
89217
89218- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
89219+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
89220 if (!argv)
89221 goto out;
89222
89223@@ -97,7 +97,8 @@ static int call_modprobe(char *module_name, int wait)
89224 argv[1] = "-q";
89225 argv[2] = "--";
89226 argv[3] = module_name; /* check free_modprobe_argv() */
89227- argv[4] = NULL;
89228+ argv[4] = module_param;
89229+ argv[5] = NULL;
89230
89231 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
89232 NULL, free_modprobe_argv, NULL);
89233@@ -129,9 +130,8 @@ out:
89234 * If module auto-loading support is disabled then this function
89235 * becomes a no-operation.
89236 */
89237-int __request_module(bool wait, const char *fmt, ...)
89238+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
89239 {
89240- va_list args;
89241 char module_name[MODULE_NAME_LEN];
89242 unsigned int max_modprobes;
89243 int ret;
89244@@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
89245 if (!modprobe_path[0])
89246 return 0;
89247
89248- va_start(args, fmt);
89249- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
89250- va_end(args);
89251+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
89252 if (ret >= MODULE_NAME_LEN)
89253 return -ENAMETOOLONG;
89254
89255@@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
89256 if (ret)
89257 return ret;
89258
89259+#ifdef CONFIG_GRKERNSEC_MODHARDEN
89260+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
89261+ /* hack to workaround consolekit/udisks stupidity */
89262+ read_lock(&tasklist_lock);
89263+ if (!strcmp(current->comm, "mount") &&
89264+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
89265+ read_unlock(&tasklist_lock);
89266+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
89267+ return -EPERM;
89268+ }
89269+ read_unlock(&tasklist_lock);
89270+ }
89271+#endif
89272+
89273 /* If modprobe needs a service that is in a module, we get a recursive
89274 * loop. Limit the number of running kmod threads to max_threads/2 or
89275 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
89276@@ -188,16 +200,61 @@ int __request_module(bool wait, const char *fmt, ...)
89277
89278 trace_module_request(module_name, wait, _RET_IP_);
89279
89280- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
89281+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
89282
89283 atomic_dec(&kmod_concurrent);
89284 return ret;
89285 }
89286+
89287+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
89288+{
89289+ va_list args;
89290+ int ret;
89291+
89292+ va_start(args, fmt);
89293+ ret = ____request_module(wait, module_param, fmt, args);
89294+ va_end(args);
89295+
89296+ return ret;
89297+}
89298+
89299+int __request_module(bool wait, const char *fmt, ...)
89300+{
89301+ va_list args;
89302+ int ret;
89303+
89304+#ifdef CONFIG_GRKERNSEC_MODHARDEN
89305+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
89306+ char module_param[MODULE_NAME_LEN];
89307+
89308+ memset(module_param, 0, sizeof(module_param));
89309+
89310+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
89311+
89312+ va_start(args, fmt);
89313+ ret = ____request_module(wait, module_param, fmt, args);
89314+ va_end(args);
89315+
89316+ return ret;
89317+ }
89318+#endif
89319+
89320+ va_start(args, fmt);
89321+ ret = ____request_module(wait, NULL, fmt, args);
89322+ va_end(args);
89323+
89324+ return ret;
89325+}
89326+
89327 EXPORT_SYMBOL(__request_module);
89328 #endif /* CONFIG_MODULES */
89329
89330 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
89331 {
89332+#ifdef CONFIG_GRKERNSEC
89333+ kfree(info->path);
89334+ info->path = info->origpath;
89335+#endif
89336 if (info->cleanup)
89337 (*info->cleanup)(info);
89338 kfree(info);
89339@@ -240,6 +297,20 @@ static int ____call_usermodehelper(void *data)
89340 */
89341 set_user_nice(current, 0);
89342
89343+#ifdef CONFIG_GRKERNSEC
89344+ /* this is race-free as far as userland is concerned as we copied
89345+ out the path to be used prior to this point and are now operating
89346+ on that copy
89347+ */
89348+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
89349+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
89350+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
89351+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
89352+ retval = -EPERM;
89353+ goto out;
89354+ }
89355+#endif
89356+
89357 retval = -ENOMEM;
89358 new = prepare_kernel_cred(current);
89359 if (!new)
89360@@ -262,8 +333,8 @@ static int ____call_usermodehelper(void *data)
89361 commit_creds(new);
89362
89363 retval = do_execve(getname_kernel(sub_info->path),
89364- (const char __user *const __user *)sub_info->argv,
89365- (const char __user *const __user *)sub_info->envp);
89366+ (const char __user *const __force_user *)sub_info->argv,
89367+ (const char __user *const __force_user *)sub_info->envp);
89368 out:
89369 sub_info->retval = retval;
89370 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
89371@@ -303,7 +374,7 @@ static int wait_for_helper(void *data)
89372 *
89373 * Thus the __user pointer cast is valid here.
89374 */
89375- sys_wait4(pid, (int __user *)&ret, 0, NULL);
89376+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
89377
89378 /*
89379 * If ret is 0, either ____call_usermodehelper failed and the
89380@@ -532,7 +603,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
89381 goto out;
89382
89383 INIT_WORK(&sub_info->work, __call_usermodehelper);
89384+#ifdef CONFIG_GRKERNSEC
89385+ sub_info->origpath = path;
89386+ sub_info->path = kstrdup(path, gfp_mask);
89387+#else
89388 sub_info->path = path;
89389+#endif
89390 sub_info->argv = argv;
89391 sub_info->envp = envp;
89392
89393@@ -645,7 +721,7 @@ EXPORT_SYMBOL(call_usermodehelper);
89394 static int proc_cap_handler(struct ctl_table *table, int write,
89395 void __user *buffer, size_t *lenp, loff_t *ppos)
89396 {
89397- struct ctl_table t;
89398+ ctl_table_no_const t;
89399 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
89400 kernel_cap_t new_cap;
89401 int err, i;
89402diff --git a/kernel/kprobes.c b/kernel/kprobes.c
89403index 3995f54..e247879 100644
89404--- a/kernel/kprobes.c
89405+++ b/kernel/kprobes.c
89406@@ -31,6 +31,9 @@
89407 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
89408 * <prasanna@in.ibm.com> added function-return probes.
89409 */
89410+#ifdef CONFIG_GRKERNSEC_HIDESYM
89411+#define __INCLUDED_BY_HIDESYM 1
89412+#endif
89413 #include <linux/kprobes.h>
89414 #include <linux/hash.h>
89415 #include <linux/init.h>
89416@@ -122,12 +125,12 @@ enum kprobe_slot_state {
89417
89418 static void *alloc_insn_page(void)
89419 {
89420- return module_alloc(PAGE_SIZE);
89421+ return module_alloc_exec(PAGE_SIZE);
89422 }
89423
89424 static void free_insn_page(void *page)
89425 {
89426- module_free(NULL, page);
89427+ module_free_exec(NULL, page);
89428 }
89429
89430 struct kprobe_insn_cache kprobe_insn_slots = {
89431@@ -2187,11 +2190,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
89432 kprobe_type = "k";
89433
89434 if (sym)
89435- seq_printf(pi, "%p %s %s+0x%x %s ",
89436+ seq_printf(pi, "%pK %s %s+0x%x %s ",
89437 p->addr, kprobe_type, sym, offset,
89438 (modname ? modname : " "));
89439 else
89440- seq_printf(pi, "%p %s %p ",
89441+ seq_printf(pi, "%pK %s %pK ",
89442 p->addr, kprobe_type, p->addr);
89443
89444 if (!pp)
89445diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
89446index 6683cce..daf8999 100644
89447--- a/kernel/ksysfs.c
89448+++ b/kernel/ksysfs.c
89449@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
89450 {
89451 if (count+1 > UEVENT_HELPER_PATH_LEN)
89452 return -ENOENT;
89453+ if (!capable(CAP_SYS_ADMIN))
89454+ return -EPERM;
89455 memcpy(uevent_helper, buf, count);
89456 uevent_helper[count] = '\0';
89457 if (count && uevent_helper[count-1] == '\n')
89458@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
89459 return count;
89460 }
89461
89462-static struct bin_attribute notes_attr = {
89463+static bin_attribute_no_const notes_attr __read_only = {
89464 .attr = {
89465 .name = "notes",
89466 .mode = S_IRUGO,
89467diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
89468index 88d0d44..e9ce0ee 100644
89469--- a/kernel/locking/lockdep.c
89470+++ b/kernel/locking/lockdep.c
89471@@ -599,6 +599,10 @@ static int static_obj(void *obj)
89472 end = (unsigned long) &_end,
89473 addr = (unsigned long) obj;
89474
89475+#ifdef CONFIG_PAX_KERNEXEC
89476+ start = ktla_ktva(start);
89477+#endif
89478+
89479 /*
89480 * static variable?
89481 */
89482@@ -740,6 +744,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
89483 if (!static_obj(lock->key)) {
89484 debug_locks_off();
89485 printk("INFO: trying to register non-static key.\n");
89486+ printk("lock:%pS key:%pS.\n", lock, lock->key);
89487 printk("the code is fine but needs lockdep annotation.\n");
89488 printk("turning off the locking correctness validator.\n");
89489 dump_stack();
89490@@ -3081,7 +3086,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
89491 if (!class)
89492 return 0;
89493 }
89494- atomic_inc((atomic_t *)&class->ops);
89495+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
89496 if (very_verbose(class)) {
89497 printk("\nacquire class [%p] %s", class->key, class->name);
89498 if (class->name_version > 1)
89499diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
89500index ef43ac4..2720dfa 100644
89501--- a/kernel/locking/lockdep_proc.c
89502+++ b/kernel/locking/lockdep_proc.c
89503@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
89504 return 0;
89505 }
89506
89507- seq_printf(m, "%p", class->key);
89508+ seq_printf(m, "%pK", class->key);
89509 #ifdef CONFIG_DEBUG_LOCKDEP
89510 seq_printf(m, " OPS:%8ld", class->ops);
89511 #endif
89512@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
89513
89514 list_for_each_entry(entry, &class->locks_after, entry) {
89515 if (entry->distance == 1) {
89516- seq_printf(m, " -> [%p] ", entry->class->key);
89517+ seq_printf(m, " -> [%pK] ", entry->class->key);
89518 print_name(m, entry->class);
89519 seq_puts(m, "\n");
89520 }
89521@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
89522 if (!class->key)
89523 continue;
89524
89525- seq_printf(m, "[%p] ", class->key);
89526+ seq_printf(m, "[%pK] ", class->key);
89527 print_name(m, class);
89528 seq_puts(m, "\n");
89529 }
89530@@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
89531 if (!i)
89532 seq_line(m, '-', 40-namelen, namelen);
89533
89534- snprintf(ip, sizeof(ip), "[<%p>]",
89535+ snprintf(ip, sizeof(ip), "[<%pK>]",
89536 (void *)class->contention_point[i]);
89537 seq_printf(m, "%40s %14lu %29s %pS\n",
89538 name, stats->contention_point[i],
89539@@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
89540 if (!i)
89541 seq_line(m, '-', 40-namelen, namelen);
89542
89543- snprintf(ip, sizeof(ip), "[<%p>]",
89544+ snprintf(ip, sizeof(ip), "[<%pK>]",
89545 (void *)class->contending_point[i]);
89546 seq_printf(m, "%40s %14lu %29s %pS\n",
89547 name, stats->contending_point[i],
89548diff --git a/kernel/locking/mcs_spinlock.c b/kernel/locking/mcs_spinlock.c
89549index 9887a90..0cd2b1d 100644
89550--- a/kernel/locking/mcs_spinlock.c
89551+++ b/kernel/locking/mcs_spinlock.c
89552@@ -100,7 +100,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
89553
89554 prev = decode_cpu(old);
89555 node->prev = prev;
89556- ACCESS_ONCE(prev->next) = node;
89557+ ACCESS_ONCE_RW(prev->next) = node;
89558
89559 /*
89560 * Normally @prev is untouchable after the above store; because at that
89561@@ -172,8 +172,8 @@ unqueue:
89562 * it will wait in Step-A.
89563 */
89564
89565- ACCESS_ONCE(next->prev) = prev;
89566- ACCESS_ONCE(prev->next) = next;
89567+ ACCESS_ONCE_RW(next->prev) = prev;
89568+ ACCESS_ONCE_RW(prev->next) = next;
89569
89570 return false;
89571 }
89572@@ -195,13 +195,13 @@ void osq_unlock(struct optimistic_spin_queue *lock)
89573 node = this_cpu_ptr(&osq_node);
89574 next = xchg(&node->next, NULL);
89575 if (next) {
89576- ACCESS_ONCE(next->locked) = 1;
89577+ ACCESS_ONCE_RW(next->locked) = 1;
89578 return;
89579 }
89580
89581 next = osq_wait_next(lock, node, NULL);
89582 if (next)
89583- ACCESS_ONCE(next->locked) = 1;
89584+ ACCESS_ONCE_RW(next->locked) = 1;
89585 }
89586
89587 #endif
89588diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
89589index 4d60986..5d351c1 100644
89590--- a/kernel/locking/mcs_spinlock.h
89591+++ b/kernel/locking/mcs_spinlock.h
89592@@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
89593 */
89594 return;
89595 }
89596- ACCESS_ONCE(prev->next) = node;
89597+ ACCESS_ONCE_RW(prev->next) = node;
89598
89599 /* Wait until the lock holder passes the lock down. */
89600 arch_mcs_spin_lock_contended(&node->locked);
89601diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
89602index 5cf6731..ce3bc5a 100644
89603--- a/kernel/locking/mutex-debug.c
89604+++ b/kernel/locking/mutex-debug.c
89605@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
89606 }
89607
89608 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89609- struct thread_info *ti)
89610+ struct task_struct *task)
89611 {
89612 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
89613
89614 /* Mark the current thread as blocked on the lock: */
89615- ti->task->blocked_on = waiter;
89616+ task->blocked_on = waiter;
89617 }
89618
89619 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89620- struct thread_info *ti)
89621+ struct task_struct *task)
89622 {
89623 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
89624- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
89625- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
89626- ti->task->blocked_on = NULL;
89627+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
89628+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
89629+ task->blocked_on = NULL;
89630
89631 list_del_init(&waiter->list);
89632 waiter->task = NULL;
89633diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
89634index 0799fd3..d06ae3b 100644
89635--- a/kernel/locking/mutex-debug.h
89636+++ b/kernel/locking/mutex-debug.h
89637@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
89638 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
89639 extern void debug_mutex_add_waiter(struct mutex *lock,
89640 struct mutex_waiter *waiter,
89641- struct thread_info *ti);
89642+ struct task_struct *task);
89643 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
89644- struct thread_info *ti);
89645+ struct task_struct *task);
89646 extern void debug_mutex_unlock(struct mutex *lock);
89647 extern void debug_mutex_init(struct mutex *lock, const char *name,
89648 struct lock_class_key *key);
89649diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
89650index dadbf88..4500507 100644
89651--- a/kernel/locking/mutex.c
89652+++ b/kernel/locking/mutex.c
89653@@ -518,7 +518,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
89654 goto skip_wait;
89655
89656 debug_mutex_lock_common(lock, &waiter);
89657- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
89658+ debug_mutex_add_waiter(lock, &waiter, task);
89659
89660 /* add waiting tasks to the end of the waitqueue (FIFO): */
89661 list_add_tail(&waiter.list, &lock->wait_list);
89662@@ -563,7 +563,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
89663 schedule_preempt_disabled();
89664 spin_lock_mutex(&lock->wait_lock, flags);
89665 }
89666- mutex_remove_waiter(lock, &waiter, current_thread_info());
89667+ mutex_remove_waiter(lock, &waiter, task);
89668 /* set it to 0 if there are no waiters left: */
89669 if (likely(list_empty(&lock->wait_list)))
89670 atomic_set(&lock->count, 0);
89671@@ -600,7 +600,7 @@ skip_wait:
89672 return 0;
89673
89674 err:
89675- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
89676+ mutex_remove_waiter(lock, &waiter, task);
89677 spin_unlock_mutex(&lock->wait_lock, flags);
89678 debug_mutex_free_waiter(&waiter);
89679 mutex_release(&lock->dep_map, 1, ip);
89680diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
89681index 1d96dd0..994ff19 100644
89682--- a/kernel/locking/rtmutex-tester.c
89683+++ b/kernel/locking/rtmutex-tester.c
89684@@ -22,7 +22,7 @@
89685 #define MAX_RT_TEST_MUTEXES 8
89686
89687 static spinlock_t rttest_lock;
89688-static atomic_t rttest_event;
89689+static atomic_unchecked_t rttest_event;
89690
89691 struct test_thread_data {
89692 int opcode;
89693@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89694
89695 case RTTEST_LOCKCONT:
89696 td->mutexes[td->opdata] = 1;
89697- td->event = atomic_add_return(1, &rttest_event);
89698+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89699 return 0;
89700
89701 case RTTEST_RESET:
89702@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89703 return 0;
89704
89705 case RTTEST_RESETEVENT:
89706- atomic_set(&rttest_event, 0);
89707+ atomic_set_unchecked(&rttest_event, 0);
89708 return 0;
89709
89710 default:
89711@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89712 return ret;
89713
89714 td->mutexes[id] = 1;
89715- td->event = atomic_add_return(1, &rttest_event);
89716+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89717 rt_mutex_lock(&mutexes[id]);
89718- td->event = atomic_add_return(1, &rttest_event);
89719+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89720 td->mutexes[id] = 4;
89721 return 0;
89722
89723@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89724 return ret;
89725
89726 td->mutexes[id] = 1;
89727- td->event = atomic_add_return(1, &rttest_event);
89728+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89729 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
89730- td->event = atomic_add_return(1, &rttest_event);
89731+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89732 td->mutexes[id] = ret ? 0 : 4;
89733 return ret ? -EINTR : 0;
89734
89735@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
89736 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
89737 return ret;
89738
89739- td->event = atomic_add_return(1, &rttest_event);
89740+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89741 rt_mutex_unlock(&mutexes[id]);
89742- td->event = atomic_add_return(1, &rttest_event);
89743+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89744 td->mutexes[id] = 0;
89745 return 0;
89746
89747@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89748 break;
89749
89750 td->mutexes[dat] = 2;
89751- td->event = atomic_add_return(1, &rttest_event);
89752+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89753 break;
89754
89755 default:
89756@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89757 return;
89758
89759 td->mutexes[dat] = 3;
89760- td->event = atomic_add_return(1, &rttest_event);
89761+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89762 break;
89763
89764 case RTTEST_LOCKNOWAIT:
89765@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
89766 return;
89767
89768 td->mutexes[dat] = 1;
89769- td->event = atomic_add_return(1, &rttest_event);
89770+ td->event = atomic_add_return_unchecked(1, &rttest_event);
89771 return;
89772
89773 default:
89774diff --git a/kernel/module.c b/kernel/module.c
89775index 88cec1d..d097c28 100644
89776--- a/kernel/module.c
89777+++ b/kernel/module.c
89778@@ -60,6 +60,7 @@
89779 #include <linux/jump_label.h>
89780 #include <linux/pfn.h>
89781 #include <linux/bsearch.h>
89782+#include <linux/grsecurity.h>
89783 #include <uapi/linux/module.h>
89784 #include "module-internal.h"
89785
89786@@ -156,7 +157,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
89787
89788 /* Bounds of module allocation, for speeding __module_address.
89789 * Protected by module_mutex. */
89790-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
89791+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
89792+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
89793
89794 int register_module_notifier(struct notifier_block * nb)
89795 {
89796@@ -323,7 +325,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
89797 return true;
89798
89799 list_for_each_entry_rcu(mod, &modules, list) {
89800- struct symsearch arr[] = {
89801+ struct symsearch modarr[] = {
89802 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
89803 NOT_GPL_ONLY, false },
89804 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
89805@@ -348,7 +350,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
89806 if (mod->state == MODULE_STATE_UNFORMED)
89807 continue;
89808
89809- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
89810+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
89811 return true;
89812 }
89813 return false;
89814@@ -488,7 +490,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
89815 if (!pcpusec->sh_size)
89816 return 0;
89817
89818- if (align > PAGE_SIZE) {
89819+ if (align-1 >= PAGE_SIZE) {
89820 pr_warn("%s: per-cpu alignment %li > %li\n",
89821 mod->name, align, PAGE_SIZE);
89822 align = PAGE_SIZE;
89823@@ -1060,7 +1062,7 @@ struct module_attribute module_uevent =
89824 static ssize_t show_coresize(struct module_attribute *mattr,
89825 struct module_kobject *mk, char *buffer)
89826 {
89827- return sprintf(buffer, "%u\n", mk->mod->core_size);
89828+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
89829 }
89830
89831 static struct module_attribute modinfo_coresize =
89832@@ -1069,7 +1071,7 @@ static struct module_attribute modinfo_coresize =
89833 static ssize_t show_initsize(struct module_attribute *mattr,
89834 struct module_kobject *mk, char *buffer)
89835 {
89836- return sprintf(buffer, "%u\n", mk->mod->init_size);
89837+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
89838 }
89839
89840 static struct module_attribute modinfo_initsize =
89841@@ -1161,12 +1163,29 @@ static int check_version(Elf_Shdr *sechdrs,
89842 goto bad_version;
89843 }
89844
89845+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
89846+ /*
89847+ * avoid potentially printing jibberish on attempted load
89848+ * of a module randomized with a different seed
89849+ */
89850+ pr_warn("no symbol version for %s\n", symname);
89851+#else
89852 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
89853+#endif
89854 return 0;
89855
89856 bad_version:
89857+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
89858+ /*
89859+ * avoid potentially printing jibberish on attempted load
89860+ * of a module randomized with a different seed
89861+ */
89862+ printk("attempted module disagrees about version of symbol %s\n",
89863+ symname);
89864+#else
89865 printk("%s: disagrees about version of symbol %s\n",
89866 mod->name, symname);
89867+#endif
89868 return 0;
89869 }
89870
89871@@ -1282,7 +1301,7 @@ resolve_symbol_wait(struct module *mod,
89872 */
89873 #ifdef CONFIG_SYSFS
89874
89875-#ifdef CONFIG_KALLSYMS
89876+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
89877 static inline bool sect_empty(const Elf_Shdr *sect)
89878 {
89879 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
89880@@ -1422,7 +1441,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
89881 {
89882 unsigned int notes, loaded, i;
89883 struct module_notes_attrs *notes_attrs;
89884- struct bin_attribute *nattr;
89885+ bin_attribute_no_const *nattr;
89886
89887 /* failed to create section attributes, so can't create notes */
89888 if (!mod->sect_attrs)
89889@@ -1534,7 +1553,7 @@ static void del_usage_links(struct module *mod)
89890 static int module_add_modinfo_attrs(struct module *mod)
89891 {
89892 struct module_attribute *attr;
89893- struct module_attribute *temp_attr;
89894+ module_attribute_no_const *temp_attr;
89895 int error = 0;
89896 int i;
89897
89898@@ -1755,21 +1774,21 @@ static void set_section_ro_nx(void *base,
89899
89900 static void unset_module_core_ro_nx(struct module *mod)
89901 {
89902- set_page_attributes(mod->module_core + mod->core_text_size,
89903- mod->module_core + mod->core_size,
89904+ set_page_attributes(mod->module_core_rw,
89905+ mod->module_core_rw + mod->core_size_rw,
89906 set_memory_x);
89907- set_page_attributes(mod->module_core,
89908- mod->module_core + mod->core_ro_size,
89909+ set_page_attributes(mod->module_core_rx,
89910+ mod->module_core_rx + mod->core_size_rx,
89911 set_memory_rw);
89912 }
89913
89914 static void unset_module_init_ro_nx(struct module *mod)
89915 {
89916- set_page_attributes(mod->module_init + mod->init_text_size,
89917- mod->module_init + mod->init_size,
89918+ set_page_attributes(mod->module_init_rw,
89919+ mod->module_init_rw + mod->init_size_rw,
89920 set_memory_x);
89921- set_page_attributes(mod->module_init,
89922- mod->module_init + mod->init_ro_size,
89923+ set_page_attributes(mod->module_init_rx,
89924+ mod->module_init_rx + mod->init_size_rx,
89925 set_memory_rw);
89926 }
89927
89928@@ -1782,14 +1801,14 @@ void set_all_modules_text_rw(void)
89929 list_for_each_entry_rcu(mod, &modules, list) {
89930 if (mod->state == MODULE_STATE_UNFORMED)
89931 continue;
89932- if ((mod->module_core) && (mod->core_text_size)) {
89933- set_page_attributes(mod->module_core,
89934- mod->module_core + mod->core_text_size,
89935+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
89936+ set_page_attributes(mod->module_core_rx,
89937+ mod->module_core_rx + mod->core_size_rx,
89938 set_memory_rw);
89939 }
89940- if ((mod->module_init) && (mod->init_text_size)) {
89941- set_page_attributes(mod->module_init,
89942- mod->module_init + mod->init_text_size,
89943+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
89944+ set_page_attributes(mod->module_init_rx,
89945+ mod->module_init_rx + mod->init_size_rx,
89946 set_memory_rw);
89947 }
89948 }
89949@@ -1805,14 +1824,14 @@ void set_all_modules_text_ro(void)
89950 list_for_each_entry_rcu(mod, &modules, list) {
89951 if (mod->state == MODULE_STATE_UNFORMED)
89952 continue;
89953- if ((mod->module_core) && (mod->core_text_size)) {
89954- set_page_attributes(mod->module_core,
89955- mod->module_core + mod->core_text_size,
89956+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
89957+ set_page_attributes(mod->module_core_rx,
89958+ mod->module_core_rx + mod->core_size_rx,
89959 set_memory_ro);
89960 }
89961- if ((mod->module_init) && (mod->init_text_size)) {
89962- set_page_attributes(mod->module_init,
89963- mod->module_init + mod->init_text_size,
89964+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
89965+ set_page_attributes(mod->module_init_rx,
89966+ mod->module_init_rx + mod->init_size_rx,
89967 set_memory_ro);
89968 }
89969 }
89970@@ -1865,16 +1884,19 @@ static void free_module(struct module *mod)
89971
89972 /* This may be NULL, but that's OK */
89973 unset_module_init_ro_nx(mod);
89974- module_free(mod, mod->module_init);
89975+ module_free(mod, mod->module_init_rw);
89976+ module_free_exec(mod, mod->module_init_rx);
89977 kfree(mod->args);
89978 percpu_modfree(mod);
89979
89980 /* Free lock-classes: */
89981- lockdep_free_key_range(mod->module_core, mod->core_size);
89982+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
89983+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
89984
89985 /* Finally, free the core (containing the module structure) */
89986 unset_module_core_ro_nx(mod);
89987- module_free(mod, mod->module_core);
89988+ module_free_exec(mod, mod->module_core_rx);
89989+ module_free(mod, mod->module_core_rw);
89990
89991 #ifdef CONFIG_MPU
89992 update_protections(current->mm);
89993@@ -1943,9 +1965,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
89994 int ret = 0;
89995 const struct kernel_symbol *ksym;
89996
89997+#ifdef CONFIG_GRKERNSEC_MODHARDEN
89998+ int is_fs_load = 0;
89999+ int register_filesystem_found = 0;
90000+ char *p;
90001+
90002+ p = strstr(mod->args, "grsec_modharden_fs");
90003+ if (p) {
90004+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
90005+ /* copy \0 as well */
90006+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
90007+ is_fs_load = 1;
90008+ }
90009+#endif
90010+
90011 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
90012 const char *name = info->strtab + sym[i].st_name;
90013
90014+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90015+ /* it's a real shame this will never get ripped and copied
90016+ upstream! ;(
90017+ */
90018+ if (is_fs_load && !strcmp(name, "register_filesystem"))
90019+ register_filesystem_found = 1;
90020+#endif
90021+
90022 switch (sym[i].st_shndx) {
90023 case SHN_COMMON:
90024 /* Ignore common symbols */
90025@@ -1970,7 +2014,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90026 ksym = resolve_symbol_wait(mod, info, name);
90027 /* Ok if resolved. */
90028 if (ksym && !IS_ERR(ksym)) {
90029+ pax_open_kernel();
90030 sym[i].st_value = ksym->value;
90031+ pax_close_kernel();
90032 break;
90033 }
90034
90035@@ -1989,11 +2035,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
90036 secbase = (unsigned long)mod_percpu(mod);
90037 else
90038 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
90039+ pax_open_kernel();
90040 sym[i].st_value += secbase;
90041+ pax_close_kernel();
90042 break;
90043 }
90044 }
90045
90046+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90047+ if (is_fs_load && !register_filesystem_found) {
90048+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
90049+ ret = -EPERM;
90050+ }
90051+#endif
90052+
90053 return ret;
90054 }
90055
90056@@ -2077,22 +2132,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
90057 || s->sh_entsize != ~0UL
90058 || strstarts(sname, ".init"))
90059 continue;
90060- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
90061+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
90062+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
90063+ else
90064+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
90065 pr_debug("\t%s\n", sname);
90066 }
90067- switch (m) {
90068- case 0: /* executable */
90069- mod->core_size = debug_align(mod->core_size);
90070- mod->core_text_size = mod->core_size;
90071- break;
90072- case 1: /* RO: text and ro-data */
90073- mod->core_size = debug_align(mod->core_size);
90074- mod->core_ro_size = mod->core_size;
90075- break;
90076- case 3: /* whole core */
90077- mod->core_size = debug_align(mod->core_size);
90078- break;
90079- }
90080 }
90081
90082 pr_debug("Init section allocation order:\n");
90083@@ -2106,23 +2151,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
90084 || s->sh_entsize != ~0UL
90085 || !strstarts(sname, ".init"))
90086 continue;
90087- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
90088- | INIT_OFFSET_MASK);
90089+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
90090+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
90091+ else
90092+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
90093+ s->sh_entsize |= INIT_OFFSET_MASK;
90094 pr_debug("\t%s\n", sname);
90095 }
90096- switch (m) {
90097- case 0: /* executable */
90098- mod->init_size = debug_align(mod->init_size);
90099- mod->init_text_size = mod->init_size;
90100- break;
90101- case 1: /* RO: text and ro-data */
90102- mod->init_size = debug_align(mod->init_size);
90103- mod->init_ro_size = mod->init_size;
90104- break;
90105- case 3: /* whole init */
90106- mod->init_size = debug_align(mod->init_size);
90107- break;
90108- }
90109 }
90110 }
90111
90112@@ -2295,7 +2330,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
90113
90114 /* Put symbol section at end of init part of module. */
90115 symsect->sh_flags |= SHF_ALLOC;
90116- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
90117+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
90118 info->index.sym) | INIT_OFFSET_MASK;
90119 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
90120
90121@@ -2312,13 +2347,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
90122 }
90123
90124 /* Append room for core symbols at end of core part. */
90125- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
90126- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
90127- mod->core_size += strtab_size;
90128+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
90129+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
90130+ mod->core_size_rx += strtab_size;
90131
90132 /* Put string table section at end of init part of module. */
90133 strsect->sh_flags |= SHF_ALLOC;
90134- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
90135+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
90136 info->index.str) | INIT_OFFSET_MASK;
90137 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
90138 }
90139@@ -2336,12 +2371,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
90140 /* Make sure we get permanent strtab: don't use info->strtab. */
90141 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
90142
90143+ pax_open_kernel();
90144+
90145 /* Set types up while we still have access to sections. */
90146 for (i = 0; i < mod->num_symtab; i++)
90147 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
90148
90149- mod->core_symtab = dst = mod->module_core + info->symoffs;
90150- mod->core_strtab = s = mod->module_core + info->stroffs;
90151+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
90152+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
90153 src = mod->symtab;
90154 for (ndst = i = 0; i < mod->num_symtab; i++) {
90155 if (i == 0 ||
90156@@ -2353,6 +2390,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
90157 }
90158 }
90159 mod->core_num_syms = ndst;
90160+
90161+ pax_close_kernel();
90162 }
90163 #else
90164 static inline void layout_symtab(struct module *mod, struct load_info *info)
90165@@ -2386,17 +2425,33 @@ void * __weak module_alloc(unsigned long size)
90166 return vmalloc_exec(size);
90167 }
90168
90169-static void *module_alloc_update_bounds(unsigned long size)
90170+static void *module_alloc_update_bounds_rw(unsigned long size)
90171 {
90172 void *ret = module_alloc(size);
90173
90174 if (ret) {
90175 mutex_lock(&module_mutex);
90176 /* Update module bounds. */
90177- if ((unsigned long)ret < module_addr_min)
90178- module_addr_min = (unsigned long)ret;
90179- if ((unsigned long)ret + size > module_addr_max)
90180- module_addr_max = (unsigned long)ret + size;
90181+ if ((unsigned long)ret < module_addr_min_rw)
90182+ module_addr_min_rw = (unsigned long)ret;
90183+ if ((unsigned long)ret + size > module_addr_max_rw)
90184+ module_addr_max_rw = (unsigned long)ret + size;
90185+ mutex_unlock(&module_mutex);
90186+ }
90187+ return ret;
90188+}
90189+
90190+static void *module_alloc_update_bounds_rx(unsigned long size)
90191+{
90192+ void *ret = module_alloc_exec(size);
90193+
90194+ if (ret) {
90195+ mutex_lock(&module_mutex);
90196+ /* Update module bounds. */
90197+ if ((unsigned long)ret < module_addr_min_rx)
90198+ module_addr_min_rx = (unsigned long)ret;
90199+ if ((unsigned long)ret + size > module_addr_max_rx)
90200+ module_addr_max_rx = (unsigned long)ret + size;
90201 mutex_unlock(&module_mutex);
90202 }
90203 return ret;
90204@@ -2650,7 +2705,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
90205 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
90206
90207 if (info->index.sym == 0) {
90208+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
90209+ /*
90210+ * avoid potentially printing jibberish on attempted load
90211+ * of a module randomized with a different seed
90212+ */
90213+ pr_warn("module has no symbols (stripped?)\n");
90214+#else
90215 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
90216+#endif
90217 return ERR_PTR(-ENOEXEC);
90218 }
90219
90220@@ -2666,8 +2729,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
90221 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
90222 {
90223 const char *modmagic = get_modinfo(info, "vermagic");
90224+ const char *license = get_modinfo(info, "license");
90225 int err;
90226
90227+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
90228+ if (!license || !license_is_gpl_compatible(license))
90229+ return -ENOEXEC;
90230+#endif
90231+
90232 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
90233 modmagic = NULL;
90234
90235@@ -2692,7 +2761,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
90236 }
90237
90238 /* Set up license info based on the info section */
90239- set_license(mod, get_modinfo(info, "license"));
90240+ set_license(mod, license);
90241
90242 return 0;
90243 }
90244@@ -2786,7 +2855,7 @@ static int move_module(struct module *mod, struct load_info *info)
90245 void *ptr;
90246
90247 /* Do the allocs. */
90248- ptr = module_alloc_update_bounds(mod->core_size);
90249+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
90250 /*
90251 * The pointer to this block is stored in the module structure
90252 * which is inside the block. Just mark it as not being a
90253@@ -2796,11 +2865,11 @@ static int move_module(struct module *mod, struct load_info *info)
90254 if (!ptr)
90255 return -ENOMEM;
90256
90257- memset(ptr, 0, mod->core_size);
90258- mod->module_core = ptr;
90259+ memset(ptr, 0, mod->core_size_rw);
90260+ mod->module_core_rw = ptr;
90261
90262- if (mod->init_size) {
90263- ptr = module_alloc_update_bounds(mod->init_size);
90264+ if (mod->init_size_rw) {
90265+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
90266 /*
90267 * The pointer to this block is stored in the module structure
90268 * which is inside the block. This block doesn't need to be
90269@@ -2809,13 +2878,45 @@ static int move_module(struct module *mod, struct load_info *info)
90270 */
90271 kmemleak_ignore(ptr);
90272 if (!ptr) {
90273- module_free(mod, mod->module_core);
90274+ module_free(mod, mod->module_core_rw);
90275 return -ENOMEM;
90276 }
90277- memset(ptr, 0, mod->init_size);
90278- mod->module_init = ptr;
90279+ memset(ptr, 0, mod->init_size_rw);
90280+ mod->module_init_rw = ptr;
90281 } else
90282- mod->module_init = NULL;
90283+ mod->module_init_rw = NULL;
90284+
90285+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
90286+ kmemleak_not_leak(ptr);
90287+ if (!ptr) {
90288+ if (mod->module_init_rw)
90289+ module_free(mod, mod->module_init_rw);
90290+ module_free(mod, mod->module_core_rw);
90291+ return -ENOMEM;
90292+ }
90293+
90294+ pax_open_kernel();
90295+ memset(ptr, 0, mod->core_size_rx);
90296+ pax_close_kernel();
90297+ mod->module_core_rx = ptr;
90298+
90299+ if (mod->init_size_rx) {
90300+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
90301+ kmemleak_ignore(ptr);
90302+ if (!ptr && mod->init_size_rx) {
90303+ module_free_exec(mod, mod->module_core_rx);
90304+ if (mod->module_init_rw)
90305+ module_free(mod, mod->module_init_rw);
90306+ module_free(mod, mod->module_core_rw);
90307+ return -ENOMEM;
90308+ }
90309+
90310+ pax_open_kernel();
90311+ memset(ptr, 0, mod->init_size_rx);
90312+ pax_close_kernel();
90313+ mod->module_init_rx = ptr;
90314+ } else
90315+ mod->module_init_rx = NULL;
90316
90317 /* Transfer each section which specifies SHF_ALLOC */
90318 pr_debug("final section addresses:\n");
90319@@ -2826,16 +2927,45 @@ static int move_module(struct module *mod, struct load_info *info)
90320 if (!(shdr->sh_flags & SHF_ALLOC))
90321 continue;
90322
90323- if (shdr->sh_entsize & INIT_OFFSET_MASK)
90324- dest = mod->module_init
90325- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90326- else
90327- dest = mod->module_core + shdr->sh_entsize;
90328+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
90329+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
90330+ dest = mod->module_init_rw
90331+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90332+ else
90333+ dest = mod->module_init_rx
90334+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
90335+ } else {
90336+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
90337+ dest = mod->module_core_rw + shdr->sh_entsize;
90338+ else
90339+ dest = mod->module_core_rx + shdr->sh_entsize;
90340+ }
90341+
90342+ if (shdr->sh_type != SHT_NOBITS) {
90343+
90344+#ifdef CONFIG_PAX_KERNEXEC
90345+#ifdef CONFIG_X86_64
90346+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
90347+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
90348+#endif
90349+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
90350+ pax_open_kernel();
90351+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
90352+ pax_close_kernel();
90353+ } else
90354+#endif
90355
90356- if (shdr->sh_type != SHT_NOBITS)
90357 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
90358+ }
90359 /* Update sh_addr to point to copy in image. */
90360- shdr->sh_addr = (unsigned long)dest;
90361+
90362+#ifdef CONFIG_PAX_KERNEXEC
90363+ if (shdr->sh_flags & SHF_EXECINSTR)
90364+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
90365+ else
90366+#endif
90367+
90368+ shdr->sh_addr = (unsigned long)dest;
90369 pr_debug("\t0x%lx %s\n",
90370 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
90371 }
90372@@ -2892,12 +3022,12 @@ static void flush_module_icache(const struct module *mod)
90373 * Do it before processing of module parameters, so the module
90374 * can provide parameter accessor functions of its own.
90375 */
90376- if (mod->module_init)
90377- flush_icache_range((unsigned long)mod->module_init,
90378- (unsigned long)mod->module_init
90379- + mod->init_size);
90380- flush_icache_range((unsigned long)mod->module_core,
90381- (unsigned long)mod->module_core + mod->core_size);
90382+ if (mod->module_init_rx)
90383+ flush_icache_range((unsigned long)mod->module_init_rx,
90384+ (unsigned long)mod->module_init_rx
90385+ + mod->init_size_rx);
90386+ flush_icache_range((unsigned long)mod->module_core_rx,
90387+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
90388
90389 set_fs(old_fs);
90390 }
90391@@ -2954,8 +3084,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
90392 static void module_deallocate(struct module *mod, struct load_info *info)
90393 {
90394 percpu_modfree(mod);
90395- module_free(mod, mod->module_init);
90396- module_free(mod, mod->module_core);
90397+ module_free_exec(mod, mod->module_init_rx);
90398+ module_free_exec(mod, mod->module_core_rx);
90399+ module_free(mod, mod->module_init_rw);
90400+ module_free(mod, mod->module_core_rw);
90401 }
90402
90403 int __weak module_finalize(const Elf_Ehdr *hdr,
90404@@ -2968,7 +3100,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
90405 static int post_relocation(struct module *mod, const struct load_info *info)
90406 {
90407 /* Sort exception table now relocations are done. */
90408+ pax_open_kernel();
90409 sort_extable(mod->extable, mod->extable + mod->num_exentries);
90410+ pax_close_kernel();
90411
90412 /* Copy relocated percpu area over. */
90413 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
90414@@ -3077,11 +3211,12 @@ static int do_init_module(struct module *mod)
90415 mod->strtab = mod->core_strtab;
90416 #endif
90417 unset_module_init_ro_nx(mod);
90418- module_free(mod, mod->module_init);
90419- mod->module_init = NULL;
90420- mod->init_size = 0;
90421- mod->init_ro_size = 0;
90422- mod->init_text_size = 0;
90423+ module_free(mod, mod->module_init_rw);
90424+ module_free_exec(mod, mod->module_init_rx);
90425+ mod->module_init_rw = NULL;
90426+ mod->module_init_rx = NULL;
90427+ mod->init_size_rw = 0;
90428+ mod->init_size_rx = 0;
90429 mutex_unlock(&module_mutex);
90430 wake_up_all(&module_wq);
90431
90432@@ -3149,16 +3284,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
90433 module_bug_finalize(info->hdr, info->sechdrs, mod);
90434
90435 /* Set RO and NX regions for core */
90436- set_section_ro_nx(mod->module_core,
90437- mod->core_text_size,
90438- mod->core_ro_size,
90439- mod->core_size);
90440+ set_section_ro_nx(mod->module_core_rx,
90441+ mod->core_size_rx,
90442+ mod->core_size_rx,
90443+ mod->core_size_rx);
90444
90445 /* Set RO and NX regions for init */
90446- set_section_ro_nx(mod->module_init,
90447- mod->init_text_size,
90448- mod->init_ro_size,
90449- mod->init_size);
90450+ set_section_ro_nx(mod->module_init_rx,
90451+ mod->init_size_rx,
90452+ mod->init_size_rx,
90453+ mod->init_size_rx);
90454
90455 /* Mark state as coming so strong_try_module_get() ignores us,
90456 * but kallsyms etc. can see us. */
90457@@ -3242,9 +3377,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
90458 if (err)
90459 goto free_unload;
90460
90461+ /* Now copy in args */
90462+ mod->args = strndup_user(uargs, ~0UL >> 1);
90463+ if (IS_ERR(mod->args)) {
90464+ err = PTR_ERR(mod->args);
90465+ goto free_unload;
90466+ }
90467+
90468 /* Set up MODINFO_ATTR fields */
90469 setup_modinfo(mod, info);
90470
90471+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90472+ {
90473+ char *p, *p2;
90474+
90475+ if (strstr(mod->args, "grsec_modharden_netdev")) {
90476+ 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);
90477+ err = -EPERM;
90478+ goto free_modinfo;
90479+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
90480+ p += sizeof("grsec_modharden_normal") - 1;
90481+ p2 = strstr(p, "_");
90482+ if (p2) {
90483+ *p2 = '\0';
90484+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
90485+ *p2 = '_';
90486+ }
90487+ err = -EPERM;
90488+ goto free_modinfo;
90489+ }
90490+ }
90491+#endif
90492+
90493 /* Fix up syms, so that st_value is a pointer to location. */
90494 err = simplify_symbols(mod, info);
90495 if (err < 0)
90496@@ -3260,13 +3424,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
90497
90498 flush_module_icache(mod);
90499
90500- /* Now copy in args */
90501- mod->args = strndup_user(uargs, ~0UL >> 1);
90502- if (IS_ERR(mod->args)) {
90503- err = PTR_ERR(mod->args);
90504- goto free_arch_cleanup;
90505- }
90506-
90507 dynamic_debug_setup(info->debug, info->num_debug);
90508
90509 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
90510@@ -3314,11 +3471,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
90511 ddebug_cleanup:
90512 dynamic_debug_remove(info->debug);
90513 synchronize_sched();
90514- kfree(mod->args);
90515- free_arch_cleanup:
90516 module_arch_cleanup(mod);
90517 free_modinfo:
90518 free_modinfo(mod);
90519+ kfree(mod->args);
90520 free_unload:
90521 module_unload_free(mod);
90522 unlink_mod:
90523@@ -3403,10 +3559,16 @@ static const char *get_ksymbol(struct module *mod,
90524 unsigned long nextval;
90525
90526 /* At worse, next value is at end of module */
90527- if (within_module_init(addr, mod))
90528- nextval = (unsigned long)mod->module_init+mod->init_text_size;
90529+ if (within_module_init_rx(addr, mod))
90530+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
90531+ else if (within_module_init_rw(addr, mod))
90532+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
90533+ else if (within_module_core_rx(addr, mod))
90534+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
90535+ else if (within_module_core_rw(addr, mod))
90536+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
90537 else
90538- nextval = (unsigned long)mod->module_core+mod->core_text_size;
90539+ return NULL;
90540
90541 /* Scan for closest preceding symbol, and next symbol. (ELF
90542 starts real symbols at 1). */
90543@@ -3654,7 +3816,7 @@ static int m_show(struct seq_file *m, void *p)
90544 return 0;
90545
90546 seq_printf(m, "%s %u",
90547- mod->name, mod->init_size + mod->core_size);
90548+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
90549 print_unload_info(m, mod);
90550
90551 /* Informative for users. */
90552@@ -3663,7 +3825,7 @@ static int m_show(struct seq_file *m, void *p)
90553 mod->state == MODULE_STATE_COMING ? "Loading":
90554 "Live");
90555 /* Used by oprofile and other similar tools. */
90556- seq_printf(m, " 0x%pK", mod->module_core);
90557+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
90558
90559 /* Taints info */
90560 if (mod->taints)
90561@@ -3699,7 +3861,17 @@ static const struct file_operations proc_modules_operations = {
90562
90563 static int __init proc_modules_init(void)
90564 {
90565+#ifndef CONFIG_GRKERNSEC_HIDESYM
90566+#ifdef CONFIG_GRKERNSEC_PROC_USER
90567+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
90568+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
90569+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
90570+#else
90571 proc_create("modules", 0, NULL, &proc_modules_operations);
90572+#endif
90573+#else
90574+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
90575+#endif
90576 return 0;
90577 }
90578 module_init(proc_modules_init);
90579@@ -3760,7 +3932,8 @@ struct module *__module_address(unsigned long addr)
90580 {
90581 struct module *mod;
90582
90583- if (addr < module_addr_min || addr > module_addr_max)
90584+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
90585+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
90586 return NULL;
90587
90588 list_for_each_entry_rcu(mod, &modules, list) {
90589@@ -3801,11 +3974,20 @@ bool is_module_text_address(unsigned long addr)
90590 */
90591 struct module *__module_text_address(unsigned long addr)
90592 {
90593- struct module *mod = __module_address(addr);
90594+ struct module *mod;
90595+
90596+#ifdef CONFIG_X86_32
90597+ addr = ktla_ktva(addr);
90598+#endif
90599+
90600+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
90601+ return NULL;
90602+
90603+ mod = __module_address(addr);
90604+
90605 if (mod) {
90606 /* Make sure it's within the text section. */
90607- if (!within(addr, mod->module_init, mod->init_text_size)
90608- && !within(addr, mod->module_core, mod->core_text_size))
90609+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
90610 mod = NULL;
90611 }
90612 return mod;
90613diff --git a/kernel/notifier.c b/kernel/notifier.c
90614index 4803da6..1c5eea6 100644
90615--- a/kernel/notifier.c
90616+++ b/kernel/notifier.c
90617@@ -5,6 +5,7 @@
90618 #include <linux/rcupdate.h>
90619 #include <linux/vmalloc.h>
90620 #include <linux/reboot.h>
90621+#include <linux/mm.h>
90622
90623 /*
90624 * Notifier list for kernel code which wants to be called
90625@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
90626 while ((*nl) != NULL) {
90627 if (n->priority > (*nl)->priority)
90628 break;
90629- nl = &((*nl)->next);
90630+ nl = (struct notifier_block **)&((*nl)->next);
90631 }
90632- n->next = *nl;
90633+ pax_open_kernel();
90634+ *(const void **)&n->next = *nl;
90635 rcu_assign_pointer(*nl, n);
90636+ pax_close_kernel();
90637 return 0;
90638 }
90639
90640@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
90641 return 0;
90642 if (n->priority > (*nl)->priority)
90643 break;
90644- nl = &((*nl)->next);
90645+ nl = (struct notifier_block **)&((*nl)->next);
90646 }
90647- n->next = *nl;
90648+ pax_open_kernel();
90649+ *(const void **)&n->next = *nl;
90650 rcu_assign_pointer(*nl, n);
90651+ pax_close_kernel();
90652 return 0;
90653 }
90654
90655@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
90656 {
90657 while ((*nl) != NULL) {
90658 if ((*nl) == n) {
90659+ pax_open_kernel();
90660 rcu_assign_pointer(*nl, n->next);
90661+ pax_close_kernel();
90662 return 0;
90663 }
90664- nl = &((*nl)->next);
90665+ nl = (struct notifier_block **)&((*nl)->next);
90666 }
90667 return -ENOENT;
90668 }
90669diff --git a/kernel/padata.c b/kernel/padata.c
90670index 161402f..598814c 100644
90671--- a/kernel/padata.c
90672+++ b/kernel/padata.c
90673@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
90674 * seq_nr mod. number of cpus in use.
90675 */
90676
90677- seq_nr = atomic_inc_return(&pd->seq_nr);
90678+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
90679 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
90680
90681 return padata_index_to_cpu(pd, cpu_index);
90682@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
90683 padata_init_pqueues(pd);
90684 padata_init_squeues(pd);
90685 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
90686- atomic_set(&pd->seq_nr, -1);
90687+ atomic_set_unchecked(&pd->seq_nr, -1);
90688 atomic_set(&pd->reorder_objects, 0);
90689 atomic_set(&pd->refcnt, 0);
90690 pd->pinst = pinst;
90691diff --git a/kernel/panic.c b/kernel/panic.c
90692index cf80672..f6771b2 100644
90693--- a/kernel/panic.c
90694+++ b/kernel/panic.c
90695@@ -53,7 +53,7 @@ EXPORT_SYMBOL(panic_blink);
90696 /*
90697 * Stop ourself in panic -- architecture code may override this
90698 */
90699-void __weak panic_smp_self_stop(void)
90700+void __weak __noreturn panic_smp_self_stop(void)
90701 {
90702 while (1)
90703 cpu_relax();
90704@@ -422,7 +422,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
90705 disable_trace_on_warning();
90706
90707 pr_warn("------------[ cut here ]------------\n");
90708- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
90709+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
90710 raw_smp_processor_id(), current->pid, file, line, caller);
90711
90712 if (args)
90713@@ -476,7 +476,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
90714 */
90715 __visible void __stack_chk_fail(void)
90716 {
90717- panic("stack-protector: Kernel stack is corrupted in: %p\n",
90718+ dump_stack();
90719+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
90720 __builtin_return_address(0));
90721 }
90722 EXPORT_SYMBOL(__stack_chk_fail);
90723diff --git a/kernel/pid.c b/kernel/pid.c
90724index 9b9a266..c20ef80 100644
90725--- a/kernel/pid.c
90726+++ b/kernel/pid.c
90727@@ -33,6 +33,7 @@
90728 #include <linux/rculist.h>
90729 #include <linux/bootmem.h>
90730 #include <linux/hash.h>
90731+#include <linux/security.h>
90732 #include <linux/pid_namespace.h>
90733 #include <linux/init_task.h>
90734 #include <linux/syscalls.h>
90735@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
90736
90737 int pid_max = PID_MAX_DEFAULT;
90738
90739-#define RESERVED_PIDS 300
90740+#define RESERVED_PIDS 500
90741
90742 int pid_max_min = RESERVED_PIDS + 1;
90743 int pid_max_max = PID_MAX_LIMIT;
90744@@ -445,10 +446,18 @@ EXPORT_SYMBOL(pid_task);
90745 */
90746 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
90747 {
90748+ struct task_struct *task;
90749+
90750 rcu_lockdep_assert(rcu_read_lock_held(),
90751 "find_task_by_pid_ns() needs rcu_read_lock()"
90752 " protection");
90753- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
90754+
90755+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
90756+
90757+ if (gr_pid_is_chrooted(task))
90758+ return NULL;
90759+
90760+ return task;
90761 }
90762
90763 struct task_struct *find_task_by_vpid(pid_t vnr)
90764@@ -456,6 +465,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
90765 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
90766 }
90767
90768+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
90769+{
90770+ rcu_lockdep_assert(rcu_read_lock_held(),
90771+ "find_task_by_pid_ns() needs rcu_read_lock()"
90772+ " protection");
90773+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
90774+}
90775+
90776 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
90777 {
90778 struct pid *pid;
90779diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
90780index db95d8e..a0ca23f 100644
90781--- a/kernel/pid_namespace.c
90782+++ b/kernel/pid_namespace.c
90783@@ -253,7 +253,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
90784 void __user *buffer, size_t *lenp, loff_t *ppos)
90785 {
90786 struct pid_namespace *pid_ns = task_active_pid_ns(current);
90787- struct ctl_table tmp = *table;
90788+ ctl_table_no_const tmp = *table;
90789
90790 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
90791 return -EPERM;
90792diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
90793index bbef57f..5f94462 100644
90794--- a/kernel/power/Kconfig
90795+++ b/kernel/power/Kconfig
90796@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
90797 config HIBERNATION
90798 bool "Hibernation (aka 'suspend to disk')"
90799 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
90800+ depends on !GRKERNSEC_KMEM
90801+ depends on !PAX_MEMORY_SANITIZE
90802 select HIBERNATE_CALLBACKS
90803 select LZO_COMPRESS
90804 select LZO_DECOMPRESS
90805diff --git a/kernel/power/process.c b/kernel/power/process.c
90806index 5a6ec86..3a8c884 100644
90807--- a/kernel/power/process.c
90808+++ b/kernel/power/process.c
90809@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
90810 unsigned int elapsed_msecs;
90811 bool wakeup = false;
90812 int sleep_usecs = USEC_PER_MSEC;
90813+ bool timedout = false;
90814
90815 do_gettimeofday(&start);
90816
90817@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
90818
90819 while (true) {
90820 todo = 0;
90821+ if (time_after(jiffies, end_time))
90822+ timedout = true;
90823 read_lock(&tasklist_lock);
90824 for_each_process_thread(g, p) {
90825 if (p == current || !freeze_task(p))
90826 continue;
90827
90828- if (!freezer_should_skip(p))
90829+ if (!freezer_should_skip(p)) {
90830 todo++;
90831+ if (timedout) {
90832+ printk(KERN_ERR "Task refusing to freeze:\n");
90833+ sched_show_task(p);
90834+ }
90835+ }
90836 }
90837 read_unlock(&tasklist_lock);
90838
90839@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
90840 todo += wq_busy;
90841 }
90842
90843- if (!todo || time_after(jiffies, end_time))
90844+ if (!todo || timedout)
90845 break;
90846
90847 if (pm_wakeup_pending()) {
90848diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
90849index ced2b84..ffc4791 100644
90850--- a/kernel/printk/printk.c
90851+++ b/kernel/printk/printk.c
90852@@ -489,6 +489,11 @@ static int check_syslog_permissions(int type, bool from_file)
90853 if (from_file && type != SYSLOG_ACTION_OPEN)
90854 return 0;
90855
90856+#ifdef CONFIG_GRKERNSEC_DMESG
90857+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
90858+ return -EPERM;
90859+#endif
90860+
90861 if (syslog_action_restricted(type)) {
90862 if (capable(CAP_SYSLOG))
90863 return 0;
90864diff --git a/kernel/profile.c b/kernel/profile.c
90865index 54bf5ba..df6e0a2 100644
90866--- a/kernel/profile.c
90867+++ b/kernel/profile.c
90868@@ -37,7 +37,7 @@ struct profile_hit {
90869 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
90870 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
90871
90872-static atomic_t *prof_buffer;
90873+static atomic_unchecked_t *prof_buffer;
90874 static unsigned long prof_len, prof_shift;
90875
90876 int prof_on __read_mostly;
90877@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
90878 hits[i].pc = 0;
90879 continue;
90880 }
90881- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
90882+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
90883 hits[i].hits = hits[i].pc = 0;
90884 }
90885 }
90886@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
90887 * Add the current hit(s) and flush the write-queue out
90888 * to the global buffer:
90889 */
90890- atomic_add(nr_hits, &prof_buffer[pc]);
90891+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
90892 for (i = 0; i < NR_PROFILE_HIT; ++i) {
90893- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
90894+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
90895 hits[i].pc = hits[i].hits = 0;
90896 }
90897 out:
90898@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
90899 {
90900 unsigned long pc;
90901 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
90902- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
90903+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
90904 }
90905 #endif /* !CONFIG_SMP */
90906
90907@@ -490,7 +490,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
90908 return -EFAULT;
90909 buf++; p++; count--; read++;
90910 }
90911- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
90912+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
90913 if (copy_to_user(buf, (void *)pnt, count))
90914 return -EFAULT;
90915 read += count;
90916@@ -521,7 +521,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
90917 }
90918 #endif
90919 profile_discard_flip_buffers();
90920- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
90921+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
90922 return count;
90923 }
90924
90925diff --git a/kernel/ptrace.c b/kernel/ptrace.c
90926index 54e7522..5b82dd6 100644
90927--- a/kernel/ptrace.c
90928+++ b/kernel/ptrace.c
90929@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
90930 if (seize)
90931 flags |= PT_SEIZED;
90932 rcu_read_lock();
90933- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
90934+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
90935 flags |= PT_PTRACE_CAP;
90936 rcu_read_unlock();
90937 task->ptrace = flags;
90938@@ -532,7 +532,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
90939 break;
90940 return -EIO;
90941 }
90942- if (copy_to_user(dst, buf, retval))
90943+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
90944 return -EFAULT;
90945 copied += retval;
90946 src += retval;
90947@@ -800,7 +800,7 @@ int ptrace_request(struct task_struct *child, long request,
90948 bool seized = child->ptrace & PT_SEIZED;
90949 int ret = -EIO;
90950 siginfo_t siginfo, *si;
90951- void __user *datavp = (void __user *) data;
90952+ void __user *datavp = (__force void __user *) data;
90953 unsigned long __user *datalp = datavp;
90954 unsigned long flags;
90955
90956@@ -1046,14 +1046,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
90957 goto out;
90958 }
90959
90960+ if (gr_handle_ptrace(child, request)) {
90961+ ret = -EPERM;
90962+ goto out_put_task_struct;
90963+ }
90964+
90965 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
90966 ret = ptrace_attach(child, request, addr, data);
90967 /*
90968 * Some architectures need to do book-keeping after
90969 * a ptrace attach.
90970 */
90971- if (!ret)
90972+ if (!ret) {
90973 arch_ptrace_attach(child);
90974+ gr_audit_ptrace(child);
90975+ }
90976 goto out_put_task_struct;
90977 }
90978
90979@@ -1081,7 +1088,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
90980 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
90981 if (copied != sizeof(tmp))
90982 return -EIO;
90983- return put_user(tmp, (unsigned long __user *)data);
90984+ return put_user(tmp, (__force unsigned long __user *)data);
90985 }
90986
90987 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
90988@@ -1175,7 +1182,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
90989 }
90990
90991 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
90992- compat_long_t, addr, compat_long_t, data)
90993+ compat_ulong_t, addr, compat_ulong_t, data)
90994 {
90995 struct task_struct *child;
90996 long ret;
90997@@ -1191,14 +1198,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
90998 goto out;
90999 }
91000
91001+ if (gr_handle_ptrace(child, request)) {
91002+ ret = -EPERM;
91003+ goto out_put_task_struct;
91004+ }
91005+
91006 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
91007 ret = ptrace_attach(child, request, addr, data);
91008 /*
91009 * Some architectures need to do book-keeping after
91010 * a ptrace attach.
91011 */
91012- if (!ret)
91013+ if (!ret) {
91014 arch_ptrace_attach(child);
91015+ gr_audit_ptrace(child);
91016+ }
91017 goto out_put_task_struct;
91018 }
91019
91020diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
91021index 240fa90..5fa56bd 100644
91022--- a/kernel/rcu/rcutorture.c
91023+++ b/kernel/rcu/rcutorture.c
91024@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
91025 rcu_torture_count) = { 0 };
91026 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
91027 rcu_torture_batch) = { 0 };
91028-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
91029-static atomic_t n_rcu_torture_alloc;
91030-static atomic_t n_rcu_torture_alloc_fail;
91031-static atomic_t n_rcu_torture_free;
91032-static atomic_t n_rcu_torture_mberror;
91033-static atomic_t n_rcu_torture_error;
91034+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
91035+static atomic_unchecked_t n_rcu_torture_alloc;
91036+static atomic_unchecked_t n_rcu_torture_alloc_fail;
91037+static atomic_unchecked_t n_rcu_torture_free;
91038+static atomic_unchecked_t n_rcu_torture_mberror;
91039+static atomic_unchecked_t n_rcu_torture_error;
91040 static long n_rcu_torture_barrier_error;
91041 static long n_rcu_torture_boost_ktrerror;
91042 static long n_rcu_torture_boost_rterror;
91043@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
91044 static long n_rcu_torture_timers;
91045 static long n_barrier_attempts;
91046 static long n_barrier_successes;
91047-static atomic_long_t n_cbfloods;
91048+static atomic_long_unchecked_t n_cbfloods;
91049 static struct list_head rcu_torture_removed;
91050
91051 static int rcu_torture_writer_state;
91052@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
91053
91054 spin_lock_bh(&rcu_torture_lock);
91055 if (list_empty(&rcu_torture_freelist)) {
91056- atomic_inc(&n_rcu_torture_alloc_fail);
91057+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
91058 spin_unlock_bh(&rcu_torture_lock);
91059 return NULL;
91060 }
91061- atomic_inc(&n_rcu_torture_alloc);
91062+ atomic_inc_unchecked(&n_rcu_torture_alloc);
91063 p = rcu_torture_freelist.next;
91064 list_del_init(p);
91065 spin_unlock_bh(&rcu_torture_lock);
91066@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
91067 static void
91068 rcu_torture_free(struct rcu_torture *p)
91069 {
91070- atomic_inc(&n_rcu_torture_free);
91071+ atomic_inc_unchecked(&n_rcu_torture_free);
91072 spin_lock_bh(&rcu_torture_lock);
91073 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
91074 spin_unlock_bh(&rcu_torture_lock);
91075@@ -312,7 +312,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
91076 i = rp->rtort_pipe_count;
91077 if (i > RCU_TORTURE_PIPE_LEN)
91078 i = RCU_TORTURE_PIPE_LEN;
91079- atomic_inc(&rcu_torture_wcount[i]);
91080+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
91081 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
91082 rp->rtort_mbtest = 0;
91083 return true;
91084@@ -799,7 +799,7 @@ rcu_torture_cbflood(void *arg)
91085 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
91086 do {
91087 schedule_timeout_interruptible(cbflood_inter_holdoff);
91088- atomic_long_inc(&n_cbfloods);
91089+ atomic_long_inc_unchecked(&n_cbfloods);
91090 WARN_ON(signal_pending(current));
91091 for (i = 0; i < cbflood_n_burst; i++) {
91092 for (j = 0; j < cbflood_n_per_burst; j++) {
91093@@ -917,7 +917,7 @@ rcu_torture_writer(void *arg)
91094 i = old_rp->rtort_pipe_count;
91095 if (i > RCU_TORTURE_PIPE_LEN)
91096 i = RCU_TORTURE_PIPE_LEN;
91097- atomic_inc(&rcu_torture_wcount[i]);
91098+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
91099 old_rp->rtort_pipe_count++;
91100 switch (synctype[torture_random(&rand) % nsynctypes]) {
91101 case RTWS_DEF_FREE:
91102@@ -1035,7 +1035,7 @@ static void rcu_torture_timer(unsigned long unused)
91103 return;
91104 }
91105 if (p->rtort_mbtest == 0)
91106- atomic_inc(&n_rcu_torture_mberror);
91107+ atomic_inc_unchecked(&n_rcu_torture_mberror);
91108 spin_lock(&rand_lock);
91109 cur_ops->read_delay(&rand);
91110 n_rcu_torture_timers++;
91111@@ -1105,7 +1105,7 @@ rcu_torture_reader(void *arg)
91112 continue;
91113 }
91114 if (p->rtort_mbtest == 0)
91115- atomic_inc(&n_rcu_torture_mberror);
91116+ atomic_inc_unchecked(&n_rcu_torture_mberror);
91117 cur_ops->read_delay(&rand);
91118 preempt_disable();
91119 pipe_count = p->rtort_pipe_count;
91120@@ -1172,11 +1172,11 @@ rcu_torture_stats_print(void)
91121 rcu_torture_current,
91122 rcu_torture_current_version,
91123 list_empty(&rcu_torture_freelist),
91124- atomic_read(&n_rcu_torture_alloc),
91125- atomic_read(&n_rcu_torture_alloc_fail),
91126- atomic_read(&n_rcu_torture_free));
91127+ atomic_read_unchecked(&n_rcu_torture_alloc),
91128+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
91129+ atomic_read_unchecked(&n_rcu_torture_free));
91130 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
91131- atomic_read(&n_rcu_torture_mberror),
91132+ atomic_read_unchecked(&n_rcu_torture_mberror),
91133 n_rcu_torture_boost_ktrerror,
91134 n_rcu_torture_boost_rterror);
91135 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
91136@@ -1188,17 +1188,17 @@ rcu_torture_stats_print(void)
91137 n_barrier_successes,
91138 n_barrier_attempts,
91139 n_rcu_torture_barrier_error);
91140- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
91141+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
91142
91143 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
91144- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
91145+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
91146 n_rcu_torture_barrier_error != 0 ||
91147 n_rcu_torture_boost_ktrerror != 0 ||
91148 n_rcu_torture_boost_rterror != 0 ||
91149 n_rcu_torture_boost_failure != 0 ||
91150 i > 1) {
91151 pr_cont("%s", "!!! ");
91152- atomic_inc(&n_rcu_torture_error);
91153+ atomic_inc_unchecked(&n_rcu_torture_error);
91154 WARN_ON_ONCE(1);
91155 }
91156 pr_cont("Reader Pipe: ");
91157@@ -1215,7 +1215,7 @@ rcu_torture_stats_print(void)
91158 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
91159 pr_cont("Free-Block Circulation: ");
91160 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
91161- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
91162+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
91163 }
91164 pr_cont("\n");
91165
91166@@ -1559,7 +1559,7 @@ rcu_torture_cleanup(void)
91167
91168 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
91169
91170- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
91171+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
91172 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
91173 else if (torture_onoff_failures())
91174 rcu_torture_print_module_parms(cur_ops,
91175@@ -1684,18 +1684,18 @@ rcu_torture_init(void)
91176
91177 rcu_torture_current = NULL;
91178 rcu_torture_current_version = 0;
91179- atomic_set(&n_rcu_torture_alloc, 0);
91180- atomic_set(&n_rcu_torture_alloc_fail, 0);
91181- atomic_set(&n_rcu_torture_free, 0);
91182- atomic_set(&n_rcu_torture_mberror, 0);
91183- atomic_set(&n_rcu_torture_error, 0);
91184+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
91185+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
91186+ atomic_set_unchecked(&n_rcu_torture_free, 0);
91187+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
91188+ atomic_set_unchecked(&n_rcu_torture_error, 0);
91189 n_rcu_torture_barrier_error = 0;
91190 n_rcu_torture_boost_ktrerror = 0;
91191 n_rcu_torture_boost_rterror = 0;
91192 n_rcu_torture_boost_failure = 0;
91193 n_rcu_torture_boosts = 0;
91194 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
91195- atomic_set(&rcu_torture_wcount[i], 0);
91196+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
91197 for_each_possible_cpu(cpu) {
91198 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
91199 per_cpu(rcu_torture_count, cpu)[i] = 0;
91200diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
91201index c0623fc..329c091 100644
91202--- a/kernel/rcu/tiny.c
91203+++ b/kernel/rcu/tiny.c
91204@@ -42,7 +42,7 @@
91205 /* Forward declarations for tiny_plugin.h. */
91206 struct rcu_ctrlblk;
91207 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
91208-static void rcu_process_callbacks(struct softirq_action *unused);
91209+static void rcu_process_callbacks(void);
91210 static void __call_rcu(struct rcu_head *head,
91211 void (*func)(struct rcu_head *rcu),
91212 struct rcu_ctrlblk *rcp);
91213@@ -310,7 +310,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
91214 false));
91215 }
91216
91217-static void rcu_process_callbacks(struct softirq_action *unused)
91218+static __latent_entropy void rcu_process_callbacks(void)
91219 {
91220 __rcu_process_callbacks(&rcu_sched_ctrlblk);
91221 __rcu_process_callbacks(&rcu_bh_ctrlblk);
91222diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
91223index 858c565..7efd915 100644
91224--- a/kernel/rcu/tiny_plugin.h
91225+++ b/kernel/rcu/tiny_plugin.h
91226@@ -152,17 +152,17 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
91227 dump_stack();
91228 }
91229 if (*rcp->curtail && ULONG_CMP_GE(j, js))
91230- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
91231+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
91232 3 * rcu_jiffies_till_stall_check() + 3;
91233 else if (ULONG_CMP_GE(j, js))
91234- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91235+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91236 }
91237
91238 static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
91239 {
91240 rcp->ticks_this_gp = 0;
91241 rcp->gp_start = jiffies;
91242- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91243+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
91244 }
91245
91246 static void check_cpu_stalls(void)
91247diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
91248index 9815447..2cdf92a 100644
91249--- a/kernel/rcu/tree.c
91250+++ b/kernel/rcu/tree.c
91251@@ -274,7 +274,7 @@ static void rcu_momentary_dyntick_idle(void)
91252 */
91253 rdtp = this_cpu_ptr(&rcu_dynticks);
91254 smp_mb__before_atomic(); /* Earlier stuff before QS. */
91255- atomic_add(2, &rdtp->dynticks); /* QS. */
91256+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
91257 smp_mb__after_atomic(); /* Later stuff after QS. */
91258 break;
91259 }
91260@@ -534,9 +534,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
91261 rcu_prepare_for_idle(smp_processor_id());
91262 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
91263 smp_mb__before_atomic(); /* See above. */
91264- atomic_inc(&rdtp->dynticks);
91265+ atomic_inc_unchecked(&rdtp->dynticks);
91266 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
91267- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
91268+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
91269 rcu_dynticks_task_enter();
91270
91271 /*
91272@@ -656,10 +656,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
91273 {
91274 rcu_dynticks_task_exit();
91275 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
91276- atomic_inc(&rdtp->dynticks);
91277+ atomic_inc_unchecked(&rdtp->dynticks);
91278 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
91279 smp_mb__after_atomic(); /* See above. */
91280- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
91281+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
91282 rcu_cleanup_after_idle(smp_processor_id());
91283 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
91284 if (!user && !is_idle_task(current)) {
91285@@ -780,14 +780,14 @@ void rcu_nmi_enter(void)
91286 struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
91287
91288 if (rdtp->dynticks_nmi_nesting == 0 &&
91289- (atomic_read(&rdtp->dynticks) & 0x1))
91290+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
91291 return;
91292 rdtp->dynticks_nmi_nesting++;
91293 smp_mb__before_atomic(); /* Force delay from prior write. */
91294- atomic_inc(&rdtp->dynticks);
91295+ atomic_inc_unchecked(&rdtp->dynticks);
91296 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
91297 smp_mb__after_atomic(); /* See above. */
91298- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
91299+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
91300 }
91301
91302 /**
91303@@ -806,9 +806,9 @@ void rcu_nmi_exit(void)
91304 return;
91305 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
91306 smp_mb__before_atomic(); /* See above. */
91307- atomic_inc(&rdtp->dynticks);
91308+ atomic_inc_unchecked(&rdtp->dynticks);
91309 smp_mb__after_atomic(); /* Force delay to next write. */
91310- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
91311+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
91312 }
91313
91314 /**
91315@@ -821,7 +821,7 @@ void rcu_nmi_exit(void)
91316 */
91317 bool notrace __rcu_is_watching(void)
91318 {
91319- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
91320+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
91321 }
91322
91323 /**
91324@@ -904,7 +904,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
91325 static int dyntick_save_progress_counter(struct rcu_data *rdp,
91326 bool *isidle, unsigned long *maxj)
91327 {
91328- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
91329+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
91330 rcu_sysidle_check_cpu(rdp, isidle, maxj);
91331 if ((rdp->dynticks_snap & 0x1) == 0) {
91332 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
91333@@ -933,7 +933,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
91334 int *rcrmp;
91335 unsigned int snap;
91336
91337- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
91338+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
91339 snap = (unsigned int)rdp->dynticks_snap;
91340
91341 /*
91342@@ -996,10 +996,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
91343 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
91344 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
91345 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
91346- ACCESS_ONCE(rdp->cond_resched_completed) =
91347+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
91348 ACCESS_ONCE(rdp->mynode->completed);
91349 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
91350- ACCESS_ONCE(*rcrmp) =
91351+ ACCESS_ONCE_RW(*rcrmp) =
91352 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
91353 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
91354 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
91355@@ -1021,7 +1021,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
91356 rsp->gp_start = j;
91357 smp_wmb(); /* Record start time before stall time. */
91358 j1 = rcu_jiffies_till_stall_check();
91359- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
91360+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
91361 rsp->jiffies_resched = j + j1 / 2;
91362 }
91363
91364@@ -1062,7 +1062,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp)
91365 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91366 return;
91367 }
91368- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
91369+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
91370 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91371
91372 /*
91373@@ -1139,7 +1139,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
91374
91375 raw_spin_lock_irqsave(&rnp->lock, flags);
91376 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
91377- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
91378+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
91379 3 * rcu_jiffies_till_stall_check() + 3;
91380 raw_spin_unlock_irqrestore(&rnp->lock, flags);
91381
91382@@ -1223,7 +1223,7 @@ void rcu_cpu_stall_reset(void)
91383 struct rcu_state *rsp;
91384
91385 for_each_rcu_flavor(rsp)
91386- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
91387+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
91388 }
91389
91390 /*
91391@@ -1609,7 +1609,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
91392 raw_spin_unlock_irq(&rnp->lock);
91393 return 0;
91394 }
91395- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
91396+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
91397
91398 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
91399 /*
91400@@ -1650,9 +1650,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
91401 rdp = this_cpu_ptr(rsp->rda);
91402 rcu_preempt_check_blocked_tasks(rnp);
91403 rnp->qsmask = rnp->qsmaskinit;
91404- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
91405+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
91406 WARN_ON_ONCE(rnp->completed != rsp->completed);
91407- ACCESS_ONCE(rnp->completed) = rsp->completed;
91408+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
91409 if (rnp == rdp->mynode)
91410 (void)__note_gp_changes(rsp, rnp, rdp);
91411 rcu_preempt_boost_start_gp(rnp);
91412@@ -1697,7 +1697,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
91413 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
91414 raw_spin_lock_irq(&rnp->lock);
91415 smp_mb__after_unlock_lock();
91416- ACCESS_ONCE(rsp->gp_flags) =
91417+ ACCESS_ONCE_RW(rsp->gp_flags) =
91418 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
91419 raw_spin_unlock_irq(&rnp->lock);
91420 }
91421@@ -1743,7 +1743,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
91422 rcu_for_each_node_breadth_first(rsp, rnp) {
91423 raw_spin_lock_irq(&rnp->lock);
91424 smp_mb__after_unlock_lock();
91425- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
91426+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
91427 rdp = this_cpu_ptr(rsp->rda);
91428 if (rnp == rdp->mynode)
91429 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
91430@@ -1758,14 +1758,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
91431 rcu_nocb_gp_set(rnp, nocb);
91432
91433 /* Declare grace period done. */
91434- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
91435+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
91436 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
91437 rsp->fqs_state = RCU_GP_IDLE;
91438 rdp = this_cpu_ptr(rsp->rda);
91439 /* Advance CBs to reduce false positives below. */
91440 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
91441 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
91442- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91443+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91444 trace_rcu_grace_period(rsp->name,
91445 ACCESS_ONCE(rsp->gpnum),
91446 TPS("newreq"));
91447@@ -1890,7 +1890,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
91448 */
91449 return false;
91450 }
91451- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91452+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
91453 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
91454 TPS("newreq"));
91455
91456@@ -2111,7 +2111,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
91457 rsp->qlen += rdp->qlen;
91458 rdp->n_cbs_orphaned += rdp->qlen;
91459 rdp->qlen_lazy = 0;
91460- ACCESS_ONCE(rdp->qlen) = 0;
91461+ ACCESS_ONCE_RW(rdp->qlen) = 0;
91462 }
91463
91464 /*
91465@@ -2356,7 +2356,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
91466 }
91467 smp_mb(); /* List handling before counting for rcu_barrier(). */
91468 rdp->qlen_lazy -= count_lazy;
91469- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
91470+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
91471 rdp->n_cbs_invoked += count;
91472
91473 /* Reinstate batch limit if we have worked down the excess. */
91474@@ -2519,7 +2519,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
91475 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
91476 return; /* Someone beat us to it. */
91477 }
91478- ACCESS_ONCE(rsp->gp_flags) =
91479+ ACCESS_ONCE_RW(rsp->gp_flags) =
91480 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
91481 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
91482 rcu_gp_kthread_wake(rsp);
91483@@ -2565,7 +2565,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
91484 /*
91485 * Do RCU core processing for the current CPU.
91486 */
91487-static void rcu_process_callbacks(struct softirq_action *unused)
91488+static void rcu_process_callbacks(void)
91489 {
91490 struct rcu_state *rsp;
91491
91492@@ -2677,7 +2677,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
91493 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
91494 if (debug_rcu_head_queue(head)) {
91495 /* Probable double call_rcu(), so leak the callback. */
91496- ACCESS_ONCE(head->func) = rcu_leak_callback;
91497+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
91498 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
91499 return;
91500 }
91501@@ -2705,7 +2705,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
91502 local_irq_restore(flags);
91503 return;
91504 }
91505- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
91506+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
91507 if (lazy)
91508 rdp->qlen_lazy++;
91509 else
91510@@ -2975,11 +2975,11 @@ void synchronize_sched_expedited(void)
91511 * counter wrap on a 32-bit system. Quite a few more CPUs would of
91512 * course be required on a 64-bit system.
91513 */
91514- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
91515+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
91516 (ulong)atomic_long_read(&rsp->expedited_done) +
91517 ULONG_MAX / 8)) {
91518 synchronize_sched();
91519- atomic_long_inc(&rsp->expedited_wrap);
91520+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
91521 return;
91522 }
91523
91524@@ -2987,12 +2987,12 @@ void synchronize_sched_expedited(void)
91525 * Take a ticket. Note that atomic_inc_return() implies a
91526 * full memory barrier.
91527 */
91528- snap = atomic_long_inc_return(&rsp->expedited_start);
91529+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
91530 firstsnap = snap;
91531 if (!try_get_online_cpus()) {
91532 /* CPU hotplug operation in flight, fall back to normal GP. */
91533 wait_rcu_gp(call_rcu_sched);
91534- atomic_long_inc(&rsp->expedited_normal);
91535+ atomic_long_inc_unchecked(&rsp->expedited_normal);
91536 return;
91537 }
91538 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
91539@@ -3005,14 +3005,14 @@ void synchronize_sched_expedited(void)
91540 synchronize_sched_expedited_cpu_stop,
91541 NULL) == -EAGAIN) {
91542 put_online_cpus();
91543- atomic_long_inc(&rsp->expedited_tryfail);
91544+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
91545
91546 /* Check to see if someone else did our work for us. */
91547 s = atomic_long_read(&rsp->expedited_done);
91548 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
91549 /* ensure test happens before caller kfree */
91550 smp_mb__before_atomic(); /* ^^^ */
91551- atomic_long_inc(&rsp->expedited_workdone1);
91552+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
91553 return;
91554 }
91555
91556@@ -3021,7 +3021,7 @@ void synchronize_sched_expedited(void)
91557 udelay(trycount * num_online_cpus());
91558 } else {
91559 wait_rcu_gp(call_rcu_sched);
91560- atomic_long_inc(&rsp->expedited_normal);
91561+ atomic_long_inc_unchecked(&rsp->expedited_normal);
91562 return;
91563 }
91564
91565@@ -3030,7 +3030,7 @@ void synchronize_sched_expedited(void)
91566 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
91567 /* ensure test happens before caller kfree */
91568 smp_mb__before_atomic(); /* ^^^ */
91569- atomic_long_inc(&rsp->expedited_workdone2);
91570+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
91571 return;
91572 }
91573
91574@@ -3044,13 +3044,13 @@ void synchronize_sched_expedited(void)
91575 if (!try_get_online_cpus()) {
91576 /* CPU hotplug operation in flight, use normal GP. */
91577 wait_rcu_gp(call_rcu_sched);
91578- atomic_long_inc(&rsp->expedited_normal);
91579+ atomic_long_inc_unchecked(&rsp->expedited_normal);
91580 return;
91581 }
91582- snap = atomic_long_read(&rsp->expedited_start);
91583+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
91584 smp_mb(); /* ensure read is before try_stop_cpus(). */
91585 }
91586- atomic_long_inc(&rsp->expedited_stoppedcpus);
91587+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
91588
91589 /*
91590 * Everyone up to our most recent fetch is covered by our grace
91591@@ -3059,16 +3059,16 @@ void synchronize_sched_expedited(void)
91592 * than we did already did their update.
91593 */
91594 do {
91595- atomic_long_inc(&rsp->expedited_done_tries);
91596+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
91597 s = atomic_long_read(&rsp->expedited_done);
91598 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
91599 /* ensure test happens before caller kfree */
91600 smp_mb__before_atomic(); /* ^^^ */
91601- atomic_long_inc(&rsp->expedited_done_lost);
91602+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
91603 break;
91604 }
91605 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
91606- atomic_long_inc(&rsp->expedited_done_exit);
91607+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
91608
91609 put_online_cpus();
91610 }
91611@@ -3274,7 +3274,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
91612 * ACCESS_ONCE() to prevent the compiler from speculating
91613 * the increment to precede the early-exit check.
91614 */
91615- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91616+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91617 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
91618 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
91619 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
91620@@ -3329,7 +3329,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
91621
91622 /* Increment ->n_barrier_done to prevent duplicate work. */
91623 smp_mb(); /* Keep increment after above mechanism. */
91624- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91625+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
91626 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
91627 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
91628 smp_mb(); /* Keep increment before caller's subsequent code. */
91629@@ -3374,10 +3374,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
91630 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
91631 init_callback_list(rdp);
91632 rdp->qlen_lazy = 0;
91633- ACCESS_ONCE(rdp->qlen) = 0;
91634+ ACCESS_ONCE_RW(rdp->qlen) = 0;
91635 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
91636 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
91637- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
91638+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
91639 rdp->cpu = cpu;
91640 rdp->rsp = rsp;
91641 rcu_boot_init_nocb_percpu_data(rdp);
91642@@ -3410,8 +3410,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
91643 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
91644 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
91645 rcu_sysidle_init_percpu_data(rdp->dynticks);
91646- atomic_set(&rdp->dynticks->dynticks,
91647- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
91648+ atomic_set_unchecked(&rdp->dynticks->dynticks,
91649+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
91650 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
91651
91652 /* Add CPU to rcu_node bitmasks. */
91653diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
91654index bbdc45d..c882ccb 100644
91655--- a/kernel/rcu/tree.h
91656+++ b/kernel/rcu/tree.h
91657@@ -87,11 +87,11 @@ struct rcu_dynticks {
91658 long long dynticks_nesting; /* Track irq/process nesting level. */
91659 /* Process level is worth LLONG_MAX/2. */
91660 int dynticks_nmi_nesting; /* Track NMI nesting level. */
91661- atomic_t dynticks; /* Even value for idle, else odd. */
91662+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
91663 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
91664 long long dynticks_idle_nesting;
91665 /* irq/process nesting level from idle. */
91666- atomic_t dynticks_idle; /* Even value for idle, else odd. */
91667+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
91668 /* "Idle" excludes userspace execution. */
91669 unsigned long dynticks_idle_jiffies;
91670 /* End of last non-NMI non-idle period. */
91671@@ -466,17 +466,17 @@ struct rcu_state {
91672 /* _rcu_barrier(). */
91673 /* End of fields guarded by barrier_mutex. */
91674
91675- atomic_long_t expedited_start; /* Starting ticket. */
91676- atomic_long_t expedited_done; /* Done ticket. */
91677- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
91678- atomic_long_t expedited_tryfail; /* # acquisition failures. */
91679- atomic_long_t expedited_workdone1; /* # done by others #1. */
91680- atomic_long_t expedited_workdone2; /* # done by others #2. */
91681- atomic_long_t expedited_normal; /* # fallbacks to normal. */
91682- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
91683- atomic_long_t expedited_done_tries; /* # tries to update _done. */
91684- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
91685- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
91686+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
91687+ atomic_long_t expedited_done; /* Done ticket. */
91688+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
91689+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
91690+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
91691+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
91692+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
91693+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
91694+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
91695+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
91696+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
91697
91698 unsigned long jiffies_force_qs; /* Time at which to invoke */
91699 /* force_quiescent_state(). */
91700diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
91701index c1d7f27..a64bf49 100644
91702--- a/kernel/rcu/tree_plugin.h
91703+++ b/kernel/rcu/tree_plugin.h
91704@@ -709,7 +709,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
91705 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
91706 {
91707 return !rcu_preempted_readers_exp(rnp) &&
91708- ACCESS_ONCE(rnp->expmask) == 0;
91709+ ACCESS_ONCE_RW(rnp->expmask) == 0;
91710 }
91711
91712 /*
91713@@ -870,7 +870,7 @@ void synchronize_rcu_expedited(void)
91714
91715 /* Clean up and exit. */
91716 smp_mb(); /* ensure expedited GP seen before counter increment. */
91717- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
91718+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
91719 sync_rcu_preempt_exp_count + 1;
91720 unlock_mb_ret:
91721 mutex_unlock(&sync_rcu_preempt_exp_mutex);
91722@@ -1426,7 +1426,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
91723 free_cpumask_var(cm);
91724 }
91725
91726-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
91727+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
91728 .store = &rcu_cpu_kthread_task,
91729 .thread_should_run = rcu_cpu_kthread_should_run,
91730 .thread_fn = rcu_cpu_kthread,
91731@@ -1900,7 +1900,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
91732 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
91733 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
91734 cpu, ticks_value, ticks_title,
91735- atomic_read(&rdtp->dynticks) & 0xfff,
91736+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
91737 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
91738 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
91739 fast_no_hz);
91740@@ -2044,7 +2044,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
91741 return;
91742 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
91743 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
91744- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
91745+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
91746 wake_up(&rdp_leader->nocb_wq);
91747 }
91748 }
91749@@ -2096,7 +2096,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
91750
91751 /* Enqueue the callback on the nocb list and update counts. */
91752 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
91753- ACCESS_ONCE(*old_rhpp) = rhp;
91754+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
91755 atomic_long_add(rhcount, &rdp->nocb_q_count);
91756 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
91757 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
91758@@ -2286,7 +2286,7 @@ wait_again:
91759 continue; /* No CBs here, try next follower. */
91760
91761 /* Move callbacks to wait-for-GP list, which is empty. */
91762- ACCESS_ONCE(rdp->nocb_head) = NULL;
91763+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
91764 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
91765 rdp->nocb_gp_count = atomic_long_xchg(&rdp->nocb_q_count, 0);
91766 rdp->nocb_gp_count_lazy =
91767@@ -2413,7 +2413,7 @@ static int rcu_nocb_kthread(void *arg)
91768 list = ACCESS_ONCE(rdp->nocb_follower_head);
91769 BUG_ON(!list);
91770 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
91771- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
91772+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
91773 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
91774 c = atomic_long_xchg(&rdp->nocb_follower_count, 0);
91775 cl = atomic_long_xchg(&rdp->nocb_follower_count_lazy, 0);
91776@@ -2443,8 +2443,8 @@ static int rcu_nocb_kthread(void *arg)
91777 list = next;
91778 }
91779 trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
91780- ACCESS_ONCE(rdp->nocb_p_count) = rdp->nocb_p_count - c;
91781- ACCESS_ONCE(rdp->nocb_p_count_lazy) =
91782+ ACCESS_ONCE_RW(rdp->nocb_p_count) = rdp->nocb_p_count - c;
91783+ ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) =
91784 rdp->nocb_p_count_lazy - cl;
91785 rdp->n_nocbs_invoked += c;
91786 }
91787@@ -2465,7 +2465,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
91788 if (!rcu_nocb_need_deferred_wakeup(rdp))
91789 return;
91790 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
91791- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
91792+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
91793 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
91794 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
91795 }
91796@@ -2584,7 +2584,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
91797 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
91798 "rcuo%c/%d", rsp->abbr, cpu);
91799 BUG_ON(IS_ERR(t));
91800- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
91801+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
91802 }
91803
91804 /*
91805@@ -2788,11 +2788,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
91806
91807 /* Record start of fully idle period. */
91808 j = jiffies;
91809- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
91810+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
91811 smp_mb__before_atomic();
91812- atomic_inc(&rdtp->dynticks_idle);
91813+ atomic_inc_unchecked(&rdtp->dynticks_idle);
91814 smp_mb__after_atomic();
91815- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
91816+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
91817 }
91818
91819 /*
91820@@ -2861,9 +2861,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
91821
91822 /* Record end of idle period. */
91823 smp_mb__before_atomic();
91824- atomic_inc(&rdtp->dynticks_idle);
91825+ atomic_inc_unchecked(&rdtp->dynticks_idle);
91826 smp_mb__after_atomic();
91827- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
91828+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
91829
91830 /*
91831 * If we are the timekeeping CPU, we are permitted to be non-idle
91832@@ -2908,7 +2908,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
91833 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
91834
91835 /* Pick up current idle and NMI-nesting counter and check. */
91836- cur = atomic_read(&rdtp->dynticks_idle);
91837+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
91838 if (cur & 0x1) {
91839 *isidle = false; /* We are not idle! */
91840 return;
91841@@ -2957,7 +2957,7 @@ static void rcu_sysidle(unsigned long j)
91842 case RCU_SYSIDLE_NOT:
91843
91844 /* First time all are idle, so note a short idle period. */
91845- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
91846+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
91847 break;
91848
91849 case RCU_SYSIDLE_SHORT:
91850@@ -2995,7 +2995,7 @@ static void rcu_sysidle_cancel(void)
91851 {
91852 smp_mb();
91853 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
91854- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
91855+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
91856 }
91857
91858 /*
91859@@ -3047,7 +3047,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
91860 smp_mb(); /* grace period precedes setting inuse. */
91861
91862 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
91863- ACCESS_ONCE(rshp->inuse) = 0;
91864+ ACCESS_ONCE_RW(rshp->inuse) = 0;
91865 }
91866
91867 /*
91868@@ -3200,7 +3200,7 @@ static void rcu_bind_gp_kthread(void)
91869 static void rcu_dynticks_task_enter(void)
91870 {
91871 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
91872- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
91873+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
91874 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
91875 }
91876
91877@@ -3208,6 +3208,6 @@ static void rcu_dynticks_task_enter(void)
91878 static void rcu_dynticks_task_exit(void)
91879 {
91880 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
91881- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
91882+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
91883 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
91884 }
91885diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
91886index 5cdc62e..cc52e88 100644
91887--- a/kernel/rcu/tree_trace.c
91888+++ b/kernel/rcu/tree_trace.c
91889@@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
91890 ulong2long(rdp->completed), ulong2long(rdp->gpnum),
91891 rdp->passed_quiesce, rdp->qs_pending);
91892 seq_printf(m, " dt=%d/%llx/%d df=%lu",
91893- atomic_read(&rdp->dynticks->dynticks),
91894+ atomic_read_unchecked(&rdp->dynticks->dynticks),
91895 rdp->dynticks->dynticks_nesting,
91896 rdp->dynticks->dynticks_nmi_nesting,
91897 rdp->dynticks_fqs);
91898@@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
91899 struct rcu_state *rsp = (struct rcu_state *)m->private;
91900
91901 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",
91902- atomic_long_read(&rsp->expedited_start),
91903+ atomic_long_read_unchecked(&rsp->expedited_start),
91904 atomic_long_read(&rsp->expedited_done),
91905- atomic_long_read(&rsp->expedited_wrap),
91906- atomic_long_read(&rsp->expedited_tryfail),
91907- atomic_long_read(&rsp->expedited_workdone1),
91908- atomic_long_read(&rsp->expedited_workdone2),
91909- atomic_long_read(&rsp->expedited_normal),
91910- atomic_long_read(&rsp->expedited_stoppedcpus),
91911- atomic_long_read(&rsp->expedited_done_tries),
91912- atomic_long_read(&rsp->expedited_done_lost),
91913- atomic_long_read(&rsp->expedited_done_exit));
91914+ atomic_long_read_unchecked(&rsp->expedited_wrap),
91915+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
91916+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
91917+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
91918+ atomic_long_read_unchecked(&rsp->expedited_normal),
91919+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
91920+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
91921+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
91922+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
91923 return 0;
91924 }
91925
91926diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
91927index 3ef8ba5..8c5ebfb6 100644
91928--- a/kernel/rcu/update.c
91929+++ b/kernel/rcu/update.c
91930@@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
91931 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
91932 */
91933 if (till_stall_check < 3) {
91934- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
91935+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
91936 till_stall_check = 3;
91937 } else if (till_stall_check > 300) {
91938- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
91939+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
91940 till_stall_check = 300;
91941 }
91942 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
91943@@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
91944 !ACCESS_ONCE(t->on_rq) ||
91945 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
91946 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
91947- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
91948+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
91949 list_del_init(&t->rcu_tasks_holdout_list);
91950 put_task_struct(t);
91951 return;
91952@@ -588,7 +588,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
91953 !is_idle_task(t)) {
91954 get_task_struct(t);
91955 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
91956- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
91957+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
91958 list_add(&t->rcu_tasks_holdout_list,
91959 &rcu_tasks_holdouts);
91960 }
91961@@ -685,7 +685,7 @@ static void rcu_spawn_tasks_kthread(void)
91962 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
91963 BUG_ON(IS_ERR(t));
91964 smp_mb(); /* Ensure others see full kthread. */
91965- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
91966+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
91967 mutex_unlock(&rcu_tasks_kthread_mutex);
91968 }
91969
91970diff --git a/kernel/resource.c b/kernel/resource.c
91971index 0bcebff..e7cd5b2 100644
91972--- a/kernel/resource.c
91973+++ b/kernel/resource.c
91974@@ -161,8 +161,18 @@ static const struct file_operations proc_iomem_operations = {
91975
91976 static int __init ioresources_init(void)
91977 {
91978+#ifdef CONFIG_GRKERNSEC_PROC_ADD
91979+#ifdef CONFIG_GRKERNSEC_PROC_USER
91980+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
91981+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
91982+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
91983+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
91984+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
91985+#endif
91986+#else
91987 proc_create("ioports", 0, NULL, &proc_ioports_operations);
91988 proc_create("iomem", 0, NULL, &proc_iomem_operations);
91989+#endif
91990 return 0;
91991 }
91992 __initcall(ioresources_init);
91993diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
91994index 8a2e230..6020954 100644
91995--- a/kernel/sched/auto_group.c
91996+++ b/kernel/sched/auto_group.c
91997@@ -11,7 +11,7 @@
91998
91999 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
92000 static struct autogroup autogroup_default;
92001-static atomic_t autogroup_seq_nr;
92002+static atomic_unchecked_t autogroup_seq_nr;
92003
92004 void __init autogroup_init(struct task_struct *init_task)
92005 {
92006@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
92007
92008 kref_init(&ag->kref);
92009 init_rwsem(&ag->lock);
92010- ag->id = atomic_inc_return(&autogroup_seq_nr);
92011+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
92012 ag->tg = tg;
92013 #ifdef CONFIG_RT_GROUP_SCHED
92014 /*
92015diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
92016index a63f4dc..349bbb0 100644
92017--- a/kernel/sched/completion.c
92018+++ b/kernel/sched/completion.c
92019@@ -204,7 +204,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
92020 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
92021 * or number of jiffies left till timeout) if completed.
92022 */
92023-long __sched
92024+long __sched __intentional_overflow(-1)
92025 wait_for_completion_interruptible_timeout(struct completion *x,
92026 unsigned long timeout)
92027 {
92028@@ -221,7 +221,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
92029 *
92030 * Return: -ERESTARTSYS if interrupted, 0 if completed.
92031 */
92032-int __sched wait_for_completion_killable(struct completion *x)
92033+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
92034 {
92035 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
92036 if (t == -ERESTARTSYS)
92037@@ -242,7 +242,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
92038 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
92039 * or number of jiffies left till timeout) if completed.
92040 */
92041-long __sched
92042+long __sched __intentional_overflow(-1)
92043 wait_for_completion_killable_timeout(struct completion *x,
92044 unsigned long timeout)
92045 {
92046diff --git a/kernel/sched/core.c b/kernel/sched/core.c
92047index 89e7283..072bc26 100644
92048--- a/kernel/sched/core.c
92049+++ b/kernel/sched/core.c
92050@@ -1885,7 +1885,7 @@ void set_numabalancing_state(bool enabled)
92051 int sysctl_numa_balancing(struct ctl_table *table, int write,
92052 void __user *buffer, size_t *lenp, loff_t *ppos)
92053 {
92054- struct ctl_table t;
92055+ ctl_table_no_const t;
92056 int err;
92057 int state = numabalancing_enabled;
92058
92059@@ -2348,8 +2348,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
92060 next->active_mm = oldmm;
92061 atomic_inc(&oldmm->mm_count);
92062 enter_lazy_tlb(oldmm, next);
92063- } else
92064+ } else {
92065 switch_mm(oldmm, mm, next);
92066+ populate_stack();
92067+ }
92068
92069 if (!prev->mm) {
92070 prev->active_mm = NULL;
92071@@ -3160,6 +3162,8 @@ int can_nice(const struct task_struct *p, const int nice)
92072 /* convert nice value [19,-20] to rlimit style value [1,40] */
92073 int nice_rlim = nice_to_rlimit(nice);
92074
92075+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
92076+
92077 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
92078 capable(CAP_SYS_NICE));
92079 }
92080@@ -3186,7 +3190,8 @@ SYSCALL_DEFINE1(nice, int, increment)
92081 nice = task_nice(current) + increment;
92082
92083 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
92084- if (increment < 0 && !can_nice(current, nice))
92085+ if (increment < 0 && (!can_nice(current, nice) ||
92086+ gr_handle_chroot_nice()))
92087 return -EPERM;
92088
92089 retval = security_task_setnice(current, nice);
92090@@ -3465,6 +3470,7 @@ recheck:
92091 if (policy != p->policy && !rlim_rtprio)
92092 return -EPERM;
92093
92094+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
92095 /* can't increase priority */
92096 if (attr->sched_priority > p->rt_priority &&
92097 attr->sched_priority > rlim_rtprio)
92098@@ -4885,6 +4891,7 @@ void idle_task_exit(void)
92099
92100 if (mm != &init_mm) {
92101 switch_mm(mm, &init_mm, current);
92102+ populate_stack();
92103 finish_arch_post_lock_switch();
92104 }
92105 mmdrop(mm);
92106@@ -4980,7 +4987,7 @@ static void migrate_tasks(unsigned int dead_cpu)
92107
92108 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
92109
92110-static struct ctl_table sd_ctl_dir[] = {
92111+static ctl_table_no_const sd_ctl_dir[] __read_only = {
92112 {
92113 .procname = "sched_domain",
92114 .mode = 0555,
92115@@ -4997,17 +5004,17 @@ static struct ctl_table sd_ctl_root[] = {
92116 {}
92117 };
92118
92119-static struct ctl_table *sd_alloc_ctl_entry(int n)
92120+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
92121 {
92122- struct ctl_table *entry =
92123+ ctl_table_no_const *entry =
92124 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
92125
92126 return entry;
92127 }
92128
92129-static void sd_free_ctl_entry(struct ctl_table **tablep)
92130+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
92131 {
92132- struct ctl_table *entry;
92133+ ctl_table_no_const *entry;
92134
92135 /*
92136 * In the intermediate directories, both the child directory and
92137@@ -5015,22 +5022,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
92138 * will always be set. In the lowest directory the names are
92139 * static strings and all have proc handlers.
92140 */
92141- for (entry = *tablep; entry->mode; entry++) {
92142- if (entry->child)
92143- sd_free_ctl_entry(&entry->child);
92144+ for (entry = tablep; entry->mode; entry++) {
92145+ if (entry->child) {
92146+ sd_free_ctl_entry(entry->child);
92147+ pax_open_kernel();
92148+ entry->child = NULL;
92149+ pax_close_kernel();
92150+ }
92151 if (entry->proc_handler == NULL)
92152 kfree(entry->procname);
92153 }
92154
92155- kfree(*tablep);
92156- *tablep = NULL;
92157+ kfree(tablep);
92158 }
92159
92160 static int min_load_idx = 0;
92161 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
92162
92163 static void
92164-set_table_entry(struct ctl_table *entry,
92165+set_table_entry(ctl_table_no_const *entry,
92166 const char *procname, void *data, int maxlen,
92167 umode_t mode, proc_handler *proc_handler,
92168 bool load_idx)
92169@@ -5050,7 +5060,7 @@ set_table_entry(struct ctl_table *entry,
92170 static struct ctl_table *
92171 sd_alloc_ctl_domain_table(struct sched_domain *sd)
92172 {
92173- struct ctl_table *table = sd_alloc_ctl_entry(14);
92174+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
92175
92176 if (table == NULL)
92177 return NULL;
92178@@ -5088,9 +5098,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
92179 return table;
92180 }
92181
92182-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
92183+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
92184 {
92185- struct ctl_table *entry, *table;
92186+ ctl_table_no_const *entry, *table;
92187 struct sched_domain *sd;
92188 int domain_num = 0, i;
92189 char buf[32];
92190@@ -5117,11 +5127,13 @@ static struct ctl_table_header *sd_sysctl_header;
92191 static void register_sched_domain_sysctl(void)
92192 {
92193 int i, cpu_num = num_possible_cpus();
92194- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
92195+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
92196 char buf[32];
92197
92198 WARN_ON(sd_ctl_dir[0].child);
92199+ pax_open_kernel();
92200 sd_ctl_dir[0].child = entry;
92201+ pax_close_kernel();
92202
92203 if (entry == NULL)
92204 return;
92205@@ -5144,8 +5156,12 @@ static void unregister_sched_domain_sysctl(void)
92206 if (sd_sysctl_header)
92207 unregister_sysctl_table(sd_sysctl_header);
92208 sd_sysctl_header = NULL;
92209- if (sd_ctl_dir[0].child)
92210- sd_free_ctl_entry(&sd_ctl_dir[0].child);
92211+ if (sd_ctl_dir[0].child) {
92212+ sd_free_ctl_entry(sd_ctl_dir[0].child);
92213+ pax_open_kernel();
92214+ sd_ctl_dir[0].child = NULL;
92215+ pax_close_kernel();
92216+ }
92217 }
92218 #else
92219 static void register_sched_domain_sysctl(void)
92220diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
92221index ef2b104..69961f6 100644
92222--- a/kernel/sched/fair.c
92223+++ b/kernel/sched/fair.c
92224@@ -1906,7 +1906,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
92225
92226 static void reset_ptenuma_scan(struct task_struct *p)
92227 {
92228- ACCESS_ONCE(p->mm->numa_scan_seq)++;
92229+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
92230 p->mm->numa_scan_offset = 0;
92231 }
92232
92233@@ -7465,7 +7465,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
92234 * run_rebalance_domains is triggered when needed from the scheduler tick.
92235 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
92236 */
92237-static void run_rebalance_domains(struct softirq_action *h)
92238+static __latent_entropy void run_rebalance_domains(void)
92239 {
92240 struct rq *this_rq = this_rq();
92241 enum cpu_idle_type idle = this_rq->idle_balance ?
92242diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
92243index 2df8ef0..aae070f 100644
92244--- a/kernel/sched/sched.h
92245+++ b/kernel/sched/sched.h
92246@@ -1140,7 +1140,7 @@ struct sched_class {
92247 #ifdef CONFIG_FAIR_GROUP_SCHED
92248 void (*task_move_group) (struct task_struct *p, int on_rq);
92249 #endif
92250-};
92251+} __do_const;
92252
92253 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
92254 {
92255diff --git a/kernel/signal.c b/kernel/signal.c
92256index 8f0876f..1153a5a 100644
92257--- a/kernel/signal.c
92258+++ b/kernel/signal.c
92259@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
92260
92261 int print_fatal_signals __read_mostly;
92262
92263-static void __user *sig_handler(struct task_struct *t, int sig)
92264+static __sighandler_t sig_handler(struct task_struct *t, int sig)
92265 {
92266 return t->sighand->action[sig - 1].sa.sa_handler;
92267 }
92268
92269-static int sig_handler_ignored(void __user *handler, int sig)
92270+static int sig_handler_ignored(__sighandler_t handler, int sig)
92271 {
92272 /* Is it explicitly or implicitly ignored? */
92273 return handler == SIG_IGN ||
92274@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
92275
92276 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
92277 {
92278- void __user *handler;
92279+ __sighandler_t handler;
92280
92281 handler = sig_handler(t, sig);
92282
92283@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
92284 atomic_inc(&user->sigpending);
92285 rcu_read_unlock();
92286
92287+ if (!override_rlimit)
92288+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
92289+
92290 if (override_rlimit ||
92291 atomic_read(&user->sigpending) <=
92292 task_rlimit(t, RLIMIT_SIGPENDING)) {
92293@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
92294
92295 int unhandled_signal(struct task_struct *tsk, int sig)
92296 {
92297- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
92298+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
92299 if (is_global_init(tsk))
92300 return 1;
92301 if (handler != SIG_IGN && handler != SIG_DFL)
92302@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
92303 }
92304 }
92305
92306+ /* allow glibc communication via tgkill to other threads in our
92307+ thread group */
92308+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
92309+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
92310+ && gr_handle_signal(t, sig))
92311+ return -EPERM;
92312+
92313 return security_task_kill(t, info, sig, 0);
92314 }
92315
92316@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
92317 return send_signal(sig, info, p, 1);
92318 }
92319
92320-static int
92321+int
92322 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92323 {
92324 return send_signal(sig, info, t, 0);
92325@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92326 unsigned long int flags;
92327 int ret, blocked, ignored;
92328 struct k_sigaction *action;
92329+ int is_unhandled = 0;
92330
92331 spin_lock_irqsave(&t->sighand->siglock, flags);
92332 action = &t->sighand->action[sig-1];
92333@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
92334 }
92335 if (action->sa.sa_handler == SIG_DFL)
92336 t->signal->flags &= ~SIGNAL_UNKILLABLE;
92337+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
92338+ is_unhandled = 1;
92339 ret = specific_send_sig_info(sig, info, t);
92340 spin_unlock_irqrestore(&t->sighand->siglock, flags);
92341
92342+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
92343+ normal operation */
92344+ if (is_unhandled) {
92345+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
92346+ gr_handle_crash(t, sig);
92347+ }
92348+
92349 return ret;
92350 }
92351
92352@@ -1300,8 +1320,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
92353 ret = check_kill_permission(sig, info, p);
92354 rcu_read_unlock();
92355
92356- if (!ret && sig)
92357+ if (!ret && sig) {
92358 ret = do_send_sig_info(sig, info, p, true);
92359+ if (!ret)
92360+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
92361+ }
92362
92363 return ret;
92364 }
92365@@ -2903,7 +2926,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
92366 int error = -ESRCH;
92367
92368 rcu_read_lock();
92369- p = find_task_by_vpid(pid);
92370+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
92371+ /* allow glibc communication via tgkill to other threads in our
92372+ thread group */
92373+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
92374+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
92375+ p = find_task_by_vpid_unrestricted(pid);
92376+ else
92377+#endif
92378+ p = find_task_by_vpid(pid);
92379 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
92380 error = check_kill_permission(sig, info, p);
92381 /*
92382@@ -3236,8 +3267,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
92383 }
92384 seg = get_fs();
92385 set_fs(KERNEL_DS);
92386- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
92387- (stack_t __force __user *) &uoss,
92388+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
92389+ (stack_t __force_user *) &uoss,
92390 compat_user_stack_pointer());
92391 set_fs(seg);
92392 if (ret >= 0 && uoss_ptr) {
92393diff --git a/kernel/smpboot.c b/kernel/smpboot.c
92394index eb89e18..a4e6792 100644
92395--- a/kernel/smpboot.c
92396+++ b/kernel/smpboot.c
92397@@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
92398 }
92399 smpboot_unpark_thread(plug_thread, cpu);
92400 }
92401- list_add(&plug_thread->list, &hotplug_threads);
92402+ pax_list_add(&plug_thread->list, &hotplug_threads);
92403 out:
92404 mutex_unlock(&smpboot_threads_lock);
92405 return ret;
92406@@ -305,7 +305,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
92407 {
92408 get_online_cpus();
92409 mutex_lock(&smpboot_threads_lock);
92410- list_del(&plug_thread->list);
92411+ pax_list_del(&plug_thread->list);
92412 smpboot_destroy_threads(plug_thread);
92413 mutex_unlock(&smpboot_threads_lock);
92414 put_online_cpus();
92415diff --git a/kernel/softirq.c b/kernel/softirq.c
92416index 0699add..d365ad8 100644
92417--- a/kernel/softirq.c
92418+++ b/kernel/softirq.c
92419@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
92420 EXPORT_SYMBOL(irq_stat);
92421 #endif
92422
92423-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
92424+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
92425
92426 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
92427
92428@@ -266,7 +266,7 @@ restart:
92429 kstat_incr_softirqs_this_cpu(vec_nr);
92430
92431 trace_softirq_entry(vec_nr);
92432- h->action(h);
92433+ h->action();
92434 trace_softirq_exit(vec_nr);
92435 if (unlikely(prev_count != preempt_count())) {
92436 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
92437@@ -426,7 +426,7 @@ void __raise_softirq_irqoff(unsigned int nr)
92438 or_softirq_pending(1UL << nr);
92439 }
92440
92441-void open_softirq(int nr, void (*action)(struct softirq_action *))
92442+void __init open_softirq(int nr, void (*action)(void))
92443 {
92444 softirq_vec[nr].action = action;
92445 }
92446@@ -478,7 +478,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
92447 }
92448 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
92449
92450-static void tasklet_action(struct softirq_action *a)
92451+static void tasklet_action(void)
92452 {
92453 struct tasklet_struct *list;
92454
92455@@ -514,7 +514,7 @@ static void tasklet_action(struct softirq_action *a)
92456 }
92457 }
92458
92459-static void tasklet_hi_action(struct softirq_action *a)
92460+static __latent_entropy void tasklet_hi_action(void)
92461 {
92462 struct tasklet_struct *list;
92463
92464@@ -741,7 +741,7 @@ static struct notifier_block cpu_nfb = {
92465 .notifier_call = cpu_callback
92466 };
92467
92468-static struct smp_hotplug_thread softirq_threads = {
92469+static struct smp_hotplug_thread softirq_threads __read_only = {
92470 .store = &ksoftirqd,
92471 .thread_should_run = ksoftirqd_should_run,
92472 .thread_fn = run_ksoftirqd,
92473diff --git a/kernel/sys.c b/kernel/sys.c
92474index 1eaa2f0..d80d27c 100644
92475--- a/kernel/sys.c
92476+++ b/kernel/sys.c
92477@@ -148,6 +148,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
92478 error = -EACCES;
92479 goto out;
92480 }
92481+
92482+ if (gr_handle_chroot_setpriority(p, niceval)) {
92483+ error = -EACCES;
92484+ goto out;
92485+ }
92486+
92487 no_nice = security_task_setnice(p, niceval);
92488 if (no_nice) {
92489 error = no_nice;
92490@@ -353,6 +359,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
92491 goto error;
92492 }
92493
92494+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
92495+ goto error;
92496+
92497+ if (!gid_eq(new->gid, old->gid)) {
92498+ /* make sure we generate a learn log for what will
92499+ end up being a role transition after a full-learning
92500+ policy is generated
92501+ CAP_SETGID is required to perform a transition
92502+ we may not log a CAP_SETGID check above, e.g.
92503+ in the case where new rgid = old egid
92504+ */
92505+ gr_learn_cap(current, new, CAP_SETGID);
92506+ }
92507+
92508 if (rgid != (gid_t) -1 ||
92509 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
92510 new->sgid = new->egid;
92511@@ -388,6 +408,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
92512 old = current_cred();
92513
92514 retval = -EPERM;
92515+
92516+ if (gr_check_group_change(kgid, kgid, kgid))
92517+ goto error;
92518+
92519 if (ns_capable(old->user_ns, CAP_SETGID))
92520 new->gid = new->egid = new->sgid = new->fsgid = kgid;
92521 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
92522@@ -405,7 +429,7 @@ error:
92523 /*
92524 * change the user struct in a credentials set to match the new UID
92525 */
92526-static int set_user(struct cred *new)
92527+int set_user(struct cred *new)
92528 {
92529 struct user_struct *new_user;
92530
92531@@ -485,7 +509,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
92532 goto error;
92533 }
92534
92535+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
92536+ goto error;
92537+
92538 if (!uid_eq(new->uid, old->uid)) {
92539+ /* make sure we generate a learn log for what will
92540+ end up being a role transition after a full-learning
92541+ policy is generated
92542+ CAP_SETUID is required to perform a transition
92543+ we may not log a CAP_SETUID check above, e.g.
92544+ in the case where new ruid = old euid
92545+ */
92546+ gr_learn_cap(current, new, CAP_SETUID);
92547 retval = set_user(new);
92548 if (retval < 0)
92549 goto error;
92550@@ -535,6 +570,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
92551 old = current_cred();
92552
92553 retval = -EPERM;
92554+
92555+ if (gr_check_crash_uid(kuid))
92556+ goto error;
92557+ if (gr_check_user_change(kuid, kuid, kuid))
92558+ goto error;
92559+
92560 if (ns_capable(old->user_ns, CAP_SETUID)) {
92561 new->suid = new->uid = kuid;
92562 if (!uid_eq(kuid, old->uid)) {
92563@@ -604,6 +645,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
92564 goto error;
92565 }
92566
92567+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
92568+ goto error;
92569+
92570 if (ruid != (uid_t) -1) {
92571 new->uid = kruid;
92572 if (!uid_eq(kruid, old->uid)) {
92573@@ -688,6 +732,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
92574 goto error;
92575 }
92576
92577+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
92578+ goto error;
92579+
92580 if (rgid != (gid_t) -1)
92581 new->gid = krgid;
92582 if (egid != (gid_t) -1)
92583@@ -752,12 +799,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
92584 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
92585 ns_capable(old->user_ns, CAP_SETUID)) {
92586 if (!uid_eq(kuid, old->fsuid)) {
92587+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
92588+ goto error;
92589+
92590 new->fsuid = kuid;
92591 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
92592 goto change_okay;
92593 }
92594 }
92595
92596+error:
92597 abort_creds(new);
92598 return old_fsuid;
92599
92600@@ -790,12 +841,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
92601 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
92602 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
92603 ns_capable(old->user_ns, CAP_SETGID)) {
92604+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
92605+ goto error;
92606+
92607 if (!gid_eq(kgid, old->fsgid)) {
92608 new->fsgid = kgid;
92609 goto change_okay;
92610 }
92611 }
92612
92613+error:
92614 abort_creds(new);
92615 return old_fsgid;
92616
92617@@ -1172,19 +1227,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
92618 return -EFAULT;
92619
92620 down_read(&uts_sem);
92621- error = __copy_to_user(&name->sysname, &utsname()->sysname,
92622+ error = __copy_to_user(name->sysname, &utsname()->sysname,
92623 __OLD_UTS_LEN);
92624 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
92625- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
92626+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
92627 __OLD_UTS_LEN);
92628 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
92629- error |= __copy_to_user(&name->release, &utsname()->release,
92630+ error |= __copy_to_user(name->release, &utsname()->release,
92631 __OLD_UTS_LEN);
92632 error |= __put_user(0, name->release + __OLD_UTS_LEN);
92633- error |= __copy_to_user(&name->version, &utsname()->version,
92634+ error |= __copy_to_user(name->version, &utsname()->version,
92635 __OLD_UTS_LEN);
92636 error |= __put_user(0, name->version + __OLD_UTS_LEN);
92637- error |= __copy_to_user(&name->machine, &utsname()->machine,
92638+ error |= __copy_to_user(name->machine, &utsname()->machine,
92639 __OLD_UTS_LEN);
92640 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
92641 up_read(&uts_sem);
92642@@ -1385,6 +1440,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
92643 */
92644 new_rlim->rlim_cur = 1;
92645 }
92646+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
92647+ is changed to a lower value. Since tasks can be created by the same
92648+ user in between this limit change and an execve by this task, force
92649+ a recheck only for this task by setting PF_NPROC_EXCEEDED
92650+ */
92651+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
92652+ tsk->flags |= PF_NPROC_EXCEEDED;
92653 }
92654 if (!retval) {
92655 if (old_rlim)
92656diff --git a/kernel/sysctl.c b/kernel/sysctl.c
92657index 15f2511..181b356 100644
92658--- a/kernel/sysctl.c
92659+++ b/kernel/sysctl.c
92660@@ -94,7 +94,6 @@
92661
92662
92663 #if defined(CONFIG_SYSCTL)
92664-
92665 /* External variables not in a header file. */
92666 extern int max_threads;
92667 extern int suid_dumpable;
92668@@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
92669
92670 /* Constants used for minimum and maximum */
92671 #ifdef CONFIG_LOCKUP_DETECTOR
92672-static int sixty = 60;
92673+static int sixty __read_only = 60;
92674 #endif
92675
92676-static int __maybe_unused neg_one = -1;
92677+static int __maybe_unused neg_one __read_only = -1;
92678
92679-static int zero;
92680-static int __maybe_unused one = 1;
92681-static int __maybe_unused two = 2;
92682-static int __maybe_unused four = 4;
92683-static unsigned long one_ul = 1;
92684-static int one_hundred = 100;
92685+static int zero __read_only = 0;
92686+static int __maybe_unused one __read_only = 1;
92687+static int __maybe_unused two __read_only = 2;
92688+static int __maybe_unused three __read_only = 3;
92689+static int __maybe_unused four __read_only = 4;
92690+static unsigned long one_ul __read_only = 1;
92691+static int one_hundred __read_only = 100;
92692 #ifdef CONFIG_PRINTK
92693-static int ten_thousand = 10000;
92694+static int ten_thousand __read_only = 10000;
92695 #endif
92696
92697 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
92698@@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
92699 void __user *buffer, size_t *lenp, loff_t *ppos);
92700 #endif
92701
92702-#ifdef CONFIG_PRINTK
92703 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
92704 void __user *buffer, size_t *lenp, loff_t *ppos);
92705-#endif
92706
92707 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
92708 void __user *buffer, size_t *lenp, loff_t *ppos);
92709@@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
92710
92711 #endif
92712
92713+extern struct ctl_table grsecurity_table[];
92714+
92715 static struct ctl_table kern_table[];
92716 static struct ctl_table vm_table[];
92717 static struct ctl_table fs_table[];
92718@@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
92719 int sysctl_legacy_va_layout;
92720 #endif
92721
92722+#ifdef CONFIG_PAX_SOFTMODE
92723+static struct ctl_table pax_table[] = {
92724+ {
92725+ .procname = "softmode",
92726+ .data = &pax_softmode,
92727+ .maxlen = sizeof(unsigned int),
92728+ .mode = 0600,
92729+ .proc_handler = &proc_dointvec,
92730+ },
92731+
92732+ { }
92733+};
92734+#endif
92735+
92736 /* The default sysctl tables: */
92737
92738 static struct ctl_table sysctl_base_table[] = {
92739@@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
92740 #endif
92741
92742 static struct ctl_table kern_table[] = {
92743+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
92744+ {
92745+ .procname = "grsecurity",
92746+ .mode = 0500,
92747+ .child = grsecurity_table,
92748+ },
92749+#endif
92750+
92751+#ifdef CONFIG_PAX_SOFTMODE
92752+ {
92753+ .procname = "pax",
92754+ .mode = 0500,
92755+ .child = pax_table,
92756+ },
92757+#endif
92758+
92759 {
92760 .procname = "sched_child_runs_first",
92761 .data = &sysctl_sched_child_runs_first,
92762@@ -642,7 +672,7 @@ static struct ctl_table kern_table[] = {
92763 .data = &modprobe_path,
92764 .maxlen = KMOD_PATH_LEN,
92765 .mode = 0644,
92766- .proc_handler = proc_dostring,
92767+ .proc_handler = proc_dostring_modpriv,
92768 },
92769 {
92770 .procname = "modules_disabled",
92771@@ -809,16 +839,20 @@ static struct ctl_table kern_table[] = {
92772 .extra1 = &zero,
92773 .extra2 = &one,
92774 },
92775+#endif
92776 {
92777 .procname = "kptr_restrict",
92778 .data = &kptr_restrict,
92779 .maxlen = sizeof(int),
92780 .mode = 0644,
92781 .proc_handler = proc_dointvec_minmax_sysadmin,
92782+#ifdef CONFIG_GRKERNSEC_HIDESYM
92783+ .extra1 = &two,
92784+#else
92785 .extra1 = &zero,
92786+#endif
92787 .extra2 = &two,
92788 },
92789-#endif
92790 {
92791 .procname = "ngroups_max",
92792 .data = &ngroups_max,
92793@@ -1065,10 +1099,17 @@ static struct ctl_table kern_table[] = {
92794 */
92795 {
92796 .procname = "perf_event_paranoid",
92797- .data = &sysctl_perf_event_paranoid,
92798- .maxlen = sizeof(sysctl_perf_event_paranoid),
92799+ .data = &sysctl_perf_event_legitimately_concerned,
92800+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
92801 .mode = 0644,
92802- .proc_handler = proc_dointvec,
92803+ /* go ahead, be a hero */
92804+ .proc_handler = proc_dointvec_minmax_sysadmin,
92805+ .extra1 = &neg_one,
92806+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
92807+ .extra2 = &three,
92808+#else
92809+ .extra2 = &two,
92810+#endif
92811 },
92812 {
92813 .procname = "perf_event_mlock_kb",
92814@@ -1327,6 +1368,13 @@ static struct ctl_table vm_table[] = {
92815 .proc_handler = proc_dointvec_minmax,
92816 .extra1 = &zero,
92817 },
92818+ {
92819+ .procname = "heap_stack_gap",
92820+ .data = &sysctl_heap_stack_gap,
92821+ .maxlen = sizeof(sysctl_heap_stack_gap),
92822+ .mode = 0644,
92823+ .proc_handler = proc_doulongvec_minmax,
92824+ },
92825 #else
92826 {
92827 .procname = "nr_trim_pages",
92828@@ -1809,6 +1857,16 @@ int proc_dostring(struct ctl_table *table, int write,
92829 (char __user *)buffer, lenp, ppos);
92830 }
92831
92832+int proc_dostring_modpriv(struct ctl_table *table, int write,
92833+ void __user *buffer, size_t *lenp, loff_t *ppos)
92834+{
92835+ if (write && !capable(CAP_SYS_MODULE))
92836+ return -EPERM;
92837+
92838+ return _proc_do_string(table->data, table->maxlen, write,
92839+ buffer, lenp, ppos);
92840+}
92841+
92842 static size_t proc_skip_spaces(char **buf)
92843 {
92844 size_t ret;
92845@@ -1914,6 +1972,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
92846 len = strlen(tmp);
92847 if (len > *size)
92848 len = *size;
92849+ if (len > sizeof(tmp))
92850+ len = sizeof(tmp);
92851 if (copy_to_user(*buf, tmp, len))
92852 return -EFAULT;
92853 *size -= len;
92854@@ -2091,7 +2151,7 @@ int proc_dointvec(struct ctl_table *table, int write,
92855 static int proc_taint(struct ctl_table *table, int write,
92856 void __user *buffer, size_t *lenp, loff_t *ppos)
92857 {
92858- struct ctl_table t;
92859+ ctl_table_no_const t;
92860 unsigned long tmptaint = get_taint();
92861 int err;
92862
92863@@ -2119,7 +2179,6 @@ static int proc_taint(struct ctl_table *table, int write,
92864 return err;
92865 }
92866
92867-#ifdef CONFIG_PRINTK
92868 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
92869 void __user *buffer, size_t *lenp, loff_t *ppos)
92870 {
92871@@ -2128,7 +2187,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
92872
92873 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
92874 }
92875-#endif
92876
92877 struct do_proc_dointvec_minmax_conv_param {
92878 int *min;
92879@@ -2688,6 +2746,12 @@ int proc_dostring(struct ctl_table *table, int write,
92880 return -ENOSYS;
92881 }
92882
92883+int proc_dostring_modpriv(struct ctl_table *table, int write,
92884+ void __user *buffer, size_t *lenp, loff_t *ppos)
92885+{
92886+ return -ENOSYS;
92887+}
92888+
92889 int proc_dointvec(struct ctl_table *table, int write,
92890 void __user *buffer, size_t *lenp, loff_t *ppos)
92891 {
92892@@ -2744,5 +2808,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
92893 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
92894 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
92895 EXPORT_SYMBOL(proc_dostring);
92896+EXPORT_SYMBOL(proc_dostring_modpriv);
92897 EXPORT_SYMBOL(proc_doulongvec_minmax);
92898 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
92899diff --git a/kernel/taskstats.c b/kernel/taskstats.c
92900index b312fcc7..753d72d 100644
92901--- a/kernel/taskstats.c
92902+++ b/kernel/taskstats.c
92903@@ -28,9 +28,12 @@
92904 #include <linux/fs.h>
92905 #include <linux/file.h>
92906 #include <linux/pid_namespace.h>
92907+#include <linux/grsecurity.h>
92908 #include <net/genetlink.h>
92909 #include <linux/atomic.h>
92910
92911+extern int gr_is_taskstats_denied(int pid);
92912+
92913 /*
92914 * Maximum length of a cpumask that can be specified in
92915 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
92916@@ -576,6 +579,9 @@ err:
92917
92918 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
92919 {
92920+ if (gr_is_taskstats_denied(current->pid))
92921+ return -EACCES;
92922+
92923 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
92924 return cmd_attr_register_cpumask(info);
92925 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
92926diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
92927index a7077d3..dd48a49 100644
92928--- a/kernel/time/alarmtimer.c
92929+++ b/kernel/time/alarmtimer.c
92930@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
92931 struct platform_device *pdev;
92932 int error = 0;
92933 int i;
92934- struct k_clock alarm_clock = {
92935+ static struct k_clock alarm_clock = {
92936 .clock_getres = alarm_clock_getres,
92937 .clock_get = alarm_clock_get,
92938 .timer_create = alarm_timer_create,
92939diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
92940index 37e50aa..57a9501 100644
92941--- a/kernel/time/hrtimer.c
92942+++ b/kernel/time/hrtimer.c
92943@@ -1399,7 +1399,7 @@ void hrtimer_peek_ahead_timers(void)
92944 local_irq_restore(flags);
92945 }
92946
92947-static void run_hrtimer_softirq(struct softirq_action *h)
92948+static __latent_entropy void run_hrtimer_softirq(void)
92949 {
92950 hrtimer_peek_ahead_timers();
92951 }
92952diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
92953index a16b678..8c5bd9d 100644
92954--- a/kernel/time/posix-cpu-timers.c
92955+++ b/kernel/time/posix-cpu-timers.c
92956@@ -1450,14 +1450,14 @@ struct k_clock clock_posix_cpu = {
92957
92958 static __init int init_posix_cpu_timers(void)
92959 {
92960- struct k_clock process = {
92961+ static struct k_clock process = {
92962 .clock_getres = process_cpu_clock_getres,
92963 .clock_get = process_cpu_clock_get,
92964 .timer_create = process_cpu_timer_create,
92965 .nsleep = process_cpu_nsleep,
92966 .nsleep_restart = process_cpu_nsleep_restart,
92967 };
92968- struct k_clock thread = {
92969+ static struct k_clock thread = {
92970 .clock_getres = thread_cpu_clock_getres,
92971 .clock_get = thread_cpu_clock_get,
92972 .timer_create = thread_cpu_timer_create,
92973diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
92974index 31ea01f..7fc61ef 100644
92975--- a/kernel/time/posix-timers.c
92976+++ b/kernel/time/posix-timers.c
92977@@ -43,6 +43,7 @@
92978 #include <linux/hash.h>
92979 #include <linux/posix-clock.h>
92980 #include <linux/posix-timers.h>
92981+#include <linux/grsecurity.h>
92982 #include <linux/syscalls.h>
92983 #include <linux/wait.h>
92984 #include <linux/workqueue.h>
92985@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
92986 * which we beg off on and pass to do_sys_settimeofday().
92987 */
92988
92989-static struct k_clock posix_clocks[MAX_CLOCKS];
92990+static struct k_clock *posix_clocks[MAX_CLOCKS];
92991
92992 /*
92993 * These ones are defined below.
92994@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
92995 */
92996 static __init int init_posix_timers(void)
92997 {
92998- struct k_clock clock_realtime = {
92999+ static struct k_clock clock_realtime = {
93000 .clock_getres = hrtimer_get_res,
93001 .clock_get = posix_clock_realtime_get,
93002 .clock_set = posix_clock_realtime_set,
93003@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
93004 .timer_get = common_timer_get,
93005 .timer_del = common_timer_del,
93006 };
93007- struct k_clock clock_monotonic = {
93008+ static struct k_clock clock_monotonic = {
93009 .clock_getres = hrtimer_get_res,
93010 .clock_get = posix_ktime_get_ts,
93011 .nsleep = common_nsleep,
93012@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
93013 .timer_get = common_timer_get,
93014 .timer_del = common_timer_del,
93015 };
93016- struct k_clock clock_monotonic_raw = {
93017+ static struct k_clock clock_monotonic_raw = {
93018 .clock_getres = hrtimer_get_res,
93019 .clock_get = posix_get_monotonic_raw,
93020 };
93021- struct k_clock clock_realtime_coarse = {
93022+ static struct k_clock clock_realtime_coarse = {
93023 .clock_getres = posix_get_coarse_res,
93024 .clock_get = posix_get_realtime_coarse,
93025 };
93026- struct k_clock clock_monotonic_coarse = {
93027+ static struct k_clock clock_monotonic_coarse = {
93028 .clock_getres = posix_get_coarse_res,
93029 .clock_get = posix_get_monotonic_coarse,
93030 };
93031- struct k_clock clock_tai = {
93032+ static struct k_clock clock_tai = {
93033 .clock_getres = hrtimer_get_res,
93034 .clock_get = posix_get_tai,
93035 .nsleep = common_nsleep,
93036@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
93037 .timer_get = common_timer_get,
93038 .timer_del = common_timer_del,
93039 };
93040- struct k_clock clock_boottime = {
93041+ static struct k_clock clock_boottime = {
93042 .clock_getres = hrtimer_get_res,
93043 .clock_get = posix_get_boottime,
93044 .nsleep = common_nsleep,
93045@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
93046 return;
93047 }
93048
93049- posix_clocks[clock_id] = *new_clock;
93050+ posix_clocks[clock_id] = new_clock;
93051 }
93052 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
93053
93054@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
93055 return (id & CLOCKFD_MASK) == CLOCKFD ?
93056 &clock_posix_dynamic : &clock_posix_cpu;
93057
93058- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
93059+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
93060 return NULL;
93061- return &posix_clocks[id];
93062+ return posix_clocks[id];
93063 }
93064
93065 static int common_timer_create(struct k_itimer *new_timer)
93066@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
93067 struct k_clock *kc = clockid_to_kclock(which_clock);
93068 struct k_itimer *new_timer;
93069 int error, new_timer_id;
93070- sigevent_t event;
93071+ sigevent_t event = { };
93072 int it_id_set = IT_ID_NOT_SET;
93073
93074 if (!kc)
93075@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
93076 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
93077 return -EFAULT;
93078
93079+ /* only the CLOCK_REALTIME clock can be set, all other clocks
93080+ have their clock_set fptr set to a nosettime dummy function
93081+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
93082+ call common_clock_set, which calls do_sys_settimeofday, which
93083+ we hook
93084+ */
93085+
93086 return kc->clock_set(which_clock, &new_tp);
93087 }
93088
93089diff --git a/kernel/time/time.c b/kernel/time/time.c
93090index a9ae20f..d3fbde7 100644
93091--- a/kernel/time/time.c
93092+++ b/kernel/time/time.c
93093@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
93094 return error;
93095
93096 if (tz) {
93097+ /* we log in do_settimeofday called below, so don't log twice
93098+ */
93099+ if (!tv)
93100+ gr_log_timechange();
93101+
93102 sys_tz = *tz;
93103 update_vsyscall_tz();
93104 if (firsttime) {
93105diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
93106index ec1791f..6a086cd 100644
93107--- a/kernel/time/timekeeping.c
93108+++ b/kernel/time/timekeeping.c
93109@@ -15,6 +15,7 @@
93110 #include <linux/init.h>
93111 #include <linux/mm.h>
93112 #include <linux/sched.h>
93113+#include <linux/grsecurity.h>
93114 #include <linux/syscore_ops.h>
93115 #include <linux/clocksource.h>
93116 #include <linux/jiffies.h>
93117@@ -717,6 +718,8 @@ int do_settimeofday(const struct timespec *tv)
93118 if (!timespec_valid_strict(tv))
93119 return -EINVAL;
93120
93121+ gr_log_timechange();
93122+
93123 raw_spin_lock_irqsave(&timekeeper_lock, flags);
93124 write_seqcount_begin(&tk_core.seq);
93125
93126diff --git a/kernel/time/timer.c b/kernel/time/timer.c
93127index 3260ffd..c93cd5e 100644
93128--- a/kernel/time/timer.c
93129+++ b/kernel/time/timer.c
93130@@ -1394,7 +1394,7 @@ void update_process_times(int user_tick)
93131 /*
93132 * This function runs timers and the timer-tq in bottom half context.
93133 */
93134-static void run_timer_softirq(struct softirq_action *h)
93135+static __latent_entropy void run_timer_softirq(void)
93136 {
93137 struct tvec_base *base = __this_cpu_read(tvec_bases);
93138
93139@@ -1457,7 +1457,7 @@ static void process_timeout(unsigned long __data)
93140 *
93141 * In all cases the return value is guaranteed to be non-negative.
93142 */
93143-signed long __sched schedule_timeout(signed long timeout)
93144+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
93145 {
93146 struct timer_list timer;
93147 unsigned long expire;
93148diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
93149index 61ed862..3b52c65 100644
93150--- a/kernel/time/timer_list.c
93151+++ b/kernel/time/timer_list.c
93152@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
93153
93154 static void print_name_offset(struct seq_file *m, void *sym)
93155 {
93156+#ifdef CONFIG_GRKERNSEC_HIDESYM
93157+ SEQ_printf(m, "<%p>", NULL);
93158+#else
93159 char symname[KSYM_NAME_LEN];
93160
93161 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
93162 SEQ_printf(m, "<%pK>", sym);
93163 else
93164 SEQ_printf(m, "%s", symname);
93165+#endif
93166 }
93167
93168 static void
93169@@ -119,7 +123,11 @@ next_one:
93170 static void
93171 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
93172 {
93173+#ifdef CONFIG_GRKERNSEC_HIDESYM
93174+ SEQ_printf(m, " .base: %p\n", NULL);
93175+#else
93176 SEQ_printf(m, " .base: %pK\n", base);
93177+#endif
93178 SEQ_printf(m, " .index: %d\n",
93179 base->index);
93180 SEQ_printf(m, " .resolution: %Lu nsecs\n",
93181@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
93182 {
93183 struct proc_dir_entry *pe;
93184
93185+#ifdef CONFIG_GRKERNSEC_PROC_ADD
93186+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
93187+#else
93188 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
93189+#endif
93190 if (!pe)
93191 return -ENOMEM;
93192 return 0;
93193diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
93194index 1fb08f2..ca4bb1e 100644
93195--- a/kernel/time/timer_stats.c
93196+++ b/kernel/time/timer_stats.c
93197@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
93198 static unsigned long nr_entries;
93199 static struct entry entries[MAX_ENTRIES];
93200
93201-static atomic_t overflow_count;
93202+static atomic_unchecked_t overflow_count;
93203
93204 /*
93205 * The entries are in a hash-table, for fast lookup:
93206@@ -140,7 +140,7 @@ static void reset_entries(void)
93207 nr_entries = 0;
93208 memset(entries, 0, sizeof(entries));
93209 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
93210- atomic_set(&overflow_count, 0);
93211+ atomic_set_unchecked(&overflow_count, 0);
93212 }
93213
93214 static struct entry *alloc_entry(void)
93215@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
93216 if (likely(entry))
93217 entry->count++;
93218 else
93219- atomic_inc(&overflow_count);
93220+ atomic_inc_unchecked(&overflow_count);
93221
93222 out_unlock:
93223 raw_spin_unlock_irqrestore(lock, flags);
93224@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
93225
93226 static void print_name_offset(struct seq_file *m, unsigned long addr)
93227 {
93228+#ifdef CONFIG_GRKERNSEC_HIDESYM
93229+ seq_printf(m, "<%p>", NULL);
93230+#else
93231 char symname[KSYM_NAME_LEN];
93232
93233 if (lookup_symbol_name(addr, symname) < 0)
93234- seq_printf(m, "<%p>", (void *)addr);
93235+ seq_printf(m, "<%pK>", (void *)addr);
93236 else
93237 seq_printf(m, "%s", symname);
93238+#endif
93239 }
93240
93241 static int tstats_show(struct seq_file *m, void *v)
93242@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
93243
93244 seq_puts(m, "Timer Stats Version: v0.3\n");
93245 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
93246- if (atomic_read(&overflow_count))
93247- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
93248+ if (atomic_read_unchecked(&overflow_count))
93249+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
93250 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
93251
93252 for (i = 0; i < nr_entries; i++) {
93253@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
93254 {
93255 struct proc_dir_entry *pe;
93256
93257+#ifdef CONFIG_GRKERNSEC_PROC_ADD
93258+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
93259+#else
93260 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
93261+#endif
93262 if (!pe)
93263 return -ENOMEM;
93264 return 0;
93265diff --git a/kernel/torture.c b/kernel/torture.c
93266index dd70993..0bf694b 100644
93267--- a/kernel/torture.c
93268+++ b/kernel/torture.c
93269@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
93270 mutex_lock(&fullstop_mutex);
93271 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
93272 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
93273- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
93274+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
93275 } else {
93276 pr_warn("Concurrent rmmod and shutdown illegal!\n");
93277 }
93278@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
93279 if (!torture_must_stop()) {
93280 if (stutter > 1) {
93281 schedule_timeout_interruptible(stutter - 1);
93282- ACCESS_ONCE(stutter_pause_test) = 2;
93283+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
93284 }
93285 schedule_timeout_interruptible(1);
93286- ACCESS_ONCE(stutter_pause_test) = 1;
93287+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
93288 }
93289 if (!torture_must_stop())
93290 schedule_timeout_interruptible(stutter);
93291- ACCESS_ONCE(stutter_pause_test) = 0;
93292+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
93293 torture_shutdown_absorb("torture_stutter");
93294 } while (!torture_must_stop());
93295 torture_kthread_stopping("torture_stutter");
93296@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
93297 schedule_timeout_uninterruptible(10);
93298 return true;
93299 }
93300- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
93301+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
93302 mutex_unlock(&fullstop_mutex);
93303 torture_shutdown_cleanup();
93304 torture_shuffle_cleanup();
93305diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
93306index c1bd4ad..4b861dc 100644
93307--- a/kernel/trace/blktrace.c
93308+++ b/kernel/trace/blktrace.c
93309@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
93310 struct blk_trace *bt = filp->private_data;
93311 char buf[16];
93312
93313- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
93314+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
93315
93316 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
93317 }
93318@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
93319 return 1;
93320
93321 bt = buf->chan->private_data;
93322- atomic_inc(&bt->dropped);
93323+ atomic_inc_unchecked(&bt->dropped);
93324 return 0;
93325 }
93326
93327@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
93328
93329 bt->dir = dir;
93330 bt->dev = dev;
93331- atomic_set(&bt->dropped, 0);
93332+ atomic_set_unchecked(&bt->dropped, 0);
93333 INIT_LIST_HEAD(&bt->running_list);
93334
93335 ret = -EIO;
93336diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
93337index 31c90fe..051ce98 100644
93338--- a/kernel/trace/ftrace.c
93339+++ b/kernel/trace/ftrace.c
93340@@ -2183,12 +2183,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
93341 if (unlikely(ftrace_disabled))
93342 return 0;
93343
93344+ ret = ftrace_arch_code_modify_prepare();
93345+ FTRACE_WARN_ON(ret);
93346+ if (ret)
93347+ return 0;
93348+
93349 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
93350+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
93351 if (ret) {
93352 ftrace_bug(ret, ip);
93353- return 0;
93354 }
93355- return 1;
93356+ return ret ? 0 : 1;
93357 }
93358
93359 /*
93360@@ -4492,8 +4497,10 @@ static int ftrace_process_locs(struct module *mod,
93361 if (!count)
93362 return 0;
93363
93364+ pax_open_kernel();
93365 sort(start, count, sizeof(*start),
93366 ftrace_cmp_ips, ftrace_swap_ips);
93367+ pax_close_kernel();
93368
93369 start_pg = ftrace_allocate_pages(count);
93370 if (!start_pg)
93371@@ -5340,7 +5347,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
93372
93373 if (t->ret_stack == NULL) {
93374 atomic_set(&t->tracing_graph_pause, 0);
93375- atomic_set(&t->trace_overrun, 0);
93376+ atomic_set_unchecked(&t->trace_overrun, 0);
93377 t->curr_ret_stack = -1;
93378 /* Make sure the tasks see the -1 first: */
93379 smp_wmb();
93380@@ -5553,7 +5560,7 @@ static void
93381 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
93382 {
93383 atomic_set(&t->tracing_graph_pause, 0);
93384- atomic_set(&t->trace_overrun, 0);
93385+ atomic_set_unchecked(&t->trace_overrun, 0);
93386 t->ftrace_timestamp = 0;
93387 /* make curr_ret_stack visible before we add the ret_stack */
93388 smp_wmb();
93389diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
93390index a56e07c..d46f0ba 100644
93391--- a/kernel/trace/ring_buffer.c
93392+++ b/kernel/trace/ring_buffer.c
93393@@ -352,9 +352,9 @@ struct buffer_data_page {
93394 */
93395 struct buffer_page {
93396 struct list_head list; /* list of buffer pages */
93397- local_t write; /* index for next write */
93398+ local_unchecked_t write; /* index for next write */
93399 unsigned read; /* index for next read */
93400- local_t entries; /* entries on this page */
93401+ local_unchecked_t entries; /* entries on this page */
93402 unsigned long real_end; /* real end of data */
93403 struct buffer_data_page *page; /* Actual data page */
93404 };
93405@@ -473,8 +473,8 @@ struct ring_buffer_per_cpu {
93406 unsigned long last_overrun;
93407 local_t entries_bytes;
93408 local_t entries;
93409- local_t overrun;
93410- local_t commit_overrun;
93411+ local_unchecked_t overrun;
93412+ local_unchecked_t commit_overrun;
93413 local_t dropped_events;
93414 local_t committing;
93415 local_t commits;
93416@@ -1032,8 +1032,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
93417 *
93418 * We add a counter to the write field to denote this.
93419 */
93420- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
93421- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
93422+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
93423+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
93424
93425 /*
93426 * Just make sure we have seen our old_write and synchronize
93427@@ -1061,8 +1061,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
93428 * cmpxchg to only update if an interrupt did not already
93429 * do it for us. If the cmpxchg fails, we don't care.
93430 */
93431- (void)local_cmpxchg(&next_page->write, old_write, val);
93432- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
93433+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
93434+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
93435
93436 /*
93437 * No need to worry about races with clearing out the commit.
93438@@ -1429,12 +1429,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
93439
93440 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
93441 {
93442- return local_read(&bpage->entries) & RB_WRITE_MASK;
93443+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
93444 }
93445
93446 static inline unsigned long rb_page_write(struct buffer_page *bpage)
93447 {
93448- return local_read(&bpage->write) & RB_WRITE_MASK;
93449+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
93450 }
93451
93452 static int
93453@@ -1529,7 +1529,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
93454 * bytes consumed in ring buffer from here.
93455 * Increment overrun to account for the lost events.
93456 */
93457- local_add(page_entries, &cpu_buffer->overrun);
93458+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
93459 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
93460 }
93461
93462@@ -2091,7 +2091,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
93463 * it is our responsibility to update
93464 * the counters.
93465 */
93466- local_add(entries, &cpu_buffer->overrun);
93467+ local_add_unchecked(entries, &cpu_buffer->overrun);
93468 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
93469
93470 /*
93471@@ -2241,7 +2241,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93472 if (tail == BUF_PAGE_SIZE)
93473 tail_page->real_end = 0;
93474
93475- local_sub(length, &tail_page->write);
93476+ local_sub_unchecked(length, &tail_page->write);
93477 return;
93478 }
93479
93480@@ -2276,7 +2276,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93481 rb_event_set_padding(event);
93482
93483 /* Set the write back to the previous setting */
93484- local_sub(length, &tail_page->write);
93485+ local_sub_unchecked(length, &tail_page->write);
93486 return;
93487 }
93488
93489@@ -2288,7 +2288,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
93490
93491 /* Set write to end of buffer */
93492 length = (tail + length) - BUF_PAGE_SIZE;
93493- local_sub(length, &tail_page->write);
93494+ local_sub_unchecked(length, &tail_page->write);
93495 }
93496
93497 /*
93498@@ -2314,7 +2314,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
93499 * about it.
93500 */
93501 if (unlikely(next_page == commit_page)) {
93502- local_inc(&cpu_buffer->commit_overrun);
93503+ local_inc_unchecked(&cpu_buffer->commit_overrun);
93504 goto out_reset;
93505 }
93506
93507@@ -2370,7 +2370,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
93508 cpu_buffer->tail_page) &&
93509 (cpu_buffer->commit_page ==
93510 cpu_buffer->reader_page))) {
93511- local_inc(&cpu_buffer->commit_overrun);
93512+ local_inc_unchecked(&cpu_buffer->commit_overrun);
93513 goto out_reset;
93514 }
93515 }
93516@@ -2418,7 +2418,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
93517 length += RB_LEN_TIME_EXTEND;
93518
93519 tail_page = cpu_buffer->tail_page;
93520- write = local_add_return(length, &tail_page->write);
93521+ write = local_add_return_unchecked(length, &tail_page->write);
93522
93523 /* set write to only the index of the write */
93524 write &= RB_WRITE_MASK;
93525@@ -2442,7 +2442,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
93526 kmemcheck_annotate_bitfield(event, bitfield);
93527 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
93528
93529- local_inc(&tail_page->entries);
93530+ local_inc_unchecked(&tail_page->entries);
93531
93532 /*
93533 * If this is the first commit on the page, then update
93534@@ -2475,7 +2475,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
93535
93536 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
93537 unsigned long write_mask =
93538- local_read(&bpage->write) & ~RB_WRITE_MASK;
93539+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
93540 unsigned long event_length = rb_event_length(event);
93541 /*
93542 * This is on the tail page. It is possible that
93543@@ -2485,7 +2485,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
93544 */
93545 old_index += write_mask;
93546 new_index += write_mask;
93547- index = local_cmpxchg(&bpage->write, old_index, new_index);
93548+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
93549 if (index == old_index) {
93550 /* update counters */
93551 local_sub(event_length, &cpu_buffer->entries_bytes);
93552@@ -2877,7 +2877,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
93553
93554 /* Do the likely case first */
93555 if (likely(bpage->page == (void *)addr)) {
93556- local_dec(&bpage->entries);
93557+ local_dec_unchecked(&bpage->entries);
93558 return;
93559 }
93560
93561@@ -2889,7 +2889,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
93562 start = bpage;
93563 do {
93564 if (bpage->page == (void *)addr) {
93565- local_dec(&bpage->entries);
93566+ local_dec_unchecked(&bpage->entries);
93567 return;
93568 }
93569 rb_inc_page(cpu_buffer, &bpage);
93570@@ -3173,7 +3173,7 @@ static inline unsigned long
93571 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
93572 {
93573 return local_read(&cpu_buffer->entries) -
93574- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
93575+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
93576 }
93577
93578 /**
93579@@ -3262,7 +3262,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
93580 return 0;
93581
93582 cpu_buffer = buffer->buffers[cpu];
93583- ret = local_read(&cpu_buffer->overrun);
93584+ ret = local_read_unchecked(&cpu_buffer->overrun);
93585
93586 return ret;
93587 }
93588@@ -3285,7 +3285,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
93589 return 0;
93590
93591 cpu_buffer = buffer->buffers[cpu];
93592- ret = local_read(&cpu_buffer->commit_overrun);
93593+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
93594
93595 return ret;
93596 }
93597@@ -3370,7 +3370,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
93598 /* if you care about this being correct, lock the buffer */
93599 for_each_buffer_cpu(buffer, cpu) {
93600 cpu_buffer = buffer->buffers[cpu];
93601- overruns += local_read(&cpu_buffer->overrun);
93602+ overruns += local_read_unchecked(&cpu_buffer->overrun);
93603 }
93604
93605 return overruns;
93606@@ -3541,8 +3541,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
93607 /*
93608 * Reset the reader page to size zero.
93609 */
93610- local_set(&cpu_buffer->reader_page->write, 0);
93611- local_set(&cpu_buffer->reader_page->entries, 0);
93612+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
93613+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
93614 local_set(&cpu_buffer->reader_page->page->commit, 0);
93615 cpu_buffer->reader_page->real_end = 0;
93616
93617@@ -3576,7 +3576,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
93618 * want to compare with the last_overrun.
93619 */
93620 smp_mb();
93621- overwrite = local_read(&(cpu_buffer->overrun));
93622+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
93623
93624 /*
93625 * Here's the tricky part.
93626@@ -4148,8 +4148,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
93627
93628 cpu_buffer->head_page
93629 = list_entry(cpu_buffer->pages, struct buffer_page, list);
93630- local_set(&cpu_buffer->head_page->write, 0);
93631- local_set(&cpu_buffer->head_page->entries, 0);
93632+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
93633+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
93634 local_set(&cpu_buffer->head_page->page->commit, 0);
93635
93636 cpu_buffer->head_page->read = 0;
93637@@ -4159,14 +4159,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
93638
93639 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
93640 INIT_LIST_HEAD(&cpu_buffer->new_pages);
93641- local_set(&cpu_buffer->reader_page->write, 0);
93642- local_set(&cpu_buffer->reader_page->entries, 0);
93643+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
93644+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
93645 local_set(&cpu_buffer->reader_page->page->commit, 0);
93646 cpu_buffer->reader_page->read = 0;
93647
93648 local_set(&cpu_buffer->entries_bytes, 0);
93649- local_set(&cpu_buffer->overrun, 0);
93650- local_set(&cpu_buffer->commit_overrun, 0);
93651+ local_set_unchecked(&cpu_buffer->overrun, 0);
93652+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
93653 local_set(&cpu_buffer->dropped_events, 0);
93654 local_set(&cpu_buffer->entries, 0);
93655 local_set(&cpu_buffer->committing, 0);
93656@@ -4571,8 +4571,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
93657 rb_init_page(bpage);
93658 bpage = reader->page;
93659 reader->page = *data_page;
93660- local_set(&reader->write, 0);
93661- local_set(&reader->entries, 0);
93662+ local_set_unchecked(&reader->write, 0);
93663+ local_set_unchecked(&reader->entries, 0);
93664 reader->read = 0;
93665 *data_page = bpage;
93666
93667diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
93668index 426962b..e8e2d9a 100644
93669--- a/kernel/trace/trace.c
93670+++ b/kernel/trace/trace.c
93671@@ -3488,7 +3488,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
93672 return 0;
93673 }
93674
93675-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
93676+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
93677 {
93678 /* do nothing if flag is already set */
93679 if (!!(trace_flags & mask) == !!enabled)
93680diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
93681index 385391f..8d2250f 100644
93682--- a/kernel/trace/trace.h
93683+++ b/kernel/trace/trace.h
93684@@ -1280,7 +1280,7 @@ extern const char *__stop___tracepoint_str[];
93685 void trace_printk_init_buffers(void);
93686 void trace_printk_start_comm(void);
93687 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
93688-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
93689+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
93690
93691 /*
93692 * Normal trace_printk() and friends allocates special buffers
93693diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
93694index 57b67b1..66082a9 100644
93695--- a/kernel/trace/trace_clock.c
93696+++ b/kernel/trace/trace_clock.c
93697@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
93698 return now;
93699 }
93700
93701-static atomic64_t trace_counter;
93702+static atomic64_unchecked_t trace_counter;
93703
93704 /*
93705 * trace_clock_counter(): simply an atomic counter.
93706@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
93707 */
93708 u64 notrace trace_clock_counter(void)
93709 {
93710- return atomic64_add_return(1, &trace_counter);
93711+ return atomic64_inc_return_unchecked(&trace_counter);
93712 }
93713diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
93714index 1b0df1e..4ebb965 100644
93715--- a/kernel/trace/trace_events.c
93716+++ b/kernel/trace/trace_events.c
93717@@ -1720,7 +1720,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
93718 return 0;
93719 }
93720
93721-struct ftrace_module_file_ops;
93722 static void __add_event_to_tracers(struct ftrace_event_call *call);
93723
93724 /* Add an additional event_call dynamically */
93725diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
93726index f0a0c98..3692dc8 100644
93727--- a/kernel/trace/trace_functions_graph.c
93728+++ b/kernel/trace/trace_functions_graph.c
93729@@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
93730
93731 /* The return trace stack is full */
93732 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
93733- atomic_inc(&current->trace_overrun);
93734+ atomic_inc_unchecked(&current->trace_overrun);
93735 return -EBUSY;
93736 }
93737
93738@@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
93739 *ret = current->ret_stack[index].ret;
93740 trace->func = current->ret_stack[index].func;
93741 trace->calltime = current->ret_stack[index].calltime;
93742- trace->overrun = atomic_read(&current->trace_overrun);
93743+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
93744 trace->depth = index;
93745 }
93746
93747diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
93748index 0abd9b8..6a663a2 100644
93749--- a/kernel/trace/trace_mmiotrace.c
93750+++ b/kernel/trace/trace_mmiotrace.c
93751@@ -24,7 +24,7 @@ struct header_iter {
93752 static struct trace_array *mmio_trace_array;
93753 static bool overrun_detected;
93754 static unsigned long prev_overruns;
93755-static atomic_t dropped_count;
93756+static atomic_unchecked_t dropped_count;
93757
93758 static void mmio_reset_data(struct trace_array *tr)
93759 {
93760@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
93761
93762 static unsigned long count_overruns(struct trace_iterator *iter)
93763 {
93764- unsigned long cnt = atomic_xchg(&dropped_count, 0);
93765+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
93766 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
93767
93768 if (over > prev_overruns)
93769@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
93770 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
93771 sizeof(*entry), 0, pc);
93772 if (!event) {
93773- atomic_inc(&dropped_count);
93774+ atomic_inc_unchecked(&dropped_count);
93775 return;
93776 }
93777 entry = ring_buffer_event_data(event);
93778@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
93779 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
93780 sizeof(*entry), 0, pc);
93781 if (!event) {
93782- atomic_inc(&dropped_count);
93783+ atomic_inc_unchecked(&dropped_count);
93784 return;
93785 }
93786 entry = ring_buffer_event_data(event);
93787diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
93788index c6977d5..d243785 100644
93789--- a/kernel/trace/trace_output.c
93790+++ b/kernel/trace/trace_output.c
93791@@ -712,14 +712,16 @@ int register_ftrace_event(struct trace_event *event)
93792 goto out;
93793 }
93794
93795+ pax_open_kernel();
93796 if (event->funcs->trace == NULL)
93797- event->funcs->trace = trace_nop_print;
93798+ *(void **)&event->funcs->trace = trace_nop_print;
93799 if (event->funcs->raw == NULL)
93800- event->funcs->raw = trace_nop_print;
93801+ *(void **)&event->funcs->raw = trace_nop_print;
93802 if (event->funcs->hex == NULL)
93803- event->funcs->hex = trace_nop_print;
93804+ *(void **)&event->funcs->hex = trace_nop_print;
93805 if (event->funcs->binary == NULL)
93806- event->funcs->binary = trace_nop_print;
93807+ *(void **)&event->funcs->binary = trace_nop_print;
93808+ pax_close_kernel();
93809
93810 key = event->type & (EVENT_HASHSIZE - 1);
93811
93812diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
93813index 1f24ed9..10407ec 100644
93814--- a/kernel/trace/trace_seq.c
93815+++ b/kernel/trace/trace_seq.c
93816@@ -367,7 +367,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
93817
93818 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
93819 if (!IS_ERR(p)) {
93820- p = mangle_path(s->buffer + s->len, p, "\n");
93821+ p = mangle_path(s->buffer + s->len, p, "\n\\");
93822 if (p) {
93823 s->len = p - s->buffer;
93824 return 1;
93825diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
93826index 16eddb3..758b308 100644
93827--- a/kernel/trace/trace_stack.c
93828+++ b/kernel/trace/trace_stack.c
93829@@ -90,7 +90,7 @@ check_stack(unsigned long ip, unsigned long *stack)
93830 return;
93831
93832 /* we do not handle interrupt stacks yet */
93833- if (!object_is_on_stack(stack))
93834+ if (!object_starts_on_stack(stack))
93835 return;
93836
93837 local_irq_save(flags);
93838diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
93839index 29228c4..301bc8c 100644
93840--- a/kernel/trace/trace_syscalls.c
93841+++ b/kernel/trace/trace_syscalls.c
93842@@ -602,6 +602,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
93843 int num;
93844
93845 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93846+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93847+ return -EINVAL;
93848
93849 mutex_lock(&syscall_trace_lock);
93850 if (!sys_perf_refcount_enter)
93851@@ -622,6 +624,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
93852 int num;
93853
93854 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93855+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93856+ return;
93857
93858 mutex_lock(&syscall_trace_lock);
93859 sys_perf_refcount_enter--;
93860@@ -674,6 +678,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
93861 int num;
93862
93863 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93864+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93865+ return -EINVAL;
93866
93867 mutex_lock(&syscall_trace_lock);
93868 if (!sys_perf_refcount_exit)
93869@@ -694,6 +700,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
93870 int num;
93871
93872 num = ((struct syscall_metadata *)call->data)->syscall_nr;
93873+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
93874+ return;
93875
93876 mutex_lock(&syscall_trace_lock);
93877 sys_perf_refcount_exit--;
93878diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
93879index aa312b0..395f343 100644
93880--- a/kernel/user_namespace.c
93881+++ b/kernel/user_namespace.c
93882@@ -82,6 +82,21 @@ int create_user_ns(struct cred *new)
93883 !kgid_has_mapping(parent_ns, group))
93884 return -EPERM;
93885
93886+#ifdef CONFIG_GRKERNSEC
93887+ /*
93888+ * This doesn't really inspire confidence:
93889+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
93890+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
93891+ * Increases kernel attack surface in areas developers
93892+ * previously cared little about ("low importance due
93893+ * to requiring "root" capability")
93894+ * To be removed when this code receives *proper* review
93895+ */
93896+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
93897+ !capable(CAP_SETGID))
93898+ return -EPERM;
93899+#endif
93900+
93901 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
93902 if (!ns)
93903 return -ENOMEM;
93904@@ -872,7 +887,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
93905 if (atomic_read(&current->mm->mm_users) > 1)
93906 return -EINVAL;
93907
93908- if (current->fs->users != 1)
93909+ if (atomic_read(&current->fs->users) != 1)
93910 return -EINVAL;
93911
93912 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
93913diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
93914index c8eac43..4b5f08f 100644
93915--- a/kernel/utsname_sysctl.c
93916+++ b/kernel/utsname_sysctl.c
93917@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
93918 static int proc_do_uts_string(struct ctl_table *table, int write,
93919 void __user *buffer, size_t *lenp, loff_t *ppos)
93920 {
93921- struct ctl_table uts_table;
93922+ ctl_table_no_const uts_table;
93923 int r;
93924 memcpy(&uts_table, table, sizeof(uts_table));
93925 uts_table.data = get_uts(table, write);
93926diff --git a/kernel/watchdog.c b/kernel/watchdog.c
93927index 70bf118..4be3c37 100644
93928--- a/kernel/watchdog.c
93929+++ b/kernel/watchdog.c
93930@@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
93931 static void watchdog_nmi_disable(unsigned int cpu) { return; }
93932 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
93933
93934-static struct smp_hotplug_thread watchdog_threads = {
93935+static struct smp_hotplug_thread watchdog_threads __read_only = {
93936 .store = &softlockup_watchdog,
93937 .thread_should_run = watchdog_should_run,
93938 .thread_fn = watchdog,
93939diff --git a/kernel/workqueue.c b/kernel/workqueue.c
93940index 09b685d..d3565e3 100644
93941--- a/kernel/workqueue.c
93942+++ b/kernel/workqueue.c
93943@@ -4508,7 +4508,7 @@ static void rebind_workers(struct worker_pool *pool)
93944 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
93945 worker_flags |= WORKER_REBOUND;
93946 worker_flags &= ~WORKER_UNBOUND;
93947- ACCESS_ONCE(worker->flags) = worker_flags;
93948+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
93949 }
93950
93951 spin_unlock_irq(&pool->lock);
93952diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
93953index 4e35a5d..8a1f3f0 100644
93954--- a/lib/Kconfig.debug
93955+++ b/lib/Kconfig.debug
93956@@ -894,7 +894,7 @@ config DEBUG_MUTEXES
93957
93958 config DEBUG_WW_MUTEX_SLOWPATH
93959 bool "Wait/wound mutex debugging: Slowpath testing"
93960- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
93961+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
93962 select DEBUG_LOCK_ALLOC
93963 select DEBUG_SPINLOCK
93964 select DEBUG_MUTEXES
93965@@ -911,7 +911,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
93966
93967 config DEBUG_LOCK_ALLOC
93968 bool "Lock debugging: detect incorrect freeing of live locks"
93969- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
93970+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
93971 select DEBUG_SPINLOCK
93972 select DEBUG_MUTEXES
93973 select LOCKDEP
93974@@ -925,7 +925,7 @@ config DEBUG_LOCK_ALLOC
93975
93976 config PROVE_LOCKING
93977 bool "Lock debugging: prove locking correctness"
93978- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
93979+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
93980 select LOCKDEP
93981 select DEBUG_SPINLOCK
93982 select DEBUG_MUTEXES
93983@@ -976,7 +976,7 @@ config LOCKDEP
93984
93985 config LOCK_STAT
93986 bool "Lock usage statistics"
93987- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
93988+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
93989 select LOCKDEP
93990 select DEBUG_SPINLOCK
93991 select DEBUG_MUTEXES
93992@@ -1449,6 +1449,7 @@ config LATENCYTOP
93993 depends on DEBUG_KERNEL
93994 depends on STACKTRACE_SUPPORT
93995 depends on PROC_FS
93996+ depends on !GRKERNSEC_HIDESYM
93997 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
93998 select KALLSYMS
93999 select KALLSYMS_ALL
94000@@ -1465,7 +1466,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
94001 config DEBUG_STRICT_USER_COPY_CHECKS
94002 bool "Strict user copy size checks"
94003 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
94004- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
94005+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
94006 help
94007 Enabling this option turns a certain set of sanity checks for user
94008 copy operations into compile time failures.
94009@@ -1593,7 +1594,7 @@ endmenu # runtime tests
94010
94011 config PROVIDE_OHCI1394_DMA_INIT
94012 bool "Remote debugging over FireWire early on boot"
94013- depends on PCI && X86
94014+ depends on PCI && X86 && !GRKERNSEC
94015 help
94016 If you want to debug problems which hang or crash the kernel early
94017 on boot and the crashing machine has a FireWire port, you can use
94018diff --git a/lib/Makefile b/lib/Makefile
94019index 0211d2b..93f5cc3 100644
94020--- a/lib/Makefile
94021+++ b/lib/Makefile
94022@@ -55,7 +55,7 @@ obj-$(CONFIG_BTREE) += btree.o
94023 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
94024 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
94025 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
94026-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
94027+obj-y += list_debug.o
94028 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
94029
94030 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
94031diff --git a/lib/average.c b/lib/average.c
94032index 114d1be..ab0350c 100644
94033--- a/lib/average.c
94034+++ b/lib/average.c
94035@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
94036 {
94037 unsigned long internal = ACCESS_ONCE(avg->internal);
94038
94039- ACCESS_ONCE(avg->internal) = internal ?
94040+ ACCESS_ONCE_RW(avg->internal) = internal ?
94041 (((internal << avg->weight) - internal) +
94042 (val << avg->factor)) >> avg->weight :
94043 (val << avg->factor);
94044diff --git a/lib/bitmap.c b/lib/bitmap.c
94045index b499ab6..fbdb76c 100644
94046--- a/lib/bitmap.c
94047+++ b/lib/bitmap.c
94048@@ -433,7 +433,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
94049 {
94050 int c, old_c, totaldigits, ndigits, nchunks, nbits;
94051 u32 chunk;
94052- const char __user __force *ubuf = (const char __user __force *)buf;
94053+ const char __user *ubuf = (const char __force_user *)buf;
94054
94055 bitmap_zero(maskp, nmaskbits);
94056
94057@@ -518,7 +518,7 @@ int bitmap_parse_user(const char __user *ubuf,
94058 {
94059 if (!access_ok(VERIFY_READ, ubuf, ulen))
94060 return -EFAULT;
94061- return __bitmap_parse((const char __force *)ubuf,
94062+ return __bitmap_parse((const char __force_kernel *)ubuf,
94063 ulen, 1, maskp, nmaskbits);
94064
94065 }
94066@@ -609,7 +609,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
94067 {
94068 unsigned a, b;
94069 int c, old_c, totaldigits;
94070- const char __user __force *ubuf = (const char __user __force *)buf;
94071+ const char __user *ubuf = (const char __force_user *)buf;
94072 int exp_digit, in_range;
94073
94074 totaldigits = c = 0;
94075@@ -704,7 +704,7 @@ int bitmap_parselist_user(const char __user *ubuf,
94076 {
94077 if (!access_ok(VERIFY_READ, ubuf, ulen))
94078 return -EFAULT;
94079- return __bitmap_parselist((const char __force *)ubuf,
94080+ return __bitmap_parselist((const char __force_kernel *)ubuf,
94081 ulen, 1, maskp, nmaskbits);
94082 }
94083 EXPORT_SYMBOL(bitmap_parselist_user);
94084diff --git a/lib/bug.c b/lib/bug.c
94085index d1d7c78..b354235 100644
94086--- a/lib/bug.c
94087+++ b/lib/bug.c
94088@@ -137,6 +137,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
94089 return BUG_TRAP_TYPE_NONE;
94090
94091 bug = find_bug(bugaddr);
94092+ if (!bug)
94093+ return BUG_TRAP_TYPE_NONE;
94094
94095 file = NULL;
94096 line = 0;
94097diff --git a/lib/debugobjects.c b/lib/debugobjects.c
94098index 547f7f9..a6d4ba0 100644
94099--- a/lib/debugobjects.c
94100+++ b/lib/debugobjects.c
94101@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
94102 if (limit > 4)
94103 return;
94104
94105- is_on_stack = object_is_on_stack(addr);
94106+ is_on_stack = object_starts_on_stack(addr);
94107 if (is_on_stack == onstack)
94108 return;
94109
94110diff --git a/lib/div64.c b/lib/div64.c
94111index 4382ad7..08aa558 100644
94112--- a/lib/div64.c
94113+++ b/lib/div64.c
94114@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
94115 EXPORT_SYMBOL(__div64_32);
94116
94117 #ifndef div_s64_rem
94118-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
94119+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
94120 {
94121 u64 quotient;
94122
94123@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
94124 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
94125 */
94126 #ifndef div64_u64
94127-u64 div64_u64(u64 dividend, u64 divisor)
94128+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
94129 {
94130 u32 high = divisor >> 32;
94131 u64 quot;
94132diff --git a/lib/dma-debug.c b/lib/dma-debug.c
94133index add80cc..0d27550 100644
94134--- a/lib/dma-debug.c
94135+++ b/lib/dma-debug.c
94136@@ -971,7 +971,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
94137
94138 void dma_debug_add_bus(struct bus_type *bus)
94139 {
94140- struct notifier_block *nb;
94141+ notifier_block_no_const *nb;
94142
94143 if (global_disable)
94144 return;
94145@@ -1148,7 +1148,7 @@ static void check_unmap(struct dma_debug_entry *ref)
94146
94147 static void check_for_stack(struct device *dev, void *addr)
94148 {
94149- if (object_is_on_stack(addr))
94150+ if (object_starts_on_stack(addr))
94151 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
94152 "stack [addr=%p]\n", addr);
94153 }
94154diff --git a/lib/hash.c b/lib/hash.c
94155index fea973f..386626f 100644
94156--- a/lib/hash.c
94157+++ b/lib/hash.c
94158@@ -14,7 +14,7 @@
94159 #include <linux/hash.h>
94160 #include <linux/cache.h>
94161
94162-static struct fast_hash_ops arch_hash_ops __read_mostly = {
94163+static struct fast_hash_ops arch_hash_ops __read_only = {
94164 .hash = jhash,
94165 .hash2 = jhash2,
94166 };
94167diff --git a/lib/inflate.c b/lib/inflate.c
94168index 013a761..c28f3fc 100644
94169--- a/lib/inflate.c
94170+++ b/lib/inflate.c
94171@@ -269,7 +269,7 @@ static void free(void *where)
94172 malloc_ptr = free_mem_ptr;
94173 }
94174 #else
94175-#define malloc(a) kmalloc(a, GFP_KERNEL)
94176+#define malloc(a) kmalloc((a), GFP_KERNEL)
94177 #define free(a) kfree(a)
94178 #endif
94179
94180diff --git a/lib/ioremap.c b/lib/ioremap.c
94181index 0c9216c..863bd89 100644
94182--- a/lib/ioremap.c
94183+++ b/lib/ioremap.c
94184@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
94185 unsigned long next;
94186
94187 phys_addr -= addr;
94188- pmd = pmd_alloc(&init_mm, pud, addr);
94189+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
94190 if (!pmd)
94191 return -ENOMEM;
94192 do {
94193@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
94194 unsigned long next;
94195
94196 phys_addr -= addr;
94197- pud = pud_alloc(&init_mm, pgd, addr);
94198+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
94199 if (!pud)
94200 return -ENOMEM;
94201 do {
94202diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
94203index bd2bea9..6b3c95e 100644
94204--- a/lib/is_single_threaded.c
94205+++ b/lib/is_single_threaded.c
94206@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
94207 struct task_struct *p, *t;
94208 bool ret;
94209
94210+ if (!mm)
94211+ return true;
94212+
94213 if (atomic_read(&task->signal->live) != 1)
94214 return false;
94215
94216diff --git a/lib/kobject.c b/lib/kobject.c
94217index 58751bb..93a1853 100644
94218--- a/lib/kobject.c
94219+++ b/lib/kobject.c
94220@@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
94221
94222
94223 static DEFINE_SPINLOCK(kobj_ns_type_lock);
94224-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
94225+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
94226
94227-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
94228+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
94229 {
94230 enum kobj_ns_type type = ops->type;
94231 int error;
94232diff --git a/lib/list_debug.c b/lib/list_debug.c
94233index c24c2f7..f0296f4 100644
94234--- a/lib/list_debug.c
94235+++ b/lib/list_debug.c
94236@@ -11,7 +11,9 @@
94237 #include <linux/bug.h>
94238 #include <linux/kernel.h>
94239 #include <linux/rculist.h>
94240+#include <linux/mm.h>
94241
94242+#ifdef CONFIG_DEBUG_LIST
94243 /*
94244 * Insert a new entry between two known consecutive entries.
94245 *
94246@@ -19,21 +21,40 @@
94247 * the prev/next entries already!
94248 */
94249
94250+static bool __list_add_debug(struct list_head *new,
94251+ struct list_head *prev,
94252+ struct list_head *next)
94253+{
94254+ if (unlikely(next->prev != prev)) {
94255+ printk(KERN_ERR "list_add corruption. next->prev should be "
94256+ "prev (%p), but was %p. (next=%p).\n",
94257+ prev, next->prev, next);
94258+ BUG();
94259+ return false;
94260+ }
94261+ if (unlikely(prev->next != next)) {
94262+ printk(KERN_ERR "list_add corruption. prev->next should be "
94263+ "next (%p), but was %p. (prev=%p).\n",
94264+ next, prev->next, prev);
94265+ BUG();
94266+ return false;
94267+ }
94268+ if (unlikely(new == prev || new == next)) {
94269+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
94270+ new, prev, next);
94271+ BUG();
94272+ return false;
94273+ }
94274+ return true;
94275+}
94276+
94277 void __list_add(struct list_head *new,
94278- struct list_head *prev,
94279- struct list_head *next)
94280+ struct list_head *prev,
94281+ struct list_head *next)
94282 {
94283- WARN(next->prev != prev,
94284- "list_add corruption. next->prev should be "
94285- "prev (%p), but was %p. (next=%p).\n",
94286- prev, next->prev, next);
94287- WARN(prev->next != next,
94288- "list_add corruption. prev->next should be "
94289- "next (%p), but was %p. (prev=%p).\n",
94290- next, prev->next, prev);
94291- WARN(new == prev || new == next,
94292- "list_add double add: new=%p, prev=%p, next=%p.\n",
94293- new, prev, next);
94294+ if (!__list_add_debug(new, prev, next))
94295+ return;
94296+
94297 next->prev = new;
94298 new->next = next;
94299 new->prev = prev;
94300@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
94301 }
94302 EXPORT_SYMBOL(__list_add);
94303
94304-void __list_del_entry(struct list_head *entry)
94305+static bool __list_del_entry_debug(struct list_head *entry)
94306 {
94307 struct list_head *prev, *next;
94308
94309 prev = entry->prev;
94310 next = entry->next;
94311
94312- if (WARN(next == LIST_POISON1,
94313- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
94314- entry, LIST_POISON1) ||
94315- WARN(prev == LIST_POISON2,
94316- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
94317- entry, LIST_POISON2) ||
94318- WARN(prev->next != entry,
94319- "list_del corruption. prev->next should be %p, "
94320- "but was %p\n", entry, prev->next) ||
94321- WARN(next->prev != entry,
94322- "list_del corruption. next->prev should be %p, "
94323- "but was %p\n", entry, next->prev))
94324+ if (unlikely(next == LIST_POISON1)) {
94325+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
94326+ entry, LIST_POISON1);
94327+ BUG();
94328+ return false;
94329+ }
94330+ if (unlikely(prev == LIST_POISON2)) {
94331+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
94332+ entry, LIST_POISON2);
94333+ BUG();
94334+ return false;
94335+ }
94336+ if (unlikely(entry->prev->next != entry)) {
94337+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
94338+ "but was %p\n", entry, prev->next);
94339+ BUG();
94340+ return false;
94341+ }
94342+ if (unlikely(entry->next->prev != entry)) {
94343+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
94344+ "but was %p\n", entry, next->prev);
94345+ BUG();
94346+ return false;
94347+ }
94348+ return true;
94349+}
94350+
94351+void __list_del_entry(struct list_head *entry)
94352+{
94353+ if (!__list_del_entry_debug(entry))
94354 return;
94355
94356- __list_del(prev, next);
94357+ __list_del(entry->prev, entry->next);
94358 }
94359 EXPORT_SYMBOL(__list_del_entry);
94360
94361@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
94362 void __list_add_rcu(struct list_head *new,
94363 struct list_head *prev, struct list_head *next)
94364 {
94365- WARN(next->prev != prev,
94366- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
94367- prev, next->prev, next);
94368- WARN(prev->next != next,
94369- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
94370- next, prev->next, prev);
94371+ if (!__list_add_debug(new, prev, next))
94372+ return;
94373+
94374 new->next = next;
94375 new->prev = prev;
94376 rcu_assign_pointer(list_next_rcu(prev), new);
94377 next->prev = new;
94378 }
94379 EXPORT_SYMBOL(__list_add_rcu);
94380+#endif
94381+
94382+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
94383+{
94384+#ifdef CONFIG_DEBUG_LIST
94385+ if (!__list_add_debug(new, prev, next))
94386+ return;
94387+#endif
94388+
94389+ pax_open_kernel();
94390+ next->prev = new;
94391+ new->next = next;
94392+ new->prev = prev;
94393+ prev->next = new;
94394+ pax_close_kernel();
94395+}
94396+EXPORT_SYMBOL(__pax_list_add);
94397+
94398+void pax_list_del(struct list_head *entry)
94399+{
94400+#ifdef CONFIG_DEBUG_LIST
94401+ if (!__list_del_entry_debug(entry))
94402+ return;
94403+#endif
94404+
94405+ pax_open_kernel();
94406+ __list_del(entry->prev, entry->next);
94407+ entry->next = LIST_POISON1;
94408+ entry->prev = LIST_POISON2;
94409+ pax_close_kernel();
94410+}
94411+EXPORT_SYMBOL(pax_list_del);
94412+
94413+void pax_list_del_init(struct list_head *entry)
94414+{
94415+ pax_open_kernel();
94416+ __list_del(entry->prev, entry->next);
94417+ INIT_LIST_HEAD(entry);
94418+ pax_close_kernel();
94419+}
94420+EXPORT_SYMBOL(pax_list_del_init);
94421+
94422+void __pax_list_add_rcu(struct list_head *new,
94423+ struct list_head *prev, struct list_head *next)
94424+{
94425+#ifdef CONFIG_DEBUG_LIST
94426+ if (!__list_add_debug(new, prev, next))
94427+ return;
94428+#endif
94429+
94430+ pax_open_kernel();
94431+ new->next = next;
94432+ new->prev = prev;
94433+ rcu_assign_pointer(list_next_rcu(prev), new);
94434+ next->prev = new;
94435+ pax_close_kernel();
94436+}
94437+EXPORT_SYMBOL(__pax_list_add_rcu);
94438+
94439+void pax_list_del_rcu(struct list_head *entry)
94440+{
94441+#ifdef CONFIG_DEBUG_LIST
94442+ if (!__list_del_entry_debug(entry))
94443+ return;
94444+#endif
94445+
94446+ pax_open_kernel();
94447+ __list_del(entry->prev, entry->next);
94448+ entry->next = LIST_POISON1;
94449+ entry->prev = LIST_POISON2;
94450+ pax_close_kernel();
94451+}
94452+EXPORT_SYMBOL(pax_list_del_rcu);
94453diff --git a/lib/lockref.c b/lib/lockref.c
94454index d2233de..fa1a2f6 100644
94455--- a/lib/lockref.c
94456+++ b/lib/lockref.c
94457@@ -48,13 +48,13 @@
94458 void lockref_get(struct lockref *lockref)
94459 {
94460 CMPXCHG_LOOP(
94461- new.count++;
94462+ __lockref_inc(&new);
94463 ,
94464 return;
94465 );
94466
94467 spin_lock(&lockref->lock);
94468- lockref->count++;
94469+ __lockref_inc(lockref);
94470 spin_unlock(&lockref->lock);
94471 }
94472 EXPORT_SYMBOL(lockref_get);
94473@@ -69,7 +69,7 @@ int lockref_get_not_zero(struct lockref *lockref)
94474 int retval;
94475
94476 CMPXCHG_LOOP(
94477- new.count++;
94478+ __lockref_inc(&new);
94479 if (!old.count)
94480 return 0;
94481 ,
94482@@ -79,7 +79,7 @@ int lockref_get_not_zero(struct lockref *lockref)
94483 spin_lock(&lockref->lock);
94484 retval = 0;
94485 if (lockref->count) {
94486- lockref->count++;
94487+ __lockref_inc(lockref);
94488 retval = 1;
94489 }
94490 spin_unlock(&lockref->lock);
94491@@ -96,7 +96,7 @@ EXPORT_SYMBOL(lockref_get_not_zero);
94492 int lockref_get_or_lock(struct lockref *lockref)
94493 {
94494 CMPXCHG_LOOP(
94495- new.count++;
94496+ __lockref_inc(&new);
94497 if (!old.count)
94498 break;
94499 ,
94500@@ -106,7 +106,7 @@ int lockref_get_or_lock(struct lockref *lockref)
94501 spin_lock(&lockref->lock);
94502 if (!lockref->count)
94503 return 0;
94504- lockref->count++;
94505+ __lockref_inc(lockref);
94506 spin_unlock(&lockref->lock);
94507 return 1;
94508 }
94509@@ -120,7 +120,7 @@ EXPORT_SYMBOL(lockref_get_or_lock);
94510 int lockref_put_or_lock(struct lockref *lockref)
94511 {
94512 CMPXCHG_LOOP(
94513- new.count--;
94514+ __lockref_dec(&new);
94515 if (old.count <= 1)
94516 break;
94517 ,
94518@@ -130,7 +130,7 @@ int lockref_put_or_lock(struct lockref *lockref)
94519 spin_lock(&lockref->lock);
94520 if (lockref->count <= 1)
94521 return 0;
94522- lockref->count--;
94523+ __lockref_dec(lockref);
94524 spin_unlock(&lockref->lock);
94525 return 1;
94526 }
94527@@ -157,7 +157,7 @@ int lockref_get_not_dead(struct lockref *lockref)
94528 int retval;
94529
94530 CMPXCHG_LOOP(
94531- new.count++;
94532+ __lockref_inc(&new);
94533 if ((int)old.count < 0)
94534 return 0;
94535 ,
94536@@ -167,7 +167,7 @@ int lockref_get_not_dead(struct lockref *lockref)
94537 spin_lock(&lockref->lock);
94538 retval = 0;
94539 if ((int) lockref->count >= 0) {
94540- lockref->count++;
94541+ __lockref_inc(lockref);
94542 retval = 1;
94543 }
94544 spin_unlock(&lockref->lock);
94545diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
94546index 6111bcb..02e816b 100644
94547--- a/lib/percpu-refcount.c
94548+++ b/lib/percpu-refcount.c
94549@@ -31,7 +31,7 @@
94550 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
94551 */
94552
94553-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
94554+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
94555
94556 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
94557
94558diff --git a/lib/radix-tree.c b/lib/radix-tree.c
94559index 3291a8e..346a91e 100644
94560--- a/lib/radix-tree.c
94561+++ b/lib/radix-tree.c
94562@@ -67,7 +67,7 @@ struct radix_tree_preload {
94563 int nr;
94564 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
94565 };
94566-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
94567+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
94568
94569 static inline void *ptr_to_indirect(void *ptr)
94570 {
94571diff --git a/lib/random32.c b/lib/random32.c
94572index 0bee183..526f12f 100644
94573--- a/lib/random32.c
94574+++ b/lib/random32.c
94575@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
94576 }
94577 #endif
94578
94579-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
94580+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
94581
94582 /**
94583 * prandom_u32_state - seeded pseudo-random number generator.
94584diff --git a/lib/rbtree.c b/lib/rbtree.c
94585index c16c81a..4dcbda1 100644
94586--- a/lib/rbtree.c
94587+++ b/lib/rbtree.c
94588@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
94589 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
94590
94591 static const struct rb_augment_callbacks dummy_callbacks = {
94592- dummy_propagate, dummy_copy, dummy_rotate
94593+ .propagate = dummy_propagate,
94594+ .copy = dummy_copy,
94595+ .rotate = dummy_rotate
94596 };
94597
94598 void rb_insert_color(struct rb_node *node, struct rb_root *root)
94599diff --git a/lib/show_mem.c b/lib/show_mem.c
94600index 5e25627..3ed9d7f 100644
94601--- a/lib/show_mem.c
94602+++ b/lib/show_mem.c
94603@@ -44,6 +44,6 @@ void show_mem(unsigned int filter)
94604 quicklist_total_size());
94605 #endif
94606 #ifdef CONFIG_MEMORY_FAILURE
94607- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
94608+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
94609 #endif
94610 }
94611diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
94612index bb2b201..46abaf9 100644
94613--- a/lib/strncpy_from_user.c
94614+++ b/lib/strncpy_from_user.c
94615@@ -21,7 +21,7 @@
94616 */
94617 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
94618 {
94619- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94620+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94621 long res = 0;
94622
94623 /*
94624diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
94625index a28df52..3d55877 100644
94626--- a/lib/strnlen_user.c
94627+++ b/lib/strnlen_user.c
94628@@ -26,7 +26,7 @@
94629 */
94630 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
94631 {
94632- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94633+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
94634 long align, res = 0;
94635 unsigned long c;
94636
94637diff --git a/lib/swiotlb.c b/lib/swiotlb.c
94638index 4abda07..b9d3765 100644
94639--- a/lib/swiotlb.c
94640+++ b/lib/swiotlb.c
94641@@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
94642
94643 void
94644 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
94645- dma_addr_t dev_addr)
94646+ dma_addr_t dev_addr, struct dma_attrs *attrs)
94647 {
94648 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
94649
94650diff --git a/lib/usercopy.c b/lib/usercopy.c
94651index 4f5b1dd..7cab418 100644
94652--- a/lib/usercopy.c
94653+++ b/lib/usercopy.c
94654@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
94655 WARN(1, "Buffer overflow detected!\n");
94656 }
94657 EXPORT_SYMBOL(copy_from_user_overflow);
94658+
94659+void copy_to_user_overflow(void)
94660+{
94661+ WARN(1, "Buffer overflow detected!\n");
94662+}
94663+EXPORT_SYMBOL(copy_to_user_overflow);
94664diff --git a/lib/vsprintf.c b/lib/vsprintf.c
94665index ec337f6..8484eb2 100644
94666--- a/lib/vsprintf.c
94667+++ b/lib/vsprintf.c
94668@@ -16,6 +16,9 @@
94669 * - scnprintf and vscnprintf
94670 */
94671
94672+#ifdef CONFIG_GRKERNSEC_HIDESYM
94673+#define __INCLUDED_BY_HIDESYM 1
94674+#endif
94675 #include <stdarg.h>
94676 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
94677 #include <linux/types.h>
94678@@ -625,7 +628,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
94679 #ifdef CONFIG_KALLSYMS
94680 if (*fmt == 'B')
94681 sprint_backtrace(sym, value);
94682- else if (*fmt != 'f' && *fmt != 's')
94683+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
94684 sprint_symbol(sym, value);
94685 else
94686 sprint_symbol_no_offset(sym, value);
94687@@ -1240,7 +1243,11 @@ char *address_val(char *buf, char *end, const void *addr,
94688 return number(buf, end, num, spec);
94689 }
94690
94691+#ifdef CONFIG_GRKERNSEC_HIDESYM
94692+int kptr_restrict __read_mostly = 2;
94693+#else
94694 int kptr_restrict __read_mostly;
94695+#endif
94696
94697 /*
94698 * Show a '%p' thing. A kernel extension is that the '%p' is followed
94699@@ -1251,8 +1258,10 @@ int kptr_restrict __read_mostly;
94700 *
94701 * - 'F' For symbolic function descriptor pointers with offset
94702 * - 'f' For simple symbolic function names without offset
94703+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
94704 * - 'S' For symbolic direct pointers with offset
94705 * - 's' For symbolic direct pointers without offset
94706+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
94707 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
94708 * - 'B' For backtraced symbolic direct pointers with offset
94709 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
94710@@ -1331,12 +1340,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94711
94712 if (!ptr && *fmt != 'K') {
94713 /*
94714- * Print (null) with the same width as a pointer so it makes
94715+ * Print (nil) with the same width as a pointer so it makes
94716 * tabular output look nice.
94717 */
94718 if (spec.field_width == -1)
94719 spec.field_width = default_width;
94720- return string(buf, end, "(null)", spec);
94721+ return string(buf, end, "(nil)", spec);
94722 }
94723
94724 switch (*fmt) {
94725@@ -1346,6 +1355,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94726 /* Fallthrough */
94727 case 'S':
94728 case 's':
94729+#ifdef CONFIG_GRKERNSEC_HIDESYM
94730+ break;
94731+#else
94732+ return symbol_string(buf, end, ptr, spec, fmt);
94733+#endif
94734+ case 'X':
94735+ ptr = dereference_function_descriptor(ptr);
94736+ case 'A':
94737 case 'B':
94738 return symbol_string(buf, end, ptr, spec, fmt);
94739 case 'R':
94740@@ -1403,6 +1420,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94741 va_end(va);
94742 return buf;
94743 }
94744+ case 'P':
94745+ break;
94746 case 'K':
94747 /*
94748 * %pK cannot be used in IRQ context because its test
94749@@ -1460,6 +1479,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
94750 ((const struct file *)ptr)->f_path.dentry,
94751 spec, fmt);
94752 }
94753+
94754+#ifdef CONFIG_GRKERNSEC_HIDESYM
94755+ /* 'P' = approved pointers to copy to userland,
94756+ as in the /proc/kallsyms case, as we make it display nothing
94757+ for non-root users, and the real contents for root users
94758+ 'X' = approved simple symbols
94759+ Also ignore 'K' pointers, since we force their NULLing for non-root users
94760+ above
94761+ */
94762+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
94763+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
94764+ dump_stack();
94765+ ptr = NULL;
94766+ }
94767+#endif
94768+
94769 spec.flags |= SMALL;
94770 if (spec.field_width == -1) {
94771 spec.field_width = default_width;
94772@@ -2160,11 +2195,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
94773 typeof(type) value; \
94774 if (sizeof(type) == 8) { \
94775 args = PTR_ALIGN(args, sizeof(u32)); \
94776- *(u32 *)&value = *(u32 *)args; \
94777- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
94778+ *(u32 *)&value = *(const u32 *)args; \
94779+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
94780 } else { \
94781 args = PTR_ALIGN(args, sizeof(type)); \
94782- value = *(typeof(type) *)args; \
94783+ value = *(const typeof(type) *)args; \
94784 } \
94785 args += sizeof(type); \
94786 value; \
94787@@ -2227,7 +2262,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
94788 case FORMAT_TYPE_STR: {
94789 const char *str_arg = args;
94790 args += strlen(str_arg) + 1;
94791- str = string(str, end, (char *)str_arg, spec);
94792+ str = string(str, end, str_arg, spec);
94793 break;
94794 }
94795
94796diff --git a/localversion-grsec b/localversion-grsec
94797new file mode 100644
94798index 0000000..7cd6065
94799--- /dev/null
94800+++ b/localversion-grsec
94801@@ -0,0 +1 @@
94802+-grsec
94803diff --git a/mm/Kconfig b/mm/Kconfig
94804index 1d1ae6b..0f05885 100644
94805--- a/mm/Kconfig
94806+++ b/mm/Kconfig
94807@@ -341,10 +341,11 @@ config KSM
94808 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
94809
94810 config DEFAULT_MMAP_MIN_ADDR
94811- int "Low address space to protect from user allocation"
94812+ int "Low address space to protect from user allocation"
94813 depends on MMU
94814- default 4096
94815- help
94816+ default 32768 if ALPHA || ARM || PARISC || SPARC32
94817+ default 65536
94818+ help
94819 This is the portion of low virtual memory which should be protected
94820 from userspace allocation. Keeping a user from writing to low pages
94821 can help reduce the impact of kernel NULL pointer bugs.
94822@@ -375,7 +376,7 @@ config MEMORY_FAILURE
94823
94824 config HWPOISON_INJECT
94825 tristate "HWPoison pages injector"
94826- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
94827+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
94828 select PROC_PAGE_MONITOR
94829
94830 config NOMMU_INITIAL_TRIM_EXCESS
94831diff --git a/mm/backing-dev.c b/mm/backing-dev.c
94832index 0ae0df5..82ac56b 100644
94833--- a/mm/backing-dev.c
94834+++ b/mm/backing-dev.c
94835@@ -12,7 +12,7 @@
94836 #include <linux/device.h>
94837 #include <trace/events/writeback.h>
94838
94839-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
94840+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
94841
94842 struct backing_dev_info default_backing_dev_info = {
94843 .name = "default",
94844@@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
94845 return err;
94846
94847 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
94848- atomic_long_inc_return(&bdi_seq));
94849+ atomic_long_inc_return_unchecked(&bdi_seq));
94850 if (err) {
94851 bdi_destroy(bdi);
94852 return err;
94853diff --git a/mm/filemap.c b/mm/filemap.c
94854index 14b4642..d71ba82 100644
94855--- a/mm/filemap.c
94856+++ b/mm/filemap.c
94857@@ -2101,7 +2101,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
94858 struct address_space *mapping = file->f_mapping;
94859
94860 if (!mapping->a_ops->readpage)
94861- return -ENOEXEC;
94862+ return -ENODEV;
94863 file_accessed(file);
94864 vma->vm_ops = &generic_file_vm_ops;
94865 return 0;
94866@@ -2279,6 +2279,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
94867 *pos = i_size_read(inode);
94868
94869 if (limit != RLIM_INFINITY) {
94870+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
94871 if (*pos >= limit) {
94872 send_sig(SIGXFSZ, current, 0);
94873 return -EFBIG;
94874diff --git a/mm/fremap.c b/mm/fremap.c
94875index 72b8fa3..c5b39f1 100644
94876--- a/mm/fremap.c
94877+++ b/mm/fremap.c
94878@@ -180,6 +180,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
94879 retry:
94880 vma = find_vma(mm, start);
94881
94882+#ifdef CONFIG_PAX_SEGMEXEC
94883+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
94884+ goto out;
94885+#endif
94886+
94887 /*
94888 * Make sure the vma is shared, that it supports prefaulting,
94889 * and that the remapped range is valid and fully within
94890diff --git a/mm/gup.c b/mm/gup.c
94891index cd62c8c..3bb2053 100644
94892--- a/mm/gup.c
94893+++ b/mm/gup.c
94894@@ -274,11 +274,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
94895 unsigned int fault_flags = 0;
94896 int ret;
94897
94898- /* For mlock, just skip the stack guard page. */
94899- if ((*flags & FOLL_MLOCK) &&
94900- (stack_guard_page_start(vma, address) ||
94901- stack_guard_page_end(vma, address + PAGE_SIZE)))
94902- return -ENOENT;
94903 if (*flags & FOLL_WRITE)
94904 fault_flags |= FAULT_FLAG_WRITE;
94905 if (nonblocking)
94906@@ -444,14 +439,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
94907 if (!(gup_flags & FOLL_FORCE))
94908 gup_flags |= FOLL_NUMA;
94909
94910- do {
94911+ while (nr_pages) {
94912 struct page *page;
94913 unsigned int foll_flags = gup_flags;
94914 unsigned int page_increm;
94915
94916 /* first iteration or cross vma bound */
94917 if (!vma || start >= vma->vm_end) {
94918- vma = find_extend_vma(mm, start);
94919+ vma = find_vma(mm, start);
94920 if (!vma && in_gate_area(mm, start)) {
94921 int ret;
94922 ret = get_gate_page(mm, start & PAGE_MASK,
94923@@ -463,7 +458,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
94924 goto next_page;
94925 }
94926
94927- if (!vma || check_vma_flags(vma, gup_flags))
94928+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
94929 return i ? : -EFAULT;
94930 if (is_vm_hugetlb_page(vma)) {
94931 i = follow_hugetlb_page(mm, vma, pages, vmas,
94932@@ -518,7 +513,7 @@ next_page:
94933 i += page_increm;
94934 start += page_increm * PAGE_SIZE;
94935 nr_pages -= page_increm;
94936- } while (nr_pages);
94937+ }
94938 return i;
94939 }
94940 EXPORT_SYMBOL(__get_user_pages);
94941diff --git a/mm/highmem.c b/mm/highmem.c
94942index 123bcd3..0de52ba 100644
94943--- a/mm/highmem.c
94944+++ b/mm/highmem.c
94945@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
94946 * So no dangers, even with speculative execution.
94947 */
94948 page = pte_page(pkmap_page_table[i]);
94949+ pax_open_kernel();
94950 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
94951-
94952+ pax_close_kernel();
94953 set_page_address(page, NULL);
94954 need_flush = 1;
94955 }
94956@@ -259,9 +260,11 @@ start:
94957 }
94958 }
94959 vaddr = PKMAP_ADDR(last_pkmap_nr);
94960+
94961+ pax_open_kernel();
94962 set_pte_at(&init_mm, vaddr,
94963 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
94964-
94965+ pax_close_kernel();
94966 pkmap_count[last_pkmap_nr] = 1;
94967 set_page_address(page, (void *)vaddr);
94968
94969diff --git a/mm/hugetlb.c b/mm/hugetlb.c
94970index 9fd7227..5628939 100644
94971--- a/mm/hugetlb.c
94972+++ b/mm/hugetlb.c
94973@@ -2258,6 +2258,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
94974 struct ctl_table *table, int write,
94975 void __user *buffer, size_t *length, loff_t *ppos)
94976 {
94977+ ctl_table_no_const t;
94978 struct hstate *h = &default_hstate;
94979 unsigned long tmp = h->max_huge_pages;
94980 int ret;
94981@@ -2265,9 +2266,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
94982 if (!hugepages_supported())
94983 return -ENOTSUPP;
94984
94985- table->data = &tmp;
94986- table->maxlen = sizeof(unsigned long);
94987- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
94988+ t = *table;
94989+ t.data = &tmp;
94990+ t.maxlen = sizeof(unsigned long);
94991+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
94992 if (ret)
94993 goto out;
94994
94995@@ -2302,6 +2304,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
94996 struct hstate *h = &default_hstate;
94997 unsigned long tmp;
94998 int ret;
94999+ ctl_table_no_const hugetlb_table;
95000
95001 if (!hugepages_supported())
95002 return -ENOTSUPP;
95003@@ -2311,9 +2314,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
95004 if (write && hstate_is_gigantic(h))
95005 return -EINVAL;
95006
95007- table->data = &tmp;
95008- table->maxlen = sizeof(unsigned long);
95009- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
95010+ hugetlb_table = *table;
95011+ hugetlb_table.data = &tmp;
95012+ hugetlb_table.maxlen = sizeof(unsigned long);
95013+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
95014 if (ret)
95015 goto out;
95016
95017@@ -2792,6 +2796,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
95018 mutex_unlock(&mapping->i_mmap_mutex);
95019 }
95020
95021+#ifdef CONFIG_PAX_SEGMEXEC
95022+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
95023+{
95024+ struct mm_struct *mm = vma->vm_mm;
95025+ struct vm_area_struct *vma_m;
95026+ unsigned long address_m;
95027+ pte_t *ptep_m;
95028+
95029+ vma_m = pax_find_mirror_vma(vma);
95030+ if (!vma_m)
95031+ return;
95032+
95033+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95034+ address_m = address + SEGMEXEC_TASK_SIZE;
95035+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
95036+ get_page(page_m);
95037+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
95038+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
95039+}
95040+#endif
95041+
95042 /*
95043 * Hugetlb_cow() should be called with page lock of the original hugepage held.
95044 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
95045@@ -2903,6 +2928,11 @@ retry_avoidcopy:
95046 make_huge_pte(vma, new_page, 1));
95047 page_remove_rmap(old_page);
95048 hugepage_add_new_anon_rmap(new_page, vma, address);
95049+
95050+#ifdef CONFIG_PAX_SEGMEXEC
95051+ pax_mirror_huge_pte(vma, address, new_page);
95052+#endif
95053+
95054 /* Make the old page be freed below */
95055 new_page = old_page;
95056 }
95057@@ -3063,6 +3093,10 @@ retry:
95058 && (vma->vm_flags & VM_SHARED)));
95059 set_huge_pte_at(mm, address, ptep, new_pte);
95060
95061+#ifdef CONFIG_PAX_SEGMEXEC
95062+ pax_mirror_huge_pte(vma, address, page);
95063+#endif
95064+
95065 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
95066 /* Optimization, do the COW without a second fault */
95067 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
95068@@ -3129,6 +3163,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95069 struct hstate *h = hstate_vma(vma);
95070 struct address_space *mapping;
95071
95072+#ifdef CONFIG_PAX_SEGMEXEC
95073+ struct vm_area_struct *vma_m;
95074+#endif
95075+
95076 address &= huge_page_mask(h);
95077
95078 ptep = huge_pte_offset(mm, address);
95079@@ -3142,6 +3180,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95080 VM_FAULT_SET_HINDEX(hstate_index(h));
95081 }
95082
95083+#ifdef CONFIG_PAX_SEGMEXEC
95084+ vma_m = pax_find_mirror_vma(vma);
95085+ if (vma_m) {
95086+ unsigned long address_m;
95087+
95088+ if (vma->vm_start > vma_m->vm_start) {
95089+ address_m = address;
95090+ address -= SEGMEXEC_TASK_SIZE;
95091+ vma = vma_m;
95092+ h = hstate_vma(vma);
95093+ } else
95094+ address_m = address + SEGMEXEC_TASK_SIZE;
95095+
95096+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
95097+ return VM_FAULT_OOM;
95098+ address_m &= HPAGE_MASK;
95099+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
95100+ }
95101+#endif
95102+
95103 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
95104 if (!ptep)
95105 return VM_FAULT_OOM;
95106diff --git a/mm/internal.h b/mm/internal.h
95107index a4f90ba..fbdc32b 100644
95108--- a/mm/internal.h
95109+++ b/mm/internal.h
95110@@ -134,6 +134,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
95111
95112 extern int __isolate_free_page(struct page *page, unsigned int order);
95113 extern void __free_pages_bootmem(struct page *page, unsigned int order);
95114+extern void free_compound_page(struct page *page);
95115 extern void prep_compound_page(struct page *page, unsigned long order);
95116 #ifdef CONFIG_MEMORY_FAILURE
95117 extern bool is_free_buddy_page(struct page *page);
95118@@ -390,7 +391,7 @@ extern u32 hwpoison_filter_enable;
95119
95120 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
95121 unsigned long, unsigned long,
95122- unsigned long, unsigned long);
95123+ unsigned long, unsigned long) __intentional_overflow(-1);
95124
95125 extern void set_pageblock_order(void);
95126 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
95127diff --git a/mm/iov_iter.c b/mm/iov_iter.c
95128index e34a3cb..a810efe 100644
95129--- a/mm/iov_iter.c
95130+++ b/mm/iov_iter.c
95131@@ -307,7 +307,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
95132
95133 while (bytes) {
95134 char __user *buf = iov->iov_base + base;
95135- int copy = min(bytes, iov->iov_len - base);
95136+ size_t copy = min(bytes, iov->iov_len - base);
95137
95138 base = 0;
95139 left = __copy_from_user_inatomic(vaddr, buf, copy);
95140@@ -335,7 +335,7 @@ static size_t copy_from_user_atomic_iovec(struct page *page,
95141
95142 kaddr = kmap_atomic(page);
95143 if (likely(i->nr_segs == 1)) {
95144- int left;
95145+ size_t left;
95146 char __user *buf = i->iov->iov_base + i->iov_offset;
95147 left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
95148 copied = bytes - left;
95149@@ -365,7 +365,7 @@ static void advance_iovec(struct iov_iter *i, size_t bytes)
95150 * zero-length segments (without overruning the iovec).
95151 */
95152 while (bytes || unlikely(i->count && !iov->iov_len)) {
95153- int copy;
95154+ size_t copy;
95155
95156 copy = min(bytes, iov->iov_len - base);
95157 BUG_ON(!i->count || i->count < copy);
95158diff --git a/mm/kmemleak.c b/mm/kmemleak.c
95159index 3cda50c..032ba634 100644
95160--- a/mm/kmemleak.c
95161+++ b/mm/kmemleak.c
95162@@ -364,7 +364,7 @@ static void print_unreferenced(struct seq_file *seq,
95163
95164 for (i = 0; i < object->trace_len; i++) {
95165 void *ptr = (void *)object->trace[i];
95166- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
95167+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
95168 }
95169 }
95170
95171@@ -1905,7 +1905,7 @@ static int __init kmemleak_late_init(void)
95172 return -ENOMEM;
95173 }
95174
95175- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
95176+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
95177 &kmemleak_fops);
95178 if (!dentry)
95179 pr_warning("Failed to create the debugfs kmemleak file\n");
95180diff --git a/mm/maccess.c b/mm/maccess.c
95181index d53adf9..03a24bf 100644
95182--- a/mm/maccess.c
95183+++ b/mm/maccess.c
95184@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
95185 set_fs(KERNEL_DS);
95186 pagefault_disable();
95187 ret = __copy_from_user_inatomic(dst,
95188- (__force const void __user *)src, size);
95189+ (const void __force_user *)src, size);
95190 pagefault_enable();
95191 set_fs(old_fs);
95192
95193@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
95194
95195 set_fs(KERNEL_DS);
95196 pagefault_disable();
95197- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
95198+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
95199 pagefault_enable();
95200 set_fs(old_fs);
95201
95202diff --git a/mm/madvise.c b/mm/madvise.c
95203index 0938b30..199abe8 100644
95204--- a/mm/madvise.c
95205+++ b/mm/madvise.c
95206@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
95207 pgoff_t pgoff;
95208 unsigned long new_flags = vma->vm_flags;
95209
95210+#ifdef CONFIG_PAX_SEGMEXEC
95211+ struct vm_area_struct *vma_m;
95212+#endif
95213+
95214 switch (behavior) {
95215 case MADV_NORMAL:
95216 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
95217@@ -126,6 +130,13 @@ success:
95218 /*
95219 * vm_flags is protected by the mmap_sem held in write mode.
95220 */
95221+
95222+#ifdef CONFIG_PAX_SEGMEXEC
95223+ vma_m = pax_find_mirror_vma(vma);
95224+ if (vma_m)
95225+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
95226+#endif
95227+
95228 vma->vm_flags = new_flags;
95229
95230 out:
95231@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
95232 struct vm_area_struct **prev,
95233 unsigned long start, unsigned long end)
95234 {
95235+
95236+#ifdef CONFIG_PAX_SEGMEXEC
95237+ struct vm_area_struct *vma_m;
95238+#endif
95239+
95240 *prev = vma;
95241 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
95242 return -EINVAL;
95243@@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct *vma,
95244 zap_page_range(vma, start, end - start, &details);
95245 } else
95246 zap_page_range(vma, start, end - start, NULL);
95247+
95248+#ifdef CONFIG_PAX_SEGMEXEC
95249+ vma_m = pax_find_mirror_vma(vma);
95250+ if (vma_m) {
95251+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
95252+ struct zap_details details = {
95253+ .nonlinear_vma = vma_m,
95254+ .last_index = ULONG_MAX,
95255+ };
95256+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
95257+ } else
95258+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
95259+ }
95260+#endif
95261+
95262 return 0;
95263 }
95264
95265@@ -488,6 +519,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
95266 if (end < start)
95267 return error;
95268
95269+#ifdef CONFIG_PAX_SEGMEXEC
95270+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
95271+ if (end > SEGMEXEC_TASK_SIZE)
95272+ return error;
95273+ } else
95274+#endif
95275+
95276+ if (end > TASK_SIZE)
95277+ return error;
95278+
95279 error = 0;
95280 if (end == start)
95281 return error;
95282diff --git a/mm/memory-failure.c b/mm/memory-failure.c
95283index 8639f6b..b623882a 100644
95284--- a/mm/memory-failure.c
95285+++ b/mm/memory-failure.c
95286@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
95287
95288 int sysctl_memory_failure_recovery __read_mostly = 1;
95289
95290-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
95291+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
95292
95293 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
95294
95295@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
95296 pfn, t->comm, t->pid);
95297 si.si_signo = SIGBUS;
95298 si.si_errno = 0;
95299- si.si_addr = (void *)addr;
95300+ si.si_addr = (void __user *)addr;
95301 #ifdef __ARCH_SI_TRAPNO
95302 si.si_trapno = trapno;
95303 #endif
95304@@ -791,7 +791,7 @@ static struct page_state {
95305 unsigned long res;
95306 char *msg;
95307 int (*action)(struct page *p, unsigned long pfn);
95308-} error_states[] = {
95309+} __do_const error_states[] = {
95310 { reserved, reserved, "reserved kernel", me_kernel },
95311 /*
95312 * free pages are specially detected outside this table:
95313@@ -1099,7 +1099,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95314 nr_pages = 1 << compound_order(hpage);
95315 else /* normal page or thp */
95316 nr_pages = 1;
95317- atomic_long_add(nr_pages, &num_poisoned_pages);
95318+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
95319
95320 /*
95321 * We need/can do nothing about count=0 pages.
95322@@ -1128,7 +1128,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95323 if (PageHWPoison(hpage)) {
95324 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
95325 || (p != hpage && TestSetPageHWPoison(hpage))) {
95326- atomic_long_sub(nr_pages, &num_poisoned_pages);
95327+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95328 unlock_page(hpage);
95329 return 0;
95330 }
95331@@ -1196,14 +1196,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
95332 */
95333 if (!PageHWPoison(p)) {
95334 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
95335- atomic_long_sub(nr_pages, &num_poisoned_pages);
95336+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95337 put_page(hpage);
95338 res = 0;
95339 goto out;
95340 }
95341 if (hwpoison_filter(p)) {
95342 if (TestClearPageHWPoison(p))
95343- atomic_long_sub(nr_pages, &num_poisoned_pages);
95344+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95345 unlock_page(hpage);
95346 put_page(hpage);
95347 return 0;
95348@@ -1433,7 +1433,7 @@ int unpoison_memory(unsigned long pfn)
95349 return 0;
95350 }
95351 if (TestClearPageHWPoison(p))
95352- atomic_long_dec(&num_poisoned_pages);
95353+ atomic_long_dec_unchecked(&num_poisoned_pages);
95354 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
95355 return 0;
95356 }
95357@@ -1447,7 +1447,7 @@ int unpoison_memory(unsigned long pfn)
95358 */
95359 if (TestClearPageHWPoison(page)) {
95360 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
95361- atomic_long_sub(nr_pages, &num_poisoned_pages);
95362+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
95363 freeit = 1;
95364 if (PageHuge(page))
95365 clear_page_hwpoison_huge_page(page);
95366@@ -1572,11 +1572,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
95367 if (PageHuge(page)) {
95368 set_page_hwpoison_huge_page(hpage);
95369 dequeue_hwpoisoned_huge_page(hpage);
95370- atomic_long_add(1 << compound_order(hpage),
95371+ atomic_long_add_unchecked(1 << compound_order(hpage),
95372 &num_poisoned_pages);
95373 } else {
95374 SetPageHWPoison(page);
95375- atomic_long_inc(&num_poisoned_pages);
95376+ atomic_long_inc_unchecked(&num_poisoned_pages);
95377 }
95378 }
95379 return ret;
95380@@ -1615,7 +1615,7 @@ static int __soft_offline_page(struct page *page, int flags)
95381 put_page(page);
95382 pr_info("soft_offline: %#lx: invalidated\n", pfn);
95383 SetPageHWPoison(page);
95384- atomic_long_inc(&num_poisoned_pages);
95385+ atomic_long_inc_unchecked(&num_poisoned_pages);
95386 return 0;
95387 }
95388
95389@@ -1666,7 +1666,7 @@ static int __soft_offline_page(struct page *page, int flags)
95390 if (!is_free_buddy_page(page))
95391 pr_info("soft offline: %#lx: page leaked\n",
95392 pfn);
95393- atomic_long_inc(&num_poisoned_pages);
95394+ atomic_long_inc_unchecked(&num_poisoned_pages);
95395 }
95396 } else {
95397 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
95398@@ -1736,11 +1736,11 @@ int soft_offline_page(struct page *page, int flags)
95399 if (PageHuge(page)) {
95400 set_page_hwpoison_huge_page(hpage);
95401 dequeue_hwpoisoned_huge_page(hpage);
95402- atomic_long_add(1 << compound_order(hpage),
95403+ atomic_long_add_unchecked(1 << compound_order(hpage),
95404 &num_poisoned_pages);
95405 } else {
95406 SetPageHWPoison(page);
95407- atomic_long_inc(&num_poisoned_pages);
95408+ atomic_long_inc_unchecked(&num_poisoned_pages);
95409 }
95410 }
95411 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
95412diff --git a/mm/memory.c b/mm/memory.c
95413index d5f2ae9..4d678b2 100644
95414--- a/mm/memory.c
95415+++ b/mm/memory.c
95416@@ -415,6 +415,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
95417 free_pte_range(tlb, pmd, addr);
95418 } while (pmd++, addr = next, addr != end);
95419
95420+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
95421 start &= PUD_MASK;
95422 if (start < floor)
95423 return;
95424@@ -429,6 +430,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
95425 pmd = pmd_offset(pud, start);
95426 pud_clear(pud);
95427 pmd_free_tlb(tlb, pmd, start);
95428+#endif
95429+
95430 }
95431
95432 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95433@@ -448,6 +451,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95434 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
95435 } while (pud++, addr = next, addr != end);
95436
95437+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
95438 start &= PGDIR_MASK;
95439 if (start < floor)
95440 return;
95441@@ -462,6 +466,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
95442 pud = pud_offset(pgd, start);
95443 pgd_clear(pgd);
95444 pud_free_tlb(tlb, pud, start);
95445+#endif
95446+
95447 }
95448
95449 /*
95450@@ -691,10 +697,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
95451 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
95452 */
95453 if (vma->vm_ops)
95454- printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
95455+ printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
95456 vma->vm_ops->fault);
95457 if (vma->vm_file)
95458- printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
95459+ printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
95460 vma->vm_file->f_op->mmap);
95461 dump_stack();
95462 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
95463@@ -1501,6 +1507,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
95464 page_add_file_rmap(page);
95465 set_pte_at(mm, addr, pte, mk_pte(page, prot));
95466
95467+#ifdef CONFIG_PAX_SEGMEXEC
95468+ pax_mirror_file_pte(vma, addr, page, ptl);
95469+#endif
95470+
95471 retval = 0;
95472 pte_unmap_unlock(pte, ptl);
95473 return retval;
95474@@ -1545,9 +1555,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
95475 if (!page_count(page))
95476 return -EINVAL;
95477 if (!(vma->vm_flags & VM_MIXEDMAP)) {
95478+
95479+#ifdef CONFIG_PAX_SEGMEXEC
95480+ struct vm_area_struct *vma_m;
95481+#endif
95482+
95483 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
95484 BUG_ON(vma->vm_flags & VM_PFNMAP);
95485 vma->vm_flags |= VM_MIXEDMAP;
95486+
95487+#ifdef CONFIG_PAX_SEGMEXEC
95488+ vma_m = pax_find_mirror_vma(vma);
95489+ if (vma_m)
95490+ vma_m->vm_flags |= VM_MIXEDMAP;
95491+#endif
95492+
95493 }
95494 return insert_page(vma, addr, page, vma->vm_page_prot);
95495 }
95496@@ -1630,6 +1652,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
95497 unsigned long pfn)
95498 {
95499 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
95500+ BUG_ON(vma->vm_mirror);
95501
95502 if (addr < vma->vm_start || addr >= vma->vm_end)
95503 return -EFAULT;
95504@@ -1877,7 +1900,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
95505
95506 BUG_ON(pud_huge(*pud));
95507
95508- pmd = pmd_alloc(mm, pud, addr);
95509+ pmd = (mm == &init_mm) ?
95510+ pmd_alloc_kernel(mm, pud, addr) :
95511+ pmd_alloc(mm, pud, addr);
95512 if (!pmd)
95513 return -ENOMEM;
95514 do {
95515@@ -1897,7 +1922,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
95516 unsigned long next;
95517 int err;
95518
95519- pud = pud_alloc(mm, pgd, addr);
95520+ pud = (mm == &init_mm) ?
95521+ pud_alloc_kernel(mm, pgd, addr) :
95522+ pud_alloc(mm, pgd, addr);
95523 if (!pud)
95524 return -ENOMEM;
95525 do {
95526@@ -2019,6 +2046,186 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
95527 return ret;
95528 }
95529
95530+#ifdef CONFIG_PAX_SEGMEXEC
95531+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
95532+{
95533+ struct mm_struct *mm = vma->vm_mm;
95534+ spinlock_t *ptl;
95535+ pte_t *pte, entry;
95536+
95537+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
95538+ entry = *pte;
95539+ if (!pte_present(entry)) {
95540+ if (!pte_none(entry)) {
95541+ BUG_ON(pte_file(entry));
95542+ free_swap_and_cache(pte_to_swp_entry(entry));
95543+ pte_clear_not_present_full(mm, address, pte, 0);
95544+ }
95545+ } else {
95546+ struct page *page;
95547+
95548+ flush_cache_page(vma, address, pte_pfn(entry));
95549+ entry = ptep_clear_flush(vma, address, pte);
95550+ BUG_ON(pte_dirty(entry));
95551+ page = vm_normal_page(vma, address, entry);
95552+ if (page) {
95553+ update_hiwater_rss(mm);
95554+ if (PageAnon(page))
95555+ dec_mm_counter_fast(mm, MM_ANONPAGES);
95556+ else
95557+ dec_mm_counter_fast(mm, MM_FILEPAGES);
95558+ page_remove_rmap(page);
95559+ page_cache_release(page);
95560+ }
95561+ }
95562+ pte_unmap_unlock(pte, ptl);
95563+}
95564+
95565+/* PaX: if vma is mirrored, synchronize the mirror's PTE
95566+ *
95567+ * the ptl of the lower mapped page is held on entry and is not released on exit
95568+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
95569+ */
95570+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
95571+{
95572+ struct mm_struct *mm = vma->vm_mm;
95573+ unsigned long address_m;
95574+ spinlock_t *ptl_m;
95575+ struct vm_area_struct *vma_m;
95576+ pmd_t *pmd_m;
95577+ pte_t *pte_m, entry_m;
95578+
95579+ BUG_ON(!page_m || !PageAnon(page_m));
95580+
95581+ vma_m = pax_find_mirror_vma(vma);
95582+ if (!vma_m)
95583+ return;
95584+
95585+ BUG_ON(!PageLocked(page_m));
95586+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95587+ address_m = address + SEGMEXEC_TASK_SIZE;
95588+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95589+ pte_m = pte_offset_map(pmd_m, address_m);
95590+ ptl_m = pte_lockptr(mm, pmd_m);
95591+ if (ptl != ptl_m) {
95592+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95593+ if (!pte_none(*pte_m))
95594+ goto out;
95595+ }
95596+
95597+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
95598+ page_cache_get(page_m);
95599+ page_add_anon_rmap(page_m, vma_m, address_m);
95600+ inc_mm_counter_fast(mm, MM_ANONPAGES);
95601+ set_pte_at(mm, address_m, pte_m, entry_m);
95602+ update_mmu_cache(vma_m, address_m, pte_m);
95603+out:
95604+ if (ptl != ptl_m)
95605+ spin_unlock(ptl_m);
95606+ pte_unmap(pte_m);
95607+ unlock_page(page_m);
95608+}
95609+
95610+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
95611+{
95612+ struct mm_struct *mm = vma->vm_mm;
95613+ unsigned long address_m;
95614+ spinlock_t *ptl_m;
95615+ struct vm_area_struct *vma_m;
95616+ pmd_t *pmd_m;
95617+ pte_t *pte_m, entry_m;
95618+
95619+ BUG_ON(!page_m || PageAnon(page_m));
95620+
95621+ vma_m = pax_find_mirror_vma(vma);
95622+ if (!vma_m)
95623+ return;
95624+
95625+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95626+ address_m = address + SEGMEXEC_TASK_SIZE;
95627+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95628+ pte_m = pte_offset_map(pmd_m, address_m);
95629+ ptl_m = pte_lockptr(mm, pmd_m);
95630+ if (ptl != ptl_m) {
95631+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95632+ if (!pte_none(*pte_m))
95633+ goto out;
95634+ }
95635+
95636+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
95637+ page_cache_get(page_m);
95638+ page_add_file_rmap(page_m);
95639+ inc_mm_counter_fast(mm, MM_FILEPAGES);
95640+ set_pte_at(mm, address_m, pte_m, entry_m);
95641+ update_mmu_cache(vma_m, address_m, pte_m);
95642+out:
95643+ if (ptl != ptl_m)
95644+ spin_unlock(ptl_m);
95645+ pte_unmap(pte_m);
95646+}
95647+
95648+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
95649+{
95650+ struct mm_struct *mm = vma->vm_mm;
95651+ unsigned long address_m;
95652+ spinlock_t *ptl_m;
95653+ struct vm_area_struct *vma_m;
95654+ pmd_t *pmd_m;
95655+ pte_t *pte_m, entry_m;
95656+
95657+ vma_m = pax_find_mirror_vma(vma);
95658+ if (!vma_m)
95659+ return;
95660+
95661+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
95662+ address_m = address + SEGMEXEC_TASK_SIZE;
95663+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
95664+ pte_m = pte_offset_map(pmd_m, address_m);
95665+ ptl_m = pte_lockptr(mm, pmd_m);
95666+ if (ptl != ptl_m) {
95667+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
95668+ if (!pte_none(*pte_m))
95669+ goto out;
95670+ }
95671+
95672+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
95673+ set_pte_at(mm, address_m, pte_m, entry_m);
95674+out:
95675+ if (ptl != ptl_m)
95676+ spin_unlock(ptl_m);
95677+ pte_unmap(pte_m);
95678+}
95679+
95680+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
95681+{
95682+ struct page *page_m;
95683+ pte_t entry;
95684+
95685+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
95686+ goto out;
95687+
95688+ entry = *pte;
95689+ page_m = vm_normal_page(vma, address, entry);
95690+ if (!page_m)
95691+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
95692+ else if (PageAnon(page_m)) {
95693+ if (pax_find_mirror_vma(vma)) {
95694+ pte_unmap_unlock(pte, ptl);
95695+ lock_page(page_m);
95696+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
95697+ if (pte_same(entry, *pte))
95698+ pax_mirror_anon_pte(vma, address, page_m, ptl);
95699+ else
95700+ unlock_page(page_m);
95701+ }
95702+ } else
95703+ pax_mirror_file_pte(vma, address, page_m, ptl);
95704+
95705+out:
95706+ pte_unmap_unlock(pte, ptl);
95707+}
95708+#endif
95709+
95710 /*
95711 * This routine handles present pages, when users try to write
95712 * to a shared page. It is done by copying the page to a new address
95713@@ -2218,6 +2425,12 @@ gotten:
95714 */
95715 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
95716 if (likely(pte_same(*page_table, orig_pte))) {
95717+
95718+#ifdef CONFIG_PAX_SEGMEXEC
95719+ if (pax_find_mirror_vma(vma))
95720+ BUG_ON(!trylock_page(new_page));
95721+#endif
95722+
95723 if (old_page) {
95724 if (!PageAnon(old_page)) {
95725 dec_mm_counter_fast(mm, MM_FILEPAGES);
95726@@ -2271,6 +2484,10 @@ gotten:
95727 page_remove_rmap(old_page);
95728 }
95729
95730+#ifdef CONFIG_PAX_SEGMEXEC
95731+ pax_mirror_anon_pte(vma, address, new_page, ptl);
95732+#endif
95733+
95734 /* Free the old page.. */
95735 new_page = old_page;
95736 ret |= VM_FAULT_WRITE;
95737@@ -2545,6 +2762,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
95738 swap_free(entry);
95739 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
95740 try_to_free_swap(page);
95741+
95742+#ifdef CONFIG_PAX_SEGMEXEC
95743+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
95744+#endif
95745+
95746 unlock_page(page);
95747 if (page != swapcache) {
95748 /*
95749@@ -2568,6 +2790,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
95750
95751 /* No need to invalidate - it was non-present before */
95752 update_mmu_cache(vma, address, page_table);
95753+
95754+#ifdef CONFIG_PAX_SEGMEXEC
95755+ pax_mirror_anon_pte(vma, address, page, ptl);
95756+#endif
95757+
95758 unlock:
95759 pte_unmap_unlock(page_table, ptl);
95760 out:
95761@@ -2587,40 +2814,6 @@ out_release:
95762 }
95763
95764 /*
95765- * This is like a special single-page "expand_{down|up}wards()",
95766- * except we must first make sure that 'address{-|+}PAGE_SIZE'
95767- * doesn't hit another vma.
95768- */
95769-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
95770-{
95771- address &= PAGE_MASK;
95772- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
95773- struct vm_area_struct *prev = vma->vm_prev;
95774-
95775- /*
95776- * Is there a mapping abutting this one below?
95777- *
95778- * That's only ok if it's the same stack mapping
95779- * that has gotten split..
95780- */
95781- if (prev && prev->vm_end == address)
95782- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
95783-
95784- expand_downwards(vma, address - PAGE_SIZE);
95785- }
95786- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
95787- struct vm_area_struct *next = vma->vm_next;
95788-
95789- /* As VM_GROWSDOWN but s/below/above/ */
95790- if (next && next->vm_start == address + PAGE_SIZE)
95791- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
95792-
95793- expand_upwards(vma, address + PAGE_SIZE);
95794- }
95795- return 0;
95796-}
95797-
95798-/*
95799 * We enter with non-exclusive mmap_sem (to exclude vma changes,
95800 * but allow concurrent faults), and pte mapped but not yet locked.
95801 * We return with mmap_sem still held, but pte unmapped and unlocked.
95802@@ -2630,27 +2823,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
95803 unsigned int flags)
95804 {
95805 struct mem_cgroup *memcg;
95806- struct page *page;
95807+ struct page *page = NULL;
95808 spinlock_t *ptl;
95809 pte_t entry;
95810
95811- pte_unmap(page_table);
95812-
95813- /* Check if we need to add a guard page to the stack */
95814- if (check_stack_guard_page(vma, address) < 0)
95815- return VM_FAULT_SIGBUS;
95816-
95817- /* Use the zero-page for reads */
95818 if (!(flags & FAULT_FLAG_WRITE)) {
95819 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
95820 vma->vm_page_prot));
95821- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
95822+ ptl = pte_lockptr(mm, pmd);
95823+ spin_lock(ptl);
95824 if (!pte_none(*page_table))
95825 goto unlock;
95826 goto setpte;
95827 }
95828
95829 /* Allocate our own private page. */
95830+ pte_unmap(page_table);
95831+
95832 if (unlikely(anon_vma_prepare(vma)))
95833 goto oom;
95834 page = alloc_zeroed_user_highpage_movable(vma, address);
95835@@ -2674,6 +2863,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
95836 if (!pte_none(*page_table))
95837 goto release;
95838
95839+#ifdef CONFIG_PAX_SEGMEXEC
95840+ if (pax_find_mirror_vma(vma))
95841+ BUG_ON(!trylock_page(page));
95842+#endif
95843+
95844 inc_mm_counter_fast(mm, MM_ANONPAGES);
95845 page_add_new_anon_rmap(page, vma, address);
95846 mem_cgroup_commit_charge(page, memcg, false);
95847@@ -2683,6 +2877,12 @@ setpte:
95848
95849 /* No need to invalidate - it was non-present before */
95850 update_mmu_cache(vma, address, page_table);
95851+
95852+#ifdef CONFIG_PAX_SEGMEXEC
95853+ if (page)
95854+ pax_mirror_anon_pte(vma, address, page, ptl);
95855+#endif
95856+
95857 unlock:
95858 pte_unmap_unlock(page_table, ptl);
95859 return 0;
95860@@ -2913,6 +3113,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95861 return ret;
95862 }
95863 do_set_pte(vma, address, fault_page, pte, false, false);
95864+
95865+#ifdef CONFIG_PAX_SEGMEXEC
95866+ pax_mirror_file_pte(vma, address, fault_page, ptl);
95867+#endif
95868+
95869 unlock_page(fault_page);
95870 unlock_out:
95871 pte_unmap_unlock(pte, ptl);
95872@@ -2955,7 +3160,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95873 page_cache_release(fault_page);
95874 goto uncharge_out;
95875 }
95876+
95877+#ifdef CONFIG_PAX_SEGMEXEC
95878+ if (pax_find_mirror_vma(vma))
95879+ BUG_ON(!trylock_page(new_page));
95880+#endif
95881+
95882 do_set_pte(vma, address, new_page, pte, true, true);
95883+
95884+#ifdef CONFIG_PAX_SEGMEXEC
95885+ pax_mirror_anon_pte(vma, address, new_page, ptl);
95886+#endif
95887+
95888 mem_cgroup_commit_charge(new_page, memcg, false);
95889 lru_cache_add_active_or_unevictable(new_page, vma);
95890 pte_unmap_unlock(pte, ptl);
95891@@ -3005,6 +3221,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95892 return ret;
95893 }
95894 do_set_pte(vma, address, fault_page, pte, true, false);
95895+
95896+#ifdef CONFIG_PAX_SEGMEXEC
95897+ pax_mirror_file_pte(vma, address, fault_page, ptl);
95898+#endif
95899+
95900 pte_unmap_unlock(pte, ptl);
95901
95902 if (set_page_dirty(fault_page))
95903@@ -3246,6 +3467,12 @@ static int handle_pte_fault(struct mm_struct *mm,
95904 if (flags & FAULT_FLAG_WRITE)
95905 flush_tlb_fix_spurious_fault(vma, address);
95906 }
95907+
95908+#ifdef CONFIG_PAX_SEGMEXEC
95909+ pax_mirror_pte(vma, address, pte, pmd, ptl);
95910+ return 0;
95911+#endif
95912+
95913 unlock:
95914 pte_unmap_unlock(pte, ptl);
95915 return 0;
95916@@ -3265,9 +3492,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
95917 pmd_t *pmd;
95918 pte_t *pte;
95919
95920+#ifdef CONFIG_PAX_SEGMEXEC
95921+ struct vm_area_struct *vma_m;
95922+#endif
95923+
95924 if (unlikely(is_vm_hugetlb_page(vma)))
95925 return hugetlb_fault(mm, vma, address, flags);
95926
95927+#ifdef CONFIG_PAX_SEGMEXEC
95928+ vma_m = pax_find_mirror_vma(vma);
95929+ if (vma_m) {
95930+ unsigned long address_m;
95931+ pgd_t *pgd_m;
95932+ pud_t *pud_m;
95933+ pmd_t *pmd_m;
95934+
95935+ if (vma->vm_start > vma_m->vm_start) {
95936+ address_m = address;
95937+ address -= SEGMEXEC_TASK_SIZE;
95938+ vma = vma_m;
95939+ } else
95940+ address_m = address + SEGMEXEC_TASK_SIZE;
95941+
95942+ pgd_m = pgd_offset(mm, address_m);
95943+ pud_m = pud_alloc(mm, pgd_m, address_m);
95944+ if (!pud_m)
95945+ return VM_FAULT_OOM;
95946+ pmd_m = pmd_alloc(mm, pud_m, address_m);
95947+ if (!pmd_m)
95948+ return VM_FAULT_OOM;
95949+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
95950+ return VM_FAULT_OOM;
95951+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
95952+ }
95953+#endif
95954+
95955 pgd = pgd_offset(mm, address);
95956 pud = pud_alloc(mm, pgd, address);
95957 if (!pud)
95958@@ -3401,6 +3660,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
95959 spin_unlock(&mm->page_table_lock);
95960 return 0;
95961 }
95962+
95963+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
95964+{
95965+ pud_t *new = pud_alloc_one(mm, address);
95966+ if (!new)
95967+ return -ENOMEM;
95968+
95969+ smp_wmb(); /* See comment in __pte_alloc */
95970+
95971+ spin_lock(&mm->page_table_lock);
95972+ if (pgd_present(*pgd)) /* Another has populated it */
95973+ pud_free(mm, new);
95974+ else
95975+ pgd_populate_kernel(mm, pgd, new);
95976+ spin_unlock(&mm->page_table_lock);
95977+ return 0;
95978+}
95979 #endif /* __PAGETABLE_PUD_FOLDED */
95980
95981 #ifndef __PAGETABLE_PMD_FOLDED
95982@@ -3431,6 +3707,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
95983 spin_unlock(&mm->page_table_lock);
95984 return 0;
95985 }
95986+
95987+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
95988+{
95989+ pmd_t *new = pmd_alloc_one(mm, address);
95990+ if (!new)
95991+ return -ENOMEM;
95992+
95993+ smp_wmb(); /* See comment in __pte_alloc */
95994+
95995+ spin_lock(&mm->page_table_lock);
95996+#ifndef __ARCH_HAS_4LEVEL_HACK
95997+ if (pud_present(*pud)) /* Another has populated it */
95998+ pmd_free(mm, new);
95999+ else
96000+ pud_populate_kernel(mm, pud, new);
96001+#else
96002+ if (pgd_present(*pud)) /* Another has populated it */
96003+ pmd_free(mm, new);
96004+ else
96005+ pgd_populate_kernel(mm, pud, new);
96006+#endif /* __ARCH_HAS_4LEVEL_HACK */
96007+ spin_unlock(&mm->page_table_lock);
96008+ return 0;
96009+}
96010 #endif /* __PAGETABLE_PMD_FOLDED */
96011
96012 static int __follow_pte(struct mm_struct *mm, unsigned long address,
96013@@ -3540,8 +3840,8 @@ out:
96014 return ret;
96015 }
96016
96017-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
96018- void *buf, int len, int write)
96019+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
96020+ void *buf, size_t len, int write)
96021 {
96022 resource_size_t phys_addr;
96023 unsigned long prot = 0;
96024@@ -3567,8 +3867,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
96025 * Access another process' address space as given in mm. If non-NULL, use the
96026 * given task for page fault accounting.
96027 */
96028-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96029- unsigned long addr, void *buf, int len, int write)
96030+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96031+ unsigned long addr, void *buf, size_t len, int write)
96032 {
96033 struct vm_area_struct *vma;
96034 void *old_buf = buf;
96035@@ -3576,7 +3876,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96036 down_read(&mm->mmap_sem);
96037 /* ignore errors, just check how much was successfully transferred */
96038 while (len) {
96039- int bytes, ret, offset;
96040+ ssize_t bytes, ret, offset;
96041 void *maddr;
96042 struct page *page = NULL;
96043
96044@@ -3637,8 +3937,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
96045 *
96046 * The caller must hold a reference on @mm.
96047 */
96048-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
96049- void *buf, int len, int write)
96050+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
96051+ void *buf, size_t len, int write)
96052 {
96053 return __access_remote_vm(NULL, mm, addr, buf, len, write);
96054 }
96055@@ -3648,11 +3948,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
96056 * Source/target buffer must be kernel space,
96057 * Do not walk the page table directly, use get_user_pages
96058 */
96059-int access_process_vm(struct task_struct *tsk, unsigned long addr,
96060- void *buf, int len, int write)
96061+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
96062+ void *buf, size_t len, int write)
96063 {
96064 struct mm_struct *mm;
96065- int ret;
96066+ ssize_t ret;
96067
96068 mm = get_task_mm(tsk);
96069 if (!mm)
96070diff --git a/mm/mempolicy.c b/mm/mempolicy.c
96071index e58725a..e0be017 100644
96072--- a/mm/mempolicy.c
96073+++ b/mm/mempolicy.c
96074@@ -750,6 +750,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
96075 unsigned long vmstart;
96076 unsigned long vmend;
96077
96078+#ifdef CONFIG_PAX_SEGMEXEC
96079+ struct vm_area_struct *vma_m;
96080+#endif
96081+
96082 vma = find_vma(mm, start);
96083 if (!vma || vma->vm_start > start)
96084 return -EFAULT;
96085@@ -793,6 +797,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
96086 err = vma_replace_policy(vma, new_pol);
96087 if (err)
96088 goto out;
96089+
96090+#ifdef CONFIG_PAX_SEGMEXEC
96091+ vma_m = pax_find_mirror_vma(vma);
96092+ if (vma_m) {
96093+ err = vma_replace_policy(vma_m, new_pol);
96094+ if (err)
96095+ goto out;
96096+ }
96097+#endif
96098+
96099 }
96100
96101 out:
96102@@ -1212,6 +1226,17 @@ static long do_mbind(unsigned long start, unsigned long len,
96103
96104 if (end < start)
96105 return -EINVAL;
96106+
96107+#ifdef CONFIG_PAX_SEGMEXEC
96108+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
96109+ if (end > SEGMEXEC_TASK_SIZE)
96110+ return -EINVAL;
96111+ } else
96112+#endif
96113+
96114+ if (end > TASK_SIZE)
96115+ return -EINVAL;
96116+
96117 if (end == start)
96118 return 0;
96119
96120@@ -1437,8 +1462,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
96121 */
96122 tcred = __task_cred(task);
96123 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
96124- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
96125- !capable(CAP_SYS_NICE)) {
96126+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
96127 rcu_read_unlock();
96128 err = -EPERM;
96129 goto out_put;
96130@@ -1469,6 +1493,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
96131 goto out;
96132 }
96133
96134+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
96135+ if (mm != current->mm &&
96136+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
96137+ mmput(mm);
96138+ err = -EPERM;
96139+ goto out;
96140+ }
96141+#endif
96142+
96143 err = do_migrate_pages(mm, old, new,
96144 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
96145
96146diff --git a/mm/migrate.c b/mm/migrate.c
96147index 0143995..b294728 100644
96148--- a/mm/migrate.c
96149+++ b/mm/migrate.c
96150@@ -1495,8 +1495,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
96151 */
96152 tcred = __task_cred(task);
96153 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
96154- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
96155- !capable(CAP_SYS_NICE)) {
96156+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
96157 rcu_read_unlock();
96158 err = -EPERM;
96159 goto out;
96160diff --git a/mm/mlock.c b/mm/mlock.c
96161index 73cf098..ab547c7 100644
96162--- a/mm/mlock.c
96163+++ b/mm/mlock.c
96164@@ -14,6 +14,7 @@
96165 #include <linux/pagevec.h>
96166 #include <linux/mempolicy.h>
96167 #include <linux/syscalls.h>
96168+#include <linux/security.h>
96169 #include <linux/sched.h>
96170 #include <linux/export.h>
96171 #include <linux/rmap.h>
96172@@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
96173 {
96174 unsigned long nstart, end, tmp;
96175 struct vm_area_struct * vma, * prev;
96176- int error;
96177+ int error = 0;
96178
96179 VM_BUG_ON(start & ~PAGE_MASK);
96180 VM_BUG_ON(len != PAGE_ALIGN(len));
96181@@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
96182 return -EINVAL;
96183 if (end == start)
96184 return 0;
96185+ if (end > TASK_SIZE)
96186+ return -EINVAL;
96187+
96188 vma = find_vma(current->mm, start);
96189 if (!vma || vma->vm_start > start)
96190 return -ENOMEM;
96191@@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
96192 for (nstart = start ; ; ) {
96193 vm_flags_t newflags;
96194
96195+#ifdef CONFIG_PAX_SEGMEXEC
96196+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
96197+ break;
96198+#endif
96199+
96200 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
96201
96202 newflags = vma->vm_flags & ~VM_LOCKED;
96203@@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
96204 locked += current->mm->locked_vm;
96205
96206 /* check against resource limits */
96207+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
96208 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
96209 error = do_mlock(start, len, 1);
96210
96211@@ -783,6 +793,11 @@ static int do_mlockall(int flags)
96212 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
96213 vm_flags_t newflags;
96214
96215+#ifdef CONFIG_PAX_SEGMEXEC
96216+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
96217+ break;
96218+#endif
96219+
96220 newflags = vma->vm_flags & ~VM_LOCKED;
96221 if (flags & MCL_CURRENT)
96222 newflags |= VM_LOCKED;
96223@@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
96224 lock_limit >>= PAGE_SHIFT;
96225
96226 ret = -ENOMEM;
96227+
96228+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
96229+
96230 down_write(&current->mm->mmap_sem);
96231-
96232 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
96233 capable(CAP_IPC_LOCK))
96234 ret = do_mlockall(flags);
96235diff --git a/mm/mmap.c b/mm/mmap.c
96236index ae91989..d8308c7 100644
96237--- a/mm/mmap.c
96238+++ b/mm/mmap.c
96239@@ -41,6 +41,7 @@
96240 #include <linux/notifier.h>
96241 #include <linux/memory.h>
96242 #include <linux/printk.h>
96243+#include <linux/random.h>
96244
96245 #include <asm/uaccess.h>
96246 #include <asm/cacheflush.h>
96247@@ -57,6 +58,16 @@
96248 #define arch_rebalance_pgtables(addr, len) (addr)
96249 #endif
96250
96251+static inline void verify_mm_writelocked(struct mm_struct *mm)
96252+{
96253+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
96254+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
96255+ up_read(&mm->mmap_sem);
96256+ BUG();
96257+ }
96258+#endif
96259+}
96260+
96261 static void unmap_region(struct mm_struct *mm,
96262 struct vm_area_struct *vma, struct vm_area_struct *prev,
96263 unsigned long start, unsigned long end);
96264@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
96265 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
96266 *
96267 */
96268-pgprot_t protection_map[16] = {
96269+pgprot_t protection_map[16] __read_only = {
96270 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
96271 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
96272 };
96273
96274-pgprot_t vm_get_page_prot(unsigned long vm_flags)
96275+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
96276 {
96277- return __pgprot(pgprot_val(protection_map[vm_flags &
96278+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
96279 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
96280 pgprot_val(arch_vm_get_page_prot(vm_flags)));
96281+
96282+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96283+ if (!(__supported_pte_mask & _PAGE_NX) &&
96284+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
96285+ (vm_flags & (VM_READ | VM_WRITE)))
96286+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
96287+#endif
96288+
96289+ return prot;
96290 }
96291 EXPORT_SYMBOL(vm_get_page_prot);
96292
96293@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
96294 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
96295 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
96296 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
96297+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
96298 /*
96299 * Make sure vm_committed_as in one cacheline and not cacheline shared with
96300 * other variables. It can be updated by several CPUs frequently.
96301@@ -274,6 +295,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
96302 struct vm_area_struct *next = vma->vm_next;
96303
96304 might_sleep();
96305+ BUG_ON(vma->vm_mirror);
96306 if (vma->vm_ops && vma->vm_ops->close)
96307 vma->vm_ops->close(vma);
96308 if (vma->vm_file)
96309@@ -287,6 +309,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
96310
96311 SYSCALL_DEFINE1(brk, unsigned long, brk)
96312 {
96313+ unsigned long rlim;
96314 unsigned long retval;
96315 unsigned long newbrk, oldbrk;
96316 struct mm_struct *mm = current->mm;
96317@@ -317,7 +340,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
96318 * segment grow beyond its set limit the in case where the limit is
96319 * not page aligned -Ram Gupta
96320 */
96321- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
96322+ rlim = rlimit(RLIMIT_DATA);
96323+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
96324+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
96325+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
96326+ rlim = 4096 * PAGE_SIZE;
96327+#endif
96328+ if (check_data_rlimit(rlim, brk, mm->start_brk,
96329 mm->end_data, mm->start_data))
96330 goto out;
96331
96332@@ -976,6 +1005,12 @@ static int
96333 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
96334 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
96335 {
96336+
96337+#ifdef CONFIG_PAX_SEGMEXEC
96338+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
96339+ return 0;
96340+#endif
96341+
96342 if (is_mergeable_vma(vma, file, vm_flags) &&
96343 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
96344 if (vma->vm_pgoff == vm_pgoff)
96345@@ -995,6 +1030,12 @@ static int
96346 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
96347 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
96348 {
96349+
96350+#ifdef CONFIG_PAX_SEGMEXEC
96351+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
96352+ return 0;
96353+#endif
96354+
96355 if (is_mergeable_vma(vma, file, vm_flags) &&
96356 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
96357 pgoff_t vm_pglen;
96358@@ -1044,6 +1085,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96359 struct vm_area_struct *area, *next;
96360 int err;
96361
96362+#ifdef CONFIG_PAX_SEGMEXEC
96363+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
96364+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
96365+
96366+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
96367+#endif
96368+
96369 /*
96370 * We later require that vma->vm_flags == vm_flags,
96371 * so this tests vma->vm_flags & VM_SPECIAL, too.
96372@@ -1059,6 +1107,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96373 if (next && next->vm_end == end) /* cases 6, 7, 8 */
96374 next = next->vm_next;
96375
96376+#ifdef CONFIG_PAX_SEGMEXEC
96377+ if (prev)
96378+ prev_m = pax_find_mirror_vma(prev);
96379+ if (area)
96380+ area_m = pax_find_mirror_vma(area);
96381+ if (next)
96382+ next_m = pax_find_mirror_vma(next);
96383+#endif
96384+
96385 /*
96386 * Can it merge with the predecessor?
96387 */
96388@@ -1078,9 +1135,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96389 /* cases 1, 6 */
96390 err = vma_adjust(prev, prev->vm_start,
96391 next->vm_end, prev->vm_pgoff, NULL);
96392- } else /* cases 2, 5, 7 */
96393+
96394+#ifdef CONFIG_PAX_SEGMEXEC
96395+ if (!err && prev_m)
96396+ err = vma_adjust(prev_m, prev_m->vm_start,
96397+ next_m->vm_end, prev_m->vm_pgoff, NULL);
96398+#endif
96399+
96400+ } else { /* cases 2, 5, 7 */
96401 err = vma_adjust(prev, prev->vm_start,
96402 end, prev->vm_pgoff, NULL);
96403+
96404+#ifdef CONFIG_PAX_SEGMEXEC
96405+ if (!err && prev_m)
96406+ err = vma_adjust(prev_m, prev_m->vm_start,
96407+ end_m, prev_m->vm_pgoff, NULL);
96408+#endif
96409+
96410+ }
96411 if (err)
96412 return NULL;
96413 khugepaged_enter_vma_merge(prev, vm_flags);
96414@@ -1094,12 +1166,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
96415 mpol_equal(policy, vma_policy(next)) &&
96416 can_vma_merge_before(next, vm_flags,
96417 anon_vma, file, pgoff+pglen)) {
96418- if (prev && addr < prev->vm_end) /* case 4 */
96419+ if (prev && addr < prev->vm_end) { /* case 4 */
96420 err = vma_adjust(prev, prev->vm_start,
96421 addr, prev->vm_pgoff, NULL);
96422- else /* cases 3, 8 */
96423+
96424+#ifdef CONFIG_PAX_SEGMEXEC
96425+ if (!err && prev_m)
96426+ err = vma_adjust(prev_m, prev_m->vm_start,
96427+ addr_m, prev_m->vm_pgoff, NULL);
96428+#endif
96429+
96430+ } else { /* cases 3, 8 */
96431 err = vma_adjust(area, addr, next->vm_end,
96432 next->vm_pgoff - pglen, NULL);
96433+
96434+#ifdef CONFIG_PAX_SEGMEXEC
96435+ if (!err && area_m)
96436+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
96437+ next_m->vm_pgoff - pglen, NULL);
96438+#endif
96439+
96440+ }
96441 if (err)
96442 return NULL;
96443 khugepaged_enter_vma_merge(area, vm_flags);
96444@@ -1208,8 +1295,10 @@ none:
96445 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
96446 struct file *file, long pages)
96447 {
96448- const unsigned long stack_flags
96449- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
96450+
96451+#ifdef CONFIG_PAX_RANDMMAP
96452+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
96453+#endif
96454
96455 mm->total_vm += pages;
96456
96457@@ -1217,7 +1306,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
96458 mm->shared_vm += pages;
96459 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
96460 mm->exec_vm += pages;
96461- } else if (flags & stack_flags)
96462+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
96463 mm->stack_vm += pages;
96464 }
96465 #endif /* CONFIG_PROC_FS */
96466@@ -1247,6 +1336,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
96467 locked += mm->locked_vm;
96468 lock_limit = rlimit(RLIMIT_MEMLOCK);
96469 lock_limit >>= PAGE_SHIFT;
96470+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
96471 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
96472 return -EAGAIN;
96473 }
96474@@ -1273,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96475 * (the exception is when the underlying filesystem is noexec
96476 * mounted, in which case we dont add PROT_EXEC.)
96477 */
96478- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
96479+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
96480 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
96481 prot |= PROT_EXEC;
96482
96483@@ -1299,7 +1389,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96484 /* Obtain the address to map to. we verify (or select) it and ensure
96485 * that it represents a valid section of the address space.
96486 */
96487- addr = get_unmapped_area(file, addr, len, pgoff, flags);
96488+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
96489 if (addr & ~PAGE_MASK)
96490 return addr;
96491
96492@@ -1310,6 +1400,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96493 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
96494 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
96495
96496+#ifdef CONFIG_PAX_MPROTECT
96497+ if (mm->pax_flags & MF_PAX_MPROTECT) {
96498+
96499+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
96500+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
96501+ mm->binfmt->handle_mmap)
96502+ mm->binfmt->handle_mmap(file);
96503+#endif
96504+
96505+#ifndef CONFIG_PAX_MPROTECT_COMPAT
96506+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
96507+ gr_log_rwxmmap(file);
96508+
96509+#ifdef CONFIG_PAX_EMUPLT
96510+ vm_flags &= ~VM_EXEC;
96511+#else
96512+ return -EPERM;
96513+#endif
96514+
96515+ }
96516+
96517+ if (!(vm_flags & VM_EXEC))
96518+ vm_flags &= ~VM_MAYEXEC;
96519+#else
96520+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
96521+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
96522+#endif
96523+ else
96524+ vm_flags &= ~VM_MAYWRITE;
96525+ }
96526+#endif
96527+
96528+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96529+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
96530+ vm_flags &= ~VM_PAGEEXEC;
96531+#endif
96532+
96533 if (flags & MAP_LOCKED)
96534 if (!can_do_mlock())
96535 return -EPERM;
96536@@ -1397,6 +1524,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
96537 vm_flags |= VM_NORESERVE;
96538 }
96539
96540+ if (!gr_acl_handle_mmap(file, prot))
96541+ return -EACCES;
96542+
96543 addr = mmap_region(file, addr, len, vm_flags, pgoff);
96544 if (!IS_ERR_VALUE(addr) &&
96545 ((vm_flags & VM_LOCKED) ||
96546@@ -1490,7 +1620,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
96547 vm_flags_t vm_flags = vma->vm_flags;
96548
96549 /* If it was private or non-writable, the write bit is already clear */
96550- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
96551+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
96552 return 0;
96553
96554 /* The backer wishes to know when pages are first written to? */
96555@@ -1541,7 +1671,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
96556 struct rb_node **rb_link, *rb_parent;
96557 unsigned long charged = 0;
96558
96559+#ifdef CONFIG_PAX_SEGMEXEC
96560+ struct vm_area_struct *vma_m = NULL;
96561+#endif
96562+
96563+ /*
96564+ * mm->mmap_sem is required to protect against another thread
96565+ * changing the mappings in case we sleep.
96566+ */
96567+ verify_mm_writelocked(mm);
96568+
96569 /* Check against address space limit. */
96570+
96571+#ifdef CONFIG_PAX_RANDMMAP
96572+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
96573+#endif
96574+
96575 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
96576 unsigned long nr_pages;
96577
96578@@ -1560,11 +1705,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
96579
96580 /* Clear old maps */
96581 error = -ENOMEM;
96582-munmap_back:
96583 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
96584 if (do_munmap(mm, addr, len))
96585 return -ENOMEM;
96586- goto munmap_back;
96587+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
96588 }
96589
96590 /*
96591@@ -1595,6 +1739,16 @@ munmap_back:
96592 goto unacct_error;
96593 }
96594
96595+#ifdef CONFIG_PAX_SEGMEXEC
96596+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
96597+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
96598+ if (!vma_m) {
96599+ error = -ENOMEM;
96600+ goto free_vma;
96601+ }
96602+ }
96603+#endif
96604+
96605 vma->vm_mm = mm;
96606 vma->vm_start = addr;
96607 vma->vm_end = addr + len;
96608@@ -1625,6 +1779,13 @@ munmap_back:
96609 if (error)
96610 goto unmap_and_free_vma;
96611
96612+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
96613+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
96614+ vma->vm_flags |= VM_PAGEEXEC;
96615+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
96616+ }
96617+#endif
96618+
96619 /* Can addr have changed??
96620 *
96621 * Answer: Yes, several device drivers can do it in their
96622@@ -1643,6 +1804,12 @@ munmap_back:
96623 }
96624
96625 vma_link(mm, vma, prev, rb_link, rb_parent);
96626+
96627+#ifdef CONFIG_PAX_SEGMEXEC
96628+ if (vma_m)
96629+ BUG_ON(pax_mirror_vma(vma_m, vma));
96630+#endif
96631+
96632 /* Once vma denies write, undo our temporary denial count */
96633 if (file) {
96634 if (vm_flags & VM_SHARED)
96635@@ -1655,6 +1822,7 @@ out:
96636 perf_event_mmap(vma);
96637
96638 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
96639+ track_exec_limit(mm, addr, addr + len, vm_flags);
96640 if (vm_flags & VM_LOCKED) {
96641 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
96642 vma == get_gate_vma(current->mm)))
96643@@ -1692,6 +1860,12 @@ allow_write_and_free_vma:
96644 if (vm_flags & VM_DENYWRITE)
96645 allow_write_access(file);
96646 free_vma:
96647+
96648+#ifdef CONFIG_PAX_SEGMEXEC
96649+ if (vma_m)
96650+ kmem_cache_free(vm_area_cachep, vma_m);
96651+#endif
96652+
96653 kmem_cache_free(vm_area_cachep, vma);
96654 unacct_error:
96655 if (charged)
96656@@ -1699,7 +1873,63 @@ unacct_error:
96657 return error;
96658 }
96659
96660-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
96661+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
96662+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
96663+{
96664+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
96665+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
96666+
96667+ return 0;
96668+}
96669+#endif
96670+
96671+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
96672+{
96673+ if (!vma) {
96674+#ifdef CONFIG_STACK_GROWSUP
96675+ if (addr > sysctl_heap_stack_gap)
96676+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
96677+ else
96678+ vma = find_vma(current->mm, 0);
96679+ if (vma && (vma->vm_flags & VM_GROWSUP))
96680+ return false;
96681+#endif
96682+ return true;
96683+ }
96684+
96685+ if (addr + len > vma->vm_start)
96686+ return false;
96687+
96688+ if (vma->vm_flags & VM_GROWSDOWN)
96689+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
96690+#ifdef CONFIG_STACK_GROWSUP
96691+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
96692+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
96693+#endif
96694+ else if (offset)
96695+ return offset <= vma->vm_start - addr - len;
96696+
96697+ return true;
96698+}
96699+
96700+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
96701+{
96702+ if (vma->vm_start < len)
96703+ return -ENOMEM;
96704+
96705+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
96706+ if (offset <= vma->vm_start - len)
96707+ return vma->vm_start - len - offset;
96708+ else
96709+ return -ENOMEM;
96710+ }
96711+
96712+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
96713+ return vma->vm_start - len - sysctl_heap_stack_gap;
96714+ return -ENOMEM;
96715+}
96716+
96717+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
96718 {
96719 /*
96720 * We implement the search by looking for an rbtree node that
96721@@ -1747,11 +1977,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
96722 }
96723 }
96724
96725- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
96726+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
96727 check_current:
96728 /* Check if current node has a suitable gap */
96729 if (gap_start > high_limit)
96730 return -ENOMEM;
96731+
96732+ if (gap_end - gap_start > info->threadstack_offset)
96733+ gap_start += info->threadstack_offset;
96734+ else
96735+ gap_start = gap_end;
96736+
96737+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
96738+ if (gap_end - gap_start > sysctl_heap_stack_gap)
96739+ gap_start += sysctl_heap_stack_gap;
96740+ else
96741+ gap_start = gap_end;
96742+ }
96743+ if (vma->vm_flags & VM_GROWSDOWN) {
96744+ if (gap_end - gap_start > sysctl_heap_stack_gap)
96745+ gap_end -= sysctl_heap_stack_gap;
96746+ else
96747+ gap_end = gap_start;
96748+ }
96749 if (gap_end >= low_limit && gap_end - gap_start >= length)
96750 goto found;
96751
96752@@ -1801,7 +2049,7 @@ found:
96753 return gap_start;
96754 }
96755
96756-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
96757+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
96758 {
96759 struct mm_struct *mm = current->mm;
96760 struct vm_area_struct *vma;
96761@@ -1855,6 +2103,24 @@ check_current:
96762 gap_end = vma->vm_start;
96763 if (gap_end < low_limit)
96764 return -ENOMEM;
96765+
96766+ if (gap_end - gap_start > info->threadstack_offset)
96767+ gap_end -= info->threadstack_offset;
96768+ else
96769+ gap_end = gap_start;
96770+
96771+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
96772+ if (gap_end - gap_start > sysctl_heap_stack_gap)
96773+ gap_start += sysctl_heap_stack_gap;
96774+ else
96775+ gap_start = gap_end;
96776+ }
96777+ if (vma->vm_flags & VM_GROWSDOWN) {
96778+ if (gap_end - gap_start > sysctl_heap_stack_gap)
96779+ gap_end -= sysctl_heap_stack_gap;
96780+ else
96781+ gap_end = gap_start;
96782+ }
96783 if (gap_start <= high_limit && gap_end - gap_start >= length)
96784 goto found;
96785
96786@@ -1918,6 +2184,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96787 struct mm_struct *mm = current->mm;
96788 struct vm_area_struct *vma;
96789 struct vm_unmapped_area_info info;
96790+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
96791
96792 if (len > TASK_SIZE - mmap_min_addr)
96793 return -ENOMEM;
96794@@ -1925,11 +2192,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96795 if (flags & MAP_FIXED)
96796 return addr;
96797
96798+#ifdef CONFIG_PAX_RANDMMAP
96799+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
96800+#endif
96801+
96802 if (addr) {
96803 addr = PAGE_ALIGN(addr);
96804 vma = find_vma(mm, addr);
96805 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
96806- (!vma || addr + len <= vma->vm_start))
96807+ check_heap_stack_gap(vma, addr, len, offset))
96808 return addr;
96809 }
96810
96811@@ -1938,6 +2209,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
96812 info.low_limit = mm->mmap_base;
96813 info.high_limit = TASK_SIZE;
96814 info.align_mask = 0;
96815+ info.threadstack_offset = offset;
96816 return vm_unmapped_area(&info);
96817 }
96818 #endif
96819@@ -1956,6 +2228,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96820 struct mm_struct *mm = current->mm;
96821 unsigned long addr = addr0;
96822 struct vm_unmapped_area_info info;
96823+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
96824
96825 /* requested length too big for entire address space */
96826 if (len > TASK_SIZE - mmap_min_addr)
96827@@ -1964,12 +2237,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96828 if (flags & MAP_FIXED)
96829 return addr;
96830
96831+#ifdef CONFIG_PAX_RANDMMAP
96832+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
96833+#endif
96834+
96835 /* requesting a specific address */
96836 if (addr) {
96837 addr = PAGE_ALIGN(addr);
96838 vma = find_vma(mm, addr);
96839 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
96840- (!vma || addr + len <= vma->vm_start))
96841+ check_heap_stack_gap(vma, addr, len, offset))
96842 return addr;
96843 }
96844
96845@@ -1978,6 +2255,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96846 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
96847 info.high_limit = mm->mmap_base;
96848 info.align_mask = 0;
96849+ info.threadstack_offset = offset;
96850 addr = vm_unmapped_area(&info);
96851
96852 /*
96853@@ -1990,6 +2268,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
96854 VM_BUG_ON(addr != -ENOMEM);
96855 info.flags = 0;
96856 info.low_limit = TASK_UNMAPPED_BASE;
96857+
96858+#ifdef CONFIG_PAX_RANDMMAP
96859+ if (mm->pax_flags & MF_PAX_RANDMMAP)
96860+ info.low_limit += mm->delta_mmap;
96861+#endif
96862+
96863 info.high_limit = TASK_SIZE;
96864 addr = vm_unmapped_area(&info);
96865 }
96866@@ -2090,6 +2374,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
96867 return vma;
96868 }
96869
96870+#ifdef CONFIG_PAX_SEGMEXEC
96871+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
96872+{
96873+ struct vm_area_struct *vma_m;
96874+
96875+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
96876+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
96877+ BUG_ON(vma->vm_mirror);
96878+ return NULL;
96879+ }
96880+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
96881+ vma_m = vma->vm_mirror;
96882+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
96883+ BUG_ON(vma->vm_file != vma_m->vm_file);
96884+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
96885+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
96886+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
96887+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
96888+ return vma_m;
96889+}
96890+#endif
96891+
96892 /*
96893 * Verify that the stack growth is acceptable and
96894 * update accounting. This is shared with both the
96895@@ -2106,6 +2412,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
96896 return -ENOMEM;
96897
96898 /* Stack limit test */
96899+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
96900 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
96901 return -ENOMEM;
96902
96903@@ -2116,6 +2423,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
96904 locked = mm->locked_vm + grow;
96905 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
96906 limit >>= PAGE_SHIFT;
96907+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
96908 if (locked > limit && !capable(CAP_IPC_LOCK))
96909 return -ENOMEM;
96910 }
96911@@ -2145,37 +2453,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
96912 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
96913 * vma is the last one with address > vma->vm_end. Have to extend vma.
96914 */
96915+#ifndef CONFIG_IA64
96916+static
96917+#endif
96918 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
96919 {
96920 int error;
96921+ bool locknext;
96922
96923 if (!(vma->vm_flags & VM_GROWSUP))
96924 return -EFAULT;
96925
96926+ /* Also guard against wrapping around to address 0. */
96927+ if (address < PAGE_ALIGN(address+1))
96928+ address = PAGE_ALIGN(address+1);
96929+ else
96930+ return -ENOMEM;
96931+
96932 /*
96933 * We must make sure the anon_vma is allocated
96934 * so that the anon_vma locking is not a noop.
96935 */
96936 if (unlikely(anon_vma_prepare(vma)))
96937 return -ENOMEM;
96938+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
96939+ if (locknext && anon_vma_prepare(vma->vm_next))
96940+ return -ENOMEM;
96941 vma_lock_anon_vma(vma);
96942+ if (locknext)
96943+ vma_lock_anon_vma(vma->vm_next);
96944
96945 /*
96946 * vma->vm_start/vm_end cannot change under us because the caller
96947 * is required to hold the mmap_sem in read mode. We need the
96948- * anon_vma lock to serialize against concurrent expand_stacks.
96949- * Also guard against wrapping around to address 0.
96950+ * anon_vma locks to serialize against concurrent expand_stacks
96951+ * and expand_upwards.
96952 */
96953- if (address < PAGE_ALIGN(address+4))
96954- address = PAGE_ALIGN(address+4);
96955- else {
96956- vma_unlock_anon_vma(vma);
96957- return -ENOMEM;
96958- }
96959 error = 0;
96960
96961 /* Somebody else might have raced and expanded it already */
96962- if (address > vma->vm_end) {
96963+ 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)
96964+ error = -ENOMEM;
96965+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
96966 unsigned long size, grow;
96967
96968 size = address - vma->vm_start;
96969@@ -2210,6 +2529,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
96970 }
96971 }
96972 }
96973+ if (locknext)
96974+ vma_unlock_anon_vma(vma->vm_next);
96975 vma_unlock_anon_vma(vma);
96976 khugepaged_enter_vma_merge(vma, vma->vm_flags);
96977 validate_mm(vma->vm_mm);
96978@@ -2224,6 +2545,8 @@ int expand_downwards(struct vm_area_struct *vma,
96979 unsigned long address)
96980 {
96981 int error;
96982+ bool lockprev = false;
96983+ struct vm_area_struct *prev;
96984
96985 /*
96986 * We must make sure the anon_vma is allocated
96987@@ -2237,6 +2560,15 @@ int expand_downwards(struct vm_area_struct *vma,
96988 if (error)
96989 return error;
96990
96991+ prev = vma->vm_prev;
96992+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
96993+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
96994+#endif
96995+ if (lockprev && anon_vma_prepare(prev))
96996+ return -ENOMEM;
96997+ if (lockprev)
96998+ vma_lock_anon_vma(prev);
96999+
97000 vma_lock_anon_vma(vma);
97001
97002 /*
97003@@ -2246,9 +2578,17 @@ int expand_downwards(struct vm_area_struct *vma,
97004 */
97005
97006 /* Somebody else might have raced and expanded it already */
97007- if (address < vma->vm_start) {
97008+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
97009+ error = -ENOMEM;
97010+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
97011 unsigned long size, grow;
97012
97013+#ifdef CONFIG_PAX_SEGMEXEC
97014+ struct vm_area_struct *vma_m;
97015+
97016+ vma_m = pax_find_mirror_vma(vma);
97017+#endif
97018+
97019 size = vma->vm_end - address;
97020 grow = (vma->vm_start - address) >> PAGE_SHIFT;
97021
97022@@ -2273,13 +2613,27 @@ int expand_downwards(struct vm_area_struct *vma,
97023 vma->vm_pgoff -= grow;
97024 anon_vma_interval_tree_post_update_vma(vma);
97025 vma_gap_update(vma);
97026+
97027+#ifdef CONFIG_PAX_SEGMEXEC
97028+ if (vma_m) {
97029+ anon_vma_interval_tree_pre_update_vma(vma_m);
97030+ vma_m->vm_start -= grow << PAGE_SHIFT;
97031+ vma_m->vm_pgoff -= grow;
97032+ anon_vma_interval_tree_post_update_vma(vma_m);
97033+ vma_gap_update(vma_m);
97034+ }
97035+#endif
97036+
97037 spin_unlock(&vma->vm_mm->page_table_lock);
97038
97039+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
97040 perf_event_mmap(vma);
97041 }
97042 }
97043 }
97044 vma_unlock_anon_vma(vma);
97045+ if (lockprev)
97046+ vma_unlock_anon_vma(prev);
97047 khugepaged_enter_vma_merge(vma, vma->vm_flags);
97048 validate_mm(vma->vm_mm);
97049 return error;
97050@@ -2377,6 +2731,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
97051 do {
97052 long nrpages = vma_pages(vma);
97053
97054+#ifdef CONFIG_PAX_SEGMEXEC
97055+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
97056+ vma = remove_vma(vma);
97057+ continue;
97058+ }
97059+#endif
97060+
97061 if (vma->vm_flags & VM_ACCOUNT)
97062 nr_accounted += nrpages;
97063 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
97064@@ -2421,6 +2782,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
97065 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
97066 vma->vm_prev = NULL;
97067 do {
97068+
97069+#ifdef CONFIG_PAX_SEGMEXEC
97070+ if (vma->vm_mirror) {
97071+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
97072+ vma->vm_mirror->vm_mirror = NULL;
97073+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
97074+ vma->vm_mirror = NULL;
97075+ }
97076+#endif
97077+
97078 vma_rb_erase(vma, &mm->mm_rb);
97079 mm->map_count--;
97080 tail_vma = vma;
97081@@ -2448,14 +2819,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97082 struct vm_area_struct *new;
97083 int err = -ENOMEM;
97084
97085+#ifdef CONFIG_PAX_SEGMEXEC
97086+ struct vm_area_struct *vma_m, *new_m = NULL;
97087+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
97088+#endif
97089+
97090 if (is_vm_hugetlb_page(vma) && (addr &
97091 ~(huge_page_mask(hstate_vma(vma)))))
97092 return -EINVAL;
97093
97094+#ifdef CONFIG_PAX_SEGMEXEC
97095+ vma_m = pax_find_mirror_vma(vma);
97096+#endif
97097+
97098 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97099 if (!new)
97100 goto out_err;
97101
97102+#ifdef CONFIG_PAX_SEGMEXEC
97103+ if (vma_m) {
97104+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
97105+ if (!new_m) {
97106+ kmem_cache_free(vm_area_cachep, new);
97107+ goto out_err;
97108+ }
97109+ }
97110+#endif
97111+
97112 /* most fields are the same, copy all, and then fixup */
97113 *new = *vma;
97114
97115@@ -2468,6 +2858,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97116 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
97117 }
97118
97119+#ifdef CONFIG_PAX_SEGMEXEC
97120+ if (vma_m) {
97121+ *new_m = *vma_m;
97122+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
97123+ new_m->vm_mirror = new;
97124+ new->vm_mirror = new_m;
97125+
97126+ if (new_below)
97127+ new_m->vm_end = addr_m;
97128+ else {
97129+ new_m->vm_start = addr_m;
97130+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
97131+ }
97132+ }
97133+#endif
97134+
97135 err = vma_dup_policy(vma, new);
97136 if (err)
97137 goto out_free_vma;
97138@@ -2488,6 +2894,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97139 else
97140 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
97141
97142+#ifdef CONFIG_PAX_SEGMEXEC
97143+ if (!err && vma_m) {
97144+ struct mempolicy *pol = vma_policy(new);
97145+
97146+ if (anon_vma_clone(new_m, vma_m))
97147+ goto out_free_mpol;
97148+
97149+ mpol_get(pol);
97150+ set_vma_policy(new_m, pol);
97151+
97152+ if (new_m->vm_file)
97153+ get_file(new_m->vm_file);
97154+
97155+ if (new_m->vm_ops && new_m->vm_ops->open)
97156+ new_m->vm_ops->open(new_m);
97157+
97158+ if (new_below)
97159+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
97160+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
97161+ else
97162+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
97163+
97164+ if (err) {
97165+ if (new_m->vm_ops && new_m->vm_ops->close)
97166+ new_m->vm_ops->close(new_m);
97167+ if (new_m->vm_file)
97168+ fput(new_m->vm_file);
97169+ mpol_put(pol);
97170+ }
97171+ }
97172+#endif
97173+
97174 /* Success. */
97175 if (!err)
97176 return 0;
97177@@ -2497,10 +2935,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97178 new->vm_ops->close(new);
97179 if (new->vm_file)
97180 fput(new->vm_file);
97181- unlink_anon_vmas(new);
97182 out_free_mpol:
97183 mpol_put(vma_policy(new));
97184 out_free_vma:
97185+
97186+#ifdef CONFIG_PAX_SEGMEXEC
97187+ if (new_m) {
97188+ unlink_anon_vmas(new_m);
97189+ kmem_cache_free(vm_area_cachep, new_m);
97190+ }
97191+#endif
97192+
97193+ unlink_anon_vmas(new);
97194 kmem_cache_free(vm_area_cachep, new);
97195 out_err:
97196 return err;
97197@@ -2513,6 +2959,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97198 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97199 unsigned long addr, int new_below)
97200 {
97201+
97202+#ifdef CONFIG_PAX_SEGMEXEC
97203+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
97204+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
97205+ if (mm->map_count >= sysctl_max_map_count-1)
97206+ return -ENOMEM;
97207+ } else
97208+#endif
97209+
97210 if (mm->map_count >= sysctl_max_map_count)
97211 return -ENOMEM;
97212
97213@@ -2524,11 +2979,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97214 * work. This now handles partial unmappings.
97215 * Jeremy Fitzhardinge <jeremy@goop.org>
97216 */
97217+#ifdef CONFIG_PAX_SEGMEXEC
97218 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97219 {
97220+ int ret = __do_munmap(mm, start, len);
97221+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
97222+ return ret;
97223+
97224+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
97225+}
97226+
97227+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97228+#else
97229+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97230+#endif
97231+{
97232 unsigned long end;
97233 struct vm_area_struct *vma, *prev, *last;
97234
97235+ /*
97236+ * mm->mmap_sem is required to protect against another thread
97237+ * changing the mappings in case we sleep.
97238+ */
97239+ verify_mm_writelocked(mm);
97240+
97241 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
97242 return -EINVAL;
97243
97244@@ -2604,6 +3078,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
97245 /* Fix up all other VM information */
97246 remove_vma_list(mm, vma);
97247
97248+ track_exec_limit(mm, start, end, 0UL);
97249+
97250 return 0;
97251 }
97252
97253@@ -2612,6 +3088,13 @@ int vm_munmap(unsigned long start, size_t len)
97254 int ret;
97255 struct mm_struct *mm = current->mm;
97256
97257+
97258+#ifdef CONFIG_PAX_SEGMEXEC
97259+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
97260+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
97261+ return -EINVAL;
97262+#endif
97263+
97264 down_write(&mm->mmap_sem);
97265 ret = do_munmap(mm, start, len);
97266 up_write(&mm->mmap_sem);
97267@@ -2625,16 +3108,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
97268 return vm_munmap(addr, len);
97269 }
97270
97271-static inline void verify_mm_writelocked(struct mm_struct *mm)
97272-{
97273-#ifdef CONFIG_DEBUG_VM
97274- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
97275- WARN_ON(1);
97276- up_read(&mm->mmap_sem);
97277- }
97278-#endif
97279-}
97280-
97281 /*
97282 * this is really a simplified "do_mmap". it only handles
97283 * anonymous maps. eventually we may be able to do some
97284@@ -2648,6 +3121,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97285 struct rb_node **rb_link, *rb_parent;
97286 pgoff_t pgoff = addr >> PAGE_SHIFT;
97287 int error;
97288+ unsigned long charged;
97289
97290 len = PAGE_ALIGN(len);
97291 if (!len)
97292@@ -2655,10 +3129,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97293
97294 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
97295
97296+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
97297+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
97298+ flags &= ~VM_EXEC;
97299+
97300+#ifdef CONFIG_PAX_MPROTECT
97301+ if (mm->pax_flags & MF_PAX_MPROTECT)
97302+ flags &= ~VM_MAYEXEC;
97303+#endif
97304+
97305+ }
97306+#endif
97307+
97308 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
97309 if (error & ~PAGE_MASK)
97310 return error;
97311
97312+ charged = len >> PAGE_SHIFT;
97313+
97314 error = mlock_future_check(mm, mm->def_flags, len);
97315 if (error)
97316 return error;
97317@@ -2672,21 +3160,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97318 /*
97319 * Clear old maps. this also does some error checking for us
97320 */
97321- munmap_back:
97322 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
97323 if (do_munmap(mm, addr, len))
97324 return -ENOMEM;
97325- goto munmap_back;
97326+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
97327 }
97328
97329 /* Check against address space limits *after* clearing old maps... */
97330- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
97331+ if (!may_expand_vm(mm, charged))
97332 return -ENOMEM;
97333
97334 if (mm->map_count > sysctl_max_map_count)
97335 return -ENOMEM;
97336
97337- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
97338+ if (security_vm_enough_memory_mm(mm, charged))
97339 return -ENOMEM;
97340
97341 /* Can we just expand an old private anonymous mapping? */
97342@@ -2700,7 +3187,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97343 */
97344 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97345 if (!vma) {
97346- vm_unacct_memory(len >> PAGE_SHIFT);
97347+ vm_unacct_memory(charged);
97348 return -ENOMEM;
97349 }
97350
97351@@ -2714,10 +3201,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
97352 vma_link(mm, vma, prev, rb_link, rb_parent);
97353 out:
97354 perf_event_mmap(vma);
97355- mm->total_vm += len >> PAGE_SHIFT;
97356+ mm->total_vm += charged;
97357 if (flags & VM_LOCKED)
97358- mm->locked_vm += (len >> PAGE_SHIFT);
97359+ mm->locked_vm += charged;
97360 vma->vm_flags |= VM_SOFTDIRTY;
97361+ track_exec_limit(mm, addr, addr + len, flags);
97362 return addr;
97363 }
97364
97365@@ -2779,6 +3267,7 @@ void exit_mmap(struct mm_struct *mm)
97366 while (vma) {
97367 if (vma->vm_flags & VM_ACCOUNT)
97368 nr_accounted += vma_pages(vma);
97369+ vma->vm_mirror = NULL;
97370 vma = remove_vma(vma);
97371 }
97372 vm_unacct_memory(nr_accounted);
97373@@ -2796,6 +3285,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
97374 struct vm_area_struct *prev;
97375 struct rb_node **rb_link, *rb_parent;
97376
97377+#ifdef CONFIG_PAX_SEGMEXEC
97378+ struct vm_area_struct *vma_m = NULL;
97379+#endif
97380+
97381+ if (security_mmap_addr(vma->vm_start))
97382+ return -EPERM;
97383+
97384 /*
97385 * The vm_pgoff of a purely anonymous vma should be irrelevant
97386 * until its first write fault, when page's anon_vma and index
97387@@ -2819,7 +3315,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
97388 security_vm_enough_memory_mm(mm, vma_pages(vma)))
97389 return -ENOMEM;
97390
97391+#ifdef CONFIG_PAX_SEGMEXEC
97392+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
97393+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97394+ if (!vma_m)
97395+ return -ENOMEM;
97396+ }
97397+#endif
97398+
97399 vma_link(mm, vma, prev, rb_link, rb_parent);
97400+
97401+#ifdef CONFIG_PAX_SEGMEXEC
97402+ if (vma_m)
97403+ BUG_ON(pax_mirror_vma(vma_m, vma));
97404+#endif
97405+
97406 return 0;
97407 }
97408
97409@@ -2838,6 +3348,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
97410 struct rb_node **rb_link, *rb_parent;
97411 bool faulted_in_anon_vma = true;
97412
97413+ BUG_ON(vma->vm_mirror);
97414+
97415 /*
97416 * If anonymous vma has not yet been faulted, update new pgoff
97417 * to match new location, to increase its chance of merging.
97418@@ -2902,6 +3414,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
97419 return NULL;
97420 }
97421
97422+#ifdef CONFIG_PAX_SEGMEXEC
97423+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
97424+{
97425+ struct vm_area_struct *prev_m;
97426+ struct rb_node **rb_link_m, *rb_parent_m;
97427+ struct mempolicy *pol_m;
97428+
97429+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
97430+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
97431+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
97432+ *vma_m = *vma;
97433+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
97434+ if (anon_vma_clone(vma_m, vma))
97435+ return -ENOMEM;
97436+ pol_m = vma_policy(vma_m);
97437+ mpol_get(pol_m);
97438+ set_vma_policy(vma_m, pol_m);
97439+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
97440+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
97441+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
97442+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
97443+ if (vma_m->vm_file)
97444+ get_file(vma_m->vm_file);
97445+ if (vma_m->vm_ops && vma_m->vm_ops->open)
97446+ vma_m->vm_ops->open(vma_m);
97447+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
97448+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
97449+ vma_m->vm_mirror = vma;
97450+ vma->vm_mirror = vma_m;
97451+ return 0;
97452+}
97453+#endif
97454+
97455 /*
97456 * Return true if the calling process may expand its vm space by the passed
97457 * number of pages
97458@@ -2913,6 +3458,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
97459
97460 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
97461
97462+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
97463 if (cur + npages > lim)
97464 return 0;
97465 return 1;
97466@@ -2995,6 +3541,22 @@ static struct vm_area_struct *__install_special_mapping(
97467 vma->vm_start = addr;
97468 vma->vm_end = addr + len;
97469
97470+#ifdef CONFIG_PAX_MPROTECT
97471+ if (mm->pax_flags & MF_PAX_MPROTECT) {
97472+#ifndef CONFIG_PAX_MPROTECT_COMPAT
97473+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
97474+ return ERR_PTR(-EPERM);
97475+ if (!(vm_flags & VM_EXEC))
97476+ vm_flags &= ~VM_MAYEXEC;
97477+#else
97478+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
97479+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
97480+#endif
97481+ else
97482+ vm_flags &= ~VM_MAYWRITE;
97483+ }
97484+#endif
97485+
97486 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
97487 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
97488
97489diff --git a/mm/mprotect.c b/mm/mprotect.c
97490index ace9345..63320dc 100644
97491--- a/mm/mprotect.c
97492+++ b/mm/mprotect.c
97493@@ -24,10 +24,18 @@
97494 #include <linux/migrate.h>
97495 #include <linux/perf_event.h>
97496 #include <linux/ksm.h>
97497+#include <linux/sched/sysctl.h>
97498+
97499+#ifdef CONFIG_PAX_MPROTECT
97500+#include <linux/elf.h>
97501+#include <linux/binfmts.h>
97502+#endif
97503+
97504 #include <asm/uaccess.h>
97505 #include <asm/pgtable.h>
97506 #include <asm/cacheflush.h>
97507 #include <asm/tlbflush.h>
97508+#include <asm/mmu_context.h>
97509
97510 /*
97511 * For a prot_numa update we only hold mmap_sem for read so there is a
97512@@ -251,6 +259,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
97513 return pages;
97514 }
97515
97516+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
97517+/* called while holding the mmap semaphor for writing except stack expansion */
97518+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
97519+{
97520+ unsigned long oldlimit, newlimit = 0UL;
97521+
97522+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
97523+ return;
97524+
97525+ spin_lock(&mm->page_table_lock);
97526+ oldlimit = mm->context.user_cs_limit;
97527+ if ((prot & VM_EXEC) && oldlimit < end)
97528+ /* USER_CS limit moved up */
97529+ newlimit = end;
97530+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
97531+ /* USER_CS limit moved down */
97532+ newlimit = start;
97533+
97534+ if (newlimit) {
97535+ mm->context.user_cs_limit = newlimit;
97536+
97537+#ifdef CONFIG_SMP
97538+ wmb();
97539+ cpus_clear(mm->context.cpu_user_cs_mask);
97540+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
97541+#endif
97542+
97543+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
97544+ }
97545+ spin_unlock(&mm->page_table_lock);
97546+ if (newlimit == end) {
97547+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
97548+
97549+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
97550+ if (is_vm_hugetlb_page(vma))
97551+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
97552+ else
97553+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
97554+ }
97555+}
97556+#endif
97557+
97558 int
97559 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97560 unsigned long start, unsigned long end, unsigned long newflags)
97561@@ -263,11 +313,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97562 int error;
97563 int dirty_accountable = 0;
97564
97565+#ifdef CONFIG_PAX_SEGMEXEC
97566+ struct vm_area_struct *vma_m = NULL;
97567+ unsigned long start_m, end_m;
97568+
97569+ start_m = start + SEGMEXEC_TASK_SIZE;
97570+ end_m = end + SEGMEXEC_TASK_SIZE;
97571+#endif
97572+
97573 if (newflags == oldflags) {
97574 *pprev = vma;
97575 return 0;
97576 }
97577
97578+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
97579+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
97580+
97581+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
97582+ return -ENOMEM;
97583+
97584+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
97585+ return -ENOMEM;
97586+ }
97587+
97588 /*
97589 * If we make a private mapping writable we increase our commit;
97590 * but (without finer accounting) cannot reduce our commit if we
97591@@ -284,6 +352,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
97592 }
97593 }
97594
97595+#ifdef CONFIG_PAX_SEGMEXEC
97596+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
97597+ if (start != vma->vm_start) {
97598+ error = split_vma(mm, vma, start, 1);
97599+ if (error)
97600+ goto fail;
97601+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
97602+ *pprev = (*pprev)->vm_next;
97603+ }
97604+
97605+ if (end != vma->vm_end) {
97606+ error = split_vma(mm, vma, end, 0);
97607+ if (error)
97608+ goto fail;
97609+ }
97610+
97611+ if (pax_find_mirror_vma(vma)) {
97612+ error = __do_munmap(mm, start_m, end_m - start_m);
97613+ if (error)
97614+ goto fail;
97615+ } else {
97616+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
97617+ if (!vma_m) {
97618+ error = -ENOMEM;
97619+ goto fail;
97620+ }
97621+ vma->vm_flags = newflags;
97622+ error = pax_mirror_vma(vma_m, vma);
97623+ if (error) {
97624+ vma->vm_flags = oldflags;
97625+ goto fail;
97626+ }
97627+ }
97628+ }
97629+#endif
97630+
97631 /*
97632 * First try to merge with previous and/or next vma.
97633 */
97634@@ -314,7 +418,19 @@ success:
97635 * vm_flags and vm_page_prot are protected by the mmap_sem
97636 * held in write mode.
97637 */
97638+
97639+#ifdef CONFIG_PAX_SEGMEXEC
97640+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
97641+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
97642+#endif
97643+
97644 vma->vm_flags = newflags;
97645+
97646+#ifdef CONFIG_PAX_MPROTECT
97647+ if (mm->binfmt && mm->binfmt->handle_mprotect)
97648+ mm->binfmt->handle_mprotect(vma, newflags);
97649+#endif
97650+
97651 dirty_accountable = vma_wants_writenotify(vma);
97652 vma_set_page_prot(vma);
97653
97654@@ -350,6 +466,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97655 end = start + len;
97656 if (end <= start)
97657 return -ENOMEM;
97658+
97659+#ifdef CONFIG_PAX_SEGMEXEC
97660+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
97661+ if (end > SEGMEXEC_TASK_SIZE)
97662+ return -EINVAL;
97663+ } else
97664+#endif
97665+
97666+ if (end > TASK_SIZE)
97667+ return -EINVAL;
97668+
97669 if (!arch_validate_prot(prot))
97670 return -EINVAL;
97671
97672@@ -357,7 +484,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97673 /*
97674 * Does the application expect PROT_READ to imply PROT_EXEC:
97675 */
97676- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
97677+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
97678 prot |= PROT_EXEC;
97679
97680 vm_flags = calc_vm_prot_bits(prot);
97681@@ -389,6 +516,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97682 if (start > vma->vm_start)
97683 prev = vma;
97684
97685+#ifdef CONFIG_PAX_MPROTECT
97686+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
97687+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
97688+#endif
97689+
97690 for (nstart = start ; ; ) {
97691 unsigned long newflags;
97692
97693@@ -399,6 +531,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97694
97695 /* newflags >> 4 shift VM_MAY% in place of VM_% */
97696 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
97697+ if (prot & (PROT_WRITE | PROT_EXEC))
97698+ gr_log_rwxmprotect(vma);
97699+
97700+ error = -EACCES;
97701+ goto out;
97702+ }
97703+
97704+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
97705 error = -EACCES;
97706 goto out;
97707 }
97708@@ -413,6 +553,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
97709 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
97710 if (error)
97711 goto out;
97712+
97713+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
97714+
97715 nstart = tmp;
97716
97717 if (nstart < prev->vm_end)
97718diff --git a/mm/mremap.c b/mm/mremap.c
97719index b147f66..98a695a 100644
97720--- a/mm/mremap.c
97721+++ b/mm/mremap.c
97722@@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
97723 continue;
97724 pte = ptep_get_and_clear(mm, old_addr, old_pte);
97725 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
97726+
97727+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
97728+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
97729+ pte = pte_exprotect(pte);
97730+#endif
97731+
97732 pte = move_soft_dirty_pte(pte);
97733 set_pte_at(mm, new_addr, new_pte, pte);
97734 }
97735@@ -345,6 +351,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
97736 if (is_vm_hugetlb_page(vma))
97737 goto Einval;
97738
97739+#ifdef CONFIG_PAX_SEGMEXEC
97740+ if (pax_find_mirror_vma(vma))
97741+ goto Einval;
97742+#endif
97743+
97744 /* We can't remap across vm area boundaries */
97745 if (old_len > vma->vm_end - addr)
97746 goto Efault;
97747@@ -400,20 +411,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
97748 unsigned long ret = -EINVAL;
97749 unsigned long charged = 0;
97750 unsigned long map_flags;
97751+ unsigned long pax_task_size = TASK_SIZE;
97752
97753 if (new_addr & ~PAGE_MASK)
97754 goto out;
97755
97756- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
97757+#ifdef CONFIG_PAX_SEGMEXEC
97758+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
97759+ pax_task_size = SEGMEXEC_TASK_SIZE;
97760+#endif
97761+
97762+ pax_task_size -= PAGE_SIZE;
97763+
97764+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
97765 goto out;
97766
97767 /* Check if the location we're moving into overlaps the
97768 * old location at all, and fail if it does.
97769 */
97770- if ((new_addr <= addr) && (new_addr+new_len) > addr)
97771- goto out;
97772-
97773- if ((addr <= new_addr) && (addr+old_len) > new_addr)
97774+ if (addr + old_len > new_addr && new_addr + new_len > addr)
97775 goto out;
97776
97777 ret = do_munmap(mm, new_addr, new_len);
97778@@ -482,6 +498,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97779 unsigned long ret = -EINVAL;
97780 unsigned long charged = 0;
97781 bool locked = false;
97782+ unsigned long pax_task_size = TASK_SIZE;
97783
97784 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
97785 return ret;
97786@@ -503,6 +520,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97787 if (!new_len)
97788 return ret;
97789
97790+#ifdef CONFIG_PAX_SEGMEXEC
97791+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
97792+ pax_task_size = SEGMEXEC_TASK_SIZE;
97793+#endif
97794+
97795+ pax_task_size -= PAGE_SIZE;
97796+
97797+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
97798+ old_len > pax_task_size || addr > pax_task_size-old_len)
97799+ return ret;
97800+
97801 down_write(&current->mm->mmap_sem);
97802
97803 if (flags & MREMAP_FIXED) {
97804@@ -553,6 +581,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97805 new_addr = addr;
97806 }
97807 ret = addr;
97808+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
97809 goto out;
97810 }
97811 }
97812@@ -576,7 +605,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
97813 goto out;
97814 }
97815
97816+ map_flags = vma->vm_flags;
97817 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
97818+ if (!(ret & ~PAGE_MASK)) {
97819+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
97820+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
97821+ }
97822 }
97823 out:
97824 if (ret & ~PAGE_MASK)
97825diff --git a/mm/nommu.c b/mm/nommu.c
97826index bd1808e..b63d87c 100644
97827--- a/mm/nommu.c
97828+++ b/mm/nommu.c
97829@@ -70,7 +70,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
97830 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
97831 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
97832 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
97833-int heap_stack_gap = 0;
97834
97835 atomic_long_t mmap_pages_allocated;
97836
97837@@ -857,15 +856,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
97838 EXPORT_SYMBOL(find_vma);
97839
97840 /*
97841- * find a VMA
97842- * - we don't extend stack VMAs under NOMMU conditions
97843- */
97844-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
97845-{
97846- return find_vma(mm, addr);
97847-}
97848-
97849-/*
97850 * expand a stack to a given address
97851 * - not supported under NOMMU conditions
97852 */
97853@@ -1572,6 +1562,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
97854
97855 /* most fields are the same, copy all, and then fixup */
97856 *new = *vma;
97857+ INIT_LIST_HEAD(&new->anon_vma_chain);
97858 *region = *vma->vm_region;
97859 new->vm_region = region;
97860
97861@@ -2002,8 +1993,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
97862 }
97863 EXPORT_SYMBOL(generic_file_remap_pages);
97864
97865-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97866- unsigned long addr, void *buf, int len, int write)
97867+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97868+ unsigned long addr, void *buf, size_t len, int write)
97869 {
97870 struct vm_area_struct *vma;
97871
97872@@ -2044,8 +2035,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97873 *
97874 * The caller must hold a reference on @mm.
97875 */
97876-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97877- void *buf, int len, int write)
97878+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
97879+ void *buf, size_t len, int write)
97880 {
97881 return __access_remote_vm(NULL, mm, addr, buf, len, write);
97882 }
97883@@ -2054,7 +2045,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
97884 * Access another process' address space.
97885 * - source/target buffer must be kernel space
97886 */
97887-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
97888+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
97889 {
97890 struct mm_struct *mm;
97891
97892diff --git a/mm/page-writeback.c b/mm/page-writeback.c
97893index 19ceae8..70848ee 100644
97894--- a/mm/page-writeback.c
97895+++ b/mm/page-writeback.c
97896@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
97897 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
97898 * - the bdi dirty thresh drops quickly due to change of JBOD workload
97899 */
97900-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
97901+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
97902 unsigned long thresh,
97903 unsigned long bg_thresh,
97904 unsigned long dirty,
97905diff --git a/mm/page_alloc.c b/mm/page_alloc.c
97906index 616a2c9..0e755f6 100644
97907--- a/mm/page_alloc.c
97908+++ b/mm/page_alloc.c
97909@@ -59,6 +59,7 @@
97910 #include <linux/page-debug-flags.h>
97911 #include <linux/hugetlb.h>
97912 #include <linux/sched/rt.h>
97913+#include <linux/random.h>
97914
97915 #include <asm/sections.h>
97916 #include <asm/tlbflush.h>
97917@@ -356,7 +357,7 @@ out:
97918 * This usage means that zero-order pages may not be compound.
97919 */
97920
97921-static void free_compound_page(struct page *page)
97922+void free_compound_page(struct page *page)
97923 {
97924 __free_pages_ok(page, compound_order(page));
97925 }
97926@@ -741,6 +742,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
97927 int i;
97928 int bad = 0;
97929
97930+#ifdef CONFIG_PAX_MEMORY_SANITIZE
97931+ unsigned long index = 1UL << order;
97932+#endif
97933+
97934 trace_mm_page_free(page, order);
97935 kmemcheck_free_shadow(page, order);
97936
97937@@ -757,6 +762,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
97938 debug_check_no_obj_freed(page_address(page),
97939 PAGE_SIZE << order);
97940 }
97941+
97942+#ifdef CONFIG_PAX_MEMORY_SANITIZE
97943+ for (; index; --index)
97944+ sanitize_highpage(page + index - 1);
97945+#endif
97946+
97947 arch_free_page(page, order);
97948 kernel_map_pages(page, 1 << order, 0);
97949
97950@@ -780,6 +791,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
97951 local_irq_restore(flags);
97952 }
97953
97954+#ifdef CONFIG_PAX_LATENT_ENTROPY
97955+bool __meminitdata extra_latent_entropy;
97956+
97957+static int __init setup_pax_extra_latent_entropy(char *str)
97958+{
97959+ extra_latent_entropy = true;
97960+ return 0;
97961+}
97962+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
97963+
97964+volatile u64 latent_entropy __latent_entropy;
97965+EXPORT_SYMBOL(latent_entropy);
97966+#endif
97967+
97968 void __init __free_pages_bootmem(struct page *page, unsigned int order)
97969 {
97970 unsigned int nr_pages = 1 << order;
97971@@ -795,6 +820,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
97972 __ClearPageReserved(p);
97973 set_page_count(p, 0);
97974
97975+#ifdef CONFIG_PAX_LATENT_ENTROPY
97976+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
97977+ u64 hash = 0;
97978+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
97979+ const u64 *data = lowmem_page_address(page);
97980+
97981+ for (index = 0; index < end; index++)
97982+ hash ^= hash + data[index];
97983+ latent_entropy ^= hash;
97984+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
97985+ }
97986+#endif
97987+
97988 page_zone(page)->managed_pages += nr_pages;
97989 set_page_refcounted(page);
97990 __free_pages(page, order);
97991@@ -923,8 +961,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags)
97992 arch_alloc_page(page, order);
97993 kernel_map_pages(page, 1 << order, 1);
97994
97995+#ifndef CONFIG_PAX_MEMORY_SANITIZE
97996 if (gfp_flags & __GFP_ZERO)
97997 prep_zero_page(page, order, gfp_flags);
97998+#endif
97999
98000 if (order && (gfp_flags & __GFP_COMP))
98001 prep_compound_page(page, order);
98002@@ -1602,7 +1642,7 @@ again:
98003 }
98004
98005 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
98006- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
98007+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
98008 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
98009 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
98010
98011@@ -1923,7 +1963,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
98012 do {
98013 mod_zone_page_state(zone, NR_ALLOC_BATCH,
98014 high_wmark_pages(zone) - low_wmark_pages(zone) -
98015- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
98016+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
98017 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
98018 } while (zone++ != preferred_zone);
98019 }
98020@@ -5698,7 +5738,7 @@ static void __setup_per_zone_wmarks(void)
98021
98022 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
98023 high_wmark_pages(zone) - low_wmark_pages(zone) -
98024- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
98025+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
98026
98027 setup_zone_migrate_reserve(zone);
98028 spin_unlock_irqrestore(&zone->lock, flags);
98029diff --git a/mm/percpu.c b/mm/percpu.c
98030index 014bab6..db5a76f 100644
98031--- a/mm/percpu.c
98032+++ b/mm/percpu.c
98033@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
98034 static unsigned int pcpu_high_unit_cpu __read_mostly;
98035
98036 /* the address of the first chunk which starts with the kernel static area */
98037-void *pcpu_base_addr __read_mostly;
98038+void *pcpu_base_addr __read_only;
98039 EXPORT_SYMBOL_GPL(pcpu_base_addr);
98040
98041 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
98042diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
98043index 5077afc..846c9ef 100644
98044--- a/mm/process_vm_access.c
98045+++ b/mm/process_vm_access.c
98046@@ -13,6 +13,7 @@
98047 #include <linux/uio.h>
98048 #include <linux/sched.h>
98049 #include <linux/highmem.h>
98050+#include <linux/security.h>
98051 #include <linux/ptrace.h>
98052 #include <linux/slab.h>
98053 #include <linux/syscalls.h>
98054@@ -157,19 +158,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
98055 ssize_t iov_len;
98056 size_t total_len = iov_iter_count(iter);
98057
98058+ return -ENOSYS; // PaX: until properly audited
98059+
98060 /*
98061 * Work out how many pages of struct pages we're going to need
98062 * when eventually calling get_user_pages
98063 */
98064 for (i = 0; i < riovcnt; i++) {
98065 iov_len = rvec[i].iov_len;
98066- if (iov_len > 0) {
98067- nr_pages_iov = ((unsigned long)rvec[i].iov_base
98068- + iov_len)
98069- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
98070- / PAGE_SIZE + 1;
98071- nr_pages = max(nr_pages, nr_pages_iov);
98072- }
98073+ if (iov_len <= 0)
98074+ continue;
98075+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
98076+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
98077+ nr_pages = max(nr_pages, nr_pages_iov);
98078 }
98079
98080 if (nr_pages == 0)
98081@@ -197,6 +198,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
98082 goto free_proc_pages;
98083 }
98084
98085+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
98086+ rc = -EPERM;
98087+ goto put_task_struct;
98088+ }
98089+
98090 mm = mm_access(task, PTRACE_MODE_ATTACH);
98091 if (!mm || IS_ERR(mm)) {
98092 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
98093diff --git a/mm/rmap.c b/mm/rmap.c
98094index 3e4c721..a5e3e39 100644
98095--- a/mm/rmap.c
98096+++ b/mm/rmap.c
98097@@ -164,6 +164,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98098 struct anon_vma *anon_vma = vma->anon_vma;
98099 struct anon_vma_chain *avc;
98100
98101+#ifdef CONFIG_PAX_SEGMEXEC
98102+ struct anon_vma_chain *avc_m = NULL;
98103+#endif
98104+
98105 might_sleep();
98106 if (unlikely(!anon_vma)) {
98107 struct mm_struct *mm = vma->vm_mm;
98108@@ -173,6 +177,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98109 if (!avc)
98110 goto out_enomem;
98111
98112+#ifdef CONFIG_PAX_SEGMEXEC
98113+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
98114+ if (!avc_m)
98115+ goto out_enomem_free_avc;
98116+#endif
98117+
98118 anon_vma = find_mergeable_anon_vma(vma);
98119 allocated = NULL;
98120 if (!anon_vma) {
98121@@ -186,6 +196,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98122 /* page_table_lock to protect against threads */
98123 spin_lock(&mm->page_table_lock);
98124 if (likely(!vma->anon_vma)) {
98125+
98126+#ifdef CONFIG_PAX_SEGMEXEC
98127+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
98128+
98129+ if (vma_m) {
98130+ BUG_ON(vma_m->anon_vma);
98131+ vma_m->anon_vma = anon_vma;
98132+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
98133+ avc_m = NULL;
98134+ }
98135+#endif
98136+
98137 vma->anon_vma = anon_vma;
98138 anon_vma_chain_link(vma, avc, anon_vma);
98139 allocated = NULL;
98140@@ -196,12 +218,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
98141
98142 if (unlikely(allocated))
98143 put_anon_vma(allocated);
98144+
98145+#ifdef CONFIG_PAX_SEGMEXEC
98146+ if (unlikely(avc_m))
98147+ anon_vma_chain_free(avc_m);
98148+#endif
98149+
98150 if (unlikely(avc))
98151 anon_vma_chain_free(avc);
98152 }
98153 return 0;
98154
98155 out_enomem_free_avc:
98156+
98157+#ifdef CONFIG_PAX_SEGMEXEC
98158+ if (avc_m)
98159+ anon_vma_chain_free(avc_m);
98160+#endif
98161+
98162 anon_vma_chain_free(avc);
98163 out_enomem:
98164 return -ENOMEM;
98165@@ -237,7 +271,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
98166 * Attach the anon_vmas from src to dst.
98167 * Returns 0 on success, -ENOMEM on failure.
98168 */
98169-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
98170+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
98171 {
98172 struct anon_vma_chain *avc, *pavc;
98173 struct anon_vma *root = NULL;
98174@@ -270,7 +304,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
98175 * the corresponding VMA in the parent process is attached to.
98176 * Returns 0 on success, non-zero on failure.
98177 */
98178-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
98179+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
98180 {
98181 struct anon_vma_chain *avc;
98182 struct anon_vma *anon_vma;
98183@@ -376,8 +410,10 @@ static void anon_vma_ctor(void *data)
98184 void __init anon_vma_init(void)
98185 {
98186 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
98187- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
98188- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
98189+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
98190+ anon_vma_ctor);
98191+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
98192+ SLAB_PANIC|SLAB_NO_SANITIZE);
98193 }
98194
98195 /*
98196diff --git a/mm/shmem.c b/mm/shmem.c
98197index 185836b..d7255a1 100644
98198--- a/mm/shmem.c
98199+++ b/mm/shmem.c
98200@@ -33,7 +33,7 @@
98201 #include <linux/swap.h>
98202 #include <linux/aio.h>
98203
98204-static struct vfsmount *shm_mnt;
98205+struct vfsmount *shm_mnt;
98206
98207 #ifdef CONFIG_SHMEM
98208 /*
98209@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
98210 #define BOGO_DIRENT_SIZE 20
98211
98212 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
98213-#define SHORT_SYMLINK_LEN 128
98214+#define SHORT_SYMLINK_LEN 64
98215
98216 /*
98217 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
98218@@ -2558,6 +2558,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
98219 static int shmem_xattr_validate(const char *name)
98220 {
98221 struct { const char *prefix; size_t len; } arr[] = {
98222+
98223+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
98224+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
98225+#endif
98226+
98227 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
98228 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
98229 };
98230@@ -2613,6 +2618,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
98231 if (err)
98232 return err;
98233
98234+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
98235+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
98236+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
98237+ return -EOPNOTSUPP;
98238+ if (size > 8)
98239+ return -EINVAL;
98240+ }
98241+#endif
98242+
98243 return simple_xattr_set(&info->xattrs, name, value, size, flags);
98244 }
98245
98246@@ -2996,8 +3010,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
98247 int err = -ENOMEM;
98248
98249 /* Round up to L1_CACHE_BYTES to resist false sharing */
98250- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
98251- L1_CACHE_BYTES), GFP_KERNEL);
98252+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
98253 if (!sbinfo)
98254 return -ENOMEM;
98255
98256diff --git a/mm/slab.c b/mm/slab.c
98257index f34e053..78a3839 100644
98258--- a/mm/slab.c
98259+++ b/mm/slab.c
98260@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
98261 if ((x)->max_freeable < i) \
98262 (x)->max_freeable = i; \
98263 } while (0)
98264-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
98265-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
98266-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
98267-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
98268+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
98269+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
98270+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
98271+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
98272+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
98273+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
98274 #else
98275 #define STATS_INC_ACTIVE(x) do { } while (0)
98276 #define STATS_DEC_ACTIVE(x) do { } while (0)
98277@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
98278 #define STATS_INC_ALLOCMISS(x) do { } while (0)
98279 #define STATS_INC_FREEHIT(x) do { } while (0)
98280 #define STATS_INC_FREEMISS(x) do { } while (0)
98281+#define STATS_INC_SANITIZED(x) do { } while (0)
98282+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
98283 #endif
98284
98285 #if DEBUG
98286@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
98287 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
98288 */
98289 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
98290- const struct page *page, void *obj)
98291+ const struct page *page, const void *obj)
98292 {
98293 u32 offset = (obj - page->s_mem);
98294 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
98295@@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
98296 * structures first. Without this, further allocations will bug.
98297 */
98298 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
98299- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
98300+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
98301 slab_state = PARTIAL_NODE;
98302
98303 slab_early_init = 0;
98304@@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
98305
98306 cachep = find_mergeable(size, align, flags, name, ctor);
98307 if (cachep) {
98308- cachep->refcount++;
98309+ atomic_inc(&cachep->refcount);
98310
98311 /*
98312 * Adjust the object sizes so that we clear
98313@@ -3352,6 +3356,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
98314 struct array_cache *ac = cpu_cache_get(cachep);
98315
98316 check_irq_off();
98317+
98318+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98319+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
98320+ STATS_INC_NOT_SANITIZED(cachep);
98321+ else {
98322+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
98323+
98324+ if (cachep->ctor)
98325+ cachep->ctor(objp);
98326+
98327+ STATS_INC_SANITIZED(cachep);
98328+ }
98329+#endif
98330+
98331 kmemleak_free_recursive(objp, cachep->flags);
98332 objp = cache_free_debugcheck(cachep, objp, caller);
98333
98334@@ -3557,6 +3575,7 @@ void kfree(const void *objp)
98335
98336 if (unlikely(ZERO_OR_NULL_PTR(objp)))
98337 return;
98338+ VM_BUG_ON(!virt_addr_valid(objp));
98339 local_irq_save(flags);
98340 kfree_debugcheck(objp);
98341 c = virt_to_cache(objp);
98342@@ -3979,14 +3998,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
98343 }
98344 /* cpu stats */
98345 {
98346- unsigned long allochit = atomic_read(&cachep->allochit);
98347- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
98348- unsigned long freehit = atomic_read(&cachep->freehit);
98349- unsigned long freemiss = atomic_read(&cachep->freemiss);
98350+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
98351+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
98352+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
98353+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
98354
98355 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
98356 allochit, allocmiss, freehit, freemiss);
98357 }
98358+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98359+ {
98360+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
98361+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
98362+
98363+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
98364+ }
98365+#endif
98366 #endif
98367 }
98368
98369@@ -4200,13 +4227,69 @@ static const struct file_operations proc_slabstats_operations = {
98370 static int __init slab_proc_init(void)
98371 {
98372 #ifdef CONFIG_DEBUG_SLAB_LEAK
98373- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
98374+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
98375 #endif
98376 return 0;
98377 }
98378 module_init(slab_proc_init);
98379 #endif
98380
98381+bool is_usercopy_object(const void *ptr)
98382+{
98383+ struct page *page;
98384+ struct kmem_cache *cachep;
98385+
98386+ if (ZERO_OR_NULL_PTR(ptr))
98387+ return false;
98388+
98389+ if (!slab_is_available())
98390+ return false;
98391+
98392+ if (!virt_addr_valid(ptr))
98393+ return false;
98394+
98395+ page = virt_to_head_page(ptr);
98396+
98397+ if (!PageSlab(page))
98398+ return false;
98399+
98400+ cachep = page->slab_cache;
98401+ return cachep->flags & SLAB_USERCOPY;
98402+}
98403+
98404+#ifdef CONFIG_PAX_USERCOPY
98405+const char *check_heap_object(const void *ptr, unsigned long n)
98406+{
98407+ struct page *page;
98408+ struct kmem_cache *cachep;
98409+ unsigned int objnr;
98410+ unsigned long offset;
98411+
98412+ if (ZERO_OR_NULL_PTR(ptr))
98413+ return "<null>";
98414+
98415+ if (!virt_addr_valid(ptr))
98416+ return NULL;
98417+
98418+ page = virt_to_head_page(ptr);
98419+
98420+ if (!PageSlab(page))
98421+ return NULL;
98422+
98423+ cachep = page->slab_cache;
98424+ if (!(cachep->flags & SLAB_USERCOPY))
98425+ return cachep->name;
98426+
98427+ objnr = obj_to_index(cachep, page, ptr);
98428+ BUG_ON(objnr >= cachep->num);
98429+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
98430+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
98431+ return NULL;
98432+
98433+ return cachep->name;
98434+}
98435+#endif
98436+
98437 /**
98438 * ksize - get the actual amount of memory allocated for a given object
98439 * @objp: Pointer to the object
98440diff --git a/mm/slab.h b/mm/slab.h
98441index ab019e6..fbcac34 100644
98442--- a/mm/slab.h
98443+++ b/mm/slab.h
98444@@ -22,7 +22,7 @@ struct kmem_cache {
98445 unsigned int align; /* Alignment as calculated */
98446 unsigned long flags; /* Active flags on the slab */
98447 const char *name; /* Slab name for sysfs */
98448- int refcount; /* Use counter */
98449+ atomic_t refcount; /* Use counter */
98450 void (*ctor)(void *); /* Called on object slot creation */
98451 struct list_head list; /* List of all slab caches on the system */
98452 };
98453@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
98454 /* The slab cache that manages slab cache information */
98455 extern struct kmem_cache *kmem_cache;
98456
98457+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98458+#ifdef CONFIG_X86_64
98459+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
98460+#else
98461+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
98462+#endif
98463+enum pax_sanitize_mode {
98464+ PAX_SANITIZE_SLAB_OFF = 0,
98465+ PAX_SANITIZE_SLAB_FAST,
98466+ PAX_SANITIZE_SLAB_FULL,
98467+};
98468+extern enum pax_sanitize_mode pax_sanitize_slab;
98469+#endif
98470+
98471 unsigned long calculate_alignment(unsigned long flags,
98472 unsigned long align, unsigned long size);
98473
98474@@ -116,7 +130,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
98475
98476 /* Legal flag mask for kmem_cache_create(), for various configurations */
98477 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
98478- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
98479+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
98480+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
98481
98482 #if defined(CONFIG_DEBUG_SLAB)
98483 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
98484@@ -300,6 +315,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
98485 return s;
98486
98487 page = virt_to_head_page(x);
98488+
98489+ BUG_ON(!PageSlab(page));
98490+
98491 cachep = page->slab_cache;
98492 if (slab_equal_or_root(cachep, s))
98493 return cachep;
98494diff --git a/mm/slab_common.c b/mm/slab_common.c
98495index dcdab81..3576646 100644
98496--- a/mm/slab_common.c
98497+++ b/mm/slab_common.c
98498@@ -25,11 +25,35 @@
98499
98500 #include "slab.h"
98501
98502-enum slab_state slab_state;
98503+enum slab_state slab_state __read_only;
98504 LIST_HEAD(slab_caches);
98505 DEFINE_MUTEX(slab_mutex);
98506 struct kmem_cache *kmem_cache;
98507
98508+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98509+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
98510+static int __init pax_sanitize_slab_setup(char *str)
98511+{
98512+ if (!str)
98513+ return 0;
98514+
98515+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
98516+ pr_info("PaX slab sanitization: %s\n", "disabled");
98517+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
98518+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
98519+ pr_info("PaX slab sanitization: %s\n", "fast");
98520+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
98521+ } else if (!strcmp(str, "full")) {
98522+ pr_info("PaX slab sanitization: %s\n", "full");
98523+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
98524+ } else
98525+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
98526+
98527+ return 0;
98528+}
98529+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
98530+#endif
98531+
98532 /*
98533 * Set of flags that will prevent slab merging
98534 */
98535@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
98536 * Merge control. If this is set then no merging of slab caches will occur.
98537 * (Could be removed. This was introduced to pacify the merge skeptics.)
98538 */
98539-static int slab_nomerge;
98540+static int slab_nomerge = 1;
98541
98542 static int __init setup_slab_nomerge(char *str)
98543 {
98544@@ -218,7 +242,7 @@ int slab_unmergeable(struct kmem_cache *s)
98545 /*
98546 * We may have set a slab to be unmergeable during bootstrap.
98547 */
98548- if (s->refcount < 0)
98549+ if (atomic_read(&s->refcount) < 0)
98550 return 1;
98551
98552 return 0;
98553@@ -322,7 +346,7 @@ do_kmem_cache_create(char *name, size_t object_size, size_t size, size_t align,
98554 if (err)
98555 goto out_free_cache;
98556
98557- s->refcount = 1;
98558+ atomic_set(&s->refcount, 1);
98559 list_add(&s->list, &slab_caches);
98560 out:
98561 if (err)
98562@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
98563 */
98564 flags &= CACHE_CREATE_MASK;
98565
98566+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98567+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
98568+ flags |= SLAB_NO_SANITIZE;
98569+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
98570+ flags &= ~SLAB_NO_SANITIZE;
98571+#endif
98572+
98573 s = __kmem_cache_alias(name, size, align, flags, ctor);
98574 if (s)
98575 goto out_unlock;
98576@@ -505,8 +536,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
98577
98578 mutex_lock(&slab_mutex);
98579
98580- s->refcount--;
98581- if (s->refcount)
98582+ if (!atomic_dec_and_test(&s->refcount))
98583 goto out_unlock;
98584
98585 if (memcg_cleanup_cache_params(s) != 0)
98586@@ -526,7 +556,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
98587 rcu_barrier();
98588
98589 memcg_free_cache_params(s);
98590-#ifdef SLAB_SUPPORTS_SYSFS
98591+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
98592 sysfs_slab_remove(s);
98593 #else
98594 slab_kmem_cache_release(s);
98595@@ -582,7 +612,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
98596 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
98597 name, size, err);
98598
98599- s->refcount = -1; /* Exempt from merging for now */
98600+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
98601 }
98602
98603 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
98604@@ -595,7 +625,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
98605
98606 create_boot_cache(s, name, size, flags);
98607 list_add(&s->list, &slab_caches);
98608- s->refcount = 1;
98609+ atomic_set(&s->refcount, 1);
98610 return s;
98611 }
98612
98613@@ -607,6 +637,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
98614 EXPORT_SYMBOL(kmalloc_dma_caches);
98615 #endif
98616
98617+#ifdef CONFIG_PAX_USERCOPY_SLABS
98618+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
98619+EXPORT_SYMBOL(kmalloc_usercopy_caches);
98620+#endif
98621+
98622 /*
98623 * Conversion table for small slabs sizes / 8 to the index in the
98624 * kmalloc array. This is necessary for slabs < 192 since we have non power
98625@@ -671,6 +706,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
98626 return kmalloc_dma_caches[index];
98627
98628 #endif
98629+
98630+#ifdef CONFIG_PAX_USERCOPY_SLABS
98631+ if (unlikely((flags & GFP_USERCOPY)))
98632+ return kmalloc_usercopy_caches[index];
98633+
98634+#endif
98635+
98636 return kmalloc_caches[index];
98637 }
98638
98639@@ -727,7 +769,7 @@ void __init create_kmalloc_caches(unsigned long flags)
98640 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
98641 if (!kmalloc_caches[i]) {
98642 kmalloc_caches[i] = create_kmalloc_cache(NULL,
98643- 1 << i, flags);
98644+ 1 << i, SLAB_USERCOPY | flags);
98645 }
98646
98647 /*
98648@@ -736,10 +778,10 @@ void __init create_kmalloc_caches(unsigned long flags)
98649 * earlier power of two caches
98650 */
98651 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
98652- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
98653+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
98654
98655 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
98656- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
98657+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
98658 }
98659
98660 /* Kmalloc array is now usable */
98661@@ -772,6 +814,23 @@ void __init create_kmalloc_caches(unsigned long flags)
98662 }
98663 }
98664 #endif
98665+
98666+#ifdef CONFIG_PAX_USERCOPY_SLABS
98667+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
98668+ struct kmem_cache *s = kmalloc_caches[i];
98669+
98670+ if (s) {
98671+ int size = kmalloc_size(i);
98672+ char *n = kasprintf(GFP_NOWAIT,
98673+ "usercopy-kmalloc-%d", size);
98674+
98675+ BUG_ON(!n);
98676+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
98677+ size, SLAB_USERCOPY | flags);
98678+ }
98679+ }
98680+#endif
98681+
98682 }
98683 #endif /* !CONFIG_SLOB */
98684
98685@@ -830,6 +889,9 @@ void print_slabinfo_header(struct seq_file *m)
98686 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
98687 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
98688 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
98689+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98690+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
98691+#endif
98692 #endif
98693 seq_putc(m, '\n');
98694 }
98695diff --git a/mm/slob.c b/mm/slob.c
98696index 96a8620..3e7e663 100644
98697--- a/mm/slob.c
98698+++ b/mm/slob.c
98699@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
98700 /*
98701 * Return the size of a slob block.
98702 */
98703-static slobidx_t slob_units(slob_t *s)
98704+static slobidx_t slob_units(const slob_t *s)
98705 {
98706 if (s->units > 0)
98707 return s->units;
98708@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
98709 /*
98710 * Return the next free slob block pointer after this one.
98711 */
98712-static slob_t *slob_next(slob_t *s)
98713+static slob_t *slob_next(const slob_t *s)
98714 {
98715 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
98716 slobidx_t next;
98717@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
98718 /*
98719 * Returns true if s is the last free block in its page.
98720 */
98721-static int slob_last(slob_t *s)
98722+static int slob_last(const slob_t *s)
98723 {
98724 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
98725 }
98726
98727-static void *slob_new_pages(gfp_t gfp, int order, int node)
98728+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
98729 {
98730- void *page;
98731+ struct page *page;
98732
98733 #ifdef CONFIG_NUMA
98734 if (node != NUMA_NO_NODE)
98735@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
98736 if (!page)
98737 return NULL;
98738
98739- return page_address(page);
98740+ __SetPageSlab(page);
98741+ return page;
98742 }
98743
98744-static void slob_free_pages(void *b, int order)
98745+static void slob_free_pages(struct page *sp, int order)
98746 {
98747 if (current->reclaim_state)
98748 current->reclaim_state->reclaimed_slab += 1 << order;
98749- free_pages((unsigned long)b, order);
98750+ __ClearPageSlab(sp);
98751+ page_mapcount_reset(sp);
98752+ sp->private = 0;
98753+ __free_pages(sp, order);
98754 }
98755
98756 /*
98757@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
98758
98759 /* Not enough space: must allocate a new page */
98760 if (!b) {
98761- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
98762- if (!b)
98763+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
98764+ if (!sp)
98765 return NULL;
98766- sp = virt_to_page(b);
98767- __SetPageSlab(sp);
98768+ b = page_address(sp);
98769
98770 spin_lock_irqsave(&slob_lock, flags);
98771 sp->units = SLOB_UNITS(PAGE_SIZE);
98772 sp->freelist = b;
98773+ sp->private = 0;
98774 INIT_LIST_HEAD(&sp->lru);
98775 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
98776 set_slob_page_free(sp, slob_list);
98777@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
98778 /*
98779 * slob_free: entry point into the slob allocator.
98780 */
98781-static void slob_free(void *block, int size)
98782+static void slob_free(struct kmem_cache *c, void *block, int size)
98783 {
98784 struct page *sp;
98785 slob_t *prev, *next, *b = (slob_t *)block;
98786@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
98787 if (slob_page_free(sp))
98788 clear_slob_page_free(sp);
98789 spin_unlock_irqrestore(&slob_lock, flags);
98790- __ClearPageSlab(sp);
98791- page_mapcount_reset(sp);
98792- slob_free_pages(b, 0);
98793+ slob_free_pages(sp, 0);
98794 return;
98795 }
98796
98797+#ifdef CONFIG_PAX_MEMORY_SANITIZE
98798+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
98799+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
98800+#endif
98801+
98802 if (!slob_page_free(sp)) {
98803 /* This slob page is about to become partially free. Easy! */
98804 sp->units = units;
98805@@ -424,11 +431,10 @@ out:
98806 */
98807
98808 static __always_inline void *
98809-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
98810+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
98811 {
98812- unsigned int *m;
98813- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98814- void *ret;
98815+ slob_t *m;
98816+ void *ret = NULL;
98817
98818 gfp &= gfp_allowed_mask;
98819
98820@@ -442,23 +448,41 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
98821
98822 if (!m)
98823 return NULL;
98824- *m = size;
98825+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
98826+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
98827+ m[0].units = size;
98828+ m[1].units = align;
98829 ret = (void *)m + align;
98830
98831 trace_kmalloc_node(caller, ret,
98832 size, size + align, gfp, node);
98833 } else {
98834 unsigned int order = get_order(size);
98835+ struct page *page;
98836
98837 if (likely(order))
98838 gfp |= __GFP_COMP;
98839- ret = slob_new_pages(gfp, order, node);
98840+ page = slob_new_pages(gfp, order, node);
98841+ if (page) {
98842+ ret = page_address(page);
98843+ page->private = size;
98844+ }
98845
98846 trace_kmalloc_node(caller, ret,
98847 size, PAGE_SIZE << order, gfp, node);
98848 }
98849
98850- kmemleak_alloc(ret, size, 1, gfp);
98851+ return ret;
98852+}
98853+
98854+static __always_inline void *
98855+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
98856+{
98857+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98858+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
98859+
98860+ if (!ZERO_OR_NULL_PTR(ret))
98861+ kmemleak_alloc(ret, size, 1, gfp);
98862 return ret;
98863 }
98864
98865@@ -491,34 +515,112 @@ void kfree(const void *block)
98866 return;
98867 kmemleak_free(block);
98868
98869+ VM_BUG_ON(!virt_addr_valid(block));
98870 sp = virt_to_page(block);
98871- if (PageSlab(sp)) {
98872+ VM_BUG_ON(!PageSlab(sp));
98873+ if (!sp->private) {
98874 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98875- unsigned int *m = (unsigned int *)(block - align);
98876- slob_free(m, *m + align);
98877- } else
98878+ slob_t *m = (slob_t *)(block - align);
98879+ slob_free(NULL, m, m[0].units + align);
98880+ } else {
98881+ __ClearPageSlab(sp);
98882+ page_mapcount_reset(sp);
98883+ sp->private = 0;
98884 __free_pages(sp, compound_order(sp));
98885+ }
98886 }
98887 EXPORT_SYMBOL(kfree);
98888
98889+bool is_usercopy_object(const void *ptr)
98890+{
98891+ if (!slab_is_available())
98892+ return false;
98893+
98894+ // PAX: TODO
98895+
98896+ return false;
98897+}
98898+
98899+#ifdef CONFIG_PAX_USERCOPY
98900+const char *check_heap_object(const void *ptr, unsigned long n)
98901+{
98902+ struct page *page;
98903+ const slob_t *free;
98904+ const void *base;
98905+ unsigned long flags;
98906+
98907+ if (ZERO_OR_NULL_PTR(ptr))
98908+ return "<null>";
98909+
98910+ if (!virt_addr_valid(ptr))
98911+ return NULL;
98912+
98913+ page = virt_to_head_page(ptr);
98914+ if (!PageSlab(page))
98915+ return NULL;
98916+
98917+ if (page->private) {
98918+ base = page;
98919+ if (base <= ptr && n <= page->private - (ptr - base))
98920+ return NULL;
98921+ return "<slob>";
98922+ }
98923+
98924+ /* some tricky double walking to find the chunk */
98925+ spin_lock_irqsave(&slob_lock, flags);
98926+ base = (void *)((unsigned long)ptr & PAGE_MASK);
98927+ free = page->freelist;
98928+
98929+ while (!slob_last(free) && (void *)free <= ptr) {
98930+ base = free + slob_units(free);
98931+ free = slob_next(free);
98932+ }
98933+
98934+ while (base < (void *)free) {
98935+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
98936+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
98937+ int offset;
98938+
98939+ if (ptr < base + align)
98940+ break;
98941+
98942+ offset = ptr - base - align;
98943+ if (offset >= m) {
98944+ base += size;
98945+ continue;
98946+ }
98947+
98948+ if (n > m - offset)
98949+ break;
98950+
98951+ spin_unlock_irqrestore(&slob_lock, flags);
98952+ return NULL;
98953+ }
98954+
98955+ spin_unlock_irqrestore(&slob_lock, flags);
98956+ return "<slob>";
98957+}
98958+#endif
98959+
98960 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
98961 size_t ksize(const void *block)
98962 {
98963 struct page *sp;
98964 int align;
98965- unsigned int *m;
98966+ slob_t *m;
98967
98968 BUG_ON(!block);
98969 if (unlikely(block == ZERO_SIZE_PTR))
98970 return 0;
98971
98972 sp = virt_to_page(block);
98973- if (unlikely(!PageSlab(sp)))
98974- return PAGE_SIZE << compound_order(sp);
98975+ VM_BUG_ON(!PageSlab(sp));
98976+ if (sp->private)
98977+ return sp->private;
98978
98979 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
98980- m = (unsigned int *)(block - align);
98981- return SLOB_UNITS(*m) * SLOB_UNIT;
98982+ m = (slob_t *)(block - align);
98983+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
98984 }
98985 EXPORT_SYMBOL(ksize);
98986
98987@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
98988
98989 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
98990 {
98991- void *b;
98992+ void *b = NULL;
98993
98994 flags &= gfp_allowed_mask;
98995
98996 lockdep_trace_alloc(flags);
98997
98998+#ifdef CONFIG_PAX_USERCOPY_SLABS
98999+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
99000+#else
99001 if (c->size < PAGE_SIZE) {
99002 b = slob_alloc(c->size, flags, c->align, node);
99003 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
99004 SLOB_UNITS(c->size) * SLOB_UNIT,
99005 flags, node);
99006 } else {
99007- b = slob_new_pages(flags, get_order(c->size), node);
99008+ struct page *sp;
99009+
99010+ sp = slob_new_pages(flags, get_order(c->size), node);
99011+ if (sp) {
99012+ b = page_address(sp);
99013+ sp->private = c->size;
99014+ }
99015 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
99016 PAGE_SIZE << get_order(c->size),
99017 flags, node);
99018 }
99019+#endif
99020
99021 if (b && c->ctor)
99022 c->ctor(b);
99023@@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
99024 EXPORT_SYMBOL(kmem_cache_alloc_node);
99025 #endif
99026
99027-static void __kmem_cache_free(void *b, int size)
99028+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
99029 {
99030- if (size < PAGE_SIZE)
99031- slob_free(b, size);
99032+ struct page *sp;
99033+
99034+ sp = virt_to_page(b);
99035+ BUG_ON(!PageSlab(sp));
99036+ if (!sp->private)
99037+ slob_free(c, b, size);
99038 else
99039- slob_free_pages(b, get_order(size));
99040+ slob_free_pages(sp, get_order(size));
99041 }
99042
99043 static void kmem_rcu_free(struct rcu_head *head)
99044@@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
99045 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
99046 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
99047
99048- __kmem_cache_free(b, slob_rcu->size);
99049+ __kmem_cache_free(NULL, b, slob_rcu->size);
99050 }
99051
99052 void kmem_cache_free(struct kmem_cache *c, void *b)
99053 {
99054+ int size = c->size;
99055+
99056+#ifdef CONFIG_PAX_USERCOPY_SLABS
99057+ if (size + c->align < PAGE_SIZE) {
99058+ size += c->align;
99059+ b -= c->align;
99060+ }
99061+#endif
99062+
99063 kmemleak_free_recursive(b, c->flags);
99064 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
99065 struct slob_rcu *slob_rcu;
99066- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
99067- slob_rcu->size = c->size;
99068+ slob_rcu = b + (size - sizeof(struct slob_rcu));
99069+ slob_rcu->size = size;
99070 call_rcu(&slob_rcu->head, kmem_rcu_free);
99071 } else {
99072- __kmem_cache_free(b, c->size);
99073+ __kmem_cache_free(c, b, size);
99074 }
99075
99076+#ifdef CONFIG_PAX_USERCOPY_SLABS
99077+ trace_kfree(_RET_IP_, b);
99078+#else
99079 trace_kmem_cache_free(_RET_IP_, b);
99080+#endif
99081+
99082 }
99083 EXPORT_SYMBOL(kmem_cache_free);
99084
99085diff --git a/mm/slub.c b/mm/slub.c
99086index ae7b9f1..7b3fdbe 100644
99087--- a/mm/slub.c
99088+++ b/mm/slub.c
99089@@ -197,7 +197,7 @@ struct track {
99090
99091 enum track_item { TRACK_ALLOC, TRACK_FREE };
99092
99093-#ifdef CONFIG_SYSFS
99094+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99095 static int sysfs_slab_add(struct kmem_cache *);
99096 static int sysfs_slab_alias(struct kmem_cache *, const char *);
99097 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
99098@@ -535,7 +535,7 @@ static void print_track(const char *s, struct track *t)
99099 if (!t->addr)
99100 return;
99101
99102- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
99103+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
99104 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
99105 #ifdef CONFIG_STACKTRACE
99106 {
99107@@ -2645,6 +2645,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
99108
99109 slab_free_hook(s, x);
99110
99111+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99112+ if (!(s->flags & SLAB_NO_SANITIZE)) {
99113+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
99114+ if (s->ctor)
99115+ s->ctor(x);
99116+ }
99117+#endif
99118+
99119 redo:
99120 /*
99121 * Determine the currently cpus per cpu slab.
99122@@ -2982,6 +2990,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
99123 s->inuse = size;
99124
99125 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
99126+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99127+ (!(flags & SLAB_NO_SANITIZE)) ||
99128+#endif
99129 s->ctor)) {
99130 /*
99131 * Relocate free pointer after the object if it is not
99132@@ -3301,6 +3312,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
99133 EXPORT_SYMBOL(__kmalloc_node);
99134 #endif
99135
99136+bool is_usercopy_object(const void *ptr)
99137+{
99138+ struct page *page;
99139+ struct kmem_cache *s;
99140+
99141+ if (ZERO_OR_NULL_PTR(ptr))
99142+ return false;
99143+
99144+ if (!slab_is_available())
99145+ return false;
99146+
99147+ if (!virt_addr_valid(ptr))
99148+ return false;
99149+
99150+ page = virt_to_head_page(ptr);
99151+
99152+ if (!PageSlab(page))
99153+ return false;
99154+
99155+ s = page->slab_cache;
99156+ return s->flags & SLAB_USERCOPY;
99157+}
99158+
99159+#ifdef CONFIG_PAX_USERCOPY
99160+const char *check_heap_object(const void *ptr, unsigned long n)
99161+{
99162+ struct page *page;
99163+ struct kmem_cache *s;
99164+ unsigned long offset;
99165+
99166+ if (ZERO_OR_NULL_PTR(ptr))
99167+ return "<null>";
99168+
99169+ if (!virt_addr_valid(ptr))
99170+ return NULL;
99171+
99172+ page = virt_to_head_page(ptr);
99173+
99174+ if (!PageSlab(page))
99175+ return NULL;
99176+
99177+ s = page->slab_cache;
99178+ if (!(s->flags & SLAB_USERCOPY))
99179+ return s->name;
99180+
99181+ offset = (ptr - page_address(page)) % s->size;
99182+ if (offset <= s->object_size && n <= s->object_size - offset)
99183+ return NULL;
99184+
99185+ return s->name;
99186+}
99187+#endif
99188+
99189 size_t ksize(const void *object)
99190 {
99191 struct page *page;
99192@@ -3329,6 +3393,7 @@ void kfree(const void *x)
99193 if (unlikely(ZERO_OR_NULL_PTR(x)))
99194 return;
99195
99196+ VM_BUG_ON(!virt_addr_valid(x));
99197 page = virt_to_head_page(x);
99198 if (unlikely(!PageSlab(page))) {
99199 BUG_ON(!PageCompound(page));
99200@@ -3624,7 +3689,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99201 int i;
99202 struct kmem_cache *c;
99203
99204- s->refcount++;
99205+ atomic_inc(&s->refcount);
99206
99207 /*
99208 * Adjust the object sizes so that we clear
99209@@ -3643,7 +3708,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
99210 }
99211
99212 if (sysfs_slab_alias(s, name)) {
99213- s->refcount--;
99214+ atomic_dec(&s->refcount);
99215 s = NULL;
99216 }
99217 }
99218@@ -3760,7 +3825,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
99219 }
99220 #endif
99221
99222-#ifdef CONFIG_SYSFS
99223+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99224 static int count_inuse(struct page *page)
99225 {
99226 return page->inuse;
99227@@ -4041,7 +4106,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
99228 len += sprintf(buf + len, "%7ld ", l->count);
99229
99230 if (l->addr)
99231+#ifdef CONFIG_GRKERNSEC_HIDESYM
99232+ len += sprintf(buf + len, "%pS", NULL);
99233+#else
99234 len += sprintf(buf + len, "%pS", (void *)l->addr);
99235+#endif
99236 else
99237 len += sprintf(buf + len, "<not-available>");
99238
99239@@ -4143,12 +4212,12 @@ static void __init resiliency_test(void)
99240 validate_slab_cache(kmalloc_caches[9]);
99241 }
99242 #else
99243-#ifdef CONFIG_SYSFS
99244+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99245 static void resiliency_test(void) {};
99246 #endif
99247 #endif
99248
99249-#ifdef CONFIG_SYSFS
99250+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99251 enum slab_stat_type {
99252 SL_ALL, /* All slabs */
99253 SL_PARTIAL, /* Only partially allocated slabs */
99254@@ -4385,13 +4454,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
99255 {
99256 if (!s->ctor)
99257 return 0;
99258+#ifdef CONFIG_GRKERNSEC_HIDESYM
99259+ return sprintf(buf, "%pS\n", NULL);
99260+#else
99261 return sprintf(buf, "%pS\n", s->ctor);
99262+#endif
99263 }
99264 SLAB_ATTR_RO(ctor);
99265
99266 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
99267 {
99268- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
99269+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
99270 }
99271 SLAB_ATTR_RO(aliases);
99272
99273@@ -4479,6 +4552,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
99274 SLAB_ATTR_RO(cache_dma);
99275 #endif
99276
99277+#ifdef CONFIG_PAX_USERCOPY_SLABS
99278+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
99279+{
99280+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
99281+}
99282+SLAB_ATTR_RO(usercopy);
99283+#endif
99284+
99285+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99286+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
99287+{
99288+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
99289+}
99290+SLAB_ATTR_RO(sanitize);
99291+#endif
99292+
99293 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
99294 {
99295 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
99296@@ -4534,7 +4623,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
99297 * as well as cause other issues like converting a mergeable
99298 * cache into an umergeable one.
99299 */
99300- if (s->refcount > 1)
99301+ if (atomic_read(&s->refcount) > 1)
99302 return -EINVAL;
99303
99304 s->flags &= ~SLAB_TRACE;
99305@@ -4654,7 +4743,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
99306 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
99307 size_t length)
99308 {
99309- if (s->refcount > 1)
99310+ if (atomic_read(&s->refcount) > 1)
99311 return -EINVAL;
99312
99313 s->flags &= ~SLAB_FAILSLAB;
99314@@ -4824,6 +4913,12 @@ static struct attribute *slab_attrs[] = {
99315 #ifdef CONFIG_ZONE_DMA
99316 &cache_dma_attr.attr,
99317 #endif
99318+#ifdef CONFIG_PAX_USERCOPY_SLABS
99319+ &usercopy_attr.attr,
99320+#endif
99321+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99322+ &sanitize_attr.attr,
99323+#endif
99324 #ifdef CONFIG_NUMA
99325 &remote_node_defrag_ratio_attr.attr,
99326 #endif
99327@@ -5068,6 +5163,7 @@ static char *create_unique_id(struct kmem_cache *s)
99328 return name;
99329 }
99330
99331+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99332 static int sysfs_slab_add(struct kmem_cache *s)
99333 {
99334 int err;
99335@@ -5141,6 +5237,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
99336 kobject_del(&s->kobj);
99337 kobject_put(&s->kobj);
99338 }
99339+#endif
99340
99341 /*
99342 * Need to buffer aliases during bootup until sysfs becomes
99343@@ -5154,6 +5251,7 @@ struct saved_alias {
99344
99345 static struct saved_alias *alias_list;
99346
99347+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
99348 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
99349 {
99350 struct saved_alias *al;
99351@@ -5176,6 +5274,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
99352 alias_list = al;
99353 return 0;
99354 }
99355+#endif
99356
99357 static int __init slab_sysfs_init(void)
99358 {
99359diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
99360index 4cba9c2..b4f9fcc 100644
99361--- a/mm/sparse-vmemmap.c
99362+++ b/mm/sparse-vmemmap.c
99363@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
99364 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
99365 if (!p)
99366 return NULL;
99367- pud_populate(&init_mm, pud, p);
99368+ pud_populate_kernel(&init_mm, pud, p);
99369 }
99370 return pud;
99371 }
99372@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
99373 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
99374 if (!p)
99375 return NULL;
99376- pgd_populate(&init_mm, pgd, p);
99377+ pgd_populate_kernel(&init_mm, pgd, p);
99378 }
99379 return pgd;
99380 }
99381diff --git a/mm/sparse.c b/mm/sparse.c
99382index d1b48b6..6e8590e 100644
99383--- a/mm/sparse.c
99384+++ b/mm/sparse.c
99385@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
99386
99387 for (i = 0; i < PAGES_PER_SECTION; i++) {
99388 if (PageHWPoison(&memmap[i])) {
99389- atomic_long_sub(1, &num_poisoned_pages);
99390+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
99391 ClearPageHWPoison(&memmap[i]);
99392 }
99393 }
99394diff --git a/mm/swap.c b/mm/swap.c
99395index 8a12b33..7068e78 100644
99396--- a/mm/swap.c
99397+++ b/mm/swap.c
99398@@ -31,6 +31,7 @@
99399 #include <linux/memcontrol.h>
99400 #include <linux/gfp.h>
99401 #include <linux/uio.h>
99402+#include <linux/hugetlb.h>
99403
99404 #include "internal.h"
99405
99406@@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
99407
99408 __page_cache_release(page);
99409 dtor = get_compound_page_dtor(page);
99410+ if (!PageHuge(page))
99411+ BUG_ON(dtor != free_compound_page);
99412 (*dtor)(page);
99413 }
99414
99415diff --git a/mm/swapfile.c b/mm/swapfile.c
99416index 8798b2e..348f9dd 100644
99417--- a/mm/swapfile.c
99418+++ b/mm/swapfile.c
99419@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
99420
99421 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
99422 /* Activity counter to indicate that a swapon or swapoff has occurred */
99423-static atomic_t proc_poll_event = ATOMIC_INIT(0);
99424+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
99425
99426 static inline unsigned char swap_count(unsigned char ent)
99427 {
99428@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
99429 spin_unlock(&swap_lock);
99430
99431 err = 0;
99432- atomic_inc(&proc_poll_event);
99433+ atomic_inc_unchecked(&proc_poll_event);
99434 wake_up_interruptible(&proc_poll_wait);
99435
99436 out_dput:
99437@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
99438
99439 poll_wait(file, &proc_poll_wait, wait);
99440
99441- if (seq->poll_event != atomic_read(&proc_poll_event)) {
99442- seq->poll_event = atomic_read(&proc_poll_event);
99443+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
99444+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
99445 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
99446 }
99447
99448@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
99449 return ret;
99450
99451 seq = file->private_data;
99452- seq->poll_event = atomic_read(&proc_poll_event);
99453+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
99454 return 0;
99455 }
99456
99457@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
99458 (frontswap_map) ? "FS" : "");
99459
99460 mutex_unlock(&swapon_mutex);
99461- atomic_inc(&proc_poll_event);
99462+ atomic_inc_unchecked(&proc_poll_event);
99463 wake_up_interruptible(&proc_poll_wait);
99464
99465 if (S_ISREG(inode->i_mode))
99466diff --git a/mm/util.c b/mm/util.c
99467index fec39d4..3e60325 100644
99468--- a/mm/util.c
99469+++ b/mm/util.c
99470@@ -195,6 +195,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
99471 void arch_pick_mmap_layout(struct mm_struct *mm)
99472 {
99473 mm->mmap_base = TASK_UNMAPPED_BASE;
99474+
99475+#ifdef CONFIG_PAX_RANDMMAP
99476+ if (mm->pax_flags & MF_PAX_RANDMMAP)
99477+ mm->mmap_base += mm->delta_mmap;
99478+#endif
99479+
99480 mm->get_unmapped_area = arch_get_unmapped_area;
99481 }
99482 #endif
99483@@ -371,6 +377,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
99484 if (!mm->arg_end)
99485 goto out_mm; /* Shh! No looking before we're done */
99486
99487+ if (gr_acl_handle_procpidmem(task))
99488+ goto out_mm;
99489+
99490 len = mm->arg_end - mm->arg_start;
99491
99492 if (len > buflen)
99493diff --git a/mm/vmalloc.c b/mm/vmalloc.c
99494index 90520af..24231aa 100644
99495--- a/mm/vmalloc.c
99496+++ b/mm/vmalloc.c
99497@@ -40,6 +40,21 @@ struct vfree_deferred {
99498 };
99499 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
99500
99501+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99502+struct stack_deferred_llist {
99503+ struct llist_head list;
99504+ void *stack;
99505+ void *lowmem_stack;
99506+};
99507+
99508+struct stack_deferred {
99509+ struct stack_deferred_llist list;
99510+ struct work_struct wq;
99511+};
99512+
99513+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
99514+#endif
99515+
99516 static void __vunmap(const void *, int);
99517
99518 static void free_work(struct work_struct *w)
99519@@ -47,12 +62,30 @@ static void free_work(struct work_struct *w)
99520 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
99521 struct llist_node *llnode = llist_del_all(&p->list);
99522 while (llnode) {
99523- void *p = llnode;
99524+ void *x = llnode;
99525 llnode = llist_next(llnode);
99526- __vunmap(p, 1);
99527+ __vunmap(x, 1);
99528 }
99529 }
99530
99531+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99532+static void unmap_work(struct work_struct *w)
99533+{
99534+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
99535+ struct llist_node *llnode = llist_del_all(&p->list.list);
99536+ while (llnode) {
99537+ struct stack_deferred_llist *x =
99538+ llist_entry((struct llist_head *)llnode,
99539+ struct stack_deferred_llist, list);
99540+ void *stack = ACCESS_ONCE(x->stack);
99541+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
99542+ llnode = llist_next(llnode);
99543+ __vunmap(stack, 0);
99544+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
99545+ }
99546+}
99547+#endif
99548+
99549 /*** Page table manipulation functions ***/
99550
99551 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
99552@@ -61,8 +94,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
99553
99554 pte = pte_offset_kernel(pmd, addr);
99555 do {
99556- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
99557- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
99558+
99559+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99560+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
99561+ BUG_ON(!pte_exec(*pte));
99562+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
99563+ continue;
99564+ }
99565+#endif
99566+
99567+ {
99568+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
99569+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
99570+ }
99571 } while (pte++, addr += PAGE_SIZE, addr != end);
99572 }
99573
99574@@ -122,16 +166,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
99575 pte = pte_alloc_kernel(pmd, addr);
99576 if (!pte)
99577 return -ENOMEM;
99578+
99579+ pax_open_kernel();
99580 do {
99581 struct page *page = pages[*nr];
99582
99583- if (WARN_ON(!pte_none(*pte)))
99584+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99585+ if (pgprot_val(prot) & _PAGE_NX)
99586+#endif
99587+
99588+ if (!pte_none(*pte)) {
99589+ pax_close_kernel();
99590+ WARN_ON(1);
99591 return -EBUSY;
99592- if (WARN_ON(!page))
99593+ }
99594+ if (!page) {
99595+ pax_close_kernel();
99596+ WARN_ON(1);
99597 return -ENOMEM;
99598+ }
99599 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
99600 (*nr)++;
99601 } while (pte++, addr += PAGE_SIZE, addr != end);
99602+ pax_close_kernel();
99603 return 0;
99604 }
99605
99606@@ -141,7 +198,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
99607 pmd_t *pmd;
99608 unsigned long next;
99609
99610- pmd = pmd_alloc(&init_mm, pud, addr);
99611+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
99612 if (!pmd)
99613 return -ENOMEM;
99614 do {
99615@@ -158,7 +215,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
99616 pud_t *pud;
99617 unsigned long next;
99618
99619- pud = pud_alloc(&init_mm, pgd, addr);
99620+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
99621 if (!pud)
99622 return -ENOMEM;
99623 do {
99624@@ -218,6 +275,12 @@ int is_vmalloc_or_module_addr(const void *x)
99625 if (addr >= MODULES_VADDR && addr < MODULES_END)
99626 return 1;
99627 #endif
99628+
99629+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
99630+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
99631+ return 1;
99632+#endif
99633+
99634 return is_vmalloc_addr(x);
99635 }
99636
99637@@ -238,8 +301,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
99638
99639 if (!pgd_none(*pgd)) {
99640 pud_t *pud = pud_offset(pgd, addr);
99641+#ifdef CONFIG_X86
99642+ if (!pud_large(*pud))
99643+#endif
99644 if (!pud_none(*pud)) {
99645 pmd_t *pmd = pmd_offset(pud, addr);
99646+#ifdef CONFIG_X86
99647+ if (!pmd_large(*pmd))
99648+#endif
99649 if (!pmd_none(*pmd)) {
99650 pte_t *ptep, pte;
99651
99652@@ -1183,13 +1252,23 @@ void __init vmalloc_init(void)
99653 for_each_possible_cpu(i) {
99654 struct vmap_block_queue *vbq;
99655 struct vfree_deferred *p;
99656+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99657+ struct stack_deferred *p2;
99658+#endif
99659
99660 vbq = &per_cpu(vmap_block_queue, i);
99661 spin_lock_init(&vbq->lock);
99662 INIT_LIST_HEAD(&vbq->free);
99663+
99664 p = &per_cpu(vfree_deferred, i);
99665 init_llist_head(&p->list);
99666 INIT_WORK(&p->wq, free_work);
99667+
99668+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99669+ p2 = &per_cpu(stack_deferred, i);
99670+ init_llist_head(&p2->list.list);
99671+ INIT_WORK(&p2->wq, unmap_work);
99672+#endif
99673 }
99674
99675 /* Import existing vmlist entries. */
99676@@ -1314,6 +1393,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
99677 struct vm_struct *area;
99678
99679 BUG_ON(in_interrupt());
99680+
99681+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99682+ if (flags & VM_KERNEXEC) {
99683+ if (start != VMALLOC_START || end != VMALLOC_END)
99684+ return NULL;
99685+ start = (unsigned long)MODULES_EXEC_VADDR;
99686+ end = (unsigned long)MODULES_EXEC_END;
99687+ }
99688+#endif
99689+
99690 if (flags & VM_IOREMAP)
99691 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
99692
99693@@ -1519,6 +1608,23 @@ void vunmap(const void *addr)
99694 }
99695 EXPORT_SYMBOL(vunmap);
99696
99697+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
99698+void unmap_process_stacks(struct task_struct *task)
99699+{
99700+ if (unlikely(in_interrupt())) {
99701+ struct stack_deferred *p = &__get_cpu_var(stack_deferred);
99702+ struct stack_deferred_llist *list = task->stack;
99703+ list->stack = task->stack;
99704+ list->lowmem_stack = task->lowmem_stack;
99705+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
99706+ schedule_work(&p->wq);
99707+ } else {
99708+ __vunmap(task->stack, 0);
99709+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
99710+ }
99711+}
99712+#endif
99713+
99714 /**
99715 * vmap - map an array of pages into virtually contiguous space
99716 * @pages: array of page pointers
99717@@ -1539,6 +1645,11 @@ void *vmap(struct page **pages, unsigned int count,
99718 if (count > totalram_pages)
99719 return NULL;
99720
99721+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99722+ if (!(pgprot_val(prot) & _PAGE_NX))
99723+ flags |= VM_KERNEXEC;
99724+#endif
99725+
99726 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
99727 __builtin_return_address(0));
99728 if (!area)
99729@@ -1641,6 +1752,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
99730 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
99731 goto fail;
99732
99733+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
99734+ if (!(pgprot_val(prot) & _PAGE_NX))
99735+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
99736+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
99737+ else
99738+#endif
99739+
99740 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
99741 start, end, node, gfp_mask, caller);
99742 if (!area)
99743@@ -1817,10 +1935,9 @@ EXPORT_SYMBOL(vzalloc_node);
99744 * For tight control over page level allocator and protection flags
99745 * use __vmalloc() instead.
99746 */
99747-
99748 void *vmalloc_exec(unsigned long size)
99749 {
99750- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
99751+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
99752 NUMA_NO_NODE, __builtin_return_address(0));
99753 }
99754
99755@@ -2127,6 +2244,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
99756 {
99757 struct vm_struct *area;
99758
99759+ BUG_ON(vma->vm_mirror);
99760+
99761 size = PAGE_ALIGN(size);
99762
99763 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
99764@@ -2609,7 +2728,11 @@ static int s_show(struct seq_file *m, void *p)
99765 v->addr, v->addr + v->size, v->size);
99766
99767 if (v->caller)
99768+#ifdef CONFIG_GRKERNSEC_HIDESYM
99769+ seq_printf(m, " %pK", v->caller);
99770+#else
99771 seq_printf(m, " %pS", v->caller);
99772+#endif
99773
99774 if (v->nr_pages)
99775 seq_printf(m, " pages=%d", v->nr_pages);
99776diff --git a/mm/vmstat.c b/mm/vmstat.c
99777index 1b12d39..57b29b2 100644
99778--- a/mm/vmstat.c
99779+++ b/mm/vmstat.c
99780@@ -22,6 +22,7 @@
99781 #include <linux/writeback.h>
99782 #include <linux/compaction.h>
99783 #include <linux/mm_inline.h>
99784+#include <linux/grsecurity.h>
99785
99786 #include "internal.h"
99787
99788@@ -81,7 +82,7 @@ void vm_events_fold_cpu(int cpu)
99789 *
99790 * vm_stat contains the global counters
99791 */
99792-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
99793+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
99794 EXPORT_SYMBOL(vm_stat);
99795
99796 #ifdef CONFIG_SMP
99797@@ -433,7 +434,7 @@ static int fold_diff(int *diff)
99798
99799 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
99800 if (diff[i]) {
99801- atomic_long_add(diff[i], &vm_stat[i]);
99802+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
99803 changes++;
99804 }
99805 return changes;
99806@@ -471,7 +472,7 @@ static int refresh_cpu_vm_stats(void)
99807 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
99808 if (v) {
99809
99810- atomic_long_add(v, &zone->vm_stat[i]);
99811+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
99812 global_diff[i] += v;
99813 #ifdef CONFIG_NUMA
99814 /* 3 seconds idle till flush */
99815@@ -535,7 +536,7 @@ void cpu_vm_stats_fold(int cpu)
99816
99817 v = p->vm_stat_diff[i];
99818 p->vm_stat_diff[i] = 0;
99819- atomic_long_add(v, &zone->vm_stat[i]);
99820+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
99821 global_diff[i] += v;
99822 }
99823 }
99824@@ -555,8 +556,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
99825 if (pset->vm_stat_diff[i]) {
99826 int v = pset->vm_stat_diff[i];
99827 pset->vm_stat_diff[i] = 0;
99828- atomic_long_add(v, &zone->vm_stat[i]);
99829- atomic_long_add(v, &vm_stat[i]);
99830+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
99831+ atomic_long_add_unchecked(v, &vm_stat[i]);
99832 }
99833 }
99834 #endif
99835@@ -1189,10 +1190,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
99836 stat_items_size += sizeof(struct vm_event_state);
99837 #endif
99838
99839- v = kmalloc(stat_items_size, GFP_KERNEL);
99840+ v = kzalloc(stat_items_size, GFP_KERNEL);
99841 m->private = v;
99842 if (!v)
99843 return ERR_PTR(-ENOMEM);
99844+
99845+#ifdef CONFIG_GRKERNSEC_PROC_ADD
99846+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
99847+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
99848+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
99849+ && !in_group_p(grsec_proc_gid)
99850+#endif
99851+ )
99852+ return (unsigned long *)m->private + *pos;
99853+#endif
99854+#endif
99855+
99856 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
99857 v[i] = global_page_state(i);
99858 v += NR_VM_ZONE_STAT_ITEMS;
99859@@ -1424,10 +1437,16 @@ static int __init setup_vmstat(void)
99860 cpu_notifier_register_done();
99861 #endif
99862 #ifdef CONFIG_PROC_FS
99863- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
99864- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
99865- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
99866- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
99867+ {
99868+ mode_t gr_mode = S_IRUGO;
99869+#ifdef CONFIG_GRKERNSEC_PROC_ADD
99870+ gr_mode = S_IRUSR;
99871+#endif
99872+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
99873+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
99874+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
99875+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
99876+ }
99877 #endif
99878 return 0;
99879 }
99880diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
99881index 64c6bed..b79a5de 100644
99882--- a/net/8021q/vlan.c
99883+++ b/net/8021q/vlan.c
99884@@ -481,7 +481,7 @@ out:
99885 return NOTIFY_DONE;
99886 }
99887
99888-static struct notifier_block vlan_notifier_block __read_mostly = {
99889+static struct notifier_block vlan_notifier_block = {
99890 .notifier_call = vlan_device_event,
99891 };
99892
99893@@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
99894 err = -EPERM;
99895 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
99896 break;
99897- if ((args.u.name_type >= 0) &&
99898- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
99899+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
99900 struct vlan_net *vn;
99901
99902 vn = net_generic(net, vlan_net_id);
99903diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
99904index 8ac8a5c..991defc 100644
99905--- a/net/8021q/vlan_netlink.c
99906+++ b/net/8021q/vlan_netlink.c
99907@@ -238,7 +238,7 @@ nla_put_failure:
99908 return -EMSGSIZE;
99909 }
99910
99911-struct rtnl_link_ops vlan_link_ops __read_mostly = {
99912+struct rtnl_link_ops vlan_link_ops = {
99913 .kind = "vlan",
99914 .maxtype = IFLA_VLAN_MAX,
99915 .policy = vlan_policy,
99916diff --git a/net/9p/client.c b/net/9p/client.c
99917index e86a9bea..e91f70e 100644
99918--- a/net/9p/client.c
99919+++ b/net/9p/client.c
99920@@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
99921 len - inline_len);
99922 } else {
99923 err = copy_from_user(ename + inline_len,
99924- uidata, len - inline_len);
99925+ (char __force_user *)uidata, len - inline_len);
99926 if (err) {
99927 err = -EFAULT;
99928 goto out_err;
99929@@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
99930 kernel_buf = 1;
99931 indata = data;
99932 } else
99933- indata = (__force char *)udata;
99934+ indata = (__force_kernel char *)udata;
99935 /*
99936 * response header len is 11
99937 * PDU Header(7) + IO Size (4)
99938@@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
99939 kernel_buf = 1;
99940 odata = data;
99941 } else
99942- odata = (char *)udata;
99943+ odata = (char __force_kernel *)udata;
99944 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
99945 P9_ZC_HDR_SZ, kernel_buf, "dqd",
99946 fid->fid, offset, rsize);
99947diff --git a/net/9p/mod.c b/net/9p/mod.c
99948index 6ab36ae..6f1841b 100644
99949--- a/net/9p/mod.c
99950+++ b/net/9p/mod.c
99951@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
99952 void v9fs_register_trans(struct p9_trans_module *m)
99953 {
99954 spin_lock(&v9fs_trans_lock);
99955- list_add_tail(&m->list, &v9fs_trans_list);
99956+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
99957 spin_unlock(&v9fs_trans_lock);
99958 }
99959 EXPORT_SYMBOL(v9fs_register_trans);
99960@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
99961 void v9fs_unregister_trans(struct p9_trans_module *m)
99962 {
99963 spin_lock(&v9fs_trans_lock);
99964- list_del_init(&m->list);
99965+ pax_list_del_init((struct list_head *)&m->list);
99966 spin_unlock(&v9fs_trans_lock);
99967 }
99968 EXPORT_SYMBOL(v9fs_unregister_trans);
99969diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
99970index 80d08f6..de63fd1 100644
99971--- a/net/9p/trans_fd.c
99972+++ b/net/9p/trans_fd.c
99973@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
99974 oldfs = get_fs();
99975 set_fs(get_ds());
99976 /* The cast to a user pointer is valid due to the set_fs() */
99977- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
99978+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
99979 set_fs(oldfs);
99980
99981 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
99982diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
99983index af46bc4..f9adfcd 100644
99984--- a/net/appletalk/atalk_proc.c
99985+++ b/net/appletalk/atalk_proc.c
99986@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
99987 struct proc_dir_entry *p;
99988 int rc = -ENOMEM;
99989
99990- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
99991+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
99992 if (!atalk_proc_dir)
99993 goto out;
99994
99995diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
99996index 876fbe8..8bbea9f 100644
99997--- a/net/atm/atm_misc.c
99998+++ b/net/atm/atm_misc.c
99999@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
100000 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
100001 return 1;
100002 atm_return(vcc, truesize);
100003- atomic_inc(&vcc->stats->rx_drop);
100004+ atomic_inc_unchecked(&vcc->stats->rx_drop);
100005 return 0;
100006 }
100007 EXPORT_SYMBOL(atm_charge);
100008@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
100009 }
100010 }
100011 atm_return(vcc, guess);
100012- atomic_inc(&vcc->stats->rx_drop);
100013+ atomic_inc_unchecked(&vcc->stats->rx_drop);
100014 return NULL;
100015 }
100016 EXPORT_SYMBOL(atm_alloc_charge);
100017@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
100018
100019 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
100020 {
100021-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
100022+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
100023 __SONET_ITEMS
100024 #undef __HANDLE_ITEM
100025 }
100026@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
100027
100028 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
100029 {
100030-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
100031+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
100032 __SONET_ITEMS
100033 #undef __HANDLE_ITEM
100034 }
100035diff --git a/net/atm/lec.c b/net/atm/lec.c
100036index 4b98f89..5a2f6cb 100644
100037--- a/net/atm/lec.c
100038+++ b/net/atm/lec.c
100039@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
100040 }
100041
100042 static struct lane2_ops lane2_ops = {
100043- lane2_resolve, /* resolve, spec 3.1.3 */
100044- lane2_associate_req, /* associate_req, spec 3.1.4 */
100045- NULL /* associate indicator, spec 3.1.5 */
100046+ .resolve = lane2_resolve,
100047+ .associate_req = lane2_associate_req,
100048+ .associate_indicator = NULL
100049 };
100050
100051 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
100052diff --git a/net/atm/lec.h b/net/atm/lec.h
100053index 4149db1..f2ab682 100644
100054--- a/net/atm/lec.h
100055+++ b/net/atm/lec.h
100056@@ -48,7 +48,7 @@ struct lane2_ops {
100057 const u8 *tlvs, u32 sizeoftlvs);
100058 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
100059 const u8 *tlvs, u32 sizeoftlvs);
100060-};
100061+} __no_const;
100062
100063 /*
100064 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
100065diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
100066index d1b2d9a..d549f7f 100644
100067--- a/net/atm/mpoa_caches.c
100068+++ b/net/atm/mpoa_caches.c
100069@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
100070
100071
100072 static struct in_cache_ops ingress_ops = {
100073- in_cache_add_entry, /* add_entry */
100074- in_cache_get, /* get */
100075- in_cache_get_with_mask, /* get_with_mask */
100076- in_cache_get_by_vcc, /* get_by_vcc */
100077- in_cache_put, /* put */
100078- in_cache_remove_entry, /* remove_entry */
100079- cache_hit, /* cache_hit */
100080- clear_count_and_expired, /* clear_count */
100081- check_resolving_entries, /* check_resolving */
100082- refresh_entries, /* refresh */
100083- in_destroy_cache /* destroy_cache */
100084+ .add_entry = in_cache_add_entry,
100085+ .get = in_cache_get,
100086+ .get_with_mask = in_cache_get_with_mask,
100087+ .get_by_vcc = in_cache_get_by_vcc,
100088+ .put = in_cache_put,
100089+ .remove_entry = in_cache_remove_entry,
100090+ .cache_hit = cache_hit,
100091+ .clear_count = clear_count_and_expired,
100092+ .check_resolving = check_resolving_entries,
100093+ .refresh = refresh_entries,
100094+ .destroy_cache = in_destroy_cache
100095 };
100096
100097 static struct eg_cache_ops egress_ops = {
100098- eg_cache_add_entry, /* add_entry */
100099- eg_cache_get_by_cache_id, /* get_by_cache_id */
100100- eg_cache_get_by_tag, /* get_by_tag */
100101- eg_cache_get_by_vcc, /* get_by_vcc */
100102- eg_cache_get_by_src_ip, /* get_by_src_ip */
100103- eg_cache_put, /* put */
100104- eg_cache_remove_entry, /* remove_entry */
100105- update_eg_cache_entry, /* update */
100106- clear_expired, /* clear_expired */
100107- eg_destroy_cache /* destroy_cache */
100108+ .add_entry = eg_cache_add_entry,
100109+ .get_by_cache_id = eg_cache_get_by_cache_id,
100110+ .get_by_tag = eg_cache_get_by_tag,
100111+ .get_by_vcc = eg_cache_get_by_vcc,
100112+ .get_by_src_ip = eg_cache_get_by_src_ip,
100113+ .put = eg_cache_put,
100114+ .remove_entry = eg_cache_remove_entry,
100115+ .update = update_eg_cache_entry,
100116+ .clear_expired = clear_expired,
100117+ .destroy_cache = eg_destroy_cache
100118 };
100119
100120
100121diff --git a/net/atm/proc.c b/net/atm/proc.c
100122index bbb6461..cf04016 100644
100123--- a/net/atm/proc.c
100124+++ b/net/atm/proc.c
100125@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
100126 const struct k_atm_aal_stats *stats)
100127 {
100128 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
100129- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
100130- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
100131- atomic_read(&stats->rx_drop));
100132+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
100133+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
100134+ atomic_read_unchecked(&stats->rx_drop));
100135 }
100136
100137 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
100138diff --git a/net/atm/resources.c b/net/atm/resources.c
100139index 0447d5d..3cf4728 100644
100140--- a/net/atm/resources.c
100141+++ b/net/atm/resources.c
100142@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
100143 static void copy_aal_stats(struct k_atm_aal_stats *from,
100144 struct atm_aal_stats *to)
100145 {
100146-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
100147+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
100148 __AAL_STAT_ITEMS
100149 #undef __HANDLE_ITEM
100150 }
100151@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
100152 static void subtract_aal_stats(struct k_atm_aal_stats *from,
100153 struct atm_aal_stats *to)
100154 {
100155-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
100156+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
100157 __AAL_STAT_ITEMS
100158 #undef __HANDLE_ITEM
100159 }
100160diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
100161index 919a5ce..cc6b444 100644
100162--- a/net/ax25/sysctl_net_ax25.c
100163+++ b/net/ax25/sysctl_net_ax25.c
100164@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
100165 {
100166 char path[sizeof("net/ax25/") + IFNAMSIZ];
100167 int k;
100168- struct ctl_table *table;
100169+ ctl_table_no_const *table;
100170
100171 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
100172 if (!table)
100173diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
100174index 1e80539..676c37a 100644
100175--- a/net/batman-adv/bat_iv_ogm.c
100176+++ b/net/batman-adv/bat_iv_ogm.c
100177@@ -313,7 +313,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
100178
100179 /* randomize initial seqno to avoid collision */
100180 get_random_bytes(&random_seqno, sizeof(random_seqno));
100181- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
100182+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
100183
100184 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
100185 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
100186@@ -918,9 +918,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
100187 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
100188
100189 /* change sequence number to network order */
100190- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
100191+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
100192 batadv_ogm_packet->seqno = htonl(seqno);
100193- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
100194+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
100195
100196 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
100197
100198@@ -1597,7 +1597,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
100199 return;
100200
100201 /* could be changed by schedule_own_packet() */
100202- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
100203+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
100204
100205 if (ogm_packet->flags & BATADV_DIRECTLINK)
100206 has_directlink_flag = true;
100207diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
100208index fc1835c..eead856 100644
100209--- a/net/batman-adv/fragmentation.c
100210+++ b/net/batman-adv/fragmentation.c
100211@@ -450,7 +450,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
100212 frag_header.packet_type = BATADV_UNICAST_FRAG;
100213 frag_header.version = BATADV_COMPAT_VERSION;
100214 frag_header.ttl = BATADV_TTL;
100215- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
100216+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
100217 frag_header.reserved = 0;
100218 frag_header.no = 0;
100219 frag_header.total_size = htons(skb->len);
100220diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
100221index 5467955..75ad4e3 100644
100222--- a/net/batman-adv/soft-interface.c
100223+++ b/net/batman-adv/soft-interface.c
100224@@ -296,7 +296,7 @@ send:
100225 primary_if->net_dev->dev_addr);
100226
100227 /* set broadcast sequence number */
100228- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
100229+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
100230 bcast_packet->seqno = htonl(seqno);
100231
100232 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
100233@@ -761,7 +761,7 @@ static int batadv_softif_init_late(struct net_device *dev)
100234 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
100235
100236 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
100237- atomic_set(&bat_priv->bcast_seqno, 1);
100238+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
100239 atomic_set(&bat_priv->tt.vn, 0);
100240 atomic_set(&bat_priv->tt.local_changes, 0);
100241 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
100242@@ -775,7 +775,7 @@ static int batadv_softif_init_late(struct net_device *dev)
100243
100244 /* randomize initial seqno to avoid collision */
100245 get_random_bytes(&random_seqno, sizeof(random_seqno));
100246- atomic_set(&bat_priv->frag_seqno, random_seqno);
100247+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
100248
100249 bat_priv->primary_if = NULL;
100250 bat_priv->num_ifaces = 0;
100251@@ -983,7 +983,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
100252 return 0;
100253 }
100254
100255-struct rtnl_link_ops batadv_link_ops __read_mostly = {
100256+struct rtnl_link_ops batadv_link_ops = {
100257 .kind = "batadv",
100258 .priv_size = sizeof(struct batadv_priv),
100259 .setup = batadv_softif_init_early,
100260diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
100261index 8854c05..ee5d5497 100644
100262--- a/net/batman-adv/types.h
100263+++ b/net/batman-adv/types.h
100264@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
100265 struct batadv_hard_iface_bat_iv {
100266 unsigned char *ogm_buff;
100267 int ogm_buff_len;
100268- atomic_t ogm_seqno;
100269+ atomic_unchecked_t ogm_seqno;
100270 };
100271
100272 /**
100273@@ -768,7 +768,7 @@ struct batadv_priv {
100274 atomic_t bonding;
100275 atomic_t fragmentation;
100276 atomic_t packet_size_max;
100277- atomic_t frag_seqno;
100278+ atomic_unchecked_t frag_seqno;
100279 #ifdef CONFIG_BATMAN_ADV_BLA
100280 atomic_t bridge_loop_avoidance;
100281 #endif
100282@@ -787,7 +787,7 @@ struct batadv_priv {
100283 #endif
100284 uint32_t isolation_mark;
100285 uint32_t isolation_mark_mask;
100286- atomic_t bcast_seqno;
100287+ atomic_unchecked_t bcast_seqno;
100288 atomic_t bcast_queue_left;
100289 atomic_t batman_queue_left;
100290 char num_ifaces;
100291diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c
100292index c2e0d14..bfa852b 100644
100293--- a/net/bluetooth/6lowpan.c
100294+++ b/net/bluetooth/6lowpan.c
100295@@ -367,7 +367,6 @@ static int recv_pkt(struct sk_buff *skb, struct net_device *dev,
100296
100297 drop:
100298 dev->stats.rx_dropped++;
100299- kfree_skb(skb);
100300 return NET_RX_DROP;
100301 }
100302
100303diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
100304index 85bcc21..ce82722d 100644
100305--- a/net/bluetooth/bnep/core.c
100306+++ b/net/bluetooth/bnep/core.c
100307@@ -533,6 +533,9 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
100308
100309 BT_DBG("");
100310
100311+ if (!l2cap_is_socket(sock))
100312+ return -EBADFD;
100313+
100314 baswap((void *) dst, &l2cap_pi(sock->sk)->chan->dst);
100315 baswap((void *) src, &l2cap_pi(sock->sk)->chan->src);
100316
100317diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
100318index 67fe5e8..278a194 100644
100319--- a/net/bluetooth/cmtp/core.c
100320+++ b/net/bluetooth/cmtp/core.c
100321@@ -334,6 +334,9 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
100322
100323 BT_DBG("");
100324
100325+ if (!l2cap_is_socket(sock))
100326+ return -EBADFD;
100327+
100328 session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL);
100329 if (!session)
100330 return -ENOMEM;
100331diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
100332index 115f149..f0ba286 100644
100333--- a/net/bluetooth/hci_sock.c
100334+++ b/net/bluetooth/hci_sock.c
100335@@ -1067,7 +1067,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
100336 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
100337 }
100338
100339- len = min_t(unsigned int, len, sizeof(uf));
100340+ len = min((size_t)len, sizeof(uf));
100341 if (copy_from_user(&uf, optval, len)) {
100342 err = -EFAULT;
100343 break;
100344diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
100345index 1b7d605..02ebd10 100644
100346--- a/net/bluetooth/hidp/core.c
100347+++ b/net/bluetooth/hidp/core.c
100348@@ -1318,13 +1318,14 @@ int hidp_connection_add(struct hidp_connadd_req *req,
100349 {
100350 struct hidp_session *session;
100351 struct l2cap_conn *conn;
100352- struct l2cap_chan *chan = l2cap_pi(ctrl_sock->sk)->chan;
100353+ struct l2cap_chan *chan;
100354 int ret;
100355
100356 ret = hidp_verify_sockets(ctrl_sock, intr_sock);
100357 if (ret)
100358 return ret;
100359
100360+ chan = l2cap_pi(ctrl_sock->sk)->chan;
100361 conn = NULL;
100362 l2cap_chan_lock(chan);
100363 if (chan->conn)
100364diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
100365index b6f9777..36d3039 100644
100366--- a/net/bluetooth/l2cap_core.c
100367+++ b/net/bluetooth/l2cap_core.c
100368@@ -3512,8 +3512,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
100369 break;
100370
100371 case L2CAP_CONF_RFC:
100372- if (olen == sizeof(rfc))
100373- memcpy(&rfc, (void *)val, olen);
100374+ if (olen != sizeof(rfc))
100375+ break;
100376+
100377+ memcpy(&rfc, (void *)val, olen);
100378
100379 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
100380 rfc.mode != chan->mode)
100381diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
100382index 31f106e..323f606 100644
100383--- a/net/bluetooth/l2cap_sock.c
100384+++ b/net/bluetooth/l2cap_sock.c
100385@@ -628,7 +628,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
100386 struct sock *sk = sock->sk;
100387 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
100388 struct l2cap_options opts;
100389- int len, err = 0;
100390+ int err = 0;
100391+ size_t len = optlen;
100392 u32 opt;
100393
100394 BT_DBG("sk %p", sk);
100395@@ -655,7 +656,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
100396 opts.max_tx = chan->max_tx;
100397 opts.txwin_size = chan->tx_win;
100398
100399- len = min_t(unsigned int, sizeof(opts), optlen);
100400+ len = min(sizeof(opts), len);
100401 if (copy_from_user((char *) &opts, optval, len)) {
100402 err = -EFAULT;
100403 break;
100404@@ -742,7 +743,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100405 struct bt_security sec;
100406 struct bt_power pwr;
100407 struct l2cap_conn *conn;
100408- int len, err = 0;
100409+ int err = 0;
100410+ size_t len = optlen;
100411 u32 opt;
100412
100413 BT_DBG("sk %p", sk);
100414@@ -766,7 +768,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100415
100416 sec.level = BT_SECURITY_LOW;
100417
100418- len = min_t(unsigned int, sizeof(sec), optlen);
100419+ len = min(sizeof(sec), len);
100420 if (copy_from_user((char *) &sec, optval, len)) {
100421 err = -EFAULT;
100422 break;
100423@@ -862,7 +864,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
100424
100425 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
100426
100427- len = min_t(unsigned int, sizeof(pwr), optlen);
100428+ len = min(sizeof(pwr), len);
100429 if (copy_from_user((char *) &pwr, optval, len)) {
100430 err = -EFAULT;
100431 break;
100432diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
100433index 8bbbb5e..6fc0950 100644
100434--- a/net/bluetooth/rfcomm/sock.c
100435+++ b/net/bluetooth/rfcomm/sock.c
100436@@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
100437 struct sock *sk = sock->sk;
100438 struct bt_security sec;
100439 int err = 0;
100440- size_t len;
100441+ size_t len = optlen;
100442 u32 opt;
100443
100444 BT_DBG("sk %p", sk);
100445@@ -709,7 +709,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
100446
100447 sec.level = BT_SECURITY_LOW;
100448
100449- len = min_t(unsigned int, sizeof(sec), optlen);
100450+ len = min(sizeof(sec), len);
100451 if (copy_from_user((char *) &sec, optval, len)) {
100452 err = -EFAULT;
100453 break;
100454diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
100455index 8e385a0..a5bdd8e 100644
100456--- a/net/bluetooth/rfcomm/tty.c
100457+++ b/net/bluetooth/rfcomm/tty.c
100458@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
100459 BT_DBG("tty %p id %d", tty, tty->index);
100460
100461 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
100462- dev->channel, dev->port.count);
100463+ dev->channel, atomic_read(&dev->port.count));
100464
100465 err = tty_port_open(&dev->port, tty, filp);
100466 if (err)
100467@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
100468 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
100469
100470 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
100471- dev->port.count);
100472+ atomic_read(&dev->port.count));
100473
100474 tty_port_close(&dev->port, tty, filp);
100475 }
100476diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
100477index e5ec470..cbfabd1 100644
100478--- a/net/bridge/br_netlink.c
100479+++ b/net/bridge/br_netlink.c
100480@@ -564,7 +564,7 @@ static struct rtnl_af_ops br_af_ops = {
100481 .get_link_af_size = br_get_link_af_size,
100482 };
100483
100484-struct rtnl_link_ops br_link_ops __read_mostly = {
100485+struct rtnl_link_ops br_link_ops = {
100486 .kind = "bridge",
100487 .priv_size = sizeof(struct net_bridge),
100488 .setup = br_dev_setup,
100489diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
100490index d9a8c05..8dadc6c6 100644
100491--- a/net/bridge/netfilter/ebtables.c
100492+++ b/net/bridge/netfilter/ebtables.c
100493@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
100494 tmp.valid_hooks = t->table->valid_hooks;
100495 }
100496 mutex_unlock(&ebt_mutex);
100497- if (copy_to_user(user, &tmp, *len) != 0) {
100498+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100499 BUGPRINT("c2u Didn't work\n");
100500 ret = -EFAULT;
100501 break;
100502@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
100503 goto out;
100504 tmp.valid_hooks = t->valid_hooks;
100505
100506- if (copy_to_user(user, &tmp, *len) != 0) {
100507+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100508 ret = -EFAULT;
100509 break;
100510 }
100511@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
100512 tmp.entries_size = t->table->entries_size;
100513 tmp.valid_hooks = t->table->valid_hooks;
100514
100515- if (copy_to_user(user, &tmp, *len) != 0) {
100516+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
100517 ret = -EFAULT;
100518 break;
100519 }
100520diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
100521index f5afda1..dcf770a 100644
100522--- a/net/caif/cfctrl.c
100523+++ b/net/caif/cfctrl.c
100524@@ -10,6 +10,7 @@
100525 #include <linux/spinlock.h>
100526 #include <linux/slab.h>
100527 #include <linux/pkt_sched.h>
100528+#include <linux/sched.h>
100529 #include <net/caif/caif_layer.h>
100530 #include <net/caif/cfpkt.h>
100531 #include <net/caif/cfctrl.h>
100532@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
100533 memset(&dev_info, 0, sizeof(dev_info));
100534 dev_info.id = 0xff;
100535 cfsrvl_init(&this->serv, 0, &dev_info, false);
100536- atomic_set(&this->req_seq_no, 1);
100537- atomic_set(&this->rsp_seq_no, 1);
100538+ atomic_set_unchecked(&this->req_seq_no, 1);
100539+ atomic_set_unchecked(&this->rsp_seq_no, 1);
100540 this->serv.layer.receive = cfctrl_recv;
100541 sprintf(this->serv.layer.name, "ctrl");
100542 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
100543@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
100544 struct cfctrl_request_info *req)
100545 {
100546 spin_lock_bh(&ctrl->info_list_lock);
100547- atomic_inc(&ctrl->req_seq_no);
100548- req->sequence_no = atomic_read(&ctrl->req_seq_no);
100549+ atomic_inc_unchecked(&ctrl->req_seq_no);
100550+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
100551 list_add_tail(&req->list, &ctrl->list);
100552 spin_unlock_bh(&ctrl->info_list_lock);
100553 }
100554@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
100555 if (p != first)
100556 pr_warn("Requests are not received in order\n");
100557
100558- atomic_set(&ctrl->rsp_seq_no,
100559+ atomic_set_unchecked(&ctrl->rsp_seq_no,
100560 p->sequence_no);
100561 list_del(&p->list);
100562 goto out;
100563diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
100564index 4589ff67..46d6b8f 100644
100565--- a/net/caif/chnl_net.c
100566+++ b/net/caif/chnl_net.c
100567@@ -516,7 +516,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
100568 };
100569
100570
100571-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
100572+static struct rtnl_link_ops ipcaif_link_ops = {
100573 .kind = "caif",
100574 .priv_size = sizeof(struct chnl_net),
100575 .setup = ipcaif_net_setup,
100576diff --git a/net/can/af_can.c b/net/can/af_can.c
100577index ce82337..5d17b4d 100644
100578--- a/net/can/af_can.c
100579+++ b/net/can/af_can.c
100580@@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
100581 };
100582
100583 /* notifier block for netdevice event */
100584-static struct notifier_block can_netdev_notifier __read_mostly = {
100585+static struct notifier_block can_netdev_notifier = {
100586 .notifier_call = can_notifier,
100587 };
100588
100589diff --git a/net/can/bcm.c b/net/can/bcm.c
100590index dcb75c0..24b1b43 100644
100591--- a/net/can/bcm.c
100592+++ b/net/can/bcm.c
100593@@ -1624,7 +1624,7 @@ static int __init bcm_module_init(void)
100594 }
100595
100596 /* create /proc/net/can-bcm directory */
100597- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
100598+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
100599 return 0;
100600 }
100601
100602diff --git a/net/can/gw.c b/net/can/gw.c
100603index 050a211..bb9fe33 100644
100604--- a/net/can/gw.c
100605+++ b/net/can/gw.c
100606@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
100607 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
100608
100609 static HLIST_HEAD(cgw_list);
100610-static struct notifier_block notifier;
100611
100612 static struct kmem_cache *cgw_cache __read_mostly;
100613
100614@@ -947,6 +946,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
100615 return err;
100616 }
100617
100618+static struct notifier_block notifier = {
100619+ .notifier_call = cgw_notifier
100620+};
100621+
100622 static __init int cgw_module_init(void)
100623 {
100624 /* sanitize given module parameter */
100625@@ -962,7 +965,6 @@ static __init int cgw_module_init(void)
100626 return -ENOMEM;
100627
100628 /* set notifier */
100629- notifier.notifier_call = cgw_notifier;
100630 register_netdevice_notifier(&notifier);
100631
100632 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
100633diff --git a/net/can/proc.c b/net/can/proc.c
100634index 1a19b98..df2b4ec 100644
100635--- a/net/can/proc.c
100636+++ b/net/can/proc.c
100637@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
100638 void can_init_proc(void)
100639 {
100640 /* create /proc/net/can directory */
100641- can_dir = proc_mkdir("can", init_net.proc_net);
100642+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
100643
100644 if (!can_dir) {
100645 printk(KERN_INFO "can: failed to create /proc/net/can . "
100646diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
100647index 8d1653c..77ad145 100644
100648--- a/net/ceph/messenger.c
100649+++ b/net/ceph/messenger.c
100650@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
100651 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
100652
100653 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
100654-static atomic_t addr_str_seq = ATOMIC_INIT(0);
100655+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
100656
100657 static struct page *zero_page; /* used in certain error cases */
100658
100659@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
100660 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
100661 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
100662
100663- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
100664+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
100665 s = addr_str[i];
100666
100667 switch (ss->ss_family) {
100668diff --git a/net/compat.c b/net/compat.c
100669index bc8aeef..f9c070c 100644
100670--- a/net/compat.c
100671+++ b/net/compat.c
100672@@ -73,9 +73,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
100673 return -EFAULT;
100674 if (kmsg->msg_namelen > sizeof(struct sockaddr_storage))
100675 kmsg->msg_namelen = sizeof(struct sockaddr_storage);
100676- kmsg->msg_name = compat_ptr(tmp1);
100677- kmsg->msg_iov = compat_ptr(tmp2);
100678- kmsg->msg_control = compat_ptr(tmp3);
100679+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
100680+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
100681+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
100682 return 0;
100683 }
100684
100685@@ -87,7 +87,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100686
100687 if (kern_msg->msg_name && kern_msg->msg_namelen) {
100688 if (mode == VERIFY_READ) {
100689- int err = move_addr_to_kernel(kern_msg->msg_name,
100690+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
100691 kern_msg->msg_namelen,
100692 kern_address);
100693 if (err < 0)
100694@@ -100,7 +100,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100695 }
100696
100697 tot_len = iov_from_user_compat_to_kern(kern_iov,
100698- (struct compat_iovec __user *)kern_msg->msg_iov,
100699+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
100700 kern_msg->msg_iovlen);
100701 if (tot_len >= 0)
100702 kern_msg->msg_iov = kern_iov;
100703@@ -120,20 +120,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
100704
100705 #define CMSG_COMPAT_FIRSTHDR(msg) \
100706 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
100707- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
100708+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
100709 (struct compat_cmsghdr __user *)NULL)
100710
100711 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
100712 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
100713 (ucmlen) <= (unsigned long) \
100714 ((mhdr)->msg_controllen - \
100715- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
100716+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
100717
100718 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
100719 struct compat_cmsghdr __user *cmsg, int cmsg_len)
100720 {
100721 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
100722- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
100723+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
100724 msg->msg_controllen)
100725 return NULL;
100726 return (struct compat_cmsghdr __user *)ptr;
100727@@ -223,7 +223,7 @@ Efault:
100728
100729 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
100730 {
100731- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
100732+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
100733 struct compat_cmsghdr cmhdr;
100734 struct compat_timeval ctv;
100735 struct compat_timespec cts[3];
100736@@ -279,7 +279,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
100737
100738 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
100739 {
100740- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
100741+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
100742 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
100743 int fdnum = scm->fp->count;
100744 struct file **fp = scm->fp->fp;
100745@@ -367,7 +367,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
100746 return -EFAULT;
100747 old_fs = get_fs();
100748 set_fs(KERNEL_DS);
100749- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
100750+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
100751 set_fs(old_fs);
100752
100753 return err;
100754@@ -428,7 +428,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
100755 len = sizeof(ktime);
100756 old_fs = get_fs();
100757 set_fs(KERNEL_DS);
100758- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
100759+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
100760 set_fs(old_fs);
100761
100762 if (!err) {
100763@@ -571,7 +571,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100764 case MCAST_JOIN_GROUP:
100765 case MCAST_LEAVE_GROUP:
100766 {
100767- struct compat_group_req __user *gr32 = (void *)optval;
100768+ struct compat_group_req __user *gr32 = (void __user *)optval;
100769 struct group_req __user *kgr =
100770 compat_alloc_user_space(sizeof(struct group_req));
100771 u32 interface;
100772@@ -592,7 +592,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100773 case MCAST_BLOCK_SOURCE:
100774 case MCAST_UNBLOCK_SOURCE:
100775 {
100776- struct compat_group_source_req __user *gsr32 = (void *)optval;
100777+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
100778 struct group_source_req __user *kgsr = compat_alloc_user_space(
100779 sizeof(struct group_source_req));
100780 u32 interface;
100781@@ -613,7 +613,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
100782 }
100783 case MCAST_MSFILTER:
100784 {
100785- struct compat_group_filter __user *gf32 = (void *)optval;
100786+ struct compat_group_filter __user *gf32 = (void __user *)optval;
100787 struct group_filter __user *kgf;
100788 u32 interface, fmode, numsrc;
100789
100790@@ -651,7 +651,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
100791 char __user *optval, int __user *optlen,
100792 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
100793 {
100794- struct compat_group_filter __user *gf32 = (void *)optval;
100795+ struct compat_group_filter __user *gf32 = (void __user *)optval;
100796 struct group_filter __user *kgf;
100797 int __user *koptlen;
100798 u32 interface, fmode, numsrc;
100799@@ -804,7 +804,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
100800
100801 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
100802 return -EINVAL;
100803- if (copy_from_user(a, args, nas[call]))
100804+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
100805 return -EFAULT;
100806 a0 = a[0];
100807 a1 = a[1];
100808diff --git a/net/core/datagram.c b/net/core/datagram.c
100809index fdbc9a8..cd6972c 100644
100810--- a/net/core/datagram.c
100811+++ b/net/core/datagram.c
100812@@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
100813 }
100814
100815 kfree_skb(skb);
100816- atomic_inc(&sk->sk_drops);
100817+ atomic_inc_unchecked(&sk->sk_drops);
100818 sk_mem_reclaim_partial(sk);
100819
100820 return err;
100821diff --git a/net/core/dev.c b/net/core/dev.c
100822index 945bbd0..8b1a370 100644
100823--- a/net/core/dev.c
100824+++ b/net/core/dev.c
100825@@ -1683,14 +1683,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
100826 {
100827 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
100828 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
100829- atomic_long_inc(&dev->rx_dropped);
100830+ atomic_long_inc_unchecked(&dev->rx_dropped);
100831 kfree_skb(skb);
100832 return NET_RX_DROP;
100833 }
100834 }
100835
100836 if (unlikely(!is_skb_forwardable(dev, skb))) {
100837- atomic_long_inc(&dev->rx_dropped);
100838+ atomic_long_inc_unchecked(&dev->rx_dropped);
100839 kfree_skb(skb);
100840 return NET_RX_DROP;
100841 }
100842@@ -2985,7 +2985,7 @@ recursion_alert:
100843 drop:
100844 rcu_read_unlock_bh();
100845
100846- atomic_long_inc(&dev->tx_dropped);
100847+ atomic_long_inc_unchecked(&dev->tx_dropped);
100848 kfree_skb_list(skb);
100849 return rc;
100850 out:
100851@@ -3328,7 +3328,7 @@ enqueue:
100852
100853 local_irq_restore(flags);
100854
100855- atomic_long_inc(&skb->dev->rx_dropped);
100856+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
100857 kfree_skb(skb);
100858 return NET_RX_DROP;
100859 }
100860@@ -3405,7 +3405,7 @@ int netif_rx_ni(struct sk_buff *skb)
100861 }
100862 EXPORT_SYMBOL(netif_rx_ni);
100863
100864-static void net_tx_action(struct softirq_action *h)
100865+static __latent_entropy void net_tx_action(void)
100866 {
100867 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
100868
100869@@ -3738,7 +3738,7 @@ ncls:
100870 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
100871 } else {
100872 drop:
100873- atomic_long_inc(&skb->dev->rx_dropped);
100874+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
100875 kfree_skb(skb);
100876 /* Jamal, now you will not able to escape explaining
100877 * me how you were going to use this. :-)
100878@@ -4502,7 +4502,7 @@ void netif_napi_del(struct napi_struct *napi)
100879 }
100880 EXPORT_SYMBOL(netif_napi_del);
100881
100882-static void net_rx_action(struct softirq_action *h)
100883+static __latent_entropy void net_rx_action(void)
100884 {
100885 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
100886 unsigned long time_limit = jiffies + 2;
100887@@ -6548,8 +6548,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
100888 } else {
100889 netdev_stats_to_stats64(storage, &dev->stats);
100890 }
100891- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
100892- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
100893+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
100894+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
100895 return storage;
100896 }
100897 EXPORT_SYMBOL(dev_get_stats);
100898diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
100899index 72e899a..79a9409 100644
100900--- a/net/core/dev_ioctl.c
100901+++ b/net/core/dev_ioctl.c
100902@@ -365,8 +365,13 @@ void dev_load(struct net *net, const char *name)
100903 no_module = !dev;
100904 if (no_module && capable(CAP_NET_ADMIN))
100905 no_module = request_module("netdev-%s", name);
100906- if (no_module && capable(CAP_SYS_MODULE))
100907+ if (no_module && capable(CAP_SYS_MODULE)) {
100908+#ifdef CONFIG_GRKERNSEC_MODHARDEN
100909+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
100910+#else
100911 request_module("%s", name);
100912+#endif
100913+ }
100914 }
100915 EXPORT_SYMBOL(dev_load);
100916
100917diff --git a/net/core/filter.c b/net/core/filter.c
100918index 647b122..18a7ff6 100644
100919--- a/net/core/filter.c
100920+++ b/net/core/filter.c
100921@@ -532,7 +532,11 @@ do_pass:
100922
100923 /* Unkown instruction. */
100924 default:
100925- goto err;
100926+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
100927+ fp->code, fp->jt, fp->jf, fp->k);
100928+ kfree(addrs);
100929+ BUG();
100930+ return -EINVAL;
100931 }
100932
100933 insn++;
100934@@ -576,7 +580,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
100935 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
100936 int pc, ret = 0;
100937
100938- BUILD_BUG_ON(BPF_MEMWORDS > 16);
100939+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
100940
100941 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
100942 if (!masks)
100943@@ -987,7 +991,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
100944 if (!fp)
100945 return -ENOMEM;
100946
100947- memcpy(fp->insns, fprog->filter, fsize);
100948+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
100949
100950 fp->len = fprog->len;
100951 /* Since unattached filters are not copied back to user
100952diff --git a/net/core/flow.c b/net/core/flow.c
100953index a0348fd..6951c76 100644
100954--- a/net/core/flow.c
100955+++ b/net/core/flow.c
100956@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
100957 static int flow_entry_valid(struct flow_cache_entry *fle,
100958 struct netns_xfrm *xfrm)
100959 {
100960- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
100961+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
100962 return 0;
100963 if (fle->object && !fle->object->ops->check(fle->object))
100964 return 0;
100965@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
100966 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
100967 fcp->hash_count++;
100968 }
100969- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
100970+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
100971 flo = fle->object;
100972 if (!flo)
100973 goto ret_object;
100974@@ -263,7 +263,7 @@ nocache:
100975 }
100976 flo = resolver(net, key, family, dir, flo, ctx);
100977 if (fle) {
100978- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
100979+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
100980 if (!IS_ERR(flo))
100981 fle->object = flo;
100982 else
100983diff --git a/net/core/iovec.c b/net/core/iovec.c
100984index e1ec45a..e5c6f16 100644
100985--- a/net/core/iovec.c
100986+++ b/net/core/iovec.c
100987@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
100988 if (m->msg_name && m->msg_namelen) {
100989 if (mode == VERIFY_READ) {
100990 void __user *namep;
100991- namep = (void __user __force *) m->msg_name;
100992+ namep = (void __force_user *) m->msg_name;
100993 err = move_addr_to_kernel(namep, m->msg_namelen,
100994 address);
100995 if (err < 0)
100996@@ -55,7 +55,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
100997 }
100998
100999 size = m->msg_iovlen * sizeof(struct iovec);
101000- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
101001+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
101002 return -EFAULT;
101003
101004 m->msg_iov = iov;
101005diff --git a/net/core/neighbour.c b/net/core/neighbour.c
101006index ef31fef..8be66d9 100644
101007--- a/net/core/neighbour.c
101008+++ b/net/core/neighbour.c
101009@@ -2825,7 +2825,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
101010 void __user *buffer, size_t *lenp, loff_t *ppos)
101011 {
101012 int size, ret;
101013- struct ctl_table tmp = *ctl;
101014+ ctl_table_no_const tmp = *ctl;
101015
101016 tmp.extra1 = &zero;
101017 tmp.extra2 = &unres_qlen_max;
101018@@ -2887,7 +2887,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
101019 void __user *buffer,
101020 size_t *lenp, loff_t *ppos)
101021 {
101022- struct ctl_table tmp = *ctl;
101023+ ctl_table_no_const tmp = *ctl;
101024 int ret;
101025
101026 tmp.extra1 = &zero;
101027diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
101028index 2bf8329..2eb1423 100644
101029--- a/net/core/net-procfs.c
101030+++ b/net/core/net-procfs.c
101031@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
101032 struct rtnl_link_stats64 temp;
101033 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
101034
101035- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101036+ if (gr_proc_is_restricted())
101037+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101038+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
101039+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
101040+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
101041+ else
101042+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
101043 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
101044 dev->name, stats->rx_bytes, stats->rx_packets,
101045 stats->rx_errors,
101046@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
101047 return 0;
101048 }
101049
101050-static const struct seq_operations dev_seq_ops = {
101051+const struct seq_operations dev_seq_ops = {
101052 .start = dev_seq_start,
101053 .next = dev_seq_next,
101054 .stop = dev_seq_stop,
101055@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
101056
101057 static int softnet_seq_open(struct inode *inode, struct file *file)
101058 {
101059- return seq_open(file, &softnet_seq_ops);
101060+ return seq_open_restrict(file, &softnet_seq_ops);
101061 }
101062
101063 static const struct file_operations softnet_seq_fops = {
101064@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
101065 else
101066 seq_printf(seq, "%04x", ntohs(pt->type));
101067
101068+#ifdef CONFIG_GRKERNSEC_HIDESYM
101069+ seq_printf(seq, " %-8s %pf\n",
101070+ pt->dev ? pt->dev->name : "", NULL);
101071+#else
101072 seq_printf(seq, " %-8s %pf\n",
101073 pt->dev ? pt->dev->name : "", pt->func);
101074+#endif
101075 }
101076
101077 return 0;
101078diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
101079index 9dd0669..c52fb1b 100644
101080--- a/net/core/net-sysfs.c
101081+++ b/net/core/net-sysfs.c
101082@@ -278,7 +278,7 @@ static ssize_t carrier_changes_show(struct device *dev,
101083 {
101084 struct net_device *netdev = to_net_dev(dev);
101085 return sprintf(buf, fmt_dec,
101086- atomic_read(&netdev->carrier_changes));
101087+ atomic_read_unchecked(&netdev->carrier_changes));
101088 }
101089 static DEVICE_ATTR_RO(carrier_changes);
101090
101091diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
101092index 7f15517..f7d65c0 100644
101093--- a/net/core/net_namespace.c
101094+++ b/net/core/net_namespace.c
101095@@ -445,7 +445,7 @@ static int __register_pernet_operations(struct list_head *list,
101096 int error;
101097 LIST_HEAD(net_exit_list);
101098
101099- list_add_tail(&ops->list, list);
101100+ pax_list_add_tail((struct list_head *)&ops->list, list);
101101 if (ops->init || (ops->id && ops->size)) {
101102 for_each_net(net) {
101103 error = ops_init(ops, net);
101104@@ -458,7 +458,7 @@ static int __register_pernet_operations(struct list_head *list,
101105
101106 out_undo:
101107 /* If I have an error cleanup all namespaces I initialized */
101108- list_del(&ops->list);
101109+ pax_list_del((struct list_head *)&ops->list);
101110 ops_exit_list(ops, &net_exit_list);
101111 ops_free_list(ops, &net_exit_list);
101112 return error;
101113@@ -469,7 +469,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
101114 struct net *net;
101115 LIST_HEAD(net_exit_list);
101116
101117- list_del(&ops->list);
101118+ pax_list_del((struct list_head *)&ops->list);
101119 for_each_net(net)
101120 list_add_tail(&net->exit_list, &net_exit_list);
101121 ops_exit_list(ops, &net_exit_list);
101122@@ -603,7 +603,7 @@ int register_pernet_device(struct pernet_operations *ops)
101123 mutex_lock(&net_mutex);
101124 error = register_pernet_operations(&pernet_list, ops);
101125 if (!error && (first_device == &pernet_list))
101126- first_device = &ops->list;
101127+ first_device = (struct list_head *)&ops->list;
101128 mutex_unlock(&net_mutex);
101129 return error;
101130 }
101131diff --git a/net/core/netpoll.c b/net/core/netpoll.c
101132index e6645b4..43e1af9 100644
101133--- a/net/core/netpoll.c
101134+++ b/net/core/netpoll.c
101135@@ -379,7 +379,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
101136 struct udphdr *udph;
101137 struct iphdr *iph;
101138 struct ethhdr *eth;
101139- static atomic_t ip_ident;
101140+ static atomic_unchecked_t ip_ident;
101141 struct ipv6hdr *ip6h;
101142
101143 udp_len = len + sizeof(*udph);
101144@@ -450,7 +450,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
101145 put_unaligned(0x45, (unsigned char *)iph);
101146 iph->tos = 0;
101147 put_unaligned(htons(ip_len), &(iph->tot_len));
101148- iph->id = htons(atomic_inc_return(&ip_ident));
101149+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
101150 iph->frag_off = 0;
101151 iph->ttl = 64;
101152 iph->protocol = IPPROTO_UDP;
101153diff --git a/net/core/pktgen.c b/net/core/pktgen.c
101154index 443256b..bbff424 100644
101155--- a/net/core/pktgen.c
101156+++ b/net/core/pktgen.c
101157@@ -3753,7 +3753,7 @@ static int __net_init pg_net_init(struct net *net)
101158 pn->net = net;
101159 INIT_LIST_HEAD(&pn->pktgen_threads);
101160 pn->pktgen_exiting = false;
101161- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
101162+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
101163 if (!pn->proc_dir) {
101164 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
101165 return -ENODEV;
101166diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
101167index 76321ea..3129bd6 100644
101168--- a/net/core/rtnetlink.c
101169+++ b/net/core/rtnetlink.c
101170@@ -58,7 +58,7 @@ struct rtnl_link {
101171 rtnl_doit_func doit;
101172 rtnl_dumpit_func dumpit;
101173 rtnl_calcit_func calcit;
101174-};
101175+} __no_const;
101176
101177 static DEFINE_MUTEX(rtnl_mutex);
101178
101179@@ -304,10 +304,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
101180 * to use the ops for creating device. So do not
101181 * fill up dellink as well. That disables rtnl_dellink.
101182 */
101183- if (ops->setup && !ops->dellink)
101184- ops->dellink = unregister_netdevice_queue;
101185+ if (ops->setup && !ops->dellink) {
101186+ pax_open_kernel();
101187+ *(void **)&ops->dellink = unregister_netdevice_queue;
101188+ pax_close_kernel();
101189+ }
101190
101191- list_add_tail(&ops->list, &link_ops);
101192+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
101193 return 0;
101194 }
101195 EXPORT_SYMBOL_GPL(__rtnl_link_register);
101196@@ -354,7 +357,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
101197 for_each_net(net) {
101198 __rtnl_kill_links(net, ops);
101199 }
101200- list_del(&ops->list);
101201+ pax_list_del((struct list_head *)&ops->list);
101202 }
101203 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
101204
101205@@ -1014,7 +1017,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
101206 (dev->ifalias &&
101207 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
101208 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
101209- atomic_read(&dev->carrier_changes)))
101210+ atomic_read_unchecked(&dev->carrier_changes)))
101211 goto nla_put_failure;
101212
101213 if (1) {
101214diff --git a/net/core/scm.c b/net/core/scm.c
101215index b442e7e..6f5b5a2 100644
101216--- a/net/core/scm.c
101217+++ b/net/core/scm.c
101218@@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
101219 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
101220 {
101221 struct cmsghdr __user *cm
101222- = (__force struct cmsghdr __user *)msg->msg_control;
101223+ = (struct cmsghdr __force_user *)msg->msg_control;
101224 struct cmsghdr cmhdr;
101225 int cmlen = CMSG_LEN(len);
101226 int err;
101227@@ -233,7 +233,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
101228 err = -EFAULT;
101229 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
101230 goto out;
101231- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
101232+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
101233 goto out;
101234 cmlen = CMSG_SPACE(len);
101235 if (msg->msg_controllen < cmlen)
101236@@ -249,7 +249,7 @@ EXPORT_SYMBOL(put_cmsg);
101237 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
101238 {
101239 struct cmsghdr __user *cm
101240- = (__force struct cmsghdr __user*)msg->msg_control;
101241+ = (struct cmsghdr __force_user *)msg->msg_control;
101242
101243 int fdmax = 0;
101244 int fdnum = scm->fp->count;
101245@@ -269,7 +269,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
101246 if (fdnum < fdmax)
101247 fdmax = fdnum;
101248
101249- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
101250+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
101251 i++, cmfptr++)
101252 {
101253 struct socket *sock;
101254diff --git a/net/core/skbuff.c b/net/core/skbuff.c
101255index 32e31c2..e981248 100644
101256--- a/net/core/skbuff.c
101257+++ b/net/core/skbuff.c
101258@@ -2025,7 +2025,7 @@ EXPORT_SYMBOL(__skb_checksum);
101259 __wsum skb_checksum(const struct sk_buff *skb, int offset,
101260 int len, __wsum csum)
101261 {
101262- const struct skb_checksum_ops ops = {
101263+ static const struct skb_checksum_ops ops = {
101264 .update = csum_partial_ext,
101265 .combine = csum_block_add_ext,
101266 };
101267@@ -3255,12 +3255,14 @@ void __init skb_init(void)
101268 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
101269 sizeof(struct sk_buff),
101270 0,
101271- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
101272+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
101273+ SLAB_NO_SANITIZE,
101274 NULL);
101275 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
101276 sizeof(struct sk_buff_fclones),
101277 0,
101278- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
101279+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
101280+ SLAB_NO_SANITIZE,
101281 NULL);
101282 }
101283
101284diff --git a/net/core/sock.c b/net/core/sock.c
101285index 15e0c67..0310f4a 100644
101286--- a/net/core/sock.c
101287+++ b/net/core/sock.c
101288@@ -441,7 +441,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101289 struct sk_buff_head *list = &sk->sk_receive_queue;
101290
101291 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
101292- atomic_inc(&sk->sk_drops);
101293+ atomic_inc_unchecked(&sk->sk_drops);
101294 trace_sock_rcvqueue_full(sk, skb);
101295 return -ENOMEM;
101296 }
101297@@ -451,7 +451,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101298 return err;
101299
101300 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
101301- atomic_inc(&sk->sk_drops);
101302+ atomic_inc_unchecked(&sk->sk_drops);
101303 return -ENOBUFS;
101304 }
101305
101306@@ -464,7 +464,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
101307 skb_dst_force(skb);
101308
101309 spin_lock_irqsave(&list->lock, flags);
101310- skb->dropcount = atomic_read(&sk->sk_drops);
101311+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
101312 __skb_queue_tail(list, skb);
101313 spin_unlock_irqrestore(&list->lock, flags);
101314
101315@@ -484,7 +484,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
101316 skb->dev = NULL;
101317
101318 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
101319- atomic_inc(&sk->sk_drops);
101320+ atomic_inc_unchecked(&sk->sk_drops);
101321 goto discard_and_relse;
101322 }
101323 if (nested)
101324@@ -502,7 +502,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
101325 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
101326 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
101327 bh_unlock_sock(sk);
101328- atomic_inc(&sk->sk_drops);
101329+ atomic_inc_unchecked(&sk->sk_drops);
101330 goto discard_and_relse;
101331 }
101332
101333@@ -991,12 +991,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101334 struct timeval tm;
101335 } v;
101336
101337- int lv = sizeof(int);
101338- int len;
101339+ unsigned int lv = sizeof(int);
101340+ unsigned int len;
101341
101342 if (get_user(len, optlen))
101343 return -EFAULT;
101344- if (len < 0)
101345+ if (len > INT_MAX)
101346 return -EINVAL;
101347
101348 memset(&v, 0, sizeof(v));
101349@@ -1134,11 +1134,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101350
101351 case SO_PEERNAME:
101352 {
101353- char address[128];
101354+ char address[_K_SS_MAXSIZE];
101355
101356 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
101357 return -ENOTCONN;
101358- if (lv < len)
101359+ if (lv < len || sizeof address < len)
101360 return -EINVAL;
101361 if (copy_to_user(optval, address, len))
101362 return -EFAULT;
101363@@ -1219,7 +1219,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
101364
101365 if (len > lv)
101366 len = lv;
101367- if (copy_to_user(optval, &v, len))
101368+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
101369 return -EFAULT;
101370 lenout:
101371 if (put_user(len, optlen))
101372@@ -2315,7 +2315,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
101373 */
101374 smp_wmb();
101375 atomic_set(&sk->sk_refcnt, 1);
101376- atomic_set(&sk->sk_drops, 0);
101377+ atomic_set_unchecked(&sk->sk_drops, 0);
101378 }
101379 EXPORT_SYMBOL(sock_init_data);
101380
101381@@ -2443,6 +2443,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
101382 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
101383 int level, int type)
101384 {
101385+ struct sock_extended_err ee;
101386 struct sock_exterr_skb *serr;
101387 struct sk_buff *skb;
101388 int copied, err;
101389@@ -2464,7 +2465,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
101390 sock_recv_timestamp(msg, sk, skb);
101391
101392 serr = SKB_EXT_ERR(skb);
101393- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
101394+ ee = serr->ee;
101395+ put_cmsg(msg, level, type, sizeof ee, &ee);
101396
101397 msg->msg_flags |= MSG_ERRQUEUE;
101398 err = copied;
101399diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
101400index ad704c7..ca48aff 100644
101401--- a/net/core/sock_diag.c
101402+++ b/net/core/sock_diag.c
101403@@ -9,26 +9,33 @@
101404 #include <linux/inet_diag.h>
101405 #include <linux/sock_diag.h>
101406
101407-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
101408+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
101409 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
101410 static DEFINE_MUTEX(sock_diag_table_mutex);
101411
101412 int sock_diag_check_cookie(void *sk, __u32 *cookie)
101413 {
101414+#ifndef CONFIG_GRKERNSEC_HIDESYM
101415 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
101416 cookie[1] != INET_DIAG_NOCOOKIE) &&
101417 ((u32)(unsigned long)sk != cookie[0] ||
101418 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
101419 return -ESTALE;
101420 else
101421+#endif
101422 return 0;
101423 }
101424 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
101425
101426 void sock_diag_save_cookie(void *sk, __u32 *cookie)
101427 {
101428+#ifdef CONFIG_GRKERNSEC_HIDESYM
101429+ cookie[0] = 0;
101430+ cookie[1] = 0;
101431+#else
101432 cookie[0] = (u32)(unsigned long)sk;
101433 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
101434+#endif
101435 }
101436 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
101437
101438@@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
101439 mutex_lock(&sock_diag_table_mutex);
101440 if (sock_diag_handlers[hndl->family])
101441 err = -EBUSY;
101442- else
101443+ else {
101444+ pax_open_kernel();
101445 sock_diag_handlers[hndl->family] = hndl;
101446+ pax_close_kernel();
101447+ }
101448 mutex_unlock(&sock_diag_table_mutex);
101449
101450 return err;
101451@@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
101452
101453 mutex_lock(&sock_diag_table_mutex);
101454 BUG_ON(sock_diag_handlers[family] != hnld);
101455+ pax_open_kernel();
101456 sock_diag_handlers[family] = NULL;
101457+ pax_close_kernel();
101458 mutex_unlock(&sock_diag_table_mutex);
101459 }
101460 EXPORT_SYMBOL_GPL(sock_diag_unregister);
101461diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
101462index cf9cd13..50683950 100644
101463--- a/net/core/sysctl_net_core.c
101464+++ b/net/core/sysctl_net_core.c
101465@@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
101466 {
101467 unsigned int orig_size, size;
101468 int ret, i;
101469- struct ctl_table tmp = {
101470+ ctl_table_no_const tmp = {
101471 .data = &size,
101472 .maxlen = sizeof(size),
101473 .mode = table->mode
101474@@ -200,7 +200,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
101475 void __user *buffer, size_t *lenp, loff_t *ppos)
101476 {
101477 char id[IFNAMSIZ];
101478- struct ctl_table tbl = {
101479+ ctl_table_no_const tbl = {
101480 .data = id,
101481 .maxlen = IFNAMSIZ,
101482 };
101483@@ -263,7 +263,7 @@ static struct ctl_table net_core_table[] = {
101484 .mode = 0644,
101485 .proc_handler = proc_dointvec
101486 },
101487-#ifdef CONFIG_BPF_JIT
101488+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
101489 {
101490 .procname = "bpf_jit_enable",
101491 .data = &bpf_jit_enable,
101492@@ -379,13 +379,12 @@ static struct ctl_table netns_core_table[] = {
101493
101494 static __net_init int sysctl_core_net_init(struct net *net)
101495 {
101496- struct ctl_table *tbl;
101497+ ctl_table_no_const *tbl = NULL;
101498
101499 net->core.sysctl_somaxconn = SOMAXCONN;
101500
101501- tbl = netns_core_table;
101502 if (!net_eq(net, &init_net)) {
101503- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
101504+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
101505 if (tbl == NULL)
101506 goto err_dup;
101507
101508@@ -395,17 +394,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
101509 if (net->user_ns != &init_user_ns) {
101510 tbl[0].procname = NULL;
101511 }
101512- }
101513-
101514- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
101515+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
101516+ } else
101517+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
101518 if (net->core.sysctl_hdr == NULL)
101519 goto err_reg;
101520
101521 return 0;
101522
101523 err_reg:
101524- if (tbl != netns_core_table)
101525- kfree(tbl);
101526+ kfree(tbl);
101527 err_dup:
101528 return -ENOMEM;
101529 }
101530@@ -420,7 +418,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
101531 kfree(tbl);
101532 }
101533
101534-static __net_initdata struct pernet_operations sysctl_core_ops = {
101535+static __net_initconst struct pernet_operations sysctl_core_ops = {
101536 .init = sysctl_core_net_init,
101537 .exit = sysctl_core_net_exit,
101538 };
101539diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
101540index 25733d5..b9360f0 100644
101541--- a/net/decnet/af_decnet.c
101542+++ b/net/decnet/af_decnet.c
101543@@ -466,6 +466,7 @@ static struct proto dn_proto = {
101544 .sysctl_rmem = sysctl_decnet_rmem,
101545 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
101546 .obj_size = sizeof(struct dn_sock),
101547+ .slab_flags = SLAB_USERCOPY,
101548 };
101549
101550 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
101551diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
101552index 4400da7..3429972 100644
101553--- a/net/decnet/dn_dev.c
101554+++ b/net/decnet/dn_dev.c
101555@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
101556 .extra1 = &min_t3,
101557 .extra2 = &max_t3
101558 },
101559- {0}
101560+ { }
101561 },
101562 };
101563
101564diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
101565index 5325b54..a0d4d69 100644
101566--- a/net/decnet/sysctl_net_decnet.c
101567+++ b/net/decnet/sysctl_net_decnet.c
101568@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
101569
101570 if (len > *lenp) len = *lenp;
101571
101572- if (copy_to_user(buffer, addr, len))
101573+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
101574 return -EFAULT;
101575
101576 *lenp = len;
101577@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
101578
101579 if (len > *lenp) len = *lenp;
101580
101581- if (copy_to_user(buffer, devname, len))
101582+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
101583 return -EFAULT;
101584
101585 *lenp = len;
101586diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
101587index a2c7e4c..3dc9f67 100644
101588--- a/net/hsr/hsr_netlink.c
101589+++ b/net/hsr/hsr_netlink.c
101590@@ -102,7 +102,7 @@ nla_put_failure:
101591 return -EMSGSIZE;
101592 }
101593
101594-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
101595+static struct rtnl_link_ops hsr_link_ops = {
101596 .kind = "hsr",
101597 .maxtype = IFLA_HSR_MAX,
101598 .policy = hsr_policy,
101599diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
101600index 4413629..dea596a 100644
101601--- a/net/ieee802154/6lowpan_rtnl.c
101602+++ b/net/ieee802154/6lowpan_rtnl.c
101603@@ -635,7 +635,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
101604 dev_put(real_dev);
101605 }
101606
101607-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
101608+static struct rtnl_link_ops lowpan_link_ops = {
101609 .kind = "lowpan",
101610 .priv_size = sizeof(struct lowpan_dev_info),
101611 .setup = lowpan_setup,
101612diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
101613index 7cfcd68..84ca5b7 100644
101614--- a/net/ieee802154/reassembly.c
101615+++ b/net/ieee802154/reassembly.c
101616@@ -433,14 +433,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
101617
101618 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101619 {
101620- struct ctl_table *table;
101621+ ctl_table_no_const *table = NULL;
101622 struct ctl_table_header *hdr;
101623 struct netns_ieee802154_lowpan *ieee802154_lowpan =
101624 net_ieee802154_lowpan(net);
101625
101626- table = lowpan_frags_ns_ctl_table;
101627 if (!net_eq(net, &init_net)) {
101628- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
101629+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
101630 GFP_KERNEL);
101631 if (table == NULL)
101632 goto err_alloc;
101633@@ -455,9 +454,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101634 /* Don't export sysctls to unprivileged users */
101635 if (net->user_ns != &init_user_ns)
101636 table[0].procname = NULL;
101637- }
101638-
101639- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
101640+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
101641+ } else
101642+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
101643 if (hdr == NULL)
101644 goto err_reg;
101645
101646@@ -465,8 +464,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
101647 return 0;
101648
101649 err_reg:
101650- if (!net_eq(net, &init_net))
101651- kfree(table);
101652+ kfree(table);
101653 err_alloc:
101654 return -ENOMEM;
101655 }
101656diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
101657index e67da4e..da217942 100644
101658--- a/net/ipv4/af_inet.c
101659+++ b/net/ipv4/af_inet.c
101660@@ -1392,7 +1392,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
101661 return ip_recv_error(sk, msg, len, addr_len);
101662 #if IS_ENABLED(CONFIG_IPV6)
101663 if (sk->sk_family == AF_INET6)
101664- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
101665+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
101666 #endif
101667 return -EINVAL;
101668 }
101669diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
101670index 214882e..ec032f6 100644
101671--- a/net/ipv4/devinet.c
101672+++ b/net/ipv4/devinet.c
101673@@ -69,7 +69,8 @@
101674
101675 static struct ipv4_devconf ipv4_devconf = {
101676 .data = {
101677- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
101678+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
101679+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
101680 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
101681 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
101682 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
101683@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
101684
101685 static struct ipv4_devconf ipv4_devconf_dflt = {
101686 .data = {
101687- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
101688+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
101689+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
101690 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
101691 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
101692 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
101693@@ -1548,7 +1550,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
101694 idx = 0;
101695 head = &net->dev_index_head[h];
101696 rcu_read_lock();
101697- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
101698+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
101699 net->dev_base_seq;
101700 hlist_for_each_entry_rcu(dev, head, index_hlist) {
101701 if (idx < s_idx)
101702@@ -1866,7 +1868,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
101703 idx = 0;
101704 head = &net->dev_index_head[h];
101705 rcu_read_lock();
101706- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
101707+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
101708 net->dev_base_seq;
101709 hlist_for_each_entry_rcu(dev, head, index_hlist) {
101710 if (idx < s_idx)
101711@@ -2101,7 +2103,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
101712 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
101713 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
101714
101715-static struct devinet_sysctl_table {
101716+static const struct devinet_sysctl_table {
101717 struct ctl_table_header *sysctl_header;
101718 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
101719 } devinet_sysctl = {
101720@@ -2233,7 +2235,7 @@ static __net_init int devinet_init_net(struct net *net)
101721 int err;
101722 struct ipv4_devconf *all, *dflt;
101723 #ifdef CONFIG_SYSCTL
101724- struct ctl_table *tbl = ctl_forward_entry;
101725+ ctl_table_no_const *tbl = NULL;
101726 struct ctl_table_header *forw_hdr;
101727 #endif
101728
101729@@ -2251,7 +2253,7 @@ static __net_init int devinet_init_net(struct net *net)
101730 goto err_alloc_dflt;
101731
101732 #ifdef CONFIG_SYSCTL
101733- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
101734+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
101735 if (tbl == NULL)
101736 goto err_alloc_ctl;
101737
101738@@ -2271,7 +2273,10 @@ static __net_init int devinet_init_net(struct net *net)
101739 goto err_reg_dflt;
101740
101741 err = -ENOMEM;
101742- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
101743+ if (!net_eq(net, &init_net))
101744+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
101745+ else
101746+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
101747 if (forw_hdr == NULL)
101748 goto err_reg_ctl;
101749 net->ipv4.forw_hdr = forw_hdr;
101750@@ -2287,8 +2292,7 @@ err_reg_ctl:
101751 err_reg_dflt:
101752 __devinet_sysctl_unregister(all);
101753 err_reg_all:
101754- if (tbl != ctl_forward_entry)
101755- kfree(tbl);
101756+ kfree(tbl);
101757 err_alloc_ctl:
101758 #endif
101759 if (dflt != &ipv4_devconf_dflt)
101760diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
101761index 23104a3..9f5570b 100644
101762--- a/net/ipv4/fib_frontend.c
101763+++ b/net/ipv4/fib_frontend.c
101764@@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
101765 #ifdef CONFIG_IP_ROUTE_MULTIPATH
101766 fib_sync_up(dev);
101767 #endif
101768- atomic_inc(&net->ipv4.dev_addr_genid);
101769+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101770 rt_cache_flush(dev_net(dev));
101771 break;
101772 case NETDEV_DOWN:
101773 fib_del_ifaddr(ifa, NULL);
101774- atomic_inc(&net->ipv4.dev_addr_genid);
101775+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101776 if (ifa->ifa_dev->ifa_list == NULL) {
101777 /* Last address was deleted from this interface.
101778 * Disable IP.
101779@@ -1060,7 +1060,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
101780 #ifdef CONFIG_IP_ROUTE_MULTIPATH
101781 fib_sync_up(dev);
101782 #endif
101783- atomic_inc(&net->ipv4.dev_addr_genid);
101784+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
101785 rt_cache_flush(net);
101786 break;
101787 case NETDEV_DOWN:
101788diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
101789index f99f41b..1879da9 100644
101790--- a/net/ipv4/fib_semantics.c
101791+++ b/net/ipv4/fib_semantics.c
101792@@ -770,7 +770,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
101793 nh->nh_saddr = inet_select_addr(nh->nh_dev,
101794 nh->nh_gw,
101795 nh->nh_parent->fib_scope);
101796- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
101797+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
101798
101799 return nh->nh_saddr;
101800 }
101801diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
101802index 9111a4e..3576905 100644
101803--- a/net/ipv4/inet_hashtables.c
101804+++ b/net/ipv4/inet_hashtables.c
101805@@ -18,6 +18,7 @@
101806 #include <linux/sched.h>
101807 #include <linux/slab.h>
101808 #include <linux/wait.h>
101809+#include <linux/security.h>
101810
101811 #include <net/inet_connection_sock.h>
101812 #include <net/inet_hashtables.h>
101813@@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
101814 return inet_ehashfn(net, laddr, lport, faddr, fport);
101815 }
101816
101817+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
101818+
101819 /*
101820 * Allocate and initialize a new local port bind bucket.
101821 * The bindhash mutex for snum's hash chain must be held here.
101822@@ -554,6 +557,8 @@ ok:
101823 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
101824 spin_unlock(&head->lock);
101825
101826+ gr_update_task_in_ip_table(inet_sk(sk));
101827+
101828 if (tw) {
101829 inet_twsk_deschedule(tw, death_row);
101830 while (twrefcnt) {
101831diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
101832index 241afd7..31b95d5 100644
101833--- a/net/ipv4/inetpeer.c
101834+++ b/net/ipv4/inetpeer.c
101835@@ -461,7 +461,7 @@ relookup:
101836 if (p) {
101837 p->daddr = *daddr;
101838 atomic_set(&p->refcnt, 1);
101839- atomic_set(&p->rid, 0);
101840+ atomic_set_unchecked(&p->rid, 0);
101841 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
101842 p->rate_tokens = 0;
101843 /* 60*HZ is arbitrary, but chosen enough high so that the first
101844diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
101845index 2811cc1..ad5a534 100644
101846--- a/net/ipv4/ip_fragment.c
101847+++ b/net/ipv4/ip_fragment.c
101848@@ -268,7 +268,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
101849 return 0;
101850
101851 start = qp->rid;
101852- end = atomic_inc_return(&peer->rid);
101853+ end = atomic_inc_return_unchecked(&peer->rid);
101854 qp->rid = end;
101855
101856 rc = qp->q.fragments && (end - start) > max;
101857@@ -746,12 +746,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
101858
101859 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
101860 {
101861- struct ctl_table *table;
101862+ ctl_table_no_const *table = NULL;
101863 struct ctl_table_header *hdr;
101864
101865- table = ip4_frags_ns_ctl_table;
101866 if (!net_eq(net, &init_net)) {
101867- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
101868+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
101869 if (table == NULL)
101870 goto err_alloc;
101871
101872@@ -765,9 +764,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
101873 /* Don't export sysctls to unprivileged users */
101874 if (net->user_ns != &init_user_ns)
101875 table[0].procname = NULL;
101876- }
101877+ hdr = register_net_sysctl(net, "net/ipv4", table);
101878+ } else
101879+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
101880
101881- hdr = register_net_sysctl(net, "net/ipv4", table);
101882 if (hdr == NULL)
101883 goto err_reg;
101884
101885@@ -775,8 +775,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
101886 return 0;
101887
101888 err_reg:
101889- if (!net_eq(net, &init_net))
101890- kfree(table);
101891+ kfree(table);
101892 err_alloc:
101893 return -ENOMEM;
101894 }
101895diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
101896index 12055fd..df852c4 100644
101897--- a/net/ipv4/ip_gre.c
101898+++ b/net/ipv4/ip_gre.c
101899@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
101900 module_param(log_ecn_error, bool, 0644);
101901 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
101902
101903-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
101904+static struct rtnl_link_ops ipgre_link_ops;
101905 static int ipgre_tunnel_init(struct net_device *dev);
101906
101907 static int ipgre_net_id __read_mostly;
101908@@ -815,7 +815,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
101909 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
101910 };
101911
101912-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
101913+static struct rtnl_link_ops ipgre_link_ops = {
101914 .kind = "gre",
101915 .maxtype = IFLA_GRE_MAX,
101916 .policy = ipgre_policy,
101917@@ -829,7 +829,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
101918 .fill_info = ipgre_fill_info,
101919 };
101920
101921-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
101922+static struct rtnl_link_ops ipgre_tap_ops = {
101923 .kind = "gretap",
101924 .maxtype = IFLA_GRE_MAX,
101925 .policy = ipgre_policy,
101926diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
101927index 3d4da2c..40f9c29 100644
101928--- a/net/ipv4/ip_input.c
101929+++ b/net/ipv4/ip_input.c
101930@@ -147,6 +147,10 @@
101931 #include <linux/mroute.h>
101932 #include <linux/netlink.h>
101933
101934+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
101935+extern int grsec_enable_blackhole;
101936+#endif
101937+
101938 /*
101939 * Process Router Attention IP option (RFC 2113)
101940 */
101941@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
101942 if (!raw) {
101943 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
101944 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
101945+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
101946+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
101947+#endif
101948 icmp_send(skb, ICMP_DEST_UNREACH,
101949 ICMP_PROT_UNREACH, 0);
101950 }
101951diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
101952index 9daf217..dc6972d 100644
101953--- a/net/ipv4/ip_sockglue.c
101954+++ b/net/ipv4/ip_sockglue.c
101955@@ -1177,7 +1177,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
101956 len = min_t(unsigned int, len, opt->optlen);
101957 if (put_user(len, optlen))
101958 return -EFAULT;
101959- if (copy_to_user(optval, opt->__data, len))
101960+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
101961+ copy_to_user(optval, opt->__data, len))
101962 return -EFAULT;
101963 return 0;
101964 }
101965@@ -1308,7 +1309,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
101966 if (sk->sk_type != SOCK_STREAM)
101967 return -ENOPROTOOPT;
101968
101969- msg.msg_control = (__force void *) optval;
101970+ msg.msg_control = (__force_kernel void *) optval;
101971 msg.msg_controllen = len;
101972 msg.msg_flags = flags;
101973
101974diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
101975index 1a7e979..fd05aa4 100644
101976--- a/net/ipv4/ip_vti.c
101977+++ b/net/ipv4/ip_vti.c
101978@@ -45,7 +45,7 @@
101979 #include <net/net_namespace.h>
101980 #include <net/netns/generic.h>
101981
101982-static struct rtnl_link_ops vti_link_ops __read_mostly;
101983+static struct rtnl_link_ops vti_link_ops;
101984
101985 static int vti_net_id __read_mostly;
101986 static int vti_tunnel_init(struct net_device *dev);
101987@@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
101988 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
101989 };
101990
101991-static struct rtnl_link_ops vti_link_ops __read_mostly = {
101992+static struct rtnl_link_ops vti_link_ops = {
101993 .kind = "vti",
101994 .maxtype = IFLA_VTI_MAX,
101995 .policy = vti_policy,
101996diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
101997index 648fa14..97864d0 100644
101998--- a/net/ipv4/ipconfig.c
101999+++ b/net/ipv4/ipconfig.c
102000@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
102001
102002 mm_segment_t oldfs = get_fs();
102003 set_fs(get_ds());
102004- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
102005+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
102006 set_fs(oldfs);
102007 return res;
102008 }
102009@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
102010
102011 mm_segment_t oldfs = get_fs();
102012 set_fs(get_ds());
102013- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
102014+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
102015 set_fs(oldfs);
102016 return res;
102017 }
102018@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
102019
102020 mm_segment_t oldfs = get_fs();
102021 set_fs(get_ds());
102022- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
102023+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
102024 set_fs(oldfs);
102025 return res;
102026 }
102027diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
102028index 37096d6..86abb03 100644
102029--- a/net/ipv4/ipip.c
102030+++ b/net/ipv4/ipip.c
102031@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
102032 static int ipip_net_id __read_mostly;
102033
102034 static int ipip_tunnel_init(struct net_device *dev);
102035-static struct rtnl_link_ops ipip_link_ops __read_mostly;
102036+static struct rtnl_link_ops ipip_link_ops;
102037
102038 static int ipip_err(struct sk_buff *skb, u32 info)
102039 {
102040@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
102041 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
102042 };
102043
102044-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
102045+static struct rtnl_link_ops ipip_link_ops = {
102046 .kind = "ipip",
102047 .maxtype = IFLA_IPTUN_MAX,
102048 .policy = ipip_policy,
102049diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
102050index f95b6f9..2ee2097 100644
102051--- a/net/ipv4/netfilter/arp_tables.c
102052+++ b/net/ipv4/netfilter/arp_tables.c
102053@@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
102054 #endif
102055
102056 static int get_info(struct net *net, void __user *user,
102057- const int *len, int compat)
102058+ int len, int compat)
102059 {
102060 char name[XT_TABLE_MAXNAMELEN];
102061 struct xt_table *t;
102062 int ret;
102063
102064- if (*len != sizeof(struct arpt_getinfo)) {
102065- duprintf("length %u != %Zu\n", *len,
102066+ if (len != sizeof(struct arpt_getinfo)) {
102067+ duprintf("length %u != %Zu\n", len,
102068 sizeof(struct arpt_getinfo));
102069 return -EINVAL;
102070 }
102071@@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
102072 info.size = private->size;
102073 strcpy(info.name, name);
102074
102075- if (copy_to_user(user, &info, *len) != 0)
102076+ if (copy_to_user(user, &info, len) != 0)
102077 ret = -EFAULT;
102078 else
102079 ret = 0;
102080@@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
102081
102082 switch (cmd) {
102083 case ARPT_SO_GET_INFO:
102084- ret = get_info(sock_net(sk), user, len, 1);
102085+ ret = get_info(sock_net(sk), user, *len, 1);
102086 break;
102087 case ARPT_SO_GET_ENTRIES:
102088 ret = compat_get_entries(sock_net(sk), user, len);
102089@@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
102090
102091 switch (cmd) {
102092 case ARPT_SO_GET_INFO:
102093- ret = get_info(sock_net(sk), user, len, 0);
102094+ ret = get_info(sock_net(sk), user, *len, 0);
102095 break;
102096
102097 case ARPT_SO_GET_ENTRIES:
102098diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
102099index 99e810f..3711b81 100644
102100--- a/net/ipv4/netfilter/ip_tables.c
102101+++ b/net/ipv4/netfilter/ip_tables.c
102102@@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
102103 #endif
102104
102105 static int get_info(struct net *net, void __user *user,
102106- const int *len, int compat)
102107+ int len, int compat)
102108 {
102109 char name[XT_TABLE_MAXNAMELEN];
102110 struct xt_table *t;
102111 int ret;
102112
102113- if (*len != sizeof(struct ipt_getinfo)) {
102114- duprintf("length %u != %zu\n", *len,
102115+ if (len != sizeof(struct ipt_getinfo)) {
102116+ duprintf("length %u != %zu\n", len,
102117 sizeof(struct ipt_getinfo));
102118 return -EINVAL;
102119 }
102120@@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
102121 info.size = private->size;
102122 strcpy(info.name, name);
102123
102124- if (copy_to_user(user, &info, *len) != 0)
102125+ if (copy_to_user(user, &info, len) != 0)
102126 ret = -EFAULT;
102127 else
102128 ret = 0;
102129@@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
102130
102131 switch (cmd) {
102132 case IPT_SO_GET_INFO:
102133- ret = get_info(sock_net(sk), user, len, 1);
102134+ ret = get_info(sock_net(sk), user, *len, 1);
102135 break;
102136 case IPT_SO_GET_ENTRIES:
102137 ret = compat_get_entries(sock_net(sk), user, len);
102138@@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
102139
102140 switch (cmd) {
102141 case IPT_SO_GET_INFO:
102142- ret = get_info(sock_net(sk), user, len, 0);
102143+ ret = get_info(sock_net(sk), user, *len, 0);
102144 break;
102145
102146 case IPT_SO_GET_ENTRIES:
102147diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
102148index e90f83a..3e6acca 100644
102149--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
102150+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
102151@@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
102152 spin_lock_init(&cn->lock);
102153
102154 #ifdef CONFIG_PROC_FS
102155- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
102156+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
102157 if (!cn->procdir) {
102158 pr_err("Unable to proc dir entry\n");
102159 return -ENOMEM;
102160diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
102161index 5d740cc..b2842b9 100644
102162--- a/net/ipv4/ping.c
102163+++ b/net/ipv4/ping.c
102164@@ -59,7 +59,7 @@ struct ping_table {
102165 };
102166
102167 static struct ping_table ping_table;
102168-struct pingv6_ops pingv6_ops;
102169+struct pingv6_ops *pingv6_ops;
102170 EXPORT_SYMBOL_GPL(pingv6_ops);
102171
102172 static u16 ping_port_rover;
102173@@ -350,7 +350,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
102174 return -ENODEV;
102175 }
102176 }
102177- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
102178+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
102179 scoped);
102180 rcu_read_unlock();
102181
102182@@ -558,7 +558,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
102183 }
102184 #if IS_ENABLED(CONFIG_IPV6)
102185 } else if (skb->protocol == htons(ETH_P_IPV6)) {
102186- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
102187+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
102188 #endif
102189 }
102190
102191@@ -576,7 +576,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
102192 info, (u8 *)icmph);
102193 #if IS_ENABLED(CONFIG_IPV6)
102194 } else if (family == AF_INET6) {
102195- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
102196+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
102197 info, (u8 *)icmph);
102198 #endif
102199 }
102200@@ -910,10 +910,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
102201 }
102202
102203 if (inet6_sk(sk)->rxopt.all)
102204- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
102205+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
102206 if (skb->protocol == htons(ETH_P_IPV6) &&
102207 inet6_sk(sk)->rxopt.all)
102208- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
102209+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
102210 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
102211 ip_cmsg_recv(msg, skb);
102212 #endif
102213@@ -1105,7 +1105,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
102214 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
102215 0, sock_i_ino(sp),
102216 atomic_read(&sp->sk_refcnt), sp,
102217- atomic_read(&sp->sk_drops));
102218+ atomic_read_unchecked(&sp->sk_drops));
102219 }
102220
102221 static int ping_v4_seq_show(struct seq_file *seq, void *v)
102222diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
102223index 739db31..74f0210 100644
102224--- a/net/ipv4/raw.c
102225+++ b/net/ipv4/raw.c
102226@@ -314,7 +314,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
102227 int raw_rcv(struct sock *sk, struct sk_buff *skb)
102228 {
102229 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
102230- atomic_inc(&sk->sk_drops);
102231+ atomic_inc_unchecked(&sk->sk_drops);
102232 kfree_skb(skb);
102233 return NET_RX_DROP;
102234 }
102235@@ -755,16 +755,20 @@ static int raw_init(struct sock *sk)
102236
102237 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
102238 {
102239+ struct icmp_filter filter;
102240+
102241 if (optlen > sizeof(struct icmp_filter))
102242 optlen = sizeof(struct icmp_filter);
102243- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
102244+ if (copy_from_user(&filter, optval, optlen))
102245 return -EFAULT;
102246+ raw_sk(sk)->filter = filter;
102247 return 0;
102248 }
102249
102250 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
102251 {
102252 int len, ret = -EFAULT;
102253+ struct icmp_filter filter;
102254
102255 if (get_user(len, optlen))
102256 goto out;
102257@@ -774,8 +778,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
102258 if (len > sizeof(struct icmp_filter))
102259 len = sizeof(struct icmp_filter);
102260 ret = -EFAULT;
102261- if (put_user(len, optlen) ||
102262- copy_to_user(optval, &raw_sk(sk)->filter, len))
102263+ filter = raw_sk(sk)->filter;
102264+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
102265 goto out;
102266 ret = 0;
102267 out: return ret;
102268@@ -1004,7 +1008,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
102269 0, 0L, 0,
102270 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
102271 0, sock_i_ino(sp),
102272- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
102273+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
102274 }
102275
102276 static int raw_seq_show(struct seq_file *seq, void *v)
102277diff --git a/net/ipv4/route.c b/net/ipv4/route.c
102278index 6a2155b..d426880 100644
102279--- a/net/ipv4/route.c
102280+++ b/net/ipv4/route.c
102281@@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
102282
102283 static int rt_cache_seq_open(struct inode *inode, struct file *file)
102284 {
102285- return seq_open(file, &rt_cache_seq_ops);
102286+ return seq_open_restrict(file, &rt_cache_seq_ops);
102287 }
102288
102289 static const struct file_operations rt_cache_seq_fops = {
102290@@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
102291
102292 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
102293 {
102294- return seq_open(file, &rt_cpu_seq_ops);
102295+ return seq_open_restrict(file, &rt_cpu_seq_ops);
102296 }
102297
102298 static const struct file_operations rt_cpu_seq_fops = {
102299@@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
102300
102301 static int rt_acct_proc_open(struct inode *inode, struct file *file)
102302 {
102303- return single_open(file, rt_acct_proc_show, NULL);
102304+ return single_open_restrict(file, rt_acct_proc_show, NULL);
102305 }
102306
102307 static const struct file_operations rt_acct_proc_fops = {
102308@@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
102309
102310 #define IP_IDENTS_SZ 2048u
102311 struct ip_ident_bucket {
102312- atomic_t id;
102313+ atomic_unchecked_t id;
102314 u32 stamp32;
102315 };
102316
102317-static struct ip_ident_bucket *ip_idents __read_mostly;
102318+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
102319
102320 /* In order to protect privacy, we add a perturbation to identifiers
102321 * if one generator is seldom used. This makes hard for an attacker
102322@@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
102323 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
102324 delta = prandom_u32_max(now - old);
102325
102326- return atomic_add_return(segs + delta, &bucket->id) - segs;
102327+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
102328 }
102329 EXPORT_SYMBOL(ip_idents_reserve);
102330
102331@@ -2624,34 +2624,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
102332 .maxlen = sizeof(int),
102333 .mode = 0200,
102334 .proc_handler = ipv4_sysctl_rtcache_flush,
102335+ .extra1 = &init_net,
102336 },
102337 { },
102338 };
102339
102340 static __net_init int sysctl_route_net_init(struct net *net)
102341 {
102342- struct ctl_table *tbl;
102343+ ctl_table_no_const *tbl = NULL;
102344
102345- tbl = ipv4_route_flush_table;
102346 if (!net_eq(net, &init_net)) {
102347- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
102348+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
102349 if (tbl == NULL)
102350 goto err_dup;
102351
102352 /* Don't export sysctls to unprivileged users */
102353 if (net->user_ns != &init_user_ns)
102354 tbl[0].procname = NULL;
102355- }
102356- tbl[0].extra1 = net;
102357+ tbl[0].extra1 = net;
102358+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
102359+ } else
102360+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
102361
102362- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
102363 if (net->ipv4.route_hdr == NULL)
102364 goto err_reg;
102365 return 0;
102366
102367 err_reg:
102368- if (tbl != ipv4_route_flush_table)
102369- kfree(tbl);
102370+ kfree(tbl);
102371 err_dup:
102372 return -ENOMEM;
102373 }
102374@@ -2674,8 +2674,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
102375
102376 static __net_init int rt_genid_init(struct net *net)
102377 {
102378- atomic_set(&net->ipv4.rt_genid, 0);
102379- atomic_set(&net->fnhe_genid, 0);
102380+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
102381+ atomic_set_unchecked(&net->fnhe_genid, 0);
102382 get_random_bytes(&net->ipv4.dev_addr_genid,
102383 sizeof(net->ipv4.dev_addr_genid));
102384 return 0;
102385@@ -2718,11 +2718,7 @@ int __init ip_rt_init(void)
102386 {
102387 int rc = 0;
102388
102389- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
102390- if (!ip_idents)
102391- panic("IP: failed to allocate ip_idents\n");
102392-
102393- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
102394+ prandom_bytes(ip_idents, sizeof(ip_idents));
102395
102396 #ifdef CONFIG_IP_ROUTE_CLASSID
102397 ip_rt_acct = __alloc_percpu(256 * sizeof(struct ip_rt_acct), __alignof__(struct ip_rt_acct));
102398diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
102399index b3c53c8..35cc18d 100644
102400--- a/net/ipv4/sysctl_net_ipv4.c
102401+++ b/net/ipv4/sysctl_net_ipv4.c
102402@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
102403 container_of(table->data, struct net, ipv4.ip_local_ports.range);
102404 int ret;
102405 int range[2];
102406- struct ctl_table tmp = {
102407+ ctl_table_no_const tmp = {
102408 .data = &range,
102409 .maxlen = sizeof(range),
102410 .mode = table->mode,
102411@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
102412 int ret;
102413 gid_t urange[2];
102414 kgid_t low, high;
102415- struct ctl_table tmp = {
102416+ ctl_table_no_const tmp = {
102417 .data = &urange,
102418 .maxlen = sizeof(urange),
102419 .mode = table->mode,
102420@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
102421 void __user *buffer, size_t *lenp, loff_t *ppos)
102422 {
102423 char val[TCP_CA_NAME_MAX];
102424- struct ctl_table tbl = {
102425+ ctl_table_no_const tbl = {
102426 .data = val,
102427 .maxlen = TCP_CA_NAME_MAX,
102428 };
102429@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
102430 void __user *buffer, size_t *lenp,
102431 loff_t *ppos)
102432 {
102433- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
102434+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
102435 int ret;
102436
102437 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
102438@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
102439 void __user *buffer, size_t *lenp,
102440 loff_t *ppos)
102441 {
102442- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
102443+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
102444 int ret;
102445
102446 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
102447@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
102448 void __user *buffer, size_t *lenp,
102449 loff_t *ppos)
102450 {
102451- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
102452+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
102453 struct tcp_fastopen_context *ctxt;
102454 int ret;
102455 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
102456@@ -874,13 +874,12 @@ static struct ctl_table ipv4_net_table[] = {
102457
102458 static __net_init int ipv4_sysctl_init_net(struct net *net)
102459 {
102460- struct ctl_table *table;
102461+ ctl_table_no_const *table = NULL;
102462
102463- table = ipv4_net_table;
102464 if (!net_eq(net, &init_net)) {
102465 int i;
102466
102467- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
102468+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
102469 if (table == NULL)
102470 goto err_alloc;
102471
102472@@ -889,7 +888,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
102473 table[i].data += (void *)net - (void *)&init_net;
102474 }
102475
102476- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
102477+ if (!net_eq(net, &init_net))
102478+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
102479+ else
102480+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
102481 if (net->ipv4.ipv4_hdr == NULL)
102482 goto err_reg;
102483
102484diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
102485index d107ee2..bcebf11 100644
102486--- a/net/ipv4/tcp_input.c
102487+++ b/net/ipv4/tcp_input.c
102488@@ -765,7 +765,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
102489 * without any lock. We want to make sure compiler wont store
102490 * intermediate values in this location.
102491 */
102492- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
102493+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
102494 sk->sk_max_pacing_rate);
102495 }
102496
102497@@ -4527,7 +4527,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
102498 * simplifies code)
102499 */
102500 static void
102501-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
102502+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
102503 struct sk_buff *head, struct sk_buff *tail,
102504 u32 start, u32 end)
102505 {
102506@@ -5506,6 +5506,7 @@ discard:
102507 tcp_paws_reject(&tp->rx_opt, 0))
102508 goto discard_and_undo;
102509
102510+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
102511 if (th->syn) {
102512 /* We see SYN without ACK. It is attempt of
102513 * simultaneous connect with crossed SYNs.
102514@@ -5556,6 +5557,7 @@ discard:
102515 goto discard;
102516 #endif
102517 }
102518+#endif
102519 /* "fifth, if neither of the SYN or RST bits is set then
102520 * drop the segment and return."
102521 */
102522@@ -5602,7 +5604,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
102523 goto discard;
102524
102525 if (th->syn) {
102526- if (th->fin)
102527+ if (th->fin || th->urg || th->psh)
102528 goto discard;
102529 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
102530 return 1;
102531diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
102532index ef7089c..a3e65fb 100644
102533--- a/net/ipv4/tcp_ipv4.c
102534+++ b/net/ipv4/tcp_ipv4.c
102535@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
102536 int sysctl_tcp_low_latency __read_mostly;
102537 EXPORT_SYMBOL(sysctl_tcp_low_latency);
102538
102539+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102540+extern int grsec_enable_blackhole;
102541+#endif
102542+
102543 #ifdef CONFIG_TCP_MD5SIG
102544 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
102545 __be32 daddr, __be32 saddr, const struct tcphdr *th);
102546@@ -1469,6 +1473,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
102547 return 0;
102548
102549 reset:
102550+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102551+ if (!grsec_enable_blackhole)
102552+#endif
102553 tcp_v4_send_reset(rsk, skb);
102554 discard:
102555 kfree_skb(skb);
102556@@ -1633,12 +1640,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
102557 TCP_SKB_CB(skb)->sacked = 0;
102558
102559 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
102560- if (!sk)
102561+ if (!sk) {
102562+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102563+ ret = 1;
102564+#endif
102565 goto no_tcp_socket;
102566-
102567+ }
102568 process:
102569- if (sk->sk_state == TCP_TIME_WAIT)
102570+ if (sk->sk_state == TCP_TIME_WAIT) {
102571+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102572+ ret = 2;
102573+#endif
102574 goto do_time_wait;
102575+ }
102576
102577 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
102578 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
102579@@ -1694,6 +1708,10 @@ csum_error:
102580 bad_packet:
102581 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
102582 } else {
102583+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102584+ if (!grsec_enable_blackhole || (ret == 1 &&
102585+ (skb->dev->flags & IFF_LOOPBACK)))
102586+#endif
102587 tcp_v4_send_reset(NULL, skb);
102588 }
102589
102590diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
102591index 63d2680..2db9d6b 100644
102592--- a/net/ipv4/tcp_minisocks.c
102593+++ b/net/ipv4/tcp_minisocks.c
102594@@ -27,6 +27,10 @@
102595 #include <net/inet_common.h>
102596 #include <net/xfrm.h>
102597
102598+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102599+extern int grsec_enable_blackhole;
102600+#endif
102601+
102602 int sysctl_tcp_syncookies __read_mostly = 1;
102603 EXPORT_SYMBOL(sysctl_tcp_syncookies);
102604
102605@@ -739,7 +743,10 @@ embryonic_reset:
102606 * avoid becoming vulnerable to outside attack aiming at
102607 * resetting legit local connections.
102608 */
102609- req->rsk_ops->send_reset(sk, skb);
102610+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102611+ if (!grsec_enable_blackhole)
102612+#endif
102613+ req->rsk_ops->send_reset(sk, skb);
102614 } else if (fastopen) { /* received a valid RST pkt */
102615 reqsk_fastopen_remove(sk, req, true);
102616 tcp_reset(sk);
102617diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
102618index ebf5ff5..4d1ff32 100644
102619--- a/net/ipv4/tcp_probe.c
102620+++ b/net/ipv4/tcp_probe.c
102621@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
102622 if (cnt + width >= len)
102623 break;
102624
102625- if (copy_to_user(buf + cnt, tbuf, width))
102626+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
102627 return -EFAULT;
102628 cnt += width;
102629 }
102630diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
102631index 9b21ae8..4eb67df 100644
102632--- a/net/ipv4/tcp_timer.c
102633+++ b/net/ipv4/tcp_timer.c
102634@@ -22,6 +22,10 @@
102635 #include <linux/gfp.h>
102636 #include <net/tcp.h>
102637
102638+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102639+extern int grsec_lastack_retries;
102640+#endif
102641+
102642 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
102643 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
102644 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
102645@@ -191,6 +195,13 @@ static int tcp_write_timeout(struct sock *sk)
102646 }
102647 }
102648
102649+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102650+ if ((sk->sk_state == TCP_LAST_ACK) &&
102651+ (grsec_lastack_retries > 0) &&
102652+ (grsec_lastack_retries < retry_until))
102653+ retry_until = grsec_lastack_retries;
102654+#endif
102655+
102656 if (retransmits_timed_out(sk, retry_until,
102657 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
102658 /* Has it gone just too far? */
102659diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
102660index cd0db54..93a6518 100644
102661--- a/net/ipv4/udp.c
102662+++ b/net/ipv4/udp.c
102663@@ -87,6 +87,7 @@
102664 #include <linux/types.h>
102665 #include <linux/fcntl.h>
102666 #include <linux/module.h>
102667+#include <linux/security.h>
102668 #include <linux/socket.h>
102669 #include <linux/sockios.h>
102670 #include <linux/igmp.h>
102671@@ -114,6 +115,10 @@
102672 #include <net/busy_poll.h>
102673 #include "udp_impl.h"
102674
102675+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102676+extern int grsec_enable_blackhole;
102677+#endif
102678+
102679 struct udp_table udp_table __read_mostly;
102680 EXPORT_SYMBOL(udp_table);
102681
102682@@ -595,6 +600,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
102683 return true;
102684 }
102685
102686+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
102687+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
102688+
102689 /*
102690 * This routine is called by the ICMP module when it gets some
102691 * sort of error condition. If err < 0 then the socket should
102692@@ -932,9 +940,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
102693 dport = usin->sin_port;
102694 if (dport == 0)
102695 return -EINVAL;
102696+
102697+ err = gr_search_udp_sendmsg(sk, usin);
102698+ if (err)
102699+ return err;
102700 } else {
102701 if (sk->sk_state != TCP_ESTABLISHED)
102702 return -EDESTADDRREQ;
102703+
102704+ err = gr_search_udp_sendmsg(sk, NULL);
102705+ if (err)
102706+ return err;
102707+
102708 daddr = inet->inet_daddr;
102709 dport = inet->inet_dport;
102710 /* Open fast path for connected socket.
102711@@ -1182,7 +1199,7 @@ static unsigned int first_packet_length(struct sock *sk)
102712 IS_UDPLITE(sk));
102713 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
102714 IS_UDPLITE(sk));
102715- atomic_inc(&sk->sk_drops);
102716+ atomic_inc_unchecked(&sk->sk_drops);
102717 __skb_unlink(skb, rcvq);
102718 __skb_queue_tail(&list_kill, skb);
102719 }
102720@@ -1262,6 +1279,10 @@ try_again:
102721 if (!skb)
102722 goto out;
102723
102724+ err = gr_search_udp_recvmsg(sk, skb);
102725+ if (err)
102726+ goto out_free;
102727+
102728 ulen = skb->len - sizeof(struct udphdr);
102729 copied = len;
102730 if (copied > ulen)
102731@@ -1295,7 +1316,7 @@ try_again:
102732 if (unlikely(err)) {
102733 trace_kfree_skb(skb, udp_recvmsg);
102734 if (!peeked) {
102735- atomic_inc(&sk->sk_drops);
102736+ atomic_inc_unchecked(&sk->sk_drops);
102737 UDP_INC_STATS_USER(sock_net(sk),
102738 UDP_MIB_INERRORS, is_udplite);
102739 }
102740@@ -1592,7 +1613,7 @@ csum_error:
102741 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
102742 drop:
102743 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
102744- atomic_inc(&sk->sk_drops);
102745+ atomic_inc_unchecked(&sk->sk_drops);
102746 kfree_skb(skb);
102747 return -1;
102748 }
102749@@ -1611,7 +1632,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
102750 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
102751
102752 if (!skb1) {
102753- atomic_inc(&sk->sk_drops);
102754+ atomic_inc_unchecked(&sk->sk_drops);
102755 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
102756 IS_UDPLITE(sk));
102757 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
102758@@ -1812,6 +1833,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
102759 goto csum_error;
102760
102761 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
102762+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
102763+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
102764+#endif
102765 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
102766
102767 /*
102768@@ -2398,7 +2422,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
102769 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
102770 0, sock_i_ino(sp),
102771 atomic_read(&sp->sk_refcnt), sp,
102772- atomic_read(&sp->sk_drops));
102773+ atomic_read_unchecked(&sp->sk_drops));
102774 }
102775
102776 int udp4_seq_show(struct seq_file *seq, void *v)
102777diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
102778index 6156f68..d6ab46d 100644
102779--- a/net/ipv4/xfrm4_policy.c
102780+++ b/net/ipv4/xfrm4_policy.c
102781@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
102782 fl4->flowi4_tos = iph->tos;
102783 }
102784
102785-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
102786+static int xfrm4_garbage_collect(struct dst_ops *ops)
102787 {
102788 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
102789
102790- xfrm4_policy_afinfo.garbage_collect(net);
102791+ xfrm_garbage_collect_deferred(net);
102792 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
102793 }
102794
102795@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
102796
102797 static int __net_init xfrm4_net_init(struct net *net)
102798 {
102799- struct ctl_table *table;
102800+ ctl_table_no_const *table = NULL;
102801 struct ctl_table_header *hdr;
102802
102803- table = xfrm4_policy_table;
102804 if (!net_eq(net, &init_net)) {
102805- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
102806+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
102807 if (!table)
102808 goto err_alloc;
102809
102810 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
102811- }
102812-
102813- hdr = register_net_sysctl(net, "net/ipv4", table);
102814+ hdr = register_net_sysctl(net, "net/ipv4", table);
102815+ } else
102816+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
102817 if (!hdr)
102818 goto err_reg;
102819
102820@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
102821 return 0;
102822
102823 err_reg:
102824- if (!net_eq(net, &init_net))
102825- kfree(table);
102826+ kfree(table);
102827 err_alloc:
102828 return -ENOMEM;
102829 }
102830diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
102831index 0169ccf..50d7b04 100644
102832--- a/net/ipv6/addrconf.c
102833+++ b/net/ipv6/addrconf.c
102834@@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
102835 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
102836 .mtu6 = IPV6_MIN_MTU,
102837 .accept_ra = 1,
102838- .accept_redirects = 1,
102839+ .accept_redirects = 0,
102840 .autoconf = 1,
102841 .force_mld_version = 0,
102842 .mldv1_unsolicited_report_interval = 10 * HZ,
102843@@ -208,7 +208,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
102844 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
102845 .mtu6 = IPV6_MIN_MTU,
102846 .accept_ra = 1,
102847- .accept_redirects = 1,
102848+ .accept_redirects = 0,
102849 .autoconf = 1,
102850 .force_mld_version = 0,
102851 .mldv1_unsolicited_report_interval = 10 * HZ,
102852@@ -604,7 +604,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
102853 idx = 0;
102854 head = &net->dev_index_head[h];
102855 rcu_read_lock();
102856- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
102857+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
102858 net->dev_base_seq;
102859 hlist_for_each_entry_rcu(dev, head, index_hlist) {
102860 if (idx < s_idx)
102861@@ -2396,7 +2396,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
102862 p.iph.ihl = 5;
102863 p.iph.protocol = IPPROTO_IPV6;
102864 p.iph.ttl = 64;
102865- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
102866+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
102867
102868 if (ops->ndo_do_ioctl) {
102869 mm_segment_t oldfs = get_fs();
102870@@ -3534,16 +3534,23 @@ static const struct file_operations if6_fops = {
102871 .release = seq_release_net,
102872 };
102873
102874+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
102875+extern void unregister_ipv6_seq_ops_addr(void);
102876+
102877 static int __net_init if6_proc_net_init(struct net *net)
102878 {
102879- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
102880+ register_ipv6_seq_ops_addr(&if6_seq_ops);
102881+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
102882+ unregister_ipv6_seq_ops_addr();
102883 return -ENOMEM;
102884+ }
102885 return 0;
102886 }
102887
102888 static void __net_exit if6_proc_net_exit(struct net *net)
102889 {
102890 remove_proc_entry("if_inet6", net->proc_net);
102891+ unregister_ipv6_seq_ops_addr();
102892 }
102893
102894 static struct pernet_operations if6_proc_net_ops = {
102895@@ -4159,7 +4166,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
102896 s_ip_idx = ip_idx = cb->args[2];
102897
102898 rcu_read_lock();
102899- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
102900+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
102901 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
102902 idx = 0;
102903 head = &net->dev_index_head[h];
102904@@ -4788,7 +4795,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
102905 rt_genid_bump_ipv6(net);
102906 break;
102907 }
102908- atomic_inc(&net->ipv6.dev_addr_genid);
102909+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
102910 }
102911
102912 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
102913@@ -4808,7 +4815,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
102914 int *valp = ctl->data;
102915 int val = *valp;
102916 loff_t pos = *ppos;
102917- struct ctl_table lctl;
102918+ ctl_table_no_const lctl;
102919 int ret;
102920
102921 /*
102922@@ -4893,7 +4900,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
102923 int *valp = ctl->data;
102924 int val = *valp;
102925 loff_t pos = *ppos;
102926- struct ctl_table lctl;
102927+ ctl_table_no_const lctl;
102928 int ret;
102929
102930 /*
102931diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
102932index e8c4400..a4cd5da 100644
102933--- a/net/ipv6/af_inet6.c
102934+++ b/net/ipv6/af_inet6.c
102935@@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
102936 net->ipv6.sysctl.icmpv6_time = 1*HZ;
102937 net->ipv6.sysctl.flowlabel_consistency = 1;
102938 net->ipv6.sysctl.auto_flowlabels = 0;
102939- atomic_set(&net->ipv6.fib6_sernum, 1);
102940+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
102941
102942 err = ipv6_init_mibs(net);
102943 if (err)
102944diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
102945index 2cdc383..09cffb8 100644
102946--- a/net/ipv6/datagram.c
102947+++ b/net/ipv6/datagram.c
102948@@ -928,5 +928,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
102949 0,
102950 sock_i_ino(sp),
102951 atomic_read(&sp->sk_refcnt), sp,
102952- atomic_read(&sp->sk_drops));
102953+ atomic_read_unchecked(&sp->sk_drops));
102954 }
102955diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
102956index 97ae700..18dcae0 100644
102957--- a/net/ipv6/icmp.c
102958+++ b/net/ipv6/icmp.c
102959@@ -997,7 +997,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
102960
102961 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
102962 {
102963- struct ctl_table *table;
102964+ ctl_table_no_const *table;
102965
102966 table = kmemdup(ipv6_icmp_table_template,
102967 sizeof(ipv6_icmp_table_template),
102968diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
102969index b2d1838..0194c04 100644
102970--- a/net/ipv6/ip6_fib.c
102971+++ b/net/ipv6/ip6_fib.c
102972@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
102973 int new, old;
102974
102975 do {
102976- old = atomic_read(&net->ipv6.fib6_sernum);
102977+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
102978 new = old < INT_MAX ? old + 1 : 1;
102979- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
102980+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
102981 old, new) != old);
102982 return new;
102983 }
102984diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
102985index 0e32d2e..98cbe65 100644
102986--- a/net/ipv6/ip6_gre.c
102987+++ b/net/ipv6/ip6_gre.c
102988@@ -71,8 +71,8 @@ struct ip6gre_net {
102989 struct net_device *fb_tunnel_dev;
102990 };
102991
102992-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
102993-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
102994+static struct rtnl_link_ops ip6gre_link_ops;
102995+static struct rtnl_link_ops ip6gre_tap_ops;
102996 static int ip6gre_tunnel_init(struct net_device *dev);
102997 static void ip6gre_tunnel_setup(struct net_device *dev);
102998 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
102999@@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
103000 }
103001
103002
103003-static struct inet6_protocol ip6gre_protocol __read_mostly = {
103004+static struct inet6_protocol ip6gre_protocol = {
103005 .handler = ip6gre_rcv,
103006 .err_handler = ip6gre_err,
103007 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
103008@@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
103009 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
103010 };
103011
103012-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
103013+static struct rtnl_link_ops ip6gre_link_ops = {
103014 .kind = "ip6gre",
103015 .maxtype = IFLA_GRE_MAX,
103016 .policy = ip6gre_policy,
103017@@ -1664,7 +1664,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
103018 .fill_info = ip6gre_fill_info,
103019 };
103020
103021-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
103022+static struct rtnl_link_ops ip6gre_tap_ops = {
103023 .kind = "ip6gretap",
103024 .maxtype = IFLA_GRE_MAX,
103025 .policy = ip6gre_policy,
103026diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
103027index 9cb94cf..5678108 100644
103028--- a/net/ipv6/ip6_tunnel.c
103029+++ b/net/ipv6/ip6_tunnel.c
103030@@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
103031
103032 static int ip6_tnl_dev_init(struct net_device *dev);
103033 static void ip6_tnl_dev_setup(struct net_device *dev);
103034-static struct rtnl_link_ops ip6_link_ops __read_mostly;
103035+static struct rtnl_link_ops ip6_link_ops;
103036
103037 static int ip6_tnl_net_id __read_mostly;
103038 struct ip6_tnl_net {
103039@@ -1706,7 +1706,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
103040 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
103041 };
103042
103043-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
103044+static struct rtnl_link_ops ip6_link_ops = {
103045 .kind = "ip6tnl",
103046 .maxtype = IFLA_IPTUN_MAX,
103047 .policy = ip6_tnl_policy,
103048diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
103049index bcda14d..49378c9 100644
103050--- a/net/ipv6/ip6_vti.c
103051+++ b/net/ipv6/ip6_vti.c
103052@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
103053
103054 static int vti6_dev_init(struct net_device *dev);
103055 static void vti6_dev_setup(struct net_device *dev);
103056-static struct rtnl_link_ops vti6_link_ops __read_mostly;
103057+static struct rtnl_link_ops vti6_link_ops;
103058
103059 static int vti6_net_id __read_mostly;
103060 struct vti6_net {
103061@@ -981,7 +981,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
103062 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
103063 };
103064
103065-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
103066+static struct rtnl_link_ops vti6_link_ops = {
103067 .kind = "vti6",
103068 .maxtype = IFLA_VTI_MAX,
103069 .policy = vti6_policy,
103070diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
103071index e1a9583..7dd8f4d 100644
103072--- a/net/ipv6/ipv6_sockglue.c
103073+++ b/net/ipv6/ipv6_sockglue.c
103074@@ -993,7 +993,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
103075 if (sk->sk_type != SOCK_STREAM)
103076 return -ENOPROTOOPT;
103077
103078- msg.msg_control = optval;
103079+ msg.msg_control = (void __force_kernel *)optval;
103080 msg.msg_controllen = len;
103081 msg.msg_flags = flags;
103082
103083diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
103084index e080fbb..412b3cf 100644
103085--- a/net/ipv6/netfilter/ip6_tables.c
103086+++ b/net/ipv6/netfilter/ip6_tables.c
103087@@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
103088 #endif
103089
103090 static int get_info(struct net *net, void __user *user,
103091- const int *len, int compat)
103092+ int len, int compat)
103093 {
103094 char name[XT_TABLE_MAXNAMELEN];
103095 struct xt_table *t;
103096 int ret;
103097
103098- if (*len != sizeof(struct ip6t_getinfo)) {
103099- duprintf("length %u != %zu\n", *len,
103100+ if (len != sizeof(struct ip6t_getinfo)) {
103101+ duprintf("length %u != %zu\n", len,
103102 sizeof(struct ip6t_getinfo));
103103 return -EINVAL;
103104 }
103105@@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
103106 info.size = private->size;
103107 strcpy(info.name, name);
103108
103109- if (copy_to_user(user, &info, *len) != 0)
103110+ if (copy_to_user(user, &info, len) != 0)
103111 ret = -EFAULT;
103112 else
103113 ret = 0;
103114@@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103115
103116 switch (cmd) {
103117 case IP6T_SO_GET_INFO:
103118- ret = get_info(sock_net(sk), user, len, 1);
103119+ ret = get_info(sock_net(sk), user, *len, 1);
103120 break;
103121 case IP6T_SO_GET_ENTRIES:
103122 ret = compat_get_entries(sock_net(sk), user, len);
103123@@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
103124
103125 switch (cmd) {
103126 case IP6T_SO_GET_INFO:
103127- ret = get_info(sock_net(sk), user, len, 0);
103128+ ret = get_info(sock_net(sk), user, *len, 0);
103129 break;
103130
103131 case IP6T_SO_GET_ENTRIES:
103132diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
103133index 6f187c8..34b367f 100644
103134--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
103135+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
103136@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
103137
103138 static int nf_ct_frag6_sysctl_register(struct net *net)
103139 {
103140- struct ctl_table *table;
103141+ ctl_table_no_const *table = NULL;
103142 struct ctl_table_header *hdr;
103143
103144- table = nf_ct_frag6_sysctl_table;
103145 if (!net_eq(net, &init_net)) {
103146- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
103147+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
103148 GFP_KERNEL);
103149 if (table == NULL)
103150 goto err_alloc;
103151@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
103152 table[2].data = &net->nf_frag.frags.high_thresh;
103153 table[2].extra1 = &net->nf_frag.frags.low_thresh;
103154 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
103155- }
103156-
103157- hdr = register_net_sysctl(net, "net/netfilter", table);
103158+ hdr = register_net_sysctl(net, "net/netfilter", table);
103159+ } else
103160+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
103161 if (hdr == NULL)
103162 goto err_reg;
103163
103164@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
103165 return 0;
103166
103167 err_reg:
103168- if (!net_eq(net, &init_net))
103169- kfree(table);
103170+ kfree(table);
103171 err_alloc:
103172 return -ENOMEM;
103173 }
103174diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
103175index 5b7a1ed..d9da205 100644
103176--- a/net/ipv6/ping.c
103177+++ b/net/ipv6/ping.c
103178@@ -240,6 +240,24 @@ static struct pernet_operations ping_v6_net_ops = {
103179 };
103180 #endif
103181
103182+static struct pingv6_ops real_pingv6_ops = {
103183+ .ipv6_recv_error = ipv6_recv_error,
103184+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
103185+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
103186+ .icmpv6_err_convert = icmpv6_err_convert,
103187+ .ipv6_icmp_error = ipv6_icmp_error,
103188+ .ipv6_chk_addr = ipv6_chk_addr,
103189+};
103190+
103191+static struct pingv6_ops dummy_pingv6_ops = {
103192+ .ipv6_recv_error = dummy_ipv6_recv_error,
103193+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
103194+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
103195+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
103196+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
103197+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
103198+};
103199+
103200 int __init pingv6_init(void)
103201 {
103202 #ifdef CONFIG_PROC_FS
103203@@ -247,13 +265,7 @@ int __init pingv6_init(void)
103204 if (ret)
103205 return ret;
103206 #endif
103207- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
103208- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
103209- pingv6_ops.ip6_datagram_recv_specific_ctl =
103210- ip6_datagram_recv_specific_ctl;
103211- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
103212- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
103213- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
103214+ pingv6_ops = &real_pingv6_ops;
103215 return inet6_register_protosw(&pingv6_protosw);
103216 }
103217
103218@@ -262,14 +274,9 @@ int __init pingv6_init(void)
103219 */
103220 void pingv6_exit(void)
103221 {
103222- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
103223- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
103224- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
103225- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
103226- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
103227- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
103228 #ifdef CONFIG_PROC_FS
103229 unregister_pernet_subsys(&ping_v6_net_ops);
103230 #endif
103231+ pingv6_ops = &dummy_pingv6_ops;
103232 inet6_unregister_protosw(&pingv6_protosw);
103233 }
103234diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
103235index 1752cd0..3c6af41 100644
103236--- a/net/ipv6/proc.c
103237+++ b/net/ipv6/proc.c
103238@@ -309,7 +309,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
103239 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
103240 goto proc_snmp6_fail;
103241
103242- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
103243+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
103244 if (!net->mib.proc_net_devsnmp6)
103245 goto proc_dev_snmp6_fail;
103246 return 0;
103247diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
103248index 896af88..6e2ba628 100644
103249--- a/net/ipv6/raw.c
103250+++ b/net/ipv6/raw.c
103251@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
103252 {
103253 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
103254 skb_checksum_complete(skb)) {
103255- atomic_inc(&sk->sk_drops);
103256+ atomic_inc_unchecked(&sk->sk_drops);
103257 kfree_skb(skb);
103258 return NET_RX_DROP;
103259 }
103260@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
103261 struct raw6_sock *rp = raw6_sk(sk);
103262
103263 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
103264- atomic_inc(&sk->sk_drops);
103265+ atomic_inc_unchecked(&sk->sk_drops);
103266 kfree_skb(skb);
103267 return NET_RX_DROP;
103268 }
103269@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
103270
103271 if (inet->hdrincl) {
103272 if (skb_checksum_complete(skb)) {
103273- atomic_inc(&sk->sk_drops);
103274+ atomic_inc_unchecked(&sk->sk_drops);
103275 kfree_skb(skb);
103276 return NET_RX_DROP;
103277 }
103278@@ -608,7 +608,7 @@ out:
103279 return err;
103280 }
103281
103282-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
103283+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
103284 struct flowi6 *fl6, struct dst_entry **dstp,
103285 unsigned int flags)
103286 {
103287@@ -914,12 +914,15 @@ do_confirm:
103288 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
103289 char __user *optval, int optlen)
103290 {
103291+ struct icmp6_filter filter;
103292+
103293 switch (optname) {
103294 case ICMPV6_FILTER:
103295 if (optlen > sizeof(struct icmp6_filter))
103296 optlen = sizeof(struct icmp6_filter);
103297- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
103298+ if (copy_from_user(&filter, optval, optlen))
103299 return -EFAULT;
103300+ raw6_sk(sk)->filter = filter;
103301 return 0;
103302 default:
103303 return -ENOPROTOOPT;
103304@@ -932,6 +935,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
103305 char __user *optval, int __user *optlen)
103306 {
103307 int len;
103308+ struct icmp6_filter filter;
103309
103310 switch (optname) {
103311 case ICMPV6_FILTER:
103312@@ -943,7 +947,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
103313 len = sizeof(struct icmp6_filter);
103314 if (put_user(len, optlen))
103315 return -EFAULT;
103316- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
103317+ filter = raw6_sk(sk)->filter;
103318+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
103319 return -EFAULT;
103320 return 0;
103321 default:
103322diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
103323index 1a157ca..9fc05f4 100644
103324--- a/net/ipv6/reassembly.c
103325+++ b/net/ipv6/reassembly.c
103326@@ -625,12 +625,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
103327
103328 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103329 {
103330- struct ctl_table *table;
103331+ ctl_table_no_const *table = NULL;
103332 struct ctl_table_header *hdr;
103333
103334- table = ip6_frags_ns_ctl_table;
103335 if (!net_eq(net, &init_net)) {
103336- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
103337+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
103338 if (table == NULL)
103339 goto err_alloc;
103340
103341@@ -644,9 +643,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103342 /* Don't export sysctls to unprivileged users */
103343 if (net->user_ns != &init_user_ns)
103344 table[0].procname = NULL;
103345- }
103346+ hdr = register_net_sysctl(net, "net/ipv6", table);
103347+ } else
103348+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
103349
103350- hdr = register_net_sysctl(net, "net/ipv6", table);
103351 if (hdr == NULL)
103352 goto err_reg;
103353
103354@@ -654,8 +654,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
103355 return 0;
103356
103357 err_reg:
103358- if (!net_eq(net, &init_net))
103359- kfree(table);
103360+ kfree(table);
103361 err_alloc:
103362 return -ENOMEM;
103363 }
103364diff --git a/net/ipv6/route.c b/net/ipv6/route.c
103365index a318dd89..7ecfea6 100644
103366--- a/net/ipv6/route.c
103367+++ b/net/ipv6/route.c
103368@@ -2965,7 +2965,7 @@ struct ctl_table ipv6_route_table_template[] = {
103369
103370 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
103371 {
103372- struct ctl_table *table;
103373+ ctl_table_no_const *table;
103374
103375 table = kmemdup(ipv6_route_table_template,
103376 sizeof(ipv6_route_table_template),
103377diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
103378index a24557a..00a9ed1 100644
103379--- a/net/ipv6/sit.c
103380+++ b/net/ipv6/sit.c
103381@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
103382 static void ipip6_dev_free(struct net_device *dev);
103383 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
103384 __be32 *v4dst);
103385-static struct rtnl_link_ops sit_link_ops __read_mostly;
103386+static struct rtnl_link_ops sit_link_ops;
103387
103388 static int sit_net_id __read_mostly;
103389 struct sit_net {
103390@@ -1750,7 +1750,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
103391 unregister_netdevice_queue(dev, head);
103392 }
103393
103394-static struct rtnl_link_ops sit_link_ops __read_mostly = {
103395+static struct rtnl_link_ops sit_link_ops = {
103396 .kind = "sit",
103397 .maxtype = IFLA_IPTUN_MAX,
103398 .policy = ipip6_policy,
103399diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
103400index c5c10fa..2577d51 100644
103401--- a/net/ipv6/sysctl_net_ipv6.c
103402+++ b/net/ipv6/sysctl_net_ipv6.c
103403@@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
103404
103405 static int __net_init ipv6_sysctl_net_init(struct net *net)
103406 {
103407- struct ctl_table *ipv6_table;
103408+ ctl_table_no_const *ipv6_table;
103409 struct ctl_table *ipv6_route_table;
103410 struct ctl_table *ipv6_icmp_table;
103411 int err;
103412diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
103413index c277951..c7ee5bf 100644
103414--- a/net/ipv6/tcp_ipv6.c
103415+++ b/net/ipv6/tcp_ipv6.c
103416@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
103417 }
103418 }
103419
103420+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103421+extern int grsec_enable_blackhole;
103422+#endif
103423+
103424 static void tcp_v6_hash(struct sock *sk)
103425 {
103426 if (sk->sk_state != TCP_CLOSE) {
103427@@ -1341,6 +1345,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
103428 return 0;
103429
103430 reset:
103431+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103432+ if (!grsec_enable_blackhole)
103433+#endif
103434 tcp_v6_send_reset(sk, skb);
103435 discard:
103436 if (opt_skb)
103437@@ -1434,12 +1441,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
103438
103439 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
103440 tcp_v6_iif(skb));
103441- if (!sk)
103442+ if (!sk) {
103443+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103444+ ret = 1;
103445+#endif
103446 goto no_tcp_socket;
103447+ }
103448
103449 process:
103450- if (sk->sk_state == TCP_TIME_WAIT)
103451+ if (sk->sk_state == TCP_TIME_WAIT) {
103452+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103453+ ret = 2;
103454+#endif
103455 goto do_time_wait;
103456+ }
103457
103458 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
103459 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
103460@@ -1486,6 +1501,10 @@ csum_error:
103461 bad_packet:
103462 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
103463 } else {
103464+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103465+ if (!grsec_enable_blackhole || (ret == 1 &&
103466+ (skb->dev->flags & IFF_LOOPBACK)))
103467+#endif
103468 tcp_v6_send_reset(NULL, skb);
103469 }
103470
103471diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
103472index f6ba535..b41033f 100644
103473--- a/net/ipv6/udp.c
103474+++ b/net/ipv6/udp.c
103475@@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
103476 udp_ipv6_hash_secret + net_hash_mix(net));
103477 }
103478
103479+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103480+extern int grsec_enable_blackhole;
103481+#endif
103482+
103483 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
103484 {
103485 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
103486@@ -434,7 +438,7 @@ try_again:
103487 if (unlikely(err)) {
103488 trace_kfree_skb(skb, udpv6_recvmsg);
103489 if (!peeked) {
103490- atomic_inc(&sk->sk_drops);
103491+ atomic_inc_unchecked(&sk->sk_drops);
103492 if (is_udp4)
103493 UDP_INC_STATS_USER(sock_net(sk),
103494 UDP_MIB_INERRORS,
103495@@ -701,7 +705,7 @@ csum_error:
103496 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
103497 drop:
103498 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
103499- atomic_inc(&sk->sk_drops);
103500+ atomic_inc_unchecked(&sk->sk_drops);
103501 kfree_skb(skb);
103502 return -1;
103503 }
103504@@ -740,7 +744,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
103505 if (likely(skb1 == NULL))
103506 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
103507 if (!skb1) {
103508- atomic_inc(&sk->sk_drops);
103509+ atomic_inc_unchecked(&sk->sk_drops);
103510 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
103511 IS_UDPLITE(sk));
103512 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
103513@@ -919,6 +923,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
103514 goto csum_error;
103515
103516 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
103517+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103518+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
103519+#endif
103520 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
103521
103522 kfree_skb(skb);
103523diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
103524index 5f98364..5ca982a 100644
103525--- a/net/ipv6/xfrm6_policy.c
103526+++ b/net/ipv6/xfrm6_policy.c
103527@@ -130,8 +130,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
103528 {
103529 struct flowi6 *fl6 = &fl->u.ip6;
103530 int onlyproto = 0;
103531- u16 offset = skb_network_header_len(skb);
103532 const struct ipv6hdr *hdr = ipv6_hdr(skb);
103533+ u16 offset = sizeof(*hdr);
103534 struct ipv6_opt_hdr *exthdr;
103535 const unsigned char *nh = skb_network_header(skb);
103536 u8 nexthdr = nh[IP6CB(skb)->nhoff];
103537@@ -217,11 +217,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
103538 }
103539 }
103540
103541-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
103542+static int xfrm6_garbage_collect(struct dst_ops *ops)
103543 {
103544 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
103545
103546- xfrm6_policy_afinfo.garbage_collect(net);
103547+ xfrm_garbage_collect_deferred(net);
103548 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
103549 }
103550
103551@@ -334,19 +334,19 @@ static struct ctl_table xfrm6_policy_table[] = {
103552
103553 static int __net_init xfrm6_net_init(struct net *net)
103554 {
103555- struct ctl_table *table;
103556+ ctl_table_no_const *table = NULL;
103557 struct ctl_table_header *hdr;
103558
103559- table = xfrm6_policy_table;
103560 if (!net_eq(net, &init_net)) {
103561- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
103562+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
103563 if (!table)
103564 goto err_alloc;
103565
103566 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
103567- }
103568+ hdr = register_net_sysctl(net, "net/ipv6", table);
103569+ } else
103570+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
103571
103572- hdr = register_net_sysctl(net, "net/ipv6", table);
103573 if (!hdr)
103574 goto err_reg;
103575
103576@@ -354,8 +354,7 @@ static int __net_init xfrm6_net_init(struct net *net)
103577 return 0;
103578
103579 err_reg:
103580- if (!net_eq(net, &init_net))
103581- kfree(table);
103582+ kfree(table);
103583 err_alloc:
103584 return -ENOMEM;
103585 }
103586diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
103587index e15c16a..7cf07aa 100644
103588--- a/net/ipx/ipx_proc.c
103589+++ b/net/ipx/ipx_proc.c
103590@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
103591 struct proc_dir_entry *p;
103592 int rc = -ENOMEM;
103593
103594- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
103595+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
103596
103597 if (!ipx_proc_dir)
103598 goto out;
103599diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
103600index 61ceb4c..e788eb8 100644
103601--- a/net/irda/ircomm/ircomm_tty.c
103602+++ b/net/irda/ircomm/ircomm_tty.c
103603@@ -317,10 +317,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103604 add_wait_queue(&port->open_wait, &wait);
103605
103606 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
103607- __FILE__, __LINE__, tty->driver->name, port->count);
103608+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103609
103610 spin_lock_irqsave(&port->lock, flags);
103611- port->count--;
103612+ atomic_dec(&port->count);
103613 port->blocked_open++;
103614 spin_unlock_irqrestore(&port->lock, flags);
103615
103616@@ -355,7 +355,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103617 }
103618
103619 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
103620- __FILE__, __LINE__, tty->driver->name, port->count);
103621+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103622
103623 schedule();
103624 }
103625@@ -365,12 +365,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
103626
103627 spin_lock_irqsave(&port->lock, flags);
103628 if (!tty_hung_up_p(filp))
103629- port->count++;
103630+ atomic_inc(&port->count);
103631 port->blocked_open--;
103632 spin_unlock_irqrestore(&port->lock, flags);
103633
103634 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
103635- __FILE__, __LINE__, tty->driver->name, port->count);
103636+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
103637
103638 if (!retval)
103639 port->flags |= ASYNC_NORMAL_ACTIVE;
103640@@ -444,12 +444,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
103641
103642 /* ++ is not atomic, so this should be protected - Jean II */
103643 spin_lock_irqsave(&self->port.lock, flags);
103644- self->port.count++;
103645+ atomic_inc(&self->port.count);
103646 spin_unlock_irqrestore(&self->port.lock, flags);
103647 tty_port_tty_set(&self->port, tty);
103648
103649 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
103650- self->line, self->port.count);
103651+ self->line, atomic_read(&self->port.count));
103652
103653 /* Not really used by us, but lets do it anyway */
103654 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
103655@@ -985,7 +985,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
103656 tty_kref_put(port->tty);
103657 }
103658 port->tty = NULL;
103659- port->count = 0;
103660+ atomic_set(&port->count, 0);
103661 spin_unlock_irqrestore(&port->lock, flags);
103662
103663 wake_up_interruptible(&port->open_wait);
103664@@ -1342,7 +1342,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
103665 seq_putc(m, '\n');
103666
103667 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
103668- seq_printf(m, "Open count: %d\n", self->port.count);
103669+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
103670 seq_printf(m, "Max data size: %d\n", self->max_data_size);
103671 seq_printf(m, "Max header size: %d\n", self->max_header_size);
103672
103673diff --git a/net/irda/irproc.c b/net/irda/irproc.c
103674index b9ac598..f88cc56 100644
103675--- a/net/irda/irproc.c
103676+++ b/net/irda/irproc.c
103677@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
103678 {
103679 int i;
103680
103681- proc_irda = proc_mkdir("irda", init_net.proc_net);
103682+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
103683 if (proc_irda == NULL)
103684 return;
103685
103686diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
103687index a089b6b..3ca3b60 100644
103688--- a/net/iucv/af_iucv.c
103689+++ b/net/iucv/af_iucv.c
103690@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
103691 {
103692 char name[12];
103693
103694- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
103695+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
103696 while (__iucv_get_sock_by_name(name)) {
103697 sprintf(name, "%08x",
103698- atomic_inc_return(&iucv_sk_list.autobind_name));
103699+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
103700 }
103701 memcpy(iucv->src_name, name, 8);
103702 }
103703diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
103704index 2a6a1fd..6c112b0 100644
103705--- a/net/iucv/iucv.c
103706+++ b/net/iucv/iucv.c
103707@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
103708 return NOTIFY_OK;
103709 }
103710
103711-static struct notifier_block __refdata iucv_cpu_notifier = {
103712+static struct notifier_block iucv_cpu_notifier = {
103713 .notifier_call = iucv_cpu_notify,
103714 };
103715
103716diff --git a/net/key/af_key.c b/net/key/af_key.c
103717index 1847ec4..26ef732 100644
103718--- a/net/key/af_key.c
103719+++ b/net/key/af_key.c
103720@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
103721 static u32 get_acqseq(void)
103722 {
103723 u32 res;
103724- static atomic_t acqseq;
103725+ static atomic_unchecked_t acqseq;
103726
103727 do {
103728- res = atomic_inc_return(&acqseq);
103729+ res = atomic_inc_return_unchecked(&acqseq);
103730 } while (!res);
103731 return res;
103732 }
103733diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
103734index edb78e6..8dc654a 100644
103735--- a/net/l2tp/l2tp_eth.c
103736+++ b/net/l2tp/l2tp_eth.c
103737@@ -42,12 +42,12 @@ struct l2tp_eth {
103738 struct sock *tunnel_sock;
103739 struct l2tp_session *session;
103740 struct list_head list;
103741- atomic_long_t tx_bytes;
103742- atomic_long_t tx_packets;
103743- atomic_long_t tx_dropped;
103744- atomic_long_t rx_bytes;
103745- atomic_long_t rx_packets;
103746- atomic_long_t rx_errors;
103747+ atomic_long_unchecked_t tx_bytes;
103748+ atomic_long_unchecked_t tx_packets;
103749+ atomic_long_unchecked_t tx_dropped;
103750+ atomic_long_unchecked_t rx_bytes;
103751+ atomic_long_unchecked_t rx_packets;
103752+ atomic_long_unchecked_t rx_errors;
103753 };
103754
103755 /* via l2tp_session_priv() */
103756@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
103757 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
103758
103759 if (likely(ret == NET_XMIT_SUCCESS)) {
103760- atomic_long_add(len, &priv->tx_bytes);
103761- atomic_long_inc(&priv->tx_packets);
103762+ atomic_long_add_unchecked(len, &priv->tx_bytes);
103763+ atomic_long_inc_unchecked(&priv->tx_packets);
103764 } else {
103765- atomic_long_inc(&priv->tx_dropped);
103766+ atomic_long_inc_unchecked(&priv->tx_dropped);
103767 }
103768 return NETDEV_TX_OK;
103769 }
103770@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
103771 {
103772 struct l2tp_eth *priv = netdev_priv(dev);
103773
103774- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
103775- stats->tx_packets = atomic_long_read(&priv->tx_packets);
103776- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
103777- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
103778- stats->rx_packets = atomic_long_read(&priv->rx_packets);
103779- stats->rx_errors = atomic_long_read(&priv->rx_errors);
103780+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
103781+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
103782+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
103783+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
103784+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
103785+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
103786 return stats;
103787 }
103788
103789@@ -166,15 +166,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
103790 nf_reset(skb);
103791
103792 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
103793- atomic_long_inc(&priv->rx_packets);
103794- atomic_long_add(data_len, &priv->rx_bytes);
103795+ atomic_long_inc_unchecked(&priv->rx_packets);
103796+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
103797 } else {
103798- atomic_long_inc(&priv->rx_errors);
103799+ atomic_long_inc_unchecked(&priv->rx_errors);
103800 }
103801 return;
103802
103803 error:
103804- atomic_long_inc(&priv->rx_errors);
103805+ atomic_long_inc_unchecked(&priv->rx_errors);
103806 kfree_skb(skb);
103807 }
103808
103809diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
103810index 1a3c7e0..80f8b0c 100644
103811--- a/net/llc/llc_proc.c
103812+++ b/net/llc/llc_proc.c
103813@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
103814 int rc = -ENOMEM;
103815 struct proc_dir_entry *p;
103816
103817- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
103818+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
103819 if (!llc_proc_dir)
103820 goto out;
103821
103822diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
103823index 343da1e..509873f 100644
103824--- a/net/mac80211/cfg.c
103825+++ b/net/mac80211/cfg.c
103826@@ -541,7 +541,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
103827 ret = ieee80211_vif_use_channel(sdata, chandef,
103828 IEEE80211_CHANCTX_EXCLUSIVE);
103829 }
103830- } else if (local->open_count == local->monitors) {
103831+ } else if (local_read(&local->open_count) == local->monitors) {
103832 local->_oper_chandef = *chandef;
103833 ieee80211_hw_config(local, 0);
103834 }
103835@@ -3326,7 +3326,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
103836 else
103837 local->probe_req_reg--;
103838
103839- if (!local->open_count)
103840+ if (!local_read(&local->open_count))
103841 break;
103842
103843 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
103844@@ -3460,8 +3460,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
103845 if (chanctx_conf) {
103846 *chandef = sdata->vif.bss_conf.chandef;
103847 ret = 0;
103848- } else if (local->open_count > 0 &&
103849- local->open_count == local->monitors &&
103850+ } else if (local_read(&local->open_count) > 0 &&
103851+ local_read(&local->open_count) == local->monitors &&
103852 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
103853 if (local->use_chanctx)
103854 *chandef = local->monitor_chandef;
103855diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
103856index 8c68da3..0695016 100644
103857--- a/net/mac80211/ieee80211_i.h
103858+++ b/net/mac80211/ieee80211_i.h
103859@@ -29,6 +29,7 @@
103860 #include <net/ieee80211_radiotap.h>
103861 #include <net/cfg80211.h>
103862 #include <net/mac80211.h>
103863+#include <asm/local.h>
103864 #include "key.h"
103865 #include "sta_info.h"
103866 #include "debug.h"
103867@@ -1057,7 +1058,7 @@ struct ieee80211_local {
103868 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
103869 spinlock_t queue_stop_reason_lock;
103870
103871- int open_count;
103872+ local_t open_count;
103873 int monitors, cooked_mntrs;
103874 /* number of interfaces with corresponding FIF_ flags */
103875 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
103876diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
103877index 653f5eb..02994ee 100644
103878--- a/net/mac80211/iface.c
103879+++ b/net/mac80211/iface.c
103880@@ -532,7 +532,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103881 break;
103882 }
103883
103884- if (local->open_count == 0) {
103885+ if (local_read(&local->open_count) == 0) {
103886 res = drv_start(local);
103887 if (res)
103888 goto err_del_bss;
103889@@ -579,7 +579,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103890 res = drv_add_interface(local, sdata);
103891 if (res)
103892 goto err_stop;
103893- } else if (local->monitors == 0 && local->open_count == 0) {
103894+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
103895 res = ieee80211_add_virtual_monitor(local);
103896 if (res)
103897 goto err_stop;
103898@@ -688,7 +688,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103899 atomic_inc(&local->iff_promiscs);
103900
103901 if (coming_up)
103902- local->open_count++;
103903+ local_inc(&local->open_count);
103904
103905 if (hw_reconf_flags)
103906 ieee80211_hw_config(local, hw_reconf_flags);
103907@@ -726,7 +726,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
103908 err_del_interface:
103909 drv_remove_interface(local, sdata);
103910 err_stop:
103911- if (!local->open_count)
103912+ if (!local_read(&local->open_count))
103913 drv_stop(local);
103914 err_del_bss:
103915 sdata->bss = NULL;
103916@@ -892,7 +892,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
103917 }
103918
103919 if (going_down)
103920- local->open_count--;
103921+ local_dec(&local->open_count);
103922
103923 switch (sdata->vif.type) {
103924 case NL80211_IFTYPE_AP_VLAN:
103925@@ -954,7 +954,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
103926 }
103927 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
103928
103929- if (local->open_count == 0)
103930+ if (local_read(&local->open_count) == 0)
103931 ieee80211_clear_tx_pending(local);
103932
103933 /*
103934@@ -997,7 +997,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
103935 if (cancel_scan)
103936 flush_delayed_work(&local->scan_work);
103937
103938- if (local->open_count == 0) {
103939+ if (local_read(&local->open_count) == 0) {
103940 ieee80211_stop_device(local);
103941
103942 /* no reconfiguring after stop! */
103943@@ -1008,7 +1008,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
103944 ieee80211_configure_filter(local);
103945 ieee80211_hw_config(local, hw_reconf_flags);
103946
103947- if (local->monitors == local->open_count)
103948+ if (local->monitors == local_read(&local->open_count))
103949 ieee80211_add_virtual_monitor(local);
103950 }
103951
103952diff --git a/net/mac80211/main.c b/net/mac80211/main.c
103953index 0de7c93..884b2ca 100644
103954--- a/net/mac80211/main.c
103955+++ b/net/mac80211/main.c
103956@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
103957 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
103958 IEEE80211_CONF_CHANGE_POWER);
103959
103960- if (changed && local->open_count) {
103961+ if (changed && local_read(&local->open_count)) {
103962 ret = drv_config(local, changed);
103963 /*
103964 * Goal:
103965diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
103966index 4c5192e..04cc0d8 100644
103967--- a/net/mac80211/pm.c
103968+++ b/net/mac80211/pm.c
103969@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
103970 struct ieee80211_sub_if_data *sdata;
103971 struct sta_info *sta;
103972
103973- if (!local->open_count)
103974+ if (!local_read(&local->open_count))
103975 goto suspend;
103976
103977 ieee80211_scan_cancel(local);
103978@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
103979 cancel_work_sync(&local->dynamic_ps_enable_work);
103980 del_timer_sync(&local->dynamic_ps_timer);
103981
103982- local->wowlan = wowlan && local->open_count;
103983+ local->wowlan = wowlan && local_read(&local->open_count);
103984 if (local->wowlan) {
103985 int err = drv_suspend(local, wowlan);
103986 if (err < 0) {
103987@@ -125,7 +125,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
103988 WARN_ON(!list_empty(&local->chanctx_list));
103989
103990 /* stop hardware - this must stop RX */
103991- if (local->open_count)
103992+ if (local_read(&local->open_count))
103993 ieee80211_stop_device(local);
103994
103995 suspend:
103996diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
103997index 6081329..ab23834 100644
103998--- a/net/mac80211/rate.c
103999+++ b/net/mac80211/rate.c
104000@@ -720,7 +720,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
104001
104002 ASSERT_RTNL();
104003
104004- if (local->open_count)
104005+ if (local_read(&local->open_count))
104006 return -EBUSY;
104007
104008 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
104009diff --git a/net/mac80211/util.c b/net/mac80211/util.c
104010index 3c61060..7bed2e3 100644
104011--- a/net/mac80211/util.c
104012+++ b/net/mac80211/util.c
104013@@ -1669,7 +1669,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
104014 }
104015 #endif
104016 /* everything else happens only if HW was up & running */
104017- if (!local->open_count)
104018+ if (!local_read(&local->open_count))
104019 goto wake_up;
104020
104021 /*
104022@@ -1895,7 +1895,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
104023 local->in_reconfig = false;
104024 barrier();
104025
104026- if (local->monitors == local->open_count && local->monitors > 0)
104027+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
104028 ieee80211_add_virtual_monitor(local);
104029
104030 /*
104031diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
104032index ae5096ab..e5aa70a 100644
104033--- a/net/netfilter/Kconfig
104034+++ b/net/netfilter/Kconfig
104035@@ -1105,6 +1105,16 @@ config NETFILTER_XT_MATCH_ESP
104036
104037 To compile it as a module, choose M here. If unsure, say N.
104038
104039+config NETFILTER_XT_MATCH_GRADM
104040+ tristate '"gradm" match support'
104041+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
104042+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
104043+ ---help---
104044+ The gradm match allows to match on grsecurity RBAC being enabled.
104045+ It is useful when iptables rules are applied early on bootup to
104046+ prevent connections to the machine (except from a trusted host)
104047+ while the RBAC system is disabled.
104048+
104049 config NETFILTER_XT_MATCH_HASHLIMIT
104050 tristate '"hashlimit" match support'
104051 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
104052diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
104053index a9571be..c59e173 100644
104054--- a/net/netfilter/Makefile
104055+++ b/net/netfilter/Makefile
104056@@ -137,6 +137,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
104057 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
104058 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
104059 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
104060+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
104061 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
104062 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
104063 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
104064diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
104065index d259da3..6a32b2c 100644
104066--- a/net/netfilter/ipset/ip_set_core.c
104067+++ b/net/netfilter/ipset/ip_set_core.c
104068@@ -1952,7 +1952,7 @@ done:
104069 return ret;
104070 }
104071
104072-static struct nf_sockopt_ops so_set __read_mostly = {
104073+static struct nf_sockopt_ops so_set = {
104074 .pf = PF_INET,
104075 .get_optmin = SO_IP_SET,
104076 .get_optmax = SO_IP_SET + 1,
104077diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
104078index b0f7b62..0541842 100644
104079--- a/net/netfilter/ipvs/ip_vs_conn.c
104080+++ b/net/netfilter/ipvs/ip_vs_conn.c
104081@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
104082 /* Increase the refcnt counter of the dest */
104083 ip_vs_dest_hold(dest);
104084
104085- conn_flags = atomic_read(&dest->conn_flags);
104086+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
104087 if (cp->protocol != IPPROTO_UDP)
104088 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
104089 flags = cp->flags;
104090@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
104091
104092 cp->control = NULL;
104093 atomic_set(&cp->n_control, 0);
104094- atomic_set(&cp->in_pkts, 0);
104095+ atomic_set_unchecked(&cp->in_pkts, 0);
104096
104097 cp->packet_xmit = NULL;
104098 cp->app = NULL;
104099@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
104100
104101 /* Don't drop the entry if its number of incoming packets is not
104102 located in [0, 8] */
104103- i = atomic_read(&cp->in_pkts);
104104+ i = atomic_read_unchecked(&cp->in_pkts);
104105 if (i > 8 || i < 0) return 0;
104106
104107 if (!todrop_rate[i]) return 0;
104108diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
104109index 990decb..5075248 100644
104110--- a/net/netfilter/ipvs/ip_vs_core.c
104111+++ b/net/netfilter/ipvs/ip_vs_core.c
104112@@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
104113 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
104114 /* do not touch skb anymore */
104115
104116- atomic_inc(&cp->in_pkts);
104117+ atomic_inc_unchecked(&cp->in_pkts);
104118 ip_vs_conn_put(cp);
104119 return ret;
104120 }
104121@@ -1712,7 +1712,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
104122 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
104123 pkts = sysctl_sync_threshold(ipvs);
104124 else
104125- pkts = atomic_add_return(1, &cp->in_pkts);
104126+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104127
104128 if (ipvs->sync_state & IP_VS_STATE_MASTER)
104129 ip_vs_sync_conn(net, cp, pkts);
104130diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
104131index ac7ba68..9735acb9 100644
104132--- a/net/netfilter/ipvs/ip_vs_ctl.c
104133+++ b/net/netfilter/ipvs/ip_vs_ctl.c
104134@@ -800,7 +800,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
104135 */
104136 ip_vs_rs_hash(ipvs, dest);
104137 }
104138- atomic_set(&dest->conn_flags, conn_flags);
104139+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
104140
104141 /* bind the service */
104142 old_svc = rcu_dereference_protected(dest->svc, 1);
104143@@ -1665,7 +1665,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
104144 * align with netns init in ip_vs_control_net_init()
104145 */
104146
104147-static struct ctl_table vs_vars[] = {
104148+static ctl_table_no_const vs_vars[] __read_only = {
104149 {
104150 .procname = "amemthresh",
104151 .maxlen = sizeof(int),
104152@@ -2000,7 +2000,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
104153 " %-7s %-6d %-10d %-10d\n",
104154 &dest->addr.in6,
104155 ntohs(dest->port),
104156- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
104157+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
104158 atomic_read(&dest->weight),
104159 atomic_read(&dest->activeconns),
104160 atomic_read(&dest->inactconns));
104161@@ -2011,7 +2011,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
104162 "%-7s %-6d %-10d %-10d\n",
104163 ntohl(dest->addr.ip),
104164 ntohs(dest->port),
104165- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
104166+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
104167 atomic_read(&dest->weight),
104168 atomic_read(&dest->activeconns),
104169 atomic_read(&dest->inactconns));
104170@@ -2500,7 +2500,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
104171
104172 entry.addr = dest->addr.ip;
104173 entry.port = dest->port;
104174- entry.conn_flags = atomic_read(&dest->conn_flags);
104175+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
104176 entry.weight = atomic_read(&dest->weight);
104177 entry.u_threshold = dest->u_threshold;
104178 entry.l_threshold = dest->l_threshold;
104179@@ -3040,7 +3040,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
104180 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
104181 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
104182 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
104183- (atomic_read(&dest->conn_flags) &
104184+ (atomic_read_unchecked(&dest->conn_flags) &
104185 IP_VS_CONN_F_FWD_MASK)) ||
104186 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
104187 atomic_read(&dest->weight)) ||
104188@@ -3673,7 +3673,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
104189 {
104190 int idx;
104191 struct netns_ipvs *ipvs = net_ipvs(net);
104192- struct ctl_table *tbl;
104193+ ctl_table_no_const *tbl;
104194
104195 atomic_set(&ipvs->dropentry, 0);
104196 spin_lock_init(&ipvs->dropentry_lock);
104197diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
104198index 127f140..553d652 100644
104199--- a/net/netfilter/ipvs/ip_vs_lblc.c
104200+++ b/net/netfilter/ipvs/ip_vs_lblc.c
104201@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
104202 * IPVS LBLC sysctl table
104203 */
104204 #ifdef CONFIG_SYSCTL
104205-static struct ctl_table vs_vars_table[] = {
104206+static ctl_table_no_const vs_vars_table[] __read_only = {
104207 {
104208 .procname = "lblc_expiration",
104209 .data = NULL,
104210diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
104211index 2229d2d..b32b785 100644
104212--- a/net/netfilter/ipvs/ip_vs_lblcr.c
104213+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
104214@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
104215 * IPVS LBLCR sysctl table
104216 */
104217
104218-static struct ctl_table vs_vars_table[] = {
104219+static ctl_table_no_const vs_vars_table[] __read_only = {
104220 {
104221 .procname = "lblcr_expiration",
104222 .data = NULL,
104223diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
104224index 7162c86..9eeb60e 100644
104225--- a/net/netfilter/ipvs/ip_vs_sync.c
104226+++ b/net/netfilter/ipvs/ip_vs_sync.c
104227@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
104228 cp = cp->control;
104229 if (cp) {
104230 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
104231- pkts = atomic_add_return(1, &cp->in_pkts);
104232+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104233 else
104234 pkts = sysctl_sync_threshold(ipvs);
104235 ip_vs_sync_conn(net, cp->control, pkts);
104236@@ -771,7 +771,7 @@ control:
104237 if (!cp)
104238 return;
104239 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
104240- pkts = atomic_add_return(1, &cp->in_pkts);
104241+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
104242 else
104243 pkts = sysctl_sync_threshold(ipvs);
104244 goto sloop;
104245@@ -901,7 +901,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
104246
104247 if (opt)
104248 memcpy(&cp->in_seq, opt, sizeof(*opt));
104249- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
104250+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
104251 cp->state = state;
104252 cp->old_state = cp->state;
104253 /*
104254diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
104255index bd90bf8..816a020d 100644
104256--- a/net/netfilter/ipvs/ip_vs_xmit.c
104257+++ b/net/netfilter/ipvs/ip_vs_xmit.c
104258@@ -1215,7 +1215,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
104259 else
104260 rc = NF_ACCEPT;
104261 /* do not touch skb anymore */
104262- atomic_inc(&cp->in_pkts);
104263+ atomic_inc_unchecked(&cp->in_pkts);
104264 goto out;
104265 }
104266
104267@@ -1308,7 +1308,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
104268 else
104269 rc = NF_ACCEPT;
104270 /* do not touch skb anymore */
104271- atomic_inc(&cp->in_pkts);
104272+ atomic_inc_unchecked(&cp->in_pkts);
104273 goto out;
104274 }
104275
104276diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
104277index a4b5e2a..13b1de3 100644
104278--- a/net/netfilter/nf_conntrack_acct.c
104279+++ b/net/netfilter/nf_conntrack_acct.c
104280@@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
104281 #ifdef CONFIG_SYSCTL
104282 static int nf_conntrack_acct_init_sysctl(struct net *net)
104283 {
104284- struct ctl_table *table;
104285+ ctl_table_no_const *table;
104286
104287 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
104288 GFP_KERNEL);
104289diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
104290index 5016a69..594f8e9 100644
104291--- a/net/netfilter/nf_conntrack_core.c
104292+++ b/net/netfilter/nf_conntrack_core.c
104293@@ -1739,6 +1739,10 @@ void nf_conntrack_init_end(void)
104294 #define DYING_NULLS_VAL ((1<<30)+1)
104295 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
104296
104297+#ifdef CONFIG_GRKERNSEC_HIDESYM
104298+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
104299+#endif
104300+
104301 int nf_conntrack_init_net(struct net *net)
104302 {
104303 int ret = -ENOMEM;
104304@@ -1764,7 +1768,11 @@ int nf_conntrack_init_net(struct net *net)
104305 if (!net->ct.stat)
104306 goto err_pcpu_lists;
104307
104308+#ifdef CONFIG_GRKERNSEC_HIDESYM
104309+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
104310+#else
104311 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
104312+#endif
104313 if (!net->ct.slabname)
104314 goto err_slabname;
104315
104316diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
104317index 4e78c57..ec8fb74 100644
104318--- a/net/netfilter/nf_conntrack_ecache.c
104319+++ b/net/netfilter/nf_conntrack_ecache.c
104320@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
104321 #ifdef CONFIG_SYSCTL
104322 static int nf_conntrack_event_init_sysctl(struct net *net)
104323 {
104324- struct ctl_table *table;
104325+ ctl_table_no_const *table;
104326
104327 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
104328 GFP_KERNEL);
104329diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
104330index 5b3eae7..dd4b8fe 100644
104331--- a/net/netfilter/nf_conntrack_helper.c
104332+++ b/net/netfilter/nf_conntrack_helper.c
104333@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
104334
104335 static int nf_conntrack_helper_init_sysctl(struct net *net)
104336 {
104337- struct ctl_table *table;
104338+ ctl_table_no_const *table;
104339
104340 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
104341 GFP_KERNEL);
104342diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
104343index b65d586..beec902 100644
104344--- a/net/netfilter/nf_conntrack_proto.c
104345+++ b/net/netfilter/nf_conntrack_proto.c
104346@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
104347
104348 static void
104349 nf_ct_unregister_sysctl(struct ctl_table_header **header,
104350- struct ctl_table **table,
104351+ ctl_table_no_const **table,
104352 unsigned int users)
104353 {
104354 if (users > 0)
104355diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
104356index cf65a1e..2f291e9 100644
104357--- a/net/netfilter/nf_conntrack_standalone.c
104358+++ b/net/netfilter/nf_conntrack_standalone.c
104359@@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
104360
104361 static int nf_conntrack_standalone_init_sysctl(struct net *net)
104362 {
104363- struct ctl_table *table;
104364+ ctl_table_no_const *table;
104365
104366 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
104367 GFP_KERNEL);
104368diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
104369index 7a394df..bd91a8a 100644
104370--- a/net/netfilter/nf_conntrack_timestamp.c
104371+++ b/net/netfilter/nf_conntrack_timestamp.c
104372@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
104373 #ifdef CONFIG_SYSCTL
104374 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
104375 {
104376- struct ctl_table *table;
104377+ ctl_table_no_const *table;
104378
104379 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
104380 GFP_KERNEL);
104381diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
104382index d719764..311bc60 100644
104383--- a/net/netfilter/nf_log.c
104384+++ b/net/netfilter/nf_log.c
104385@@ -353,7 +353,7 @@ static const struct file_operations nflog_file_ops = {
104386
104387 #ifdef CONFIG_SYSCTL
104388 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
104389-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
104390+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
104391
104392 static int nf_log_proc_dostring(struct ctl_table *table, int write,
104393 void __user *buffer, size_t *lenp, loff_t *ppos)
104394@@ -384,14 +384,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
104395 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
104396 mutex_unlock(&nf_log_mutex);
104397 } else {
104398+ ctl_table_no_const nf_log_table = *table;
104399+
104400 mutex_lock(&nf_log_mutex);
104401 logger = rcu_dereference_protected(net->nf.nf_loggers[tindex],
104402 lockdep_is_held(&nf_log_mutex));
104403 if (!logger)
104404- table->data = "NONE";
104405+ nf_log_table.data = "NONE";
104406 else
104407- table->data = logger->name;
104408- r = proc_dostring(table, write, buffer, lenp, ppos);
104409+ nf_log_table.data = logger->name;
104410+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
104411 mutex_unlock(&nf_log_mutex);
104412 }
104413
104414diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
104415index c68c1e5..8b5d670 100644
104416--- a/net/netfilter/nf_sockopt.c
104417+++ b/net/netfilter/nf_sockopt.c
104418@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
104419 }
104420 }
104421
104422- list_add(&reg->list, &nf_sockopts);
104423+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
104424 out:
104425 mutex_unlock(&nf_sockopt_mutex);
104426 return ret;
104427@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
104428 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
104429 {
104430 mutex_lock(&nf_sockopt_mutex);
104431- list_del(&reg->list);
104432+ pax_list_del((struct list_head *)&reg->list);
104433 mutex_unlock(&nf_sockopt_mutex);
104434 }
104435 EXPORT_SYMBOL(nf_unregister_sockopt);
104436diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
104437index 5f1be5b..2cba8cd 100644
104438--- a/net/netfilter/nfnetlink_log.c
104439+++ b/net/netfilter/nfnetlink_log.c
104440@@ -80,7 +80,7 @@ static int nfnl_log_net_id __read_mostly;
104441 struct nfnl_log_net {
104442 spinlock_t instances_lock;
104443 struct hlist_head instance_table[INSTANCE_BUCKETS];
104444- atomic_t global_seq;
104445+ atomic_unchecked_t global_seq;
104446 };
104447
104448 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
104449@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
104450 /* global sequence number */
104451 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
104452 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
104453- htonl(atomic_inc_return(&log->global_seq))))
104454+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
104455 goto nla_put_failure;
104456
104457 if (data_len) {
104458diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
104459new file mode 100644
104460index 0000000..c566332
104461--- /dev/null
104462+++ b/net/netfilter/xt_gradm.c
104463@@ -0,0 +1,51 @@
104464+/*
104465+ * gradm match for netfilter
104466